From 07f323644d437cde169d69e013f884f33c83859a Mon Sep 17 00:00:00 2001
From: Hilke Heremans <hilke@thinman.be>
Date: Sat, 11 Mar 2017 08:52:57 +0100
Subject: [PATCH 001/366] Fix for IP detection on Macs with multiple interfaces
 and loopbacks configured

---
 packager/react-native-xcode.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packager/react-native-xcode.sh b/packager/react-native-xcode.sh
index d136282fdd683d..2edea86bc35bf8 100755
--- a/packager/react-native-xcode.sh
+++ b/packager/react-native-xcode.sh
@@ -76,7 +76,7 @@ if [[ "$CONFIGURATION" = "Debug" && ! "$PLATFORM_NAME" == *simulator ]]; then
   PLIST=$TARGET_BUILD_DIR/$INFOPLIST_PATH
   IP=$(ipconfig getifaddr en0)
   if [ -z "$IP" ]; then
-    IP=$(ifconfig | grep 'inet ' | grep -v 127.0.0.1 | cut -d\   -f2  | awk 'NR==1{print $1}')
+    IP=$(ifconfig | grep 'inet ' | grep -v 127.0.0.1 | grep -v 127.94.0 | cut -d\   -f2  | awk 'NR==1{print $1}')
   fi
   $PLISTBUDDY -c "Add NSAppTransportSecurity:NSExceptionDomains:localhost:NSTemporaryExceptionAllowsInsecureHTTPLoads bool true" "$PLIST"
   $PLISTBUDDY -c "Add NSAppTransportSecurity:NSExceptionDomains:$IP.xip.io:NSTemporaryExceptionAllowsInsecureHTTPLoads bool true" "$PLIST"

From 8ba06cbfb1c60980437e38c358a971ff105af245 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=9Cst=C3=BCn=20Ergenoglu?= <ustun@unity3d.com>
Date: Sat, 11 Mar 2017 17:22:32 -0800
Subject: [PATCH 002/366] Fix wrong modal size in fullscreen

Summary:
Display.getCurrentSizeRange() doesn't include the size of the status
bar, so Modal windows on Android have a gap in the bottom that is the
same size as the status bar. This checks the current theme and adds the
size of status bar to the modal window height if necessary.

**Test plan (required)**

Run a React Native app on Android with a theme that doesn't show status bar and launch a modal dialog. See issue #11872 for an example.
Closes https://github.com/facebook/react-native/pull/11928

Differential Revision: D4695847

fbshipit-source-id: 9fafc2b5040e2f58d562c9cc4cd4d6d87b0df2a3
---
 .../react/views/modal/ModalHostHelper.java    | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostHelper.java b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostHelper.java
index d95b2ee7aa887e..d63643266db40f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostHelper.java
@@ -4,6 +4,8 @@
 
 import android.annotation.TargetApi;
 import android.content.Context;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
 import android.graphics.Point;
 import android.view.Display;
 import android.view.WindowManager;
@@ -38,12 +40,26 @@ public static Point getModalHostSize(Context context) {
     // getSize will return the dimensions of the screen in its current orientation
     display.getSize(SIZE_POINT);
 
+    int[] attrs = {android.R.attr.windowFullscreen};
+    Resources.Theme theme = context.getTheme();
+    TypedArray ta = theme.obtainStyledAttributes(attrs);
+    boolean windowFullscreen = ta.getBoolean(0, false);
+
+    // We need to add the status bar height to the height if we have a fullscreen window,
+    // because Display.getCurrentSizeRange doesn't include it.
+    Resources resources = context.getResources();
+    int statusBarId = resources.getIdentifier("status_bar_height", "dimen", "android");
+    int statusBarHeight = 0;
+    if (windowFullscreen && statusBarId > 0) {
+        statusBarHeight = (int) resources.getDimension(statusBarId);
+    }
+
     if (SIZE_POINT.x < SIZE_POINT.y) {
       // If we are vertical the width value comes from min width and height comes from max height
-      return new Point(MIN_POINT.x, MAX_POINT.y);
+      return new Point(MIN_POINT.x, MAX_POINT.y + statusBarHeight);
     } else {
       // If we are horizontal the width value comes from max width and height comes from min height
-      return new Point(MAX_POINT.x, MIN_POINT.y);
+      return new Point(MAX_POINT.x, MIN_POINT.y + statusBarHeight);
     }
   }
 }

From 76f5b9606a43dee4cc1962b4f8a3ada4e90b910a Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Mon, 13 Mar 2017 05:17:54 -0700
Subject: [PATCH 003/366] packager: Bundler: refactor the maxWorkerCount

Summary: The function giving the worker count was duplicated, let's just pass it down from a central place, the Bundler. Also, I simplified the function to use a simple formula rather than arbitrary ranges (it's still arbitrary, just a tad bit less :D ).

Reviewed By: davidaurelio

Differential Revision: D4689366

fbshipit-source-id: fe5b349396f1a07858f4f80ccaa63c375122fac8
---
 .../src/Bundler/__tests__/Bundler-test.js     | 15 +++++++++
 packager/src/Bundler/index.js                 | 27 +++++++++++++++-
 packager/src/JSTransformer/index.js           | 23 ++-----------
 packager/src/Resolver/index.js                |  1 +
 .../__tests__/DependencyGraph-test.js         |  2 +-
 packager/src/node-haste/index.js              | 32 +++----------------
 6 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/packager/src/Bundler/__tests__/Bundler-test.js b/packager/src/Bundler/__tests__/Bundler-test.js
index f8b1639bb8e4fd..b4becd75dab965 100644
--- a/packager/src/Bundler/__tests__/Bundler-test.js
+++ b/packager/src/Bundler/__tests__/Bundler-test.js
@@ -15,6 +15,7 @@ jest
   .setMock('uglify-js')
   .mock('image-size')
   .mock('fs')
+  .mock('os')
   .mock('assert')
   .mock('progress')
   .mock('../../node-haste')
@@ -31,6 +32,7 @@ var Resolver = require('../../Resolver');
 var defaults = require('../../../defaults');
 var sizeOf = require('image-size');
 var fs = require('fs');
+const os = require('os');
 
 var commonOptions = {
   allowBundleUpdates: false,
@@ -76,6 +78,8 @@ describe('Bundler', function() {
   var projectRoots;
 
   beforeEach(function() {
+    os.cpus.mockReturnValue({length: 1});
+
     getDependencies = jest.fn();
     getModuleSystemDependencies = jest.fn();
     projectRoots = ['/root'];
@@ -348,5 +352,16 @@ describe('Bundler', function() {
           '/root/img/new_image2@3x.png',
         ]));
     });
+
+    it('return correct number of workers', () => {
+      os.cpus.mockReturnValue({length: 1});
+      expect(Bundler.getMaxWorkerCount()).toBe(1);
+      os.cpus.mockReturnValue({length: 8});
+      expect(Bundler.getMaxWorkerCount()).toBe(6);
+      os.cpus.mockReturnValue({length: 24});
+      expect(Bundler.getMaxWorkerCount()).toBe(14);
+      process.env.REACT_NATIVE_MAX_WORKERS = 5;
+      expect(Bundler.getMaxWorkerCount()).toBe(5);
+    });
   });
 });
diff --git a/packager/src/Bundler/index.js b/packager/src/Bundler/index.js
index b4dcf64719ae4c..7066db33f911f3 100644
--- a/packager/src/Bundler/index.js
+++ b/packager/src/Bundler/index.js
@@ -25,6 +25,8 @@ const imageSize = require('image-size');
 const path = require('path');
 const denodeify = require('denodeify');
 const defaults = require('../../defaults');
+const os = require('os');
+const invariant = require('fbjs/lib/invariant');
 
 const {
   sep: pathSeparator,
@@ -163,8 +165,10 @@ class Bundler {
       cacheKey: transformCacheKey,
     });
 
+    const maxWorkerCount = Bundler.getMaxWorkerCount();
+
     /* $FlowFixMe: in practice it's always here. */
-    this._transformer = new Transformer(opts.transformModulePath);
+    this._transformer = new Transformer(opts.transformModulePath, maxWorkerCount);
 
     const getTransformCacheKey = (src, filename, options) => {
       return transformCacheKey + getCacheKey(src, filename, options);
@@ -178,6 +182,7 @@ class Bundler {
       getTransformCacheKey,
       globalTransformCache: opts.globalTransformCache,
       hasteImpl: opts.hasteImpl,
+      maxWorkerCount,
       minifyCode: this._transformer.minify,
       moduleFormat: opts.moduleFormat,
       platforms: new Set(opts.platforms),
@@ -780,6 +785,26 @@ class Bundler {
   getResolver(): Promise<Resolver> {
     return this._resolverPromise;
   }
+
+  /**
+   * Unless overriden, we use a diminishing amount of workers per core, because
+   * using more and more of them does not scale much. Ex. 6 workers for 8
+   * cores, or 14 workers for 24 cores.
+   */
+  static getMaxWorkerCount() {
+    const cores = os.cpus().length;
+    const envStr = process.env.REACT_NATIVE_MAX_WORKERS;
+    if (envStr == null) {
+      return Math.max(1, Math.ceil(cores * (0.5 + 0.5 * Math.exp(-cores * 0.07)) - 1));
+    }
+    const envCount = parseInt(process.env.REACT_NATIVE_MAX_WORKERS, 10);
+    invariant(
+      Number.isInteger(envCount),
+      'environment variable `REACT_NATIVE_MAX_WORKERS` must be a valid integer',
+    );
+    return Math.min(cores, envCount);
+  }
+
 }
 
 function getPathRelativeToRoot(roots, absPath) {
diff --git a/packager/src/JSTransformer/index.js b/packager/src/JSTransformer/index.js
index 393eb2452f872c..6cc7e56e17d4fc 100644
--- a/packager/src/JSTransformer/index.js
+++ b/packager/src/JSTransformer/index.js
@@ -16,7 +16,6 @@ const Logger = require('../Logger');
 const debug = require('debug')('RNP:JStransformer');
 const denodeify = require('denodeify');
 const invariant = require('fbjs/lib/invariant');
-const os = require('os');
 const path = require('path');
 const util = require('util');
 const workerFarm = require('worker-farm');
@@ -35,24 +34,7 @@ const TRANSFORM_TIMEOUT_INTERVAL = 301000;
 // How may times can we tolerate failures from the worker.
 const MAX_RETRIES = 2;
 
-const maxConcurrentWorkers = ((cores, override) => {
-  if (override) {
-    return Math.min(cores, override);
-  }
-
-  if (cores < 3) {
-    return cores;
-  }
-  if (cores < 8) {
-    return Math.floor(cores * 0.75);
-  }
-  if (cores < 24) {
-    return Math.floor(3 / 8 * cores + 3); // between cores *.75 and cores / 2
-  }
-  return cores / 2;
-})(os.cpus().length, parseInt(process.env.REACT_NATIVE_MAX_WORKERS, 10));
-
-function makeFarm(worker, methods, timeout) {
+function makeFarm(worker, methods, timeout, maxConcurrentWorkers) {
   return workerFarm(
     {
       autoStart: true,
@@ -83,7 +65,7 @@ class Transformer {
     sourceMap: SourceMap,
   ) => Promise<{code: string, map: SourceMap}>;
 
-  constructor(transformModulePath: string) {
+  constructor(transformModulePath: string, maxWorkerCount: number) {
     invariant(path.isAbsolute(transformModulePath), 'transform module path should be absolute');
     this._transformModulePath = transformModulePath;
 
@@ -91,6 +73,7 @@ class Transformer {
       require.resolve('./worker'),
       ['minify', 'transformAndExtractDependencies'],
       TRANSFORM_TIMEOUT_INTERVAL,
+      maxWorkerCount,
     );
     this._transform = denodeify(this._workers.transformAndExtractDependencies);
     this.minify = denodeify(this._workers.minify);
diff --git a/packager/src/Resolver/index.js b/packager/src/Resolver/index.js
index 31d53c9d3f7d56..e73706bf8eea16 100644
--- a/packager/src/Resolver/index.js
+++ b/packager/src/Resolver/index.js
@@ -37,6 +37,7 @@ type Options = {
   getTransformCacheKey: GetTransformCacheKey,
   globalTransformCache: ?GlobalTransformCache,
   hasteImpl?: HasteImpl,
+  maxWorkerCount: number,
   minifyCode: MinifyCode,
   platforms: Set<string>,
   polyfillModuleNames?: Array<string>,
diff --git a/packager/src/node-haste/__tests__/DependencyGraph-test.js b/packager/src/node-haste/__tests__/DependencyGraph-test.js
index 3c5aca6fbca76b..4a60d0b55c450c 100644
--- a/packager/src/node-haste/__tests__/DependencyGraph-test.js
+++ b/packager/src/node-haste/__tests__/DependencyGraph-test.js
@@ -112,7 +112,7 @@ describe('DependencyGraph', function() {
       platforms: new Set(['ios', 'android']),
       useWatchman: false,
       ignoreFilePath: () => false,
-      maxWorkers: 1,
+      maxWorkerCount: 1,
       moduleOptions: {cacheTransformResults: true},
       resetCache: true,
       transformCode: (module, sourceCode, transformOptions) => {
diff --git a/packager/src/node-haste/index.js b/packager/src/node-haste/index.js
index 25af7db61b2231..6af6a1901f2e85 100644
--- a/packager/src/node-haste/index.js
+++ b/packager/src/node-haste/index.js
@@ -24,8 +24,8 @@ const fs = require('fs');
 const getAssetDataFromName = require('./lib/getAssetDataFromName');
 const getInverseDependencies = require('./lib/getInverseDependencies');
 const getPlatformExtension = require('./lib/getPlatformExtension');
+const invariant = require('fbjs/lib/invariant');
 const isAbsolutePath = require('absolute-path');
-const os = require('os');
 const path = require('path');
 const replacePatterns = require('./lib/replacePatterns');
 const util = require('util');
@@ -58,7 +58,7 @@ type Options = {
   getTransformCacheKey: GetTransformCacheKey,
   globalTransformCache: ?GlobalTransformCache,
   ignoreFilePath: (filePath: string) => boolean,
-  maxWorkers: ?number,
+  maxWorkerCount: number,
   moduleOptions: ModuleOptions,
   platforms: Set<string>,
   preferNativePlatform: boolean,
@@ -87,6 +87,7 @@ class DependencyGraph extends EventEmitter {
     initialModuleMap: ModuleMap,
   }) {
     super();
+    invariant(config.opts.maxWorkerCount >= 1, 'worker count must be greater or equal to 1');
     this._opts = config.opts;
     this._haste = config.haste;
     this._hasteFS = config.initialHasteFS;
@@ -97,12 +98,11 @@ class DependencyGraph extends EventEmitter {
   }
 
   static _createHaste(opts: Options): JestHasteMap {
-    const mw = opts.maxWorkers;
     return new JestHasteMap({
       extensions: opts.extensions.concat(opts.assetExts),
       forceNodeFilesystemAPI: opts.forceNodeFilesystemAPI,
       ignorePattern: {test: opts.ignoreFilePath},
-      maxWorkers: typeof mw === 'number' && mw >= 1 ? mw : getMaxWorkers(),
+      maxWorkers: opts.maxWorkerCount,
       mocksPattern: '',
       name: 'react-native-packager',
       platforms: Array.from(opts.platforms),
@@ -306,28 +306,4 @@ function NotFoundError() {
 }
 util.inherits(NotFoundError, Error);
 
-function getMaxWorkers() {
-  const cores = os.cpus().length;
-
-  if (cores <= 1) {
-    // oh well...
-    return 1;
-  }
-  if (cores <= 4) {
-    // don't starve the CPU while still reading reasonably rapidly
-    return cores - 1;
-  }
-  if (cores <= 8) {
-    // empirical testing showed massive diminishing returns when going over
-    // 4 or 5 workers on 8-core machines
-    return Math.floor(cores * 0.75) - 1;
-  }
-
-  // pretty much guesswork
-  if (cores < 24) {
-    return Math.floor(3 / 8 * cores + 3);
-  }
-  return cores / 2;
-}
-
 module.exports = DependencyGraph;

From 41f3d0cf2d0b20315969b68895e9e217b114544c Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieterdb@fb.com>
Date: Mon, 13 Mar 2017 05:58:09 -0700
Subject: [PATCH 004/366] Expose getter for 'flex' property

Summary: Helps mitigate part of https://github.com/facebook/react-native/pull/12245 while we wait for a more comprehensive solution.

Reviewed By: emilsjolander

Differential Revision: D4571776

fbshipit-source-id: 185cd1b0d3af37724136a37471df412c2000dfe4
---
 React/Views/RCTShadowView.h | 3 +--
 React/Views/RCTShadowView.m | 6 +-----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/React/Views/RCTShadowView.h b/React/Views/RCTShadowView.h
index bc15bfe595e0c6..61154b1d6e4aab 100644
--- a/React/Views/RCTShadowView.h
+++ b/React/Views/RCTShadowView.h
@@ -135,14 +135,13 @@ typedef void (^RCTApplierBlock)(NSDictionary<NSNumber *, UIView *> *viewRegistry
 @property (nonatomic, assign) YGWrap flexWrap;
 @property (nonatomic, assign) YGDisplay display;
 
+@property (nonatomic, assign) float flex;
 @property (nonatomic, assign) float flexGrow;
 @property (nonatomic, assign) float flexShrink;
 @property (nonatomic, assign) YGValue flexBasis;
 
 @property (nonatomic, assign) float aspectRatio;
 
-- (void)setFlex:(float)flex;
-
 /**
  * z-index, used to override sibling order in the view
  */
diff --git a/React/Views/RCTShadowView.m b/React/Views/RCTShadowView.m
index c50f38281bbd40..8de41aaca7ff7f 100644
--- a/React/Views/RCTShadowView.m
+++ b/React/Views/RCTShadowView.m
@@ -669,11 +669,6 @@ - (void)setIntrinsicContentSize:(CGSize)intrinsicContentSize
 
 // Flex
 
-- (void)setFlex:(float)value
-{
-  YGNodeStyleSetFlex(_yogaNode, value);
-}
-
 - (void)setFlexBasis:(YGValue)value
 {
   RCT_SET_YGVALUE_AUTO(value, YGNodeStyleSetFlexBasis, _yogaNode);
@@ -694,6 +689,7 @@ - (type)getProp                                             \
   return YGNodeStyleGet##cssProp(_yogaNode);                \
 }
 
+RCT_STYLE_PROPERTY(Flex, flex, Flex, float)
 RCT_STYLE_PROPERTY(FlexGrow, flexGrow, FlexGrow, float)
 RCT_STYLE_PROPERTY(FlexShrink, flexShrink, FlexShrink, float)
 RCT_STYLE_PROPERTY(FlexDirection, flexDirection, FlexDirection, YGFlexDirection)

From ac452c0a173594e40cab1e61e77823be59dd44c6 Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Mon, 13 Mar 2017 06:14:34 -0700
Subject: [PATCH 005/366] packager: Server: make buildBundle() async

Summary: Also remove the unnecessary await of the resolver, because `_bundler.bundle()` already does that.

Reviewed By: davidaurelio

Differential Revision: D4689448

fbshipit-source-id: 3b4fd73b1368f8b00c6eb7483e751387d9856ce9
---
 packager/src/Server/index.js | 51 +++++++++++++++---------------------
 1 file changed, 21 insertions(+), 30 deletions(-)

diff --git a/packager/src/Server/index.js b/packager/src/Server/index.js
index 66c84869a178a0..972723c2883ded 100644
--- a/packager/src/Server/index.js
+++ b/packager/src/Server/index.js
@@ -302,37 +302,28 @@ class Server {
     }
   }
 
-  buildBundle(options: {
-    entryFile: string,
-    platform?: string,
-  }): Promise<Bundle> {
-    return this._bundler.getResolver().then(() => {
-      if (!options.platform) {
-        options.platform = getPlatformExtension(options.entryFile);
-      }
-
-      const opts = bundleOpts(options);
-      return this._bundler.bundle(opts);
-    }).then(bundle => {
-      const modules = bundle.getModules();
-      const nonVirtual = modules.filter(m => !m.virtual);
-      bundleDeps.set(bundle, {
-        files: new Map(
-          nonVirtual
-            .map(({sourcePath, meta}) =>
-              [sourcePath, meta != null ? meta.dependencies : []])
-        ),
-        idToIndex: new Map(modules.map(({id}, i) => [id, i])),
-        dependencyPairs: new Map(
-          nonVirtual
-            .filter(({meta}) => meta && meta.dependencyPairs)
-            /* $FlowFixMe: the filter above ensures `dependencyPairs` is not null. */
-            .map(m => [m.sourcePath, m.meta.dependencyPairs])
-        ),
-        outdated: new Set(),
-      });
-      return bundle;
+  async buildBundle(options: {entryFile: string, platform?: string}): Promise<Bundle> {
+    if (!options.platform) {
+      options.platform = getPlatformExtension(options.entryFile);
+    }
+    const opts = bundleOpts(options);
+    const bundle = await this._bundler.bundle(opts);
+    const modules = bundle.getModules();
+    const nonVirtual = modules.filter(m => !m.virtual);
+    bundleDeps.set(bundle, {
+      files: new Map(nonVirtual.map(({sourcePath, meta}) =>
+        [sourcePath, meta != null ? meta.dependencies : []],
+      )),
+      idToIndex: new Map(modules.map(({id}, i) => [id, i])),
+      dependencyPairs: new Map(
+        nonVirtual
+          .filter(({meta}) => meta && meta.dependencyPairs)
+          /* $FlowFixMe: the filter above ensures `dependencyPairs` is not null. */
+          .map(m => [m.sourcePath, m.meta.dependencyPairs])
+      ),
+      outdated: new Set(),
     });
+    return bundle;
   }
 
   buildBundleFromUrl(reqUrl: string): Promise<mixed> {

From 3ce31c24dad8a52ce17772c8e65687a14d320c09 Mon Sep 17 00:00:00 2001
From: Spencer Ahrens <sahrens@fb.com>
Date: Mon, 13 Mar 2017 09:41:30 -0700
Subject: [PATCH 006/366] Rename *Component props to match SectionList

Reviewed By: yungsters

Differential Revision: D4697335

fbshipit-source-id: 742b7a1729ba7a08fe3d9707bcf6c51026779739
---
 Examples/UIExplorer/js/FlatListExample.js     |  6 +++---
 Examples/UIExplorer/js/MultiColumnExample.js  |  6 +++---
 Libraries/CustomComponents/Lists/FlatList.js  | 21 +++++++------------
 .../CustomComponents/Lists/SectionList.js     | 10 +--------
 .../CustomComponents/Lists/VirtualizedList.js | 20 ++++++++----------
 .../Lists/VirtualizedSectionList.js           |  2 +-
 6 files changed, 24 insertions(+), 41 deletions(-)

diff --git a/Examples/UIExplorer/js/FlatListExample.js b/Examples/UIExplorer/js/FlatListExample.js
index 90263d70aaed44..6ff92e6dcdf24e 100644
--- a/Examples/UIExplorer/js/FlatListExample.js
+++ b/Examples/UIExplorer/js/FlatListExample.js
@@ -133,9 +133,9 @@ class FlatListExample extends React.PureComponent {
         </View>
         <SeparatorComponent />
         <AnimatedFlatList
-          HeaderComponent={HeaderComponent}
-          FooterComponent={FooterComponent}
-          SeparatorComponent={SeparatorComponent}
+          ItemSeparatorComponent={SeparatorComponent}
+          ListHeaderComponent={HeaderComponent}
+          ListFooterComponent={FooterComponent}
           data={filteredData}
           debug={this.state.debug}
           disableVirtualization={!this.state.virtualized}
diff --git a/Examples/UIExplorer/js/MultiColumnExample.js b/Examples/UIExplorer/js/MultiColumnExample.js
index 806b6a7313d8ce..9b4477240f56ac 100644
--- a/Examples/UIExplorer/js/MultiColumnExample.js
+++ b/Examples/UIExplorer/js/MultiColumnExample.js
@@ -97,9 +97,9 @@ class MultiColumnExample extends React.PureComponent {
         </View>
         <SeparatorComponent />
         <FlatList
-          FooterComponent={FooterComponent}
-          HeaderComponent={HeaderComponent}
-          SeparatorComponent={SeparatorComponent}
+          ItemSeparatorComponent={SeparatorComponent}
+          ListFooterComponent={FooterComponent}
+          ListHeaderComponent={HeaderComponent}
           getItemLayout={this.state.fixedHeight ? this._getItemLayout : undefined}
           data={filteredData}
           key={this.state.numColumns + (this.state.fixedHeight ? 'f' : 'v')}
diff --git a/Libraries/CustomComponents/Lists/FlatList.js b/Libraries/CustomComponents/Lists/FlatList.js
index 951f8f78278a09..10a47cc46974c5 100644
--- a/Libraries/CustomComponents/Lists/FlatList.js
+++ b/Libraries/CustomComponents/Lists/FlatList.js
@@ -67,17 +67,17 @@ type RequiredProps<ItemT> = {
 };
 type OptionalProps<ItemT> = {
   /**
-   * Rendered at the bottom of all the items.
+   * Rendered in between each item, but not at the top or bottom.
    */
-  FooterComponent?: ?ReactClass<any>,
+  ItemSeparatorComponent?: ?ReactClass<any>,
   /**
-   * Rendered at the top of all the items.
+   * Rendered at the bottom of all the items.
    */
-  HeaderComponent?: ?ReactClass<any>,
+  ListFooterComponent?: ?ReactClass<any>,
   /**
-   * Rendered in between each item, but not at the top or bottom.
+   * Rendered at the top of all the items.
    */
-  SeparatorComponent?: ?ReactClass<any>,
+  ListHeaderComponent?: ?ReactClass<any>,
   /**
    * `getItemLayout` is an optional optimizations that let us skip measurement of dynamic content if
    * you know the height of items a priori. `getItemLayout` is the most efficient, and is easy to
@@ -88,7 +88,7 @@ type OptionalProps<ItemT> = {
    *     )}
    *
    * Remember to include separator length (height or width) in your offset calculation if you
-   * specify `SeparatorComponent`.
+   * specify `ItemSeparatorComponent`.
    */
   getItemLayout?: (data: ?Array<ItemT>, index: number) =>
     {length: number, offset: number, index: number},
@@ -132,13 +132,6 @@ type OptionalProps<ItemT> = {
    * Optional custom style for multi-item rows generated when numColumns > 1
    */
   columnWrapperStyle?: StyleObj,
-  /**
-   * Optional optimization to minimize re-rendering items.
-   */
-  shouldItemUpdate: (
-    prevInfo: {item: ItemT, index: number},
-    nextInfo: {item: ItemT, index: number}
-  ) => boolean,
   /**
    * See `ViewabilityHelper` for flow type and further documentation.
    */
diff --git a/Libraries/CustomComponents/Lists/SectionList.js b/Libraries/CustomComponents/Lists/SectionList.js
index 2b6daefe77eb6a..2bc66a65affe54 100644
--- a/Libraries/CustomComponents/Lists/SectionList.js
+++ b/Libraries/CustomComponents/Lists/SectionList.js
@@ -183,16 +183,8 @@ class SectionList<SectionT: SectionBase<any>>
   static defaultProps: DefaultProps = VirtualizedSectionList.defaultProps;
 
   render() {
-    const {ListFooterComponent, ListHeaderComponent, ItemSeparatorComponent} = this.props;
     const List = this.props.legacyImplementation ? MetroListView : VirtualizedSectionList;
-    return (
-      <List
-        {...this.props}
-        FooterComponent={ListFooterComponent}
-        HeaderComponent={ListHeaderComponent}
-        SeparatorComponent={ItemSeparatorComponent}
-      />
-    );
+    return <List {...this.props} />;
   }
 }
 
diff --git a/Libraries/CustomComponents/Lists/VirtualizedList.js b/Libraries/CustomComponents/Lists/VirtualizedList.js
index 206a1f2d8cd3f3..9040fcf1b81763 100644
--- a/Libraries/CustomComponents/Lists/VirtualizedList.js
+++ b/Libraries/CustomComponents/Lists/VirtualizedList.js
@@ -59,9 +59,6 @@ type RequiredProps = {
   data?: any,
 };
 type OptionalProps = {
-  FooterComponent?: ?ReactClass<any>,
-  HeaderComponent?: ?ReactClass<any>,
-  SeparatorComponent?: ?ReactClass<any>,
   /**
    * `debug` will turn on extra logging and visual overlays to aid with debugging both usage and
    * implementation, but with a significant perf hit.
@@ -305,6 +302,7 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
       'Components based on VirtualizedList must be wrapped with Animated.createAnimatedComponent ' +
       'to support native onScroll events with useNativeDriver',
     );
+
     this._updateCellsToRenderBatcher = new Batchinator(
       this._updateCellsToRender,
       this.props.updateCellsBatchingPeriod,
@@ -334,7 +332,7 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
   }
 
   _pushCells(cells, first, last) {
-    const {SeparatorComponent, data, getItem, getItemCount, keyExtractor} = this.props;
+    const {ItemSeparatorComponent, data, getItem, getItemCount, keyExtractor} = this.props;
     const end = getItemCount(data) - 1;
     last = Math.min(end, last);
     for (let ii = first; ii <= last; ii++) {
@@ -352,19 +350,19 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
           parentProps={this.props}
         />
       );
-      if (SeparatorComponent && ii < end) {
-        cells.push(<SeparatorComponent key={'sep' + ii}/>);
+      if (ItemSeparatorComponent && ii < end) {
+        cells.push(<ItemSeparatorComponent key={'sep' + ii}/>);
       }
     }
   }
   render() {
-    const {FooterComponent, HeaderComponent} = this.props;
+    const {ListFooterComponent, ListHeaderComponent} = this.props;
     const {data, disableVirtualization, horizontal} = this.props;
     const cells = [];
-    if (HeaderComponent) {
+    if (ListHeaderComponent) {
       cells.push(
         <View key="$header" onLayout={this._onLayoutHeader}>
-          <HeaderComponent />
+          <ListHeaderComponent />
         </View>
       );
     }
@@ -404,10 +402,10 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
         );
       }
     }
-    if (FooterComponent) {
+    if (ListFooterComponent) {
       cells.push(
         <View key="$footer" onLayout={this._onLayoutFooter}>
-          <FooterComponent />
+          <ListFooterComponent />
         </View>
       );
     }
diff --git a/Libraries/CustomComponents/Lists/VirtualizedSectionList.js b/Libraries/CustomComponents/Lists/VirtualizedSectionList.js
index 84ec2c2c37822e..317891c4d3ebc2 100644
--- a/Libraries/CustomComponents/Lists/VirtualizedSectionList.js
+++ b/Libraries/CustomComponents/Lists/VirtualizedSectionList.js
@@ -84,7 +84,7 @@ type OptionalProps<SectionT: SectionBase> = {
   renderSectionHeader?: ?({section: SectionT}) => ?React.Element<*>,
   /**
    * Rendered at the bottom of every Section, except the very last one, in place of the normal
-   * SeparatorComponent.
+   * ItemSeparatorComponent.
    */
   SectionSeparatorComponent?: ?ReactClass<*>,
   /**

From 67a8d8951d3ffdc49f7a31403b3f08626565707c Mon Sep 17 00:00:00 2001
From: Hector Ramos <hramos@fb.com>
Date: Mon, 13 Mar 2017 10:50:23 -0700
Subject: [PATCH 007/366] React Conf lanches

Reviewed By: ericvicenti, gfosco

Differential Revision: D4679678

fbshipit-source-id: c1088390a44540e8934666e0ffdd43a3e170de32
---
 blog/2017-03-13-better-list-views.md          | 120 ++++++++++++++++++
 ...2017-03-13-idx-the-existential-function.md |  48 +++++++
 ...-13-introducing-create-react-native-app.md |  34 +++++
 3 files changed, 202 insertions(+)
 create mode 100644 blog/2017-03-13-better-list-views.md
 create mode 100644 blog/2017-03-13-idx-the-existential-function.md
 create mode 100644 blog/2017-03-13-introducing-create-react-native-app.md

diff --git a/blog/2017-03-13-better-list-views.md b/blog/2017-03-13-better-list-views.md
new file mode 100644
index 00000000000000..c18e6f29b1cbd7
--- /dev/null
+++ b/blog/2017-03-13-better-list-views.md
@@ -0,0 +1,120 @@
+---
+title: Better List Views in React Native
+author: Spencer Ahrens
+authorTitle: Software Engineer at Facebook
+authorURL: https://github.com/sahrens
+authorImage: https://avatars1.githubusercontent.com/u/1509831
+authorTwitter: sahrens2012
+category: engineering
+---
+
+Many of you have started playing with some of our new List components already after our [teaser announcement in the community group](https://www.facebook.com/groups/react.native.community/permalink/921378591331053), but we are officially announcing them today! No more `ListView`s or `DataSource`s, stale rows, ignored bugs, or excessive memory consumption - with the latest React Native March 2017 release candidate (`0.43-rc.1`) you can pick from the new suite of components what best fits your use-case, with great perf and feature sets out of the box:
+
+### [`<FlatList>`](https://facebook.github.io/react-native/releases/next/docs/flatlist.html) ###
+
+This is the workhorse component for simple, performant lists. Provide an array of data and a `renderItem` function and you're good to go:
+
+```
+<FlatList
+  data={[{title: 'Title Text', key: 'item1'}, ...]}
+  renderItem={({item}) => <ListItem title={item.title}}
+/>
+```
+
+### [`<SectionList>`](https://facebook.github.io/react-native/releases/next/docs/sectionlist.html) ###
+
+If you want to render a set of data broken into logical sections, maybe with section headers (e.g. in an alphabetical address book), and potentially with heterogeneous data and rendering (such as a profile view with some buttons followed by a composer, then a photo grid, then a friend grid, and finally a list of stories), this is the way to go.
+
+```
+<SectionList
+  renderItem={({item}) => <ListItem title={item.title}}
+  renderSectionHeader={({section}) => <H1 title={section.key} />}
+  sections={[ // homogenous rendering between sections
+    {data: [...], key: ...},
+    {data: [...], key: ...},
+    {data: [...], key: ...},
+  ]}
+/>
+
+<SectionList
+  sections={[ // heterogeneous rendering between sections
+    {data: [...], key: ..., renderItem: ...},
+    {data: [...], key: ..., renderItem: ...},
+    {data: [...], key: ..., renderItem: ...},
+  ]}
+/>
+```
+
+### [`<VirtualizedList>`](https://facebook.github.io/react-native/releases/next/docs/virtualizedlist.html) ##
+
+The implementation behind the scenes with a more flexible API. Especially handy if your data is not in a plain array (e.g. an immutable list).
+
+## Features ##
+
+Lists are used in many contexts, so we packed the new components full of features to handle the majority of use cases out of the box:
+
+* Scroll loading (`onEndReached`).
+* Pull to refresh (`onRefresh` / `refreshing`).
+* [Configurable](https://github.com/facebook/react-native/blob/master/Libraries/CustomComponents/Lists/ViewabilityHelper.js) viewability (VPV) callbacks (`onViewableItemsChanged` / `viewabilityConfig`).
+* Horizontal mode (`horizontal`).
+* Intelligent item and section separators.
+* Multi-column support (`numColumns`)
+* `scrollToEnd`, `scrollToIndex`, and `scrollToItem`
+* Better Flow typing.
+
+### Some Caveats ###
+
+- The internal state of item subtrees is not preserved when content scrolls out of the render window. Make sure all your data is captured in the item data or external stores like Flux, Redux, or Relay.
+
+- These components are based on `PureComponent` which means that they will not re-render if `props` remains shallow-equal. Make sure that everything your `renderItem` function depends on directly is passed as a prop that is not `===` after updates, otherwise your UI may not update on changes. This includes the `data` prop and parent component state. For example:
+
+  ```javascript
+  <FlatList
+    data={this.state.data}
+    renderItem={({item}) => <MyItem
+      item={item}
+      onPress={() => this.setState((oldState) => ({
+        selected: { // New instance breaks `===`
+          ...oldState.selected, // copy old data
+          [item.key]: !oldState.selected[item.key], // toggle
+        }}))
+      }
+      selected={
+        !!this.state.selected[item.key] // renderItem depends on state
+      }
+    />}
+    selected={ // Can be any prop that doesn't collide with existing props
+      this.state.selected // A change to selected should re-render FlatList
+    }
+  />
+  ```
+
+- In order to constrain memory and enable smooth scrolling, content is rendered asynchronously offscreen. This means it's possible to scroll faster than the fill rate and momentarily see blank content. This is a tradeoff that can be adjusted to suit the needs of each application, and we are working on improving it behind the scenes.
+
+- By default, these new lists look for a `key` prop on each item and use that for the React key. Alternatively, you can provide a custom `keyExtractor` prop.
+
+## Performance ##
+
+Besides simplifying the API, the new list components also have significant performance enhancements, the main one being nearly constant memory usage for any number of rows. This is done by 'virtualizing' elements that are outside of the render window by completely unmounting them from the component hierarchy and reclaiming the JS memory from the react components, along with the native memory from the shadow tree and the UI views. This has a catch which is that internal component state will not be preserved, so **make sure you track any important state outside of the components themselves, e.g. in Relay or Redux or Flux store.**
+
+Limiting the render window also reduces the amount of work that needs to be done by React and the native platform, e.g from view traversals. Even if you are rendering the last of a million elements, with these new lists there is no need to iterate through all those elements in order to render. You can even jump to the middle with `scrollToIndex` without excessive rendering.
+
+We've also made some improvements with scheduling which should help with application responsiveness. Items at the edge of the render window are rendered infrequently and at a lower priority after any active gestures or animations or other interactions have completed.
+
+## Advanced Usage ##
+
+Unlike `ListView`, all items in the render window are re-rendered any time any props change. Often this is fine because the windowing reduces the number of items to a constant number, but if your items are on the complex side, you should make sure to follow React best practices for performance and use `React.PureComponent` and/or `shouldComponentUpdate` as appropriate within your components to limit re-renders of the recursive subtree.
+
+If you can calculate the height of your rows without rendering them, you can improve the user experience by providing the `getItemLayout` prop. This makes it much smoother to scroll to specific items with e.g. `scrollToIndex`, and will improve the scroll indicator UI because the height of the content can be determined without rendering it.
+
+If you have an alternative data type, like an immutable list, `<VirtualizedList>` is the way to go. It takes a `getItem` prop that lets you return the item data for any given index and has looser flow typing.
+
+There are also a bunch of parameters you can tweak if you have an unusual use case. For example, you can use `windowSize` to trade off memory usage vs. user experience, `maxToRenderPerBatch` to adjust fill rate vs. responsiveness, `onEndReachedThreshold` to control when scroll loading happens, and more.
+
+## Future Work ##
+
+* Migration of existing surfaces (ultimately deprecation of `ListView`).
+* More features as we see/hear the need (let us know!).
+* Sticky section header support.
+* More performance optimizations.
+* Support functional item components with state.
diff --git a/blog/2017-03-13-idx-the-existential-function.md b/blog/2017-03-13-idx-the-existential-function.md
new file mode 100644
index 00000000000000..d10ba1cde0683b
--- /dev/null
+++ b/blog/2017-03-13-idx-the-existential-function.md
@@ -0,0 +1,48 @@
+---
+title: idx: The Existential Function
+author: Timothy Yung
+authorTitle: Engineering Manager at Facebook
+authorURL: https://github.com/yungsters
+authorImage: https://pbs.twimg.com/profile_images/1592444107/image.jpg
+authorTwitter: yungsters
+category: engineering
+---
+
+At Facebook, we often need to access deeply nested values in data structures fetched with GraphQL. On the way to accessing these deeply nested values, it is common for one or more intermediate fields to be nullable. These intermediate fields may be null for a variety of reasons, from failed privacy checks to the mere fact that null happens to be the most flexible way to represent non-fatal errors.
+
+Unfortunately, accessing these deeply nested values is currently tedious and verbose.
+
+```javascript
+props.user &&
+props.user.friends &&
+props.user.friends[0] &&
+props.user.friends[0].friends
+```
+
+There is [an ECMAScript proposal to introduce the existential operator](https://github.com/claudepache/es-optional-chaining) which will make this much more convenient. But until a time when that proposal is finalized, we want a solution that improves our quality of life, maintains existing language semantics, and encourages type safety with Flow.
+
+We came up with an existential _function_ we call `idx`.
+
+```javascript
+idx(props, _ => _.user.friends[0].friends)
+```
+
+The invocation in this code snippet behaves similarly to the boolean expression in the code snippet above, except with significantly less repetition. The `idx` function takes exactly two arguments:
+
+- Any value, typically an object or array into which you want to access a nested value.
+- A function that receives the first argument and accesses a nested value on it.
+
+In theory, the `idx` function will try-catch errors that are the result of accessing properties on null or undefined. If such an error is caught, it will return either null or undefined. (And you can see how this might be implemented in [idx.js](https://github.com/facebookincubator/idx/blob/master/packages/idx/src/idx.js).)
+
+In practice, try-catching every nested property access is slow, and differentiating between specific kinds of TypeErrors is fragile. To deal with these shortcomings, we created a Babel plugin that transforms the above `idx` invocation into the following expression:
+
+```javascript
+props.user == null ? props.user :
+props.user.friends == null ? props.user.friends :
+props.user.friends[0] == null ? props.user.friends[0] :
+props.user.friends[0].friends
+```
+
+Finally, we added a custom Flow type declaration for `idx` that allows the traversal in the second argument to be properly type-checked while permitting nested access on nullable properties.
+
+The function, Babel plugin, and Flow declaration are now [available on GitHub](https://github.com/facebookincubator/idx). They are used by installing the **idx** and **babel-plugin-idx** npm packages, and adding “idx” to the list of plugins in your `.babelrc` file.
diff --git a/blog/2017-03-13-introducing-create-react-native-app.md b/blog/2017-03-13-introducing-create-react-native-app.md
new file mode 100644
index 00000000000000..4ff6714e8d05a6
--- /dev/null
+++ b/blog/2017-03-13-introducing-create-react-native-app.md
@@ -0,0 +1,34 @@
+---
+title: Introducing Create React Native App
+author: Adam Perry
+authorTitle: Software Engineer at Expo
+authorURL: https://github.com/dikaiosune
+authorImage: https://avatars2.githubusercontent.com/u/6812281
+authorTwitter: dika10sune
+category: engineering
+---
+
+Today we’re announcing [Create React Native App](https://github.com/react-community/create-react-native-app): a new tool that makes it significantly easier to get started with a React Native project! It’s heavily inspired by the design of [Create React App](https://github.com/facebookincubator/create-react-app) and is the product of a collaboration between [Facebook](https://code.facebook.com) and [Expo](https://expo.io) (formerly Exponent).
+
+Many developers struggle with installing and configuring React Native’s current native build dependencies, especially for Android. With Create React Native App, there’s no need to use Xcode or Android Studio, and you can develop for your iOS device using Linux or Windows. This is accomplished using the Expo app, which loads and runs CRNA projects written in pure JavaScript without compiling any native code.
+
+Try creating a new project (replace with suitable yarn commands if you have it installed):
+
+```
+$ npm i -g create-react-native-app
+$ create-react-native-app my-project
+$ cd my-project
+$ npm start
+```
+
+This will start the React Native packager and print a QR code. Open it in the [Expo app](https://expo.io) to load your JavaScript. Calls to `console.log` are forwarded to your terminal. You can make use of any standard React Native APIs as well as the [Expo SDK](https://docs.expo.io/versions/latest/sdk/index.html).
+
+## What about native code?
+
+Many React Native projects have Java or Objective-C/Swift dependencies that need to be compiled. The Expo app does include APIs for camera, video, contacts, and more, and bundles popular libraries like [Airbnb’s react-native-maps](https://docs.expo.io/versions/v14.0.0/sdk/map-view.html), or [Facebook authentication](https://docs.expo.io/versions/latest/sdk/facebook.html). However if you need a native code dependency that Expo doesn’t bundle then you’ll probably need to have your own build configuration for it. Just like Create React App, “ejecting” is supported by CRNA.
+
+You can run `npm run eject` to get a project very similar to what `react-native init` would generate. At that point you’ll need Xcode and/or Android Studio just as you would if you started with `react-native init` , adding libraries with `react-native link` will work, and you’ll have full control over the native code compilation process.
+
+## Questions? Feedback?
+
+Create React Native App is now stable enough for general use, which means we’re very eager to hear about your experience using it! You can find me [on Twitter](https://twitter.com/dika10sune) or open an issue on [the GitHub repository](https://github.com/react-community/create-react-native-app). Pull requests are very welcome!

From 2976aa12bcb0ca26c800261f0e5c7e26c97425f0 Mon Sep 17 00:00:00 2001
From: amilcar-andrade <amilcar.andrade.g@gmail.com>
Date: Mon, 13 Mar 2017 12:25:49 -0700
Subject: [PATCH 008/366] Fixes spelling mistake inside
 TouchableNativeFeedback.android.js

Summary:
Thanks for submitting a pull request! Please provide enough information so that others can review your pull request:

> **Unless you are a React Native release maintainer and cherry-picking an *existing* commit into a current release, ensure your pull request is targeting the `master` React Native branch.**

Explain the **motivation** for making this change. What existing problem does the pull request solve?

Prefer **small pull requests**. These are much easier to review and more likely to get merged. Make sure the PR does only one thing, otherwise please split it.

**Test plan (required)**

Demonstrate the code is solid. Example: The exact commands you ran and their output, screenshots / videos if the pull request changes UI.

Make sure tests pass on both Travis and Circle CI.

**Code formatting**

Look around. Match the style of the rest of the codebase. See also the simple [style guide](https://github.com/facebook/react-native/blob/master/CONTRIBUTING.md#style-guide).

For more info, see
Closes https://github.com/facebook/react-native/pull/12901

Differential Revision: D4699296

Pulled By: hramos

fbshipit-source-id: 514ae27c47c8ae22e1aadb99a787daa6fdc3b6a4
---
 .../Components/Touchable/TouchableNativeFeedback.android.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Libraries/Components/Touchable/TouchableNativeFeedback.android.js b/Libraries/Components/Touchable/TouchableNativeFeedback.android.js
index 037a3b85ca8cfd..5707b61e378aaf 100644
--- a/Libraries/Components/Touchable/TouchableNativeFeedback.android.js
+++ b/Libraries/Components/Touchable/TouchableNativeFeedback.android.js
@@ -255,7 +255,7 @@ var TouchableNativeFeedback = React.createClass({
 
     // We need to clone the actual element so that the ripple background drawable
     // can be applied directly to the background of this element rather than to
-    // a wrapper view as done in outher Touchable*
+    // a wrapper view as done in other Touchable*
     return React.cloneElement(
       child,
       childProps

From 98798a06aebe87fdde7643143a9e5acd7f8c99ae Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Mon, 13 Mar 2017 13:19:55 -0700
Subject: [PATCH 009/366] More accurate implementation of `RCTRootView`'s
 `sizeThatFits:`

Reviewed By: mmmulani

Differential Revision: D4672788

fbshipit-source-id: 780487f2264916349e32785808a93ed6f957e471
---
 React/Base/RCTRootView.m | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/React/Base/RCTRootView.m b/React/Base/RCTRootView.m
index 839640a8fbe482..db1ed02343c415 100644
--- a/React/Base/RCTRootView.m
+++ b/React/Base/RCTRootView.m
@@ -153,10 +153,22 @@ - (void)setPassThroughTouches:(BOOL)passThroughTouches
 
 - (CGSize)sizeThatFits:(CGSize)size
 {
-  return CGSizeMake(
-    _sizeFlexibility & RCTRootViewSizeFlexibilityWidth ? MIN(_intrinsicContentSize.width, size.width) : size.width,
-    _sizeFlexibility & RCTRootViewSizeFlexibilityHeight ? MIN(_intrinsicContentSize.height, size.height) : size.height
-  );
+  CGSize fitSize = _intrinsicContentSize;
+  CGSize currentSize = self.bounds.size;
+
+  // Following the current `size` and current `sizeFlexibility` policy.
+  fitSize = CGSizeMake(
+      _sizeFlexibility & RCTRootViewSizeFlexibilityWidth ? fitSize.width : currentSize.width,
+      _sizeFlexibility & RCTRootViewSizeFlexibilityHeight ? fitSize.height : currentSize.height
+    );
+
+  // Following the given size constraints.
+  fitSize = CGSizeMake(
+      MIN(size.width, fitSize.width),
+      MIN(size.height, fitSize.height)
+    );
+
+  return fitSize;
 }
 
 - (void)layoutSubviews

From 103fa3d818cab67a73de55a64bb19381db397098 Mon Sep 17 00:00:00 2001
From: Martin Konicek <mkonicek@fb.com>
Date: Mon, 13 Mar 2017 13:24:48 -0700
Subject: [PATCH 010/366] Skip flaky ScrollView tests

Summary: Closes https://github.com/facebook/react-native/pull/12868

Differential Revision: D4699900

Pulled By: hramos

fbshipit-source-id: b531f2359734177df1868b453dd1d882e693caa3
---
 scripts/run-android-ci-instrumentation-tests.js | 8 ++++++++
 scripts/run-android-local-integration-tests.sh  | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/scripts/run-android-ci-instrumentation-tests.js b/scripts/run-android-ci-instrumentation-tests.js
index 329d46070fa12b..4d60bf7591fbfc 100644
--- a/scripts/run-android-ci-instrumentation-tests.js
+++ b/scripts/run-android-ci-instrumentation-tests.js
@@ -28,11 +28,19 @@ const numberOfRetries = argv.retries || 1;
 const tryExecNTimes = require('./try-n-times');
 const path = require('path');
 
+// Flaky tests ignored on Circle CI. They still run internally at fb.
+const ignoredTests = [
+  'ReactScrollViewTestCase',
+  'ReactHorizontalScrollViewTestCase'
+];
+
 // ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactHorizontalScrollViewTestCase.java
 const testClasses = ls(`${argv.path}/*.java`)
 .map(javaFile => {
   // ReactHorizontalScrollViewTestCase
   return path.basename(javaFile, '.java');
+}).filter(className => {
+  return ignoredTests.indexOf(className) === -1;
 }).map(className => {
   // com.facebook.react.tests.ReactHorizontalScrollViewTestCase
   return argv.package + '.' + className;
diff --git a/scripts/run-android-local-integration-tests.sh b/scripts/run-android-local-integration-tests.sh
index 4d454a1c732803..a85d02be37cfa2 100755
--- a/scripts/run-android-local-integration-tests.sh
+++ b/scripts/run-android-local-integration-tests.sh
@@ -20,4 +20,5 @@ buck fetch ReactAndroid/src/androidTest/buck-runner:instrumentation-tests
 buck install ReactAndroid/src/androidTest/buck-runner:instrumentation-tests
 
 echo "Running integration tests..."
-adb shell am instrument -w com.facebook.react.tests/android.support.test.runner.AndroidJUnitRunner
+# Use the JS script that runs all tests in a loop and is easy to tweak
+node ./scripts/run-android-ci-instrumentation-tests.js --path ./ReactAndroid/src/androidTest/java/com/facebook/react/tests --package com.facebook.react.tests

From fa30f414032a74a2009c7a162e1ab9b49f90fe34 Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Mon, 13 Mar 2017 13:31:35 -0700
Subject: [PATCH 011/366] Better TextInput: RCTTextView and RCTTextField was
 marked as Yoga leaf nodes

Reviewed By: mmmulani

Differential Revision: D4639060

fbshipit-source-id: d4580303a61a7f86cf8bb6ec016fd9834340ffe0
---
 Libraries/Text/RCTShadowTextField.h           | 14 ++++++++++
 Libraries/Text/RCTShadowTextField.m           | 19 ++++++++++++++
 Libraries/Text/RCTShadowTextView.h            | 14 ++++++++++
 Libraries/Text/RCTShadowTextView.m            | 19 ++++++++++++++
 .../Text/RCTText.xcodeproj/project.pbxproj    | 26 +++++++++++++++----
 Libraries/Text/RCTTextFieldManager.m          |  6 +++++
 Libraries/Text/RCTTextViewManager.m           |  6 +++++
 7 files changed, 99 insertions(+), 5 deletions(-)
 create mode 100644 Libraries/Text/RCTShadowTextField.h
 create mode 100644 Libraries/Text/RCTShadowTextField.m
 create mode 100644 Libraries/Text/RCTShadowTextView.h
 create mode 100644 Libraries/Text/RCTShadowTextView.m

diff --git a/Libraries/Text/RCTShadowTextField.h b/Libraries/Text/RCTShadowTextField.h
new file mode 100644
index 00000000000000..543f7fb349a0ef
--- /dev/null
+++ b/Libraries/Text/RCTShadowTextField.h
@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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.
+ */
+
+#import <React/RCTShadowView.h>
+
+@interface RCTShadowTextField : RCTShadowView
+
+@end
diff --git a/Libraries/Text/RCTShadowTextField.m b/Libraries/Text/RCTShadowTextField.m
new file mode 100644
index 00000000000000..3bc5929dc49c37
--- /dev/null
+++ b/Libraries/Text/RCTShadowTextField.m
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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.
+ */
+
+#import "RCTShadowTextField.h"
+
+@implementation RCTShadowTextField
+
+- (BOOL)isYogaLeafNode
+{
+  return YES;
+}
+
+@end
diff --git a/Libraries/Text/RCTShadowTextView.h b/Libraries/Text/RCTShadowTextView.h
new file mode 100644
index 00000000000000..e2c6f1e7ed45db
--- /dev/null
+++ b/Libraries/Text/RCTShadowTextView.h
@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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.
+ */
+
+#import <React/RCTShadowView.h>
+
+@interface RCTShadowTextView : RCTShadowView
+
+@end
diff --git a/Libraries/Text/RCTShadowTextView.m b/Libraries/Text/RCTShadowTextView.m
new file mode 100644
index 00000000000000..d3e3602edc4073
--- /dev/null
+++ b/Libraries/Text/RCTShadowTextView.m
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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.
+ */
+
+#import "RCTShadowTextView.h"
+
+@implementation RCTShadowTextView
+
+- (BOOL)isYogaLeafNode
+{
+  return YES;
+}
+
+@end
diff --git a/Libraries/Text/RCTText.xcodeproj/project.pbxproj b/Libraries/Text/RCTText.xcodeproj/project.pbxproj
index 8e7ee1f1a20598..e2cfafd68291b7 100644
--- a/Libraries/Text/RCTText.xcodeproj/project.pbxproj
+++ b/Libraries/Text/RCTText.xcodeproj/project.pbxproj
@@ -27,6 +27,10 @@
 		58B511D01A9E6C5C00147676 /* RCTShadowText.m in Sources */ = {isa = PBXBuildFile; fileRef = 58B511CB1A9E6C5C00147676 /* RCTShadowText.m */; };
 		58B511D11A9E6C5C00147676 /* RCTTextManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 58B511CD1A9E6C5C00147676 /* RCTTextManager.m */; };
 		58B512161A9E6EFF00147676 /* RCTText.m in Sources */ = {isa = PBXBuildFile; fileRef = 58B512141A9E6EFF00147676 /* RCTText.m */; };
+		59F60E911E661BDD0081153B /* RCTShadowTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 59F60E8E1E661BDD0081153B /* RCTShadowTextField.m */; };
+		59F60E921E661BDD0081153B /* RCTShadowTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 59F60E8E1E661BDD0081153B /* RCTShadowTextField.m */; };
+		59F60E931E661BDD0081153B /* RCTShadowTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59F60E901E661BDD0081153B /* RCTShadowTextView.m */; };
+		59F60E941E661BDD0081153B /* RCTShadowTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59F60E901E661BDD0081153B /* RCTShadowTextView.m */; };
 		AF3225F91DE5574F00D3E7E7 /* RCTConvert+Text.m in Sources */ = {isa = PBXBuildFile; fileRef = AF3225F81DE5574F00D3E7E7 /* RCTConvert+Text.m */; };
 		AF3225FA1DE5574F00D3E7E7 /* RCTConvert+Text.m in Sources */ = {isa = PBXBuildFile; fileRef = AF3225F81DE5574F00D3E7E7 /* RCTConvert+Text.m */; };
 /* End PBXBuildFile section */
@@ -54,6 +58,10 @@
 		58B511CD1A9E6C5C00147676 /* RCTTextManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTextManager.m; sourceTree = "<group>"; };
 		58B512141A9E6EFF00147676 /* RCTText.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTText.m; sourceTree = "<group>"; };
 		58B512151A9E6EFF00147676 /* RCTText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTText.h; sourceTree = "<group>"; };
+		59F60E8D1E661BDD0081153B /* RCTShadowTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTShadowTextField.h; sourceTree = "<group>"; };
+		59F60E8E1E661BDD0081153B /* RCTShadowTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTShadowTextField.m; sourceTree = "<group>"; };
+		59F60E8F1E661BDD0081153B /* RCTShadowTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTShadowTextView.h; sourceTree = "<group>"; };
+		59F60E901E661BDD0081153B /* RCTShadowTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTShadowTextView.m; sourceTree = "<group>"; };
 		AF3225F71DE5574F00D3E7E7 /* RCTConvert+Text.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "RCTConvert+Text.h"; sourceTree = "<group>"; };
 		AF3225F81DE5574F00D3E7E7 /* RCTConvert+Text.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "RCTConvert+Text.m"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -62,29 +70,33 @@
 		58B511921A9E6C1200147676 = {
 			isa = PBXGroup;
 			children = (
+				58B5119C1A9E6C1200147676 /* Products */,
 				AF3225F71DE5574F00D3E7E7 /* RCTConvert+Text.h */,
 				AF3225F81DE5574F00D3E7E7 /* RCTConvert+Text.m */,
-				19FC5C861D41A4220090108F /* RCTTextSelection.h */,
-				19FC5C841D41A4120090108F /* RCTTextSelection.m */,
 				58B511C61A9E6C5C00147676 /* RCTRawTextManager.h */,
 				58B511C71A9E6C5C00147676 /* RCTRawTextManager.m */,
 				58B511C81A9E6C5C00147676 /* RCTShadowRawText.h */,
 				58B511C91A9E6C5C00147676 /* RCTShadowRawText.m */,
 				58B511CA1A9E6C5C00147676 /* RCTShadowText.h */,
 				58B511CB1A9E6C5C00147676 /* RCTShadowText.m */,
+				59F60E8D1E661BDD0081153B /* RCTShadowTextField.h */,
+				59F60E8E1E661BDD0081153B /* RCTShadowTextField.m */,
+				59F60E8F1E661BDD0081153B /* RCTShadowTextView.h */,
+				59F60E901E661BDD0081153B /* RCTShadowTextView.m */,
 				58B512151A9E6EFF00147676 /* RCTText.h */,
 				58B512141A9E6EFF00147676 /* RCTText.m */,
-				58B511CC1A9E6C5C00147676 /* RCTTextManager.h */,
-				58B511CD1A9E6C5C00147676 /* RCTTextManager.m */,
 				1362F0FC1B4D51F400E06D8C /* RCTTextField.h */,
 				1362F0FD1B4D51F400E06D8C /* RCTTextField.m */,
 				1362F0FE1B4D51F400E06D8C /* RCTTextFieldManager.h */,
 				1362F0FF1B4D51F400E06D8C /* RCTTextFieldManager.m */,
+				58B511CC1A9E6C5C00147676 /* RCTTextManager.h */,
+				58B511CD1A9E6C5C00147676 /* RCTTextManager.m */,
+				19FC5C861D41A4220090108F /* RCTTextSelection.h */,
+				19FC5C841D41A4120090108F /* RCTTextSelection.m */,
 				131B6ABC1AF0CD0600FFC3E0 /* RCTTextView.h */,
 				131B6ABD1AF0CD0600FFC3E0 /* RCTTextView.m */,
 				131B6ABE1AF0CD0600FFC3E0 /* RCTTextViewManager.h */,
 				131B6ABF1AF0CD0600FFC3E0 /* RCTTextViewManager.m */,
-				58B5119C1A9E6C1200147676 /* Products */,
 			);
 			indentWidth = 2;
 			sourceTree = "<group>";
@@ -180,8 +192,10 @@
 				2D3B5F3B1D9B106F00451313 /* RCTTextView.m in Sources */,
 				2D3B5F3A1D9B106F00451313 /* RCTTextFieldManager.m in Sources */,
 				2D3B5F341D9B103100451313 /* RCTRawTextManager.m in Sources */,
+				59F60E921E661BDD0081153B /* RCTShadowTextField.m in Sources */,
 				AF3225FA1DE5574F00D3E7E7 /* RCTConvert+Text.m in Sources */,
 				2D3B5F3C1D9B106F00451313 /* RCTTextViewManager.m in Sources */,
+				59F60E941E661BDD0081153B /* RCTShadowTextView.m in Sources */,
 				2D3B5F331D9B102D00451313 /* RCTTextSelection.m in Sources */,
 				2D3B5F351D9B103300451313 /* RCTShadowRawText.m in Sources */,
 			);
@@ -198,8 +212,10 @@
 				1362F1001B4D51F400E06D8C /* RCTTextField.m in Sources */,
 				58B512161A9E6EFF00147676 /* RCTText.m in Sources */,
 				1362F1011B4D51F400E06D8C /* RCTTextFieldManager.m in Sources */,
+				59F60E911E661BDD0081153B /* RCTShadowTextField.m in Sources */,
 				AF3225F91DE5574F00D3E7E7 /* RCTConvert+Text.m in Sources */,
 				131B6AC11AF0CD0600FFC3E0 /* RCTTextViewManager.m in Sources */,
+				59F60E931E661BDD0081153B /* RCTShadowTextView.m in Sources */,
 				58B511CF1A9E6C5C00147676 /* RCTShadowRawText.m in Sources */,
 				58B511D01A9E6C5C00147676 /* RCTShadowText.m in Sources */,
 			);
diff --git a/Libraries/Text/RCTTextFieldManager.m b/Libraries/Text/RCTTextFieldManager.m
index 72e205ae417322..27287c32afc262 100644
--- a/Libraries/Text/RCTTextFieldManager.m
+++ b/Libraries/Text/RCTTextFieldManager.m
@@ -14,6 +14,7 @@
 #import <React/RCTShadowView.h>
 
 #import "RCTConvert+Text.h"
+#import "RCTShadowTextField.h"
 #import "RCTTextField.h"
 
 
@@ -21,6 +22,11 @@ @implementation RCTTextFieldManager
 
 RCT_EXPORT_MODULE()
 
+- (RCTShadowView *)shadowView
+{
+  return [RCTShadowTextField new];
+}
+
 - (UIView *)view
 {
   return [[RCTTextField alloc] initWithEventDispatcher:self.bridge.eventDispatcher];
diff --git a/Libraries/Text/RCTTextViewManager.m b/Libraries/Text/RCTTextViewManager.m
index c599526b9f968c..7b7f5d0473d422 100644
--- a/Libraries/Text/RCTTextViewManager.m
+++ b/Libraries/Text/RCTTextViewManager.m
@@ -15,12 +15,18 @@
 #import <React/RCTShadowView.h>
 
 #import "RCTConvert+Text.h"
+#import "RCTShadowTextView.h"
 #import "RCTTextView.h"
 
 @implementation RCTTextViewManager
 
 RCT_EXPORT_MODULE()
 
+- (RCTShadowView *)shadowView
+{
+  return [RCTShadowTextView new];
+}
+
 - (UIView *)view
 {
   return [[RCTTextView alloc] initWithEventDispatcher:self.bridge.eventDispatcher];

From 22e03a09b12c1f32e5fd57fd2047314cf655065c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <hramos@users.noreply.github.com>
Date: Mon, 13 Mar 2017 16:25:38 -0700
Subject: [PATCH 012/366] Fix example code

Summary: Closes https://github.com/facebook/react-native/pull/12908

Differential Revision: D4701705

Pulled By: hramos

fbshipit-source-id: 9ac33e57e0df73b4b8a0d1a05a4254e7482e2ef6
---
 blog/2017-03-13-better-list-views.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blog/2017-03-13-better-list-views.md b/blog/2017-03-13-better-list-views.md
index c18e6f29b1cbd7..3d7b7574501ac3 100644
--- a/blog/2017-03-13-better-list-views.md
+++ b/blog/2017-03-13-better-list-views.md
@@ -17,7 +17,7 @@ This is the workhorse component for simple, performant lists. Provide an array o
 ```
 <FlatList
   data={[{title: 'Title Text', key: 'item1'}, ...]}
-  renderItem={({item}) => <ListItem title={item.title}}
+  renderItem={({item}) => <ListItem title={item.title} />}
 />
 ```
 

From 8a7eb170dd4ce42023eb8c20f65fb60145880524 Mon Sep 17 00:00:00 2001
From: Edwin <edwin@sussol.net>
Date: Mon, 13 Mar 2017 23:49:47 -0700
Subject: [PATCH 013/366] Adds Animated.loop to Animated API

Summary:
* Any animation can be looped on the javascript thread
* Only basic animations supported natively at this stage, loops run
using the native driver cannot contain animations of type sequence,
parallel, stagger, or loop

Motivation: We need a spinner in our app that is displayed and animated while the javascript thread is tied up with other tasks. This means it needs to be offloaded from the javascript thread, so that it will continue to run while those tasks are churning away.

I originally submitted PR #9513, which has served our needs, but brentvatne pointed out a better way to do it. Had hoped his suggestion would be implemented by janicduplessis or another fb employee, but after 5 months I thought I'd give it another push.

I've put together an implementation that basically matches the suggested API. Let me know what you think, and whether others can pick it up from here and get it in to core.

Personal Motivation: I am leaving my current organisation on Feb 10th, so am trying to clean thing
Closes https://github.com/facebook/react-native/pull/11973

Differential Revision: D4704381

fbshipit-source-id: 42a2cdf5d53a7c0d08f86a58485f7f38739e6cd9
---
 .../Animated/src/AnimatedImplementation.js    | 222 ++++++++++++++++--
 .../Animated/src/__tests__/Animated-test.js   | 177 ++++++++++++++
 .../react/animated/DecayAnimation.java        |  26 +-
 .../animated/FrameBasedAnimationDriver.java   |  13 +-
 .../react/animated/SpringAnimation.java       |  20 +-
 .../NativeAnimatedNodeTraversalTest.java      | 175 ++++++++++++++
 6 files changed, 603 insertions(+), 30 deletions(-)

diff --git a/Libraries/Animated/src/AnimatedImplementation.js b/Libraries/Animated/src/AnimatedImplementation.js
index e0860eced71cac..1c06b9a6e4ab13 100644
--- a/Libraries/Animated/src/AnimatedImplementation.js
+++ b/Libraries/Animated/src/AnimatedImplementation.js
@@ -97,6 +97,7 @@ type AnimationConfig = {
   isInteraction?: bool,
   useNativeDriver?: bool,
   onComplete?: ?EndCallback,
+  iterations?: number,
 };
 
 // Important note: start() and stop() will only be called at most once.
@@ -107,6 +108,7 @@ class Animation {
   __isInteraction: bool;
   __nativeId: number;
   __onEnd: ?EndCallback;
+  __iterations: number;
   start(
     fromValue: number,
     onUpdate: (value: number) => void,
@@ -228,7 +230,7 @@ function _flush(rootNode: AnimatedValue): void {
   animatedStyles.forEach(animatedStyle => animatedStyle.update());
 }
 
-type TimingAnimationConfig =  AnimationConfig & {
+type TimingAnimationConfig = AnimationConfig & {
   toValue: number | AnimatedValue | {x: number, y: number} | AnimatedValueXY,
   easing?: (value: number) => number,
   duration?: number,
@@ -271,6 +273,7 @@ class TimingAnimation extends Animation {
     this._easing = config.easing !== undefined ? config.easing : easeInOut();
     this._duration = config.duration !== undefined ? config.duration : 500;
     this._delay = config.delay !== undefined ? config.delay : 0;
+    this.__iterations = config.iterations !== undefined ? config.iterations : 1;
     this.__isInteraction = config.isInteraction !== undefined ? config.isInteraction : true;
     this._useNativeDriver = shouldUseNativeDriver(config);
   }
@@ -286,7 +289,8 @@ class TimingAnimation extends Animation {
       type: 'frames',
       frames,
       toValue: this._toValue,
-      delay: this._delay
+      delay: this._delay,
+      iterations: this.__iterations,
     };
   }
 
@@ -386,6 +390,7 @@ class DecayAnimation extends Animation {
     this._velocity = config.velocity;
     this._useNativeDriver = shouldUseNativeDriver(config);
     this.__isInteraction = config.isInteraction !== undefined ? config.isInteraction : true;
+    this.__iterations = config.iterations !== undefined ? config.iterations : 1;
   }
 
   __getNativeAnimationConfig() {
@@ -393,6 +398,7 @@ class DecayAnimation extends Animation {
       type: 'decay',
       deceleration: this._deceleration,
       velocity: this._velocity,
+      iterations: this.__iterations,
     };
   }
 
@@ -505,6 +511,7 @@ class SpringAnimation extends Animation {
     this._toValue = config.toValue;
     this._useNativeDriver = shouldUseNativeDriver(config);
     this.__isInteraction = config.isInteraction !== undefined ? config.isInteraction : true;
+    this.__iterations = config.iterations !== undefined ? config.iterations : 1;
 
     var springConfig;
     if (config.bounciness !== undefined || config.speed !== undefined) {
@@ -536,6 +543,7 @@ class SpringAnimation extends Animation {
       friction: this._friction,
       initialVelocity: withDefault(this._initialVelocity, this._lastVelocity),
       toValue: this._toValue,
+      iterations: this.__iterations,
     };
   }
 
@@ -695,6 +703,7 @@ var _uniqueId = 1;
  */
 class AnimatedValue extends AnimatedWithChildren {
   _value: number;
+  _startingValue: number;
   _offset: number;
   _animation: ?Animation;
   _tracking: ?Animated;
@@ -703,7 +712,7 @@ class AnimatedValue extends AnimatedWithChildren {
 
   constructor(value: number) {
     super();
-    this._value = value;
+    this._startingValue = this._value = value;
     this._offset = 0;
     this._animation = null;
     this._listeners = {};
@@ -846,6 +855,14 @@ class AnimatedValue extends AnimatedWithChildren {
     callback && callback(this.__getValue());
   }
 
+  /**
+  * Stops any animation and resets the value to its original
+  */
+  resetAnimation(callback?: ?(value: number) => void): void {
+    this.stopAnimation(callback);
+    this._value = this._startingValue;
+  }
+
   /**
    * Interpolates the value before updating the property, e.g. mapping 0-1 to
    * 0-10.
@@ -1013,6 +1030,12 @@ class AnimatedValueXY extends AnimatedWithChildren {
     };
   }
 
+  resetAnimation(callback?: (value: {x: number, y: number}) => void): void {
+    this.x.resetAnimation();
+    this.y.resetAnimation();
+    callback && callback(this.__getValue());
+  }
+
   stopAnimation(callback?: (value: {x: number, y: number}) => void): void {
     this.x.stopAnimation();
     this.y.stopAnimation();
@@ -1888,6 +1911,9 @@ class AnimatedTracking extends Animated {
 type CompositeAnimation = {
   start: (callback?: ?EndCallback) => void,
   stop: () => void,
+  reset: () => void,
+  _startNativeLoop: (iterations?: number) => void,
+  _isUsingNativeDriver: () => boolean,
 };
 
 var add = function(
@@ -1965,16 +1991,18 @@ var spring = function(
   value: AnimatedValue | AnimatedValueXY,
   config: SpringAnimationConfig,
 ): CompositeAnimation {
-  return maybeVectorAnim(value, config, spring) || {
-    start: function(callback?: ?EndCallback): void {
-      callback = _combineCallbacks(callback, config);
-      var singleValue: any = value;
-      var singleConfig: any = config;
+  var start = function(
+    animatedValue: AnimatedValue | AnimatedValueXY,
+    configuration: SpringAnimationConfig,
+    callback?: ?EndCallback): void {
+      callback = _combineCallbacks(callback, configuration);
+      var singleValue: any = animatedValue;
+      var singleConfig: any = configuration;
       singleValue.stopTracking();
-      if (config.toValue instanceof Animated) {
+      if (configuration.toValue instanceof Animated) {
         singleValue.track(new AnimatedTracking(
           singleValue,
-          config.toValue,
+          configuration.toValue,
           SpringAnimation,
           singleConfig,
           callback
@@ -1982,11 +2010,28 @@ var spring = function(
       } else {
         singleValue.animate(new SpringAnimation(singleConfig), callback);
       }
+  };
+  return maybeVectorAnim(value, config, spring) || {
+    start: function(callback?: ?EndCallback): void {
+      start(value, config, callback);
     },
 
     stop: function(): void {
       value.stopAnimation();
     },
+
+    reset: function(): void {
+      value.resetAnimation();
+    },
+
+    _startNativeLoop: function(iterations?: number): void {
+      var singleConfig = { ...config, iterations };
+      start(value, singleConfig);
+    },
+
+    _isUsingNativeDriver: function(): boolean {
+      return config.useNativeDriver || false;
+    }
   };
 };
 
@@ -1994,16 +2039,18 @@ var timing = function(
   value: AnimatedValue | AnimatedValueXY,
   config: TimingAnimationConfig,
 ): CompositeAnimation {
-  return maybeVectorAnim(value, config, timing) || {
-    start: function(callback?: ?EndCallback): void {
-      callback = _combineCallbacks(callback, config);
-      var singleValue: any = value;
-      var singleConfig: any = config;
+  var start = function(
+    animatedValue: AnimatedValue | AnimatedValueXY,
+    configuration: TimingAnimationConfig,
+    callback?: ?EndCallback): void {
+      callback = _combineCallbacks(callback, configuration);
+      var singleValue: any = animatedValue;
+      var singleConfig: any = configuration;
       singleValue.stopTracking();
-      if (config.toValue instanceof Animated) {
+      if (configuration.toValue instanceof Animated) {
         singleValue.track(new AnimatedTracking(
           singleValue,
-          config.toValue,
+          configuration.toValue,
           TimingAnimation,
           singleConfig,
           callback
@@ -2011,11 +2058,29 @@ var timing = function(
       } else {
         singleValue.animate(new TimingAnimation(singleConfig), callback);
       }
+  };
+
+  return maybeVectorAnim(value, config, timing) || {
+    start: function(callback?: ?EndCallback): void {
+      start(value, config, callback);
     },
 
     stop: function(): void {
       value.stopAnimation();
     },
+
+    reset: function(): void {
+      value.resetAnimation();
+    },
+
+    _startNativeLoop: function(iterations?: number): void {
+      var singleConfig = { ...config, iterations };
+      start(value, singleConfig);
+    },
+
+    _isUsingNativeDriver: function(): boolean {
+      return config.useNativeDriver || false;
+    }
   };
 };
 
@@ -2023,18 +2088,38 @@ var decay = function(
   value: AnimatedValue | AnimatedValueXY,
   config: DecayAnimationConfig,
 ): CompositeAnimation {
-  return maybeVectorAnim(value, config, decay) || {
-    start: function(callback?: ?EndCallback): void {
-      callback = _combineCallbacks(callback, config);
-      var singleValue: any = value;
-      var singleConfig: any = config;
+  var start = function(
+    animatedValue: AnimatedValue | AnimatedValueXY,
+    configuration: DecayAnimationConfig,
+    callback?: ?EndCallback): void {
+      callback = _combineCallbacks(callback, configuration);
+      var singleValue: any = animatedValue;
+      var singleConfig: any = configuration;
       singleValue.stopTracking();
       singleValue.animate(new DecayAnimation(singleConfig), callback);
+  };
+
+  return maybeVectorAnim(value, config, decay) || {
+    start: function(callback?: ?EndCallback): void {
+      start(value, config, callback);
     },
 
     stop: function(): void {
       value.stopAnimation();
     },
+
+    reset: function(): void {
+      value.resetAnimation();
+    },
+
+    _startNativeLoop: function(iterations?: number): void {
+      var singleConfig = { ...config, iterations };
+      start(value, singleConfig);
+    },
+
+    _isUsingNativeDriver: function(): boolean {
+      return config.useNativeDriver || false;
+    }
   };
 };
 
@@ -2071,6 +2156,23 @@ var sequence = function(
       if (current < animations.length) {
         animations[current].stop();
       }
+    },
+
+    reset: function() {
+      animations.forEach((animation, idx) => {
+        if (idx <= current) {
+          animation.reset();
+        }
+      });
+      current = 0;
+    },
+
+    _startNativeLoop: function() {
+      throw new Error('Loops run using the native driver cannot contain Animated.sequence animations');
+    },
+
+    _isUsingNativeDriver: function(): boolean {
+      return false;
     }
   };
 };
@@ -2122,6 +2224,22 @@ var parallel = function(
         !hasEnded[idx] && animation.stop();
         hasEnded[idx] = true;
       });
+    },
+
+    reset: function(): void {
+      animations.forEach((animation, idx) => {
+        animation.reset();
+        hasEnded[idx] = false;
+        doneCount = 0;
+      });
+    },
+
+    _startNativeLoop: function() {
+      throw new Error('Loops run using the native driver cannot contain Animated.parallel animations');
+    },
+
+    _isUsingNativeDriver: function(): boolean {
+      return false;
     }
   };
 
@@ -2145,6 +2263,59 @@ var stagger = function(
   }));
 };
 
+type LoopAnimationConfig = { iterations: number };
+
+var loop = function(
+  animation: CompositeAnimation,
+  { iterations = -1 }: LoopAnimationConfig = {},
+): CompositeAnimation {
+  var isFinished = false;
+  var iterationsSoFar = 0;
+  return {
+    start: function(callback?: ?EndCallback) {
+      var restart = function(result: EndResult = {finished: true}): void {
+        if (isFinished ||
+            (iterationsSoFar === iterations) ||
+            (result.finished === false)) {
+          callback && callback(result);
+        } else {
+          iterationsSoFar++;
+          animation.reset();
+          animation.start(restart);
+        }
+      };
+      if (!animation || iterations === 0) {
+        callback && callback({finished: true});
+      } else {
+        if (animation._isUsingNativeDriver()) {
+          animation._startNativeLoop(iterations);
+        } else {
+          restart(); // Start looping recursively on the js thread
+        }
+      }
+    },
+
+    stop: function(): void {
+      isFinished = true;
+      animation.stop();
+    },
+
+    reset: function(): void {
+      iterationsSoFar = 0;
+      isFinished = false;
+      animation.reset();
+    },
+
+    _startNativeLoop: function() {
+      throw new Error('Loops run using the native driver cannot contain Animated.loop animations');
+    },
+
+    _isUsingNativeDriver: function(): boolean {
+      return animation._isUsingNativeDriver();
+    }
+  };
+};
+
 type Mapping = {[key: string]: Mapping} | AnimatedValue;
 type EventConfig = {
   listener?: ?Function,
@@ -2606,6 +2777,13 @@ module.exports = {
    * sequence with successive delays.  Nice for doing trailing effects.
    */
   stagger,
+  /**
+  * Loops a given animation continuously, so that each time it reaches the
+  * end, it resets and begins again from the start. Can specify number of
+  * times to loop using the key 'iterations' in the config. Will loop without
+  * blocking the UI thread if the child animation is set to 'useNativeDriver'.
+  */
+  loop,
 
   /**
    * Takes an array of mappings and extracts values from each arg accordingly,
diff --git a/Libraries/Animated/src/__tests__/Animated-test.js b/Libraries/Animated/src/__tests__/Animated-test.js
index fc313a8af0582b..c89d2979995a21 100644
--- a/Libraries/Animated/src/__tests__/Animated-test.js
+++ b/Libraries/Animated/src/__tests__/Animated-test.js
@@ -214,6 +214,183 @@ describe('Animated tests', () => {
     });
   });
 
+  describe('Animated Loop', () => {
+
+    it('loops indefinitely if config not specified', () => {
+      var animation = {start: jest.fn(), reset: jest.fn(), _isUsingNativeDriver: () => false};
+      var cb = jest.fn();
+
+      var loop = Animated.loop(animation);
+
+      expect(animation.start).not.toBeCalled();
+
+      loop.start(cb);
+
+      expect(animation.start).toBeCalled();
+      expect(animation.reset).toHaveBeenCalledTimes(1);
+      expect(cb).not.toBeCalled();
+
+      animation.start.mock.calls[0][0]({finished: true}); // End of loop 1
+      expect(animation.reset).toHaveBeenCalledTimes(2);
+      expect(cb).not.toBeCalled();
+
+      animation.start.mock.calls[0][0]({finished: true}); // End of loop 2
+      expect(animation.reset).toHaveBeenCalledTimes(3);
+      expect(cb).not.toBeCalled();
+
+      animation.start.mock.calls[0][0]({finished: true}); // End of loop 3
+      expect(animation.reset).toHaveBeenCalledTimes(4);
+      expect(cb).not.toBeCalled();
+    });
+
+    it('loops indefinitely if iterations is -1', () => {
+      var animation = {start: jest.fn(), reset: jest.fn(), _isUsingNativeDriver: () => false};
+      var cb = jest.fn();
+
+      var loop = Animated.loop(animation, { iterations: -1 });
+
+      expect(animation.start).not.toBeCalled();
+
+      loop.start(cb);
+
+      expect(animation.start).toBeCalled();
+      expect(animation.reset).toHaveBeenCalledTimes(1);
+      expect(cb).not.toBeCalled();
+
+      animation.start.mock.calls[0][0]({finished: true}); // End of loop 1
+      expect(animation.reset).toHaveBeenCalledTimes(2);
+      expect(cb).not.toBeCalled();
+
+      animation.start.mock.calls[0][0]({finished: true}); // End of loop 2
+      expect(animation.reset).toHaveBeenCalledTimes(3);
+      expect(cb).not.toBeCalled();
+
+      animation.start.mock.calls[0][0]({finished: true}); // End of loop 3
+      expect(animation.reset).toHaveBeenCalledTimes(4);
+      expect(cb).not.toBeCalled();
+    });
+
+    it('loops indefinitely if iterations not specified', () => {
+      var animation = {start: jest.fn(), reset: jest.fn(), _isUsingNativeDriver: () => false};
+      var cb = jest.fn();
+
+      var loop = Animated.loop(animation, { anotherKey: 'value' });
+
+      expect(animation.start).not.toBeCalled();
+
+      loop.start(cb);
+
+      expect(animation.start).toBeCalled();
+      expect(animation.reset).toHaveBeenCalledTimes(1);
+      expect(cb).not.toBeCalled();
+
+      animation.start.mock.calls[0][0]({finished: true}); // End of loop 1
+      expect(animation.reset).toHaveBeenCalledTimes(2);
+      expect(cb).not.toBeCalled();
+
+      animation.start.mock.calls[0][0]({finished: true}); // End of loop 2
+      expect(animation.reset).toHaveBeenCalledTimes(3);
+      expect(cb).not.toBeCalled();
+
+      animation.start.mock.calls[0][0]({finished: true}); // End of loop 3
+      expect(animation.reset).toHaveBeenCalledTimes(4);
+      expect(cb).not.toBeCalled();
+    });
+
+    it('loops three times if iterations is 3', () => {
+      var animation = {start: jest.fn(), reset: jest.fn(), _isUsingNativeDriver: () => false};
+      var cb = jest.fn();
+
+      var loop = Animated.loop(animation, { iterations: 3 });
+
+      expect(animation.start).not.toBeCalled();
+
+      loop.start(cb);
+
+      expect(animation.start).toBeCalled();
+      expect(animation.reset).toHaveBeenCalledTimes(1);
+      expect(cb).not.toBeCalled();
+
+      animation.start.mock.calls[0][0]({finished: true}); // End of loop 1
+      expect(animation.reset).toHaveBeenCalledTimes(2);
+      expect(cb).not.toBeCalled();
+
+      animation.start.mock.calls[0][0]({finished: true}); // End of loop 2
+      expect(animation.reset).toHaveBeenCalledTimes(3);
+      expect(cb).not.toBeCalled();
+
+      animation.start.mock.calls[0][0]({finished: true}); // End of loop 3
+      expect(animation.reset).toHaveBeenCalledTimes(3);
+      expect(cb).toBeCalledWith({finished: true});
+    });
+
+    it('does not loop if iterations is 1', () => {
+      var animation = {start: jest.fn(), reset: jest.fn(), _isUsingNativeDriver: () => false};
+      var cb = jest.fn();
+
+      var loop = Animated.loop(animation, { iterations: 1 });
+
+      expect(animation.start).not.toBeCalled();
+
+      loop.start(cb);
+
+      expect(animation.start).toBeCalled();
+      expect(cb).not.toBeCalled();
+
+      animation.start.mock.calls[0][0]({finished: true}); // End of loop 1
+      expect(cb).toBeCalledWith({finished: true});
+    });
+
+    it('does not animate if iterations is 0', () => {
+      var animation = {start: jest.fn(), reset: jest.fn(), _isUsingNativeDriver: () => false};
+      var cb = jest.fn();
+
+      var loop = Animated.loop(animation, { iterations: 0 });
+
+      expect(animation.start).not.toBeCalled();
+
+      loop.start(cb);
+
+      expect(animation.start).not.toBeCalled();
+      expect(cb).toBeCalledWith({ finished: true });
+    });
+
+    it('supports interrupting an indefinite loop', () => {
+      var animation = {start: jest.fn(), reset: jest.fn(), _isUsingNativeDriver: () => false};
+      var cb = jest.fn();
+
+      Animated.loop(animation).start(cb);
+      expect(animation.start).toBeCalled();
+      expect(animation.reset).toHaveBeenCalledTimes(1);
+      expect(cb).not.toBeCalled();
+
+      animation.start.mock.calls[0][0]({finished: true}); // End of loop 1
+      expect(animation.reset).toHaveBeenCalledTimes(2);
+      expect(cb).not.toBeCalled();
+
+      animation.start.mock.calls[0][0]({finished: false}); // Interrupt loop
+      expect(animation.reset).toHaveBeenCalledTimes(2);
+      expect(cb).toBeCalledWith({finished: false});
+    });
+
+    it('supports stopping loop', () => {
+      var animation = {start: jest.fn(), stop: jest.fn(), reset: jest.fn(), _isUsingNativeDriver: () => false};
+      var cb = jest.fn();
+
+      var loop = Animated.loop(animation);
+      loop.start(cb);
+      loop.stop();
+
+      expect(animation.start).toBeCalled();
+      expect(animation.reset).toHaveBeenCalledTimes(1);
+      expect(animation.stop).toBeCalled();
+
+      animation.start.mock.calls[0][0]({finished: false}); // Interrupt loop
+      expect(animation.reset).toHaveBeenCalledTimes(1);
+      expect(cb).toBeCalledWith({finished: false});
+    });
+  });
+
   describe('Animated Parallel', () => {
 
     it('works with an empty parallel', () => {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/DecayAnimation.java b/ReactAndroid/src/main/java/com/facebook/react/animated/DecayAnimation.java
index 84dac0623b17ed..41b6d24ff31239 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/DecayAnimation.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/DecayAnimation.java
@@ -21,12 +21,17 @@ public class DecayAnimation extends AnimationDriver {
   private final double mDeceleration;
 
   private long mStartFrameTimeMillis = -1;
-  private double mFromValue;
-  private double mLastValue;
+  private double mFromValue = 0d;
+  private double mLastValue = 0d;
+  private int mIterations;
+  private int mCurrentLoop;
 
   public DecayAnimation(ReadableMap config) {
     mVelocity = config.getDouble("velocity");
     mDeceleration = config.getDouble("deceleration");
+    mIterations = config.hasKey("iterations") ? config.getInt("iterations") : 1;
+    mCurrentLoop = 1;
+    mHasFinished = mIterations == 0;
   }
 
   @Override
@@ -35,7 +40,11 @@ public void runAnimationStep(long frameTimeNanos) {
     if (mStartFrameTimeMillis == -1) {
       // since this is the first animation step, consider the start to be on the previous frame
       mStartFrameTimeMillis = frameTimeMillis - 16;
-      mFromValue = mAnimatedValue.mValue;
+      if (mFromValue == mLastValue) { // first iteration, assign mFromValue based on mAnimatedValue
+        mFromValue = mAnimatedValue.mValue;
+      } else { // not the first iteration, reset mAnimatedValue based on mFromValue
+        mAnimatedValue.mValue = mFromValue;
+      }
       mLastValue = mAnimatedValue.mValue;
     }
 
@@ -44,8 +53,15 @@ public void runAnimationStep(long frameTimeNanos) {
         (1 - Math.exp(-(1 - mDeceleration) * (frameTimeMillis - mStartFrameTimeMillis)));
 
     if (Math.abs(mLastValue - value) < 0.1) {
-      mHasFinished = true;
-      return;
+
+      if (mIterations == -1 || mCurrentLoop < mIterations) { // looping animation, return to start
+        // set mStartFrameTimeMillis to -1 to reset instance variables on the next runAnimationStep
+        mStartFrameTimeMillis = -1;
+        mCurrentLoop++;
+      } else { // animation has completed
+        mHasFinished = true;
+        return;
+      }
     }
 
     mLastValue = value;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/FrameBasedAnimationDriver.java b/ReactAndroid/src/main/java/com/facebook/react/animated/FrameBasedAnimationDriver.java
index 86eac84521b8c7..94b12178979326 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/FrameBasedAnimationDriver.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/FrameBasedAnimationDriver.java
@@ -26,6 +26,8 @@ class FrameBasedAnimationDriver extends AnimationDriver {
   private final double[] mFrames;
   private final double mToValue;
   private double mFromValue;
+  private int mIterations;
+  private int mCurrentLoop;
 
   FrameBasedAnimationDriver(ReadableMap config) {
     ReadableArray frames = config.getArray("frames");
@@ -35,6 +37,9 @@ class FrameBasedAnimationDriver extends AnimationDriver {
       mFrames[i] = frames.getDouble(i);
     }
     mToValue = config.getDouble("toValue");
+    mIterations = config.hasKey("iterations") ? config.getInt("iterations") : 1;
+    mCurrentLoop = 1;
+    mHasFinished = mIterations == 0;
   }
 
   @Override
@@ -53,9 +58,13 @@ public void runAnimationStep(long frameTimeNanos) {
     }
     double nextValue;
     if (frameIndex >= mFrames.length - 1) {
-      // animation has completed, no more frames left
-      mHasFinished = true;
       nextValue = mToValue;
+      if (mIterations == -1 || mCurrentLoop < mIterations) { // looping animation, return to start
+        mStartFrameTimeNanos = frameTimeNanos;
+        mCurrentLoop++;
+      } else { // animation has completed, no more frames left
+        mHasFinished = true;
+      }
     } else {
       nextValue = mFromValue + mFrames[frameIndex] * (mToValue - mFromValue);
     }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/SpringAnimation.java b/ReactAndroid/src/main/java/com/facebook/react/animated/SpringAnimation.java
index 7cb14d109f62e3..a57a9152dfd34f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/SpringAnimation.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/SpringAnimation.java
@@ -38,6 +38,10 @@ private static class PhysicsState {
   private double mRestSpeedThreshold;
   private double mDisplacementFromRestThreshold;
   private double mTimeAccumulator = 0;
+  // for controlling loop
+  private int mIterations;
+  private int mCurrentLoop = 0;
+  private double mOriginalValue;
 
   SpringAnimation(ReadableMap config) {
     mSpringFriction = config.getDouble("friction");
@@ -47,12 +51,18 @@ private static class PhysicsState {
     mRestSpeedThreshold = config.getDouble("restSpeedThreshold");
     mDisplacementFromRestThreshold = config.getDouble("restDisplacementThreshold");
     mOvershootClampingEnabled = config.getBoolean("overshootClamping");
+    mIterations = config.hasKey("iterations") ? config.getInt("iterations") : 1;
+    mHasFinished = mIterations == 0;
   }
 
   @Override
   public void runAnimationStep(long frameTimeNanos) {
     long frameTimeMillis = frameTimeNanos / 1000000;
     if (!mSpringStarted) {
+      if (mCurrentLoop == 0) {
+        mOriginalValue = mAnimatedValue.mValue;
+        mCurrentLoop = 1;
+      }
       mStartValue = mCurrentState.position = mAnimatedValue.mValue;
       mLastTime = frameTimeMillis;
       mSpringStarted = true;
@@ -60,7 +70,15 @@ public void runAnimationStep(long frameTimeNanos) {
     advance((frameTimeMillis - mLastTime) / 1000.0);
     mLastTime = frameTimeMillis;
     mAnimatedValue.mValue = mCurrentState.position;
-    mHasFinished = isAtRest();
+    if (isAtRest()) {
+      if (mIterations == -1 || mCurrentLoop < mIterations) { // looping animation, return to start
+        mSpringStarted = false;
+        mAnimatedValue.mValue = mOriginalValue;
+        mCurrentLoop++;
+      } else { // animation has completed
+        mHasFinished = true;
+      }
+    }
   }
 
   /**
diff --git a/ReactAndroid/src/test/java/com/facebook/react/animated/NativeAnimatedNodeTraversalTest.java b/ReactAndroid/src/test/java/com/facebook/react/animated/NativeAnimatedNodeTraversalTest.java
index 5476ab5ea2ee2f..ced79811c36960 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/animated/NativeAnimatedNodeTraversalTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/animated/NativeAnimatedNodeTraversalTest.java
@@ -167,6 +167,42 @@ public void testFramesAnimation() {
     verifyNoMoreInteractions(mUIImplementationMock);
   }
 
+  @Test
+  public void testFramesAnimationLoopsFiveTimes() {
+    createSimpleAnimatedViewWithOpacity(1000, 0d);
+
+    JavaOnlyArray frames = JavaOnlyArray.of(0d, 0.2d, 0.4d, 0.6d, 0.8d, 1d);
+    Callback animationCallback = mock(Callback.class);
+    mNativeAnimatedNodesManager.startAnimatingNode(
+      1,
+      1,
+      JavaOnlyMap.of("type", "frames", "frames", frames, "toValue", 1d, "iterations", 5),
+      animationCallback);
+
+    ArgumentCaptor<ReactStylesDiffMap> stylesCaptor =
+        ArgumentCaptor.forClass(ReactStylesDiffMap.class);
+
+    reset(mUIImplementationMock);
+    mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
+    verify(mUIImplementationMock).synchronouslyUpdateViewOnUIThread(eq(1000), stylesCaptor.capture());
+    assertThat(stylesCaptor.getValue().getDouble("opacity", Double.NaN)).isEqualTo(0);
+
+    for (int iteration = 0; iteration < 5; iteration++) {
+      for (int i = 0; i < frames.size(); i++) {
+        reset(mUIImplementationMock);
+        mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
+        verify(mUIImplementationMock)
+            .synchronouslyUpdateViewOnUIThread(eq(1000), stylesCaptor.capture());
+        assertThat(stylesCaptor.getValue().getDouble("opacity", Double.NaN))
+            .isEqualTo(frames.getDouble(i));
+      }
+    }
+
+    reset(mUIImplementationMock);
+    mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
+    verifyNoMoreInteractions(mUIImplementationMock);
+  }
+
   @Test
   public void testNodeValueListenerIfNotListening() {
     int nodeId = 1;
@@ -285,6 +321,84 @@ public void testSpringAnimation() {
     verifyNoMoreInteractions(mUIImplementationMock);
   }
 
+  @Test
+  public void testSpringAnimationLoopsFiveTimes() {
+    createSimpleAnimatedViewWithOpacity(1000, 0d);
+
+    Callback animationCallback = mock(Callback.class);
+    mNativeAnimatedNodesManager.startAnimatingNode(
+      1,
+      1,
+      JavaOnlyMap.of(
+        "type",
+        "spring",
+        "friction",
+        7d,
+        "tension",
+        40.0d,
+        "initialVelocity",
+        0d,
+        "toValue",
+        1d,
+        "restSpeedThreshold",
+        0.001d,
+        "restDisplacementThreshold",
+        0.001d,
+        "overshootClamping",
+        false,
+        "iterations",
+        5),
+      animationCallback);
+
+    ArgumentCaptor<ReactStylesDiffMap> stylesCaptor =
+      ArgumentCaptor.forClass(ReactStylesDiffMap.class);
+
+    reset(mUIImplementationMock);
+    mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
+    verify(mUIImplementationMock).synchronouslyUpdateViewOnUIThread(eq(1000), stylesCaptor.capture());
+    assertThat(stylesCaptor.getValue().getDouble("opacity", Double.NaN)).isEqualTo(0);
+
+    double previousValue = 0d;
+    boolean wasGreaterThanOne = false;
+    boolean didComeToRest = false;
+    int numberOfResets = 0;
+    /* run 3 secs of animation, five times */
+    for (int i = 0; i < 3 * 60 * 5; i++) {
+      reset(mUIImplementationMock);
+      mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
+      verify(mUIImplementationMock, atMost(1))
+        .synchronouslyUpdateViewOnUIThread(eq(1000), stylesCaptor.capture());
+      double currentValue = stylesCaptor.getValue().getDouble("opacity", Double.NaN);
+      if (currentValue > 1d) {
+        wasGreaterThanOne = true;
+      }
+      // Test to see if it reset after coming to rest
+      if (didComeToRest &&
+          currentValue == 0d &&
+          Math.abs(Math.abs(currentValue - previousValue) - 1d) < 0.001d) {
+        numberOfResets++;
+      }
+
+      // verify that an animation step is relatively small, unless it has come to rest and reset
+      if (!didComeToRest) assertThat(Math.abs(currentValue - previousValue)).isLessThan(0.1d);
+
+
+       // record that the animation did come to rest when it rests on toValue
+      didComeToRest = Math.abs(currentValue - 1d) < 0.001d &&
+                      Math.abs(currentValue - previousValue) < 0.001d;
+      previousValue = currentValue;
+    }
+    // verify that we've reach the final value at the end of animation
+    assertThat(previousValue).isEqualTo(1d);
+    // verify that value has reached some maximum value that is greater than the final value (bounce)
+    assertThat(wasGreaterThanOne);
+    // verify that value reset 4 times after finishing a full animation
+    assertThat(numberOfResets).isEqualTo(4);
+    reset(mUIImplementationMock);
+    mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
+    verifyNoMoreInteractions(mUIImplementationMock);
+  }
+
   @Test
   public void testDecayAnimation() {
     createSimpleAnimatedViewWithOpacity(1000, 0d);
@@ -342,6 +456,67 @@ public void testDecayAnimation() {
     verifyNoMoreInteractions(mUIImplementationMock);
   }
 
+  @Test
+  public void testDecayAnimationLoopsFiveTimes() {
+    createSimpleAnimatedViewWithOpacity(1000, 0d);
+
+    Callback animationCallback = mock(Callback.class);
+    mNativeAnimatedNodesManager.startAnimatingNode(
+      1,
+      1,
+      JavaOnlyMap.of(
+        "type",
+        "decay",
+        "velocity",
+        0.5d,
+        "deceleration",
+        0.998d,
+        "iterations",
+        5),
+      animationCallback);
+
+    ArgumentCaptor<ReactStylesDiffMap> stylesCaptor =
+      ArgumentCaptor.forClass(ReactStylesDiffMap.class);
+
+    reset(mUIImplementationMock);
+    mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
+    verify(mUIImplementationMock, atMost(1))
+      .synchronouslyUpdateViewOnUIThread(eq(1000), stylesCaptor.capture());
+    double previousValue = stylesCaptor.getValue().getDouble("opacity", Double.NaN);
+    double previousDiff = Double.POSITIVE_INFINITY;
+    double initialValue = stylesCaptor.getValue().getDouble("opacity", Double.NaN);
+    boolean didComeToRest = false;
+    int numberOfResets = 0;
+    /* run 3 secs of animation, five times */
+    for (int i = 0; i < 3 * 60 * 5; i++) {
+      reset(mUIImplementationMock);
+      mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
+      verify(mUIImplementationMock, atMost(1))
+        .synchronouslyUpdateViewOnUIThread(eq(1000), stylesCaptor.capture());
+      double currentValue = stylesCaptor.getValue().getDouble("opacity", Double.NaN);
+      double currentDiff = currentValue - previousValue;
+      // Test to see if it reset after coming to rest (i.e. dropped back to )
+      if (didComeToRest && currentValue == initialValue) {
+        numberOfResets++;
+      }
+
+      // verify monotonicity, unless it has come to rest and reset
+      // greater *or equal* because the animation stops during these 3 seconds
+      if (!didComeToRest) assertThat(currentValue).as("on frame " + i).isGreaterThanOrEqualTo(previousValue);
+
+      // Test if animation has come to rest using the 0.1 threshold from DecayAnimation.java
+      didComeToRest = Math.abs(currentDiff) < 0.1d;
+      previousValue = currentValue;
+      previousDiff = currentDiff;
+    }
+
+    // verify that value reset (looped) 4 times after finishing a full animation
+    assertThat(numberOfResets).isEqualTo(4);
+    reset(mUIImplementationMock);
+    mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
+    verifyNoMoreInteractions(mUIImplementationMock);
+  }
+
   @Test
   public void testAnimationCallbackFinish() {
     createSimpleAnimatedViewWithOpacity(1000, 0d);

From fbd1b0a6654d87b236a382d52575d637f87acf24 Mon Sep 17 00:00:00 2001
From: Martin Konicek <mkonicek@fb.com>
Date: Tue, 14 Mar 2017 08:11:59 -0700
Subject: [PATCH 014/366] Temp disable OSS Android e2e test until we debug and
 fix it

Reviewed By: mkonicek

Differential Revision:
D4705570
Ninja: OSS only

fbshipit-source-id: 9aa401c0e030794accabcdc4861f5bf9950ff4d8
---
 circle.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 00cad8d46afdfb..945e6b7412ff4c 100644
--- a/circle.yml
+++ b/circle.yml
@@ -76,7 +76,9 @@ test:
     - node ./scripts/run-android-ci-instrumentation-tests.js --retries 3 --path ./ReactAndroid/src/androidTest/java/com/facebook/react/tests --package com.facebook.react.tests
 
     # Android e2e test
-    - source scripts/circle-ci-android-setup.sh && retry3 node ./scripts/run-ci-e2e-tests.js --android --js --retries 2
+    # Temp disabled to debug an ongoing issue (so far we think it's packager related).
+    # Re-enable this ASAP once the issue is fixed.
+    #- source scripts/circle-ci-android-setup.sh && retry3 node ./scripts/run-ci-e2e-tests.js --android --js --retries 2
 
     # testing docs generation
     - cd website && npm test

From 8ac35c8a0e31a0d5d384e18fc07fc09fd9bcd4e1 Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Tue, 14 Mar 2017 11:01:19 -0700
Subject: [PATCH 015/366] packager: react-packager.js: reinforce the typing at
 API boundary

Reviewed By: davidaurelio

Differential Revision: D4698256

fbshipit-source-id: 7a42e9b79744f599e92b5d3d91c41cdd0de2ece5
---
 packager/react-packager.js | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/packager/react-packager.js b/packager/react-packager.js
index 1e95d24ed1b91a..7525ec52abc066 100644
--- a/packager/react-packager.js
+++ b/packager/react-packager.js
@@ -16,6 +16,7 @@ const Logger = require('./src/Logger');
 const debug = require('debug');
 const invariant = require('fbjs/lib/invariant');
 
+import type Server from './src/Server';
 import type GlobalTransformCache from './src/lib/GlobalTransformCache';
 import type {Reporter} from './src/lib/reporting';
 import type {HasteImpl} from './src/node-haste/Module';
@@ -41,9 +42,27 @@ type StrictOptions = {
   watch?: boolean,
 };
 
-exports.buildBundle = function(options: Options, bundleOptions: {}) {
+/**
+ * This is a public API, so we don't trust the values and consider them as
+ * `mixed`. Because it understands `invariant`, Flow ensure that we refine these
+ * values completely.
+ */
+exports.buildBundle = function(options: Options, bundleOptions: mixed) {
+  invariant(
+    typeof bundleOptions === 'object' && bundleOptions != null,
+    '`bundleOptions` must be an object',
+  );
+  const {entryFile, platform} = bundleOptions;
+  invariant(
+    platform === undefined || typeof platform === 'string',
+    '`bundleOptions` field `platform` must be a string',
+  );
+  invariant(
+    typeof entryFile === 'string',
+    '`bundleOptions` must contain a string field `entryFile`',
+  );
   var server = createNonPersistentServer(options);
-  return server.buildBundle(bundleOptions)
+  return server.buildBundle({...bundleOptions, entryFile, platform})
     .then(p => {
       server.end();
       return p;
@@ -73,7 +92,7 @@ function enableDebug() {
   debug.enable(debugPattern);
 }
 
-function createServer(options: StrictOptions) {
+function createServer(options: StrictOptions): Server {
   // the debug module is configured globally, we need to enable debugging
   // *before* requiring any packages that use `debug` for logging
   if (options.verbose) {
@@ -84,11 +103,11 @@ function createServer(options: StrictOptions) {
   invariant(options.reporter != null, 'createServer() requires reporter');
   const serverOptions = Object.assign({}, options);
   delete serverOptions.verbose;
-  var Server = require('./src/Server');
-  return new Server(serverOptions);
+  const ServerClass = require('./src/Server');
+  return new ServerClass(serverOptions);
 }
 
-function createNonPersistentServer(options: Options) {
+function createNonPersistentServer(options: Options): Server {
   const serverOptions = {
     // It's unsound to set-up the reporter here,
     // but this allows backward compatibility.

From 4203c9c8374104017a8b3e8dc4b6e46c31f724a8 Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Tue, 14 Mar 2017 11:01:21 -0700
Subject: [PATCH 016/366] packager: fix buildBundle() options

Summary: The problem with `bundleOpts` is that it discards Flow typing, so it prevents reinforcing the integration of `Bundler` into `Server`. This changeset removes the `bundleOpts` to solve that issues. Instead, it makes the options explicit so that there is less uncertaintly. I love making options explicit, because they force callsites to take a consicious decision about what is really needed, making them more robust. They also expose oddities that probably needs refatoring, for example having a `resolutionRequest` in the bundle options does not seem correct, it should be an implementation details. Likewise, `onProgress` should probably be exposed differently, as it does not affect the content of the bundle itself.

Reviewed By: davidaurelio

Differential Revision: D4697729

fbshipit-source-id: d543870ba024e7588c10b101fa51429c77cc5ddc
---
 local-cli/bundle/output/bundle.js            |   5 +-
 local-cli/bundle/output/unbundle/index.js    |   5 +-
 packager/react-packager.js                   |  59 +++++---
 packager/src/Bundler/Bundle.js               |   4 +-
 packager/src/Bundler/index.js                |   2 +-
 packager/src/Server/__tests__/Server-test.js |  93 ++++++------
 packager/src/Server/index.js                 | 140 +++++++------------
 7 files changed, 149 insertions(+), 159 deletions(-)

diff --git a/local-cli/bundle/output/bundle.js b/local-cli/bundle/output/bundle.js
index c4b6effe1e6d30..0b1487f3c4d5b3 100644
--- a/local-cli/bundle/output/bundle.js
+++ b/local-cli/bundle/output/bundle.js
@@ -8,18 +8,21 @@
  *
  * @flow
  */
+
 'use strict';
 
+const Server = require('../../../packager/src/Server');
+
 const meta = require('./meta');
 const relativizeSourceMap = require('../../../packager/src//lib/relativizeSourceMap');
 const writeFile = require('./writeFile');
 
 import type Bundle from '../../../packager/src//Bundler/Bundle';
-import type Server from '../../../packager/src//Server';
 import type {OutputOptions, RequestOptions} from '../types.flow';
 
 function buildBundle(packagerClient: Server, requestOptions: RequestOptions) {
   return packagerClient.buildBundle({
+    ...Server.DEFAULT_BUNDLE_OPTIONS,
     ...requestOptions,
     isolateModuleIDs: true,
   });
diff --git a/local-cli/bundle/output/unbundle/index.js b/local-cli/bundle/output/unbundle/index.js
index e830311dec9ad4..62c13f819ee1fe 100644
--- a/local-cli/bundle/output/unbundle/index.js
+++ b/local-cli/bundle/output/unbundle/index.js
@@ -8,17 +8,20 @@
  *
  * @flow
  */
+
 'use strict';
 
+const Server = require('../../../../packager/src/Server');
+
 const asAssets = require('./as-assets');
 const asIndexedFile = require('./as-indexed-file');
 
 import type Bundle from '../../../../packager/src//Bundler/Bundle';
-import type Server from '../../../../packager/src//Server';
 import type {OutputOptions, RequestOptions} from '../../types.flow';
 
 function buildBundle(packagerClient: Server, requestOptions: RequestOptions) {
   return packagerClient.buildBundle({
+    ...Server.DEFAULT_BUNDLE_OPTIONS,
     ...requestOptions,
     unbundle: true,
     isolateModuleIDs: true,
diff --git a/packager/react-packager.js b/packager/react-packager.js
index 7525ec52abc066..e51592303223be 100644
--- a/packager/react-packager.js
+++ b/packager/react-packager.js
@@ -42,31 +42,46 @@ type StrictOptions = {
   watch?: boolean,
 };
 
+type PublicBundleOptions = {
+  +dev?: boolean,
+  +entryFile: string,
+  +generateSourceMaps?: boolean,
+  +inlineSourceMap?: boolean,
+  +minify?: boolean,
+  +platform?: string,
+  +runModule?: boolean,
+  +sourceMapUrl?: string,
+};
+
 /**
- * This is a public API, so we don't trust the values and consider them as
- * `mixed`. Because it understands `invariant`, Flow ensure that we refine these
- * values completely.
+ * This is a public API, so we don't trust the value and purposefully downgrade
+ * it as `mixed`. Because it understands `invariant`, Flow ensure that we
+ * refine these values completely.
  */
-exports.buildBundle = function(options: Options, bundleOptions: mixed) {
-  invariant(
-    typeof bundleOptions === 'object' && bundleOptions != null,
-    '`bundleOptions` must be an object',
-  );
-  const {entryFile, platform} = bundleOptions;
-  invariant(
-    platform === undefined || typeof platform === 'string',
-    '`bundleOptions` field `platform` must be a string',
-  );
-  invariant(
-    typeof entryFile === 'string',
-    '`bundleOptions` must contain a string field `entryFile`',
-  );
+function assertPublicBundleOptions(bo: mixed): PublicBundleOptions {
+  invariant(typeof bo === 'object' && bo != null, 'bundle options must be an object');
+  invariant(bo.dev === undefined || typeof bo.dev === 'boolean', 'bundle options field `dev` must be a boolean');
+  const {entryFile} = bo;
+  invariant(typeof entryFile === 'string', 'bundle options must contain a string field `entryFile`');
+  invariant(bo.generateSourceMaps === undefined || typeof bo.generateSourceMaps === 'boolean', 'bundle options field `generateSourceMaps` must be a boolean');
+  invariant(bo.inlineSourceMap === undefined || typeof bo.inlineSourceMap === 'boolean', 'bundle options field `inlineSourceMap` must be a boolean');
+  invariant(bo.minify === undefined || typeof bo.minify === 'boolean', 'bundle options field `minify` must be a boolean');
+  invariant(bo.platform === undefined || typeof bo.platform === 'string', 'bundle options field `platform` must be a string');
+  invariant(bo.runModule === undefined || typeof bo.runModule === 'boolean', 'bundle options field `runModule` must be a boolean');
+  invariant(bo.sourceMapUrl === undefined || typeof bo.sourceMapUrl === 'string', 'bundle options field `sourceMapUrl` must be a boolean');
+  return {entryFile, ...bo};
+}
+
+exports.buildBundle = function(options: Options, bundleOptions: PublicBundleOptions) {
   var server = createNonPersistentServer(options);
-  return server.buildBundle({...bundleOptions, entryFile, platform})
-    .then(p => {
-      server.end();
-      return p;
-    });
+  const ServerClass = require('./src/Server');
+  return server.buildBundle({
+    ...ServerClass.DEFAULT_BUNDLE_OPTIONS,
+    ...assertPublicBundleOptions(bundleOptions),
+  }).then(p => {
+    server.end();
+    return p;
+  });
 };
 
 exports.getOrderedDependencyPaths = function(options: Options, bundleOptions: {}) {
diff --git a/packager/src/Bundler/Bundle.js b/packager/src/Bundler/Bundle.js
index 2b22ec498dab97..b6bedf22a30574 100644
--- a/packager/src/Bundler/Bundle.js
+++ b/packager/src/Bundler/Bundle.js
@@ -44,10 +44,10 @@ class Bundle extends BundleBase {
   _ramGroups: Array<string> | void;
   _sourceMap: string | null;
   _sourceMapFormat: SourceMapFormat;
-  _sourceMapUrl: string | void;
+  _sourceMapUrl: ?string;
 
   constructor({sourceMapUrl, dev, minify, ramGroups}: {
-    sourceMapUrl?: string,
+    sourceMapUrl: ?string,
     dev?: boolean,
     minify?: boolean,
     ramGroups?: Array<string>,
diff --git a/packager/src/Bundler/index.js b/packager/src/Bundler/index.js
index 7066db33f911f3..ce940a7f6cbf85 100644
--- a/packager/src/Bundler/index.js
+++ b/packager/src/Bundler/index.js
@@ -221,7 +221,7 @@ class Bundler {
     dev: boolean,
     minify: boolean,
     unbundle: boolean,
-    sourceMapUrl: string,
+    sourceMapUrl: ?string,
   }): Promise<Bundle> {
     const {dev, minify, unbundle} = options;
     return this._resolverPromise.then(
diff --git a/packager/src/Server/__tests__/Server-test.js b/packager/src/Server/__tests__/Server-test.js
index 8223190b36320c..361eb4a907fa44 100644
--- a/packager/src/Server/__tests__/Server-test.js
+++ b/packager/src/Server/__tests__/Server-test.js
@@ -6,6 +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.
  */
+
 'use strict';
 
 jest.disableAutomock();
@@ -144,21 +145,22 @@ describe('processRequest', () => {
     ).then(response => {
       expect(response.body).toEqual('this is the source');
       expect(Bundler.prototype.bundle).toBeCalledWith({
+        assetPlugins: [],
+        dev: true,
         entryFile: 'index.ios.js',
-        inlineSourceMap: false,
-        minify: false,
+        entryModuleOnly: false,
         generateSourceMaps: false,
         hot: false,
-        runModule: true,
-        sourceMapUrl: 'index.ios.includeRequire.map',
-        dev: true,
-        platform: undefined,
+        inlineSourceMap: false,
+        isolateModuleIDs: false,
+        minify: false,
         onProgress: jasmine.any(Function),
+        platform: undefined,
+        resolutionResponse: null,
         runBeforeMainModule: ['InitializeCore'],
+        runModule: true,
+        sourceMapUrl: 'index.ios.includeRequire.map',
         unbundle: false,
-        entryModuleOnly: false,
-        isolateModuleIDs: false,
-        assetPlugins: [],
       });
     });
   });
@@ -170,21 +172,22 @@ describe('processRequest', () => {
     ).then(function(response) {
       expect(response.body).toEqual('this is the source');
       expect(Bundler.prototype.bundle).toBeCalledWith({
+        assetPlugins: [],
+        dev: true,
         entryFile: 'index.js',
-        inlineSourceMap: false,
-        minify: false,
+        entryModuleOnly: false,
         generateSourceMaps: false,
         hot: false,
-        runModule: true,
-        sourceMapUrl: 'index.map?platform=ios',
-        dev: true,
-        platform: 'ios',
+        inlineSourceMap: false,
+        isolateModuleIDs: false,
+        minify: false,
         onProgress: jasmine.any(Function),
+        platform: 'ios',
+        resolutionResponse: null,
         runBeforeMainModule: ['InitializeCore'],
+        runModule: true,
+        sourceMapUrl: 'index.map?platform=ios',
         unbundle: false,
-        entryModuleOnly: false,
-        isolateModuleIDs: false,
-        assetPlugins: [],
       });
     });
   });
@@ -196,21 +199,22 @@ describe('processRequest', () => {
     ).then(function(response) {
       expect(response.body).toEqual('this is the source');
       expect(Bundler.prototype.bundle).toBeCalledWith({
+        assetPlugins: ['assetPlugin1', 'assetPlugin2'],
+        dev: true,
         entryFile: 'index.js',
-        inlineSourceMap: false,
-        minify: false,
+        entryModuleOnly: false,
         generateSourceMaps: false,
         hot: false,
-        runModule: true,
-        sourceMapUrl: 'index.map?assetPlugin=assetPlugin1&assetPlugin=assetPlugin2',
-        dev: true,
-        platform: undefined,
+        inlineSourceMap: false,
+        isolateModuleIDs: false,
+        minify: false,
         onProgress: jasmine.any(Function),
+        platform: undefined,
+        resolutionResponse: null,
         runBeforeMainModule: ['InitializeCore'],
+        runModule: true,
+        sourceMapUrl: 'index.map?assetPlugin=assetPlugin1&assetPlugin=assetPlugin2',
         unbundle: false,
-        entryModuleOnly: false,
-        isolateModuleIDs: false,
-        assetPlugins: ['assetPlugin1', 'assetPlugin2'],
       });
     });
   });
@@ -422,21 +426,26 @@ describe('processRequest', () => {
   describe('buildbundle(options)', () => {
     it('Calls the bundler with the correct args', () => {
       return server.buildBundle({
+        ...Server.DEFAULT_BUNDLE_OPTIONS,
         entryFile: 'foo file',
       }).then(() =>
         expect(Bundler.prototype.bundle).toBeCalledWith({
+          assetPlugins: [],
+          dev: true,
           entryFile: 'foo file',
+          entryModuleOnly: false,
+          generateSourceMaps: false,
+          hot: false,
           inlineSourceMap: false,
+          isolateModuleIDs: false,
           minify: false,
-          hot: false,
-          runModule: true,
-          dev: true,
+          onProgress: null,
           platform: undefined,
+          resolutionResponse: null,
           runBeforeMainModule: ['InitializeCore'],
+          runModule: true,
+          sourceMapUrl: null,
           unbundle: false,
-          entryModuleOnly: false,
-          isolateModuleIDs: false,
-          assetPlugins: [],
         })
       );
     });
@@ -447,20 +456,22 @@ describe('processRequest', () => {
       return server.buildBundleFromUrl('/path/to/foo.bundle?dev=false&runModule=false')
         .then(() =>
           expect(Bundler.prototype.bundle).toBeCalledWith({
+            assetPlugins: [],
+            dev: false,
             entryFile: 'path/to/foo.js',
-            inlineSourceMap: false,
-            minify: false,
+            entryModuleOnly: false,
             generateSourceMaps: true,
             hot: false,
-            runModule: false,
-            sourceMapUrl: '/path/to/foo.map?dev=false&runModule=false',
-            dev: false,
+            inlineSourceMap: false,
+            isolateModuleIDs: false,
+            minify: false,
+            onProgress: null,
             platform: undefined,
+            resolutionResponse: null,
             runBeforeMainModule: ['InitializeCore'],
+            runModule: false,
+            sourceMapUrl: '/path/to/foo.map?dev=false&runModule=false',
             unbundle: false,
-            entryModuleOnly: false,
-            isolateModuleIDs: false,
-            assetPlugins: [],
           })
         );
     });
diff --git a/packager/src/Server/index.js b/packager/src/Server/index.js
index 972723c2883ded..e4b7e9f9eca0b2 100644
--- a/packager/src/Server/index.js
+++ b/packager/src/Server/index.js
@@ -77,70 +77,24 @@ type Options = {
   watch?: boolean,
 };
 
-const bundleOpts = declareOpts({
-  sourceMapUrl: {
-    type: 'string',
-    required: false,
-  },
-  entryFile: {
-    type: 'string',
-    required: true,
-  },
-  dev: {
-    type: 'boolean',
-    default: true,
-  },
-  minify: {
-    type: 'boolean',
-    default: false,
-  },
-  runModule: {
-    type: 'boolean',
-    default: true,
-  },
-  inlineSourceMap: {
-    type: 'boolean',
-    default: false,
-  },
-  platform: {
-    type: 'string',
-    required: true,
-  },
-  runBeforeMainModule: {
-    type: 'array',
-    default: defaults.runBeforeMainModule,
-  },
-  unbundle: {
-    type: 'boolean',
-    default: false,
-  },
-  hot: {
-    type: 'boolean',
-    default: false,
-  },
-  entryModuleOnly: {
-    type: 'boolean',
-    default: false,
-  },
-  isolateModuleIDs: {
-    type: 'boolean',
-    default: false,
-  },
-  resolutionResponse: {
-    type: 'object',
-  },
-  generateSourceMaps: {
-    type: 'boolean',
-    required: false,
-  },
-  assetPlugins: {
-    type: 'array',
-    default: [],
-  },
-  onProgress: {
-    type: 'function',
-  },
-});
+export type BundleOptions = {
+  +assetPlugins: Array<string>,
+  dev: boolean,
+  entryFile: string,
+  +entryModuleOnly: boolean,
+  +generateSourceMaps: boolean,
+  +hot: boolean,
+  +inlineSourceMap: boolean,
+  +isolateModuleIDs: boolean,
+  minify: boolean,
+  onProgress: ?(doneCont: number, totalCount: number) => mixed,
+  +platform: ?string,
+  +resolutionResponse: ?{},
+  +runBeforeMainModule: Array<string>,
+  +runModule: boolean,
+  sourceMapUrl: ?string,
+  unbundle: boolean,
+};
 
 const dependencyOpts = declareOpts({
   platform: {
@@ -302,12 +256,8 @@ class Server {
     }
   }
 
-  async buildBundle(options: {entryFile: string, platform?: string}): Promise<Bundle> {
-    if (!options.platform) {
-      options.platform = getPlatformExtension(options.entryFile);
-    }
-    const opts = bundleOpts(options);
-    const bundle = await this._bundler.bundle(opts);
+  async buildBundle(options: BundleOptions): Promise<Bundle> {
+    const bundle = await this._bundler.bundle(options);
     const modules = bundle.getModules();
     const nonVirtual = modules.filter(m => !m.virtual);
     bundleDeps.set(bundle, {
@@ -359,7 +309,7 @@ class Server {
 
   getDependencies(options: {
     entryFile: string,
-    platform?: string,
+    platform: ?string,
   }): Promise<ResolutionResponse> {
     return Promise.resolve().then(() => {
       if (!options.platform) {
@@ -568,10 +518,7 @@ class Server {
     });
   }
 
-  _useCachedOrUpdateOrCreateBundle(options: {
-    entryFile: string,
-    platform?: string,
-  }): Promise<Bundle> {
+  _useCachedOrUpdateOrCreateBundle(options: BundleOptions): Promise<Bundle> {
     const optionsJson = this.optionsHash(options);
     const bundleFromScratch = () => {
       const building = this.buildBundle(options);
@@ -597,8 +544,7 @@ class Server {
           // $FlowFixMe(>=0.37.0)
           deps.outdated = new Set();
 
-          const opts = bundleOpts(options);
-          const {platform, dev, minify, hot} = opts;
+          const {platform, dev, minify, hot} = options;
 
           // Need to create a resolution response to pass to the bundler
           // to process requires after transform. By providing a
@@ -880,20 +826,7 @@ class Server {
     }
   }
 
-  _getOptionsFromUrl(reqUrl: string): {
-    sourceMapUrl: string,
-    entryFile: string,
-    dev: boolean,
-    minify: boolean,
-    hot: boolean,
-    runModule: boolean,
-    inlineSourceMap: boolean,
-    platform?: string,
-    entryModuleOnly: boolean,
-    generateSourceMaps: boolean,
-    assetPlugins: Array<string>,
-    onProgress?: (doneCont: number, totalCount: number) => mixed,
-  } {
+  _getOptionsFromUrl(reqUrl: string): BundleOptions {
     // `true` to parse the query param as an object.
     const urlObj = url.parse(reqUrl, true);
 
@@ -934,13 +867,16 @@ class Server {
       dev,
       minify,
       hot: this._getBoolOptionFromQuery(urlObj.query, 'hot', false),
+      runBeforeMainModule: defaults.runBeforeMainModule,
       runModule: this._getBoolOptionFromQuery(urlObj.query, 'runModule', true),
       inlineSourceMap: this._getBoolOptionFromQuery(
         urlObj.query,
         'inlineSourceMap',
         false
       ),
+      isolateModuleIDs: false,
       platform,
+      resolutionResponse: null,
       entryModuleOnly: this._getBoolOptionFromQuery(
         urlObj.query,
         'entryModuleOnly',
@@ -949,6 +885,8 @@ class Server {
       generateSourceMaps:
         minify || !dev || this._getBoolOptionFromQuery(urlObj.query, 'babelSourcemap', false),
       assetPlugins,
+      onProgress: null,
+      unbundle: false,
     };
   }
 
@@ -960,8 +898,28 @@ class Server {
 
     return query[opt] === 'true' || query[opt] === '1';
   }
+
+  static DEFAULT_BUNDLE_OPTIONS;
+
 }
 
+Server.DEFAULT_BUNDLE_OPTIONS =  {
+  assetPlugins: [],
+  dev: true,
+  entryModuleOnly: false,
+  generateSourceMaps: false,
+  hot: false,
+  inlineSourceMap: false,
+  isolateModuleIDs: false,
+  minify: false,
+  onProgress: null,
+  resolutionResponse: null,
+  runBeforeMainModule: defaults.runBeforeMainModule,
+  runModule: true,
+  sourceMapUrl: null,
+  unbundle: false,
+};
+
 function contentsEqual<T>(array: Array<T>, set: Set<T>): boolean {
   return array.length === set.size && array.every(set.has, set);
 }

From 0a7427f5990fc501932a8086591e445a036b6e66 Mon Sep 17 00:00:00 2001
From: Jonathan Keljo <jkeljo@fb.com>
Date: Tue, 14 Mar 2017 11:07:54 -0700
Subject: [PATCH 017/366] Migrate ReactAndroid to use Buck's new
 java_annotation_processor rule

Reviewed By: asp2insp

Differential Revision: D4654756

fbshipit-source-id: d98d55786d84cf02234699a260e8750305982267
---
 ReactAndroid/DEFS                             | 22 +++++--------------
 .../com/facebook/react/module/processing/BUCK | 16 ++++++++++----
 .../java/com/facebook/react/processing/BUCK   | 16 ++++++++++----
 3 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/ReactAndroid/DEFS b/ReactAndroid/DEFS
index 632167ab730677..d54f4a601d2191 100644
--- a/ReactAndroid/DEFS
+++ b/ReactAndroid/DEFS
@@ -46,38 +46,28 @@ original_android_library=android_library
 def android_library(
   name,
   deps=[],
-  annotation_processors=[],
-  annotation_processor_deps=[],
+  plugins=[]
   *args,
   **kwargs):
 
   if react_native_target('java/com/facebook/react/uimanager/annotations:annotations') in deps and name != 'processing':
-    react_property_processors = [
-      'com.facebook.react.processing.ReactPropertyProcessor',
-    ]
-    react_property_processor_deps = [
+    react_property_plugins = [
       react_native_target('java/com/facebook/react/processing:processing'),
     ]
 
-    annotation_processors = list(set(annotation_processors + react_property_processors))
-    annotation_processor_deps = list(set(annotation_processor_deps + react_property_processor_deps))
+    plugins = list(set(plugins + react_property_plugins))
 
   if react_native_target('java/com/facebook/react/module/annotations:annotations') in deps and name != 'processing':
-    react_module_processors = [
-      'com.facebook.react.module.processing.ReactModuleSpecProcessor',
-    ]
-    react_module_processor_deps = [
+    react_module_plugins = [
       react_native_target('java/com/facebook/react/module/processing:processing'),
     ]
 
-    annotation_processors = list(set(annotation_processors + react_module_processors))
-    annotation_processor_deps = list(set(annotation_processor_deps + react_module_processor_deps))
+    plugins = list(set(plugins + react_module_plugins))
 
   original_android_library(
     name=name,
     deps=deps,
-    annotation_processors=annotation_processors,
-    annotation_processor_deps=annotation_processor_deps,
+    plugins=plugins,
     *args,
     **kwargs)
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/module/processing/BUCK b/ReactAndroid/src/main/java/com/facebook/react/module/processing/BUCK
index bed89ebebe269a..92ee442d7d78de 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/module/processing/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/module/processing/BUCK
@@ -1,13 +1,21 @@
 include_defs("//ReactAndroid/DEFS")
 
-java_library(
+java_annotation_processor(
     name = "processing",
-    srcs = glob(["*.java"]),
-    source = "7",
-    target = "7",
+    processor_class = "com.facebook.react.module.processing.ReactModuleSpecProcessor",
     visibility = [
         "PUBLIC",
     ],
+    deps = [
+        ":processing-lib",
+    ],
+)
+
+java_library(
+    name = "processing-lib",
+    srcs = glob(["*.java"]),
+    source = "7",
+    target = "7",
     deps = [
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_dep("third-party/java/javapoet:javapoet"),
diff --git a/ReactAndroid/src/main/java/com/facebook/react/processing/BUCK b/ReactAndroid/src/main/java/com/facebook/react/processing/BUCK
index b2d3f6dba2a077..7f7c396dd8f79d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/processing/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/processing/BUCK
@@ -1,13 +1,21 @@
 include_defs("//ReactAndroid/DEFS")
 
-java_library(
+java_annotation_processor(
     name = "processing",
-    srcs = glob(["*.java"]),
-    source = "7",
-    target = "7",
+    processor_class = "com.facebook.react.processing.ReactPropertyProcessor",
     visibility = [
         "PUBLIC",
     ],
+    deps = [
+        ":processing-lib",
+    ],
+)
+
+java_library(
+    name = "processing-lib",
+    srcs = glob(["*.java"]),
+    source = "7",
+    target = "7",
     deps = [
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_dep("third-party/java/javapoet:javapoet"),

From 4ac585b34bc1d15fd5b528007cee67c38499133c Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Tue, 14 Mar 2017 11:19:35 -0700
Subject: [PATCH 018/366] packager: attachHMRServer.js: fix callsite of
 Server#getModuleForPath()

Summary: In a previous changeset, Server#getModuleForPath() started returning `Promise<Module>` instead of `Module`, but the callsites in HMR haven't been updated, causing it to break. This would have been caught if `attachHMRServer.js` was using flow, that I'm considering doing in a following up diff. This would also have been caught if we had better integration testing of HMR. Good news however,it was caught by the OSS e2e test, that covers Hot Reloading.

Reviewed By: davidaurelio

Differential Revision: D4705937

fbshipit-source-id: fe787bc6ae50024759c7f7aeed747394fdce9aa1
---
 local-cli/server/util/attachHMRServer.js | 60 ++++++++++++------------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/local-cli/server/util/attachHMRServer.js b/local-cli/server/util/attachHMRServer.js
index 02373c43dcbfc9..9e1dd4241fd132 100644
--- a/local-cli/server/util/attachHMRServer.js
+++ b/local-cli/server/util/attachHMRServer.js
@@ -175,9 +175,9 @@ function attachHMRServer({httpServer, path, packagerServer}) {
                     entryFile: filename,
                     recursive: true,
                   }).then(response => {
-                    const module = packagerServer.getModuleForPath(filename);
-
-                    return response.copy({dependencies: [module]});
+                    return packagerServer.getModuleForPath(filename).then(module => {
+                      return response.copy({dependencies: [module]});
+                    });
                   });
                 }
 
@@ -195,32 +195,34 @@ function attachHMRServer({httpServer, path, packagerServer}) {
                       return {};
                     }
 
-                    // build list of modules for which we'll send HMR updates
-                    const modulesToUpdate = [packagerServer.getModuleForPath(filename)];
-                    Object.keys(depsModulesCache).forEach(module => {
-                      if (!client.dependenciesModulesCache[module]) {
-                        modulesToUpdate.push(depsModulesCache[module]);
-                      }
-                    });
-
-                    // Need to send modules to the client in an order it can
-                    // process them: if a new dependency graph was uncovered
-                    // because a new dependency was added, the file that was
-                    // changed, which is the root of the dependency tree that
-                    // will be sent, needs to be the last module that gets
-                    // processed. Reversing the new modules makes sense
-                    // because we get them through the resolver which returns
-                    // a BFS ordered list.
-                    modulesToUpdate.reverse();
-
-                    // invalidate caches
-                    client.dependenciesCache = depsCache;
-                    client.dependenciesModulesCache = depsModulesCache;
-                    client.shallowDependencies = shallowDeps;
-                    client.inverseDependenciesCache = inverseDepsCache;
-
-                    return resolutionResponse.copy({
-                      dependencies: modulesToUpdate
+                    return packagerServer.getModuleForPath(filename).then(moduleToUpdate => {
+                      // build list of modules for which we'll send HMR updates
+                      const modulesToUpdate = [moduleToUpdate];
+                      Object.keys(depsModulesCache).forEach(module => {
+                        if (!client.dependenciesModulesCache[module]) {
+                          modulesToUpdate.push(depsModulesCache[module]);
+                        }
+                      });
+
+                      // Need to send modules to the client in an order it can
+                      // process them: if a new dependency graph was uncovered
+                      // because a new dependency was added, the file that was
+                      // changed, which is the root of the dependency tree that
+                      // will be sent, needs to be the last module that gets
+                      // processed. Reversing the new modules makes sense
+                      // because we get them through the resolver which returns
+                      // a BFS ordered list.
+                      modulesToUpdate.reverse();
+
+                      // invalidate caches
+                      client.dependenciesCache = depsCache;
+                      client.dependenciesModulesCache = depsModulesCache;
+                      client.shallowDependencies = shallowDeps;
+                      client.inverseDependenciesCache = inverseDepsCache;
+
+                      return resolutionResponse.copy({
+                        dependencies: modulesToUpdate
+                      });
                     });
                   });
               })

From 3e528b10145a13896b6610bfa690aefb99e7dbbd Mon Sep 17 00:00:00 2001
From: Theo Yaung <theoy@fb.com>
Date: Tue, 14 Mar 2017 11:40:20 -0700
Subject: [PATCH 019/366] Remove Inspector Logic (cannot work on iOS / System
 JSC)

Reviewed By: javache

Differential Revision: D4620530

fbshipit-source-id: 52abc6178b1ad1b52ba1b1825702c9c254a04520
---
 ReactAndroid/src/main/jni/xreact/jni/BUCK     |   1 -
 .../src/main/jni/xreact/jni/JInspector.cpp    |   4 +
 .../src/main/jni/xreact/jni/JInspector.h      |   4 +
 ReactCommon/cxxreact/BUCK                     |   3 +-
 ReactCommon/inspector/Agent.cpp               |  50 -----
 ReactCommon/inspector/Agent.h                 |  33 ---
 ReactCommon/inspector/Android.mk              |  28 ---
 ReactCommon/inspector/BUCK                    |  60 ------
 ReactCommon/inspector/ConsoleAgent.cpp        | 152 --------------
 ReactCommon/inspector/ConsoleAgent.h          |  43 ----
 ReactCommon/inspector/Dispatcher.cpp          |   3 -
 ReactCommon/inspector/Dispatcher.h            |  41 ----
 ReactCommon/inspector/Error.cpp               |  19 --
 ReactCommon/inspector/Error.h                 |  34 ----
 ReactCommon/inspector/Inspector.cpp           | 162 ---------------
 ReactCommon/inspector/Inspector.h             |  94 ---------
 ReactCommon/inspector/InspectorAgent.cpp      |  22 --
 ReactCommon/inspector/InspectorAgent.h        |  22 --
 ReactCommon/inspector/InspectorController.cpp | 192 ------------------
 ReactCommon/inspector/InspectorController.h   |  42 ----
 ReactCommon/inspector/JSDispatcher.cpp        | 135 ------------
 ReactCommon/inspector/JSDispatcher.h          |  46 -----
 ReactCommon/inspector/LegacyAgents.cpp        |  35 ----
 ReactCommon/inspector/LegacyAgents.h          |  32 ---
 ReactCommon/inspector/LegacyDebuggerAgent.cpp |  44 ----
 ReactCommon/inspector/LegacyDebuggerAgent.h   |  40 ----
 ReactCommon/inspector/LegacyDispatcher.cpp    |  54 -----
 ReactCommon/inspector/LegacyDispatcher.h      |  52 -----
 .../inspector/LegacyInspectorEnvironment.cpp  |  34 ----
 .../inspector/LegacyInspectorEnvironment.h    |  35 ----
 ReactCommon/inspector/LegacyRuntimeAgent.cpp  |  63 ------
 ReactCommon/inspector/LegacyRuntimeAgent.h    |  39 ----
 .../inspector/LegacyScriptDebugServer.cpp     |  64 ------
 .../inspector/LegacyScriptDebugServer.h       |  45 ----
 ReactCommon/inspector/PageAgent.cpp           |  31 ---
 ReactCommon/inspector/PageAgent.h             |  20 --
 ReactCommon/inspector/Protocol.cpp            |  86 --------
 ReactCommon/inspector/Protocol.h              |  77 -------
 ReactCommon/inspector/README.md               |  17 --
 ReactCommon/inspector/Util.cpp                |   9 -
 ReactCommon/inspector/Util.h                  |  45 ----
 41 files changed, 9 insertions(+), 2003 deletions(-)
 delete mode 100644 ReactCommon/inspector/Agent.cpp
 delete mode 100644 ReactCommon/inspector/Agent.h
 delete mode 100644 ReactCommon/inspector/Android.mk
 delete mode 100644 ReactCommon/inspector/BUCK
 delete mode 100644 ReactCommon/inspector/ConsoleAgent.cpp
 delete mode 100644 ReactCommon/inspector/ConsoleAgent.h
 delete mode 100644 ReactCommon/inspector/Dispatcher.cpp
 delete mode 100644 ReactCommon/inspector/Dispatcher.h
 delete mode 100644 ReactCommon/inspector/Error.cpp
 delete mode 100644 ReactCommon/inspector/Error.h
 delete mode 100644 ReactCommon/inspector/Inspector.cpp
 delete mode 100644 ReactCommon/inspector/Inspector.h
 delete mode 100644 ReactCommon/inspector/InspectorAgent.cpp
 delete mode 100644 ReactCommon/inspector/InspectorAgent.h
 delete mode 100644 ReactCommon/inspector/InspectorController.cpp
 delete mode 100644 ReactCommon/inspector/InspectorController.h
 delete mode 100644 ReactCommon/inspector/JSDispatcher.cpp
 delete mode 100644 ReactCommon/inspector/JSDispatcher.h
 delete mode 100644 ReactCommon/inspector/LegacyAgents.cpp
 delete mode 100644 ReactCommon/inspector/LegacyAgents.h
 delete mode 100644 ReactCommon/inspector/LegacyDebuggerAgent.cpp
 delete mode 100644 ReactCommon/inspector/LegacyDebuggerAgent.h
 delete mode 100644 ReactCommon/inspector/LegacyDispatcher.cpp
 delete mode 100644 ReactCommon/inspector/LegacyDispatcher.h
 delete mode 100644 ReactCommon/inspector/LegacyInspectorEnvironment.cpp
 delete mode 100644 ReactCommon/inspector/LegacyInspectorEnvironment.h
 delete mode 100644 ReactCommon/inspector/LegacyRuntimeAgent.cpp
 delete mode 100644 ReactCommon/inspector/LegacyRuntimeAgent.h
 delete mode 100644 ReactCommon/inspector/LegacyScriptDebugServer.cpp
 delete mode 100644 ReactCommon/inspector/LegacyScriptDebugServer.h
 delete mode 100644 ReactCommon/inspector/PageAgent.cpp
 delete mode 100644 ReactCommon/inspector/PageAgent.h
 delete mode 100644 ReactCommon/inspector/Protocol.cpp
 delete mode 100644 ReactCommon/inspector/Protocol.h
 delete mode 100644 ReactCommon/inspector/README.md
 delete mode 100644 ReactCommon/inspector/Util.cpp
 delete mode 100644 ReactCommon/inspector/Util.h

diff --git a/ReactAndroid/src/main/jni/xreact/jni/BUCK b/ReactAndroid/src/main/jni/xreact/jni/BUCK
index 6c2be6899b28a4..ef06da174c223b 100644
--- a/ReactAndroid/src/main/jni/xreact/jni/BUCK
+++ b/ReactAndroid/src/main/jni/xreact/jni/BUCK
@@ -51,6 +51,5 @@ cxx_library(
         "//xplat/fbsystrace:fbsystrace",
         react_native_xplat_target("cxxreact:bridge"),
         react_native_xplat_target("cxxreact:module"),
-        react_native_xplat_target("inspector:inspector"),
     ],
 )
diff --git a/ReactAndroid/src/main/jni/xreact/jni/JInspector.cpp b/ReactAndroid/src/main/jni/xreact/jni/JInspector.cpp
index 4146fc0fd095cd..cad09b1cc00562 100644
--- a/ReactAndroid/src/main/jni/xreact/jni/JInspector.cpp
+++ b/ReactAndroid/src/main/jni/xreact/jni/JInspector.cpp
@@ -2,6 +2,8 @@
 
 #include "JInspector.h"
 
+#ifdef WITH_INSPECTOR
+
 namespace facebook {
 namespace react {
 
@@ -88,3 +90,5 @@ void JInspector::registerNatives() {
 
 }
 }
+
+#endif
diff --git a/ReactAndroid/src/main/jni/xreact/jni/JInspector.h b/ReactAndroid/src/main/jni/xreact/jni/JInspector.h
index 3335deccb2d9a9..0b9db509a75be8 100644
--- a/ReactAndroid/src/main/jni/xreact/jni/JInspector.h
+++ b/ReactAndroid/src/main/jni/xreact/jni/JInspector.h
@@ -2,6 +2,8 @@
 
 #pragma once
 
+#ifdef WITH_INSPECTOR
+
 #include <inspector/Inspector.h>
 
 #include <fb/fbjni.h>
@@ -59,3 +61,5 @@ class JInspector : public jni::HybridClass<JInspector> {
 
 }
 }
+
+#endif
diff --git a/ReactCommon/cxxreact/BUCK b/ReactCommon/cxxreact/BUCK
index da1ae79918b8e7..45496978a27648 100644
--- a/ReactCommon/cxxreact/BUCK
+++ b/ReactCommon/cxxreact/BUCK
@@ -27,8 +27,7 @@ if THIS_IS_FBANDROID:
         '-Wno-pessimizing-move',
       ],
       deps = [
-        '//xplat/folly:molly',
-        react_native_xplat_target('inspector:inspector'),
+        '//xplat/folly:molly'
       ])
 
     cxx_library(
diff --git a/ReactCommon/inspector/Agent.cpp b/ReactCommon/inspector/Agent.cpp
deleted file mode 100644
index 1a3720cd6a9a52..00000000000000
--- a/ReactCommon/inspector/Agent.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#include "Agent.h"
-
-#include "Error.h"
-#include "Protocol.h"
-
-#include <folly/json.h>
-
-namespace facebook {
-namespace react {
-
-void Agent::onConnect(std::shared_ptr<Channel> channel) {
-  channel_ = std::move(channel);
-
-  channel_->registerDomain(getDomain(), [this](std::string, int callId, const std::string& method, folly::dynamic args) {
-    auto result = handle(method, std::move(args));
-    if (result.isNull()) {
-      result = folly::dynamic::object;
-    }
-    auto message = folly::dynamic::object("id", callId)("result", std::move(result));
-    channel_->sendMessage(folly::toJson(std::move(message)));
-  });
-}
-
-void Agent::onDisconnect() {
-  channel_.reset();
-}
-
-folly::dynamic Agent::handle(const std::string& method, folly::dynamic args) {
-  try {
-    return methods_.at(method)(std::move(args));
-  } catch (const std::out_of_range& e) {
-    throw InspectorException(ErrorCode::MethodNotFound, "Unknown method: '" + method + "'");
-  }
-}
-
-void Agent::registerMethod(std::string name, Method method) {
-  methods_.emplace(std::move(name), std::move(method));
-}
-
-void Agent::sendEvent(std::string name, folly::dynamic params) {
-  if (!channel_) {
-    return;
-  }
-  channel_->sendMessage(Event(getDomain(), std::move(name), std::move(params)));
-}
-
-}
-}
diff --git a/ReactCommon/inspector/Agent.h b/ReactCommon/inspector/Agent.h
deleted file mode 100644
index 94443231f768df..00000000000000
--- a/ReactCommon/inspector/Agent.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#pragma once
-
-#include "Dispatcher.h"
-
-#include <unordered_map>
-
-namespace facebook {
-namespace react {
-
-/*
- * An dispatcher that makes it simple to implement an agent that serves a single domain.
- */
-class Agent : public Dispatcher {
-public:
-  void onConnect(std::shared_ptr<Channel> channel) override;
-  void onDisconnect() override;
-protected:
-  using Method = std::function<folly::dynamic(folly::dynamic)>;
-  void registerMethod(std::string name, Method method);
-  void sendEvent(std::string name, folly::dynamic params = nullptr);
-
-  virtual std::string getDomain() = 0;
-private:
-  folly::dynamic handle(const std::string& method, folly::dynamic args);
-
-  std::shared_ptr<Channel> channel_;
-  std::unordered_map<std::string, Method> methods_;
-};
-
-}
-}
diff --git a/ReactCommon/inspector/Android.mk b/ReactCommon/inspector/Android.mk
deleted file mode 100644
index bd13be66e81362..00000000000000
--- a/ReactCommon/inspector/Android.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := inspector
-
-LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
-
-LOCAL_CFLAGS := \
-  -DLOG_TAG=\"ReactNative\"
-
-LOCAL_CFLAGS += -Wall -Werror -fexceptions -frtti
-CXX11_FLAGS := -std=c++11
-LOCAL_CFLAGS += $(CXX11_FLAGS)
-LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS)
-
-LOCAL_STATIC_LIBRARIES := jschelpers
-LOCAL_SHARED_LIBRARIES := libfolly_json libjsc libglog
-
-include $(BUILD_STATIC_LIBRARY)
-
-$(call import-module,folly)
-$(call import-module,jsc)
-$(call import-module,glog)
-$(call import-module,jschelpers)
diff --git a/ReactCommon/inspector/BUCK b/ReactCommon/inspector/BUCK
deleted file mode 100644
index d98a369ec3a72c..00000000000000
--- a/ReactCommon/inspector/BUCK
+++ /dev/null
@@ -1,60 +0,0 @@
-EXPORTED_HEADERS = [
-    "Inspector.h",
-]
-
-def library(**kwargs):
-  if THIS_IS_FBANDROID:
-    include_defs('//ReactAndroid/DEFS')
-
-    cxx_library(
-      force_static = True,
-      # We depend on JSC, support the same platforms
-      supported_platforms_regex = '^android-(armv7|x86)$',
-      deps = [
-        '//xplat/folly:molly',
-        react_native_xplat_target('jschelpers:jschelpers'),
-      ],
-      **kwargs
-    )
-  elif THIS_IS_FBOBJC:
-    ios_library(
-      inherited_buck_flags = STATIC_LIBRARY_IOS_FLAGS,
-      frameworks = [
-       '$SDKROOT/System/Library/Frameworks/JavaScriptCore.framework',
-      ],
-      deps = [
-        '//xplat/folly:molly',
-        react_native_xplat_target('jschelpers:jschelpers'),
-      ],
-      **kwargs
-    )
-  else:
-    raise Error('Unknown repo')
-
-library(
-    name = "inspector",
-    srcs = glob(["*.cpp"]),
-    compiler_flags = [
-        "-Wall",
-        "-Wno-shadow",
-        "-Wno-inconsistent-missing-override",
-        "-Wno-unused-local-typedef",
-        "-Wno-unused-private-field",
-        "-Wno-undefined-bool-conversion",
-        "-fexceptions",
-        "-fvisibility=hidden",
-        "-std=gnu++1y",
-    ],
-    exported_headers = EXPORTED_HEADERS,
-    header_namespace = "inspector",
-    headers = subdir_glob(
-        [("inspector", "*.h")],
-        excludes = EXPORTED_HEADERS,
-    ),
-    preprocessor_flags = [
-        "-DENABLE_INSPECTOR=1",
-    ],
-    visibility = [
-        "PUBLIC",
-    ],
-)
diff --git a/ReactCommon/inspector/ConsoleAgent.cpp b/ReactCommon/inspector/ConsoleAgent.cpp
deleted file mode 100644
index 665a1df45f60b3..00000000000000
--- a/ReactCommon/inspector/ConsoleAgent.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#include "ConsoleAgent.h"
-
-#include "Protocol.h"
-#include "Util.h"
-
-#include <jschelpers/JSCHelpers.h>
-
-#include <JavaScriptCore/config.h>
-#include <JavaScriptCore/APICast.h>
-#include <JavaScriptCore/JSContextRef.h>
-#include <JavaScriptCore/JSObjectRef.h>
-#include <JavaScriptCore/JSValueRef.h>
-#include <JavaScriptCore/JSStringRef.h>
-
-#include <JavaScriptCore/JSLock.h>
-#include <JavaScriptCore/JSGlobalObject.h>
-#include <JavaScriptCore/JSArray.h>
-#include <JavaScriptCore/InjectedScriptManager.h>
-#include <JavaScriptCore/ScriptArguments.h>
-#include <JavaScriptCore/ScriptCallStack.h>
-#include <JavaScriptCore/ScriptCallStackFactory.h>
-
-#include <folly/json.h>
-
-namespace facebook {
-namespace react {
-
-namespace {
-
-static JSValueRef inspectorLog(
-    ConsoleAgent* agent,
-    JSContextRef ctx,
-    JSObjectRef thisObject,
-    size_t argumentCount,
-    const JSValueRef arguments[]) {
-  CHECK(argumentCount == 4) << "__inspectorLog takes 4 args";
-  auto execState = toJS(ctx);
-  JSC::JSLockHolder lock(execState);
-  auto params = toJS(execState, arguments[2]);
-  agent->log(
-    execState,
-    Value(ctx, arguments[0]).toString().str(),
-    Value(ctx, arguments[1]).toString().str(),
-    JSC::asArray(params),
-    Value(ctx, arguments[3]).asUnsignedInteger());
-  return JSValueMakeUndefined(ctx);
-}
-
-size_t skipNativeCode(const Inspector::ScriptCallStack& callStack, size_t offset) {
-  for (; offset < callStack.size(); offset++) {
-    auto& frame = callStack.at(offset);
-    if (frame.sourceURL() != "[native code]") {
-      return offset;
-    }
-  }
-
-  return callStack.size();
-}
-
-const Inspector::ScriptCallFrame* firstUserFrame(const Inspector::ScriptCallStack& callStack, size_t framesToSkip) {
-  // Skip out of native code
-  size_t offset = skipNativeCode(callStack, 0);
-
-  // Skip frames of console polyfill
-  offset = skipNativeCode(callStack, offset + framesToSkip);
-  if (offset >= callStack.size()) {
-    return nullptr;
-  }
-
-  if (callStack.at(offset).functionName() == "infoLog") {
-    offset += 1;
-  }
-
-  if (offset >= callStack.size()) {
-    return nullptr;
-  }
-
-  return &callStack.at(offset);
-}
-
-}
-
-ConsoleAgent::ConsoleAgent(JSC::JSGlobalObject& globalObject, Inspector::InjectedScriptManager* injectedScriptManager)
-    : globalObject_(globalObject)
-    , injectedScriptManager_(injectedScriptManager) {
-  registerMethod("enable", [this](folly::dynamic) -> folly::dynamic {
-    using namespace std::placeholders;
-    enabled_ = true;
-    JSGlobalContextRef context = toGlobalRef(globalObject_.globalExec());
-    installGlobalFunction(context, "__inspectorLog", std::bind(&inspectorLog, this, _1, _2, _3, _4));
-    return nullptr;
-  });
-  registerMethod("disable", [this](folly::dynamic) -> folly::dynamic {
-    JSGlobalContextRef context = toGlobalRef(globalObject_.globalExec());
-    removeGlobal(context, "__inspectorLog");
-    enabled_ = false;
-    return nullptr;
-  });
-}
-
-void ConsoleAgent::log(JSC::ExecState* execState, std::string message) {
-  log(execState, "log", std::move(message), nullptr, 0);
-}
-
-void ConsoleAgent::log(JSC::ExecState* execState, std::string level, std::string message, JSC::JSArray* params, size_t framesToSkip) {
-  if (!enabled_) {
-    return;
-  }
-
-  auto callStack = Inspector::createScriptCallStack(execState, Inspector::ScriptCallStack::maxCallStackSizeToCapture);
-
-  auto logEntry = folly::dynamic::object
-    ("source", "console-api")
-    ("level", level)
-    ("text", std::move(message))
-    ("timestamp", Timestamp::now())
-    ("stackTrace", folly::parseJson(toStdString(callStack->buildInspectorArray()->toJSONString())));
-
-  if (params) {
-    logEntry("parameters", convertParams(execState, params));
-  }
-
-  if (auto frame = firstUserFrame(*callStack, framesToSkip)) {
-    logEntry
-      ("url", toStdString(frame->sourceURL()))
-      ("line", frame->lineNumber())
-      ("column", frame->columnNumber());
-  }
-
-  sendEvent("messageAdded", folly::dynamic::object("message", std::move(logEntry)));
-}
-
-folly::dynamic ConsoleAgent::convertParams(JSC::ExecState* execState, JSC::JSArray* params) {
-  auto injectedScript = injectedScriptManager_->injectedScriptFor(execState->lexicalGlobalObject()->globalExec());
-  if (injectedScript.hasNoValue()) {
-    return nullptr;
-  }
-
-  folly::dynamic remoteParams = folly::dynamic::array;
-  for (size_t i = 0, size = params->length(); i < size; i++) {
-    auto scriptValue = Deprecated::ScriptValue(execState->vm(), params->getIndex(execState, i));
-    auto remoteValue = injectedScript.wrapObject(std::move(scriptValue), "console", true);
-    remoteParams.push_back(folly::parseJson(toStdString(remoteValue->toJSONString())));
-  }
-
-  return remoteParams;
-}
-
-}
-}
diff --git a/ReactCommon/inspector/ConsoleAgent.h b/ReactCommon/inspector/ConsoleAgent.h
deleted file mode 100644
index 961271923bd674..00000000000000
--- a/ReactCommon/inspector/ConsoleAgent.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#pragma once
-
-#include "Agent.h"
-
-namespace JSC {
-class JSGlobalObject;
-class ExecState;
-class JSArray;
-}
-
-namespace Inspector {
-class InjectedScriptManager;
-}
-
-namespace facebook {
-namespace react {
-
-/**
- * Implements the Console agent. Relies on Javascript to call the globally exposed method __inspectorLog
- * to send logging events.
- */
-class ConsoleAgent : public Agent {
-public:
-  ConsoleAgent(JSC::JSGlobalObject& globalObject, Inspector::InjectedScriptManager* injectedScriptManager);
-
-  void log(JSC::ExecState* execState, std::string message);
-  void log(JSC::ExecState* execState, std::string level, std::string message, JSC::JSArray* params, size_t framesToSkip);
-private:
-  bool enabled_{false};
-  JSC::JSGlobalObject& globalObject_;
-  Inspector::InjectedScriptManager* injectedScriptManager_;
-
-  folly::dynamic convertParams(JSC::ExecState* execState, JSC::JSArray* params);
-
-  std::string getDomain() override {
-    return "Console";
-  }
-};
-
-}
-}
diff --git a/ReactCommon/inspector/Dispatcher.cpp b/ReactCommon/inspector/Dispatcher.cpp
deleted file mode 100644
index 54bbd03f2da076..00000000000000
--- a/ReactCommon/inspector/Dispatcher.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#include "Dispatcher.h"
diff --git a/ReactCommon/inspector/Dispatcher.h b/ReactCommon/inspector/Dispatcher.h
deleted file mode 100644
index c864bea0aaf389..00000000000000
--- a/ReactCommon/inspector/Dispatcher.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#pragma once
-
-#include <memory>
-
-#include <folly/dynamic.h>
-// Both double-conversions and WTF define the ASSERT macro
-#undef ASSERT
-
-namespace facebook {
-namespace react {
-
-/*
- * A bidrectional channel that allows both sending events to the remote inspector and registering
- * to receive events for a specific domain.
- */
-class Channel {
-public:
-  using MessageHandler = std::function<void(std::string message, int callId, const std::string& methodName, folly::dynamic args)>;
-
-  virtual ~Channel() = default;
-
-  virtual void sendMessage(std::string message) = 0;
-  virtual void registerDomain(std::string domain, MessageHandler handler) = 0;
-};
-
-/*
- * A dispatcher is responsible for one or multiple domains and registering them with the Channel
- * when it is connected.
- */
-class Dispatcher {
-public:
-  virtual ~Dispatcher() {}
-
-  virtual void onConnect(std::shared_ptr<Channel> channel) = 0;
-  virtual void onDisconnect() = 0;
-};
-
-}
-}
diff --git a/ReactCommon/inspector/Error.cpp b/ReactCommon/inspector/Error.cpp
deleted file mode 100644
index 5bb780f4471e1b..00000000000000
--- a/ReactCommon/inspector/Error.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#include "Error.h"
-
-namespace facebook {
-namespace react {
-
-InspectorException::InspectorException(int callId, ErrorCode code, std::string message)
-  : error_(callId, code, std::move(message)) {}
-
-InspectorException::InspectorException(ErrorCode code, std::string message)
-  : error_(code, std::move(message)) {}
-
-InspectorException InspectorException::withCallId(int callId) const {
-  return InspectorException(callId, error_.code(), error_.message());
-}
-
-}
-}
diff --git a/ReactCommon/inspector/Error.h b/ReactCommon/inspector/Error.h
deleted file mode 100644
index f373035a321a32..00000000000000
--- a/ReactCommon/inspector/Error.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#pragma once
-
-#include "Protocol.h"
-
-#include <string>
-#include <exception>
-
-#include <folly/Optional.h>
-
-namespace facebook {
-namespace react {
-
-class InspectorException : public std::exception {
-public:
-  InspectorException(int callId, ErrorCode code, std::string message);
-  explicit InspectorException(ErrorCode code, std::string message);
-
-  const char* what() const throw() override {
-    return error_.message().c_str();
-  }
-
-  const Error& error() const {
-    return error_;
-  }
-
-  InspectorException withCallId(int callId) const;
-private:
-  Error error_;
-};
-
-}
-}
diff --git a/ReactCommon/inspector/Inspector.cpp b/ReactCommon/inspector/Inspector.cpp
deleted file mode 100644
index 68233b15e71627..00000000000000
--- a/ReactCommon/inspector/Inspector.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#include "Inspector.h"
-
-#include "InspectorController.h"
-
-#include <JavaScriptCore/config.h>
-
-#include <JavaScriptCore/APICast.h>
-#include <JavaScriptCore/JSGlobalObject.h>
-#include <JavaScriptCore/JSLock.h>
-
-#include <folly/Memory.h>
-
-namespace facebook {
-namespace react {
-
-namespace {
-
-JSC::JSGlobalObject& getGlobalObject(JSContextRef ctx) {
-  JSC::ExecState* exec = toJS(ctx);
-  JSC::JSLockHolder locker(exec);
-
-  JSC::JSGlobalObject* globalObject = exec->vmEntryGlobalObject();
-  return *globalObject;
-}
-
-}
-
-Inspector::LocalConnection::LocalConnection(std::shared_ptr<Inspector::DuplexConnection> duplexConnection)
-    : duplexConnection_(std::move(duplexConnection)) {}
-
-void Inspector::LocalConnection::sendMessage(std::string message) {
-  duplexConnection_->sendToLocal(std::move(message));
-}
-
-void Inspector::LocalConnection::disconnect() {
-  duplexConnection_->terminate(false);
-}
-
-Inspector::PageHolder::PageHolder(std::string name, std::unique_ptr<InspectorController> controller)
-: name(name)
-, controller(std::move(controller)) {}
-
-Inspector::PageHolder::~PageHolder() = default;
-
-Inspector& Inspector::instance() {
-  static Inspector inspector;
-  return inspector;
-}
-
-std::vector<Inspector::Page> Inspector::getPages() const {
-  std::lock_guard<std::mutex> lock(registrationMutex_);
-  std::vector<Page> pages;
-  pages.reserve(pages_.size());
-  for (auto& entry : pages_) {
-    pages.emplace_back(Page{entry.first, entry.second.name});
-  }
-  return pages;
-}
-
-void Inspector::registerGlobalContext(std::string title, JSGlobalContextRef ctx) {
-  std::lock_guard<std::mutex> lock(registrationMutex_);
-  auto controller = folly::make_unique<InspectorController>(getGlobalObject(ctx));
-  auto pageId = numPages_++;
-  pages_.emplace(
-    std::piecewise_construct,
-    std::forward_as_tuple(pageId),
-    std::forward_as_tuple(std::move(title), std::move(controller)));
-}
-
-void Inspector::unregisterGlobalContext(JSGlobalContextRef ctx) {
-  std::lock_guard<std::mutex> lock(registrationMutex_);
-  auto& globalObject = getGlobalObject(ctx);
-  for (auto it = pages_.begin(); it != pages_.end(); it++) {
-    auto& page = it->second;
-    if (page.controller->getGlobalObject().globalExec() == globalObject.globalExec()) {
-      if (page.connection_) {
-        page.connection_->terminate(true);
-      }
-      pages_.erase(it);
-      return;
-    }
-  }
-}
-
-std::unique_ptr<Inspector::LocalConnection> Inspector::connect(int pageId, std::unique_ptr<RemoteConnection> remote) {
-  std::lock_guard<std::mutex> lock(registrationMutex_);
-  return folly::make_unique<LocalConnection>(pages_.at(pageId).connect(std::move(remote)));
-}
-
-void Inspector::disconnect(int pageId) {
-  std::lock_guard<std::mutex> lock(registrationMutex_);
-  pages_.at(pageId).controller->onDisconnect();
-}
-
-std::shared_ptr<Inspector::DuplexConnection> Inspector::PageHolder::connect(std::unique_ptr<RemoteConnection> remote) {
-  if (connection_) {
-    throw std::runtime_error("Already connected");
-  }
-  connection_ = std::make_shared<DuplexConnection>(*this, std::move(remote));
-  controller->onConnect([connection = connection_](std::string message) {
-    connection->sendToRemote(std::move(message));
-  });
-  return connection_;
-}
-
-Inspector::DuplexConnection::DuplexConnection(PageHolder& page, std::unique_ptr<RemoteConnection> remoteConnection)
-    : page_(page)
-    , remoteConnection_(std::move(remoteConnection)) {}
-
-Inspector::DuplexConnection::~DuplexConnection() {
-  if (remoteConnection_) {
-    LOG(FATAL) << "DuplexConnection wasn't terminated before destruction";
-  }
-}
-
-void Inspector::DuplexConnection::sendToRemote(std::string message) {
-  std::lock_guard<std::mutex> lock(remoteMutex_);
-  if (!remoteConnection_) {
-    return;
-  }
-
-  remoteConnection_->onMessage(std::move(message));
-}
-
-void Inspector::DuplexConnection::sendToLocal(std::string message) {
-  std::lock_guard<std::mutex> lock(localMutex_);
-  if (!remoteConnection_) {
-    return;
-  }
-
-  page_.controller->onMessage(std::move(message));
-}
-
-void Inspector::DuplexConnection::terminate(bool local) {
-  std::lock_guard<std::mutex> lockLocal(localMutex_);
-  {
-    // Temp lock here so we can still send going away message
-    std::lock_guard<std::mutex> lockRemote(remoteMutex_);
-    if (!remoteConnection_) {
-      // Already disconnected
-      return;
-    }
-  }
-
-  if (local) {
-    page_.controller->onGoingAway();
-  }
-  std::lock_guard<std::mutex> lockRemote(remoteMutex_);
-
-  auto remoteConnection = std::move(remoteConnection_);
-  if (local) {
-    remoteConnection->onDisconnect();
-  }
-  page_.controller->onDisconnect();
-  // This kills us
-  page_.connection_.reset();
-}
-
-}
-}
diff --git a/ReactCommon/inspector/Inspector.h b/ReactCommon/inspector/Inspector.h
deleted file mode 100644
index 0f4177b53d6db1..00000000000000
--- a/ReactCommon/inspector/Inspector.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#pragma once
-
-#include <memory>
-#include <string>
-#include <vector>
-#include <unordered_map>
-#include <mutex>
-
-#include <JavaScriptCore/JSBase.h>
-#undef WTF_EXPORT_PRIVATE
-
-namespace facebook {
-namespace react {
-
-class InspectorController;
-class Sender;
-/**
- * The inspector exposes method to query for available 'pages' and connect to a specific one.
- * Available Javascript contextes needs to be registered when they are created and removed when
- * they are torn down.
- */
-class Inspector {
-private:
-  class DuplexConnection;
-public:
-  struct Page {
-    const int id;
-    const std::string title;
-  };
-
-  struct RemoteConnection {
-    virtual ~RemoteConnection() = default;
-    virtual void onMessage(std::string message) = 0;
-    virtual void onDisconnect() = 0;
-  };
-
-  class LocalConnection {
-  public:
-    void sendMessage(std::string message);
-    void disconnect();
-
-    LocalConnection(std::shared_ptr<DuplexConnection> duplexConnection);
-  private:
-    std::shared_ptr<DuplexConnection> duplexConnection_;
-  };
-
-  static Inspector& instance();
-
-  void registerGlobalContext(std::string title, JSGlobalContextRef ctx);
-  void unregisterGlobalContext(JSGlobalContextRef ctx);
-
-  std::vector<Page> getPages() const;
-  std::unique_ptr<LocalConnection> connect(int pageId, std::unique_ptr<RemoteConnection> remote);
-private:
-  struct PageHolder;
-
-  class DuplexConnection {
-  public:
-    DuplexConnection(PageHolder& page, std::unique_ptr<RemoteConnection> remoteConnection);
-    ~DuplexConnection();
-
-    void sendToRemote(std::string message);
-    void sendToLocal(std::string message);
-    void terminate(bool local);
-  private:
-    PageHolder& page_;
-    std::unique_ptr<RemoteConnection> remoteConnection_;
-    std::mutex localMutex_;
-    std::mutex remoteMutex_;
-  };
-
-  struct PageHolder {
-    PageHolder(std::string name, std::unique_ptr<InspectorController> controller);
-    ~PageHolder();
-
-    std::shared_ptr<DuplexConnection> connect(std::unique_ptr<RemoteConnection> remote);
-
-    const std::string name;
-    std::unique_ptr<InspectorController> controller;
-    std::shared_ptr<DuplexConnection> connection_;
-  };
-
-  Inspector() {};
-  void disconnect(int pageId);
-
-  int numPages_ = 0;
-  std::unordered_map<int, PageHolder> pages_;
-  mutable std::mutex registrationMutex_;
-};
-
-}
-}
diff --git a/ReactCommon/inspector/InspectorAgent.cpp b/ReactCommon/inspector/InspectorAgent.cpp
deleted file mode 100644
index d94176059ae779..00000000000000
--- a/ReactCommon/inspector/InspectorAgent.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#include "InspectorAgent.h"
-
-namespace facebook {
-namespace react {
-
-InspectorAgent::InspectorAgent() {
-  auto emptyMethod = [](folly::dynamic) -> folly::dynamic {
-    return nullptr;
-  };
-
-  registerMethod("enable", emptyMethod);
-  registerMethod("disable", emptyMethod);
-}
-
-void InspectorAgent::detach() {
-  sendEvent("detached", folly::dynamic::object("reason", "target_closed"));
-}
-
-}
-}
diff --git a/ReactCommon/inspector/InspectorAgent.h b/ReactCommon/inspector/InspectorAgent.h
deleted file mode 100644
index 569e73f79d5104..00000000000000
--- a/ReactCommon/inspector/InspectorAgent.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#pragma once
-
-#include "Agent.h"
-
-namespace facebook {
-namespace react {
-
-class InspectorAgent : public Agent {
-public:
-  InspectorAgent();
-
-  void detach();
-private:
-  std::string getDomain() override {
-    return "Inspector";
-  }
-};
-
-}
-}
diff --git a/ReactCommon/inspector/InspectorController.cpp b/ReactCommon/inspector/InspectorController.cpp
deleted file mode 100644
index d04525cdd70fa6..00000000000000
--- a/ReactCommon/inspector/InspectorController.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#include "InspectorController.h"
-
-#include "Error.h"
-#include "Agent.h"
-#include "LegacyInspectorEnvironment.h"
-#include "InspectorAgent.h"
-#include "PageAgent.h"
-#include "ConsoleAgent.h"
-#include "JSDispatcher.h"
-#include "LegacyAgents.h"
-
-#include <folly/Memory.h>
-#include <folly/Conv.h>
-#include <folly/json.h>
-
-namespace facebook {
-namespace react {
-
-class ConcreteChannel : public Channel {
-public:
-  ConcreteChannel(Receiver receiver)
-  : receiver_(std::move(receiver)) {}
-
-  void sendMessage(std::string message) override {
-    receiver_(std::move(message));
-  }
-
-  void registerDomain(std::string domain, MessageHandler handler) override {
-    domains_.emplace(std::move(domain), std::move(handler));
-  }
-
-  std::unordered_map<std::string, MessageHandler>& getDomains() {
-    return domains_;
-  }
-private:
-  std::unordered_map<std::string, MessageHandler> domains_;
-  Receiver receiver_;
-};
-
-class MessageRouter {
-public:
-  MessageRouter(ConcreteChannel* channel)
-  : channel_(channel) {
-    CHECK(channel_) << "Channel is null";
-  }
-
-  /*
-   * Messages are in JSON, formatted like:
-   * {
-   *   "id": 1,
-   *   "method": "Debugger.removeBreakpoint",
-   *   "params": { "removeBreakpoint": "xyz" }
-   * }
-   */
-  void route(std::string message) {
-    try {
-      auto json = parseJson(message);
-      auto callId = getCallId(json);
-      receive(callId, std::move(message), std::move(json));
-    } catch (const InspectorException& e) {
-      channel_->sendMessage(e.error());
-    }
-  }
-private:
-  void receive(int callId, std::string message, folly::dynamic json) {
-    try {
-      auto method = Method::parse(json["method"].asString());
-      auto& handler = getHandler(method.domain());
-      handler(std::move(message), callId, method.name(), std::move(json["params"]));
-    } catch (const InspectorException& e) {
-      throw e.withCallId(callId);
-    } catch (const std::exception& e) {
-      LOG(ERROR) << "Dispatcher failed: " << e.what();
-      throw InspectorException(callId, ErrorCode::ServerError, "Internal error");
-    } catch (...) {
-      throw InspectorException(callId, ErrorCode::ServerError, "Internal error");
-    }
-  }
-
-  folly::dynamic parseJson(const std::string& message) {
-    try {
-      return folly::parseJson(message);
-    } catch (const std::runtime_error& e) {
-      throw InspectorException(ErrorCode::ParseError, "Message must be in JSON format");
-    }
-  }
-
-  int getCallId(folly::dynamic& json) {
-    auto& id = json["id"];
-    if (!id.isInt()) {
-      throw InspectorException(ErrorCode::InvalidRequest, "The type of 'id' property must be number");
-    } else {
-      return id.asInt();
-    }
-  }
-
-  Channel::MessageHandler& getHandler(const std::string& domain) {
-    try {
-      auto& domains = channel_->getDomains();
-      return domains.at(domain);
-    } catch (const std::out_of_range& e) {
-      throw InspectorException(ErrorCode::MethodNotFound, folly::to<std::string>("Unknown domain: '", domain, "'"));
-    }
-  }
-
-  ConcreteChannel* channel_;
-};
-
-class SchemaAgent : public Agent {
-public:
-  SchemaAgent() {
-    registerMethod("getDomains", [this](folly::dynamic) -> folly::dynamic {
-      CHECK(channel_) << "Channel is null";
-      folly::dynamic names = folly::dynamic::array;
-      auto& domains = channel_->getDomains();
-      for (auto& entry : domains) {
-        // TODO(blom): Actually get version?
-        names.push_back(folly::dynamic::object("name", entry.first)("version", "1.0"));
-      }
-      return names;
-    });
-  }
-
-  void onConnect(std::shared_ptr<Channel> channel) override {
-    Agent::onConnect(channel);
-    channel_ = std::static_pointer_cast<ConcreteChannel>(channel);
-  }
-private:
-  std::shared_ptr<ConcreteChannel> channel_;
-
-  std::string getDomain() override {
-    return "Schema";
-  }
-};
-
-InspectorController::InspectorController(JSC::JSGlobalObject& globalObject)
-    : globalObject_(globalObject) {
-  auto environment = folly::make_unique<LegacyInspectorEnvironment>();
-  auto inspectorAgent = folly::make_unique<InspectorAgent>();
-  inspectorAgent_ = inspectorAgent.get();
-  dispatchers_.push_back(std::move(inspectorAgent));
-  dispatchers_.push_back(folly::make_unique<SchemaAgent>());
-  dispatchers_.push_back(folly::make_unique<PageAgent>());
-  dispatchers_.push_back(folly::make_unique<JSDispatcher>(globalObject));
-
-  auto consoleAgent = folly::make_unique<ConsoleAgent>(globalObject, environment->injectedScriptManager());
-  auto legacyAgents = folly::make_unique<LegacyAgents>(globalObject, std::move(environment), consoleAgent.get());
-
-  dispatchers_.push_back(std::move(consoleAgent));
-  dispatchers_.push_back(std::move(legacyAgents));
-}
-
-InspectorController::~InspectorController() {
-  CHECK(!channel_) << "Wasn't disconnected";
-}
-
-void InspectorController::onConnect(Receiver receiver) {
-  CHECK(!channel_) << "Already connected";
-
-  channel_ = std::make_shared<ConcreteChannel>(std::move(receiver));
-
-  for (auto& dispatcher : dispatchers_) {
-    dispatcher->onConnect(channel_);
-  }
-}
-
-void InspectorController::onMessage(std::string message) {
-  CHECK(channel_) << "Not connected";
-
-  MessageRouter(channel_.get()).route(message);
-}
-
-void InspectorController::onGoingAway() {
-  CHECK(channel_) << "Not connected";
-
-  inspectorAgent_->detach();
-}
-
-void InspectorController::onDisconnect() {
-  CHECK(channel_) << "Not connected";
-
-  for (auto& dispatcher : dispatchers_) {
-    dispatcher->onDisconnect();
-  }
-
-  channel_.reset();
-}
-
-}
-}
diff --git a/ReactCommon/inspector/InspectorController.h b/ReactCommon/inspector/InspectorController.h
deleted file mode 100644
index 2281e9929588c2..00000000000000
--- a/ReactCommon/inspector/InspectorController.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#pragma once
-
-#include "Dispatcher.h"
-
-#include <memory>
-#include <vector>
-#include <unordered_map>
-
-namespace JSC {
-class JSGlobalObject;
-}
-
-namespace facebook {
-namespace react {
-
-class ConcreteChannel;
-class InspectorAgent;
-
-using Receiver = std::function<void(std::string)>;
-
-class InspectorController {
-public:
-  InspectorController(JSC::JSGlobalObject& globalObject);
-  ~InspectorController();
-
-  JSC::JSGlobalObject& getGlobalObject() const { return globalObject_; }
-
-  void onConnect(Receiver receiver);
-  void onMessage(std::string message);
-  void onGoingAway();
-  void onDisconnect();
-private:
-  JSC::JSGlobalObject& globalObject_;
-  std::shared_ptr<ConcreteChannel> channel_;
-  std::vector<std::unique_ptr<Dispatcher>> dispatchers_;
-  InspectorAgent* inspectorAgent_;
-};
-
-}
-}
diff --git a/ReactCommon/inspector/JSDispatcher.cpp b/ReactCommon/inspector/JSDispatcher.cpp
deleted file mode 100644
index 2920626dbdbfd7..00000000000000
--- a/ReactCommon/inspector/JSDispatcher.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#include "JSDispatcher.h"
-
-#include "Protocol.h"
-#include "Util.h"
-
-#include <jschelpers/JSCHelpers.h>
-
-#include <JavaScriptCore/APICast.h>
-#include <JavaScriptCore/JSContextRef.h>
-#include <JavaScriptCore/JSObjectRef.h>
-#include <JavaScriptCore/JSStringRef.h>
-
-#include <folly/json.h>
-
-#include <exception>
-
-namespace facebook {
-namespace react {
-
-namespace {
-
-static JSValueRef nativeRegisterAgent(
-    JSDispatcher* agent,
-    JSContextRef ctx,
-    JSObjectRef thisObject,
-    size_t argumentCount,
-    const JSValueRef arguments[]) {
-  CHECK(argumentCount == 1) << "__registerInspectorAgent takes 1 arg";
-  auto execState = toJS(ctx);
-  JSC::JSLockHolder lock(execState);
-  auto globalContext = JSContextGetGlobalContext(ctx);
-  agent->addAgent(
-    execState,
-    Value(globalContext, arguments[0]).asObject());
-  return JSValueMakeUndefined(ctx);
-}
-
-static JSValueRef nativeSendEvent(
-    JSDispatcher* agent,
-    const std::string& domain,
-    JSContextRef ctx,
-    JSObjectRef thisObject,
-    size_t argumentCount,
-    const JSValueRef arguments[]) {
-  CHECK(argumentCount == 2) << "sendEvent takes 2 args";
-  auto execState = toJS(ctx);
-  JSC::JSLockHolder lock(execState);
-  auto globalContext = JSContextGetGlobalContext(ctx);
-  auto params = folly::parseJson(Value(globalContext, arguments[1]).toJSONString());
-  agent->sendEvent(
-    domain,
-    Value(globalContext, arguments[0]).toString().str(),
-    std::move(params));
-  return JSValueMakeUndefined(ctx);
-}
-
-static JSValueRef nativeInspectorTimestamp(
-    JSContextRef ctx,
-    JSObjectRef function,
-    JSObjectRef thisObject,
-    size_t argumentCount,
-    const JSValueRef arguments[],
-    JSValueRef *exception) {
-  return JSValueMakeNumber(ctx, Timestamp::now());
-}
-
-}
-
-JSDispatcher::JSDispatcher(JSC::JSGlobalObject& globalObject) {
-  using namespace std::placeholders;
-  JSGlobalContextRef context = toGlobalRef(globalObject.globalExec());
-  installGlobalFunction(context, "__registerInspectorAgent", std::bind(&nativeRegisterAgent, this, _1, _2, _3, _4));
-  installGlobalFunction(context, "__inspectorTimestamp", &nativeInspectorTimestamp);
-}
-
-void JSDispatcher::onConnect(std::shared_ptr<Channel> channel) {
-  channel_ = std::move(channel);
-
-  for (auto& pair : agents_) {
-    registerAgent(pair.first);
-  }
-}
-
-void JSDispatcher::onDisconnect() {
-  channel_.reset();
-}
-
-void JSDispatcher::addAgent(JSC::ExecState* execState, Object agentType) {
-  auto context = agentType.context();
-  auto domainObject = agentType.getProperty("DOMAIN");
-  if (domainObject.isUndefined()) {
-    throw std::invalid_argument("DOMAIN should be string");
-  }
-  auto domain = domainObject.toString().str();
-  // Bind the domain to the send event function
-  using namespace std::placeholders;
-  Value sendEventFunction = Object(
-    context,
-    makeFunction(context, "sendEvent",  std::bind(&nativeSendEvent, this, domain, _1, _2, _3, _4)));
-  auto agent = agentType.callAsConstructor({ sendEventFunction });
-  agent.makeProtected();
-
-  if (channel_) {
-    registerAgent(domain);
-  }
-  agents_.emplace(std::move(domain), std::move(agent));
-}
-
-void JSDispatcher::registerAgent(const std::string& name) {
-  channel_->registerDomain(
-    name,
-    [this, name](std::string, int callId, const std::string& methodName, folly::dynamic args) {
-      Object& agent = agents_.at(name);
-      auto context = agent.context();
-      JSC::JSLockHolder lock(toJS(context));
-      // TODO(blom): Check undefined before asObject
-      auto method = agent.getProperty(methodName.c_str()).asObject();
-      if (args.isNull()) {
-        args = folly::dynamic::object;
-      }
-      auto response = method.callAsFunction(agent, { Value::fromDynamic(context, args) });
-      auto result = (response.isUndefined() || response.isNull()) ? folly::dynamic::object() : folly::parseJson(response.toJSONString());
-      auto message = folly::dynamic::object("id", callId)("result", std::move(result));
-      channel_->sendMessage(folly::toJson(std::move(message)));
-    });
-}
-
-void JSDispatcher::sendEvent(std::string domain, std::string name, folly::dynamic params) {
-  channel_->sendMessage(Event(std::move(domain), std::move(name), std::move(params)));
-}
-
-}
-}
diff --git a/ReactCommon/inspector/JSDispatcher.h b/ReactCommon/inspector/JSDispatcher.h
deleted file mode 100644
index b9330301e05678..00000000000000
--- a/ReactCommon/inspector/JSDispatcher.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#pragma once
-
-#include "Dispatcher.h"
-
-#include <JavaScriptCore/config.h>
-#include <JavaScriptCore/JSValueRef.h>
-
-#include <jschelpers/Value.h>
-
-#include <unordered_map>
-
-namespace JSC {
-class JSGlobalObject;
-class JSObject;
-class ExecState;
-class JSArray;
-}
-
-namespace facebook {
-namespace react {
-
-/*
- * A dispatcher that allows agents to be implemented in Javascript. Provides the global method
- * __registerInspectorAgent to register a JS agent.
- */
-class JSDispatcher : public Dispatcher {
-public:
-  JSDispatcher(JSC::JSGlobalObject& globalObject);
-
-  void onConnect(std::shared_ptr<Channel> channel) override;
-  void onDisconnect() override;
-
-  void addAgent(JSC::ExecState* execState, Object agentType);
-  void registerAgent(const std::string& name);
-
-  void sendEvent(std::string domain, std::string name, folly::dynamic params);
-private:
-  std::shared_ptr<Channel> channel_;
-
-  std::unordered_map<std::string, Object> agents_;
-};
-
-}
-}
diff --git a/ReactCommon/inspector/LegacyAgents.cpp b/ReactCommon/inspector/LegacyAgents.cpp
deleted file mode 100644
index 2ccd2eb693018b..00000000000000
--- a/ReactCommon/inspector/LegacyAgents.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#include "LegacyAgents.h"
-
-#include "LegacyInspectorEnvironment.h"
-#include "LegacyRuntimeAgent.h"
-#include "LegacyDebuggerAgent.h"
-
-#include <JavaScriptCore/config.h>
-#include <JavaScriptCore/JSGlobalObject.h>
-#include <folly/Memory.h>
-
-namespace facebook {
-namespace react {
-
-using namespace Inspector;
-
-LegacyAgents::LegacyAgents(
-  JSC::JSGlobalObject& globalObject,
-  std::unique_ptr<LegacyInspectorEnvironment> environment,
-  ConsoleAgent* consoleAgent)
-    : LegacyDispatcher(globalObject)
-    , environment_(std::move(environment)) {
-  auto injectedScriptManager = environment_->injectedScriptManager();
-  auto runtimeAgent = folly::make_unique<LegacyRuntimeAgent>(injectedScriptManager, globalObject);
-  auto debuggerAgent = folly::make_unique<LegacyDebuggerAgent>(injectedScriptManager, globalObject, consoleAgent);
-
-  runtimeAgent->setScriptDebugServer(&debuggerAgent->scriptDebugServer());
-
-  addAgent("Runtime", std::move(runtimeAgent));
-  addAgent("Debugger", std::move(debuggerAgent));
-}
-
-}
-}
diff --git a/ReactCommon/inspector/LegacyAgents.h b/ReactCommon/inspector/LegacyAgents.h
deleted file mode 100644
index 36650d7a8885cc..00000000000000
--- a/ReactCommon/inspector/LegacyAgents.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#pragma once
-
-#include "LegacyDispatcher.h"
-
-namespace JSC {
-class JSGlobalObject;
-}
-
-namespace facebook {
-namespace react {
-
-class LegacyInspectorEnvironment;
-class ConsoleAgent;
-
-/*
- * An dispatcher that provides the existing agents in JavaScriptCore.
- */
-class LegacyAgents : public LegacyDispatcher {
-public:
-  LegacyAgents(
-    JSC::JSGlobalObject& globalObject,
-    std::unique_ptr<LegacyInspectorEnvironment> environment,
-    ConsoleAgent* consoleAgent);
-private:
-  std::unique_ptr<LegacyInspectorEnvironment> environment_;
-  ConsoleAgent* consoleAgent_;
-};
-
-}
-}
diff --git a/ReactCommon/inspector/LegacyDebuggerAgent.cpp b/ReactCommon/inspector/LegacyDebuggerAgent.cpp
deleted file mode 100644
index 20b71a0dabf1c4..00000000000000
--- a/ReactCommon/inspector/LegacyDebuggerAgent.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#include "LegacyDebuggerAgent.h"
-
-#include "Util.h"
-
-#include <JavaScriptCore/InjectedScript.h>
-#include <JavaScriptCore/InjectedScriptManager.h>
-#include <JavaScriptCore/JSGlobalObject.h>
-
-namespace facebook {
-namespace react {
-
-using namespace Inspector;
-
-LegacyDebuggerAgent::LegacyDebuggerAgent(InjectedScriptManager* injectedScriptManager, JSC::JSGlobalObject& globalObject, ConsoleAgent* consoleAgent)
-  : InspectorDebuggerAgent(injectedScriptManager)
-  , scriptDebugServer_(globalObject)
-  , consoleAgent_(consoleAgent) {}
-
-void LegacyDebuggerAgent::startListeningScriptDebugServer() {
-  scriptDebugServer().addListener(this);
-}
-
-void LegacyDebuggerAgent::stopListeningScriptDebugServer(bool isBeingDestroyed) {
-  scriptDebugServer().removeListener(this, isBeingDestroyed);
-}
-
-InjectedScript LegacyDebuggerAgent::injectedScriptForEval(ErrorString* error, const int* executionContextId) {
-  if (executionContextId) {
-    *error = ASCIILiteral("Execution context id is not supported for JSContext inspection as there is only one execution context.");
-    return InjectedScript();
-  }
-
-  JSC::ExecState* exec = scriptDebugServer_.globalObject().globalExec();
-  return injectedScriptManager()->injectedScriptFor(exec);
-}
-
-void LegacyDebuggerAgent::breakpointActionLog(JSC::ExecState* exec, const String& message) {
-  consoleAgent_->log(exec, toStdString(message));
-}
-
-}
-}
diff --git a/ReactCommon/inspector/LegacyDebuggerAgent.h b/ReactCommon/inspector/LegacyDebuggerAgent.h
deleted file mode 100644
index 08bf34ce59e62a..00000000000000
--- a/ReactCommon/inspector/LegacyDebuggerAgent.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#pragma once
-
-#include "ConsoleAgent.h"
-#include "LegacyScriptDebugServer.h"
-
-#include <JavaScriptCore/config.h>
-#include <JavaScriptCore/InspectorDebuggerAgent.h>
-#include <JavaScriptCore/InspectorConsoleAgent.h>
-
-namespace JSC {
-class JSGlobalObject;
-}
-
-namespace facebook {
-namespace react {
-
-class LegacyDebuggerAgent : public Inspector::InspectorDebuggerAgent {
-public:
-  LegacyDebuggerAgent(Inspector::InjectedScriptManager*, JSC::JSGlobalObject&, ConsoleAgent*);
-
-  virtual LegacyScriptDebugServer& scriptDebugServer() override { return scriptDebugServer_; }
-
-  virtual void startListeningScriptDebugServer() override;
-  virtual void stopListeningScriptDebugServer(bool isBeingDestroyed) override;
-  virtual Inspector::InjectedScript injectedScriptForEval(Inspector::ErrorString*, const int* executionContextId) override;
-
-  virtual void breakpointActionLog(JSC::ExecState*, const String&) override;
-
-  virtual void muteConsole() override { }
-  virtual void unmuteConsole() override { }
-
-private:
-  LegacyScriptDebugServer scriptDebugServer_;
-  ConsoleAgent* consoleAgent_;
-};
-
-}
-}
diff --git a/ReactCommon/inspector/LegacyDispatcher.cpp b/ReactCommon/inspector/LegacyDispatcher.cpp
deleted file mode 100644
index 8fa7d7aebb602e..00000000000000
--- a/ReactCommon/inspector/LegacyDispatcher.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#include "LegacyDispatcher.h"
-
-#include "Util.h"
-
-#include <wtf/text/CString.h>
-#include <JavaScriptCore/JSGlobalObject.h>
-#include <JavaScriptCore/JSLock.h>
-
-namespace facebook {
-namespace react {
-
-using namespace Inspector;
-
-LegacyDispatcher::FrontendChannel::FrontendChannel(std::shared_ptr<Channel> channel)
-: channel_(channel) {}
-
-bool LegacyDispatcher::FrontendChannel::sendMessageToFrontend(const WTF::String& message) {
-  channel_->sendMessage(toStdString(message));
-  return true;
-}
-
-LegacyDispatcher::LegacyDispatcher(JSC::JSGlobalObject& globalObject)
-  : globalObject_(globalObject) {}
-
-void LegacyDispatcher::addAgent(std::string domain, std::unique_ptr<InspectorAgentBase> agent) {
-  domains_.emplace_back(std::move(domain));
-  agents_.append(std::move(agent));
-}
-
-void LegacyDispatcher::onConnect(std::shared_ptr<Channel> channel) {
-  // TODO: Should perhaps only create this once and then connect each time instead
-  frontendChannel_ = std::make_unique<FrontendChannel>(channel);
-  dispatcher_.reset(InspectorBackendDispatcher::create(frontendChannel_.get()).leakRef());
-
-  auto messageHandler = [this](std::string message, int, const std::string&, folly::dynamic) {
-    JSC::JSLockHolder lock(globalObject_.globalExec());
-    dispatcher_->dispatch(message.c_str());
-  };
-  for (auto& domain : domains_) {
-    channel->registerDomain(domain, messageHandler);
-  }
-
-  agents_.didCreateFrontendAndBackend(frontendChannel_.get(), dispatcher_.get());
-}
-
-void LegacyDispatcher::onDisconnect() {
-  // TODO: Perhaps support InspectedTargetDestroyed
-  agents_.willDestroyFrontendAndBackend(InspectorDisconnectReason::InspectorDestroyed);
-}
-
-}
-}
diff --git a/ReactCommon/inspector/LegacyDispatcher.h b/ReactCommon/inspector/LegacyDispatcher.h
deleted file mode 100644
index 96e617d7394880..00000000000000
--- a/ReactCommon/inspector/LegacyDispatcher.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#pragma once
-
-#include "Dispatcher.h"
-
-#include <JavaScriptCore/config.h>
-#include <JavaScriptCore/InspectorAgentRegistry.h>
-#include <JavaScriptCore/InspectorAgentBase.h>
-#include <JavaScriptCore/InspectorFrontendChannel.h>
-#include <JavaScriptCore/InspectorBackendDispatcher.h>
-
-#include <memory>
-#include <vector>
-
-namespace JSC {
-class JSGlobalObject;
-}
-
-namespace facebook {
-namespace react {
-
-/*
- * An dispatcher that is able to register JavaScriptCore agents that extend the InspectorAgentBase
- * base class.
- */
-class LegacyDispatcher : public Dispatcher {
-public:
-  LegacyDispatcher(JSC::JSGlobalObject& globalObject);
-  void addAgent(std::string domain, std::unique_ptr<Inspector::InspectorAgentBase> agent);
-
-  void onConnect(std::shared_ptr<Channel> channel) override;
-  void onDisconnect() override;
-private:
-  class FrontendChannel : public Inspector::InspectorFrontendChannel {
-  public:
-    FrontendChannel(std::shared_ptr<Channel> channel);
-    bool sendMessageToFrontend(const WTF::String& message) override;
-  private:
-    std::shared_ptr<Channel> channel_;
-  };
-
-  JSC::JSGlobalObject& globalObject_;
-  std::vector<std::string> domains_;
-  Inspector::InspectorAgentRegistry agents_;
-
-  std::unique_ptr<FrontendChannel> frontendChannel_;
-  std::unique_ptr<Inspector::InspectorBackendDispatcher> dispatcher_;
-};
-
-}
-}
diff --git a/ReactCommon/inspector/LegacyInspectorEnvironment.cpp b/ReactCommon/inspector/LegacyInspectorEnvironment.cpp
deleted file mode 100644
index 2a010d923a5a23..00000000000000
--- a/ReactCommon/inspector/LegacyInspectorEnvironment.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#include "LegacyInspectorEnvironment.h"
-
-#include <JavaScriptCore/config.h>
-#include <JavaScriptCore/Completion.h>
-#include <JavaScriptCore/JSGlobalObject.h>
-#include <JavaScriptCore/InjectedScriptManager.h>
-#include <JavaScriptCore/InjectedScriptHost.h>
-
-#include <folly/Memory.h>
-
-namespace facebook {
-namespace react {
-
-using namespace Inspector;
-
-LegacyInspectorEnvironment::LegacyInspectorEnvironment()
-    : injectedScriptManager_(folly::make_unique<InjectedScriptManager>(*this, InjectedScriptHost::create())) {}
-
-LegacyInspectorEnvironment::~LegacyInspectorEnvironment() {
-  injectedScriptManager_->disconnect();
-}
-
-InspectorFunctionCallHandler LegacyInspectorEnvironment::functionCallHandler() const {
-  return JSC::call;
-}
-
-InspectorEvaluateHandler LegacyInspectorEnvironment::evaluateHandler() const {
-  return JSC::evaluate;
-}
-
-}
-}
diff --git a/ReactCommon/inspector/LegacyInspectorEnvironment.h b/ReactCommon/inspector/LegacyInspectorEnvironment.h
deleted file mode 100644
index 00ec902058c8ce..00000000000000
--- a/ReactCommon/inspector/LegacyInspectorEnvironment.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#pragma once
-
-#include <JavaScriptCore/config.h>
-#include <JavaScriptCore/InspectorEnvironment.h>
-
-namespace Inspector {
-class InjectedScriptManager;
-}
-
-namespace facebook {
-namespace react {
-
-class LegacyInspectorEnvironment : public Inspector::InspectorEnvironment {
-public:
-  LegacyInspectorEnvironment();
-  ~LegacyInspectorEnvironment();
-
-  Inspector::InjectedScriptManager* injectedScriptManager() const {
-    return injectedScriptManager_.get();
-  }
-private:
-  std::unique_ptr<Inspector::InjectedScriptManager> injectedScriptManager_;
-
-  bool developerExtrasEnabled() const override { return true; }
-  bool canAccessInspectedScriptState(JSC::ExecState*) const override { return true; }
-  Inspector::InspectorFunctionCallHandler functionCallHandler() const override;
-  Inspector::InspectorEvaluateHandler evaluateHandler() const override;
-  void willCallInjectedScriptFunction(JSC::ExecState*, const WTF::String& scriptName, int scriptLine) override {};
-  void didCallInjectedScriptFunction(JSC::ExecState*) override {}
-};
-
-}
-}
diff --git a/ReactCommon/inspector/LegacyRuntimeAgent.cpp b/ReactCommon/inspector/LegacyRuntimeAgent.cpp
deleted file mode 100644
index f08a9d178aa4b6..00000000000000
--- a/ReactCommon/inspector/LegacyRuntimeAgent.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#include "LegacyRuntimeAgent.h"
-
-#include <JavaScriptCore/InjectedScript.h>
-#include <JavaScriptCore/InjectedScriptManager.h>
-#include <JavaScriptCore/JSGlobalObject.h>
-
-namespace facebook {
-namespace react {
-
-using namespace Inspector;
-
-LegacyRuntimeAgent::LegacyRuntimeAgent(InjectedScriptManager* injectedScriptManager, JSC::JSGlobalObject& globalObject)
-  : InspectorRuntimeAgent(injectedScriptManager)
-  , m_globalObject(globalObject) {}
-
-void LegacyRuntimeAgent::didCreateFrontendAndBackend(InspectorFrontendChannel* frontendChannel, InspectorBackendDispatcher* backendDispatcher) {
-  // m_frontendDispatcher = folly::make_unique<InspectorRuntimeFrontendDispatcher>(frontendChannel);
-  frontendChannel_ = frontendChannel;
-  m_backendDispatcher.reset(InspectorRuntimeBackendDispatcher::create(backendDispatcher, this).leakRef());
-}
-
-void LegacyRuntimeAgent::enable(ErrorString* error) {
-  InspectorRuntimeAgent::enable(error);
-
-  auto contextObject = InspectorObject::create();
-  contextObject->setNumber(ASCIILiteral("id"), 1);
-  contextObject->setBoolean(ASCIILiteral("isDefault"), true);
-  contextObject->setBoolean(ASCIILiteral("isPageContext"), true);
-  contextObject->setString(ASCIILiteral("origin"), ASCIILiteral(""));
-  contextObject->setString(ASCIILiteral("name"), ASCIILiteral("React Native"));
-
-  auto jsonMessage = InspectorObject::create();
-  jsonMessage->setString(ASCIILiteral("method"), ASCIILiteral("Runtime.executionContextCreated"));
-  auto paramsObject = InspectorObject::create();
-  paramsObject->setValue(ASCIILiteral("context"), contextObject);
-  jsonMessage->setObject(ASCIILiteral("params"), paramsObject);
-
-  frontendChannel_->sendMessageToFrontend(jsonMessage->toJSONString());
-}
-
-void LegacyRuntimeAgent::willDestroyFrontendAndBackend(InspectorDisconnectReason) {
-  frontendChannel_ = nullptr;
-  m_backendDispatcher = nullptr;
-}
-
-JSC::VM& LegacyRuntimeAgent::globalVM() {
-  return m_globalObject.vm();
-}
-
-InjectedScript LegacyRuntimeAgent::injectedScriptForEval(ErrorString* error, const int* executionContextId) {
-  JSC::ExecState* scriptState = m_globalObject.globalExec();
-  InjectedScript injectedScript = injectedScriptManager()->injectedScriptFor(scriptState);
-  if (injectedScript.hasNoValue()) {
-    *error = ASCIILiteral("Internal error: main world execution context not found.");
-  }
-
-  return injectedScript;
-}
-
-}
-}
diff --git a/ReactCommon/inspector/LegacyRuntimeAgent.h b/ReactCommon/inspector/LegacyRuntimeAgent.h
deleted file mode 100644
index e0b04aa74ff79a..00000000000000
--- a/ReactCommon/inspector/LegacyRuntimeAgent.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#pragma once
-
-#include <memory>
-
-#include <JavaScriptCore/config.h>
-#include <JavaScriptCore/InspectorRuntimeAgent.h>
-
-namespace JSC {
-class JSGlobalObject;
-}
-
-namespace facebook {
-namespace react {
-
-class LegacyRuntimeAgent : public Inspector::InspectorRuntimeAgent {
-public:
-  LegacyRuntimeAgent(Inspector::InjectedScriptManager*, JSC::JSGlobalObject&);
-
-  void enable(Inspector::ErrorString* error) override;
-
-  void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
-  void willDestroyFrontendAndBackend(Inspector::InspectorDisconnectReason) override;
-
-  JSC::VM& globalVM() override;
-  Inspector::InjectedScript injectedScriptForEval(Inspector::ErrorString* error, const int* executionContextId) override;
-
-  void muteConsole() override { }
-  void unmuteConsole() override { }
-private:
-  Inspector::InspectorFrontendChannel* frontendChannel_;
-  // std::unique_ptr<Inspector::InspectorRuntimeFrontendDispatcher> m_frontendDispatcher;
-  std::unique_ptr<Inspector::InspectorRuntimeBackendDispatcher> m_backendDispatcher;
-  JSC::JSGlobalObject& m_globalObject;
-};
-
-}
-}
diff --git a/ReactCommon/inspector/LegacyScriptDebugServer.cpp b/ReactCommon/inspector/LegacyScriptDebugServer.cpp
deleted file mode 100644
index 3453e708df2689..00000000000000
--- a/ReactCommon/inspector/LegacyScriptDebugServer.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#include "LegacyScriptDebugServer.h"
-
-#include <JavaScriptCore/JSGlobalObject.h>
-
-namespace facebook {
-namespace react {
-
-using namespace Inspector;
-
-LegacyScriptDebugServer::LegacyScriptDebugServer(JSC::JSGlobalObject& globalObject)
-  : Inspector::ScriptDebugServer(false)
-  , globalObject_(globalObject) {}
-
-void LegacyScriptDebugServer::addListener(ScriptDebugListener* listener)
-{
-  if (!listener) {
-    return;
-  }
-
-  bool wasEmpty = listeners_.isEmpty();
-  listeners_.add(listener);
-
-  // First listener. Attach the debugger to the JSGlobalObject.
-  if (wasEmpty) {
-    attach(&globalObject_);
-    recompileAllJSFunctions();
-  }
-}
-
-void LegacyScriptDebugServer::removeListener(ScriptDebugListener* listener, bool isBeingDestroyed) {
-  if (!listener) {
-    return;
-  }
-
-  listeners_.remove(listener);
-
-  // Last listener. Detach the debugger from the JSGlobalObject.
-  if (listeners_.isEmpty()) {
-    detach(&globalObject_, isBeingDestroyed ? Debugger::GlobalObjectIsDestructing : Debugger::TerminatingDebuggingSession);
-    if (!isBeingDestroyed) {
-      recompileAllJSFunctions();
-    }
-  }
-}
-
-void LegacyScriptDebugServer::recompileAllJSFunctions() {
-  JSC::Debugger::recompileAllJSFunctions(&globalObject_.vm());
-}
-
-void LegacyScriptDebugServer::runEventLoopWhilePaused() {
-  // Drop all locks so another thread can work in the VM while we are nested.
-  JSC::JSLock::DropAllLocks dropAllLocks(&globalObject_.vm());
-
-  // Spinning here is our best option, we could override the method
-  // notifyDoneProcessingDebuggerEvents but it's marked as final :(
-  while (!m_doneProcessingDebuggerEvents) {
-    usleep(10 * 1000);
-  }
-}
-
-}
-}
diff --git a/ReactCommon/inspector/LegacyScriptDebugServer.h b/ReactCommon/inspector/LegacyScriptDebugServer.h
deleted file mode 100644
index fe83804515419a..00000000000000
--- a/ReactCommon/inspector/LegacyScriptDebugServer.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#pragma once
-
-#include <JavaScriptCore/config.h>
-#include <JavaScriptCore/ScriptDebugServer.h>
-
-namespace JSC {
-class JSGlobalObject;
-}
-
-namespace facebook {
-namespace react {
-
-class LegacyScriptDebugServer : public Inspector::ScriptDebugServer {
-public:
-  LegacyScriptDebugServer(JSC::JSGlobalObject& object);
-
-  void addListener(Inspector::ScriptDebugListener* listener);
-  void removeListener(Inspector::ScriptDebugListener* listener, bool isBeingDestroyed);
-
-  JSC::JSGlobalObject& globalObject() const { return globalObject_; }
-
-  void recompileAllJSFunctions() override;
-
-private:
-  ListenerSet* getListenersForGlobalObject(JSC::JSGlobalObject*) override { return &listeners_; }
-  void didPause(JSC::JSGlobalObject*) override { }
-  void didContinue(JSC::JSGlobalObject*) override { }
-  void runEventLoopWhilePaused() override;
-  bool isContentScript(JSC::ExecState*) const override { return false; }
-
-  // NOTE: Currently all exceptions are reported at the API boundary through reportAPIException.
-  // Until a time comes where an exception can be caused outside of the API (e.g. setTimeout
-  // or some other async operation in a pure JSContext) we can ignore exceptions reported here.
-  // TODO: Should we actually ignore them?
-  void reportException(JSC::ExecState*, JSC::JSValue) const override { }
-
-  ListenerSet listeners_;
-  JSC::JSGlobalObject& globalObject_;
-};
-
-
-}
-}
diff --git a/ReactCommon/inspector/PageAgent.cpp b/ReactCommon/inspector/PageAgent.cpp
deleted file mode 100644
index 02dbb586162737..00000000000000
--- a/ReactCommon/inspector/PageAgent.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#include "PageAgent.h"
-
-namespace facebook {
-namespace react {
-
-PageAgent::PageAgent() {
-  auto emptyMethod = [](folly::dynamic args) -> folly::dynamic {
-    return nullptr;
-  };
-
-  registerMethod("enable", emptyMethod);
-  registerMethod("disable", emptyMethod);
-  registerMethod("getResourceTree", [](folly::dynamic args) -> folly::dynamic {
-    return folly::dynamic::object
-      ("frameTree", folly::dynamic::object
-        ("childFrames", folly::dynamic::array)
-        ("resources", folly::dynamic::array)
-        ("frame", folly::dynamic::object
-          ("id", "1")
-          ("loaderId", "1")
-          ("name", "main")
-          ("url", "")
-          ("securityOrigin", "")
-          ("mimeType", "application/octet-stream")));
-  });
-}
-
-}
-}
diff --git a/ReactCommon/inspector/PageAgent.h b/ReactCommon/inspector/PageAgent.h
deleted file mode 100644
index c2f747eb78990b..00000000000000
--- a/ReactCommon/inspector/PageAgent.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#pragma once
-
-#include "Agent.h"
-
-namespace facebook {
-namespace react {
-
-class PageAgent : public Agent {
-public:
-  PageAgent();
-private:
-  std::string getDomain() override {
-    return "Page";
-  }
-};
-
-}
-}
diff --git a/ReactCommon/inspector/Protocol.cpp b/ReactCommon/inspector/Protocol.cpp
deleted file mode 100644
index eb7428ede49d69..00000000000000
--- a/ReactCommon/inspector/Protocol.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#include "Protocol.h"
-
-#include "Error.h"
-
-#include <folly/dynamic.h>
-#include <folly/json.h>
-#include <folly/Conv.h>
-
-#include <chrono>
-
-namespace facebook {
-namespace react {
-
-namespace {
-
-folly::dynamic getCallId(const folly::Optional<int>& callId) {
-  if (callId.hasValue()) {
-    return callId.value();
-  } else {
-    return nullptr;
-  }
-}
-
-}
-
-Method Method::parse(const std::string& formatted) {
-  auto splitPos = formatted.find_first_of('.');
-  if (splitPos == std::string::npos) {
-    throw InspectorException(ErrorCode::InvalidRequest, "Invalid method format");
-  }
-  return Method(formatted.substr(0, splitPos), formatted.substr(splitPos + 1));
-}
-
-Method::Method(std::string domain, std::string name)
-  : domain_(std::move(domain))
-  , name_(std::move(name)) {}
-
-std::string Method::formatted() const {
-  return folly::to<std::string>(domain_, '.', name_);
-}
-
-Event::Event(std::string domain, std::string method, folly::dynamic params)
-  : method_(std::move(domain), std::move(method))
-  , params_(std::move(params)) {}
-
-Event::operator std::string() const {
-  auto event = folly::dynamic::object("method", method_.formatted());
-  if (!params_.isNull()) {
-    event("params", params_);
-  }
-
-  return folly::toJson(std::move(event));
-}
-
-namespace Timestamp {
-double now() {
-  using duration = std::chrono::duration<double, std::ratio<1>>;
-  auto epoch = std::chrono::duration_cast<duration>(
-    std::chrono::system_clock::now().time_since_epoch()
-  );
-  return epoch.count();
-}
-}
-
-Error::Error(int callId, ErrorCode code, std::string message)
-  : callId_(callId)
-  , code_(code)
-  , message_(std::move(message)) {}
-
-Error::Error(ErrorCode code, std::string message)
-  : code_(code)
-  , message_(std::move(message)) {}
-
-Error::operator std::string() const {
-  auto errorCode = static_cast<int>(code_);
-  return folly::toJson(
-    folly::dynamic::object("id", getCallId(callId_))
-    ("error", folly::dynamic::object("code", errorCode)("message", message_))
-  );
-}
-
-
-}
-}
diff --git a/ReactCommon/inspector/Protocol.h b/ReactCommon/inspector/Protocol.h
deleted file mode 100644
index 3b36ae7977dca3..00000000000000
--- a/ReactCommon/inspector/Protocol.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#pragma once
-
-#include <string>
-
-#include <folly/dynamic.h>
-#include <folly/Optional.h>
-
-namespace facebook {
-namespace react {
-
-class Method {
-public:
-  static Method parse(const std::string& formatted);
-
-  Method(std::string domain, std::string name);
-
-  const std::string& domain() const {
-    return domain_;
-  }
-
-  const std::string& name() const {
-    return name_;
-  }
-
-  std::string formatted() const;
-private:
-  std::string domain_;
-  std::string name_;
-};
-
-class Event {
-public:
-  explicit Event(std::string domain, std::string method, folly::dynamic params);
-
-  operator std::string() const;
-private:
-  Method method_;
-  folly::dynamic params_;
-};
-
-namespace Timestamp {
-  double now();
-}
-
-enum class ErrorCode {
-  ParseError = -32700,
-  InvalidRequest = -32600,
-  MethodNotFound = -32601,
-  InvalidParams = -32602,
-  InternalError = -32603,
-  ServerError = -32000,
-};
-
-class Error {
-public:
-  Error(int callId, ErrorCode code, std::string message);
-  Error(ErrorCode code, std::string message);
-
-  const std::string& message() const {
-    return message_;
-  }
-
-  ErrorCode code() const {
-    return code_;
-  }
-
-  operator std::string() const;
-private:
-  folly::Optional<int> callId_;
-  ErrorCode code_;
-  std::string message_;
-};
-
-}
-}
diff --git a/ReactCommon/inspector/README.md b/ReactCommon/inspector/README.md
deleted file mode 100644
index 67da1c7c31ede7..00000000000000
--- a/ReactCommon/inspector/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Inspector
-
-This directory implements an the Chrome debugging protocol [1]. The version used is roughly 1.1 of
-the protocol. The code here doesn't specify a transport and doesn't implement an actual server. This
-is left up to higher parts of the stack.
-
-The implementation uses multiple "dispatchers" to route messages for a specific domain. It reuses
-existing code in JavaScriptCore to handle the domains for Debugger and Runtime. For Console, Page
-and Inspector there are new implementations.
-
-## Open source
-
-The inspector currently doesn't compile in open source. This is due to how the build on Android
-where we download the JSC sources and build an artifact separately, later download the headers we
-need. The number of headers download would have to be expanded and verify that it builds correctly.
-
-[1]: https://developer.chrome.com/devtools/docs/debugger-protocol
diff --git a/ReactCommon/inspector/Util.cpp b/ReactCommon/inspector/Util.cpp
deleted file mode 100644
index 23c9ee6e156846..00000000000000
--- a/ReactCommon/inspector/Util.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#include "Util.h"
-
-namespace facebook {
-namespace react {
-
-}
-}
diff --git a/ReactCommon/inspector/Util.h b/ReactCommon/inspector/Util.h
deleted file mode 100644
index fb858bf30c66e8..00000000000000
--- a/ReactCommon/inspector/Util.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#pragma once
-
-#include <JavaScriptCore/config.h>
-#include <wtf/text/WTFString.h>
-#include <wtf/text/CString.h>
-#include <JavaScriptCore/JSContextRef.h>
-#include <JavaScriptCore/JSObjectRef.h>
-
-#include <string>
-#include <unordered_map>
-
-namespace facebook {
-namespace react {
-
-inline std::string toStdString(const WTF::String& str) {
-  return std::string(str.utf8().data());
-}
-
-template <typename T>
-class AgentMap {
-public:
-  void add(JSGlobalContextRef ctx, T* agent) {
-    map_[ctx] = agent;
-  }
-
-  void remove(T* agent) {
-    auto it = std::find_if(
-      map_.begin(),
-      map_.end(),
-      [agent](const typename MapType::value_type& entry) { return entry.second == agent; });
-    map_.erase(it);
-  }
-
-  T* get(JSGlobalContextRef ctx) {
-    return map_.at(ctx);
-  }
-private:
-  using MapType = std::unordered_map<JSGlobalContextRef, T*>;
-  MapType map_;
-};
-
-}
-}

From 95b61925b3e7c91fbdd0a94b12c4b04afc3591c5 Mon Sep 17 00:00:00 2001
From: Aaron Chiu <aaronechiu@fb.com>
Date: Tue, 14 Mar 2017 12:57:17 -0700
Subject: [PATCH 020/366] measure time between building ReactInstanceManager
 and creating ReactContext

Reviewed By: alexeylang

Differential Revision: D4705021

fbshipit-source-id: 555ad512aed5b44165091a4bcc25a8a5564d55d3
---
 .../java/com/facebook/react/bridge/ReactMarkerConstants.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java
index 996ef7e4f90e55..a3f2f8e355ceb3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java
@@ -68,4 +68,5 @@ public class ReactMarkerConstants {
   public static final String ON_HOST_PAUSE_END = "ON_HOST_PAUSE_END";
   public static final String CONVERT_CONSTANTS_START = "CONVERT_CONSTANTS_START";
   public static final String CONVERT_CONSTANTS_END = "CONVERT_CONSTANTS_END";
+  public static final String PRE_REACT_CONTEXT_END = "PRE_REACT_CONTEXT_END";
 }

From 1ca41a56c65bda2c20e9d7714cb06413e44347c9 Mon Sep 17 00:00:00 2001
From: Jonathan Keljo <jkeljo@fb.com>
Date: Tue, 14 Mar 2017 13:00:53 -0700
Subject: [PATCH 021/366] Fix ReactNative build break

Reviewed By: asp2insp

Differential Revision: D4707219

fbshipit-source-id: a7da2aa50fa812bb63ac7697c022f7b770eeb479
---
 ReactAndroid/DEFS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ReactAndroid/DEFS b/ReactAndroid/DEFS
index d54f4a601d2191..64b8d05b028c8f 100644
--- a/ReactAndroid/DEFS
+++ b/ReactAndroid/DEFS
@@ -46,7 +46,7 @@ original_android_library=android_library
 def android_library(
   name,
   deps=[],
-  plugins=[]
+  plugins=[],
   *args,
   **kwargs):
 

From 5f8e46b8b43c752642ded162b0d1a18ee46c13fa Mon Sep 17 00:00:00 2001
From: Daniel Woelfel <dww@fb.com>
Date: Tue, 14 Mar 2017 13:08:50 -0700
Subject: [PATCH 022/366] prevent undefined is not an Object exception

Reviewed By: sebmarkbage

Differential Revision: D4707119

fbshipit-source-id: 403d7c26a1910d0ed1b980f305aa2b6326f371a2
---
 .../src/renderers/shared/shared/event/EventPluginHub.js        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Libraries/Renderer/src/renderers/shared/shared/event/EventPluginHub.js b/Libraries/Renderer/src/renderers/shared/shared/event/EventPluginHub.js
index 6c4235ea423015..bba563c8c6d39d 100644
--- a/Libraries/Renderer/src/renderers/shared/shared/event/EventPluginHub.js
+++ b/Libraries/Renderer/src/renderers/shared/shared/event/EventPluginHub.js
@@ -147,6 +147,9 @@ var EventPluginHub = {
         return null;
       }
       const props = inst._currentElement.props;
+      if (!props) {
+        return null;
+      }
       listener = props[registrationName];
       if (shouldPreventMouseEvent(registrationName, inst._currentElement.type, props)) {
         return null;

From f7a81d18373f95ff5a9b8cc78b1d59080ba97cbb Mon Sep 17 00:00:00 2001
From: Kyle Mathews <mathews.kyle@gmail.com>
Date: Tue, 14 Mar 2017 13:38:39 -0700
Subject: [PATCH 023/366] Add a bit more spacing between p elements on website

Summary: Closes https://github.com/facebook/react-native/pull/12936

Differential Revision: D4707719

Pulled By: hramos

fbshipit-source-id: 1b6c8e144f5a5904b8babdc001f50db8d68086c6
---
 website/styles/react-native.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/styles/react-native.scss b/website/styles/react-native.scss
index af927e0fea8371..dcb765bd8e70be 100644
--- a/website/styles/react-native.scss
+++ b/website/styles/react-native.scss
@@ -817,7 +817,7 @@ h2 {
 }
 
 p {
-  margin: 10px 0;
+  margin: 16px 0;
 }
 
 .highlight {

From 0a475d2b32cc933ee9802e253754b6ec9cda8987 Mon Sep 17 00:00:00 2001
From: Alexey Lang <alexeylang@fb.com>
Date: Tue, 14 Mar 2017 13:44:54 -0700
Subject: [PATCH 024/366] Use performanceNow to calculate __BUNDLE_START_TIME__

Reviewed By: javache

Differential Revision: D4706142

fbshipit-source-id: aa983d9e5d5324f97ae34ec0190b1fc988d012c8
---
 packager/src/Resolver/polyfills/prelude.js     | 4 +++-
 packager/src/Resolver/polyfills/prelude_dev.js | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packager/src/Resolver/polyfills/prelude.js b/packager/src/Resolver/polyfills/prelude.js
index 0451a75bed8646..38170fa115c566 100644
--- a/packager/src/Resolver/polyfills/prelude.js
+++ b/packager/src/Resolver/polyfills/prelude.js
@@ -13,4 +13,6 @@
 
 global.__DEV__ = false;
 
-global.__BUNDLE_START_TIME__ = Date.now();
+global.__BUNDLE_START_TIME__ = global.nativePerformanceNow
+ ? global.nativePerformanceNow()
+ : Date.now();
diff --git a/packager/src/Resolver/polyfills/prelude_dev.js b/packager/src/Resolver/polyfills/prelude_dev.js
index 0f086fb9bfb426..caf05c283bd83a 100644
--- a/packager/src/Resolver/polyfills/prelude_dev.js
+++ b/packager/src/Resolver/polyfills/prelude_dev.js
@@ -13,4 +13,6 @@
 
 global.__DEV__ = true;
 
-global.__BUNDLE_START_TIME__ = Date.now();
+global.__BUNDLE_START_TIME__ = global.nativePerformanceNow
+ ? global.nativePerformanceNow()
+ : Date.now();

From bacee5ad560e5d4a6d6a090565f406f658026528 Mon Sep 17 00:00:00 2001
From: David Aurelio <davidaurelio@fb.com>
Date: Tue, 14 Mar 2017 14:53:37 -0700
Subject: [PATCH 025/366] Update worker to match command line args passed by
 Buck

Reviewed By: cpojer

Differential Revision: D4673955

fbshipit-source-id: 1886cef97a96efbe0e90b02b98f03544d5f3f155
---
 packager/src/ModuleGraph/ModuleGraph.js       |  2 +-
 .../ModuleGraph/__tests__/ModuleGraph-test.js | 19 -------------------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/packager/src/ModuleGraph/ModuleGraph.js b/packager/src/ModuleGraph/ModuleGraph.js
index b26eca8e985e64..757fe16fbc9352 100644
--- a/packager/src/ModuleGraph/ModuleGraph.js
+++ b/packager/src/ModuleGraph/ModuleGraph.js
@@ -52,7 +52,7 @@ exports.createBuildSetup = (
 
     parallel({
       graph: cb => graphWithOptions(
-        concat(defaults.runBeforeMainModule, entryPoints),
+        entryPoints,
         cb,
       ),
       moduleSystem: cb => graphOnlyModules(
diff --git a/packager/src/ModuleGraph/__tests__/ModuleGraph-test.js b/packager/src/ModuleGraph/__tests__/ModuleGraph-test.js
index d183feebcae434..4a3844c93c0e21 100644
--- a/packager/src/ModuleGraph/__tests__/ModuleGraph-test.js
+++ b/packager/src/ModuleGraph/__tests__/ModuleGraph-test.js
@@ -70,16 +70,6 @@ describe('build setup', () => {
     });
   });
 
-  it('places all modules from `defaults.runBeforeMainModule` after the polyfills', done => {
-    buildSetup(noEntryPoints, noOptions, (error, result) => {
-      const additionalModules =
-        Array.from(result.modules).slice(-defaults.runBeforeMainModule.length);
-      expect(additionalModules)
-        .toEqual(defaults.runBeforeMainModule.map(moduleFromPath));
-      done();
-    });
-  });
-
   it('places all entry points at the end', done => {
     const entryPoints = ['a', 'b', 'c'];
     buildSetup(entryPoints, noOptions, (error, result) => {
@@ -88,15 +78,6 @@ describe('build setup', () => {
       done();
     });
   });
-
-  it('concatenates `runBeforeMainModule` and entry points as `entryModules`', done => {
-    const entryPoints = ['a', 'b', 'c'];
-    buildSetup(entryPoints, noOptions, (error, result) => {
-      expect(Array.from(result.entryModules)).toEqual(
-        defaults.runBeforeMainModule.concat(entryPoints).map(moduleFromPath));
-      done();
-    });
-  });
 });
 
 function moduleFromPath(path) {

From 7e4b8ff000439a6fa1fcaaf5eff9c39295bfba51 Mon Sep 17 00:00:00 2001
From: Marc Horowitz <mhorowitz@fb.com>
Date: Tue, 14 Mar 2017 15:28:49 -0700
Subject: [PATCH 026/366] Support passing native modules to JSContext

Reviewed By: amnn

Differential Revision: D4561036

fbshipit-source-id: b096a222103e895b14cba1ec5b2bb6e72dd72c37
---
 ReactCommon/cxxreact/BUCK                 |  1 -
 ReactCommon/cxxreact/Instance.cpp         | 10 ++++++++++
 ReactCommon/cxxreact/NativeToJsBridge.cpp | 14 ++++++++++----
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/ReactCommon/cxxreact/BUCK b/ReactCommon/cxxreact/BUCK
index 45496978a27648..c82d6a8769d2eb 100644
--- a/ReactCommon/cxxreact/BUCK
+++ b/ReactCommon/cxxreact/BUCK
@@ -55,7 +55,6 @@ if THIS_IS_FBANDROID:
           # `initOnJSVMThread` to be called before the platform-specific hooks
           # have been properly initialised. Bad Times(TM).
           #     -- @ashokmenon (2017/01/03)
-          '//java/com/facebook/java2js:jni',
           react_native_target('jni/xreact/jni:jni'),
           react_native_xplat_target('cxxreact/...'),
         ],
diff --git a/ReactCommon/cxxreact/Instance.cpp b/ReactCommon/cxxreact/Instance.cpp
index c673958435e227..12a9dbe1e443ff 100644
--- a/ReactCommon/cxxreact/Instance.cpp
+++ b/ReactCommon/cxxreact/Instance.cpp
@@ -2,6 +2,7 @@
 
 #include "Instance.h"
 
+#include "CxxMessageQueue.h"
 #include "Executor.h"
 #include "MethodCall.h"
 #include "RecoverableError.h"
@@ -36,6 +37,15 @@ void Instance::initializeBridge(
     std::shared_ptr<ModuleRegistry> moduleRegistry) {
   callback_ = std::move(callback);
 
+  if (!nativeQueue) {
+    // TODO pass down a thread/queue from java, instead of creating our own.
+
+    auto queue = std::make_unique<CxxMessageQueue>();
+    std::thread t(queue->getUnregisteredRunLoop());
+    t.detach();
+    nativeQueue = std::move(queue);
+  }
+
   jsQueue->runOnQueueSync(
     [this, &jsef, moduleRegistry, jsQueue,
      nativeQueue=folly::makeMoveWrapper(std::move(nativeQueue))] () mutable {
diff --git a/ReactCommon/cxxreact/NativeToJsBridge.cpp b/ReactCommon/cxxreact/NativeToJsBridge.cpp
index 347d5ad9e750c8..56a71adfd2281e 100644
--- a/ReactCommon/cxxreact/NativeToJsBridge.cpp
+++ b/ReactCommon/cxxreact/NativeToJsBridge.cpp
@@ -95,9 +95,13 @@ NativeToJsBridge::NativeToJsBridge(
     std::shared_ptr<InstanceCallback> callback)
     : m_destroyed(std::make_shared<bool>(false))
     , m_mainExecutorToken(callback->createExecutorToken())
-    , m_delegate(
-      std::make_shared<JsToNativeBridge>(
-        this, registry, std::move(nativeQueue), callback)) {
+    , m_delegate(registry
+                 ? std::make_shared<JsToNativeBridge>(
+                     this, registry, std::move(nativeQueue), callback)
+                 : nullptr) {
+  if (!m_delegate) {
+    nativeQueue->quitSynchronous();
+  }
   std::unique_ptr<JSExecutor> mainExecutor =
     jsExecutorFactory->createJSExecutor(m_delegate, jsQueue);
   // cached to avoid locked map lookup in the common case
@@ -314,7 +318,9 @@ ExecutorToken NativeToJsBridge::getTokenForExecutor(JSExecutor& executor) {
 }
 
 void NativeToJsBridge::destroy() {
-  m_delegate->quitQueueSynchronous();
+  if (m_delegate) {
+    m_delegate->quitQueueSynchronous();
+  }
   auto* executorMessageQueueThread = getMessageQueueThread(m_mainExecutorToken);
   // All calls made through runOnExecutorQueue have an early exit if
   // m_destroyed is true. Setting this before the runOnQueueSync will cause

From 6410e256c5777147dc6f8f59ca1f7996e14b0353 Mon Sep 17 00:00:00 2001
From: Marc Horowitz <mhorowitz@fb.com>
Date: Tue, 14 Mar 2017 15:28:52 -0700
Subject: [PATCH 027/366] Decouple module callback mechanism from
 CatalystInstance

Summary:
Create a JSInstance superinterface which doesn't include all
the lifecycle stuff.

Reviewed By: AaaChiuuu

Differential Revision: D4614410

fbshipit-source-id: 16047bbcb1bb69bf36a0a13ef68f3a6aa396a991
---
 .../facebook/react/bridge/BaseJavaModule.java | 32 +++++++++----------
 .../facebook/react/bridge/CallbackImpl.java   |  8 ++---
 .../react/bridge/CatalystInstance.java        | 10 ++++--
 .../com/facebook/react/bridge/JSInstance.java | 24 ++++++++++++++
 .../facebook/react/bridge/NativeModule.java   |  2 +-
 .../react/cxxbridge/CatalystInstanceImpl.java | 20 ++++++------
 .../react/cxxbridge/JavaModuleWrapper.java    | 10 +++---
 .../react/cxxbridge/NativeModuleRegistry.java | 13 ++++----
 8 files changed, 74 insertions(+), 45 deletions(-)
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/bridge/JSInstance.java

diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseJavaModule.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseJavaModule.java
index 9fac0a18efd41f..f911938b400975 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseJavaModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseJavaModule.java
@@ -59,14 +59,14 @@ public int getJSArgumentsNeeded() {
     }
 
     public abstract @Nullable T extractArgument(
-        CatalystInstance catalystInstance, ExecutorToken executorToken, ReadableNativeArray jsArguments, int atIndex);
+        JSInstance jsInstance, ExecutorToken executorToken, ReadableNativeArray jsArguments, int atIndex);
   }
 
   static final private ArgumentExtractor<Boolean> ARGUMENT_EXTRACTOR_BOOLEAN =
       new ArgumentExtractor<Boolean>() {
         @Override
         public Boolean extractArgument(
-            CatalystInstance catalystInstance, ExecutorToken executorToken, ReadableNativeArray jsArguments, int atIndex) {
+            JSInstance jsInstance, ExecutorToken executorToken, ReadableNativeArray jsArguments, int atIndex) {
           return jsArguments.getBoolean(atIndex);
         }
       };
@@ -75,7 +75,7 @@ public Boolean extractArgument(
       new ArgumentExtractor<Double>() {
         @Override
         public Double extractArgument(
-            CatalystInstance catalystInstance, ExecutorToken executorToken, ReadableNativeArray jsArguments, int atIndex) {
+            JSInstance jsInstance, ExecutorToken executorToken, ReadableNativeArray jsArguments, int atIndex) {
           return jsArguments.getDouble(atIndex);
         }
       };
@@ -84,7 +84,7 @@ public Double extractArgument(
       new ArgumentExtractor<Float>() {
         @Override
         public Float extractArgument(
-            CatalystInstance catalystInstance, ExecutorToken executorToken, ReadableNativeArray jsArguments, int atIndex) {
+            JSInstance jsInstance, ExecutorToken executorToken, ReadableNativeArray jsArguments, int atIndex) {
           return (float) jsArguments.getDouble(atIndex);
         }
       };
@@ -93,7 +93,7 @@ public Float extractArgument(
       new ArgumentExtractor<Integer>() {
         @Override
         public Integer extractArgument(
-            CatalystInstance catalystInstance, ExecutorToken executorToken, ReadableNativeArray jsArguments, int atIndex) {
+            JSInstance jsInstance, ExecutorToken executorToken, ReadableNativeArray jsArguments, int atIndex) {
           return (int) jsArguments.getDouble(atIndex);
         }
       };
@@ -102,7 +102,7 @@ public Integer extractArgument(
       new ArgumentExtractor<String>() {
         @Override
         public String extractArgument(
-            CatalystInstance catalystInstance, ExecutorToken executorToken, ReadableNativeArray jsArguments, int atIndex) {
+            JSInstance jsInstance, ExecutorToken executorToken, ReadableNativeArray jsArguments, int atIndex) {
           return jsArguments.getString(atIndex);
         }
       };
@@ -111,7 +111,7 @@ public String extractArgument(
       new ArgumentExtractor<ReadableNativeArray>() {
         @Override
         public ReadableNativeArray extractArgument(
-            CatalystInstance catalystInstance, ExecutorToken executorToken, ReadableNativeArray jsArguments, int atIndex) {
+            JSInstance jsInstance, ExecutorToken executorToken, ReadableNativeArray jsArguments, int atIndex) {
           return jsArguments.getArray(atIndex);
         }
       };
@@ -120,7 +120,7 @@ public ReadableNativeArray extractArgument(
       new ArgumentExtractor<Dynamic>() {
         @Override
         public Dynamic extractArgument(
-            CatalystInstance catalystInstance, ExecutorToken executorToken, ReadableNativeArray jsArguments, int atIndex) {
+            JSInstance jsInstance, ExecutorToken executorToken, ReadableNativeArray jsArguments, int atIndex) {
           return DynamicFromArray.create(jsArguments, atIndex);
         }
       };
@@ -129,7 +129,7 @@ public Dynamic extractArgument(
       new ArgumentExtractor<ReadableMap>() {
         @Override
         public ReadableMap extractArgument(
-            CatalystInstance catalystInstance, ExecutorToken executorToken, ReadableNativeArray jsArguments, int atIndex) {
+            JSInstance jsInstance, ExecutorToken executorToken, ReadableNativeArray jsArguments, int atIndex) {
           return jsArguments.getMap(atIndex);
         }
       };
@@ -138,12 +138,12 @@ public ReadableMap extractArgument(
       new ArgumentExtractor<Callback>() {
         @Override
         public @Nullable Callback extractArgument(
-            CatalystInstance catalystInstance, ExecutorToken executorToken, ReadableNativeArray jsArguments, int atIndex) {
+            JSInstance jsInstance, ExecutorToken executorToken, ReadableNativeArray jsArguments, int atIndex) {
           if (jsArguments.isNull(atIndex)) {
             return null;
           } else {
             int id = (int) jsArguments.getDouble(atIndex);
-            return new CallbackImpl(catalystInstance, executorToken, id);
+            return new CallbackImpl(jsInstance, executorToken, id);
           }
         }
       };
@@ -157,11 +157,11 @@ public int getJSArgumentsNeeded() {
 
         @Override
         public Promise extractArgument(
-            CatalystInstance catalystInstance, ExecutorToken executorToken, ReadableNativeArray jsArguments, int atIndex) {
+            JSInstance jsInstance, ExecutorToken executorToken, ReadableNativeArray jsArguments, int atIndex) {
           Callback resolve = ARGUMENT_EXTRACTOR_CALLBACK
-              .extractArgument(catalystInstance, executorToken, jsArguments, atIndex);
+              .extractArgument(jsInstance, executorToken, jsArguments, atIndex);
           Callback reject = ARGUMENT_EXTRACTOR_CALLBACK
-              .extractArgument(catalystInstance, executorToken, jsArguments, atIndex + 1);
+              .extractArgument(jsInstance, executorToken, jsArguments, atIndex + 1);
           return new PromiseImpl(resolve, reject);
         }
       };
@@ -307,7 +307,7 @@ private String getAffectedRange(int startIndex, int jsArgumentsNeeded) {
     }
 
     @Override
-    public void invoke(CatalystInstance catalystInstance, ExecutorToken executorToken, ReadableNativeArray parameters) {
+    public void invoke(JSInstance jsInstance, ExecutorToken executorToken, ReadableNativeArray parameters) {
       SystraceMessage.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "callJavaModuleMethod")
           .arg("method", mTraceName)
           .flush();
@@ -329,7 +329,7 @@ public void invoke(CatalystInstance catalystInstance, ExecutorToken executorToke
         try {
           for (; i < mArgumentExtractors.length; i++) {
             mArguments[i + executorTokenOffset] = mArgumentExtractors[i].extractArgument(
-                catalystInstance, executorToken, parameters, jsArgumentsConsumed);
+                jsInstance, executorToken, parameters, jsArgumentsConsumed);
             jsArgumentsConsumed += mArgumentExtractors[i].getJSArgumentsNeeded();
           }
         } catch (UnexpectedNativeTypeException e) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CallbackImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CallbackImpl.java
index 7ba988a959fd51..aeef58ec4e8b6f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CallbackImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CallbackImpl.java
@@ -14,13 +14,13 @@
  */
 public final class CallbackImpl implements Callback {
 
-  private final CatalystInstance mCatalystInstance;
+  private final JSInstance mJSInstance;
   private final ExecutorToken mExecutorToken;
   private final int mCallbackId;
   private boolean mInvoked;
 
-  public CallbackImpl(CatalystInstance bridge, ExecutorToken executorToken, int callbackId) {
-    mCatalystInstance = bridge;
+  public CallbackImpl(JSInstance jsInstance, ExecutorToken executorToken, int callbackId) {
+    mJSInstance = jsInstance;
     mExecutorToken = executorToken;
     mCallbackId = callbackId;
     mInvoked = false;
@@ -33,7 +33,7 @@ public void invoke(Object... args) {
         "module. This callback type only permits a single invocation from "+
         "native code.");
     }
-    mCatalystInstance.invokeCallback(mExecutorToken, mCallbackId, Arguments.fromJavaArgs(args));
+    mJSInstance.invokeCallback(mExecutorToken, mCallbackId, Arguments.fromJavaArgs(args));
     mInvoked = true;
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java
index 725182227d2719..4f3640aede6dc2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java
@@ -23,7 +23,8 @@
  * Java APIs be invokable from JavaScript as well.
  */
 @DoNotStrip
-public interface CatalystInstance extends MemoryPressureListener {
+public interface CatalystInstance
+    extends MemoryPressureListener, JSInstance {
   void runJSBundle();
 
   /**
@@ -34,8 +35,11 @@ public interface CatalystInstance extends MemoryPressureListener {
 
   // This is called from java code, so it won't be stripped anyway, but proguard will rename it,
   // which this prevents.
-  @DoNotStrip
-  void invokeCallback(ExecutorToken executorToken, final int callbackID, final NativeArray arguments);
+  @Override @DoNotStrip
+  void invokeCallback(
+      ExecutorToken executorToken,
+      int callbackID,
+      NativeArray arguments);
   @DoNotStrip
   void callFunction(
       ExecutorToken executorToken,
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSInstance.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSInstance.java
new file mode 100644
index 00000000000000..30cb7be79f7508
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSInstance.java
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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.
+ */
+
+package com.facebook.react.bridge;
+
+/**
+ * This interface includes the methods needed to use a running JS
+ * instance, without specifying any of the bridge-specific
+ * initialization or lifecycle management.
+ */
+public interface JSInstance {
+  void invokeCallback(
+      ExecutorToken executorToken,
+      int callbackID,
+      NativeArray arguments);
+  // TODO if this interface survives refactoring, think about adding
+  // callFunction.
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModule.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModule.java
index b92ed701a9b7ab..830f56301433ab 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModule.java
@@ -20,7 +20,7 @@
  */
 public interface NativeModule {
   interface NativeMethod {
-    void invoke(CatalystInstance catalystInstance, ExecutorToken executorToken, ReadableNativeArray parameters);
+    void invoke(JSInstance jsInstance, ExecutorToken executorToken, ReadableNativeArray parameters);
     String getType();
   }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CatalystInstanceImpl.java b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CatalystInstanceImpl.java
index 0b564b42a9649b..4e9d9c0883a5b3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CatalystInstanceImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CatalystInstanceImpl.java
@@ -176,12 +176,13 @@ public void onNativeException(Exception e) {
     }
   }
 
-  private native void initializeBridge(ReactCallback callback,
-                                       JavaScriptExecutor jsExecutor,
-                                       MessageQueueThread jsQueue,
-                                       MessageQueueThread moduleQueue,
-                                       Collection<JavaModuleWrapper> javaModules,
-                                       Collection<CxxModuleWrapper> cxxModules);
+  private native void initializeBridge(
+      ReactCallback callback,
+      JavaScriptExecutor jsExecutor,
+      MessageQueueThread jsQueue,
+      MessageQueueThread moduleQueue,
+      Collection<JavaModuleWrapper> javaModules,
+      Collection<CxxModuleWrapper> cxxModules);
 
   /**
    * This API is used in situations where the JS bundle is being executed not on
@@ -232,7 +233,6 @@ public void runJSBundle() {
       mJSCallsPendingInit.clear();
     }
 
-
     // This is registered after JS starts since it makes a JS call
     Systrace.registerListener(mTraceListener);
   }
@@ -302,7 +302,7 @@ public void destroy() {
     mReactQueueConfiguration.getNativeModulesQueueThread().runOnQueue(new Runnable() {
       @Override
       public void run() {
-        mJavaRegistry.notifyCatalystInstanceDestroy();
+        mJavaRegistry.notifyJSInstanceDestroy();
       }
     });
     boolean wasIdle = (mPendingJSCalls.getAndSet(0) == 0);
@@ -341,7 +341,7 @@ public void initialize() {
     mReactQueueConfiguration.getNativeModulesQueueThread().runOnQueue(new Runnable() {
       @Override
       public void run() {
-        mJavaRegistry.notifyCatalystInstanceInitialized();
+        mJavaRegistry.notifyJSInstanceInitialized();
       }
     });
   }
@@ -390,7 +390,7 @@ public void handleMemoryPressure(MemoryPressure level) {
     if (mDestroyed) {
       return;
     }
-    switch(level) {
+    switch (level) {
       case UI_HIDDEN:
         handleMemoryPressureUiHidden();
         break;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/JavaModuleWrapper.java b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/JavaModuleWrapper.java
index e0e07af6b76825..fb3190911472a7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/JavaModuleWrapper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/JavaModuleWrapper.java
@@ -16,8 +16,8 @@
 
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.BaseJavaModule;
-import com.facebook.react.bridge.CatalystInstance;
 import com.facebook.react.bridge.ExecutorToken;
+import com.facebook.react.bridge.JSInstance;
 import com.facebook.react.bridge.NativeArray;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactMarker;
@@ -54,12 +54,12 @@ public class MethodDescriptor {
     String type;
   }
 
-  private final CatalystInstance mCatalystInstance;
+  private final JSInstance mJSInstance;
   private final ModuleHolder mModuleHolder;
   private final ArrayList<NativeModule.NativeMethod> mMethods;
 
-  public JavaModuleWrapper(CatalystInstance catalystinstance, ModuleHolder moduleHolder) {
-    mCatalystInstance = catalystinstance;
+  public JavaModuleWrapper(JSInstance jsInstance, ModuleHolder moduleHolder) {
+    mJSInstance = jsInstance;
     mModuleHolder = moduleHolder;
     mMethods = new ArrayList<>();
   }
@@ -135,6 +135,6 @@ public void invoke(ExecutorToken token, int methodId, ReadableNativeArray parame
       return;
     }
 
-    mMethods.get(methodId).invoke(mCatalystInstance, token, parameters);
+    mMethods.get(methodId).invoke(mJSInstance, token, parameters);
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/NativeModuleRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/NativeModuleRegistry.java
index 93d9e276d7fef7..2b0a576259edfa 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/NativeModuleRegistry.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/NativeModuleRegistry.java
@@ -15,6 +15,7 @@
 import java.util.Map;
 
 import com.facebook.infer.annotation.Assertions;
+import com.facebook.react.bridge.JSInstance;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.OnBatchCompleteListener;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -41,12 +42,12 @@ public NativeModuleRegistry(
   }
 
   /* package */ Collection<JavaModuleWrapper> getJavaModules(
-      CatalystInstanceImpl catalystInstanceImpl) {
+      JSInstance jsInstance) {
     ArrayList<JavaModuleWrapper> javaModules = new ArrayList<>();
     for (Map.Entry<Class<? extends NativeModule>, ModuleHolder> entry : mModules.entrySet()) {
       Class<?> type = entry.getKey();
       if (!CxxModuleWrapper.class.isAssignableFrom(type)) {
-        javaModules.add(new JavaModuleWrapper(catalystInstanceImpl, entry.getValue()));
+        javaModules.add(new JavaModuleWrapper(jsInstance, entry.getValue()));
       }
     }
     return javaModules;
@@ -63,11 +64,11 @@ public NativeModuleRegistry(
     return cxxModules;
   }
 
-  /* package */ void notifyCatalystInstanceDestroy() {
+  /* package */ void notifyJSInstanceDestroy() {
     mReactApplicationContext.assertOnNativeModulesQueueThread();
     Systrace.beginSection(
         Systrace.TRACE_TAG_REACT_JAVA_BRIDGE,
-        "NativeModuleRegistry_notifyCatalystInstanceDestroy");
+        "NativeModuleRegistry_notifyJSInstanceDestroy");
     try {
       for (ModuleHolder module : mModules.values()) {
         module.destroy();
@@ -77,7 +78,7 @@ public NativeModuleRegistry(
     }
   }
 
-  /* package */ void notifyCatalystInstanceInitialized() {
+  /* package */ void notifyJSInstanceInitialized() {
     mReactApplicationContext.assertOnNativeModulesQueueThread("From version React Native v0.44, " +
       "native modules are explicitly not initialized on the UI thread. See " +
       "https://github.com/facebook/react-native/wiki/Breaking-Changes#d4611211-reactnativeandroidbreaking-move-nativemodule-initialization-off-ui-thread---aaachiuuu " +
@@ -85,7 +86,7 @@ public NativeModuleRegistry(
     ReactMarker.logMarker(ReactMarkerConstants.NATIVE_MODULE_INITIALIZE_START);
     Systrace.beginSection(
         Systrace.TRACE_TAG_REACT_JAVA_BRIDGE,
-        "NativeModuleRegistry_notifyCatalystInstanceInitialized");
+        "NativeModuleRegistry_notifyJSInstanceInitialized");
     try {
       for (ModuleHolder module : mModules.values()) {
         module.initialize();

From e622d51e20ea53160ed534e4d2c2d968d5e5d66d Mon Sep 17 00:00:00 2001
From: Marc Horowitz <mhorowitz@fb.com>
Date: Tue, 14 Mar 2017 15:28:53 -0700
Subject: [PATCH 028/366] Support ModuleHolder-based lazy init of C++ modules
 with C++ bridge on android

Reviewed By: AaaChiuuu

Differential Revision: D4614479

fbshipit-source-id: 109ac34b8688f0113675e4a4479d1ddcc6169ed4
---
 React/CxxBridge/RCTCxxBridge.mm               |  3 +-
 .../react/cxxbridge/CatalystInstanceImpl.java |  6 ++-
 .../react/cxxbridge/NativeModuleRegistry.java |  6 +--
 .../src/main/jni/xreact/jni/Android.mk        |  1 +
 ReactAndroid/src/main/jni/xreact/jni/BUCK     |  1 +
 .../jni/xreact/jni/CatalystInstanceImpl.cpp   | 17 ++-----
 .../jni/xreact/jni/CatalystInstanceImpl.h     |  3 +-
 .../main/jni/xreact/jni/CxxModuleWrapper.h    |  8 ++-
 .../main/jni/xreact/jni/JavaModuleWrapper.h   |  2 +
 .../jni/xreact/jni/ModuleRegistryBuilder.cpp  | 51 +++++++++++++++++++
 .../jni/xreact/jni/ModuleRegistryBuilder.h    | 30 +++++++++++
 ReactCommon/cxxreact/Android.mk               |  1 +
 ReactCommon/cxxreact/CxxModule.h              |  2 +
 ReactCommon/cxxreact/CxxNativeModule.cpp      | 25 ++++++---
 ReactCommon/cxxreact/CxxNativeModule.h        |  8 ++-
 ReactCommon/cxxreact/Instance.cpp             |  2 +-
 ReactCommon/cxxreact/JSCExecutor.cpp          | 36 ++++++++-----
 ReactCommon/cxxreact/JSCNativeModules.cpp     |  4 ++
 ReactCommon/cxxreact/NativeToJsBridge.cpp     | 16 +++---
 ReactCommon/jschelpers/Value.h                |  4 ++
 20 files changed, 174 insertions(+), 52 deletions(-)
 create mode 100644 ReactAndroid/src/main/jni/xreact/jni/ModuleRegistryBuilder.cpp
 create mode 100644 ReactAndroid/src/main/jni/xreact/jni/ModuleRegistryBuilder.h

diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm
index 431c59f4f8b040..16b8782ec07338 100644
--- a/React/CxxBridge/RCTCxxBridge.mm
+++ b/React/CxxBridge/RCTCxxBridge.mm
@@ -553,7 +553,8 @@ - (BOOL)moduleIsInitialized:(Class)moduleClass
       }
       modules.emplace_back(
         new QueueNativeModule(self, std::make_unique<CxxNativeModule>(
-          _reactInstance, [(RCTCxxModule *)(moduleData.instance) move])));
+                                  _reactInstance, [moduleData.name UTF8String],
+                                  [moduleData] { return [(RCTCxxModule *)(moduleData.instance) move]; })));
     } else {
       modules.emplace_back(new RCTNativeModule(self, moduleData));
     }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CatalystInstanceImpl.java b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CatalystInstanceImpl.java
index 4e9d9c0883a5b3..38a9d548546131 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CatalystInstanceImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CatalystInstanceImpl.java
@@ -110,7 +110,7 @@ private CatalystInstanceImpl(
       final JavaScriptModuleRegistry jsModuleRegistry,
       final JSBundleLoader jsBundleLoader,
       NativeModuleCallExceptionHandler nativeModuleCallExceptionHandler) {
-    FLog.d(ReactConstants.TAG, "Initializing React Xplat Bridge.");
+    FLog.w(ReactConstants.TAG, "Initializing React Xplat Bridge.");
     mHybridData = initHybrid();
 
     mReactQueueConfiguration = ReactQueueConfigurationImpl.create(
@@ -123,6 +123,7 @@ private CatalystInstanceImpl(
     mNativeModuleCallExceptionHandler = nativeModuleCallExceptionHandler;
     mTraceListener = new JSProfilerTraceListener(this);
 
+    FLog.w(ReactConstants.TAG, "Initializing React Xplat Bridge before initializeBridge");
     initializeBridge(
       new BridgeCallback(this),
       jsExecutor,
@@ -130,6 +131,7 @@ private CatalystInstanceImpl(
       mReactQueueConfiguration.getNativeModulesQueueThread(),
       mJavaRegistry.getJavaModules(this),
       mJavaRegistry.getCxxModules());
+    FLog.w(ReactConstants.TAG, "Initializing React Xplat Bridge after initializeBridge");
     mMainExecutorToken = getMainExecutorToken();
   }
 
@@ -182,7 +184,7 @@ private native void initializeBridge(
       MessageQueueThread jsQueue,
       MessageQueueThread moduleQueue,
       Collection<JavaModuleWrapper> javaModules,
-      Collection<CxxModuleWrapper> cxxModules);
+      Collection<ModuleHolder> cxxModules);
 
   /**
    * This API is used in situations where the JS bundle is being executed not on
diff --git a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/NativeModuleRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/NativeModuleRegistry.java
index 2b0a576259edfa..140c4efdb328d2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/NativeModuleRegistry.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/NativeModuleRegistry.java
@@ -53,12 +53,12 @@ public NativeModuleRegistry(
     return javaModules;
   }
 
-  /* package */ Collection<CxxModuleWrapper> getCxxModules() {
-    ArrayList<CxxModuleWrapper> cxxModules = new ArrayList<>();
+  /* package */ Collection<ModuleHolder> getCxxModules() {
+    ArrayList<ModuleHolder> cxxModules = new ArrayList<>();
     for (Map.Entry<Class<? extends NativeModule>, ModuleHolder> entry : mModules.entrySet()) {
       Class<?> type = entry.getKey();
       if (CxxModuleWrapper.class.isAssignableFrom(type)) {
-        cxxModules.add((CxxModuleWrapper) entry.getValue().getModule());
+        cxxModules.add(entry.getValue());
       }
     }
     return cxxModules;
diff --git a/ReactAndroid/src/main/jni/xreact/jni/Android.mk b/ReactAndroid/src/main/jni/xreact/jni/Android.mk
index ea700e03ab6a69..46cebd13e2c30c 100644
--- a/ReactAndroid/src/main/jni/xreact/jni/Android.mk
+++ b/ReactAndroid/src/main/jni/xreact/jni/Android.mk
@@ -15,6 +15,7 @@ LOCAL_SRC_FILES := \
   JSLogging.cpp \
   JniJSModulesUnbundle.cpp \
   MethodInvoker.cpp \
+  ModuleRegistryBuilder.cpp \
   NativeArray.cpp \
   NativeCommon.cpp \
   NativeMap.cpp \
diff --git a/ReactAndroid/src/main/jni/xreact/jni/BUCK b/ReactAndroid/src/main/jni/xreact/jni/BUCK
index ef06da174c223b..f58ec9e4b277d1 100644
--- a/ReactAndroid/src/main/jni/xreact/jni/BUCK
+++ b/ReactAndroid/src/main/jni/xreact/jni/BUCK
@@ -6,6 +6,7 @@ EXPORTED_HEADERS = [
     "JExecutorToken.h",
     "JSLoader.h",
     "MethodInvoker.h",
+    "ModuleRegistryBuilder.h",
     "NativeArray.h",
     "NativeCommon.h",
     "NativeMap.h",
diff --git a/ReactAndroid/src/main/jni/xreact/jni/CatalystInstanceImpl.cpp b/ReactAndroid/src/main/jni/xreact/jni/CatalystInstanceImpl.cpp
index b4aa91b631c860..a38ed7713f2e2e 100644
--- a/ReactAndroid/src/main/jni/xreact/jni/CatalystInstanceImpl.cpp
+++ b/ReactAndroid/src/main/jni/xreact/jni/CatalystInstanceImpl.cpp
@@ -20,6 +20,7 @@
 #include <cxxreact/ModuleRegistry.h>
 #include <cxxreact/CxxNativeModule.h>
 
+#include "CxxModuleWrapper.h"
 #include "JavaScriptExecutorHolder.h"
 #include "JniJSModulesUnbundle.h"
 #include "JNativeRunnable.h"
@@ -128,21 +129,10 @@ void CatalystInstanceImpl::initializeBridge(
     jni::alias_ref<JavaMessageQueueThread::javaobject> jsQueue,
     jni::alias_ref<JavaMessageQueueThread::javaobject> moduleQueue,
     jni::alias_ref<jni::JCollection<JavaModuleWrapper::javaobject>::javaobject> javaModules,
-    jni::alias_ref<jni::JCollection<CxxModuleWrapper::javaobject>::javaobject> cxxModules) {
+    jni::alias_ref<jni::JCollection<ModuleHolder::javaobject>::javaobject> cxxModules) {
   // TODO mhorowitz: how to assert here?
   // Assertions.assertCondition(mBridge == null, "initializeBridge should be called once");
 
-  std::vector<std::unique_ptr<NativeModule>> modules;
-  std::weak_ptr<Instance> winstance(instance_);
-  for (const auto& jm : *javaModules) {
-    modules.emplace_back(folly::make_unique<JavaNativeModule>(winstance, jm));
-  }
-  for (const auto& cm : *cxxModules) {
-    modules.emplace_back(
-      folly::make_unique<CxxNativeModule>(winstance, std::move(cthis(cm)->getModule())));
-  }
-  auto moduleRegistry = std::make_shared<ModuleRegistry>(std::move(modules));
-
   // This used to be:
   //
   // Java CatalystInstanceImpl -> C++ CatalystInstanceImpl -> Bridge -> Bridge::Callback
@@ -163,7 +153,8 @@ void CatalystInstanceImpl::initializeBridge(
                               jseh->getExecutorFactory(),
                               folly::make_unique<JMessageQueueThread>(jsQueue),
                               folly::make_unique<JMessageQueueThread>(moduleQueue),
-                              moduleRegistry);
+                              buildModuleRegistry(std::weak_ptr<Instance>(instance_),
+                                                  javaModules, cxxModules));
 }
 
 void CatalystInstanceImpl::jniSetSourceURL(const std::string& sourceURL) {
diff --git a/ReactAndroid/src/main/jni/xreact/jni/CatalystInstanceImpl.h b/ReactAndroid/src/main/jni/xreact/jni/CatalystInstanceImpl.h
index 61e07b9c650be7..804fc927cbc1aa 100644
--- a/ReactAndroid/src/main/jni/xreact/jni/CatalystInstanceImpl.h
+++ b/ReactAndroid/src/main/jni/xreact/jni/CatalystInstanceImpl.h
@@ -10,6 +10,7 @@
 #include "JMessageQueueThread.h"
 #include "JSLoader.h"
 #include "JavaModuleWrapper.h"
+#include "ModuleRegistryBuilder.h"
 
 namespace facebook {
 namespace react {
@@ -48,7 +49,7 @@ class CatalystInstanceImpl : public jni::HybridClass<CatalystInstanceImpl> {
       jni::alias_ref<JavaMessageQueueThread::javaobject> jsQueue,
       jni::alias_ref<JavaMessageQueueThread::javaobject> moduleQueue,
       jni::alias_ref<jni::JCollection<JavaModuleWrapper::javaobject>::javaobject> javaModules,
-      jni::alias_ref<jni::JCollection<CxxModuleWrapper::javaobject>::javaobject> cxxModules);
+      jni::alias_ref<jni::JCollection<ModuleHolder::javaobject>::javaobject> cxxModules);
 
   /**
    * Sets the source URL of the underlying bridge without loading any JS code.
diff --git a/ReactAndroid/src/main/jni/xreact/jni/CxxModuleWrapper.h b/ReactAndroid/src/main/jni/xreact/jni/CxxModuleWrapper.h
index 7e80094644b06f..1d5e8ed0c43c95 100644
--- a/ReactAndroid/src/main/jni/xreact/jni/CxxModuleWrapper.h
+++ b/ReactAndroid/src/main/jni/xreact/jni/CxxModuleWrapper.h
@@ -12,7 +12,13 @@
 namespace facebook {
 namespace react {
 
-class CxxModuleWrapper : public jni::HybridClass<CxxModuleWrapper> {
+struct JNativeModule : jni::JavaClass<JNativeModule> {
+  constexpr static const char *const kJavaDescriptor =
+    "Lcom/facebook/react/bridge/NativeModule;";
+};
+
+class CxxModuleWrapper :
+    public jni::HybridClass<CxxModuleWrapper, JNativeModule> {
 public:
   constexpr static const char *const kJavaDescriptor =
     "Lcom/facebook/react/cxxbridge/CxxModuleWrapper;";
diff --git a/ReactAndroid/src/main/jni/xreact/jni/JavaModuleWrapper.h b/ReactAndroid/src/main/jni/xreact/jni/JavaModuleWrapper.h
index 9ef6c483bd8b7a..544b6eb167c169 100644
--- a/ReactAndroid/src/main/jni/xreact/jni/JavaModuleWrapper.h
+++ b/ReactAndroid/src/main/jni/xreact/jni/JavaModuleWrapper.h
@@ -27,6 +27,8 @@ struct JavaModuleWrapper : jni::JavaClass<JavaModuleWrapper> {
   static constexpr auto kJavaDescriptor = "Lcom/facebook/react/cxxbridge/JavaModuleWrapper;";
 
   jni::local_ref<JBaseJavaModule::javaobject> getModule() {
+    // This is the call which causes a lazy Java module to actually be
+    // created.
     static auto getModule = javaClassStatic()->getMethod<JBaseJavaModule::javaobject()>("getModule");
     return getModule(self());
   }
diff --git a/ReactAndroid/src/main/jni/xreact/jni/ModuleRegistryBuilder.cpp b/ReactAndroid/src/main/jni/xreact/jni/ModuleRegistryBuilder.cpp
new file mode 100644
index 00000000000000..108091a8dfd934
--- /dev/null
+++ b/ReactAndroid/src/main/jni/xreact/jni/ModuleRegistryBuilder.cpp
@@ -0,0 +1,51 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+#include "ModuleRegistryBuilder.h"
+
+#include <cxxreact/CxxNativeModule.h>
+#include <folly/Memory.h>
+
+namespace facebook {
+namespace react {
+
+std::string ModuleHolder::getName() const {
+  static auto method = getClass()->getMethod<jstring()>("getName");
+  return method(self())->toStdString();
+}
+
+xplat::module::CxxModule::Provider ModuleHolder::getProvider() const {
+  return [self=jni::make_global(self())] {
+    static auto method =
+      ModuleHolder::javaClassStatic()->getMethod<JNativeModule::javaobject()>(
+        "getModule");
+    // This is the call which uses the lazy Java Provider to instantiate the
+    // Java CxxModuleWrapper which contains the CxxModule.
+    auto module = method(self);
+    CHECK(module->isInstanceOf(CxxModuleWrapper::javaClassStatic()))
+      << "module isn't a C++ module";
+    auto cxxModule = jni::static_ref_cast<CxxModuleWrapper::javaobject>(module);
+    // Then, we grab the CxxModule from the wrapper, which is no longer needed.
+    return cxxModule->cthis()->getModule();
+  };
+}
+
+std::unique_ptr<ModuleRegistry> buildModuleRegistry(
+    std::weak_ptr<Instance> winstance,
+    jni::alias_ref<jni::JCollection<JavaModuleWrapper::javaobject>::javaobject> javaModules,
+    jni::alias_ref<jni::JCollection<ModuleHolder::javaobject>::javaobject> cxxModules) {
+  std::vector<std::unique_ptr<NativeModule>> modules;
+  for (const auto& jm : *javaModules) {
+    modules.emplace_back(folly::make_unique<JavaNativeModule>(winstance, jm));
+  }
+  for (const auto& cm : *cxxModules) {
+    modules.emplace_back(
+      folly::make_unique<CxxNativeModule>(winstance, cm->getName(), cm->getProvider()));
+  }
+  if (modules.empty()) {
+    return nullptr;
+  } else {
+    return folly::make_unique<ModuleRegistry>(std::move(modules));
+  }
+}
+
+}}
diff --git a/ReactAndroid/src/main/jni/xreact/jni/ModuleRegistryBuilder.h b/ReactAndroid/src/main/jni/xreact/jni/ModuleRegistryBuilder.h
new file mode 100644
index 00000000000000..554473601173f8
--- /dev/null
+++ b/ReactAndroid/src/main/jni/xreact/jni/ModuleRegistryBuilder.h
@@ -0,0 +1,30 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+#include <string>
+
+#include <cxxreact/CxxModule.h>
+#include <cxxreact/ModuleRegistry.h>
+#include <fb/fbjni.h>
+
+#include "CxxModuleWrapper.h"
+#include "JavaModuleWrapper.h"
+
+namespace facebook {
+namespace react {
+
+class ModuleHolder : public jni::JavaClass<ModuleHolder> {
+ public:
+  static auto constexpr kJavaDescriptor =
+    "Lcom/facebook/react/cxxbridge/ModuleHolder;";
+
+  std::string getName() const;
+  xplat::module::CxxModule::Provider getProvider() const;
+};
+
+std::unique_ptr<ModuleRegistry> buildModuleRegistry(
+  std::weak_ptr<Instance> winstance,
+  jni::alias_ref<jni::JCollection<JavaModuleWrapper::javaobject>::javaobject> javaModules,
+  jni::alias_ref<jni::JCollection<ModuleHolder::javaobject>::javaobject> cxxModules);
+
+}
+}
diff --git a/ReactCommon/cxxreact/Android.mk b/ReactCommon/cxxreact/Android.mk
index f9cdb1976ab87e..6f33a13ef738f8 100644
--- a/ReactCommon/cxxreact/Android.mk
+++ b/ReactCommon/cxxreact/Android.mk
@@ -5,6 +5,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libreactnativefb
 
 LOCAL_SRC_FILES := \
+  CxxMessageQueue.cpp \
   CxxNativeModule.cpp \
   Instance.cpp \
   JSCExecutor.cpp \
diff --git a/ReactCommon/cxxreact/CxxModule.h b/ReactCommon/cxxreact/CxxModule.h
index 0b420b01fc6c3d..897123008bc8b8 100644
--- a/ReactCommon/cxxreact/CxxModule.h
+++ b/ReactCommon/cxxreact/CxxModule.h
@@ -50,6 +50,8 @@ class CxxModule {
   class SyncTagType {};
 
 public:
+  typedef std::function<std::unique_ptr<CxxModule>()> Provider;
+
   typedef std::function<void(std::vector<folly::dynamic>)> Callback;
 
   constexpr static AsyncTagType AsyncTag = AsyncTagType();
diff --git a/ReactCommon/cxxreact/CxxNativeModule.cpp b/ReactCommon/cxxreact/CxxNativeModule.cpp
index f73cd30005d9dd..c0cacd0b85b927 100644
--- a/ReactCommon/cxxreact/CxxNativeModule.cpp
+++ b/ReactCommon/cxxreact/CxxNativeModule.cpp
@@ -47,18 +47,19 @@ CxxModule::Callback convertCallback(
 }
 
 CxxNativeModule::CxxNativeModule(std::weak_ptr<Instance> instance,
-                                 std::unique_ptr<CxxModule> module)
+                                 std::string name,
+                                 CxxModule::Provider provider)
   : instance_(instance)
-  , module_(std::move(module))
-  , methods_(module_->getMethods()) {
-    module_->setInstance(instance);
-  }
+  , name_(std::move(name))
+  , provider_(provider) {}
 
 std::string CxxNativeModule::getName() {
-  return module_->getName();
+  return name_;
 }
 
 std::vector<MethodDescriptor> CxxNativeModule::getMethods() {
+  lazyInit();
+
   std::vector<MethodDescriptor> descs;
   for (auto& method : methods_) {
     assert(method.func || method.syncFunc);
@@ -68,6 +69,8 @@ std::vector<MethodDescriptor> CxxNativeModule::getMethods() {
 }
 
 folly::dynamic CxxNativeModule::getConstants() {
+  lazyInit();
+
   folly::dynamic constants = folly::dynamic::object();
   for (auto& pair : module_->getConstants()) {
     constants.insert(std::move(pair.first), std::move(pair.second));
@@ -168,5 +171,15 @@ MethodCallResult CxxNativeModule::callSerializableNativeHook(
   return method.syncFunc(std::move(args));
 }
 
+void CxxNativeModule::lazyInit() {
+  if (module_) {
+    return;
+  }
+
+  module_ = provider_();
+  methods_ = module_->getMethods();
+  module_->setInstance(instance_);
+}
+
 }
 }
diff --git a/ReactCommon/cxxreact/CxxNativeModule.h b/ReactCommon/cxxreact/CxxNativeModule.h
index 308d004bb4892d..ab6f3df87ffd4c 100644
--- a/ReactCommon/cxxreact/CxxNativeModule.h
+++ b/ReactCommon/cxxreact/CxxNativeModule.h
@@ -15,8 +15,8 @@ std::function<void(folly::dynamic)> makeCallback(
 
 class CxxNativeModule : public NativeModule {
 public:
-  CxxNativeModule(std::weak_ptr<Instance> instance,
-                  std::unique_ptr<xplat::module::CxxModule> module);
+  CxxNativeModule(std::weak_ptr<Instance> instance, std::string name,
+                  xplat::module::CxxModule::Provider provider);
 
   std::string getName() override;
   std::vector<MethodDescriptor> getMethods() override;
@@ -27,7 +27,11 @@ class CxxNativeModule : public NativeModule {
     ExecutorToken token, unsigned int hookId, folly::dynamic&& args) override;
 
 private:
+  void lazyInit();
+
   std::weak_ptr<Instance> instance_;
+  std::string name_;
+  xplat::module::CxxModule::Provider provider_;
   std::unique_ptr<xplat::module::CxxModule> module_;
   std::vector<xplat::module::CxxModule::Method> methods_;
 };
diff --git a/ReactCommon/cxxreact/Instance.cpp b/ReactCommon/cxxreact/Instance.cpp
index 12a9dbe1e443ff..f7ad78ed4e0266 100644
--- a/ReactCommon/cxxreact/Instance.cpp
+++ b/ReactCommon/cxxreact/Instance.cpp
@@ -40,7 +40,7 @@ void Instance::initializeBridge(
   if (!nativeQueue) {
     // TODO pass down a thread/queue from java, instead of creating our own.
 
-    auto queue = std::make_unique<CxxMessageQueue>();
+    auto queue = folly::make_unique<CxxMessageQueue>();
     std::thread t(queue->getUnregisteredRunLoop());
     t.detach();
     nativeQueue = std::move(queue);
diff --git a/ReactCommon/cxxreact/JSCExecutor.cpp b/ReactCommon/cxxreact/JSCExecutor.cpp
index 606db4ab4434be..cee2f2ece2e350 100644
--- a/ReactCommon/cxxreact/JSCExecutor.cpp
+++ b/ReactCommon/cxxreact/JSCExecutor.cpp
@@ -361,12 +361,8 @@ void JSCExecutor::loadApplicationScript(std::unique_ptr<const JSBigString> scrip
 
       evaluateSourceCode(m_context, bcSourceCode, jsSourceURL);
 
-      // TODO(luk): t13903306 Remove this check once we make native modules
-      // working for java2js
-      if (m_delegate) {
-        bindBridge();
-        flush();
-      }
+      bindBridge();
+      flush();
 
       ReactMarker::logMarker("CREATE_REACT_CONTEXT_END");
       ReactMarker::logMarker("RUN_JS_BUNDLE_END");
@@ -416,11 +412,8 @@ void JSCExecutor::loadApplicationScript(std::unique_ptr<const JSBigString> scrip
     evaluateScript(m_context, jsScript, jsSourceURL);
   }
 
-  // TODO(luk): t13903306 Remove this check once we make native modules working for java2js
-  if (m_delegate) {
-    bindBridge();
-    flush();
-  }
+  bindBridge();
+  flush();
 
   ReactMarker::logMarker("CREATE_REACT_CONTEXT_END");
   ReactMarker::logMarker("RUN_JS_BUNDLE_END");
@@ -435,6 +428,9 @@ void JSCExecutor::setJSModulesUnbundle(std::unique_ptr<JSModulesUnbundle> unbund
 
 void JSCExecutor::bindBridge() throw(JSException) {
   SystraceSection s("JSCExecutor::bindBridge");
+  if (!m_delegate || !m_delegate->getModuleRegistry()) {
+    return;
+  }
   auto global = Object::getGlobalObject(m_context);
   auto batchedBridgeValue = global.getProperty("__fbBatchedBridge");
   if (batchedBridgeValue.isUndefined()) {
@@ -466,7 +462,18 @@ void JSCExecutor::callNativeModules(Value&& value) {
 
 void JSCExecutor::flush() {
   SystraceSection s("JSCExecutor::flush");
-  callNativeModules(m_flushedQueueJS->callAsFunction({}));
+  if (!m_delegate) {
+    // do nothing
+  } else if (!m_delegate->getModuleRegistry()) {
+    callNativeModules(Value::makeNull(m_context));
+  } else {
+    // If this is failing, chances are you have provided a delegate with a
+    // module registry, but haven't loaded the JS which enables native function
+    // queueing.  Add BatchedBridge.js to your bundle, pass a nullptr delegate,
+    // or make delegate->getModuleRegistry() return nullptr.
+    CHECK(m_flushedQueueJS) << "Attempting to use native methods without loading BatchedBridge.js";
+    callNativeModules(m_flushedQueueJS->callAsFunction({}));
+  }
 }
 
 void JSCExecutor::callFunction(const std::string& moduleId, const std::string& methodId, const folly::dynamic& arguments) {
@@ -476,6 +483,9 @@ void JSCExecutor::callFunction(const std::string& moduleId, const std::string& m
 
   auto result = [&] {
     try {
+      // See flush()
+      CHECK(m_callFunctionReturnFlushedQueueJS)
+        << "Attempting to call native methods without loading BatchedBridge.js";
       return m_callFunctionReturnFlushedQueueJS->callAsFunction({
         Value(m_context, String::createExpectingAscii(m_context, moduleId)),
         Value(m_context, String::createExpectingAscii(m_context, methodId)),
@@ -511,6 +521,8 @@ Value JSCExecutor::callFunctionSyncWithValue(
     const std::string& module, const std::string& method, Value args) {
   SystraceSection s("JSCExecutor::callFunction");
 
+  // See flush()
+  CHECK(m_callFunctionReturnResultAndFlushedQueueJS);
   Object result = m_callFunctionReturnResultAndFlushedQueueJS->callAsFunction({
     Value(m_context, String::createExpectingAscii(m_context, module)),
     Value(m_context, String::createExpectingAscii(m_context, method)),
diff --git a/ReactCommon/cxxreact/JSCNativeModules.cpp b/ReactCommon/cxxreact/JSCNativeModules.cpp
index b1036ba376c0e9..105873cfd9fbc8 100644
--- a/ReactCommon/cxxreact/JSCNativeModules.cpp
+++ b/ReactCommon/cxxreact/JSCNativeModules.cpp
@@ -11,6 +11,10 @@ JSCNativeModules::JSCNativeModules(std::shared_ptr<ModuleRegistry> moduleRegistr
   m_moduleRegistry(std::move(moduleRegistry)) {}
 
 JSValueRef JSCNativeModules::getModule(JSContextRef context, JSStringRef jsName) {
+  if (!m_moduleRegistry) {
+    return Value::makeUndefined(context);
+  }
+
   std::string moduleName = String::ref(context, jsName).str();
 
   const auto it = m_objects.find(moduleName);
diff --git a/ReactCommon/cxxreact/NativeToJsBridge.cpp b/ReactCommon/cxxreact/NativeToJsBridge.cpp
index 56a71adfd2281e..5c4399766c0704 100644
--- a/ReactCommon/cxxreact/NativeToJsBridge.cpp
+++ b/ReactCommon/cxxreact/NativeToJsBridge.cpp
@@ -47,6 +47,9 @@ class JsToNativeBridge : public react::ExecutorDelegate {
 
   void callNativeModules(
       JSExecutor& executor, folly::dynamic&& calls, bool isEndOfBatch) override {
+
+    CHECK(m_registry || calls.empty()) <<
+      "native module calls cannot be completed with no native modules";
     ExecutorToken token = m_nativeToJs->getTokenForExecutor(executor);
     m_nativeQueue->runOnQueue([this, token, calls=std::move(calls), isEndOfBatch] () mutable {
       // An exception anywhere in here stops processing of the batch.  This
@@ -95,13 +98,8 @@ NativeToJsBridge::NativeToJsBridge(
     std::shared_ptr<InstanceCallback> callback)
     : m_destroyed(std::make_shared<bool>(false))
     , m_mainExecutorToken(callback->createExecutorToken())
-    , m_delegate(registry
-                 ? std::make_shared<JsToNativeBridge>(
-                     this, registry, std::move(nativeQueue), callback)
-                 : nullptr) {
-  if (!m_delegate) {
-    nativeQueue->quitSynchronous();
-  }
+    , m_delegate(std::make_shared<JsToNativeBridge>(
+                   this, registry, std::move(nativeQueue), callback)) {
   std::unique_ptr<JSExecutor> mainExecutor =
     jsExecutorFactory->createJSExecutor(m_delegate, jsQueue);
   // cached to avoid locked map lookup in the common case
@@ -318,9 +316,7 @@ ExecutorToken NativeToJsBridge::getTokenForExecutor(JSExecutor& executor) {
 }
 
 void NativeToJsBridge::destroy() {
-  if (m_delegate) {
-    m_delegate->quitQueueSynchronous();
-  }
+  m_delegate->quitQueueSynchronous();
   auto* executorMessageQueueThread = getMessageQueueThread(m_mainExecutorToken);
   // All calls made through runOnExecutorQueue have an early exit if
   // m_destroyed is true. Setting this before the runOnQueueSync will cause
diff --git a/ReactCommon/jschelpers/Value.h b/ReactCommon/jschelpers/Value.h
index f2879bd1d4b9ba..b5d79c53df283f 100644
--- a/ReactCommon/jschelpers/Value.h
+++ b/ReactCommon/jschelpers/Value.h
@@ -305,6 +305,10 @@ class Value : public noncopyable {
     return Value(ctx, JSC_JSValueMakeUndefined(ctx));
   }
 
+  static Value makeNull(JSContextRef ctx) {
+    return Value(ctx, JSC_JSValueMakeNull(ctx));
+  }
+
   std::string toJSONString(unsigned indent = 0) const;
   static Value fromJSON(JSContextRef ctx, const String& json);
   static JSValueRef fromDynamic(JSContextRef ctx, const folly::dynamic& value);

From 87137cadd7ba5c23c4962f01bb4a73347f6cb835 Mon Sep 17 00:00:00 2001
From: Marc Horowitz <mhorowitz@fb.com>
Date: Tue, 14 Mar 2017 15:28:55 -0700
Subject: [PATCH 029/366] rename javaModules -> nativeModules

Reviewed By: AaaChiuuu

Differential Revision: D4631758

fbshipit-source-id: 3b62ada1bf32467b67cd8529d4b7873b43898ee4
---
 .../main/java/com/facebook/react/CoreModulesPackage.java    | 2 +-
 .../facebook/react/module/annotations/ReactModuleList.java  | 6 +++---
 .../react/module/processing/ReactModuleSpecProcessor.java   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java b/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java
index d9ff55e0dbe566..2827c47203bb8c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java
@@ -56,7 +56,7 @@
  * view managers from).
  */
 @ReactModuleList(
-  javaModules = {
+  nativeModules = {
     AndroidInfoModule.class,
     AnimationsDebugModule.class,
     DeviceEventManagerModule.class,
diff --git a/ReactAndroid/src/main/java/com/facebook/react/module/annotations/ReactModuleList.java b/ReactAndroid/src/main/java/com/facebook/react/module/annotations/ReactModuleList.java
index bf7cd7d9cd0914..fc47945ac9be8d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/module/annotations/ReactModuleList.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/module/annotations/ReactModuleList.java
@@ -19,10 +19,10 @@
 public @interface ReactModuleList {
 
   /**
-   * The Java modules in this list should be annotated with {@link ReactModule}.
-   * @return List of Java modules in the package.
+   * The Native modules in this list should be annotated with {@link ReactModule}.
+   * @return List of Native modules in the package.
    */
-  Class<? extends NativeModule>[] javaModules();
+  Class<? extends NativeModule>[] nativeModules();
 
   /**
    * The View Managers in this list should be annotated with {@link ReactModule}.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/module/processing/ReactModuleSpecProcessor.java b/ReactAndroid/src/main/java/com/facebook/react/module/processing/ReactModuleSpecProcessor.java
index cf585894ba5800..add1ef0b6ef904 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/module/processing/ReactModuleSpecProcessor.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/module/processing/ReactModuleSpecProcessor.java
@@ -87,7 +87,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
       ReactModuleList reactModuleList = typeElement.getAnnotation(ReactModuleList.class);
       List<String> nativeModules = new ArrayList<>();
       try {
-        reactModuleList.javaModules(); // throws MirroredTypesException
+        reactModuleList.nativeModules(); // throws MirroredTypesException
       } catch (MirroredTypesException mirroredTypesException) {
         List<? extends TypeMirror> typeMirrors = mirroredTypesException.getTypeMirrors();
         for (TypeMirror typeMirror : typeMirrors) {

From 957b55c769661edeee691109e45dc99a06f87bc4 Mon Sep 17 00:00:00 2001
From: Petter Hesselberg <petterh@microsoft.com>
Date: Tue, 14 Mar 2017 16:06:57 -0700
Subject: [PATCH 030/366] Don't crash in StackTraceHelper.convertJsStackTrace

Summary:
Don't crash in `StackTraceHelper.convertJsStackTrace` on missing `lineNumber`

I've seen the native Android app crash upon displaying a stack trace because of this bug.

Incidental and unrelated change: Refactor `StackTraceHelper.formatFrameSource` to use `StringBuilder`
Closes https://github.com/facebook/react-native/pull/12920

Differential Revision: D4709273

fbshipit-source-id: 95b3eb303f259460e33d8ee32a2db652360c645d
---
 .../react/devsupport/StackTraceHelper.java    | 29 +++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/StackTraceHelper.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/StackTraceHelper.java
index ef4c6c0cdfb177..93c6833415c683 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/StackTraceHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/StackTraceHelper.java
@@ -22,6 +22,9 @@
  */
 public class StackTraceHelper {
 
+  public static final java.lang.String COLUMN_KEY = "column";
+  public static final java.lang.String LINE_NUMBER_KEY = "lineNumber";
+
   /**
    * Represents a generic entry in a stack trace, be it originally from JS or Java.
    */
@@ -101,10 +104,13 @@ public static StackFrame[] convertJsStackTrace(@Nullable ReadableArray stack) {
       ReadableMap frame = stack.getMap(i);
       String methodName = frame.getString("methodName");
       String fileName = frame.getString("file");
-      int lineNumber = frame.getInt("lineNumber");
+      int lineNumber = -1;
+      if (frame.hasKey(LINE_NUMBER_KEY) && !frame.isNull(LINE_NUMBER_KEY)) {
+        lineNumber = frame.getInt(LINE_NUMBER_KEY);
+      }
       int columnNumber = -1;
-      if (frame.hasKey("column") && !frame.isNull("column")) {
-        columnNumber = frame.getInt("column");
+      if (frame.hasKey(COLUMN_KEY) && !frame.isNull(COLUMN_KEY)) {
+        columnNumber = frame.getInt(COLUMN_KEY);
       }
       result[i] = new StackFrameImpl(fileName, methodName, lineNumber, columnNumber);
     }
@@ -132,12 +138,17 @@ public static StackFrame[] convertJavaStackTrace(Throwable exception) {
    * Format a {@link StackFrame} to a String (method name is not included).
    */
   public static String formatFrameSource(StackFrame frame) {
-    String lineInfo = "";
-    final int column = frame.getColumn();
-    // If the column is 0, don't show it in red box.
-    final String columnString = column <= 0 ? "" : ":" + column;
-    lineInfo += frame.getFileName() + ":" + frame.getLine() + columnString;
-    return lineInfo;
+    StringBuilder lineInfo = new StringBuilder();
+    lineInfo.append(frame.getFileName());
+    final int line = frame.getLine();
+    if (line > 0) {
+      lineInfo.append(":").append(line);
+      final int column = frame.getColumn();
+      if (column > 0) {
+        lineInfo.append(":").append(column);
+      }
+    }
+    return lineInfo.toString();
   }
 
   /**

From a0b5a6efe55f5413048c6a752ba4e90c79ac7137 Mon Sep 17 00:00:00 2001
From: "tfallon@mail.depaul.edu" <tfallon@mail.depaul.edu>
Date: Tue, 14 Mar 2017 16:20:04 -0700
Subject: [PATCH 031/366] Explaining how to package ReactNative for Nexus/Maven
 deployment.

Summary:
**Motivation**

I needed to do this today. It's explained in code in the repository, but not included in the actual documentation. As React Native continues to grow, this is something that will be used more and more by the community.

**Test plan (required)**

No test plan required, this is simply a documentation change to add things that are only explained in code comments currently.
Closes https://github.com/facebook/react-native/pull/12938

Differential Revision: D4709339

Pulled By: mkonicek

fbshipit-source-id: a56c7573c3fa25a4059657b95b482b641ff229ff
---
 docs/AndroidBuildingFromSource.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/docs/AndroidBuildingFromSource.md b/docs/AndroidBuildingFromSource.md
index d6ebe9ae0f6237..326828a7f6e366 100644
--- a/docs/AndroidBuildingFromSource.md
+++ b/docs/AndroidBuildingFromSource.md
@@ -143,6 +143,18 @@ gradle.projectsLoaded {
 }
 ```
 
+## Building for Maven/Nexus deployment
+
+If you find that you need to push up a locally compiled React Native .aar and related files to a remote Nexus repository, you can.
+
+Start by following the `Point Gradle to your Android SDK` section of this page. Once you do this, assuming you have Gradle configured properly, you can then run the following command from the root of your React Native checkout to build and package all required files:
+
+```
+./gradlew ReactAndroid:installArchives
+```
+
+This will package everything that would typically be included in the `android` directory of your `node_modules/react-native/` installation in the root directory of your React Native checkout. 
+
 ## Testing
 
 If you made changes to React Native and submit a pull request, all tests will run on your pull request automatically. To run the tests locally, see [Testing](docs/testing.html).

From 0d5620bf5e8e07ee1951d84baf6ca6061257cdb1 Mon Sep 17 00:00:00 2001
From: sunnylqm <sunnylqm@qq.com>
Date: Tue, 14 Mar 2017 16:33:11 -0700
Subject: [PATCH 032/366] fix a typo in navigation doc

Summary: Closes https://github.com/facebook/react-native/pull/12921

Differential Revision: D4709474

Pulled By: mkonicek

fbshipit-source-id: 3c7da6ee87d350d52074a05abe168345f936858f
---
 docs/Navigation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Navigation.md b/docs/Navigation.md
index 4be9f26f676789..b245f079fdf876 100644
--- a/docs/Navigation.md
+++ b/docs/Navigation.md
@@ -56,7 +56,7 @@ class MainScreen extends React.Component {
 }
 ```
 
-React Navigation routers make it easy to override navigation logic or integrate it into redux. Because routers can be nested inside eachother, developers can override navigation logic for one area of the app without making widespread changes.
+React Navigation routers make it easy to override navigation logic or integrate it into redux. Because routers can be nested inside each other, developers can override navigation logic for one area of the app without making widespread changes.
 
 The views in React Navigation use native components and the `Animated` library to deliver 60fps animations that are run on the native thread. Plus, the animations and gestures can be easily customized.
 

From 22151d28d4ac538a37f399f9187a59a0236f401e Mon Sep 17 00:00:00 2001
From: Janic Duplessis <janicduplessis@gmail.com>
Date: Tue, 14 Mar 2017 16:39:47 -0700
Subject: [PATCH 033/366] Fix ReactCxx xcodeproj

Summary:
The ReactCxx project was not updated when RCTMap was removed in 48f30eca7e3d4c239501de515a7cc35615ed6bd1, this fixes it. It was also missing the systemJSCWrapper.cpp file.

**Test plan**
Tested that UIExplorerCxx now builds

cc mkonicek
Closes https://github.com/facebook/react-native/pull/12919

Differential Revision: D4709498

Pulled By: mkonicek

fbshipit-source-id: 995a1a914ab0a3227b1219c575a84d136800ff19
---
 React/ReactCxx.xcodeproj/project.pbxproj | 84 ++----------------------
 1 file changed, 4 insertions(+), 80 deletions(-)

diff --git a/React/ReactCxx.xcodeproj/project.pbxproj b/React/ReactCxx.xcodeproj/project.pbxproj
index 1c3ebe943e2f52..1d9ac80584e181 100644
--- a/React/ReactCxx.xcodeproj/project.pbxproj
+++ b/React/ReactCxx.xcodeproj/project.pbxproj
@@ -61,7 +61,6 @@
 		1339578B1DF76D3500EC27BE /* Yoga.h in Headers */ = {isa = PBXBuildFile; fileRef = 130A77081DF767AF001F9587 /* Yoga.h */; };
 		133CAE8E1B8E5CFD00F6AD92 /* RCTDatePicker.m in Sources */ = {isa = PBXBuildFile; fileRef = 133CAE8D1B8E5CFD00F6AD92 /* RCTDatePicker.m */; };
 		13456E931ADAD2DE009F94A7 /* RCTConvert+CoreLocation.m in Sources */ = {isa = PBXBuildFile; fileRef = 13456E921ADAD2DE009F94A7 /* RCTConvert+CoreLocation.m */; };
-		13456E961ADAD482009F94A7 /* RCTConvert+MapKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 13456E951ADAD482009F94A7 /* RCTConvert+MapKit.m */; };
 		134FCB3D1A6E7F0800051CC8 /* RCTJSCExecutor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 134FCB3A1A6E7F0800051CC8 /* RCTJSCExecutor.mm */; };
 		13513F3C1B1F43F400FCE529 /* RCTProgressViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 13513F3B1B1F43F400FCE529 /* RCTProgressViewManager.m */; };
 		13723B501A82FD3C00F88898 /* RCTStatusBarManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 13723B4F1A82FD3C00F88898 /* RCTStatusBarManager.m */; };
@@ -124,7 +123,6 @@
 		13AB5E021DF777F2001A8C30 /* Yoga.c in Sources */ = {isa = PBXBuildFile; fileRef = 130A77071DF767AF001F9587 /* Yoga.c */; };
 		13AB90C11B6FA36700713B4F /* RCTComponentData.m in Sources */ = {isa = PBXBuildFile; fileRef = 13AB90C01B6FA36700713B4F /* RCTComponentData.m */; };
 		13AF20451AE707F9005F5298 /* RCTSlider.m in Sources */ = {isa = PBXBuildFile; fileRef = 13AF20441AE707F9005F5298 /* RCTSlider.m */; };
-		13AFBCA01C07247D00BBAEAA /* RCTMapOverlay.m in Sources */ = {isa = PBXBuildFile; fileRef = 13AFBC9F1C07247D00BBAEAA /* RCTMapOverlay.m */; };
 		13B07FEF1A69327A00A75B9A /* RCTAlertManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FE81A69327A00A75B9A /* RCTAlertManager.m */; };
 		13B07FF01A69327A00A75B9A /* RCTExceptionsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FEA1A69327A00A75B9A /* RCTExceptionsManager.m */; };
 		13B07FF21A69327A00A75B9A /* RCTTiming.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FEE1A69327A00A75B9A /* RCTTiming.m */; };
@@ -136,7 +134,6 @@
 		13B0801D1A69489C00A75B9A /* RCTNavItemManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B080131A69489C00A75B9A /* RCTNavItemManager.m */; };
 		13B080201A69489C00A75B9A /* RCTActivityIndicatorViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B080191A69489C00A75B9A /* RCTActivityIndicatorViewManager.m */; };
 		13B080261A694A8400A75B9A /* RCTWrapperViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B080241A694A8400A75B9A /* RCTWrapperViewController.m */; };
-		13B202041BFB948C00C07393 /* RCTMapAnnotation.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B202031BFB948C00C07393 /* RCTMapAnnotation.m */; };
 		13BB3D021BECD54500932C10 /* RCTImageSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 13BB3D011BECD54500932C10 /* RCTImageSource.m */; };
 		13BCE8091C99CB9D00DD7AAD /* RCTRootShadowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 13BCE8081C99CB9D00DD7AAD /* RCTRootShadowView.m */; };
 		13C156051AB1A2840079392D /* RCTWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = 13C156021AB1A2840079392D /* RCTWebView.m */; };
@@ -215,8 +212,6 @@
 		13F8879F1E29741900C3C7A1 /* BitsFunctexcept.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 13F8879C1E29740700C3C7A1 /* BitsFunctexcept.cpp */; };
 		13F887A21E2977FF00C3C7A1 /* MallocImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 13F887A01E2977D800C3C7A1 /* MallocImpl.cpp */; };
 		142014191B32094000CC17BA /* RCTPerformanceLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 142014171B32094000CC17BA /* RCTPerformanceLogger.m */; };
-		14435CE51AAC4AE100FC20F4 /* RCTMap.m in Sources */ = {isa = PBXBuildFile; fileRef = 14435CE21AAC4AE100FC20F4 /* RCTMap.m */; };
-		14435CE61AAC4AE100FC20F4 /* RCTMapManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 14435CE41AAC4AE100FC20F4 /* RCTMapManager.m */; };
 		1450FF861BCFF28A00208362 /* RCTProfile.m in Sources */ = {isa = PBXBuildFile; fileRef = 1450FF811BCFF28A00208362 /* RCTProfile.m */; };
 		1450FF871BCFF28A00208362 /* RCTProfileTrampoline-arm.S in Sources */ = {isa = PBXBuildFile; fileRef = 1450FF821BCFF28A00208362 /* RCTProfileTrampoline-arm.S */; };
 		1450FF881BCFF28A00208362 /* RCTProfileTrampoline-arm64.S in Sources */ = {isa = PBXBuildFile; fileRef = 1450FF831BCFF28A00208362 /* RCTProfileTrampoline-arm64.S */; };
@@ -233,6 +228,7 @@
 		14F7A0F01BDA714B003C6C10 /* RCTFPSGraph.m in Sources */ = {isa = PBXBuildFile; fileRef = 14F7A0EF1BDA714B003C6C10 /* RCTFPSGraph.m */; };
 		191E3EBE1C29D9AF00C180A6 /* RCTRefreshControlManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 191E3EBD1C29D9AF00C180A6 /* RCTRefreshControlManager.m */; };
 		191E3EC11C29DC3800C180A6 /* RCTRefreshControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 191E3EC01C29DC3800C180A6 /* RCTRefreshControl.m */; };
+		19DED2291E77E29200F089BB /* systemJSCWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 19DED2281E77E29200F089BB /* systemJSCWrapper.cpp */; };
 		27595AA31E575C7800CCE2B1 /* CxxMessageQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0A61E03699D0018521A /* CxxMessageQueue.h */; };
 		27595AA41E575C7800CCE2B1 /* CxxModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0A71E03699D0018521A /* CxxModule.h */; };
 		27595AA51E575C7800CCE2B1 /* CxxNativeModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0A91E03699D0018521A /* CxxNativeModule.h */; };
@@ -338,12 +334,7 @@
 		2D3B5EC91D9B095C00451313 /* RCTBorderDrawing.m in Sources */ = {isa = PBXBuildFile; fileRef = 13CC8A811B17642100940AE7 /* RCTBorderDrawing.m */; };
 		2D3B5ECA1D9B095F00451313 /* RCTComponentData.m in Sources */ = {isa = PBXBuildFile; fileRef = 13AB90C01B6FA36700713B4F /* RCTComponentData.m */; };
 		2D3B5ECB1D9B096200451313 /* RCTConvert+CoreLocation.m in Sources */ = {isa = PBXBuildFile; fileRef = 13456E921ADAD2DE009F94A7 /* RCTConvert+CoreLocation.m */; };
-		2D3B5ECC1D9B096500451313 /* RCTConvert+MapKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 13456E951ADAD482009F94A7 /* RCTConvert+MapKit.m */; };
 		2D3B5ECF1D9B096F00451313 /* RCTFont.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3D37B5811D522B190042D5B5 /* RCTFont.mm */; };
-		2D3B5ED01D9B097200451313 /* RCTMap.m in Sources */ = {isa = PBXBuildFile; fileRef = 14435CE21AAC4AE100FC20F4 /* RCTMap.m */; };
-		2D3B5ED11D9B097500451313 /* RCTMapAnnotation.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B202031BFB948C00C07393 /* RCTMapAnnotation.m */; };
-		2D3B5ED21D9B097800451313 /* RCTMapManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 14435CE41AAC4AE100FC20F4 /* RCTMapManager.m */; };
-		2D3B5ED31D9B097B00451313 /* RCTMapOverlay.m in Sources */ = {isa = PBXBuildFile; fileRef = 13AFBC9F1C07247D00BBAEAA /* RCTMapOverlay.m */; };
 		2D3B5ED41D9B097D00451313 /* RCTModalHostView.m in Sources */ = {isa = PBXBuildFile; fileRef = 83A1FE8B1B62640A00BE0E65 /* RCTModalHostView.m */; };
 		2D3B5ED51D9B098000451313 /* RCTModalHostViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 83392EB21B6634E10013B15F /* RCTModalHostViewController.m */; };
 		2D3B5ED61D9B098400451313 /* RCTModalHostViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 83A1FE8E1B62643A00BE0E65 /* RCTModalHostViewManager.m */; };
@@ -454,12 +445,7 @@
 		3D302F701DF828F800D6DDAE /* RCTComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = 13C325281AA63B6A0048765F /* RCTComponent.h */; };
 		3D302F711DF828F800D6DDAE /* RCTComponentData.h in Headers */ = {isa = PBXBuildFile; fileRef = 13AB90BF1B6FA36700713B4F /* RCTComponentData.h */; };
 		3D302F721DF828F800D6DDAE /* RCTConvert+CoreLocation.h in Headers */ = {isa = PBXBuildFile; fileRef = 13456E911ADAD2DE009F94A7 /* RCTConvert+CoreLocation.h */; };
-		3D302F731DF828F800D6DDAE /* RCTConvert+MapKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 13456E941ADAD482009F94A7 /* RCTConvert+MapKit.h */; };
 		3D302F761DF828F800D6DDAE /* RCTFont.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D37B5801D522B190042D5B5 /* RCTFont.h */; };
-		3D302F771DF828F800D6DDAE /* RCTMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 14435CE11AAC4AE100FC20F4 /* RCTMap.h */; };
-		3D302F781DF828F800D6DDAE /* RCTMapAnnotation.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B202021BFB948C00C07393 /* RCTMapAnnotation.h */; };
-		3D302F791DF828F800D6DDAE /* RCTMapManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 14435CE31AAC4AE100FC20F4 /* RCTMapManager.h */; };
-		3D302F7A1DF828F800D6DDAE /* RCTMapOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 13AFBC9E1C07247D00BBAEAA /* RCTMapOverlay.h */; };
 		3D302F7B1DF828F800D6DDAE /* RCTModalHostView.h in Headers */ = {isa = PBXBuildFile; fileRef = 83A1FE8A1B62640A00BE0E65 /* RCTModalHostView.h */; };
 		3D302F7C1DF828F800D6DDAE /* RCTModalHostViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 83392EB11B6634E10013B15F /* RCTModalHostViewController.h */; };
 		3D302F7D1DF828F800D6DDAE /* RCTModalHostViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 83A1FE8D1B62643A00BE0E65 /* RCTModalHostViewManager.h */; };
@@ -594,14 +580,9 @@
 		3D80D96B1DF6FA890028D040 /* RCTComponent.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13C325281AA63B6A0048765F /* RCTComponent.h */; };
 		3D80D96C1DF6FA890028D040 /* RCTComponentData.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13AB90BF1B6FA36700713B4F /* RCTComponentData.h */; };
 		3D80D96D1DF6FA890028D040 /* RCTConvert+CoreLocation.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13456E911ADAD2DE009F94A7 /* RCTConvert+CoreLocation.h */; };
-		3D80D96E1DF6FA890028D040 /* RCTConvert+MapKit.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13456E941ADAD482009F94A7 /* RCTConvert+MapKit.h */; };
 		3D80D96F1DF6FA890028D040 /* RCTDatePicker.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 133CAE8C1B8E5CFD00F6AD92 /* RCTDatePicker.h */; };
 		3D80D9701DF6FA890028D040 /* RCTDatePickerManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 58C571C01AA56C1900CDF9C8 /* RCTDatePickerManager.h */; };
 		3D80D9711DF6FA890028D040 /* RCTFont.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D37B5801D522B190042D5B5 /* RCTFont.h */; };
-		3D80D9721DF6FA890028D040 /* RCTMap.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 14435CE11AAC4AE100FC20F4 /* RCTMap.h */; };
-		3D80D9731DF6FA890028D040 /* RCTMapAnnotation.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13B202021BFB948C00C07393 /* RCTMapAnnotation.h */; };
-		3D80D9741DF6FA890028D040 /* RCTMapManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 14435CE31AAC4AE100FC20F4 /* RCTMapManager.h */; };
-		3D80D9751DF6FA890028D040 /* RCTMapOverlay.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13AFBC9E1C07247D00BBAEAA /* RCTMapOverlay.h */; };
 		3D80D9761DF6FA890028D040 /* RCTModalHostView.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 83A1FE8A1B62640A00BE0E65 /* RCTModalHostView.h */; };
 		3D80D9771DF6FA890028D040 /* RCTModalHostViewController.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 83392EB11B6634E10013B15F /* RCTModalHostViewController.h */; };
 		3D80D9781DF6FA890028D040 /* RCTModalHostViewManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 83A1FE8D1B62643A00BE0E65 /* RCTModalHostViewManager.h */; };
@@ -717,14 +698,9 @@
 		3D80DA651DF820620028D040 /* RCTComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = 13C325281AA63B6A0048765F /* RCTComponent.h */; };
 		3D80DA661DF820620028D040 /* RCTComponentData.h in Headers */ = {isa = PBXBuildFile; fileRef = 13AB90BF1B6FA36700713B4F /* RCTComponentData.h */; };
 		3D80DA671DF820620028D040 /* RCTConvert+CoreLocation.h in Headers */ = {isa = PBXBuildFile; fileRef = 13456E911ADAD2DE009F94A7 /* RCTConvert+CoreLocation.h */; };
-		3D80DA681DF820620028D040 /* RCTConvert+MapKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 13456E941ADAD482009F94A7 /* RCTConvert+MapKit.h */; };
 		3D80DA691DF820620028D040 /* RCTDatePicker.h in Headers */ = {isa = PBXBuildFile; fileRef = 133CAE8C1B8E5CFD00F6AD92 /* RCTDatePicker.h */; };
 		3D80DA6A1DF820620028D040 /* RCTDatePickerManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 58C571C01AA56C1900CDF9C8 /* RCTDatePickerManager.h */; };
 		3D80DA6B1DF820620028D040 /* RCTFont.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D37B5801D522B190042D5B5 /* RCTFont.h */; };
-		3D80DA6C1DF820620028D040 /* RCTMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 14435CE11AAC4AE100FC20F4 /* RCTMap.h */; };
-		3D80DA6D1DF820620028D040 /* RCTMapAnnotation.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B202021BFB948C00C07393 /* RCTMapAnnotation.h */; };
-		3D80DA6E1DF820620028D040 /* RCTMapManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 14435CE31AAC4AE100FC20F4 /* RCTMapManager.h */; };
-		3D80DA6F1DF820620028D040 /* RCTMapOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 13AFBC9E1C07247D00BBAEAA /* RCTMapOverlay.h */; };
 		3D80DA701DF820620028D040 /* RCTModalHostView.h in Headers */ = {isa = PBXBuildFile; fileRef = 83A1FE8A1B62640A00BE0E65 /* RCTModalHostView.h */; };
 		3D80DA711DF820620028D040 /* RCTModalHostViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 83392EB11B6634E10013B15F /* RCTModalHostViewController.h */; };
 		3D80DA721DF820620028D040 /* RCTModalHostViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 83A1FE8D1B62643A00BE0E65 /* RCTModalHostViewManager.h */; };
@@ -871,15 +847,10 @@
 		3DA982051E5B0F7F004F2374 /* RCTComponent.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13C325281AA63B6A0048765F /* RCTComponent.h */; };
 		3DA982061E5B0F7F004F2374 /* RCTComponentData.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13AB90BF1B6FA36700713B4F /* RCTComponentData.h */; };
 		3DA982071E5B0F7F004F2374 /* RCTConvert+CoreLocation.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13456E911ADAD2DE009F94A7 /* RCTConvert+CoreLocation.h */; };
-		3DA982081E5B0F7F004F2374 /* RCTConvert+MapKit.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13456E941ADAD482009F94A7 /* RCTConvert+MapKit.h */; };
 		3DA982091E5B0F7F004F2374 /* RCTConvert+Transform.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 130443C31E401A8C00D93A67 /* RCTConvert+Transform.h */; };
 		3DA9820A1E5B0F7F004F2374 /* RCTDatePicker.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 133CAE8C1B8E5CFD00F6AD92 /* RCTDatePicker.h */; };
 		3DA9820B1E5B0F7F004F2374 /* RCTDatePickerManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 58C571C01AA56C1900CDF9C8 /* RCTDatePickerManager.h */; };
 		3DA9820C1E5B0F7F004F2374 /* RCTFont.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D37B5801D522B190042D5B5 /* RCTFont.h */; };
-		3DA9820D1E5B0F7F004F2374 /* RCTMap.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 14435CE11AAC4AE100FC20F4 /* RCTMap.h */; };
-		3DA9820E1E5B0F7F004F2374 /* RCTMapAnnotation.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13B202021BFB948C00C07393 /* RCTMapAnnotation.h */; };
-		3DA9820F1E5B0F7F004F2374 /* RCTMapManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 14435CE31AAC4AE100FC20F4 /* RCTMapManager.h */; };
-		3DA982101E5B0F7F004F2374 /* RCTMapOverlay.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13AFBC9E1C07247D00BBAEAA /* RCTMapOverlay.h */; };
 		3DA982111E5B0F7F004F2374 /* RCTModalHostView.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 83A1FE8A1B62640A00BE0E65 /* RCTModalHostView.h */; };
 		3DA982121E5B0F7F004F2374 /* RCTModalHostViewController.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 83392EB11B6634E10013B15F /* RCTModalHostViewController.h */; };
 		3DA982131E5B0F7F004F2374 /* RCTModalHostViewManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 83A1FE8D1B62643A00BE0E65 /* RCTModalHostViewManager.h */; };
@@ -1122,15 +1093,10 @@
 				3DA982051E5B0F7F004F2374 /* RCTComponent.h in Copy Headers */,
 				3DA982061E5B0F7F004F2374 /* RCTComponentData.h in Copy Headers */,
 				3DA982071E5B0F7F004F2374 /* RCTConvert+CoreLocation.h in Copy Headers */,
-				3DA982081E5B0F7F004F2374 /* RCTConvert+MapKit.h in Copy Headers */,
 				3DA982091E5B0F7F004F2374 /* RCTConvert+Transform.h in Copy Headers */,
 				3DA9820A1E5B0F7F004F2374 /* RCTDatePicker.h in Copy Headers */,
 				3DA9820B1E5B0F7F004F2374 /* RCTDatePickerManager.h in Copy Headers */,
 				3DA9820C1E5B0F7F004F2374 /* RCTFont.h in Copy Headers */,
-				3DA9820D1E5B0F7F004F2374 /* RCTMap.h in Copy Headers */,
-				3DA9820E1E5B0F7F004F2374 /* RCTMapAnnotation.h in Copy Headers */,
-				3DA9820F1E5B0F7F004F2374 /* RCTMapManager.h in Copy Headers */,
-				3DA982101E5B0F7F004F2374 /* RCTMapOverlay.h in Copy Headers */,
 				3DA982111E5B0F7F004F2374 /* RCTModalHostView.h in Copy Headers */,
 				3DA982121E5B0F7F004F2374 /* RCTModalHostViewController.h in Copy Headers */,
 				3DA982131E5B0F7F004F2374 /* RCTModalHostViewManager.h in Copy Headers */,
@@ -1367,14 +1333,9 @@
 				3D80D96B1DF6FA890028D040 /* RCTComponent.h in Copy Headers */,
 				3D80D96C1DF6FA890028D040 /* RCTComponentData.h in Copy Headers */,
 				3D80D96D1DF6FA890028D040 /* RCTConvert+CoreLocation.h in Copy Headers */,
-				3D80D96E1DF6FA890028D040 /* RCTConvert+MapKit.h in Copy Headers */,
 				3D80D96F1DF6FA890028D040 /* RCTDatePicker.h in Copy Headers */,
 				3D80D9701DF6FA890028D040 /* RCTDatePickerManager.h in Copy Headers */,
 				3D80D9711DF6FA890028D040 /* RCTFont.h in Copy Headers */,
-				3D80D9721DF6FA890028D040 /* RCTMap.h in Copy Headers */,
-				3D80D9731DF6FA890028D040 /* RCTMapAnnotation.h in Copy Headers */,
-				3D80D9741DF6FA890028D040 /* RCTMapManager.h in Copy Headers */,
-				3D80D9751DF6FA890028D040 /* RCTMapOverlay.h in Copy Headers */,
 				3D80D9761DF6FA890028D040 /* RCTModalHostView.h in Copy Headers */,
 				3D80D9771DF6FA890028D040 /* RCTModalHostViewController.h in Copy Headers */,
 				3D80D9781DF6FA890028D040 /* RCTModalHostViewManager.h in Copy Headers */,
@@ -1538,8 +1499,6 @@
 		13442BF41AA90E0B0037E5B0 /* RCTViewControllerProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTViewControllerProtocol.h; sourceTree = "<group>"; };
 		13456E911ADAD2DE009F94A7 /* RCTConvert+CoreLocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "RCTConvert+CoreLocation.h"; sourceTree = "<group>"; };
 		13456E921ADAD2DE009F94A7 /* RCTConvert+CoreLocation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "RCTConvert+CoreLocation.m"; sourceTree = "<group>"; };
-		13456E941ADAD482009F94A7 /* RCTConvert+MapKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "RCTConvert+MapKit.h"; sourceTree = "<group>"; };
-		13456E951ADAD482009F94A7 /* RCTConvert+MapKit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "RCTConvert+MapKit.m"; sourceTree = "<group>"; };
 		1345A83A1B265A0E00583190 /* RCTURLRequestDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTURLRequestDelegate.h; sourceTree = "<group>"; };
 		1345A83B1B265A0E00583190 /* RCTURLRequestHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTURLRequestHandler.h; sourceTree = "<group>"; };
 		134FCB391A6E7F0800051CC8 /* RCTJSCExecutor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTJSCExecutor.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
@@ -1626,8 +1585,6 @@
 		13AF1F851AE6E777005F5298 /* RCTDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTDefines.h; sourceTree = "<group>"; };
 		13AF20431AE707F8005F5298 /* RCTSlider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTSlider.h; sourceTree = "<group>"; };
 		13AF20441AE707F9005F5298 /* RCTSlider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTSlider.m; sourceTree = "<group>"; };
-		13AFBC9E1C07247D00BBAEAA /* RCTMapOverlay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTMapOverlay.h; sourceTree = "<group>"; };
-		13AFBC9F1C07247D00BBAEAA /* RCTMapOverlay.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTMapOverlay.m; sourceTree = "<group>"; };
 		13AFBCA11C07287B00BBAEAA /* RCTBridgeMethod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTBridgeMethod.h; sourceTree = "<group>"; };
 		13AFBCA21C07287B00BBAEAA /* RCTRootViewDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTRootViewDelegate.h; sourceTree = "<group>"; };
 		13B07FE71A69327A00A75B9A /* RCTAlertManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTAlertManager.h; sourceTree = "<group>"; };
@@ -1652,8 +1609,6 @@
 		13B080191A69489C00A75B9A /* RCTActivityIndicatorViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTActivityIndicatorViewManager.m; sourceTree = "<group>"; };
 		13B080231A694A8400A75B9A /* RCTWrapperViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTWrapperViewController.h; sourceTree = "<group>"; };
 		13B080241A694A8400A75B9A /* RCTWrapperViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTWrapperViewController.m; sourceTree = "<group>"; };
-		13B202021BFB948C00C07393 /* RCTMapAnnotation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTMapAnnotation.h; sourceTree = "<group>"; };
-		13B202031BFB948C00C07393 /* RCTMapAnnotation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTMapAnnotation.m; sourceTree = "<group>"; };
 		13BB3D001BECD54500932C10 /* RCTImageSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTImageSource.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		13BB3D011BECD54500932C10 /* RCTImageSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTImageSource.m; sourceTree = "<group>"; };
 		13BCE8071C99CB9D00DD7AAD /* RCTRootShadowView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTRootShadowView.h; sourceTree = "<group>"; };
@@ -1694,10 +1649,6 @@
 		142014171B32094000CC17BA /* RCTPerformanceLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTPerformanceLogger.m; sourceTree = "<group>"; };
 		142014181B32094000CC17BA /* RCTPerformanceLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTPerformanceLogger.h; sourceTree = "<group>"; };
 		1436DD071ADE7AA000A5ED7D /* RCTFrameUpdate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTFrameUpdate.h; sourceTree = "<group>"; };
-		14435CE11AAC4AE100FC20F4 /* RCTMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTMap.h; sourceTree = "<group>"; };
-		14435CE21AAC4AE100FC20F4 /* RCTMap.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTMap.m; sourceTree = "<group>"; };
-		14435CE31AAC4AE100FC20F4 /* RCTMapManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTMapManager.h; sourceTree = "<group>"; };
-		14435CE41AAC4AE100FC20F4 /* RCTMapManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTMapManager.m; sourceTree = "<group>"; };
 		1450FF801BCFF28A00208362 /* RCTProfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTProfile.h; sourceTree = "<group>"; };
 		1450FF811BCFF28A00208362 /* RCTProfile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTProfile.m; sourceTree = "<group>"; };
 		1450FF821BCFF28A00208362 /* RCTProfileTrampoline-arm.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = "RCTProfileTrampoline-arm.S"; sourceTree = "<group>"; };
@@ -1728,6 +1679,7 @@
 		191E3EBD1C29D9AF00C180A6 /* RCTRefreshControlManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTRefreshControlManager.m; sourceTree = "<group>"; };
 		191E3EBF1C29DC3800C180A6 /* RCTRefreshControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTRefreshControl.h; sourceTree = "<group>"; };
 		191E3EC01C29DC3800C180A6 /* RCTRefreshControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTRefreshControl.m; sourceTree = "<group>"; };
+		19DED2281E77E29200F089BB /* systemJSCWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = systemJSCWrapper.cpp; path = ../jschelpers/systemJSCWrapper.cpp; sourceTree = "<group>"; };
 		27B958731E57587D0096647A /* JSBigString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSBigString.cpp; sourceTree = "<group>"; };
 		2D2A28131D9B038B00D4039D /* libReact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libReact.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		352DCFEE1D19F4C20056D623 /* RCTI18nUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTI18nUtil.h; sourceTree = "<group>"; };
@@ -2141,8 +2093,6 @@
 				13AB90C01B6FA36700713B4F /* RCTComponentData.m */,
 				13456E911ADAD2DE009F94A7 /* RCTConvert+CoreLocation.h */,
 				13456E921ADAD2DE009F94A7 /* RCTConvert+CoreLocation.m */,
-				13456E941ADAD482009F94A7 /* RCTConvert+MapKit.h */,
-				13456E951ADAD482009F94A7 /* RCTConvert+MapKit.m */,
 				130443C31E401A8C00D93A67 /* RCTConvert+Transform.h */,
 				130443C41E401A8C00D93A67 /* RCTConvert+Transform.m */,
 				133CAE8C1B8E5CFD00F6AD92 /* RCTDatePicker.h */,
@@ -2151,14 +2101,6 @@
 				58C571BF1AA56C1900CDF9C8 /* RCTDatePickerManager.m */,
 				3D37B5801D522B190042D5B5 /* RCTFont.h */,
 				3D37B5811D522B190042D5B5 /* RCTFont.mm */,
-				14435CE11AAC4AE100FC20F4 /* RCTMap.h */,
-				14435CE21AAC4AE100FC20F4 /* RCTMap.m */,
-				13B202021BFB948C00C07393 /* RCTMapAnnotation.h */,
-				13B202031BFB948C00C07393 /* RCTMapAnnotation.m */,
-				14435CE31AAC4AE100FC20F4 /* RCTMapManager.h */,
-				14435CE41AAC4AE100FC20F4 /* RCTMapManager.m */,
-				13AFBC9E1C07247D00BBAEAA /* RCTMapOverlay.h */,
-				13AFBC9F1C07247D00BBAEAA /* RCTMapOverlay.m */,
 				83A1FE8A1B62640A00BE0E65 /* RCTModalHostView.h */,
 				83A1FE8B1B62640A00BE0E65 /* RCTModalHostView.m */,
 				83392EB11B6634E10013B15F /* RCTModalHostViewController.h */,
@@ -2517,6 +2459,7 @@
 				3D7454791E54757500E74ADD /* RecoverableError.h */,
 				3D92B0D31E03699D0018521A /* SampleCxxModule.cpp */,
 				3D92B0D41E03699D0018521A /* SampleCxxModule.h */,
+				19DED2281E77E29200F089BB /* systemJSCWrapper.cpp */,
 				3D92B0D51E03699D0018521A /* SystraceSection.h */,
 			);
 			path = cxxreact;
@@ -2635,12 +2578,7 @@
 				3D302F701DF828F800D6DDAE /* RCTComponent.h in Headers */,
 				3D302F711DF828F800D6DDAE /* RCTComponentData.h in Headers */,
 				3D302F721DF828F800D6DDAE /* RCTConvert+CoreLocation.h in Headers */,
-				3D302F731DF828F800D6DDAE /* RCTConvert+MapKit.h in Headers */,
 				3D302F761DF828F800D6DDAE /* RCTFont.h in Headers */,
-				3D302F771DF828F800D6DDAE /* RCTMap.h in Headers */,
-				3D302F781DF828F800D6DDAE /* RCTMapAnnotation.h in Headers */,
-				3D302F791DF828F800D6DDAE /* RCTMapManager.h in Headers */,
-				3D302F7A1DF828F800D6DDAE /* RCTMapOverlay.h in Headers */,
 				3D302F7B1DF828F800D6DDAE /* RCTModalHostView.h in Headers */,
 				3D302F7C1DF828F800D6DDAE /* RCTModalHostViewController.h in Headers */,
 				3D302F7D1DF828F800D6DDAE /* RCTModalHostViewManager.h in Headers */,
@@ -2907,16 +2845,11 @@
 				3D80DA661DF820620028D040 /* RCTComponentData.h in Headers */,
 				3DA9819E1E5B0DBB004F2374 /* NSDataBigString.h in Headers */,
 				3D80DA671DF820620028D040 /* RCTConvert+CoreLocation.h in Headers */,
-				3D80DA681DF820620028D040 /* RCTConvert+MapKit.h in Headers */,
 				3D80DA691DF820620028D040 /* RCTDatePicker.h in Headers */,
 				3D80DA6A1DF820620028D040 /* RCTDatePickerManager.h in Headers */,
 				3D80DA6B1DF820620028D040 /* RCTFont.h in Headers */,
 				139D7EE41E25DBDC00323FB7 /* demangle.h in Headers */,
-				3D80DA6C1DF820620028D040 /* RCTMap.h in Headers */,
-				3D80DA6D1DF820620028D040 /* RCTMapAnnotation.h in Headers */,
-				3D80DA6E1DF820620028D040 /* RCTMapManager.h in Headers */,
 				139D7E561E25C5A300323FB7 /* fast-dtoa.h in Headers */,
-				3D80DA6F1DF820620028D040 /* RCTMapOverlay.h in Headers */,
 				3D80DA701DF820620028D040 /* RCTModalHostView.h in Headers */,
 				3D80DA711DF820620028D040 /* RCTModalHostViewController.h in Headers */,
 				3D80DA721DF820620028D040 /* RCTModalHostViewManager.h in Headers */,
@@ -3337,7 +3270,6 @@
 				3D80D91B1DF6F8200028D040 /* RCTPlatform.m in Sources */,
 				2DD0EFE11DA84F2800B0C975 /* RCTStatusBarManager.m in Sources */,
 				2D3B5EC91D9B095C00451313 /* RCTBorderDrawing.m in Sources */,
-				2D3B5ED31D9B097B00451313 /* RCTMapOverlay.m in Sources */,
 				2D3B5E991D9B089A00451313 /* RCTDisplayLink.m in Sources */,
 				2D3B5EBF1D9B093300451313 /* RCTJSCProfiler.m in Sources */,
 				2D3B5EA11D9B08B600451313 /* RCTModuleData.mm in Sources */,
@@ -3359,7 +3291,6 @@
 				130443DF1E401B0D00D93A67 /* RCTTVView.m in Sources */,
 				130443A41E3FEAC600D93A67 /* RCTFollyConvert.mm in Sources */,
 				2D3B5EB71D9B091800451313 /* RCTRedBox.m in Sources */,
-				2D3B5ED11D9B097500451313 /* RCTMapAnnotation.m in Sources */,
 				3D7AA9C61E548CDD001955CF /* NSDataBigString.mm in Sources */,
 				13134C8F1E296B2A00B9F3CB /* RCTMessageThread.mm in Sources */,
 				2D3B5EAF1D9B08FB00451313 /* RCTAccessibilityManager.m in Sources */,
@@ -3375,7 +3306,6 @@
 				130E3D8B1E6A083900ACE484 /* RCTDevSettings.mm in Sources */,
 				2D3B5ED81D9B098A00451313 /* RCTNavigatorManager.m in Sources */,
 				2D3B5E951D9B087C00451313 /* RCTAssert.m in Sources */,
-				2D3B5ED21D9B097800451313 /* RCTMapManager.m in Sources */,
 				2D3B5EB61D9B091400451313 /* RCTExceptionsManager.m in Sources */,
 				2D3B5EEB1D9B09D000451313 /* RCTTabBarItem.m in Sources */,
 				2D3B5E961D9B088500451313 /* RCTBatchedBridge.m in Sources */,
@@ -3389,7 +3319,6 @@
 				13134C931E296B2A00B9F3CB /* RCTNativeModule.mm in Sources */,
 				2D3B5ECB1D9B096200451313 /* RCTConvert+CoreLocation.m in Sources */,
 				2D3B5EEE1D9B09DA00451313 /* RCTView.m in Sources */,
-				2D3B5ECC1D9B096500451313 /* RCTConvert+MapKit.m in Sources */,
 				2D3B5E981D9B089500451313 /* RCTConvert.m in Sources */,
 				2D3B5EA71D9B08CE00451313 /* RCTTouchHandler.m in Sources */,
 				3D05745A1DE5FFF500184BB4 /* RCTJavaScriptLoader.mm in Sources */,
@@ -3407,7 +3336,6 @@
 				130443DB1E401ADD00D93A67 /* RCTConvert+Transform.m in Sources */,
 				2D3B5EC61D9B095000451313 /* RCTProfileTrampoline-x86_64.S in Sources */,
 				3D7A27E31DE325DA002E3F95 /* RCTJSCErrorHandling.mm in Sources */,
-				2D3B5ED01D9B097200451313 /* RCTMap.m in Sources */,
 				2D3B5EA61D9B08CA00451313 /* RCTTouchEvent.m in Sources */,
 				2D8C2E331DA40441000EE098 /* RCTMultipartStreamReader.m in Sources */,
 				2D3B5EF01D9B09E300451313 /* RCTWrapperViewController.m in Sources */,
@@ -3535,7 +3463,6 @@
 			files = (
 				13134C9A1E296B2A00B9F3CB /* RCTCxxMethod.mm in Sources */,
 				59FBEFB61E46D91C0095D885 /* RCTScrollContentViewManager.m in Sources */,
-				13456E961ADAD482009F94A7 /* RCTConvert+MapKit.m in Sources */,
 				13723B501A82FD3C00F88898 /* RCTStatusBarManager.m in Sources */,
 				000E6CEB1AB0E980000CDF4D /* RCTSourceCode.m in Sources */,
 				14A43DF31C20B1C900794BC8 /* RCTJSCProfiler.m in Sources */,
@@ -3551,7 +3478,6 @@
 				131B6AF41AF1093D00FFC3E0 /* RCTSegmentedControl.m in Sources */,
 				830A229E1A66C68A008503DA /* RCTRootView.m in Sources */,
 				13B07FF01A69327A00A75B9A /* RCTExceptionsManager.m in Sources */,
-				13B202041BFB948C00C07393 /* RCTMapAnnotation.m in Sources */,
 				13A0C28A1B74F71200B29F6F /* RCTDevMenu.m in Sources */,
 				13BCE8091C99CB9D00DD7AAD /* RCTRootShadowView.m in Sources */,
 				14C2CA711B3AC63800E6CBB2 /* RCTModuleMethod.m in Sources */,
@@ -3609,14 +3535,12 @@
 				13A6E20E1C19AA0C00845B82 /* RCTParserUtils.m in Sources */,
 				13E067571A70F44B002CDEE1 /* RCTView.m in Sources */,
 				3D7749441DC1065C007EC8D8 /* RCTPlatform.m in Sources */,
-				13AFBCA01C07247D00BBAEAA /* RCTMapOverlay.m in Sources */,
 				13D9FEEE1CDCD93000158BD7 /* RCTKeyboardObserver.m in Sources */,
 				B233E6EA1D2D845D00BC68BA /* RCTI18nManager.m in Sources */,
 				13456E931ADAD2DE009F94A7 /* RCTConvert+CoreLocation.m in Sources */,
 				137327E91AA5CF210034F82E /* RCTTabBarItemManager.m in Sources */,
 				13A1F71E1A75392D00D3D453 /* RCTKeyCommands.m in Sources */,
 				83CBBA531A601E3B00E9B192 /* RCTUtils.m in Sources */,
-				14435CE61AAC4AE100FC20F4 /* RCTMapManager.m in Sources */,
 				130443C61E401A8C00D93A67 /* RCTConvert+Transform.m in Sources */,
 				191E3EC11C29DC3800C180A6 /* RCTRefreshControl.m in Sources */,
 				13C156051AB1A2840079392D /* RCTWebView.m in Sources */,
@@ -3639,8 +3563,8 @@
 				137327E71AA5CF210034F82E /* RCTTabBar.m in Sources */,
 				13F17A851B8493E5007D4C75 /* RCTRedBox.m in Sources */,
 				83392EB31B6634E10013B15F /* RCTModalHostViewController.m in Sources */,
-				14435CE51AAC4AE100FC20F4 /* RCTMap.m in Sources */,
 				13B0801C1A69489C00A75B9A /* RCTNavItem.m in Sources */,
+				19DED2291E77E29200F089BB /* systemJSCWrapper.cpp in Sources */,
 				83CBBA691A601EF300E9B192 /* RCTEventDispatcher.m in Sources */,
 				83A1FE8F1B62643A00BE0E65 /* RCTModalHostViewManager.m in Sources */,
 				13E0674A1A70F434002CDEE1 /* RCTUIManager.m in Sources */,

From 6dab5dcd7cd8214311d5b8aaa447a9c549d43757 Mon Sep 17 00:00:00 2001
From: Hector Ramos <hramos@fb.com>
Date: Tue, 14 Mar 2017 16:57:57 -0700
Subject: [PATCH 034/366] Link to Sketch and CRNA

Summary:
rnplay.org is shutting down on April 1st, 2017. Recommend instead using Expo's improved prototyping tool, Sketch.
Closes https://github.com/facebook/react-native/pull/12935

Differential Revision: D4709631

Pulled By: mkonicek

fbshipit-source-id: ebc020ca7973a23658dc3b63ad2ac81c2ecefe9c
---
 .github/ISSUE_TEMPLATE.md | 4 ++--
 CONTRIBUTING.md           | 2 +-
 docs/MoreResources.md     | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index c7b878bad1c8c9..7acc05e46e1629 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -7,7 +7,7 @@ We use GitHub Issues for tracking bugs in React Native.
 
 Your issue may be closed without explanation if it does not provide the information required by this template.
 
---- Please use this template, and delete everything above this line before submitting your issue --- 
+--- Please use this template, and delete everything above this line before submitting your issue ---
 
 ### Description
 
@@ -15,7 +15,7 @@ Your issue may be closed without explanation if it does not provide the informat
 
 ### Reproduction
 
-[FILL THIS OUT: Try to reproduce your bug on rnplay.org and provide a link. If you can't reproduce the bug on rnplay.org, provide a sample project.]
+[FILL THIS OUT: Try to reproduce your bug on https://sketch.expo.io/ and provide a link. If you can't reproduce the bug on Sketch, provide a sample project.]
 
 ### Solution
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 53f7c5c889af66..d460766a81a844 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -69,7 +69,7 @@ We are using GitHub Issues for our public bugs. We keep a close eye on this and
 
 ### Reporting New Issues
 
-The best way to get your bug fixed is to provide a reduced test case. Please provide either a public repository with a runnable example or a [React Native Playground](https://rnplay.org/) snippet.
+The best way to get your bug fixed is to provide a reduced test case. Please provide either a public repository with a runnable example or a [Sketch](https://sketch.expo.io/).
 
 ### Security Bugs
 
diff --git a/docs/MoreResources.md b/docs/MoreResources.md
index cc32bb1b3bf664..3c3b849ab5f7d5 100644
--- a/docs/MoreResources.md
+++ b/docs/MoreResources.md
@@ -20,7 +20,7 @@ If you're looking for a library that does a specific thing, check out [Awesome R
 
 ## Example Apps
 
-There are a lot of example apps at the [React Native Playground](https://rnplay.org/apps/picks). You can see the code running on a real device, which is a neat feature.
+There are some example apps in the [`Examples/` directory](https://github.com/facebook/react-native/tree/master/Examples) on GitHub. You can run the apps on a simulator or device, and you can see the source code for these apps, which is neat.
 
 The folks who built the app for Facebook's F8 conference in 2016 also [open-sourced the code](https://github.com/fbsamples/f8app) and wrote up a [detailed series of tutorials](http://makeitopen.com/tutorials/building-the-f8-app/planning/). This is useful if you want a more in-depth example that's more realistic than most sample apps out there.
 
@@ -28,6 +28,8 @@ The folks who built the app for Facebook's F8 conference in 2016 also [open-sour
 
 [Nuclide](https://nuclide.io/) is the IDE that Facebook uses internally for React Native development. The killer feature of Nuclide is its debugging ability. It also has great inline Flow support.
 
+[Create React Native App](https://github.com/react-community/create-react-native-app) makes it significantly easier to get started with a React Native project. There's no need to use Xcode or Android Studio, and you can develop for your iOS device using Linux or Windows.
+
 [Ignite](https://github.com/infinitered/ignite) is a starter kit that uses Redux and a few different common UI libraries. It has a CLI to generate apps, components, and containers. If you like all of the individual tech choices, Ignite could be perfect for you.
 
 [CodePush](https://microsoft.github.io/code-push/) is a service from Microsoft that makes it easy to deploy live updates to your React Native app. If you don't like going through the app store process to deploy little tweaks, and you also don't like setting up your own backend, give CodePush a try.

From 1195a8f3e6d4a2c46d7d937547a4f95b5c4da79f Mon Sep 17 00:00:00 2001
From: ShiHui <sh1@meitu.com>
Date: Tue, 14 Mar 2017 17:45:39 -0700
Subject: [PATCH 035/366] Fix RCTPicker crash

Summary:
If user slide picker when picker item is zero, `UIPickerViewDelegate` will call `pickerView:didSelectRow:inComponent` row=0, `_items[row][@"value"]` will crash.
Closes https://github.com/facebook/react-native/pull/12187

Differential Revision: D4709882

Pulled By: mkonicek

fbshipit-source-id: 772c819d4eaef41ac983287877bda2918f40b1a7
---
 React/Views/RCTPicker.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/React/Views/RCTPicker.m b/React/Views/RCTPicker.m
index ce8598b48d4a0b..0e5295a9427e29 100644
--- a/React/Views/RCTPicker.m
+++ b/React/Views/RCTPicker.m
@@ -98,7 +98,7 @@ - (void)pickerView:(__unused UIPickerView *)pickerView
       didSelectRow:(NSInteger)row inComponent:(__unused NSInteger)component
 {
   _selectedIndex = row;
-  if (_onChange) {
+  if (_onChange && _items.count > row) {
     _onChange(@{
       @"newIndex": @(row),
       @"newValue": RCTNullIfNil(_items[row][@"value"]),

From 6cbb57d0dfedd30ffcd0e1b45e9bcca837f05329 Mon Sep 17 00:00:00 2001
From: Liu Zhanhong <275368990@qq.com>
Date: Tue, 14 Mar 2017 19:18:12 -0700
Subject: [PATCH 036/366] BREAKING: Remove @provides support from packager

Summary:
see https://github.com/facebook/react-native/commit/d82f2553fb0da40b02ca5515767211105e2eec07
Closes https://github.com/facebook/react-native/pull/12355

Differential Revision: D4710001

Pulled By: davidaurelio

fbshipit-source-id: 1c2225fa3bd2881c3eaedfd02514c29b920948b6
---
 packager/src/ModuleGraph/worker/transform-module.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packager/src/ModuleGraph/worker/transform-module.js b/packager/src/ModuleGraph/worker/transform-module.js
index c451e03ffa1d10..1dca4e559bb26f 100644
--- a/packager/src/ModuleGraph/worker/transform-module.js
+++ b/packager/src/ModuleGraph/worker/transform-module.js
@@ -82,7 +82,7 @@ function transformModule(
     callback(null, {
       code,
       file: filename,
-      hasteID: annotations.providesModule || annotations.provide || null,
+      hasteID: annotations.providesModule || null,
       transformed,
       type: options.polyfill ? 'script' : 'module',
     });

From 18c239ee22adf55f9698c03066c033d7992bfaa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20W=C3=B6hrl?= <lukas@woehrl.net>
Date: Wed, 15 Mar 2017 05:20:38 -0700
Subject: [PATCH 037/366] Fix align-content: center, flex-end alignment with
 margin

Summary:
This fixes ```align-content: center``` and ```align-content: flex-end``` when the child exceeds the parents size. See #476. It also fixes those layouts if the child has ```margin: auto``` set.
Closes https://github.com/facebook/yoga/pull/477

Differential Revision: D4697833

Pulled By: emilsjolander

fbshipit-source-id: d081ec7ea559a5f2bd3271c3a4dc272960beddfa
---
 ReactCommon/yoga/yoga/Yoga.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/ReactCommon/yoga/yoga/Yoga.c b/ReactCommon/yoga/yoga/Yoga.c
index dd3ebd9d2b0472..323bb881545626 100644
--- a/ReactCommon/yoga/yoga/Yoga.c
+++ b/ReactCommon/yoga/yoga/Yoga.c
@@ -2624,10 +2624,6 @@ static void YGNodelayoutImpl(const YGNodeRef node,
                                            crossAxisParentSize,
                                            parentWidth) -
                            paddingAndBorderAxisCross;
-
-      if (measureModeCrossDim == YGMeasureModeAtMost) {
-        containerCrossAxis = fminf(containerCrossAxis, availableInnerCrossDim);
-      }
     }
 
     // If there's no flex wrap, the cross dimension is defined by the container.
@@ -2735,11 +2731,11 @@ static void YGNodelayoutImpl(const YGNodeRef node,
 
             if (YGMarginLeadingValue(child, crossAxis)->unit == YGUnitAuto &&
                 YGMarginTrailingValue(child, crossAxis)->unit == YGUnitAuto) {
-              leadingCrossDim += remainingCrossDim / 2;
+              leadingCrossDim += fmaxf(0.0f, remainingCrossDim / 2);
             } else if (YGMarginTrailingValue(child, crossAxis)->unit == YGUnitAuto) {
               // No-Op
             } else if (YGMarginLeadingValue(child, crossAxis)->unit == YGUnitAuto) {
-              leadingCrossDim += remainingCrossDim;
+              leadingCrossDim += fmaxf(0.0f, remainingCrossDim);
             } else if (alignItem == YGAlignFlexStart) {
               // No-Op
             } else if (alignItem == YGAlignCenter) {

From 7098c450d8274e441135405adf4e83871c74a8af Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Wed, 15 Mar 2017 06:05:59 -0700
Subject: [PATCH 038/366] packager: attachHMRServer.js: Flow

Summary:
The breakage fixed by changeset [1] could have been identified earlier if we had typing on `attachHMRServer`, so I spent some time on that. This has revealed in turn a few functions across the codebase that were incorrectly typed, and that are now fixed.

[1] packager: attachHMRServer.js: fix callsite of Server#getModuleForPath()

Reviewed By: davidaurelio

Differential Revision: D4706241

fbshipit-source-id: fc4285245921ae45d5781a47d626fc0559dba998
---
 local-cli/server/util/attachHMRServer.js | 66 +++++++++++++++++-------
 packager/src/Bundler/index.js            |  4 +-
 packager/src/Resolver/index.js           |  2 +-
 packager/src/Server/index.js             | 18 +++----
 packager/src/node-haste/index.js         |  5 +-
 5 files changed, 62 insertions(+), 33 deletions(-)

diff --git a/local-cli/server/util/attachHMRServer.js b/local-cli/server/util/attachHMRServer.js
index 9e1dd4241fd132..02c4f45ece80e8 100644
--- a/local-cli/server/util/attachHMRServer.js
+++ b/local-cli/server/util/attachHMRServer.js
@@ -5,7 +5,10 @@
  * This source code is licensed under the BSD-style license found in the
  * 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.
+ *
+ * @flow
  */
+
 'use strict';
 
 const querystring = require('querystring');
@@ -13,15 +16,27 @@ const url = require('url');
 
 const {getInverseDependencies} = require('../../../packager/src//node-haste');
 
+import type HMRBundle from '../../../packager/src/Bundler/HMRBundle';
+import type Server from '../../../packager/src/Server';
+import type ResolutionResponse from '../../../packager/src/node-haste/DependencyGraph/ResolutionResponse';
+import type Module from '../../../packager/src/node-haste/Module';
+import type {Server as HTTPServer} from 'http';
+
 const blacklist = [
   'Libraries/Utilities/HMRClient.js',
 ];
 
+type HMROptions = {
+  httpServer: HTTPServer,
+  path: string,
+  packagerServer: Server,
+};
+
 /**
  * Attaches a WebSocket based connection to the Packager to expose
  * Hot Module Replacement updates to the simulator.
  */
-function attachHMRServer({httpServer, path, packagerServer}) {
+function attachHMRServer({httpServer, path, packagerServer}: HMROptions) {
   let client = null;
 
   function disconnect() {
@@ -33,18 +48,25 @@ function attachHMRServer({httpServer, path, packagerServer}) {
   //   - The full list of dependencies.
   //   - The shallow dependencies each file on the dependency list has
   //   - Inverse shallow dependencies map
-  function getDependencies(platform, bundleEntry) {
+  function getDependencies(platform: string, bundleEntry: string): Promise<{
+    dependenciesCache: Array<string>,
+    dependenciesModulesCache: {[mixed]: Module},
+    shallowDependencies: {[string]: Array<Module>},
+    inverseDependenciesCache: mixed,
+    resolutionResponse: ResolutionResponse,
+  }> {
     return packagerServer.getDependencies({
       platform: platform,
       dev: true,
       hot: true,
       entryFile: bundleEntry,
     }).then(response => {
-      const {getModuleId} = response;
+      /* $FlowFixMe: getModuleId might be null */
+      const {getModuleId}: {getModuleId: () => number} = response;
 
       // for each dependency builds the object:
       // `{path: '/a/b/c.js', deps: ['modA', 'modB', ...]}`
-      return Promise.all(Object.values(response.dependencies).map(dep => {
+      return Promise.all(response.dependencies.map((dep: Module) => {
         return dep.getName().then(depName => {
           if (dep.isAsset() || dep.isJSON()) {
             return Promise.resolve({path: dep.path, deps: []});
@@ -54,23 +76,23 @@ function attachHMRServer({httpServer, path, packagerServer}) {
             dev: true,
             hot: true,
             entryFile: dep.path
-          })
-            .then(deps => {
-              return {
-                path: dep.path,
-                name: depName,
-                deps,
-              };
-            });
+          }).then(deps => {
+            return {
+              path: dep.path,
+              name: depName,
+              deps,
+            };
+          });
         });
       }))
-      .then(deps => {
+      .then((deps: Array<{path: string, name?: string, deps: Array<Module>}>) => {
         // list with all the dependencies' filenames the bundle entry has
         const dependenciesCache = response.dependencies.map(dep => dep.path);
 
         // map from module name to path
         const moduleToFilenameCache = Object.create(null);
         deps.forEach(dep => {
+          /* $FlowFixMe: `name` could be null, but `deps` would be as well. */
           moduleToFilenameCache[dep.name] = dep.path;
         });
 
@@ -114,6 +136,7 @@ function attachHMRServer({httpServer, path, packagerServer}) {
   });
 
   wss.on('connection', ws => {
+    /* $FlowFixMe: url might be null */
     const params = querystring.parse(url.parse(ws.upgradeReq.url).query);
 
     getDependencies(params.platform, params.bundleEntry)
@@ -195,11 +218,13 @@ function attachHMRServer({httpServer, path, packagerServer}) {
                       return {};
                     }
 
+                    const nonNullClient = client;
+
                     return packagerServer.getModuleForPath(filename).then(moduleToUpdate => {
                       // build list of modules for which we'll send HMR updates
                       const modulesToUpdate = [moduleToUpdate];
                       Object.keys(depsModulesCache).forEach(module => {
-                        if (!client.dependenciesModulesCache[module]) {
+                        if (!nonNullClient.dependenciesModulesCache[module]) {
                           modulesToUpdate.push(depsModulesCache[module]);
                         }
                       });
@@ -215,10 +240,10 @@ function attachHMRServer({httpServer, path, packagerServer}) {
                       modulesToUpdate.reverse();
 
                       // invalidate caches
-                      client.dependenciesCache = depsCache;
-                      client.dependenciesModulesCache = depsModulesCache;
-                      client.shallowDependencies = shallowDeps;
-                      client.inverseDependenciesCache = inverseDepsCache;
+                      nonNullClient.dependenciesCache = depsCache;
+                      nonNullClient.dependenciesModulesCache = depsModulesCache;
+                      nonNullClient.shallowDependencies = shallowDeps;
+                      nonNullClient.inverseDependenciesCache = inverseDepsCache;
 
                       return resolutionResponse.copy({
                         dependencies: modulesToUpdate
@@ -252,7 +277,7 @@ function attachHMRServer({httpServer, path, packagerServer}) {
                   resolutionResponse,
                 }, packagerHost, httpServerAddress.port);
               })
-              .then(bundle => {
+              .then((bundle: HMRBundle) => {
                 if (!client || !bundle || bundle.isEmpty()) {
                   return;
                 }
@@ -299,6 +324,7 @@ function attachHMRServer({httpServer, path, packagerServer}) {
               });
 
           promise.then(() => {
+            /* $FlowFixMe: assume `client` non-null */
             client.ws.send(JSON.stringify({type: 'update-done'}));
           });
         });
@@ -316,7 +342,7 @@ function attachHMRServer({httpServer, path, packagerServer}) {
   });
 }
 
-function arrayEquals(arrayA, arrayB) {
+function arrayEquals<T>(arrayA: Array<T>, arrayB: Array<T>): boolean {
   arrayA = arrayA || [];
   arrayB = arrayB || [];
   return (
diff --git a/packager/src/Bundler/index.js b/packager/src/Bundler/index.js
index ce940a7f6cbf85..878e39ee26fd4b 100644
--- a/packager/src/Bundler/index.js
+++ b/packager/src/Bundler/index.js
@@ -277,7 +277,7 @@ class Bundler {
     );
   }
 
-  hmrBundle(options: {platform: ?string}, host: string, port: number) {
+  hmrBundle(options: {platform: ?string}, host: string, port: number): Promise<HMRBundle> {
     return this._bundle({
       ...options,
       bundle: new HMRBundle({
@@ -492,7 +492,7 @@ class Bundler {
     minify?: boolean,
     hot?: boolean,
     generateSourceMaps?: boolean,
-  }) {
+  }): Promise<Array<Module>> {
     return this.getTransformOptions(
       entryFile,
       {
diff --git a/packager/src/Resolver/index.js b/packager/src/Resolver/index.js
index e73706bf8eea16..55e899a138354a 100644
--- a/packager/src/Resolver/index.js
+++ b/packager/src/Resolver/index.js
@@ -87,7 +87,7 @@ class Resolver {
   getShallowDependencies(
     entryFile: string,
     transformOptions: TransformOptions,
-  ): Array<string> {
+  ): Promise<Array<Module>> {
     return this._depGraph.getShallowDependencies(entryFile, transformOptions);
   }
 
diff --git a/packager/src/Server/index.js b/packager/src/Server/index.js
index e4b7e9f9eca0b2..0750e6aa6a2343 100644
--- a/packager/src/Server/index.js
+++ b/packager/src/Server/index.js
@@ -31,6 +31,7 @@ import type {Stats} from 'fs';
 import type {IncomingMessage, ServerResponse} from 'http';
 import type ResolutionResponse from '../node-haste/DependencyGraph/ResolutionResponse';
 import type Bundle from '../Bundler/Bundle';
+import type HMRBundle from '../Bundler/HMRBundle';
 import type {Reporter} from '../lib/reporting';
 import type {GetTransformOptions} from '../Bundler';
 import type GlobalTransformCache from '../lib/GlobalTransformCache';
@@ -157,7 +158,7 @@ class Server {
   _assetServer: AssetServer;
   _bundler: Bundler;
   _debouncedFileChangeHandler: (filePath: string) => mixed;
-  _hmrFileChangeListener: (type: string, filePath: string) => mixed;
+  _hmrFileChangeListener: ?(type: string, filePath: string) => mixed;
   _reporter: Reporter;
   _symbolicateInWorker: Symbolicate;
 
@@ -244,9 +245,7 @@ class Server {
     return this._bundler.end();
   }
 
-  setHMRFileChangeListener(
-    listener: (type: string, filePath: string) => mixed,
-  ) {
+  setHMRFileChangeListener(listener: ?(type: string, filePath: string) => mixed) {
     this._hmrFileChangeListener = listener;
   }
 
@@ -276,7 +275,7 @@ class Server {
     return bundle;
   }
 
-  buildBundleFromUrl(reqUrl: string): Promise<mixed> {
+  buildBundleFromUrl(reqUrl: string): Promise<Bundle> {
     const options = this._getOptionsFromUrl(reqUrl);
     return this.buildBundle(options);
   }
@@ -285,14 +284,14 @@ class Server {
     options: {platform: ?string},
     host: string,
     port: number,
-  ): Promise<string> {
+  ): Promise<HMRBundle> {
     return this._bundler.hmrBundle(options, host, port);
   }
 
   getShallowDependencies(options: {
     entryFile: string,
     platform?: string,
-  }): Promise<mixed> {
+  }): Promise<Array<Module>> {
     return Promise.resolve().then(() => {
       if (!options.platform) {
         options.platform = getPlatformExtension(options.entryFile);
@@ -335,10 +334,11 @@ class Server {
     // If Hot Loading is enabled avoid rebuilding bundles and sending live
     // updates. Instead, send the HMR updates right away and clear the bundles
     // cache so that if the user reloads we send them a fresh bundle
-    if (this._hmrFileChangeListener) {
+    const {_hmrFileChangeListener} = this;
+    if (_hmrFileChangeListener) {
       // Clear cached bundles in case user reloads
       this._clearBundles();
-      this._hmrFileChangeListener(type, filePath);
+      _hmrFileChangeListener(type, filePath);
       return;
     } else if (type !== 'change' && filePath.indexOf(NODE_MODULES) !== -1) {
       // node module resolution can be affected by added or removed files
diff --git a/packager/src/node-haste/index.js b/packager/src/node-haste/index.js
index 6af6a1901f2e85..fef220c58b473b 100644
--- a/packager/src/node-haste/index.js
+++ b/packager/src/node-haste/index.js
@@ -173,7 +173,10 @@ class DependencyGraph extends EventEmitter {
    * Returns a promise with the direct dependencies the module associated to
    * the given entryPath has.
    */
-  getShallowDependencies(entryPath: string, transformOptions: TransformOptions) {
+  getShallowDependencies(
+    entryPath: string,
+    transformOptions: TransformOptions,
+  ): Promise<Array<Module>> {
     return this._moduleCache
       .getModule(entryPath)
       .getDependencies(transformOptions);

From af590b0c747e096d7a7856e88380307d81142f84 Mon Sep 17 00:00:00 2001
From: Charles Dick <cwdick@fb.com>
Date: Wed, 15 Mar 2017 06:31:38 -0700
Subject: [PATCH 039/366] remove the old heap profiler visualization code

Differential Revision: D4650983

fbshipit-source-id: 1f791acdd3e2d96e7881ea037045fafa2c6d781a
---
 .../server/middleware/heapCapture/.gitignore  |   3 -
 .../server/middleware/heapCapture/Makefile    |   8 -
 .../middleware/heapCapture/heapCapture.html   |  12 -
 .../middleware/heapCapture/package.json       |  21 -
 .../middleware/heapCapture/src/Aggrow.js      | 190 -----
 .../middleware/heapCapture/src/AggrowData.js  | 216 ------
 .../heapCapture/src/AggrowExpander.js         | 694 ------------------
 .../heapCapture/src/AggrowTable.jsx           | 439 -----------
 .../heapCapture/src/DataColumnSelector.jsx    |  42 --
 .../middleware/heapCapture/src/Draggable.jsx  |  26 -
 .../middleware/heapCapture/src/DropTarget.jsx |  33 -
 .../heapCapture/src/ExpanderConfiguration.jsx |  29 -
 .../heapCapture/src/StackExpanderCreator.jsx  | 152 ----
 .../heapCapture/src/StackRegistry.js          |  96 ---
 .../heapCapture/src/StringInterner.js         |  26 -
 .../heapCapture/src/TableConfiguration.jsx    |  86 ---
 .../heapCapture/src/TableHeader.jsx           | 103 ---
 .../middleware/heapCapture/src/heapCapture.js | 412 -----------
 .../middleware/heapCapture/src/index.js       |  24 -
 .../middleware/heapCapture/webpack.config.js  |  29 -
 .../middleware/heapCaptureMiddleware.js       | 171 -----
 local-cli/server/runServer.js                 |   2 -
 22 files changed, 2814 deletions(-)
 delete mode 100644 local-cli/server/middleware/heapCapture/.gitignore
 delete mode 100644 local-cli/server/middleware/heapCapture/Makefile
 delete mode 100644 local-cli/server/middleware/heapCapture/heapCapture.html
 delete mode 100644 local-cli/server/middleware/heapCapture/package.json
 delete mode 100644 local-cli/server/middleware/heapCapture/src/Aggrow.js
 delete mode 100644 local-cli/server/middleware/heapCapture/src/AggrowData.js
 delete mode 100644 local-cli/server/middleware/heapCapture/src/AggrowExpander.js
 delete mode 100644 local-cli/server/middleware/heapCapture/src/AggrowTable.jsx
 delete mode 100644 local-cli/server/middleware/heapCapture/src/DataColumnSelector.jsx
 delete mode 100644 local-cli/server/middleware/heapCapture/src/Draggable.jsx
 delete mode 100644 local-cli/server/middleware/heapCapture/src/DropTarget.jsx
 delete mode 100644 local-cli/server/middleware/heapCapture/src/ExpanderConfiguration.jsx
 delete mode 100644 local-cli/server/middleware/heapCapture/src/StackExpanderCreator.jsx
 delete mode 100644 local-cli/server/middleware/heapCapture/src/StackRegistry.js
 delete mode 100644 local-cli/server/middleware/heapCapture/src/StringInterner.js
 delete mode 100644 local-cli/server/middleware/heapCapture/src/TableConfiguration.jsx
 delete mode 100644 local-cli/server/middleware/heapCapture/src/TableHeader.jsx
 delete mode 100644 local-cli/server/middleware/heapCapture/src/heapCapture.js
 delete mode 100644 local-cli/server/middleware/heapCapture/src/index.js
 delete mode 100644 local-cli/server/middleware/heapCapture/webpack.config.js
 delete mode 100644 local-cli/server/middleware/heapCaptureMiddleware.js

diff --git a/local-cli/server/middleware/heapCapture/.gitignore b/local-cli/server/middleware/heapCapture/.gitignore
deleted file mode 100644
index 99ddc99ebc0737..00000000000000
--- a/local-cli/server/middleware/heapCapture/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/captures/*
-preLoadedCapture.js
-bundle.js
diff --git a/local-cli/server/middleware/heapCapture/Makefile b/local-cli/server/middleware/heapCapture/Makefile
deleted file mode 100644
index c3083416324513..00000000000000
--- a/local-cli/server/middleware/heapCapture/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-SHELL := /bin/bash
-
-all:
-	NODE_PATH="../../../../node_modules/" babel --presets babel-preset-react-native --source-maps inline -d out src
-	for f in out/*.js; do echo -e "\n// @generated" >> $$f; done
-
-watch:
-	NODE_PATH="../../../../node_modules/" babel --watch --presets babel-preset-react-native -d out src
diff --git a/local-cli/server/middleware/heapCapture/heapCapture.html b/local-cli/server/middleware/heapCapture/heapCapture.html
deleted file mode 100644
index 2faf4387f4a844..00000000000000
--- a/local-cli/server/middleware/heapCapture/heapCapture.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!doctype html>
-<html xmlns="http://www.w3.org/1999/xhtml" style="height: 100%;">
-<head>
-  <meta charset="utf-8">
-  <title>JSC Heap Capture</title>
-</head>
-<body style="margin:0px; height: 100%">
-  Loading... This could take a while depending on how big the profile is. Check devtools console for errors.
-</body>
-<script src="preLoadedCapture.js"></script>
-<script src="bundle.js"></script>
-</html>
diff --git a/local-cli/server/middleware/heapCapture/package.json b/local-cli/server/middleware/heapCapture/package.json
deleted file mode 100644
index 1533027d785e62..00000000000000
--- a/local-cli/server/middleware/heapCapture/package.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name": "jsc-heap-capture",
-  "version": "1.0.0",
-  "description": "processes captured heaps from javascript core",
-  "main": "bundle.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "webpack"
-  },
-  "author": "cwdick",
-  "devDependencies": {
-    "babel-core": "^6.17.0",
-    "babel-loader": "^6.2.5",
-    "babel-plugin-transform-class-properties": "^6.16.0",
-    "babel-preset-es2015": "^6.16.0",
-    "babel-preset-react": "^6.16.0",
-    "react": "^0.14.1",
-    "react-dom": "^0.14.1",
-    "webpack": "^1.13.2"
-  }
-}
diff --git a/local-cli/server/middleware/heapCapture/src/Aggrow.js b/local-cli/server/middleware/heapCapture/src/Aggrow.js
deleted file mode 100644
index 198bc9bd353fd0..00000000000000
--- a/local-cli/server/middleware/heapCapture/src/Aggrow.js
+++ /dev/null
@@ -1,190 +0,0 @@
-// @flow
-
-import invariant from 'invariant';
-
-import AggrowData, {
-  AggrowDoubleColumn,
-  AggrowIntColumn,
-  AggrowStackColumn,
-  AggrowStringColumn } from './AggrowData';
-import AggrowExpander from './AggrowExpander';
-import type { FlattenedStack } from './StackRegistry';
-import StackRegistry from './StackRegistry';
-
-export type FocusConfig = {
-  pattern: RegExp,
-  firstMatch: boolean,
-  leftSide: boolean,
-}
-type FocusPredicate = (frameId: number) => boolean;
-
-export default class Aggrow {
-  data: AggrowData;
-  expander: AggrowExpander;
-
-  constructor(aggrowData: AggrowData) {
-    aggrowData.flattenStacks();
-    this.data = aggrowData;
-    this.expander = new AggrowExpander(aggrowData.rowCount);
-  }
-
-  addSumAggregator(aggregatorName: string, columnName: string): number {
-    const column = this.data.getColumn(columnName);
-
-    invariant(column, `Column ${columnName} does not exist.`);
-    invariant(column instanceof AggrowIntColumn || column instanceof AggrowDoubleColumn,
-      `Sum aggregator does not support ${column.constructor.name} columns!`);
-    return this.expander.addAggregator(
-      aggregatorName,
-      (indices: Int32Array): number => {
-        let size = 0;
-        indices.forEach((i: number) => { size += column.get(i); });
-        return size;
-      },
-      (value: any): string => value.toLocaleString(),
-      (a: number, b: number): number => b - a,
-    );
-  }
-
-  addCountAggregator(aggregatorName: string): number {
-    return this.expander.addAggregator(
-      aggregatorName,
-      (indices: Int32Array): number => indices.length,
-      (value: any): string => value.toLocaleString(),
-      (a: number, b: number): number => b - a,
-    );
-  }
-
-  addStringExpander(expanderName: string, columnName: string): number {
-    const column = this.data.getColumn(columnName);
-    invariant(column, `Column ${columnName} does not exist.`);
-    invariant(column instanceof AggrowStringColumn, 'String expander needs a string column.');
-    const strings = column.strings;
-    return this.expander.addFieldExpander(
-      expanderName,
-      (rowA: number, rowB: number): number => column.get(rowA) - column.get(rowB),
-      (row: number): string => strings.get(column.get(row)),
-      (s: string): string => s,
-    );
-  }
-
-  addNumberExpander(expanderName: string, columnName: string): number {
-    const column = this.data.getColumn(columnName);
-    invariant(column, `Column ${columnName} does not exist.`);
-    invariant(
-      column instanceof AggrowIntColumn || column instanceof AggrowDoubleColumn,
-      `Number expander does not support ${column.constructor.name} columns.`);
-    return this.expander.addFieldExpander(
-      expanderName,
-      (rowA: number, rowB: number): number => column.get(rowA) - column.get(rowB),
-      (row: number): number => column.get(row),
-      (n: any): string => n.toLocaleString(),
-    );
-  }
-
-  addPointerExpander(expanderName: string, columnName: string): number {
-    const column = this.data.getColumn(columnName);
-    invariant(column, `Column ${columnName} does not exist.`);
-    invariant(
-      column instanceof AggrowIntColumn,
-      `Pointer expander does not support ${column.constructor.name} columns.`);
-    return this.expander.addFieldExpander(
-      expanderName,
-      (rowA: number, rowB: number): number => column.get(rowA) - column.get(rowB),
-      (row: number): number => column.get(row),
-      (p: number): string => `0x${(p >>> 0).toString(16)}`,  // eslint-disable-line no-bitwise
-    );
-  }
-
-  addStackExpander(
-      expanderName: string,
-      columnName: string,
-      reverse: boolean,
-      focus: ?FocusConfig): number {
-    const column = this.data.getColumn(columnName);
-    invariant(column, `Column ${columnName} does not exist.`);
-    invariant(
-      column instanceof AggrowStackColumn,
-      `Stack expander does not support ${column.constructor.name} columns.`);
-    let stacks = column.stacks;
-    const getter = column.getter;
-    const formatter = column.formatter;
-    if (focus) {
-      const re = focus.pattern;
-      const predicate = (frameId: number): boolean => re.test(formatter(getter(frameId)));
-      stacks = focusStacks(stacks, predicate, focus.firstMatch, focus.leftSide);
-    }
-    return this.expander.addStackExpander(
-      expanderName,
-      stacks.maxDepth,
-      (row: number): FlattenedStack => stacks.get(column.get(row)),
-      getter,
-      formatter,
-      !!reverse,
-    );
-  }
-}
-
-function focusStacks(
-    stacks: StackRegistry,
-    predicate: FocusPredicate,
-    firstMatch: boolean,
-    leftSide: boolean): FocusedStackRegistry {
-  let stackMapper;
-  if (firstMatch && leftSide) {
-    stackMapper = (stack: FlattenedStack): FlattenedStack => {
-      for (let i = 0; i < stack.length; i++) {
-        if (predicate(stack[i])) {
-          return stack.subarray(0, i + 1);
-        }
-      }
-      return stack.subarray(0, 0);
-    };
-  } else if (firstMatch && !leftSide) {
-    stackMapper = (stack: FlattenedStack): FlattenedStack => {
-      for (let i = 0; i < stack.length; i++) {
-        if (predicate(stack[i])) {
-          return stack.subarray(i, stack.length);
-        }
-      }
-      return stack.subarray(0, 0);
-    };
-  } else if (!firstMatch && leftSide) {
-    stackMapper = (stack: FlattenedStack): FlattenedStack => {
-      for (let i = stack.length - 1; i >= 0; i--) {
-        if (predicate(stack[i])) {
-          return stack.subarray(0, i + 1);
-        }
-      }
-      return stack.subarray(0, 0);
-    };
-  } else {  // !firstMatch && !leftSide
-    stackMapper = (stack: FlattenedStack): FlattenedStack => {
-      for (let i = stack.length - 1; i >= 0; i--) {
-        if (predicate(stack[i])) {
-          return stack.subarray(i, stack.length);
-        }
-      }
-      return stack.subarray(0, 0);
-    };
-  }
-
-  invariant(stacks.stackIdMap, 'Stacks were not flattened.');
-  return new FocusedStackRegistry(
-    stacks.stackIdMap.map(stackMapper),
-    stacks.maxDepth);
-}
-
-class FocusedStackRegistry {
-  maxDepth: number;
-  stackIdMap: Array<FlattenedStack>;
-
-  constructor(stackIdMap: Array<FlattenedStack>, maxDepth: number) {
-    this.maxDepth = maxDepth;
-    this.stackIdMap = stackIdMap;
-  }
-
-  get(id: number): FlattenedStack {
-    return this.stackIdMap[id];
-  }
-}
diff --git a/local-cli/server/middleware/heapCapture/src/AggrowData.js b/local-cli/server/middleware/heapCapture/src/AggrowData.js
deleted file mode 100644
index 856f1ea865ccca..00000000000000
--- a/local-cli/server/middleware/heapCapture/src/AggrowData.js
+++ /dev/null
@@ -1,216 +0,0 @@
-// @flow
-
-import invariant from 'invariant';
-
-import type { FrameGetter, FrameFormatter } from './AggrowExpander';
-import type { Stack } from './StackRegistry';
-import StackRegistry from './StackRegistry';
-import StringInterner from './StringInterner';
-
-export type AggrowColumnDef =
-  AggrowStringColumnDef |
-  AggrowIntColumnDef |
-  AggrowDoubleColumnDef |
-  AggrowStackColumnDef;
-
-type AggrowStringColumnDef = {
-  type: 'string';
-  name: string;
-  strings: StringInterner;
-}
-
-type AggrowIntColumnDef = {
-  type: 'int';
-  name: string;
-}
-
-type AggrowDoubleColumnDef = {
-  type: 'double';
-  name: string;
-}
-
-type AggrowStackColumnDef = {
-  type: 'stack';
-  name: string;
-  stacks: StackRegistry,
-  getter: FrameGetter,
-  formatter: FrameFormatter,
-}
-
-export interface AggrowColumn {
-  name: string;
-  get(row: number): number;
-  insert(row: number, s: any): void;
-  extend(count: number): void;
-}
-
-class AggrowColumnBase {
-  name: string;
-
-  constructor(def: AggrowColumnDef) {
-    this.name = def.name;
-  }
-}
-
-export class AggrowStringColumn extends AggrowColumnBase {
-  strings: StringInterner;
-  data: Int32Array = new Int32Array(0);
-
-  constructor(def: AggrowStringColumnDef) {
-    super(def);
-    this.strings = def.strings;
-  }
-
-  get(row: number): number {
-    return this.data[row];
-  }
-
-  insert(row: number, s: string) {
-    this.data[row] = this.strings.intern(s);
-  }
-
-  extend(count: number) {
-    const newData = new Int32Array(this.data.length + count);
-    newData.set(this.data);
-    this.data = newData;
-  }
-}
-
-export class AggrowIntColumn extends AggrowColumnBase {
-  data: Int32Array = new Int32Array(0);
-
-  get(row: number): number {
-    return this.data[row];
-  }
-
-  insert(row: number, i: number) {
-    this.data[row] = i;
-  }
-
-  extend(count: number) {
-    const newData = new Int32Array(this.data.length + count);
-    newData.set(this.data);
-    this.data = newData;
-  }
-}
-
-export class AggrowDoubleColumn extends AggrowColumnBase {
-  data: Float64Array = new Float64Array(0);
-
-  get(row: number): number {
-    return this.data[row];
-  }
-
-  insert(row: number, d: number) {
-    this.data[row] = d;
-  }
-
-  extend(count: number) {
-    const newData = new Float64Array(this.data.length + count);
-    newData.set(this.data);
-    this.data = newData;
-  }
-}
-
-export class AggrowStackColumn extends AggrowColumnBase {
-  data: Int32Array = new Int32Array(0);
-  stacks: StackRegistry;
-  getter: FrameGetter;
-  formatter: FrameFormatter;
-
-  constructor(def: AggrowStackColumnDef) {
-    super(def);
-    this.stacks = def.stacks;
-    this.getter = def.getter;
-    this.formatter = def.formatter;
-  }
-
-  get(row: number): number {
-    return this.data[row];
-  }
-
-  insert(row: number, s: Stack) {
-    this.data[row] = s.id;
-  }
-
-  extend(count: number) {
-    const newData = new Int32Array(this.data.length + count);
-    newData.set(this.data);
-    this.data = newData;
-  }
-}
-
-function newColumn(def: AggrowColumnDef): AggrowColumn {
-  switch (def.type) {
-    case 'string':
-      return new AggrowStringColumn(def);
-    case 'int':
-      return new AggrowIntColumn(def);
-    case 'double':
-      return new AggrowDoubleColumn(def);
-    case 'stack':
-      return new AggrowStackColumn(def);
-    default:
-      throw new Error(`Unknown column type: ${def.type}`);
-  }
-}
-
-export default class AggrowData {
-  columns: Array<AggrowColumn>;
-  rowCount = 0;
-
-  constructor(columnDefs: Array<AggrowColumnDef>) {
-    this.columns = columnDefs.map(newColumn);
-  }
-
-  rowInserter(numRows: number): RowInserter {
-    const columns = this.columns;
-    columns.forEach((c: AggrowColumn): void => c.extend(numRows));
-    const currRow = this.rowCount;
-    const endRow = currRow + numRows;
-    this.rowCount = endRow;
-
-    return new RowInserter(columns, { currRow, endRow });
-  }
-
-  getColumn(name: string): ?AggrowColumn {
-    return this.columns.find((c: AggrowColumn): boolean => c.name === name);
-  }
-
-  flattenStacks() {
-    this.columns.forEach((c: AggrowColumn) => {
-      if (c instanceof AggrowStackColumn) {
-        c.stacks.flatten();
-      }
-    });
-  }
-}
-
-class RowInserter {
-  columns: Array<AggrowColumn>;
-  currRow: number;
-  endRow: number;
-
-  constructor(
-      columns: Array<AggrowColumn>,
-      params: { currRow: number, endRow: number }) {
-    this.columns = columns;
-    this.currRow = params.currRow;
-    this.endRow = params.endRow;
-  }
-
-  insertRow(...args: Array<number | string | Stack>) {
-    invariant(this.currRow < this.endRow, 'Tried to insert data off end of added range!');
-    invariant(
-      args.length === this.columns.length,
-      `Expected data for ${this.columns.length} columns, got ${args.length} columns`);
-
-    args.forEach((arg: number | string | Stack, i: number): void =>
-      this.columns[i].insert(this.currRow, arg));
-    this.currRow += 1;
-  }
-
-  done() {
-    invariant(this.currRow === this.endRow, 'Unfilled rows!');
-  }
-}
diff --git a/local-cli/server/middleware/heapCapture/src/AggrowExpander.js b/local-cli/server/middleware/heapCapture/src/AggrowExpander.js
deleted file mode 100644
index 5222901989e2e7..00000000000000
--- a/local-cli/server/middleware/heapCapture/src/AggrowExpander.js
+++ /dev/null
@@ -1,694 +0,0 @@
-// @flow
-import invariant from 'invariant';
-
-import type { FlattenedStack } from './StackRegistry';
-
-// expander ID definitions
-const FIELD_EXPANDER_ID_MIN = 0x0000;
-const FIELD_EXPANDER_ID_MAX = 0x7fff;
-const STACK_EXPANDER_ID_MIN = 0x8000;
-const STACK_EXPANDER_ID_MAX = 0xffff;
-
-// used for row.expander which reference state.activeExpanders (with frame index masked in)
-const INVALID_ACTIVE_EXPANDER = -1;
-const ACTIVE_EXPANDER_MASK = 0xffff;
-const ACTIVE_EXPANDER_FRAME_SHIFT = 16;
-
-// aggregator ID definitions
-const AGGREGATOR_ID_MAX = 0xffff;
-
-// active aggragators can have sort order changed in the reference
-const ACTIVE_AGGREGATOR_MASK = 0xffff;
-const ACTIVE_AGGREGATOR_ASC_BIT = 0x10000;
-
-// tree node state definitions
-const NODE_EXPANDED_BIT = 0x0001; // this row is expanded
-const NODE_REAGGREGATE_BIT = 0x0002; // children need aggregates
-const NODE_REORDER_BIT = 0x0004; // children need to be sorted
-const NODE_REPOSITION_BIT = 0x0008; // children need position
-const NODE_INDENT_SHIFT = 16;
-
-function _calleeFrameIdGetter(stack: FlattenedStack, depth: number): number {
-  return stack[depth];
-}
-
-function _callerFrameIdGetter(stack: FlattenedStack, depth: number): number {
-  return stack[stack.length - depth - 1];
-}
-
-function _createStackComparers(
-    stackGetter: StackGetter,
-    frameIdGetter: FrameIdGetter,
-    maxStackDepth: number): Array<Comparer<number>> {
-  const comparers = new Array(maxStackDepth);
-  for (let depth = 0; depth < maxStackDepth; depth++) {
-    const captureDepth = depth; // NB: to capture depth per loop iteration
-    comparers[depth] = function calleeStackComparer(rowA: number, rowB: number): number {
-      const a = stackGetter(rowA);
-      const b = stackGetter(rowB);
-      // NB: we put the stacks that are too short at the top,
-      // so they can be grouped into the '<exclusive>' bucket
-      if (a.length <= captureDepth && b.length <= captureDepth) {
-        return 0;
-      } else if (a.length <= captureDepth) {
-        return -1;
-      } else if (b.length <= captureDepth) {
-        return 1;
-      }
-      return frameIdGetter(a, captureDepth) - frameIdGetter(b, captureDepth);
-    };
-  }
-  return comparers;
-}
-
-function _createTreeNode(
-    parent: Row | null,
-    label: string,
-    indices: Int32Array,
-    expander: number): Row {
-  const indent = parent === null ? 0 : (parent.state >>> NODE_INDENT_SHIFT) + 1;  // eslint-disable-line no-bitwise, max-len
-  const state = NODE_REPOSITION_BIT |  // eslint-disable-line no-bitwise
-    NODE_REAGGREGATE_BIT |
-    NODE_REORDER_BIT |
-    (indent << NODE_INDENT_SHIFT);  // eslint-disable-line no-bitwise
-  return {
-    parent,     // null if root
-    children: null,     // array of children nodes
-    label,       // string to show in UI
-    indices,   // row indices under this node
-    aggregates: null,   // result of aggregate on indices
-    expander, // index into state.activeExpanders
-    top: 0,             // y position of top row (in rows)
-    height: 1,          // number of rows including children
-    state,       // see NODE_* definitions above
-  };
-}
-
-const NO_SORT_ORDER: Comparer<*> = (): number => 0;
-
-type Comparer<T> = (a: T, b: T) => number;
-
-type Aggregator = {
-  name: string,  // name for column
-  aggregator: (indexes: Int32Array) => number,  // index array -> aggregate value
-  formatter: (value: number) => string,  // aggregate value -> display string
-  sorter: Comparer<number>,  // compare two aggregate values
-}
-
-type FieldExpander = {
-  name: string,
-  comparer: Comparer<number>,
-  getter: (rowIndex: number) => any,
-  formatter: (value: any) => string,
-}
-
-type StackGetter = (rowIndex: number) => FlattenedStack;  // (row) => [frameId int]
-type FrameIdGetter = (stack: FlattenedStack, depth: number) => number;  // (stack,depth) -> frame id
-export type FrameGetter = (id: number) => any;  // (frameId int) => frame obj
-export type FrameFormatter = (frame: any) => string;  // (frame obj) => display string
-
-type StackExpander = {
-  name: string,  // display name of expander
-  comparers: Array<Comparer<number>>,  // depth -> comparer
-  stackGetter: StackGetter,
-  frameIdGetter: FrameIdGetter,
-  frameGetter: FrameGetter,
-  frameFormatter: FrameFormatter,
-}
-
-export type Row = {
-  top: number,
-  height: number,
-  state: number,
-  parent: Row | null,
-  indices: Int32Array,
-  aggregates: Array<number> | null,
-  children: Array<Row> | null,
-  expander: number,
-  label: string,
-}
-
-type State = {
-  fieldExpanders: Array<FieldExpander>,  // tree expanders that expand on simple values
-  stackExpanders: Array<StackExpander>,  // tree expanders that expand stacks
-  activeExpanders: Array<number>,  // index into field or stack expanders, hierarchy of tree
-  aggregators: Array<Aggregator>,  // all available aggregators, might not be used
-  activeAggregators: Array<number>,  // index into aggregators, to actually compute
-  sorter: Comparer<*>,
-  root: Row,
-}
-
-export default class AggrowExpander { // eslint-disable-line no-unused-vars
-  indices: Int32Array;
-  state: State;
-
-  constructor(numRows: number) {
-    this.indices = new Int32Array(numRows);
-    for (let i = 0; i < numRows; i++) {
-      this.indices[i] = i;
-    }
-
-    this.state = {
-      fieldExpanders: [],
-      stackExpanders: [],
-      activeExpanders: [],
-      aggregators: [],
-      activeAggregators: [],
-      sorter: NO_SORT_ORDER,
-      root: _createTreeNode(null, '<root>', this.indices, INVALID_ACTIVE_EXPANDER),
-    };
-  }
-
-  _evaluateAggregate(row: Row) {
-    const activeAggregators = this.state.activeAggregators;
-    const aggregates = new Array(activeAggregators.length);
-    for (let j = 0; j < activeAggregators.length; j++) {
-      const aggregator = this.state.aggregators[activeAggregators[j]];
-      aggregates[j] = aggregator.aggregator(row.indices);
-    }
-    row.aggregates = aggregates;  // eslint-disable-line no-param-reassign
-    row.state |= NODE_REAGGREGATE_BIT;  // eslint-disable-line no-bitwise, no-param-reassign
-  }
-
-  _evaluateAggregates(row: Row) {
-    if ((row.state & NODE_EXPANDED_BIT) !== 0) {  // eslint-disable-line no-bitwise
-      const children = row.children;
-      invariant(children, 'Expected non-null children');
-      for (let i = 0; i < children.length; i++) {
-        this._evaluateAggregate(children[i]);
-      }
-      row.state |= NODE_REORDER_BIT;  // eslint-disable-line no-bitwise, no-param-reassign
-    }
-    row.state ^= NODE_REAGGREGATE_BIT;  // eslint-disable-line no-bitwise, no-param-reassign
-  }
-
-  _evaluateOrder(row: Row) {
-    if ((row.state & NODE_EXPANDED_BIT) !== 0) {  // eslint-disable-line no-bitwise
-      const children = row.children;
-      invariant(children, 'Expected non-null children');
-      for (let i = 0; i < children.length; i++) {
-        const child = children[i];
-        child.state |= NODE_REORDER_BIT;  // eslint-disable-line no-bitwise
-      }
-      children.sort(this.state.sorter);
-      row.state |= NODE_REPOSITION_BIT;  // eslint-disable-line no-bitwise, no-param-reassign
-    }
-    row.state ^= NODE_REORDER_BIT;  // eslint-disable-line no-bitwise, no-param-reassign
-  }
-
-  _evaluatePosition(row: Row) {  // eslint-disable-line class-methods-use-this
-    if ((row.state & NODE_EXPANDED_BIT) !== 0) {  // eslint-disable-line no-bitwise
-      const children = row.children;
-      invariant(children, 'Expected a children array');
-      let childTop = row.top + 1;
-      for (let i = 0; i < children.length; i++) {
-        const child = children[i];
-        if (child.top !== childTop) {
-          child.top = childTop;
-          child.state |= NODE_REPOSITION_BIT;  // eslint-disable-line no-bitwise
-        }
-        childTop += child.height;
-      }
-    }
-    row.state ^= NODE_REPOSITION_BIT;  // eslint-disable-line no-bitwise, no-param-reassign
-  }
-
-  _getRowsImpl(row: Row, top: number, height: number, result: Array<Row | null>) {
-    if ((row.state & NODE_REAGGREGATE_BIT) !== 0) {  // eslint-disable-line no-bitwise
-      this._evaluateAggregates(row);
-    }
-    if ((row.state & NODE_REORDER_BIT) !== 0) {  // eslint-disable-line no-bitwise
-      this._evaluateOrder(row);
-    }
-    if ((row.state & NODE_REPOSITION_BIT) !== 0) {  // eslint-disable-line no-bitwise
-      this._evaluatePosition(row);
-    }
-
-    if (row.top >= top && row.top < top + height) {
-      invariant(
-        result[row.top - top] === null,
-        `getRows put more than one row at position ${row.top} into result`);
-      result[row.top - top] = row;  // eslint-disable-line no-param-reassign
-    }
-    if ((row.state & NODE_EXPANDED_BIT) !== 0) {  // eslint-disable-line no-bitwise
-      const children = row.children;
-      invariant(children, 'Expected non-null children');
-      for (let i = 0; i < children.length; i++) {
-        const child = children[i];
-        if (child.top < top + height && top < child.top + child.height) {
-          this._getRowsImpl(child, top, height, result);
-        }
-      }
-    }
-  }
-
-  _updateHeight(row: Row | null, heightChange: number) {  // eslint-disable-line class-methods-use-this, max-len
-    while (row !== null) {
-      row.height += heightChange;  // eslint-disable-line no-param-reassign
-      row.state |= NODE_REPOSITION_BIT;  // eslint-disable-line no-bitwise, no-param-reassign
-      row = row.parent;  // eslint-disable-line no-param-reassign
-    }
-  }
-
-  _addChildrenWithFieldExpander(row: Row, expander: FieldExpander, nextActiveIndex: number) {  // eslint-disable-line class-methods-use-this, max-len
-    const rowIndices = row.indices;
-    const comparer = expander.comparer;
-    const formatter = expander.formatter;
-    const getter = expander.getter;
-    rowIndices.sort(comparer);
-    let begin = 0;
-    let end = 1;
-    row.children = [];  // eslint-disable-line no-param-reassign
-    while (end < rowIndices.length) {
-      if (comparer(rowIndices[begin], rowIndices[end]) !== 0) {
-        invariant(row.children, 'Expected a children array');
-        row.children.push(_createTreeNode(
-          row,
-          `${expander.name}: ${formatter(getter(rowIndices[begin]))}`,
-          rowIndices.subarray(begin, end),
-          nextActiveIndex));
-        begin = end;
-      }
-      end += 1;
-    }
-    row.children.push(_createTreeNode(
-      row,
-      `${expander.name}: ${formatter(getter(rowIndices[begin]))}`,
-      rowIndices.subarray(begin, end),
-      nextActiveIndex));
-  }
-
-  _addChildrenWithStackExpander(  // eslint-disable-line class-methods-use-this
-      row: Row,
-      expander: StackExpander,
-      activeIndex: number,
-      depth: number,
-      nextActiveIndex: number) {
-    const rowIndices = row.indices;
-    const stackGetter = expander.stackGetter;
-    const frameIdGetter = expander.frameIdGetter;
-    const frameGetter = expander.frameGetter;
-    const frameFormatter = expander.frameFormatter;
-    const comparer = expander.comparers[depth];
-    const expandNextFrame = activeIndex | ((depth + 1) << ACTIVE_EXPANDER_FRAME_SHIFT);  // eslint-disable-line no-bitwise, max-len
-    rowIndices.sort(comparer);
-    let columnName = '';
-    if (depth === 0) {
-      columnName = `${expander.name}: `;
-    }
-
-    // put all the too-short stacks under <exclusive>
-    let begin = 0;
-    let beginStack = null;
-    row.children = [];  // eslint-disable-line no-param-reassign
-    while (begin < rowIndices.length) {
-      beginStack = stackGetter(rowIndices[begin]);
-      if (beginStack.length > depth) {
-        break;
-      }
-      begin += 1;
-    }
-    invariant(beginStack !== null, 'Expected beginStack at this point');
-    if (begin > 0) {
-      row.children.push(_createTreeNode(
-        row,
-        `${columnName}<exclusive>`,
-        rowIndices.subarray(0, begin),
-        nextActiveIndex));
-    }
-    // aggregate the rest under frames
-    if (begin < rowIndices.length) {
-      let end = begin + 1;
-      while (end < rowIndices.length) {
-        const endStack = stackGetter(rowIndices[end]);
-        if (frameIdGetter(beginStack, depth) !== frameIdGetter(endStack, depth)) {
-          invariant(row.children, 'Expected a children array');
-          row.children.push(_createTreeNode(
-            row,
-            columnName + frameFormatter(frameGetter(frameIdGetter(beginStack, depth))),
-            rowIndices.subarray(begin, end),
-            expandNextFrame));
-          begin = end;
-          beginStack = endStack;
-        }
-        end += 1;
-      }
-      row.children.push(_createTreeNode(
-        row,
-        columnName + frameFormatter(frameGetter(frameIdGetter(beginStack, depth))),
-        rowIndices.subarray(begin, end),
-        expandNextFrame));
-    }
-  }
-
-  _contractRow(row: Row) {
-    invariant(
-      (row.state & NODE_EXPANDED_BIT) !== 0,  // eslint-disable-line no-bitwise
-      'Cannot contract row; already contracted!');
-    row.state ^= NODE_EXPANDED_BIT;  // eslint-disable-line no-bitwise, no-param-reassign
-    const heightChange = 1 - row.height;
-    this._updateHeight(row, heightChange);
-  }
-
-  _pruneExpanders(row: Row, oldExpander: number, newExpander: number) {
-    row.state |= NODE_REPOSITION_BIT;  // eslint-disable-line no-bitwise, no-param-reassign
-    if (row.expander === oldExpander) {
-      row.state |= NODE_REAGGREGATE_BIT | NODE_REORDER_BIT | NODE_REPOSITION_BIT;   // eslint-disable-line no-bitwise, no-param-reassign, max-len
-      if ((row.state & NODE_EXPANDED_BIT) !== 0) {  // eslint-disable-line no-bitwise
-        this._contractRow(row);
-      }
-      row.children = null;  // eslint-disable-line no-param-reassign
-      row.expander = newExpander;  // eslint-disable-line no-param-reassign
-    } else {
-      row.state |= NODE_REPOSITION_BIT;  // eslint-disable-line no-bitwise, no-param-reassign
-      const children = row.children;
-      if (children != null) {
-        for (let i = 0; i < children.length; i++) {
-          const child = children[i];
-          this._pruneExpanders(child, oldExpander, newExpander);
-        }
-      }
-    }
-  }
-
-  addFieldExpander(
-    name: string,
-    comparer: Comparer<number>,
-    getter: (rowIndex: number) => any,
-    formatter: (value: any) => string): number {
-    invariant(
-      FIELD_EXPANDER_ID_MIN + this.state.fieldExpanders.length < FIELD_EXPANDER_ID_MAX,
-      'too many field expanders!');
-    this.state.fieldExpanders.push({ name, comparer, getter, formatter });
-    return FIELD_EXPANDER_ID_MIN + this.state.fieldExpanders.length - 1;
-  }
-
-  addStackExpander(
-    name: string,
-    maxStackDepth: number,
-    stackGetter: StackGetter,
-    frameGetter: FrameGetter,
-    frameFormatter: FrameFormatter,
-    reverse: boolean): number {
-    invariant(
-      STACK_EXPANDER_ID_MIN + this.state.fieldExpanders.length < STACK_EXPANDER_ID_MAX,
-      'Too many stack expanders!');
-    const idGetter = reverse ? _callerFrameIdGetter : _calleeFrameIdGetter;
-    this.state.stackExpanders.push({
-      name,
-      stackGetter,
-      comparers: _createStackComparers(stackGetter, idGetter, maxStackDepth),
-      frameIdGetter: idGetter,
-      frameGetter,
-      frameFormatter,
-    });
-    return STACK_EXPANDER_ID_MIN + this.state.stackExpanders.length - 1;
-  }
-
-  getExpanders(): Array<number> {
-    const expanders = [];
-    for (let i = 0; i < this.state.fieldExpanders.length; i++) {
-      expanders.push(FIELD_EXPANDER_ID_MIN + i);
-    }
-    for (let i = 0; i < this.state.stackExpanders.length; i++) {
-      expanders.push(STACK_EXPANDER_ID_MIN + i);
-    }
-    return expanders;
-  }
-
-  getExpanderName(id: number): string {
-    if (id >= FIELD_EXPANDER_ID_MIN && id <= FIELD_EXPANDER_ID_MAX) {
-      return this.state.fieldExpanders[id - FIELD_EXPANDER_ID_MIN].name;
-    } else if (id >= STACK_EXPANDER_ID_MIN && id <= STACK_EXPANDER_ID_MAX) {
-      return this.state.stackExpanders[id - STACK_EXPANDER_ID_MIN].name;
-    }
-    throw new Error(`Unknown expander ID ${id.toString()}`);
-  }
-
-  setActiveExpanders(ids: Array<number>) {
-    for (let i = 0; i < ids.length; i++) {
-      const id = ids[i];
-      if (id >= FIELD_EXPANDER_ID_MIN && id <= FIELD_EXPANDER_ID_MAX) {
-        invariant(
-          id - FIELD_EXPANDER_ID_MIN < this.state.fieldExpanders.length,
-          `field expander for id ${id.toString()} does not exist!`);
-      } else if (id >= STACK_EXPANDER_ID_MIN && id <= STACK_EXPANDER_ID_MAX) {
-        invariant(id - STACK_EXPANDER_ID_MIN < this.state.stackExpanders.length,
-          `stack expander for id ${id.toString()} does not exist!`);
-      }
-    }
-    for (let i = 0; i < ids.length; i++) {
-      if (this.state.activeExpanders.length <= i) {
-        this._pruneExpanders(this.state.root, INVALID_ACTIVE_EXPANDER, i);
-        break;
-      } else if (ids[i] !== this.state.activeExpanders[i]) {
-        this._pruneExpanders(this.state.root, i, i);
-        break;
-      }
-    }
-    // TODO: if ids is prefix of activeExpanders, we need to make an expander invalid
-    this.state.activeExpanders = ids.slice();
-  }
-
-  getActiveExpanders(): Array<number> {
-    return this.state.activeExpanders.slice();
-  }
-
-  addAggregator(
-      name: string,
-      aggregator: (indexes: Int32Array) => number,
-      formatter: (value: number) => string,
-      sorter: Comparer<number>): number {
-    invariant(this.state.aggregators.length < AGGREGATOR_ID_MAX, 'too many aggregators!');
-    this.state.aggregators.push({ name, aggregator, formatter, sorter });
-    return this.state.aggregators.length - 1;
-  }
-
-  getAggregators(): Array<number> {
-    const aggregators = [];
-    for (let i = 0; i < this.state.aggregators.length; i++) {
-      aggregators.push(i);
-    }
-    return aggregators;
-  }
-
-  getAggregatorName(id: number): string {
-    return this.state.aggregators[id & ACTIVE_AGGREGATOR_MASK].name;  // eslint-disable-line no-bitwise, max-len
-  }
-
-  setActiveAggregators(ids: Array<number>) {
-    for (let i = 0; i < ids.length; i++) {
-      const id = ids[i] & ACTIVE_AGGREGATOR_MASK;  // eslint-disable-line no-bitwise
-      invariant(
-        id >= 0 && id < this.state.aggregators.length,
-        `aggregator id ${id.toString()} not valid`);
-    }
-    this.state.activeAggregators = ids.slice();
-    // NB: evaluate root here because dirty bit is for children
-    // so someone has to start with root, and it might as well be right away
-    this._evaluateAggregate(this.state.root);
-    let sorter = NO_SORT_ORDER;
-    for (let i = ids.length - 1; i >= 0; i--) {
-      const ascending = (ids[i] & ACTIVE_AGGREGATOR_ASC_BIT) !== 0;  // eslint-disable-line no-bitwise, max-len
-      const id = ids[i] & ACTIVE_AGGREGATOR_MASK;  // eslint-disable-line no-bitwise
-      const comparer = this.state.aggregators[id].sorter;
-      const captureSorter = sorter;
-      const captureIndex = i;
-      sorter = (a: Row, b: Row): number => {
-        invariant(a.aggregates && b.aggregates, 'Expected aggregates.');
-        const c = comparer(a.aggregates[captureIndex], b.aggregates[captureIndex]);
-        if (c === 0) {
-          return captureSorter(a, b);
-        }
-        return ascending ? -c : c;
-      };
-    }
-    this.state.sorter = sorter;  // eslint-disable-line no-param-reassign
-    this.state.root.state |= NODE_REORDER_BIT;  // eslint-disable-line no-bitwise, no-param-reassign
-  }
-
-  getActiveAggregators(): Array<number> {
-    return this.state.activeAggregators.slice();
-  }
-
-  getRows(top: number, height: number): Array<Row | null> {
-    const result = new Array(height);
-    for (let i = 0; i < height; i++) {
-      result[i] = null;
-    }
-    this._getRowsImpl(this.state.root, top, height, result);
-    return result;
-  }
-
-  _findRowImpl(fromRow: number, predicate: (row: Row) => boolean, row: Row): number {
-    if (row.top > fromRow && predicate(row)) {
-      return row.top; // this row is a match!
-    }
-    
-    // remember how to clean up after ourselves so we only expand as little as possible
-    const contractChildren = this.canExpand(row);
-    const cleanUpChildren = row.children === null;
-    if (contractChildren) {
-      this.expand(row);
-    }
-
-    // evaluate position so we search in the correct order
-    if ((row.state & NODE_REAGGREGATE_BIT) !== 0) {  // eslint-disable-line no-bitwise
-      this._evaluateAggregates(row);
-    }
-    if ((row.state & NODE_REORDER_BIT) !== 0) {  // eslint-disable-line no-bitwise
-      this._evaluateOrder(row);
-    }
-    if ((row.state & NODE_REPOSITION_BIT) !== 0) {  // eslint-disable-line no-bitwise
-      this._evaluatePosition(row);
-    }
-    // TODO: encapsulate row state management somewhere so logic can be shared with _getRowsImpl
-
-    // search in children
-    const children = row.children;
-    if (children !== null) {
-      for (let i = 0; i < children.length; i++) {
-        const child = children[i];
-        if (child.top + child.height > fromRow) {
-          const find = this._findRowImpl(fromRow, predicate, child);
-          if (find >= 0) {
-            return find;
-          }
-        }
-      }
-    }
-    // clean up to leave the tree how it was if we didn't find anything
-    // this also saves memory
-    if (contractChildren) {
-      this.contract(row);
-    }
-    if (cleanUpChildren) {
-      row.children = null;
-    }
-    return -1;
-  }
-
-  // findRow - find the first row that matches a predicate
-  // parameters
-  //  predicate: returns true when row is found
-  //  fromRow: start search from after this row index (negative for start at beginning)
-  // returns: index of first row that matches, -1 if no match found
-  findRow(predicate: (row: Row) => boolean, fromRow: ?number): number {
-    return this._findRowImpl(!fromRow ? -1 : fromRow, predicate, this.state.root);
-  }
-
-  getRowLabel(row: Row): string {  // eslint-disable-line class-methods-use-this
-    return row.label;
-  }
-
-  getRowIndent(row: Row): number {  // eslint-disable-line class-methods-use-this
-    return row.state >>> NODE_INDENT_SHIFT;  // eslint-disable-line no-bitwise
-  }
-
-  getRowExpanderIndex(row: Row): number {  // eslint-disable-line class-methods-use-this
-    if (row.parent) {
-      return row.parent.expander & ACTIVE_EXPANDER_MASK;  // eslint-disable-line no-bitwise
-    }
-    return -1;
-  }
-
-  getRowExpansionPath(row: Row | null): Array<any> {
-    const path = [];
-    invariant(row, 'Expected non-null row here');
-    const index = row.indices[0];
-    row = row.parent;  // eslint-disable-line no-param-reassign
-    while (row) {
-      const exIndex = row.expander & ACTIVE_EXPANDER_MASK;  // eslint-disable-line no-bitwise
-      const exId = this.state.activeExpanders[exIndex];
-      if (exId >= FIELD_EXPANDER_ID_MIN &&
-          exId < FIELD_EXPANDER_ID_MIN + this.state.fieldExpanders.length) {
-        const expander = this.state.fieldExpanders[exId - FIELD_EXPANDER_ID_MIN];  // eslint-disable-line no-bitwise, max-len
-        path.push(expander.getter(index));
-        row = row.parent;  // eslint-disable-line no-param-reassign
-      } else if (exId >= STACK_EXPANDER_ID_MIN &&
-          exId < STACK_EXPANDER_ID_MIN + this.state.stackExpanders.length) {
-        const expander = this.state.stackExpanders[exId - STACK_EXPANDER_ID_MIN];
-        const stackGetter = expander.stackGetter;
-        const frameIdGetter = expander.frameIdGetter;
-        const frameGetter = expander.frameGetter;
-        const stack = [];
-        while (row && (row.expander & ACTIVE_EXPANDER_MASK) === exIndex) {  // eslint-disable-line no-bitwise, max-len
-          const depth = row.expander >>> ACTIVE_EXPANDER_FRAME_SHIFT;  // eslint-disable-line no-bitwise, max-len
-          const rowStack = stackGetter(index);
-          if (depth >= rowStack.length) {
-            stack.push('<exclusive>');
-          } else {
-            stack.push(frameGetter(frameIdGetter(rowStack, depth)));
-          }
-          row = row.parent;  // eslint-disable-line no-param-reassign
-        }
-        path.push(stack.reverse());
-      }
-    }
-    return path.reverse();
-  }
-
-  getRowAggregate(row: Row, index: number): string {
-    const aggregator = this.state.aggregators[this.state.activeAggregators[index]];
-    invariant(row.aggregates, 'Expected aggregates');
-    return aggregator.formatter(row.aggregates[index]);
-  }
-
-  getHeight(): number {
-    return this.state.root.height;
-  }
-
-  canExpand(row: Row): boolean {  // eslint-disable-line class-methods-use-this
-    return (row.state & NODE_EXPANDED_BIT) === 0 && (row.expander !== INVALID_ACTIVE_EXPANDER);  // eslint-disable-line no-bitwise, max-len
-  }
-
-  canContract(row: Row): boolean {  // eslint-disable-line class-methods-use-this
-    return (row.state & NODE_EXPANDED_BIT) !== 0;  // eslint-disable-line no-bitwise
-  }
-
-  expand(row: Row) {
-    invariant(
-      (row.state & NODE_EXPANDED_BIT) === 0,  // eslint-disable-line no-bitwise
-      'can not expand row, already expanded');
-    invariant(row.height === 1, `unexpanded row has height ${row.height.toString()} != 1`);
-    if (row.children === null) {  // first expand, generate children
-      const activeIndex = row.expander & ACTIVE_EXPANDER_MASK;  // eslint-disable-line no-bitwise
-      let nextActiveIndex = activeIndex + 1;  // NB: if next is stack, frame is 0
-      if (nextActiveIndex >= this.state.activeExpanders.length) {
-        nextActiveIndex = INVALID_ACTIVE_EXPANDER;
-      }
-      invariant(
-        activeIndex < this.state.activeExpanders.length,
-        `invalid active expander index ${activeIndex.toString()}`);
-      const exId = this.state.activeExpanders[activeIndex];
-      if (exId >= FIELD_EXPANDER_ID_MIN &&
-          exId < FIELD_EXPANDER_ID_MIN + this.state.fieldExpanders.length) {
-        const expander = this.state.fieldExpanders[exId - FIELD_EXPANDER_ID_MIN];
-        this._addChildrenWithFieldExpander(row, expander, nextActiveIndex);
-      } else if (exId >= STACK_EXPANDER_ID_MIN &&
-          exId < STACK_EXPANDER_ID_MIN + this.state.stackExpanders.length) {
-        const depth = row.expander >>> ACTIVE_EXPANDER_FRAME_SHIFT;  // eslint-disable-line no-bitwise, max-len
-        const expander = this.state.stackExpanders[exId - STACK_EXPANDER_ID_MIN];
-        this._addChildrenWithStackExpander(row, expander, activeIndex, depth, nextActiveIndex);
-      } else {
-        throw new Error(`state.activeIndex ${activeIndex} has invalid expander${exId}`);
-      }
-    }
-    row.state |= NODE_EXPANDED_BIT | NODE_REAGGREGATE_BIT | NODE_REORDER_BIT | NODE_REPOSITION_BIT;    // eslint-disable-line no-bitwise, no-param-reassign, max-len
-    let heightChange = 0;
-    invariant(row.children, 'Expected a children array');
-    for (let i = 0; i < row.children.length; i++) {
-      heightChange += row.children[i].height;
-    }
-    this._updateHeight(row, heightChange);
-    // if children only contains one node, then expand it as well
-    invariant(row.children, 'Expected a children array');
-    if (row.children.length === 1 && this.canExpand(row.children[0])) {
-      this.expand(row.children[0]);
-    }
-  }
-
-  contract(row: Row) {
-    this._contractRow(row);
-  }
-}
diff --git a/local-cli/server/middleware/heapCapture/src/AggrowTable.jsx b/local-cli/server/middleware/heapCapture/src/AggrowTable.jsx
deleted file mode 100644
index 8a54b2ba2f3781..00000000000000
--- a/local-cli/server/middleware/heapCapture/src/AggrowTable.jsx
+++ /dev/null
@@ -1,439 +0,0 @@
-// @flow
-
-import invariant from 'invariant';
-import React from 'react';
-
-import Aggrow from './Aggrow';
-import type { Row } from './AggrowExpander';
-import TableConfiguration from './TableConfiguration';
-import TableHeader from './TableHeader';
-
-const rowHeight = 20;
-const treeIndent = 16;
-
-type Props = {
-  aggrow: Aggrow,
-  enableConfigurationPane: boolean,
-  onSelectionChange?: (row: Row) => void,
-}
-
-type State = {
-  aggrow: Aggrow,
-  viewport: {
-    top: number,
-    height: number,
-  },
-  cursor: number,
-  searchValue: string,
-}
-
-export default class AggrowTable extends React.Component {
-  static defaultProps = {
-    enableConfigurationPane: true,
-  };
-
-  constructor(props: Props) {
-    super(props);
-    this.state = {
-      aggrow: props.aggrow,
-      viewport: { top: 0, height: 100 },
-      cursor: 0,
-      searchValue: '',
-    };
-  }
-
-  props: Props;
-
-  state: State;
-
-  componentDidMount() {
-    document.body && document.body.addEventListener('keydown', this.keydown);
-  }
-
-  componentWillReceiveProps(nextProps: Props) {
-    if (this.props.aggrow !== nextProps.aggrow) {
-      this.setState({
-        aggrow: nextProps.aggrow,
-        viewport: { top: 0, height: 100 },
-        cursor: 0,
-      });
-    }
-  }
-
-  componentWillUnmount() {
-    document.body && document.body.removeEventListener('keydown', this.keydown);
-  }
-
-  scroll = (e: SyntheticUIEvent) => {
-    const viewport = e.target;
-    invariant(viewport instanceof HTMLElement, 'Expected an HTML element');
-    const top = Math.floor((viewport.scrollTop - (viewport.clientHeight * 1.0)) / rowHeight);
-    const height = Math.ceil(viewport.clientHeight * 3.0 / rowHeight);
-    if (top !== this.state.viewport.top || height !== this.state.viewport.height) {
-      this.setState({ viewport: { top, height } });
-    }
-  }
-
-  _updateCursor(position: number) {
-    this.setState({ cursor: position });
-    const onSelectionChange = this.props.onSelectionChange;
-    if (onSelectionChange) {
-      const row = this.state.aggrow.expander.getRows(position, 1)[0];
-      invariant(row, 'Expected a row');
-      onSelectionChange(row);
-    }
-  }
-
-  _contractRow(row: Row) {
-    let newCursor = this.state.cursor;
-    if (newCursor > row.top && newCursor < row.top + row.height) { // in contracted section
-      newCursor = row.top;
-    } else if (newCursor >= row.top + row.height) { // below contracted section
-      newCursor -= row.height - 1;
-    }
-    this.state.aggrow.expander.contract(row);
-    this._updateCursor(newCursor);
-  }
-
-  _expandRow(row: Row) {
-    let newCursor = this.state.cursor;
-    this.state.aggrow.expander.expand(row);
-    if (newCursor > row.top) {  // below expanded section
-      newCursor += row.height - 1;
-    }
-    this._updateCursor(newCursor);
-  }
-
-  _scrollDiv: ?HTMLDivElement = null;
-
-  _setScrollDiv = (div: ?HTMLDivElement) => {
-    this._scrollDiv = div;
-  }
-
-  _keepCursorInViewport() {
-    if (this._scrollDiv) {
-      const cursor = this.state.cursor;
-      const scrollDiv = this._scrollDiv;
-      if (cursor * rowHeight < scrollDiv.scrollTop + (scrollDiv.clientHeight * 0.1)) {
-        scrollDiv.scrollTop = (cursor * rowHeight) - (scrollDiv.clientHeight * 0.1);
-      } else if ((cursor + 1) * rowHeight > scrollDiv.scrollTop + (scrollDiv.clientHeight * 0.9)) {
-        scrollDiv.scrollTop = ((cursor + 1) * rowHeight) - (scrollDiv.clientHeight * 0.9);
-      }
-    }
-  }
-
-  keydown = (e: KeyboardEvent) => {
-    const expander = this.state.aggrow.expander;
-    let cursor = this.state.cursor;
-    let row = expander.getRows(cursor, 1)[0];
-    invariant(row, 'Expected a row');
-    switch (e.keyCode) {
-      case 38: // up
-        if (cursor > 0) {
-          this._updateCursor(cursor - 1);
-          this._keepCursorInViewport();
-        }
-        e.preventDefault();
-        break;
-      case 40: // down
-        if (cursor < expander.getHeight() - 1) {
-          this._updateCursor(cursor + 1);
-          this._keepCursorInViewport();
-        }
-        e.preventDefault();
-        break;
-      case 37: // left
-        if (expander.canContract(row)) {
-          this._contractRow(row);
-        } else if (expander.getRowIndent(row) > 0) {
-          const indent = expander.getRowIndent(row) - 1;
-          while (expander.getRowIndent(row) > indent) {
-            cursor -= 1;
-            row = expander.getRows(cursor, 1)[0];
-          }
-          this._updateCursor(cursor);
-          this._keepCursorInViewport();
-        }
-        e.preventDefault();
-        break;
-      case 39: // right
-        if (expander.canExpand(row)) {
-          this._expandRow(row);
-        } else if (cursor < expander.getHeight() - 1) {
-          this._updateCursor(cursor + 1);
-          this._keepCursorInViewport();
-        }
-        e.preventDefault();
-        break;
-      default:
-        // Do nothing
-        break;
-    }
-  }
-
-  dropAction = (s: string, d: string) => {
-    const expander = this.state.aggrow.expander;
-    if (s.startsWith('aggregate:active:')) {
-      const sIndex = parseInt(s.substr(17), 10);
-      let dIndex = -1;
-      const active = expander.getActiveAggregators();
-      const dragged = active[sIndex];
-      if (d.startsWith('aggregate:insert:')) {
-        dIndex = parseInt(d.substr(17), 10);
-      } else if (d === 'divider:insert') {
-        dIndex = active.length;
-      } else {
-        throw new Error(`not allowed to drag ${s} to ${d}`);
-      }
-      if (dIndex > sIndex) {
-        dIndex -= 1;
-      }
-      active.splice(sIndex, 1);
-      active.splice(dIndex, 0, dragged);
-      expander.setActiveAggregators(active);
-      this._updateCursor(0);
-    } else if (s.startsWith('expander:active:')) {
-      const sIndex = parseInt(s.substr(16), 10);
-      let dIndex = -1;
-      const active = expander.getActiveExpanders();
-      const dragged = active[sIndex];
-      if (d.startsWith('expander:insert:')) {
-        dIndex = parseInt(d.substr(16), 10);
-      } else if (d === 'divider:insert') {
-        dIndex = 0;
-      } else {
-        throw new Error(`not allowed to drag ${s} to ${d}`);
-      }
-      if (dIndex > sIndex) {
-        dIndex -= 1;
-      }
-      active.splice(sIndex, 1);
-      active.splice(dIndex, 0, dragged);
-      expander.setActiveExpanders(active);
-      this._updateCursor(0);
-    } else if (s.startsWith('expander:add:')) {
-      let dIndex = -1;
-      const sExpander = parseInt(s.substring(13), 10);
-      if (d.startsWith('expander:insert:')) {
-        dIndex = parseInt(d.substr(16), 10);
-      } else if (d === 'divider:insert') {
-        dIndex = 0;
-      } else {
-        throw new Error(`not allowed to drag ${s} to ${d}`);
-      }
-      const active = expander.getActiveExpanders();
-      active.splice(dIndex, 0, sExpander);
-      expander.setActiveExpanders(active);
-      this._updateCursor(0);
-    }
-  }
-
-  _handleUpdate = () => {
-    this.setState({ aggrow: this.state.aggrow });
-  }
-
-  renderVirtualizedRows(): React.Element<*> {
-    const expander = this.state.aggrow.expander;
-    const viewport = this.state.viewport;
-    const rows = expander.getRows(viewport.top, viewport.height);
-    return (
-      <div
-        style={{
-          position: 'absolute',
-          width: '100%',
-          height: `${(rowHeight * (expander.getHeight() + 20))}px`,
-        }}>
-        { rows.map((child: Row | null): ?React.Element<*> => this.renderRow(child)) }
-      </div>
-    );
-  }
-
-  renderRow(toRender: Row | null): ?React.Element<*> {
-    if (toRender === null) {
-      return null;
-    }
-    const row = toRender;
-    let bg = 'white';
-    const expander = this.state.aggrow.expander;
-    const columns = [];
-    let rowText = '';
-    const indent = 4 + (expander.getRowIndent(row) * treeIndent);
-    const aggregates = expander.getActiveAggregators();
-    if (expander.getRowExpanderIndex(row) % 2 === 1) {
-      bg = '#f0f0f0';
-    }
-    if (row.top === this.state.cursor) {
-      bg = '#dfe3ee';
-    }
-    for (let i = 0; i < aggregates.length; i++) {
-      const aggregate = expander.getRowAggregate(row, i);
-      columns.push((
-        <div
-          key={`ag${i}`}
-          style={{
-            width: '16px',
-            height: 'inherit',
-            backgroundColor: '#8b9dc3',
-            flexShrink: '0',
-          }}
-        />
-      ));
-      columns.push((
-        <div
-          key={`agsep${i}`}
-          style={{
-            width: '128px',
-            textAlign: 'right',
-            backgroundColor: bg,
-            flexShrink: '0',
-          }}>
-          {aggregate}
-        </div>
-      ));
-    }
-    columns.push((
-      <div
-        key="sep"
-        style={{
-          width: '16px',
-          height: 'inherit',
-          backgroundColor: '#3b5998',
-          flexShrink: '0',
-        }}
-      />
-    ));
-    if (expander.canExpand(row)) {
-      columns.push((
-        <div  // eslint-disable-line jsx-a11y/no-static-element-interactions
-          key="indent"
-          // TODO: Fix this to not need an arrow function
-          // eslint-disable-next-line react/jsx-no-bind
-          onClick={(): void => this._expandRow(row)}
-          style={{
-            marginLeft: `${indent}px`,
-            flexShrink: '0',
-            width: '12px',
-            textAlign: 'center',
-            border: '1px solid gray',
-          }}>
-          +
-        </div>
-      ));
-    } else if (expander.canContract(row)) {
-      columns.push((
-        <div  // eslint-disable-line jsx-a11y/no-static-element-interactions
-          key="indent"
-          // TODO: Fix this to not need an arrow function
-          // eslint-disable-next-line react/jsx-no-bind
-          onClick={(): void => this._contractRow(row)}
-          style={{
-            marginLeft: `${indent}px`,
-            flexShrink: '0',
-            width: '12px',
-            textAlign: 'center',
-            border: '1px solid gray',
-          }}>
-          -
-        </div>
-      ));
-    } else {
-      columns.push((
-        <div
-          key="indent"
-          style={{
-            marginLeft: `${indent}px`,
-          }}
-        />
-      ));
-    }
-    rowText += expander.getRowLabel(row);
-    columns.push((
-      <div
-        key="data"
-        style={{
-          flexShrink: '0',
-          whiteSpace: 'nowrap',
-          marginRight: '20px',
-        }}>
-        {rowText}
-      </div>
-    ));
-    return (
-      <div  // eslint-disable-line jsx-a11y/no-static-element-interactions
-        key={row.top}
-        // TODO: Fix this to not need an arrow function
-        onClick={() => {  // eslint-disable-line react/jsx-no-bind
-          this._updateCursor(row.top);
-        }}
-        style={{
-          position: 'absolute',
-          height: `${(rowHeight - 1)}px`,
-          top: `${(rowHeight * row.top)}px`,
-          display: 'flex',
-          flexDirection: 'row',
-          alignItems: 'center',
-          backgroundColor: bg,
-          borderBottom: '1px solid gray',
-        }}>
-        {columns}
-      </div>
-    );
-  }
-
-  render(): React.Element<*> {
-    const expander = this.state.aggrow.expander;
-    const cursor = this.state.cursor;
-    const row = expander.getRows(cursor, 1)[0];
-    invariant(row, 'Expected a row');
-    const selectedExpander = expander.getRowExpanderIndex(row);
-    return (
-      <div style={{ width: '100%', height: '100%', display: 'flex', flexDirection: 'row' }}>
-        <div
-          style={{
-            width: '100%',
-            height: '100%',
-            display: 'flex',
-            flexDirection: 'column',
-            overflow: 'hidden',
-          }}>
-          <div>
-            <input type="text" value={this.state.searchValue} onChange={(event) => {this.setState({searchValue: event.target.value});}} />
-            <input type="button" value="search!" onClick={() => {
-              const re = new RegExp(this.state.searchValue);
-              const i = this.state.aggrow.expander.findRow((row) => re.test(row.label), this.state.cursor);
-              if (i >= 0) {
-                this._updateCursor(i);
-                this._keepCursorInViewport();
-              }
-            }} />
-          </div>
-          <TableHeader
-            aggrow={this.state.aggrow}
-            dropAction={this.dropAction}
-            selectedExpander={selectedExpander}
-          />
-          <div
-            onScroll={this.scroll}
-            ref={this._setScrollDiv}
-            style={{
-              width: '100%',
-              flexGrow: '1',
-              overflow: 'scroll',
-            }}>
-            <div style={{ position: 'relative' }}>
-              { this.renderVirtualizedRows() }
-            </div>
-          </div>
-        </div>
-        {
-          this.props.enableConfigurationPane ?
-            <TableConfiguration
-              aggrow={this.state.aggrow}
-              onUpdate={this._handleUpdate}
-            /> :
-            undefined
-        }
-      </div>
-    );
-  }
-}
diff --git a/local-cli/server/middleware/heapCapture/src/DataColumnSelector.jsx b/local-cli/server/middleware/heapCapture/src/DataColumnSelector.jsx
deleted file mode 100644
index e7a1784f8669b6..00000000000000
--- a/local-cli/server/middleware/heapCapture/src/DataColumnSelector.jsx
+++ /dev/null
@@ -1,42 +0,0 @@
-// @flow
-
-import invariant from 'invariant';
-import React from 'react';
-
-import AggrowData from './AggrowData';
-import type { AggrowColumn } from './AggrowData';
-
-type Props = {
-  aggrow: AggrowData,
-  filter: (column: AggrowColumn) => boolean,
-  onSelect: (columnName: string) => void,
-  selected?: string,
-}
-
-export default class DataColumnSelector extends React.Component {
-  static defaultProps = {
-    filter: (): boolean => true,
-  };
-
-  props: Props;
-
-  _handleChange = (e: SyntheticEvent) => {
-    invariant(e.target instanceof HTMLSelectElement, 'Expected element');
-    const changed = Number.parseInt(e.target.value, 10);
-    this.props.onSelect(this.props.aggrow.columns[changed].name);
-  }
-
-  render(): React.Element<*> {
-    const columns = this.props.aggrow.columns.filter(this.props.filter);
-    const selected = columns.findIndex(
-      (c: AggrowColumn): boolean => c.name === this.props.selected);
-    return (
-      <select
-        onChange={this._handleChange}
-        value={selected.toString()}>
-        {columns.map((c: AggrowColumn, i: number): React.Element<*> =>
-          <option key={`${c.name}-${i}`} value={i.toString()}>{c.name}</option>)}
-      </select>
-    );
-  }
-}
diff --git a/local-cli/server/middleware/heapCapture/src/Draggable.jsx b/local-cli/server/middleware/heapCapture/src/Draggable.jsx
deleted file mode 100644
index 0bf99039d30d0c..00000000000000
--- a/local-cli/server/middleware/heapCapture/src/Draggable.jsx
+++ /dev/null
@@ -1,26 +0,0 @@
-// @flow
-
-import React from 'react';
-
-type Props = {
-  id: string,
-  children?: any,
-}
-
-export default class Draggable extends React.Component {
-  props: Props;
-
-  _handleDragStart = (e: SyntheticDragEvent) => {
-    e.dataTransfer.setData('text', this.props.id);
-  }
-
-  render(): React.Element<*> {
-    return React.cloneElement(
-      React.Children.only(this.props.children),
-      {
-        draggable: 'true',
-        onDragStart: this._handleDragStart,
-      }
-    );
-  }
-}
diff --git a/local-cli/server/middleware/heapCapture/src/DropTarget.jsx b/local-cli/server/middleware/heapCapture/src/DropTarget.jsx
deleted file mode 100644
index 83365eaf0e576a..00000000000000
--- a/local-cli/server/middleware/heapCapture/src/DropTarget.jsx
+++ /dev/null
@@ -1,33 +0,0 @@
-// @flow
-
-import React from 'react';
-
-type Props = {
-  id: string,
-  dropAction: (sourceId: string, thisId: string) => void,
-  children?: any,
-}
-
-export default class DropTarget extends React.Component {
-  props: Props;
-
-  _handleDragOver = (e: SyntheticDragEvent) => {
-    e.preventDefault();
-  }
-
-  _handleDrop = (e: SyntheticDragEvent) => {
-    const sourceId = e.dataTransfer.getData('text');
-    e.preventDefault();
-    this.props.dropAction(sourceId, this.props.id);
-  }
-
-  render(): React.Element<*> {
-    return React.cloneElement(
-      React.Children.only(this.props.children),
-      {
-        onDragOver: this._handleDragOver,
-        onDrop: this._handleDrop,
-      }
-    );
-  }
-}
diff --git a/local-cli/server/middleware/heapCapture/src/ExpanderConfiguration.jsx b/local-cli/server/middleware/heapCapture/src/ExpanderConfiguration.jsx
deleted file mode 100644
index 728f1dfb4e0118..00000000000000
--- a/local-cli/server/middleware/heapCapture/src/ExpanderConfiguration.jsx
+++ /dev/null
@@ -1,29 +0,0 @@
-// @flow
-
-import React from 'react';
-
-import AggrowExpander from './AggrowExpander';
-import Draggable from './Draggable';
-
-type Props = {
-  expander: AggrowExpander;
-  id: number;
-}
-
-export default function ExpanderConfiguration(props: Props): React.Element<*> {
-  const expander = props.expander;
-  const id = props.id;
-  return (
-    <Draggable id={`expander:add:${id}`}>
-      <div
-        style={{
-          width: 'auto',
-          height: '26px',
-          border: '1px solid darkGray',
-          margin: '2px',
-        }}>
-        {expander.getExpanderName(id)}
-      </div>
-    </Draggable>
-  );
-}
diff --git a/local-cli/server/middleware/heapCapture/src/StackExpanderCreator.jsx b/local-cli/server/middleware/heapCapture/src/StackExpanderCreator.jsx
deleted file mode 100644
index 477165ba5121fb..00000000000000
--- a/local-cli/server/middleware/heapCapture/src/StackExpanderCreator.jsx
+++ /dev/null
@@ -1,152 +0,0 @@
-// @flow
-/* eslint-disable jsx-a11y/label-has-for */
-
-import invariant from 'invariant';
-import React from 'react';
-
-import Aggrow from './Aggrow';
-import { AggrowStackColumn } from './AggrowData';
-import type { AggrowColumn } from './AggrowData';
-import type { FocusConfig } from './Aggrow';
-
-type Props = {
-  aggrow: Aggrow,
-  onCreate: (expanderId: number) => void,
-}
-
-type State = {
-  column: string,
-  pattern: string,
-  reverse: boolean,
-  leftSide: boolean,
-  firstMatch: boolean,
-}
-
-export default class StackExpanderCreator extends React.Component {
-  constructor(props: Props) {
-    super(props);
-    const data = this.props.aggrow.data;
-    const firstColumn = data.columns.find(isStackColumn);
-    this.state = {
-      column: firstColumn ? firstColumn.name : '',
-      pattern: '',
-      reverse: false,
-      leftSide: false,
-      firstMatch: true,
-    };
-  }
-  props: Props;
-
-  state: State;
-
-  _handleColumnSelected = (e: SyntheticEvent) => {
-    invariant(e.target instanceof HTMLSelectElement, 'Expected select element');
-    this.setState({ column: e.target.value });
-  }
-
-  _handlePatternSelected = (e: SyntheticEvent) => {
-    invariant(e.target instanceof HTMLInputElement, 'Expected input element');
-    this.setState({ pattern: e.target.value });
-  }
-
-  _handleReverseSelected = (e: SyntheticEvent) => {
-    invariant(e.target instanceof HTMLInputElement, 'Expected input element');
-    this.setState({ reverse: e.target.checked });
-  }
-
-  _handleFirstMatchSelected = (e: SyntheticEvent) => {
-    invariant(e.target instanceof HTMLInputElement, 'Expected input element');
-    this.setState({ firstMatch: e.target.checked });
-  }
-
-  _handleLeftSideSelected = (e: SyntheticEvent) => {
-    invariant(e.target instanceof HTMLInputElement, 'Expected input element');
-    this.setState({ leftSide: e.target.checked });
-  }
-
-  _handleCreateClicked = () => {
-    let focus: FocusConfig;
-    let expanderName = this.state.column;
-    if (this.state.pattern !== '') {
-      focus = {
-        pattern: new RegExp(this.state.pattern),
-        firstMatch: this.state.firstMatch,
-        leftSide: this.state.leftSide,
-      };
-      expanderName += this.state.reverse ? ' reversed' : '';
-      expanderName += this.state.leftSide ? ' before' : ' after';
-      expanderName += this.state.firstMatch ? ' first ' : ' last ';
-      expanderName += this.state.pattern;
-    }
-
-    this.props.onCreate(
-      this.props.aggrow.addStackExpander(
-        expanderName,
-        this.state.column,
-        this.state.reverse,
-        focus,
-      ));
-  }
-
-  render(): React.Element<*> {
-    const data = this.props.aggrow.data;
-    const stackColumns = data.columns.filter(isStackColumn);
-    return (
-      <div
-        style={{
-          width: '100%',
-          height: '100%',
-          display: 'flex',
-          flexDirection: 'column',
-        }}>
-        <select
-          key="columnselect"
-          onChange={this._handleColumnSelected}
-          value={this.state.column}>
-          {stackColumns.map((c: AggrowColumn): React.Element<*> =>
-            <option key={c.name} value={c.name}>{c.name}</option>
-          )}
-        </select>
-        <input
-          key="pattern"
-          onChange={this._handlePatternSelected}
-          type="text"
-          value={this.state.pattern}
-        />
-        <label key="reverse">
-          <input
-            checked={this.state.reverse}
-            onChange={this._handleReverseSelected}
-            type="checkbox"
-          />
-          Reverse
-        </label>
-        <label key="firstmatch">
-          <input
-            checked={this.state.firstMatch}
-            onChange={this._handleFirstMatchSelected}
-            type="checkbox"
-          />
-          First Match
-        </label>
-        <label key="leftside">
-          <input
-            checked={this.state.leftSide}
-            onChange={this._handleLeftSideSelected}
-            type="checkbox"
-          />
-          Left of Match
-        </label>
-        <button
-          key="create"
-          onClick={this._handleCreateClicked}>
-          Create
-        </button>
-      </div>
-    );
-  }
-}
-
-function isStackColumn(c: AggrowColumn): boolean {
-  return c instanceof AggrowStackColumn;
-}
diff --git a/local-cli/server/middleware/heapCapture/src/StackRegistry.js b/local-cli/server/middleware/heapCapture/src/StackRegistry.js
deleted file mode 100644
index 5964ffcbc84131..00000000000000
--- a/local-cli/server/middleware/heapCapture/src/StackRegistry.js
+++ /dev/null
@@ -1,96 +0,0 @@
-// @flow
-
-import invariant from 'invariant';
-
-export type Stack = {
-  id: number,
-  [frameId: number]: Stack,
-}
-
-export type FlattenedStack = Int32Array;
-
-type StackIdMap = Array<FlattenedStack>;
-
-export default class StackRegistry {
-  root: ?Stack = { id: 0 };
-  nodeCount: number = 1;
-  maxDepth: number = -1;
-  stackIdMap: ?StackIdMap = null;
-
-  insert(parent: Stack, frameId: number): Stack {
-    invariant(this.stackIdMap === null, 'Stacks already flattened!');
-    let node = parent[frameId];
-    if (node === undefined) {
-      node = { id: this.nodeCount };
-      this.nodeCount += 1;
-
-      // TODO: make a builder instead of mutating the array?
-      parent[frameId] = node;  // eslint-disable-line no-param-reassign
-    }
-    return node;
-  }
-
-  get(id: number): FlattenedStack {
-    invariant(this.stackIdMap, 'Stacks not flattened!');
-    return this.stackIdMap[id];
-  }
-
-  flatten() {
-    if (this.stackIdMap !== null) {
-      return;
-    }
-    let stackFrameCount = 0;
-    function countStacks(tree: Stack, depth: number): boolean {
-      let leaf = true;
-      Object.keys(tree).forEach((frameId: any) => {
-        if (frameId !== 'id') {
-          leaf = countStacks(tree[Number(frameId)], depth + 1);
-        }
-      });
-      if (leaf) {
-        stackFrameCount += depth;
-      }
-      return false;
-    }
-    const root = this.root;
-    invariant(root, 'Stacks already flattened');
-    countStacks(root, 0);
-    const stackIdMap = new Array(this.nodeCount);
-    const stackArray = new Int32Array(stackFrameCount);
-    let maxStackDepth = 0;
-    stackFrameCount = 0;
-    function flattenStacksImpl(tree: Stack, stack: Array<number>): void {
-      let childStack;
-      maxStackDepth = Math.max(maxStackDepth, stack.length);
-      Object.keys(tree).forEach((frameId: any) => {
-        if (frameId !== 'id') {
-          stack.push(Number(frameId));
-          childStack = flattenStacksImpl(tree[frameId], stack);
-          stack.pop();
-        }
-      });
-
-      const id = tree.id;
-      invariant(
-        id >= 0 && id < stackIdMap.length && stackIdMap[id] === undefined,
-        'Invalid stack ID!');
-
-      if (childStack !== undefined) {
-        // each child must have our stack as a prefix, so just use that
-        stackIdMap[id] = childStack.subarray(0, stack.length);
-      } else {
-        const newStack = stackArray.subarray(stackFrameCount, stackFrameCount + stack.length);
-        stackFrameCount += stack.length;
-        for (let i = 0; i < stack.length; i++) {
-          newStack[i] = stack[i];
-        }
-        stackIdMap[id] = newStack;
-      }
-      return stackIdMap[id];
-    }
-    flattenStacksImpl(root, []);
-    this.root = null;
-    this.stackIdMap = stackIdMap;
-    this.maxDepth = maxStackDepth;
-  }
-}
diff --git a/local-cli/server/middleware/heapCapture/src/StringInterner.js b/local-cli/server/middleware/heapCapture/src/StringInterner.js
deleted file mode 100644
index ad7b50804ab5f5..00000000000000
--- a/local-cli/server/middleware/heapCapture/src/StringInterner.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// @flow
-
-type InternedStringsTable = {
-  [key: string]: number,
-}
-
-export default class StringInterner {
-  strings: Array<string> = [];
-  ids: InternedStringsTable = {};
-
-  intern(s: string): number {
-    const find = this.ids[s];
-    if (find === undefined) {
-      const id = this.strings.length;
-      this.ids[s] = id;
-      this.strings.push(s);
-      return id;
-    }
-
-    return find;
-  }
-
-  get(id: number): string {
-    return this.strings[id];
-  }
-}
diff --git a/local-cli/server/middleware/heapCapture/src/TableConfiguration.jsx b/local-cli/server/middleware/heapCapture/src/TableConfiguration.jsx
deleted file mode 100644
index 98dc71aa455cec..00000000000000
--- a/local-cli/server/middleware/heapCapture/src/TableConfiguration.jsx
+++ /dev/null
@@ -1,86 +0,0 @@
-// @flow
-
-import React from 'react';
-
-import Aggrow from './Aggrow';
-import ExpanderConfiguration from './ExpanderConfiguration';
-import StackExpanderCreator from './StackExpanderCreator';
-
-type State = {
-  expanded: boolean;
-}
-
-type Props = {
-  aggrow: Aggrow,
-  onUpdate: () => void,
-}
-
-export default class TableConfiguration extends React.Component {
-  props: Props;
-
-  state: State = {
-    expanded: false,
-  }
-
-  _handleUpdate = () => {
-    this.props.onUpdate();
-  }
-
-  _toggleExpanded = () => {
-    this.setState({ expanded: !this.state.expanded });
-  }
-
-  renderExpander(id: number): React.Element<*> {
-    return (<ExpanderConfiguration expander={this.props.aggrow.expander} id={id} />);
-  }
-
-  render(): React.Element<*> {
-    const expanderText = this.state.expanded ? '>>' : '<<';
-    const expander = this.props.aggrow.expander;
-    let config = [];
-    if (this.state.expanded) {
-      config = expander.getExpanders().map(
-        (ex: number): React.Element<*> => this.renderExpander(ex));
-    }
-    return (
-      <div
-        style={{
-          width: this.state.expanded ? '512px' : '26px',
-          height: '100%',
-          display: 'flex',
-          flexDirection: 'column',
-          borderLeft: '2px solid black',
-        }}>
-        <div  // eslint-disable-line jsx-a11y/no-static-element-interactions
-          onClick={this._toggleExpanded}
-          style={{
-            width: '100%',
-            height: '26px',
-            border: '1px solid darkGray',
-          }}>
-          { expanderText }
-        </div>
-        <div
-          style={{
-            width: '100%',
-            height: '26px',
-            flexGrow: '1',
-            display: 'flex',
-            flexDirection: 'column',
-          }}>
-          { config }
-        </div>
-        <div
-          style={{
-            width: '100%',
-            height: '256px',
-            display: 'flex',
-            flexDirection: 'column',
-            borderTop: '1px solid darkGray',
-          }}>
-          <StackExpanderCreator aggrow={this.props.aggrow} onCreate={this._handleUpdate} />
-        </div>
-      </div>
-    );
-  }
-}
diff --git a/local-cli/server/middleware/heapCapture/src/TableHeader.jsx b/local-cli/server/middleware/heapCapture/src/TableHeader.jsx
deleted file mode 100644
index 3326a2d85fd7fe..00000000000000
--- a/local-cli/server/middleware/heapCapture/src/TableHeader.jsx
+++ /dev/null
@@ -1,103 +0,0 @@
-// @flow
-
-import React from 'react';
-
-import Aggrow from './Aggrow';
-import Draggable from './Draggable';
-import DropTarget from './DropTarget';
-
-type Props = {
-  aggrow: Aggrow,
-  dropAction: (sourceId: string, thisId: string) => void,
-  selectedExpander: ?number,
-}
-
-export default function TableHeader(props: Props): React.Element<*> {
-  const expander = props.aggrow.expander;
-  const aggregators = expander.getActiveAggregators();
-  const expanders = expander.getActiveExpanders();
-  const headers = [];
-  for (let i = 0; i < aggregators.length; i++) {
-    const name = expander.getAggregatorName(aggregators[i]);
-    headers.push((
-      <DropTarget
-        dropAction={props.dropAction}
-        id={`aggregate:insert:${i}`}
-        key={`aggregate:insert:${i}`}>
-        <div
-          style={{
-            width: '16px',
-            height: 'inherit',
-            backgroundColor: '#8b9dc3',
-            flexShrink: '0',
-          }}
-        />
-      </DropTarget>));
-    headers.push((
-      <Draggable
-        id={`aggregate:active:${i}`}
-        key={`aggregate:active:${i}`}>
-        <div style={{ width: '128px', textAlign: 'center', flexShrink: '0' }}>{name}</div>
-      </Draggable>));
-  }
-  headers.push((
-    <DropTarget
-      dropAction={props.dropAction}
-      id="divider:insert"
-      key="divider:insert">
-      <div
-        style={{
-          width: '16px',
-          height: 'inherit',
-          backgroundColor: '#3b5998',
-          flexShrink: '0',
-        }}
-      />
-    </DropTarget>));
-  for (let i = 0; i < expanders.length; i++) {
-    const name = expander.getExpanderName(expanders[i]);
-    headers.push((
-      <Draggable
-        id={`expander:active:${i}`}
-        key={`expander:active:${i}`}>
-        <div
-          style={{
-            textAlign: 'center',
-            flexShrink: '0',
-            padding: '4px',
-            backgroundColor: i === props.selectedExpander ? '#dfe3ee' : 'white',
-          }}>
-          {name}
-        </div>
-      </Draggable>));
-    const sep = i + 1 < expanders.length ? '->' : '...';
-    headers.push((
-      <DropTarget
-        dropAction={props.dropAction}
-        id={`expander:insert:${i + 1}`}
-        key={`expander:insert:${i + 1}`}>
-        <div
-          style={{
-            height: 'inherit',
-            backgroundColor: '#8b9dc3',
-            flexShrink: '0',
-          }}>
-          {sep}
-        </div>
-      </DropTarget>)
-    );
-  }
-  return (
-    <div
-      style={{
-        width: '100%',
-        height: '26px',
-        display: 'flex',
-        flexDirection: 'row',
-        alignItems: 'center',
-        borderBottom: '2px solid black',
-      }}>
-      {headers}
-    </div>
-  );
-}
diff --git a/local-cli/server/middleware/heapCapture/src/heapCapture.js b/local-cli/server/middleware/heapCapture/src/heapCapture.js
deleted file mode 100644
index a408889886348f..00000000000000
--- a/local-cli/server/middleware/heapCapture/src/heapCapture.js
+++ /dev/null
@@ -1,412 +0,0 @@
-/**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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.
- */
-'use strict';
-/*eslint no-console-disallow: "off"*/
-/*global preLoadedCapture:true*/
-
-import ReactDOM from 'react-dom';
-import React from 'react';
-import {
-  Aggrow,
-  AggrowData,
-  AggrowTable,
-  StringInterner,
-  StackRegistry,
-} from './index.js';
-
-function RefVisitor(refs, id) {
-  this.refs = refs;
-  this.id = id;
-}
-
-RefVisitor.prototype = {
-  moveToEdge: function moveToEdge(name) {
-    const ref = this.refs[this.id];
-    if (ref && ref.edges) {
-      const edges = ref.edges;
-      for (const edgeId in edges) {
-        if (edges[edgeId] === name) {
-          this.id = edgeId;
-          return this;
-        }
-      }
-    }
-    this.id = undefined;
-    return this;
-  },
-  moveToFirst: function moveToFirst(callback) {
-    const ref = this.refs[this.id];
-    if (ref && ref.edges) {
-      const edges = ref.edges;
-      for (const edgeId in edges) {
-        this.id = edgeId;
-        if (callback(edges[edgeId], this)) {
-          return this;
-        }
-      }
-    }
-    this.id = undefined;
-    return this;
-  },
-  forEachEdge: function forEachEdge(callback) {
-    const ref = this.refs[this.id];
-    if (ref && ref.edges) {
-      const edges = ref.edges;
-      const visitor = new RefVisitor(this.refs, undefined);
-      for (const edgeId in edges) {
-        visitor.id = edgeId;
-        callback(edges[edgeId], visitor);
-      }
-    }
-  },
-  getType: function getType() {
-    const ref = this.refs[this.id];
-    if (ref) {
-      return ref.type;
-    }
-    return undefined;
-  },
-  getRef: function getRef() {
-    return this.refs[this.id];
-  },
-  clone: function clone() {
-    return new RefVisitor(this.refs, this.id);
-  },
-  isDefined: function isDefined() {
-    return !!this.id;
-  },
-  getValue: function getValue() {
-    const ref = this.refs[this.id];
-    if (ref) {
-      if (ref.type === 'string') {
-        if (ref.value) {
-          return ref.value;
-        } else {
-          const rope = [];
-          this.forEachEdge((name, visitor) => {
-            if (name && name.startsWith('[') && name.endsWith(']')) {
-              const index = parseInt(name.substring(1, name.length - 1), 10);
-              rope[index] = visitor.getValue();
-            }
-          });
-          return rope.join('');
-        }
-      } else if (ref.type === 'ScriptExecutable'
-              || ref.type === 'EvalExecutable'
-              || ref.type === 'ProgramExecutable') {
-        return ref.value.url + ':' + ref.value.line + ':' + ref.value.col;
-      } else if (ref.type === 'FunctionExecutable') {
-        return ref.value.name + '@' + ref.value.url + ':' + ref.value.line + ':' + ref.value.col;
-      } else if (ref.type === 'NativeExecutable') {
-        return ref.value.function + ' ' + ref.value.constructor + ' ' + ref.value.name;
-      } else if (ref.type === 'Function') {
-        const executable = this.clone().moveToEdge('@Executable');
-        if (executable.id) {
-          return executable.getRef().type + ' ' + executable.getValue();
-        }
-      }
-    }
-    return '#none';
-  }
-};
-
-function forEachRef(refs, callback) {
-  const visitor = new RefVisitor(refs, undefined);
-  for (const id in refs) {
-    visitor.id = id;
-    callback(visitor);
-  }
-}
-
-function firstRef(refs, callback) {
-  for (const id in refs) {
-    const ref = refs[id];
-    if (callback(id, ref)) {
-      return new RefVisitor(refs, id);
-    }
-  }
-  return new RefVisitor(refs, undefined);
-}
-
-function getInternalInstanceName(visitor) {
-  const type = visitor.clone().moveToEdge('_currentElement').moveToEdge('type');
-  if (type.getType() === 'string') { // element.type is string
-    return type.getValue();
-  } else if (type.getType() === 'Function') { // element.type is function
-    const displayName = type.clone().moveToEdge('displayName');
-    if (displayName.isDefined()) {
-      return displayName.getValue(); // element.type.displayName
-    }
-    const name = type.clone().moveToEdge('name');
-    if (name.isDefined()) {
-      return name.getValue(); // element.type.name
-    }
-    type.moveToEdge('@Executable');
-    if (type.getType() === 'FunctionExecutable') {
-      return type.getRef().value.name;  // element.type symbolicated name
-    }
-  }
-  return '#unknown';
-}
-
-function buildReactComponentTree(visitor, registry, strings) {
-  const ref = visitor.getRef();
-  if (ref.reactTree || ref.reactParent === undefined) {
-    return; // has one or doesn't need one
-  }
-  const parentVisitor = ref.reactParent;
-  if (parentVisitor === null) {
-    ref.reactTree = registry.insert(registry.root, strings.intern(getInternalInstanceName(visitor)));
-  } else if (parentVisitor) {
-    const parentRef = parentVisitor.getRef();
-    buildReactComponentTree(parentVisitor, registry, strings);
-    let relativeName = getInternalInstanceName(visitor);
-    if (ref.reactKey) {
-      relativeName = ref.reactKey + ': ' + relativeName;
-    }
-    ref.reactTree = registry.insert(parentRef.reactTree, strings.intern(relativeName));
-  } else {
-    throw 'non react instance parent of react instance';
-  }
-}
-
-function markReactComponentTree(refs, registry, strings) {
-  // annotate all refs that are react internal instances with their parent and name
-  // ref.reactParent = visitor that points to parent instance,
-  //   null if we know it's an instance, but don't have a parent yet
-  // ref.reactKey = if a key is used to distinguish siblings
-  forEachRef(refs, (visitor) => {
-    const visitorClone = visitor.clone(); // visitor will get stomped on next iteration
-    const ref = visitor.getRef();
-    visitor.forEachEdge((edgeName, edgeVisitor) => {
-      const edgeRef = edgeVisitor.getRef();
-      if (edgeRef) {
-        if (edgeName === '_renderedChildren') {
-          if (ref.reactParent === undefined) {
-            // ref is react component, even if we don't have a parent yet
-            ref.reactParent = null;
-          }
-          edgeVisitor.forEachEdge((childName, childVisitor) => {
-            const childRef = childVisitor.getRef();
-            if (childRef && childName.startsWith('.')) {
-              childRef.reactParent = visitorClone;
-              childRef.reactKey = childName;
-            }
-          });
-        } else if (edgeName === '_renderedComponent') {
-          if (ref.reactParent === undefined) {
-            ref.reactParent = null;
-          }
-          edgeRef.reactParent = visitorClone;
-        }
-      }
-    });
-  });
-  // build tree of react internal instances (since that's what has the structure)
-  // fill in ref.reactTree = path registry node
-  forEachRef(refs, (visitor) => {
-    buildReactComponentTree(visitor, registry, strings);
-  });
-  // hook in components by looking at their _reactInternalInstance fields
-  forEachRef(refs, (visitor) => {
-    const ref = visitor.getRef();
-    const instanceRef = visitor.moveToEdge('_reactInternalInstance').getRef();
-    if (instanceRef) {
-      ref.reactTree = instanceRef.reactTree;
-    }
-  });
-}
-
-function functionUrlFileName(visitor) {
-  const executable = visitor.clone().moveToEdge('@Executable');
-  const ref = executable.getRef();
-  if (ref && ref.value && ref.value.url) {
-    const url = ref.value.url;
-    let file = url.substring(url.lastIndexOf('/') + 1);
-    if (file.endsWith('.js')) {
-      file = file.substring(0, file.length - 3);
-    }
-    return file;
-  }
-  return undefined;
-}
-
-function markModules(refs) {
-  const modules = firstRef(refs, (id, ref) => ref.type === 'CallbackGlobalObject');
-  modules.moveToEdge('require');
-  modules.moveToFirst((name, visitor) => visitor.getType() === 'JSActivation');
-  modules.moveToEdge('modules');
-  modules.forEachEdge((name, visitor) => {
-    const ref = visitor.getRef();
-    visitor.moveToEdge('exports');
-    if (visitor.getType() === 'Object') {
-      visitor.moveToFirst((memberName, member) => member.getType() === 'Function');
-      if (visitor.isDefined()) {
-        ref.module = functionUrlFileName(visitor);
-      }
-    } else if (visitor.getType() === 'Function') {
-      const displayName = visitor.clone().moveToEdge('displayName');
-      if (displayName.isDefined()) {
-        ref.module = displayName.getValue();
-      }
-      ref.module = functionUrlFileName(visitor);
-    }
-    if (ref && !ref.module) {
-      ref.module = '#unknown ' + name;
-    }
-  });
-}
-
-function registerPathToRootBFS(breadth, registry, strings) {
-  while (breadth.length > 0) {
-    const nextBreadth = [];
-    for (let i = 0; i < breadth.length; i++) {
-      const visitor = breadth[i];
-      const ref = visitor.getRef();
-      visitor.forEachEdge((edgeName, edgeVisitor) => {
-        const edgeRef = edgeVisitor.getRef();
-        if (edgeRef && edgeRef.rootPath === undefined) {
-          let pathName = edgeRef.type;
-          if (edgeName) {
-            pathName = edgeName + ': ' + pathName;
-          }
-          edgeRef.rootPath = registry.insert(ref.rootPath, strings.intern(pathName));
-          nextBreadth.push(edgeVisitor.clone());
-          // copy module and react tree forward
-          if (edgeRef.module === undefined) {
-            edgeRef.module = ref.module;
-          }
-          if (edgeRef.reactTree === undefined) {
-            edgeRef.reactTree = ref.reactTree;
-          }
-        }
-      });
-    }
-    breadth = nextBreadth;
-  }
-}
-
-function registerPathToRoot(capture, registry, strings) {
-  const refs = capture.refs;
-  const roots = capture.roots;
-  markReactComponentTree(refs, registry, strings);
-  markModules(refs);
-  let breadth = [];
-  // BFS from global objects first
-  forEachRef(refs, (visitor) => {
-    const ref = visitor.getRef();
-    if (ref.type === 'CallbackGlobalObject') {
-      ref.rootPath = registry.insert(registry.root, strings.intern(ref.type));
-      breadth.push(visitor.clone());
-    }
-  });
-  registerPathToRootBFS(breadth, registry, strings);
-  breadth = [];
-  // lower priority, BFS from other roots
-  for (const id of roots) {
-    const visitor = new RefVisitor(refs, id);
-    const ref = visitor.getRef();
-    if (ref.rootPath === undefined) {
-      ref.rootPath = registry.insert(registry.root, strings.intern(`root ${id}: ${ref.type}`));
-      breadth.push(visitor.clone());
-    }
-  }
-  registerPathToRootBFS(breadth, registry, strings);
-}
-
-function registerCapture(data, captureId, capture, stacks, strings) {
-  // NB: capture.refs is potentially VERY large, so we try to avoid making
-  // copies, even if iteration is a bit more annoying.
-  let rowCount = 0;
-  for (const id in capture.refs) { // eslint-disable-line no-unused-vars
-    rowCount++;
-  }
-  for (const id in capture.markedBlocks) { // eslint-disable-line no-unused-vars
-    rowCount++;
-  }
-  const inserter = data.rowInserter(rowCount);
-  registerPathToRoot(capture, stacks, strings);
-  const noneString = strings.intern('#none');
-  const noneStack = stacks.insert(stacks.root, noneString);
-  forEachRef(capture.refs, (visitor) => {
-    // want to data.append(value, value, value), not IDs
-    const ref = visitor.getRef();
-    const id = visitor.id;
-    inserter.insertRow(
-      parseInt(id, 16),
-      ref.type,
-      ref.size,
-      ref.cellSize,
-      captureId,
-      ref.rootPath === undefined ? noneStack : ref.rootPath,
-      ref.reactTree === undefined ? noneStack : ref.reactTree,
-      visitor.getValue(),
-      ref.module === undefined ? '#none' : ref.module,
-    );
-  });
-  for (const id in capture.markedBlocks) {
-    const block = capture.markedBlocks[id];
-    inserter.insertRow(
-      parseInt(id, 16),
-      'Marked Block Overhead',
-      block.capacity - block.size,
-      0,
-      captureId,
-      noneStack,
-      noneStack,
-      'capacity: ' + block.capacity + ', size: ' + block.size + ', granularity: ' + block.cellSize,
-      '#none',
-    );
-  }
-  inserter.done();
-}
-
-if (preLoadedCapture) {
-  const strings = new StringInterner();
-  const stacks =  new StackRegistry();
-  const columns = [
-    { name: 'id', type: 'int' },
-    { name: 'type', type: 'string', strings: strings },
-    { name: 'size', type: 'int' },
-    { name: 'cell', type: 'int' },
-    { name: 'trace', type: 'string', strings: strings },
-    { name: 'path', type: 'stack', stacks: stacks, getter: x => strings.get(x), formatter: x => x },
-    { name: 'react', type: 'stack', stacks: stacks, getter: x => strings.get(x), formatter: x => x },
-    { name: 'value', type: 'string', strings: strings },
-    { name: 'module', type: 'string', strings: strings },
-  ];
-  const data = new AggrowData(columns);
-  registerCapture(data, 'trace', preLoadedCapture, stacks, strings);
-  preLoadedCapture = undefined; // let GG clean up the capture
-  const aggrow = new Aggrow(data);
-  aggrow.addPointerExpander('Id', 'id');
-  const typeExpander = aggrow.addStringExpander('Type', 'type');
-  aggrow.addNumberExpander('Size', 'size');
-  aggrow.addStringExpander('Trace', 'trace');
-  const pathExpander = aggrow.addStackExpander('Path', 'path');
-  const reactExpander = aggrow.addStackExpander('React Tree', 'react');
-  const valueExpander = aggrow.addStringExpander('Value', 'value');
-  const moduleExpander = aggrow.addStringExpander('Module', 'module');
-  aggrow.expander.setActiveExpanders([
-    pathExpander,
-    reactExpander,
-    moduleExpander,
-    typeExpander,
-    valueExpander,
-  ]);
-  const sizeAggregator = aggrow.addSumAggregator('Size', 'size');
-  const cellAggregator = aggrow.addSumAggregator('Cell Size', 'cell');
-  const countAggregator = aggrow.addCountAggregator('Count');
-  aggrow.expander.setActiveAggregators([
-    cellAggregator,
-    sizeAggregator,
-    countAggregator,
-  ]);
-  ReactDOM.render(<AggrowTable aggrow={aggrow} />, document.body);
-}
diff --git a/local-cli/server/middleware/heapCapture/src/index.js b/local-cli/server/middleware/heapCapture/src/index.js
deleted file mode 100644
index dd8acf0d942f52..00000000000000
--- a/local-cli/server/middleware/heapCapture/src/index.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// @flow
-
-import Aggrow from './Aggrow';
-import AggrowData from './AggrowData';
-import type { AggrowColumnDef } from './AggrowData';
-import AggrowExpander from './AggrowExpander';
-import AggrowTable from './AggrowTable';
-import StackRegistry from './StackRegistry';
-import type { Stack } from './StackRegistry';
-import StringInterner from './StringInterner';
-
-export type {
-  AggrowColumnDef,
-  Stack,
-};
-
-export {
-  Aggrow,
-  AggrowData,
-  AggrowExpander,
-  AggrowTable,
-  StackRegistry,
-  StringInterner,
-};
diff --git a/local-cli/server/middleware/heapCapture/webpack.config.js b/local-cli/server/middleware/heapCapture/webpack.config.js
deleted file mode 100644
index 1f614fa8429fa5..00000000000000
--- a/local-cli/server/middleware/heapCapture/webpack.config.js
+++ /dev/null
@@ -1,29 +0,0 @@
-const webpack = require('webpack');
-
-module.exports = {
-  devtool: 'inline-source-map',
-  entry: './src/heapCapture.js',
-  resolve: {
-    extensions: ["", ".js", ".jsx"],
-  },
-  module: {
-    loaders: [
-      {
-        test: /\.jsx?$/,
-        include: /\/src\//,
-        loader: 'babel-loader',
-        query: {
-          presets: [ 'react', 'es2015' ],
-          plugins: [ 'transform-class-properties' ]
-        },
-      },
-    ],
-  },
-  plugins: [
-    new webpack.BannerPlugin('\n// @generated\n', { raw: true }),
-  ],
-  output: {
-    path: './',
-    filename: 'bundle.js',
-  },
-};
diff --git a/local-cli/server/middleware/heapCaptureMiddleware.js b/local-cli/server/middleware/heapCaptureMiddleware.js
deleted file mode 100644
index 7f73e5420f6ea8..00000000000000
--- a/local-cli/server/middleware/heapCaptureMiddleware.js
+++ /dev/null
@@ -1,171 +0,0 @@
-/**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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.
- */
-'use strict';
-/*eslint no-console-disallow: "off"*/
-
-const spawn = require('child_process').spawn;
-const fs = require('fs');
-const http = require('http');
-const path = require('path');
-const urlLib = require('url');
-const SourceMapConsumer = require('source-map').SourceMapConsumer;
-
-
-// url: string
-// onSuccess: function (SourceMapConsumer)
-// onFailure: function (string)
-function getSourceMapForUrl(url, onFailure, onSuccess) {
-  if (!url) {
-    onFailure('must provide a URL');
-    return;
-  }
-
-  if (url === 'assets://default_bundle') {
-    onFailure('Don\'t know how to symbolicate in-app bundle, please load from server');
-    return;
-  }
-
-  const parsedUrl = urlLib.parse(url);
-  const mapPath = parsedUrl.pathname.replace(/\.bundle$/, '.map');
-  const options = {
-    host: 'localhost',
-    port: parsedUrl.port,
-    path: mapPath + parsedUrl.search + '&babelSourcemap=true',
-  };
-
-  http.get(options, (res) => {
-    res.setEncoding('utf8');
-    let sawEnd = false;
-    let resBody = '';
-    res.on('data', (chunk) => {
-      resBody += chunk;
-    }).on('end', () => {
-      sawEnd = true;
-      onSuccess(new SourceMapConsumer(resBody));
-    }).on('close', (err) => {
-      if (!sawEnd) {
-        onFailure('Connection terminated prematurely because of: '
-                      + err.code + ' for url: ' + url);
-      }
-    });
-  }).on('error', (err) => {
-    onFailure('Could not get response from: ' + url + ', error: ' + err.message);
-  });
-}
-
-// capture: capture object
-// onSuccess: function (Map of url -> SourceMapConsumer)
-// onFailure: function (string)
-function getSourceMapsForCapture(capture, onFailure, onSuccess) {
-  const urls = new Set();
-  const sourcemaps = new Map();
-  for (const id in capture.refs) {
-    const ref = capture.refs[id];
-    if ((ref.type === 'ScriptExecutable' ||
-        ref.type === 'EvalExecutable' ||
-        ref.type === 'ProgramExecutable' ||
-        ref.type === 'FunctionExecutable') && ref.value.url) {
-      urls.add(ref.value.url);
-    }
-  }
-  urls.forEach((url) => {
-    getSourceMapForUrl(url, onFailure, (sourcemap) => {
-      sourcemaps.set(url, sourcemap);
-      urls.delete(url);
-      if (urls.size === 0) {
-        onSuccess(sourcemaps);
-      }
-    });
-  });
-  if (urls.size === 0) {
-    console.warn('No source information found in capture');
-    onSuccess(sourcemaps);
-  }
-}
-
-// capture: capture object
-// onSuccess: function (capture object)
-// onFailure: function (string)
-function symbolicateHeapCaptureFunctions(capture, onFailure, onSuccess) {
-  getSourceMapsForCapture(capture, onFailure, (sourcemaps) => {
-    for (const id in capture.refs) {
-      const ref = capture.refs[id];
-      if (ref.type === 'ScriptExecutable' ||
-          ref.type === 'EvalExecutable' ||
-          ref.type === 'ProgramExecutable' ||
-          ref.type === 'FunctionExecutable') {
-        const sourcemap = sourcemaps.get(ref.value.url);
-        if (sourcemap) {
-          const original = sourcemap.originalPositionFor({
-            line: ref.value.line,
-            column: ref.value.col,
-          });
-          if (original.name) {
-            ref.value.name = original.name;
-          } else if (!ref.value.name) {
-            ref.value.name = path.posix.basename(original.source || '') + ':' + original.line;
-          }
-          ref.value.url = original.source;
-          ref.value.line = original.line;
-          ref.value.col = original.column;
-        }
-      }
-    }
-    onSuccess(capture);
-  });
-}
-
-module.exports = function(req, res, next) {
-  if (req.url !== '/jscheapcaptureupload') {
-    next();
-    return;
-  }
-
-  console.log('symbolicating Heap Capture');
-  symbolicateHeapCaptureFunctions(JSON.parse(req.rawBody), (err) => {
-      console.error('Error when symbolicating: ' + err);
-    },
-    (capture) => {
-      const preload = path.join(__dirname, 'heapCapture/preLoadedCapture.js');
-      fs.writeFileSync(preload, 'var preLoadedCapture = ');
-      fs.appendFileSync(preload, JSON.stringify(capture));
-      fs.appendFileSync(preload, ';');
-      const captureDir = path.join(__dirname, 'heapCapture/captures');
-      if (!fs.existsSync(captureDir)) {
-        fs.mkdirSync(captureDir);
-      }
-      console.log('Packaging Trace');
-      var captureHtml = captureDir + '/capture_' + Date.now() + '.html';
-      var capture = fs.createWriteStream(captureHtml);
-      var inliner = spawn(
-        'inliner',
-        ['--nocompress', 'heapCapture.html'],
-        { cwd: path.join(__dirname, '/heapCapture/'),
-          stdio: [ process.stdin, 'pipe', process.stderr ],
-        });
-      inliner.stdout.pipe(capture);
-      inliner.on('error', (err) => {
-        console.error('Error processing heap capture: ' + err.message);
-        console.error('make sure you have installed inliner with \'npm install inliner -g\'');
-      });
-      inliner.on('exit', (code, signal) => {
-        if (code === 0) {
-          var response = captureHtml;
-          console.log('Heap capture written to: ' + response);
-          res.end(response);
-        } else {
-          var response = 'Error processing heap capture, inliner returned code: ' + code;
-          console.error(response);
-          res.statusCode = 500;
-          res.end(response);
-        }
-      });
-    }
-  );
-};
diff --git a/local-cli/server/runServer.js b/local-cli/server/runServer.js
index 09501018b65ae6..5cc924a3bd4946 100644
--- a/local-cli/server/runServer.js
+++ b/local-cli/server/runServer.js
@@ -20,7 +20,6 @@ const defaultAssetExts = require('../../packager/defaults').assetExts;
 const defaultPlatforms = require('../../packager/defaults').platforms;
 const defaultProvidesModuleNodeModules = require('../../packager/defaults').providesModuleNodeModules;
 const getDevToolsMiddleware = require('./middleware/getDevToolsMiddleware');
-const heapCaptureMiddleware = require('./middleware/heapCaptureMiddleware.js');
 const http = require('http');
 const indexPageMiddleware = require('./middleware/indexPage');
 const loadRawBodyMiddleware = require('./middleware/loadRawBodyMiddleware');
@@ -46,7 +45,6 @@ function runServer(args, config, readyCallback) {
     .use(copyToClipBoardMiddleware)
     .use(statusPageMiddleware)
     .use(systraceProfileMiddleware)
-    .use(heapCaptureMiddleware)
     .use(cpuProfilerMiddleware)
     .use(indexPageMiddleware)
     .use(unless('/inspector', inspectorProxy.processRequest.bind(inspectorProxy)))

From 373eb61f1f411458d4c1c24bb08033bc6d16a316 Mon Sep 17 00:00:00 2001
From: Charles Dick <cwdick@fb.com>
Date: Wed, 15 Mar 2017 06:31:47 -0700
Subject: [PATCH 040/366] Download files through RN packager connection

Differential Revision: D4650999

fbshipit-source-id: 298e3e65bfc13a3610a588c9bffb4808fb2135e3
---
 .../react/devsupport/DevServerHelper.java     |   2 +
 .../devsupport/DevSupportManagerImpl.java     |  29 ++-
 .../devsupport/DisabledDevSupportManager.java |   5 -
 .../react/devsupport/JSCHeapUpload.java       |  77 -------
 .../interfaces/DevSupportManager.java         |   1 -
 .../packagerconnection/FileIoHandler.java     | 192 ++++++++++++++++++
 .../packagerconnection/JSPackagerClient.java  |   1 +
 7 files changed, 208 insertions(+), 99 deletions(-)
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCHeapUpload.java
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/packagerconnection/FileIoHandler.java

diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
index 5cebb1bc52fdba..5c3750dfe1ea87 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
@@ -32,6 +32,7 @@
 import com.facebook.react.common.network.OkHttpCallUtil;
 import com.facebook.react.devsupport.interfaces.PackagerStatusCallback;
 import com.facebook.react.modules.systeminfo.AndroidInfoHelpers;
+import com.facebook.react.packagerconnection.FileIoHandler;
 import com.facebook.react.packagerconnection.JSPackagerClient;
 
 import org.json.JSONException;
@@ -149,6 +150,7 @@ public void onRequest(@Nullable Object params, JSPackagerClient.Responder respon
             commandListener.onPokeSamplingProfilerCommand(responder);
           }
         });
+        handlers.putAll(new FileIoHandler().handlers());
 
         mPackagerClient = new JSPackagerClient(getPackagerConnectionURL(), handlers);
         mPackagerClient.init();
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java
index 28ab652142d904..d141dc9325b585 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java
@@ -422,14 +422,6 @@ public void onOptionSelected() {
           mDevSettings.setFpsDebugEnabled(!mDevSettings.isFpsDebugEnabled());
         }
       });
-    options.put(
-        mApplicationContext.getString(R.string.catalyst_heap_capture),
-        new DevOptionHandler() {
-          @Override
-          public void onOptionSelected() {
-            handleCaptureHeap(null);
-          }
-        });
     options.put(
         mApplicationContext.getString(R.string.catalyst_poke_sampling_profiler),
         new DevOptionHandler() {
@@ -540,11 +532,6 @@ public String getDownloadedJSBundleFile() {
     return mJSBundleTempFile.getAbsolutePath();
   }
 
-  @Override
-  public String getHeapCaptureUploadUrl() {
-    return mDevServerHelper.getHeapCaptureUploadUrl();
-  }
-
   /**
    * @return {@code true} if {@link com.facebook.react.ReactInstanceManager} should use downloaded JS bundle file
    * instead of using JS file from assets. This may happen when app has not been updated since
@@ -687,7 +674,7 @@ public void run() {
   }
 
   @Override
-  public void onCaptureHeapCommand(@Nullable final JSPackagerClient.Responder responder) {
+  public void onCaptureHeapCommand(final JSPackagerClient.Responder responder) {
     UiThreadUtil.runOnUiThread(new Runnable() {
       @Override
       public void run() {
@@ -706,14 +693,24 @@ public void run() {
     });
   }
 
-  private void handleCaptureHeap(@Nullable final JSPackagerClient.Responder responder) {
+  private void handleCaptureHeap(final JSPackagerClient.Responder responder) {
     if (mCurrentContext == null) {
       return;
     }
     JSCHeapCapture heapCapture = mCurrentContext.getNativeModule(JSCHeapCapture.class);
     heapCapture.captureHeap(
       mApplicationContext.getCacheDir().getPath(),
-      JSCHeapUpload.captureCallback(mDevServerHelper.getHeapCaptureUploadUrl(), responder));
+      new JSCHeapCapture.CaptureCallback() {
+        @Override
+        public void onSuccess(File capture) {
+          responder.respond(capture.toString());
+        }
+
+        @Override
+        public void onFailure(JSCHeapCapture.CaptureException error) {
+          responder.error(error.toString());
+        }
+      });
   }
 
   private void handlePokeSamplingProfiler(@Nullable final JSPackagerClient.Responder responder) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java
index 23455e02759875..63f803ca60370a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java
@@ -109,11 +109,6 @@ public String getDownloadedJSBundleFile() {
     return null;
   }
 
-  @Override
-  public String getHeapCaptureUploadUrl() {
-    return null;
-  }
-
   @Override
   public boolean hasUpToDateJSBundleInCache() {
     return false;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCHeapUpload.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCHeapUpload.java
deleted file mode 100644
index f678a6d66dd58a..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCHeapUpload.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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.
- */
-
-package com.facebook.react.devsupport;
-
-import javax.annotation.Nullable;
-
-import android.util.Log;
-import java.io.File;
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
-import com.facebook.react.packagerconnection.JSPackagerClient;
-
-import okhttp3.Call;
-import okhttp3.Callback;
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import okhttp3.Response;
-
-/**
- * Created by cwdick on 7/22/16.
- */
-public class JSCHeapUpload {
-  public static JSCHeapCapture.CaptureCallback captureCallback(
-      final String uploadUrl,
-      @Nullable final JSPackagerClient.Responder responder) {
-    return new JSCHeapCapture.CaptureCallback() {
-      @Override
-      public void onSuccess(File capture) {
-        OkHttpClient.Builder httpClientBuilder = new OkHttpClient.Builder();
-        httpClientBuilder.connectTimeout(1, TimeUnit.MINUTES)
-          .writeTimeout(5, TimeUnit.MINUTES)
-          .readTimeout(5, TimeUnit.MINUTES);
-        OkHttpClient httpClient = httpClientBuilder.build();
-        RequestBody body = RequestBody.create(MediaType.parse("application/json"), capture);
-        Request request = new Request.Builder()
-          .url(uploadUrl)
-          .method("POST", body)
-          .build();
-        Call call = httpClient.newCall(request);
-        call.enqueue(new Callback() {
-          @Override
-          public void onFailure(Call call, IOException e) {
-            String message = "Upload of heap capture failed: " + e.toString();
-            Log.e("JSCHeapCapture", message);
-            responder.error(message);
-          }
-
-          @Override
-          public void onResponse(Call call, Response response) throws IOException {
-            if (!response.isSuccessful()) {
-              String message = "Upload of heap capture failed with code " + Integer.toString(response.code()) + ": " + response.body().string();
-              Log.e("JSCHeapCapture", message);
-              responder.error(message);
-            }
-            responder.respond(response.body().string());
-          }
-        });
-      }
-
-      @Override
-      public void onFailure(JSCHeapCapture.CaptureException e) {
-        String message = "Heap capture failed: " + e.toString();
-        Log.e("JSCHeapCapture", message);
-        responder.error(message);
-      }
-    };
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.java
index a8fedc356e2517..b6bcdec4eb2797 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.java
@@ -40,7 +40,6 @@ public interface DevSupportManager extends NativeModuleCallExceptionHandler {
   String getSourceUrl();
   String getJSBundleURLForRemoteDebugging();
   String getDownloadedJSBundleFile();
-  String getHeapCaptureUploadUrl();
   boolean hasUpToDateJSBundleInCache();
   void reloadSettings();
   void handleReloadJS();
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/FileIoHandler.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/FileIoHandler.java
new file mode 100644
index 00000000000000..5a0adb1dd6b6aa
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/FileIoHandler.java
@@ -0,0 +1,192 @@
+/**
+ * Copyright (c) 2016-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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.
+ */
+
+package com.facebook.react.packagerconnection;
+
+import javax.annotation.Nullable;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Base64;
+
+import com.facebook.common.logging.FLog;
+
+import org.json.JSONObject;
+
+public class FileIoHandler implements Runnable {
+  private static final String TAG = JSPackagerClient.class.getSimpleName();
+  private static final long FILE_TTL = 30 * 1000;
+
+  private static class TtlFileInputStream {
+    private final FileInputStream mStream;
+    private long mTtl;
+
+    public TtlFileInputStream(String path) throws FileNotFoundException {
+      mStream = new FileInputStream(path);
+      mTtl = System.currentTimeMillis() + FILE_TTL;
+    }
+
+    private void extendTtl() {
+      mTtl = System.currentTimeMillis() + FILE_TTL;
+    }
+
+    public boolean expiredTtl() {
+      return System.currentTimeMillis() >= mTtl;
+    }
+
+    public String read(int size) throws IOException {
+      extendTtl();
+      byte[] buffer = new byte[size];
+      int bytesRead = mStream.read(buffer);
+      return Base64.encodeToString(buffer, 0, bytesRead, Base64.DEFAULT);
+    }
+
+    public void close() throws IOException {
+      mStream.close();
+    }
+  };
+
+  private int mNextHandle;
+  private final Handler mHandler;
+  private final Map<Integer, TtlFileInputStream> mOpenFiles;
+  private final Map<String, JSPackagerClient.RequestHandler> mRequestHandlers;
+
+  public FileIoHandler() {
+    mNextHandle = 1;
+    mHandler = new Handler(Looper.getMainLooper());
+    mOpenFiles = new HashMap<>();
+    mRequestHandlers = new HashMap<>();
+    mRequestHandlers.put("fopen", new JSPackagerClient.RequestOnlyHandler() {
+      @Override
+      public void onRequest(
+          @Nullable Object params, JSPackagerClient.Responder responder) {
+        synchronized (mOpenFiles) {
+          try {
+            JSONObject paramsObj = (JSONObject)params;
+            if (paramsObj == null) {
+              throw new Exception("params must be an object { mode: string, filename: string }");
+            }
+            String mode = paramsObj.optString("mode");
+            if (mode == null) {
+              throw new Exception("missing params.mode");
+            }
+            String filename = paramsObj.optString("filename");
+            if (filename == null) {
+              throw new Exception("missing params.filename");
+            }
+            if (!mode.equals("r")) {
+              throw new IllegalArgumentException("unsupported mode: " + mode);
+            }
+
+            responder.respond(addOpenFile(filename));
+          } catch (Exception e) {
+            responder.error(e.toString());
+          }
+        }
+      }
+    });
+    mRequestHandlers.put("fclose", new JSPackagerClient.RequestOnlyHandler() {
+      @Override
+      public void onRequest(
+          @Nullable Object params, JSPackagerClient.Responder responder) {
+        synchronized (mOpenFiles) {
+          try {
+            if (!(params instanceof Number)) {
+              throw new Exception("params must be a file handle");
+            }
+            TtlFileInputStream stream = mOpenFiles.get((int)params);
+            if (stream == null) {
+              throw new Exception("invalid file handle, it might have timed out");
+            }
+
+            mOpenFiles.remove((int)params);
+            stream.close();
+            responder.respond("");
+          } catch (Exception e) {
+            responder.error(e.toString());
+          }
+        }
+      }
+    });
+    mRequestHandlers.put("fread", new JSPackagerClient.RequestOnlyHandler() {
+      @Override
+      public void onRequest(
+          @Nullable Object params, JSPackagerClient.Responder responder) {
+        synchronized (mOpenFiles) {
+          try {
+            JSONObject paramsObj = (JSONObject)params;
+            if (paramsObj == null) {
+              throw new Exception("params must be an object { file: handle, size: number }");
+            }
+            int file = paramsObj.optInt("file");
+            if (file == 0) {
+              throw new Exception("invalid or missing file handle");
+            }
+            int size = paramsObj.optInt("size");
+            if (size == 0) {
+              throw new Exception("invalid or missing read size");
+            }
+            TtlFileInputStream stream = mOpenFiles.get(file);
+            if (stream == null) {
+              throw new Exception("invalid file handle, it might have timed out");
+            }
+
+            responder.respond(stream.read(size));
+          } catch (Exception e) {
+            responder.error(e.toString());
+          }
+        }
+      }
+    });
+  }
+
+  public Map<String, JSPackagerClient.RequestHandler> handlers() {
+    return mRequestHandlers;
+  }
+
+  private int addOpenFile(String filename) throws FileNotFoundException {
+    int handle = mNextHandle++;
+    mOpenFiles.put(handle, new TtlFileInputStream(filename));
+    if (mOpenFiles.size() == 1) {
+      mHandler.postDelayed(FileIoHandler.this, FILE_TTL);
+    }
+    return handle;
+  }
+
+  @Override
+  public void run() {
+    // clean up files that are past their expiry date
+    synchronized (mOpenFiles) {
+      Iterator<TtlFileInputStream> i = mOpenFiles.values().iterator();
+      while (i.hasNext()) {
+        TtlFileInputStream stream = i.next();
+        if (stream.expiredTtl()) {
+          i.remove();
+          try {
+            stream.close();
+          } catch (IOException e) {
+            FLog.e(
+              TAG,
+              "closing expired file failed: " + e.toString());
+          }
+        }
+      }
+      if (!mOpenFiles.isEmpty()) {
+        mHandler.postDelayed(this, FILE_TTL);
+      }
+    }
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/JSPackagerClient.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/JSPackagerClient.java
index 5170d46d0cfd47..d8cdc6544d706b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/JSPackagerClient.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/JSPackagerClient.java
@@ -10,6 +10,7 @@
 
 import javax.annotation.Nullable;
 
+import java.util.HashMap;
 import java.util.Map;
 
 import com.facebook.common.logging.FLog;

From ca6043292adaaa25c44d7a050b122f8980c6f5fe Mon Sep 17 00:00:00 2001
From: Adam Ernst <adamjernst@fb.com>
Date: Wed, 15 Mar 2017 07:23:23 -0700
Subject: [PATCH 041/366] @build-break codemod ios_library to fb_apple_library

Reviewed By: swolchok

fbshipit-source-id: cdbb5195b3c279121c79e237cc2c7275447aa625
---
 ReactCommon/cxxreact/BUCK   | 2 +-
 ReactCommon/jschelpers/BUCK | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ReactCommon/cxxreact/BUCK b/ReactCommon/cxxreact/BUCK
index c82d6a8769d2eb..5b58dbd2dc2c63 100644
--- a/ReactCommon/cxxreact/BUCK
+++ b/ReactCommon/cxxreact/BUCK
@@ -63,7 +63,7 @@ if THIS_IS_FBANDROID:
 
 if THIS_IS_FBOBJC:
   def react_library(**kwargs):
-    ios_library(
+    fb_apple_library(
       name = 'bridge',
       header_path_prefix = "cxxreact",
       inherited_buck_flags = STATIC_LIBRARY_IOS_FLAGS,
diff --git a/ReactCommon/jschelpers/BUCK b/ReactCommon/jschelpers/BUCK
index 82577f4f475648..ef759f4ca02bb6 100644
--- a/ReactCommon/jschelpers/BUCK
+++ b/ReactCommon/jschelpers/BUCK
@@ -54,7 +54,7 @@ if THIS_IS_FBANDROID:
 
 if THIS_IS_FBOBJC:
 
-  ios_library(
+  fb_apple_library(
     name = "jscinternalhelpers",
     inherited_buck_flags = STATIC_LIBRARY_IOS_FLAGS,
     compiler_flags = [
@@ -75,7 +75,7 @@ if THIS_IS_FBOBJC:
     ],
   )
 
-  ios_library(
+  fb_apple_library(
     name = "jschelpers",
     inherited_buck_flags = STATIC_LIBRARY_IOS_FLAGS,
     compiler_flags = [

From 24183a363c455611b31d964d5a88a9a8d108b66e Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Wed, 15 Mar 2017 07:42:22 -0700
Subject: [PATCH 042/366] packager: Resolver/polyfills/require: fix nit error
 message

Reviewed By: davidaurelio

Differential Revision: D4713066

fbshipit-source-id: 35f09ded85472191a3f1c36b5879acee55c60b8b
---
 packager/src/Resolver/polyfills/require.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packager/src/Resolver/polyfills/require.js b/packager/src/Resolver/polyfills/require.js
index f928c6fd80e442..d532f4a90b1ae8 100644
--- a/packager/src/Resolver/polyfills/require.js
+++ b/packager/src/Resolver/polyfills/require.js
@@ -195,7 +195,8 @@
    let message = 'Requiring unknown module "' + id + '".';
    if (__DEV__) {
      message +=
-      'If you are sure the module is there, try restarting the packager or running "npm install".';
+      'If you are sure the module is there, try restarting the packager. ' +
+      'You may also want to run `npm install`, or `yarn` (depending on your environment).';
    }
    return Error(message);
  }

From 6a9c2445ed03de88b3fc46dff3e8913c1aed9dfb Mon Sep 17 00:00:00 2001
From: Martin Konicek <mkonicek@fb.com>
Date: Wed, 15 Mar 2017 07:43:20 -0700
Subject: [PATCH 043/366] Don't merge before Circle CI tests pass: Re-enable
 Android e2e test

Summary:
Disabled earlier today, a fix for HMR landed so let's test it works.
Closes https://github.com/facebook/react-native/pull/12943

Differential Revision: D4712940

Pulled By: jeanlauliac

fbshipit-source-id: 38cbfb04a0a16a0a59e8eb4c9c26adb60ab5d635
---
 circle.yml                  |  4 +---
 scripts/run-ci-e2e-tests.js | 16 +++++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/circle.yml b/circle.yml
index 945e6b7412ff4c..00cad8d46afdfb 100644
--- a/circle.yml
+++ b/circle.yml
@@ -76,9 +76,7 @@ test:
     - node ./scripts/run-android-ci-instrumentation-tests.js --retries 3 --path ./ReactAndroid/src/androidTest/java/com/facebook/react/tests --package com.facebook.react.tests
 
     # Android e2e test
-    # Temp disabled to debug an ongoing issue (so far we think it's packager related).
-    # Re-enable this ASAP once the issue is fixed.
-    #- source scripts/circle-ci-android-setup.sh && retry3 node ./scripts/run-ci-e2e-tests.js --android --js --retries 2
+    - source scripts/circle-ci-android-setup.sh && retry3 node ./scripts/run-ci-e2e-tests.js --android --js --retries 2
 
     # testing docs generation
     - cd website && npm test
diff --git a/scripts/run-ci-e2e-tests.js b/scripts/run-ci-e2e-tests.js
index fea5078d93bc2d..b9b5a9abdb8472 100644
--- a/scripts/run-ci-e2e-tests.js
+++ b/scripts/run-ci-e2e-tests.js
@@ -12,10 +12,10 @@
 /**
  * This script tests that React Native end to end installation/bootstrap works for different platforms
  * Available arguments:
- * --ios - to test only ios application end to end
- * --tvos - to test only tvOS application end to end
- * --android - to test only android application end to end
- * --js - to test that JS in the application is compilable
+ * --ios - 'react-native init' and check iOS app doesn't redbox
+ * --tvos - 'react-native init' and check tvOS app doesn't redbox
+ * --android - 'react-native init' and check Android app doesn't redbox
+ * --js - 'react-native init' and only check the packager returns a bundle
  * --skip-cli-install - to skip react-native-cli global installation (for local debugging)
  * --retries [num] - how many times to retry possible flaky commands: npm install and running tests, default 1
  */
@@ -113,16 +113,18 @@ try {
     cd('..');
     exec('keytool -genkey -v -keystore android/keystores/debug.keystore -storepass android -alias androiddebugkey -keypass android -dname "CN=Android Debug,O=Android,C=US"');
 
-    echo(`Starting packager server, ${SERVER_PID}`);
+    echo(`Starting appium server, ${APPIUM_PID}`);
     const appiumProcess = spawn('node', ['./node_modules/.bin/appium']);
     APPIUM_PID = appiumProcess.pid;
-    echo(`Starting appium server, ${APPIUM_PID}`);
-    echo('Building app');
+
+    echo('Building the app');
     if (exec('buck build android/app').code) {
       echo('could not execute Buck build, is it installed and in PATH?');
       exitCode = 1;
       throw Error(exitCode);
     }
+
+    echo(`Starting packager server, ${SERVER_PID}`);
     const packagerEnv = Object.create(process.env);
     packagerEnv.REACT_NATIVE_MAX_WORKERS = 1;
     // shelljs exec('', {async: true}) does not emit stdout events, so we rely on good old spawn

From 5873a228f41bca763c35c470375a9f3cb36f80ab Mon Sep 17 00:00:00 2001
From: Andy Street <andrews@fb.com>
Date: Wed, 15 Mar 2017 07:49:53 -0700
Subject: [PATCH 044/366] Fix crash if native code tries to update the size of
 a modal view after JS has removed it

Summary:
See https://github.com/facebook/react-native/issues/10845

onSizeChanged is enqueueing a runnable from the ui thread that references a shadow view by id on the native modules thread. Since the shadow thread 'runs ahead' of the UI thread (e.g. it has a newer state of the world than the UI thread), this isn't safe. By the time that code block runs, it's possible that an update from JS has already removed that view from the shadow hierarchy (a change which would then propagate to the native hierarchy on the UI thread).

Reviewed By: AaaChiuuu

Differential Revision: D4706521

fbshipit-source-id: 0915f081068709b895f70b2edce12163b39e5456
---
 .../java/com/facebook/react/uimanager/UIImplementation.java | 6 ++++++
 .../com/facebook/react/views/modal/ReactModalHostView.java  | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java
index e6499c43deff6e..ab6e6f2aa998e3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java
@@ -153,6 +153,12 @@ public void updateNodeSize(
       int newWidth,
       int newHeight) {
     ReactShadowNode cssNode = mShadowNodeRegistry.getNode(nodeViewTag);
+    if (cssNode == null) {
+      FLog.w(
+        ReactConstants.TAG,
+        "Tried to update size of non-existent tag: " + nodeViewTag);
+      return;
+    }
     cssNode.setStyleWidth(newWidth);
     cssNode.setStyleHeight(newHeight);
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java
index 50a00923b211d8..674c6ef80675b6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java
@@ -304,13 +304,14 @@ public DialogRootViewGroup(Context context) {
     protected void onSizeChanged(final int w, final int h, int oldw, int oldh) {
       super.onSizeChanged(w, h, oldw, oldh);
       if (getChildCount() > 0) {
+        final int viewTag = getChildAt(0).getId();
         ReactContext reactContext = (ReactContext) getContext();
         reactContext.runOnNativeModulesQueueThread(
           new GuardedRunnable(reactContext) {
             @Override
             public void runGuarded() {
               ((ReactContext) getContext()).getNativeModule(UIManagerModule.class)
-                .updateNodeSize(getChildAt(0).getId(), w, h);
+                .updateNodeSize(viewTag, w, h);
             }
           });
       }

From 6eb9ee26525793d73bcf2988449eea7535504fb3 Mon Sep 17 00:00:00 2001
From: Marc Horowitz <mhorowitz@fb.com>
Date: Wed, 15 Mar 2017 13:35:36 -0700
Subject: [PATCH 045/366] Missing @DoNotStrip

Reviewed By: javache

Differential Revision: D4715719

fbshipit-source-id: c689ea68efafeb353382c8c3b72f5616932ad761
---
 .../main/java/com/facebook/react/cxxbridge/ModuleHolder.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/ModuleHolder.java b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/ModuleHolder.java
index 52ac2059e11be7..6226bf5be463cd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/ModuleHolder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/ModuleHolder.java
@@ -5,6 +5,7 @@
 import javax.annotation.Nullable;
 import javax.inject.Provider;
 
+import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactMarker;
 import com.facebook.react.bridge.ReactMarkerConstants;
@@ -75,6 +76,7 @@ public synchronized void destroy() {
     }
   }
 
+  @DoNotStrip
   public String getName() {
     return mName;
   }
@@ -87,6 +89,7 @@ public boolean getSupportsWebWorkers() {
     return mSupportsWebWorkers;
   }
 
+  @DoNotStrip
   public synchronized NativeModule getModule() {
     if (mModule == null) {
       mModule = create();

From 6336e4d41eccbe83212db88d00a73450f8353d3b Mon Sep 17 00:00:00 2001
From: Maxime Aoustin <maxime@Maximes-MacBook-Pro.local>
Date: Wed, 15 Mar 2017 14:07:21 -0700
Subject: [PATCH 046/366] Update Podfile documentation for RN >= 0.42.0

Summary:
I've updated the documentation that gives an example of Podfile adding a note that from React Native 0.42.0, users have to explicitly include Yoga in their Podfile.

I didn't want to modify existing `Podfile` from this documentation because they refer to `Podfile` from existing projects that do not use RN 0.42.0. So I just added a note and an example to explain how to include Yoga.

This PR is to fix the following issue: https://github.com/facebook/react-native/issues/12670
Closes https://github.com/facebook/react-native/pull/12728

Differential Revision: D4716172

Pulled By: hramos

fbshipit-source-id: 12a6e61b0d426c776a7cc2dea3ac22a50ffe56ef
---
 docs/IntegrationWithExistingApps.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/IntegrationWithExistingApps.md b/docs/IntegrationWithExistingApps.md
index 3afa8669bb3f58..e4fa55e7f69c0b 100644
--- a/docs/IntegrationWithExistingApps.md
+++ b/docs/IntegrationWithExistingApps.md
@@ -218,6 +218,8 @@ target 'NumberTileGame' do
     'RCTWebSocket', # needed for debugging
     # Add any other subspecs you want to use in your project
   ]
+  # Explicitly include Yoga if you are using RN >= 0.42.0
+  pod "Yoga", :path => "../node_modules/react-native/ReactCommon/yoga"
 
 end
 ```
@@ -243,6 +245,8 @@ target 'swift-2048' do
     'RCTWebSocket', # needed for debugging
     # Add any other subspecs you want to use in your project
   ]
+  # Explicitly include Yoga if you are using RN >= 0.42.0
+  pod "Yoga", :path => "../node_modules/react-native/ReactCommon/yoga"
 
 end
 ```

From 7f4054df76b6fdf44ef84a89487ef1381e078b95 Mon Sep 17 00:00:00 2001
From: Mike Adams <MamboCube@users.noreply.github.com>
Date: Wed, 15 Mar 2017 16:53:17 -0700
Subject: [PATCH 047/366] Update FlatList.js

Summary:
Only a small amendment, but took me a little bit to figure out why this wasn't working.
Closes https://github.com/facebook/react-native/pull/12706

Differential Revision: D4656700

fbshipit-source-id: d6038581aa70e96a2be775a7a9786e8c7e64f762
---
 Libraries/CustomComponents/Lists/FlatList.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Libraries/CustomComponents/Lists/FlatList.js b/Libraries/CustomComponents/Lists/FlatList.js
index 10a47cc46974c5..5fedff5d612446 100644
--- a/Libraries/CustomComponents/Lists/FlatList.js
+++ b/Libraries/CustomComponents/Lists/FlatList.js
@@ -51,7 +51,7 @@ type RequiredProps<ItemT> = {
    *     _renderItem = ({item}) => (
    *       <TouchableOpacity onPress={() => this._onPress(item)}>
    *         <Text>{item.title}}</Text>
-   *       <TouchableOpacity/>
+   *       </TouchableOpacity>
    *     );
    *     ...
    *     <FlatList data={[{title: 'Title Text', key: 'item1'}]} renderItem={this._renderItem} />

From 28bb1960a40fea21494f9cc707b19901962a1561 Mon Sep 17 00:00:00 2001
From: Hector Ramos <hramos@fb.com>
Date: Wed, 15 Mar 2017 17:24:39 -0700
Subject: [PATCH 048/366] Shorten template instructions.

Summary:
I've noticed many pull requests are opened with a very short description that fails to explain the motivation behind the PR, and many more forego providing a test plan. With this PR, I am shortening the template in order to provide concise instructions that provide the essential steps above the fold in the "Open a pull request" composer window.

- We need people to open a PR against master, not stable. The exact reason for this is not important and providing an explanation takes away from other more important points.
- Test plans are essential, but their requirement appears below the fold in the current template.
- More PRs could use tests.
- Make a point of asking PR authors to follow up on CI test failures.
- The composer does not parse Markdown into HTML. Markdown is pretty readable as is, but using reference links instead of inline links should help with readability.

I observed that it will only display the first 8 lines of the PR template above the fold. Seeing t
Closes https://github.com/facebook/react-native/pull/12958

Differential Revision: D4718294

Pulled By: mkonicek

fbshipit-source-id: b19a29e5ed73fb78d09c7de17625b1883590075c
---
 .github/PULL_REQUEST_TEMPLATE.md | 33 ++++++++++++++++--------
 CONTRIBUTING.md                  | 43 ++++++++++++++++----------------
 2 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 7da24f09442644..de18092adff89b 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,19 +1,32 @@
-Thanks for submitting a pull request! Please provide enough information so that others can review your pull request:
+Thanks for submitting a PR! Please read these instructions carefully:
 
-> **Unless you are a React Native release maintainer and cherry-picking an *existing* commit into a current release, ensure your pull request is targeting the `master` React Native branch.**
+- [ ] Explain the **motivation** for making this change.
+- [ ] Provide a **test plan** demonstrating that the code is solid.
+- [ ] Match the **code formatting** of the rest of the codebase.
+- [ ] Target the `master` branch, NOT a "stable" branch.
 
-Explain the **motivation** for making this change. What existing problem does the pull request solve?
+## Motivation (required)
 
-Prefer **small pull requests**. These are much easier to review and more likely to get merged. Make sure the PR does only one thing, otherwise please split it.
+What existing problem does the pull request solve?
 
-**Test plan (required)**
+## Test Plan (required)
 
-Demonstrate the code is solid. Example: The exact commands you ran and their output, screenshots / videos if the pull request changes UI.
+A good test plan has the exact commands you ran and their output, provides screenshots or videos if the pull request changes UI or updates the website. See [What is a Test Plan?][1] to learn more.  
 
-Make sure tests pass on both Travis and Circle CI.
+If you have added code that should be tested, add tests.
 
-**Code formatting**
+## Next Steps
 
-Look around. Match the style of the rest of the codebase. See also the simple [style guide](https://github.com/facebook/react-native/blob/master/CONTRIBUTING.md#style-guide).
+Sign the [CLA][2], if you haven't already.
 
-For more info, see the ["Pull Requests" section of our "Contributing" guidelines](https://github.com/facebook/react-native/blob/master/CONTRIBUTING.md#pull-requests).
+Small pull requests are much easier to review and more likely to get merged. Make sure the PR does only one thing, otherwise please split it.
+
+Make sure all **tests pass** on both [Travis][3] and [Circle CI][4]. PRs that break tests are unlikely to be merged.
+
+For more info, see the ["Pull Requests"][5] section of our "Contributing" guidelines.
+
+[1]: https://medium.com/@martinkonicek/what-is-a-test-plan-8bfc840ec171#.y9lcuqqi9
+[2]: https://code.facebook.com/cla
+[3]: https://travis-ci.org/facebook/react-native
+[4]: http://circleci.com/gh/facebook/react-native
+[5]: https://github.com/facebook/react-native/blob/master/CONTRIBUTING.md#pull-requests
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d460766a81a844..59731909c8a3cc 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -14,29 +14,30 @@ We will do our best to keep `master` in good shape, with tests passing at all ti
 
 The core team will be monitoring for pull requests. When we get one, we'll run some Facebook-specific integration tests on it first. From here, we'll need to get another person to sign off on the changes and then merge the pull request. For API changes we may need to fix internal uses, which could cause some delay. We'll do our best to provide updates and feedback throughout the process.
 
-**Please submit your pull request on the `master` branch**. If the fix is critical and should be included in a stable branch please mention it and it will be cherry picked into it.
+**Please submit your pull request on the `master` branch**. If the fix is critical and should be included in a stable branch please mention it and it will be cherry picked into it by a project maintainer.
 
 *Before* submitting a pull request, please make sure the following is done…
 
 1. Fork the repo and create your branch from `master`.
-2. **Describe your test plan in your commit.** If you've added code that should be tested, add tests!
-3. If you've changed APIs, update the documentation.
-4. If you've updated the docs, verify the website locally and submit screenshots if applicable.
-
-    ```
-    $ cd website
-    $ npm install && npm start
-    go to: http://localhost:8079/react-native/index.html
-    ```
-
-5. Add the copyright notice to the top of any new files you've added.
-6. Ensure tests pass on Travis and Circle CI.
-7. Make sure your code lints (`node linter.js <files touched>`).
-8. If you haven't already, sign the [CLA](https://code.facebook.com/cla).
-9. Squash your commits (`git rebase -i`).
-   one intent alongs with one commit makes it clearer for people to review and easier to understand your intention
-
-Note: It is not necessary to keep clicking `Merge master to your branch` on PR page. You would want to merge master if there are conflicts or tests are failing. The facebook-bot ultimately squashes all commits to a single one before merging your PR.
+2. **Describe your test plan in your commit.**
+  - If you've added code that should be tested, add tests!
+  - If you've changed APIs, update the documentation.
+  - If you've updated the docs, verify the website locally and submit screenshots if applicable.
+
+  ```
+  $ cd website
+  $ npm install && npm start
+  Open the following in your browser: http://localhost:8079/react-native/index.html
+  ```
+
+3. Add the copyright notice to the top of any new files you've added.
+4. Ensure tests pass on Travis and Circle CI.
+5. Make sure your code lints (`node linter.js <files touched>`).
+6. If you haven't already, sign the [CLA](https://code.facebook.com/cla).
+7. Squash your commits (`git rebase -i`).
+   One intent alongside one commit makes it clearer for people to review and easier to understand your intention.
+
+> **Note:** It is not necessary to keep clicking `Merge master to your branch` on the PR page. You would want to merge master if there are conflicts or tests are failing. The Facebook-GitHub-Bot ultimately squashes all commits to a single one before merging your PR.
 
 #### Copyright Notice for files
 
@@ -77,8 +78,8 @@ Facebook has a [bounty program](https://www.facebook.com/whitehat/) for the safe
 
 ## How to Get in Touch
 
-* [Facebook group](https://www.facebook.com/groups/react.native.community/)
-* Reactiflux — [#react-native](http://join.reactiflux.com/)
+* [Facebook](https://www.facebook.com/groups/react.native.community/)
+* [Twitter](https://www.twitter.com/reactnative)
 
 ## Style Guide
 

From 35046984db2c41ef740cb50e1e60a3dfdcd23056 Mon Sep 17 00:00:00 2001
From: Andrew Jack <me@andrewjack.uk>
Date: Wed, 15 Mar 2017 17:32:01 -0700
Subject: [PATCH 049/366] Add TextLayoutBuilder proguard rule

Summary:
To enable users to use run proguard in their Android applications.

Fixes: #11891

[TextLayoutBuilder](https://github.com/facebookincubator/TextLayoutBuilder) is built as a Jar rather than an AAR so the proguard rules cannot be provided with the binary.

This PR adds the rules that are included in TextLayoutBuilder https://github.com/facebookincubator/TextLayoutBuilder/blob/master/proguard-android.txt

- Created an `react-native init ProguardTest` project with proguard turned on for v0.41.0
- Make sure tests pass on both Travis and Circle CI.
Closes https://github.com/facebook/react-native/pull/12511

Differential Revision: D4718029

Pulled By: mkonicek

fbshipit-source-id: 9e3f11c8b9b54eb8e52aa6f44cacd00857a882a5
---
 local-cli/templates/HelloWorld/android/app/proguard-rules.pro | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/local-cli/templates/HelloWorld/android/app/proguard-rules.pro b/local-cli/templates/HelloWorld/android/app/proguard-rules.pro
index 48361a9015dc50..6e8516c8d6dd4b 100644
--- a/local-cli/templates/HelloWorld/android/app/proguard-rules.pro
+++ b/local-cli/templates/HelloWorld/android/app/proguard-rules.pro
@@ -50,6 +50,10 @@
 
 -dontwarn com.facebook.react.**
 
+# TextLayoutBuilder uses a non-public Android constructor within StaticLayout.
+# See libs/proxy/src/main/java/com/facebook/fbui/textlayoutbuilder/proxy for details.
+-dontwarn android.text.StaticLayout
+
 # okhttp
 
 -keepattributes Signature

From c53404a6889b8f8718d90cda161523c06ebcb43f Mon Sep 17 00:00:00 2001
From: Bin Yue <felixyuebin@gmail.com>
Date: Wed, 15 Mar 2017 17:46:14 -0700
Subject: [PATCH 050/366] Fix TextInput 'defaultValue' propTypes to 'string'

Summary:
Because `TextInput` only render the `defaultValue` of `string`, when using other types of values, it will render empty('') without any Warnings.
Closes https://github.com/facebook/react-native/pull/11478

Differential Revision: D4340132

Pulled By: lacker

fbshipit-source-id: aedb96d49277836000c0adc53007c97db6363253
---
 Libraries/Components/TextInput/TextInput.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Libraries/Components/TextInput/TextInput.js b/Libraries/Components/TextInput/TextInput.js
index e9b2de7d5474e3..d1c3e6fd27f723 100644
--- a/Libraries/Components/TextInput/TextInput.js
+++ b/Libraries/Components/TextInput/TextInput.js
@@ -452,7 +452,7 @@ const TextInput = React.createClass({
      * Useful for simple use-cases where you do not want to deal with listening
      * to events and updating the value prop to keep the controlled state in sync.
      */
-    defaultValue: PropTypes.node,
+    defaultValue: PropTypes.string,
     /**
      * When the clear button should appear on the right side of the text view.
      * @platform ios

From d5dda1b1365321c0bb64eca0d1d88909f0f6c7fd Mon Sep 17 00:00:00 2001
From: Ashok Menon <ashokmenon@fb.com>
Date: Wed, 15 Mar 2017 18:25:35 -0700
Subject: [PATCH 051/366] Adding in missing wrapper invocation.

Reviewed By: javache

Differential Revision: D4714260

fbshipit-source-id: 641dfd07e8161bedf31cfd4cf94b1dc64beec0f9
---
 React/CxxModule/RCTCxxUtils.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/React/CxxModule/RCTCxxUtils.h b/React/CxxModule/RCTCxxUtils.h
index 0f361233836d2e..2278cf42de8371 100644
--- a/React/CxxModule/RCTCxxUtils.h
+++ b/React/CxxModule/RCTCxxUtils.h
@@ -33,7 +33,7 @@ template <>
 struct ValueEncoder<NSArray *> {
   static Value toValue(JSGlobalContextRef ctx, NSArray *const __strong array)
   {
-    JSValue *value = [JSValue valueWithObject:array inContext:contextForGlobalContextRef(ctx)];
+    JSValue *value = [JSC_JSValue(ctx) valueWithObject:array inContext:contextForGlobalContextRef(ctx)];
     return {ctx, [value JSValueRef]};
   }
 };

From c8d922b4670127c417d744a0a1412cc6ad961fef Mon Sep 17 00:00:00 2001
From: Andy Street <andrews@fb.com>
Date: Thu, 16 Mar 2017 07:40:54 -0700
Subject: [PATCH 052/366] BREAKING: Only call batchDidComplete when there were
 actually native calls dispatched

Summary: This is breaking because it affects the contract for onBatchComplete, but modules really shouldn't (and probably aren't) depending on it being called without any actual native module method calls having happened.

Reviewed By: javache

Differential Revision: D4715656

fbshipit-source-id: 53ddd4a26c9949de86f5111d214b3e5002ca2e94
---
 ReactCommon/cxxreact/NativeToJsBridge.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ReactCommon/cxxreact/NativeToJsBridge.cpp b/ReactCommon/cxxreact/NativeToJsBridge.cpp
index 5c4399766c0704..8c6babfbf4e842 100644
--- a/ReactCommon/cxxreact/NativeToJsBridge.cpp
+++ b/ReactCommon/cxxreact/NativeToJsBridge.cpp
@@ -52,6 +52,8 @@ class JsToNativeBridge : public react::ExecutorDelegate {
       "native module calls cannot be completed with no native modules";
     ExecutorToken token = m_nativeToJs->getTokenForExecutor(executor);
     m_nativeQueue->runOnQueue([this, token, calls=std::move(calls), isEndOfBatch] () mutable {
+      m_batchHadNativeModuleCalls = m_batchHadNativeModuleCalls || !calls.empty();
+
       // An exception anywhere in here stops processing of the batch.  This
       // was the behavior of the Android bridge, and since exception handling
       // terminates the whole bridge, there's not much point in continuing.
@@ -60,7 +62,10 @@ class JsToNativeBridge : public react::ExecutorDelegate {
           token, call.moduleId, call.methodId, std::move(call.arguments), call.callId);
       }
       if (isEndOfBatch) {
-        m_callback->onBatchComplete();
+        if (m_batchHadNativeModuleCalls) {
+          m_callback->onBatchComplete();
+          m_batchHadNativeModuleCalls = false;
+        }
         m_callback->decrementPendingJSCalls();
       }
     });
@@ -88,6 +93,7 @@ class JsToNativeBridge : public react::ExecutorDelegate {
   std::shared_ptr<ModuleRegistry> m_registry;
   std::unique_ptr<MessageQueueThread> m_nativeQueue;
   std::shared_ptr<InstanceCallback> m_callback;
+  bool m_batchHadNativeModuleCalls = false;
 };
 
 NativeToJsBridge::NativeToJsBridge(

From bb266715f14f47916adbfb804279cfe35df71121 Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Thu, 16 Mar 2017 09:20:55 -0700
Subject: [PATCH 053/366] packager: GlobalTransformCache: finish conversion to
 async/await

Reviewed By: davidaurelio

Differential Revision: D4713456

fbshipit-source-id: f65c45439d1657872e28a296f13a73ee2032ea93
---
 packager/src/lib/GlobalTransformCache.js | 108 ++++++++++-------------
 packager/src/node-haste/Module.js        |  21 +++--
 2 files changed, 55 insertions(+), 74 deletions(-)

diff --git a/packager/src/lib/GlobalTransformCache.js b/packager/src/lib/GlobalTransformCache.js
index 70b5979d927ea1..002960df315be5 100644
--- a/packager/src/lib/GlobalTransformCache.js
+++ b/packager/src/lib/GlobalTransformCache.js
@@ -14,10 +14,10 @@
 const BatchProcessor = require('./BatchProcessor');
 
 const crypto = require('crypto');
+const fetch = require('node-fetch');
 const imurmurhash = require('imurmurhash');
 const jsonStableStringify = require('json-stable-stringify');
 const path = require('path');
-const request = require('request');
 
 import type {Options as TransformOptions} from '../JSTransformer/worker/worker';
 import type {CachedResult, GetTransformCacheKey} from './TransformCache';
@@ -33,9 +33,6 @@ type FetchProps = {
   transformOptions: TransformOptions,
 };
 
-type FetchCallback = (error?: Error, result?: ?CachedResult) => mixed;
-type FetchURICallback = (error?: Error, resultURI?: ?string) => mixed;
-
 type URI = string;
 
 /**
@@ -64,11 +61,8 @@ class KeyURIFetcher {
     return keys.map(key => URIsByKey.get(key));
   }
 
-  fetch(key: string, callback: FetchURICallback) {
-    this._batchProcessor.queue(key).then(
-      res => process.nextTick(callback.bind(undefined, undefined, res)),
-      err => process.nextTick(callback.bind(undefined, err)),
-    );
+  async fetch(key: string): Promise<?string> {
+    return await this._batchProcessor.queue(key);
   }
 
   constructor(fetchResultURIs: FetchResultURIs, processError: (error: Error) => mixed) {
@@ -181,20 +175,6 @@ class GlobalTransformCache {
   _retries: number;
   _store: ?KeyResultStore;
 
-  /**
-   * If too many errors already happened, we just drop the additional errors.
-   */
-  _processError(error: Error) {
-    if (this._retries <= 0) {
-      return;
-    }
-    this._reporter.update({type: 'global_cache_error', error});
-    --this._retries;
-    if (this._retries <= 0) {
-      this._reporter.update({type: 'global_cache_disabled', reason: 'too_many_errors'});
-    }
-  }
-
   /**
    * For using the global cache one needs to have some kind of central key-value
    * store that gets prefilled using keyOf() and the transformed results. The
@@ -231,30 +211,36 @@ class GlobalTransformCache {
     return `${digest}-${path.basename(props.filePath)}`;
   }
 
+  /**
+   * If too many errors already happened, we just drop the additional errors.
+   */
+  _processError(error: Error) {
+    if (this._retries <= 0) {
+      return;
+    }
+    this._reporter.update({type: 'global_cache_error', error});
+    --this._retries;
+    if (this._retries <= 0) {
+      this._reporter.update({type: 'global_cache_disabled', reason: 'too_many_errors'});
+    }
+  }
+
   /**
    * We may want to improve that logic to return a stream instead of the whole
    * blob of transformed results. However the results are generally only a few
    * megabytes each.
    */
-  _fetchFromURI(uri: string, callback: FetchCallback) {
-    request.get({uri, json: true, timeout: 8000}, (error, response, unvalidatedResult) => {
-      if (error != null) {
-        callback(error);
-        return;
-      }
-      if (response.statusCode !== 200) {
-        callback(new Error(
-          `Unexpected HTTP status code: ${response.statusCode}`,
-        ));
-        return;
-      }
-      const result = validateCachedResult(unvalidatedResult);
-      if (result == null) {
-        callback(new Error('Invalid result returned by server.'));
-        return;
-      }
-      callback(undefined, result);
-    });
+  async _fetchFromURI(uri: string): Promise<CachedResult> {
+    const response = await fetch(uri, {method: 'GET', timeout: 8000});
+    if (response.status !== 200) {
+      throw new Error(`Unexpected HTTP status: ${response.status} ${response.statusText} `);
+    }
+    const unvalidatedResult = await response.json();
+    const result = validateCachedResult(unvalidatedResult);
+    if (result == null) {
+      throw new Error('Server returned invalid result.');
+    }
+    return result;
   }
 
   /**
@@ -262,31 +248,27 @@ class GlobalTransformCache {
    * of errors. This is because the global cache is not critical to the normal
    * packager operation.
    */
-  _tryFetchingFromURI(uri: string, callback: FetchCallback) {
-    this._fetchFromURI(uri, (error, result) => {
-      if (error != null) {
-        this._processError(error);
-      }
-      callback(undefined, result);
-    });
+  async _tryFetchingFromURI(uri: string): Promise<?CachedResult> {
+    try {
+      return await this._fetchFromURI(uri);
+    } catch (error) {
+      this._processError(error);
+    }
   }
 
-  fetch(props: FetchProps, callback: FetchCallback) {
+  /**
+   * This may return `null` if either the cache doesn't have a value for that
+   * key yet, or an error happened, processed separately.
+   */
+  async fetch(props: FetchProps): Promise<?CachedResult> {
     if (this._retries <= 0 || !this._profileSet.has(props.transformOptions)) {
-      process.nextTick(callback);
-      return;
+      return null;
+    }
+    const uri = await this._fetcher.fetch(GlobalTransformCache.keyOf(props));
+    if (uri == null) {
+      return null;
     }
-    this._fetcher.fetch(GlobalTransformCache.keyOf(props), (error, uri) => {
-      if (error != null) {
-        callback(error);
-      } else {
-        if (uri == null) {
-          callback();
-          return;
-        }
-        this._tryFetchingFromURI(uri, callback);
-      }
-    });
+    return await this._tryFetchingFromURI(uri);
   }
 
   store(props: FetchProps, result: CachedResult) {
diff --git a/packager/src/node-haste/Module.js b/packager/src/node-haste/Module.js
index 6f05271016d714..0f1892ca56a231 100644
--- a/packager/src/node-haste/Module.js
+++ b/packager/src/node-haste/Module.js
@@ -307,17 +307,16 @@ class Module {
       this._transformCodeForCallback(cacheProps, callback);
       return;
     }
-    _globalCache.fetch(cacheProps, (globalCacheError, globalCachedResult) => {
-      if (globalCacheError) {
-        callback(globalCacheError);
-        return;
-      }
-      if (globalCachedResult == null) {
-        this._transformAndStoreCodeGlobally(cacheProps, _globalCache, callback);
-        return;
-      }
-      callback(undefined, globalCachedResult);
-    });
+    _globalCache.fetch(cacheProps).then(
+      globalCachedResult => process.nextTick(() => {
+        if (globalCachedResult == null) {
+          this._transformAndStoreCodeGlobally(cacheProps, _globalCache, callback);
+          return;
+        }
+        callback(undefined, globalCachedResult);
+      }),
+      globalCacheError => process.nextTick(() => callback(globalCacheError)),
+    );
   }
 
   _getAndCacheTransformedCode(

From b8cc75c613b4e7e5919128707e97aa0d19bb957d Mon Sep 17 00:00:00 2001
From: Jakub Woyke <jaqb@fb.com>
Date: Thu, 16 Mar 2017 12:24:11 -0700
Subject: [PATCH 054/366] Don't call libc malloc and free directly from
 assembly

Reviewed By: strager, javache

Differential Revision: D4484300

fbshipit-source-id: 97b9c2e9525f38c9158cfb499ba93d1af7d84b69
---
 React/Profiler/RCTProfile.m                  | 14 +++++++++++++
 React/Profiler/RCTProfileTrampoline-arm.S    | 21 ++------------------
 React/Profiler/RCTProfileTrampoline-arm64.S  |  4 ++--
 React/Profiler/RCTProfileTrampoline-i386.S   |  4 ++--
 React/Profiler/RCTProfileTrampoline-x86_64.S |  4 ++--
 5 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/React/Profiler/RCTProfile.m b/React/Profiler/RCTProfile.m
index b51a9bcc2bbd65..d2b0f479d136a7 100644
--- a/React/Profiler/RCTProfile.m
+++ b/React/Profiler/RCTProfile.m
@@ -153,6 +153,20 @@ static dispatch_group_t RCTProfileGetUnhookGroup(void)
   return unhookGroup;
 }
 
+// Used by RCTProfileTrampoline assembly file to call libc`malloc
+RCT_EXTERN void *RCTProfileMalloc(size_t size);
+void *RCTProfileMalloc(size_t size)
+{
+  return malloc(size);
+}
+
+// Used by RCTProfileTrampoline assembly file to call libc`free
+RCT_EXTERN void RCTProfileFree(void *buf);
+void RCTProfileFree(void *buf)
+{
+  free(buf);
+}
+
 RCT_EXTERN IMP RCTProfileGetImplementation(id obj, SEL cmd);
 IMP RCTProfileGetImplementation(id obj, SEL cmd)
 {
diff --git a/React/Profiler/RCTProfileTrampoline-arm.S b/React/Profiler/RCTProfileTrampoline-arm.S
index 99ac6498b2748a..aa622bbd0d7c6b 100644
--- a/React/Profiler/RCTProfileTrampoline-arm.S
+++ b/React/Profiler/RCTProfileTrampoline-arm.S
@@ -35,12 +35,7 @@ SYMBOL_NAME(RCTProfileTrampoline):
    * profile
    */
   mov r0, #0xc
-  movw	ip, :lower16:(L_malloc-(LPC1_0+4))
-  movt	ip, :upper16:(L_malloc-(LPC1_0+4))
-LPC1_0:
-  add ip, pc
-  ldr ip, [ip]
-  blx ip
+  bl SYMBOL_NAME(RCTProfileMalloc)
   /**
    * r4 is the callee saved register we'll use to refer to the allocated memory,
    * store its initial value, so we can restore it later
@@ -92,12 +87,7 @@ LPC1_0:
   ldr r1, [r4, #0x8]
   ldr r4, [r4]
   push {r1} // save the caller on the stack
-  movw	ip, :lower16:(L_free-(LPC1_1+4))
-  movt	ip, :upper16:(L_free-(LPC1_1+4))
-LPC1_1:
-  add ip, pc
-  ldr ip, [ip]
-  blx ip
+  bl SYMBOL_NAME(RCTProfileFree)
 
   pop {lr} // pop the caller
   pop {r0} // pop the return value
@@ -105,11 +95,4 @@ LPC1_1:
 
   trap
 
-  .data
-  .p2align 2
-L_malloc:
-  .long SYMBOL_NAME(malloc)
-L_free:
-  .long SYMBOL_NAME(free)
-
 #endif
diff --git a/React/Profiler/RCTProfileTrampoline-arm64.S b/React/Profiler/RCTProfileTrampoline-arm64.S
index 30ce4a04828662..e513696870551e 100644
--- a/React/Profiler/RCTProfileTrampoline-arm64.S
+++ b/React/Profiler/RCTProfileTrampoline-arm64.S
@@ -48,7 +48,7 @@ SYMBOL_NAME(RCTProfileTrampoline):
    * the implementation and the caller address.
    */
   mov x0, #0x10
-  bl SYMBOL_NAME(malloc)
+  bl SYMBOL_NAME(RCTProfileMalloc)
   // store the initial value of r19, the callee saved register we'll use
   str x19, [x0]
   mov x19, x0
@@ -111,7 +111,7 @@ SYMBOL_NAME(RCTProfileTrampoline):
   ldr x10, [x19, #0x8] //  load the caller address
   ldr x19, [x19] // restore x19
   str x10, [sp, #0x18] // store x10 on the stack space allocated above
-  bl SYMBOL_NAME(free)
+  bl SYMBOL_NAME(RCTProfileFree)
 
   // Load both return values and link register from the stack
   ldr q0, [sp, #0x0]
diff --git a/React/Profiler/RCTProfileTrampoline-i386.S b/React/Profiler/RCTProfileTrampoline-i386.S
index 7faba7742656d1..d1adf1a0898ecd 100644
--- a/React/Profiler/RCTProfileTrampoline-i386.S
+++ b/React/Profiler/RCTProfileTrampoline-i386.S
@@ -30,7 +30,7 @@ SYMBOL_NAME(RCTProfileTrampoline):
    */
   subl $0x8, %esp // stack padding (16-byte alignment for function calls)
   pushl $0xc // allocate 12-bytes
-  calll SYMBOL_NAME(malloc)
+  calll SYMBOL_NAME(RCTProfileMalloc)
   addl $0xc, %esp // restore stack (8-byte padding + 4-byte argument)
 
   /**
@@ -85,7 +85,7 @@ SYMBOL_NAME(RCTProfileTrampoline):
    * the stack has already been padded and the first and only argument, the
    * memory address, is already in the bottom of the stack.
    */
-  calll SYMBOL_NAME(free)
+  calll SYMBOL_NAME(RCTProfileFree)
   addl $0x8, %esp
 
   /**
diff --git a/React/Profiler/RCTProfileTrampoline-x86_64.S b/React/Profiler/RCTProfileTrampoline-x86_64.S
index 0325fb0f5496fe..21072d84241906 100644
--- a/React/Profiler/RCTProfileTrampoline-x86_64.S
+++ b/React/Profiler/RCTProfileTrampoline-x86_64.S
@@ -90,7 +90,7 @@ SYMBOL_NAME(RCTProfileTrampoline):
 
   // allocate 16 bytes
   movq $0x10, %rdi
-  callq SYMBOL_NAME_PIC(malloc)
+  callq SYMBOL_NAME_PIC(RCTProfileMalloc)
 
   // store the initial value of calle saved registers %r13 and %r14
   movq %r13, 0x0(%rax)
@@ -169,7 +169,7 @@ SYMBOL_NAME(RCTProfileTrampoline):
   andq $-0x10, %rsp
 
   // Free the memory allocated to stash callee saved registers
-  callq SYMBOL_NAME_PIC(free)
+  callq SYMBOL_NAME_PIC(RCTProfileFree)
 
   // unalign  stack and restore %r12
   movq %r12, %rsp

From 3bb95124845873d593903579e1e6e01e7e6525f2 Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Thu, 16 Mar 2017 13:47:25 -0700
Subject: [PATCH 055/366] packager: FBGlobalTransformCache: move the
 retry/error logic

Reviewed By: davidaurelio

Differential Revision: D4713585

fbshipit-source-id: 6a83f858692b8a1f6326051f3a3f4a3a549e4027
---
 packager/src/lib/GlobalTransformCache.js | 97 ++++++++++--------------
 1 file changed, 39 insertions(+), 58 deletions(-)

diff --git a/packager/src/lib/GlobalTransformCache.js b/packager/src/lib/GlobalTransformCache.js
index 002960df315be5..b74a1981cc2330 100644
--- a/packager/src/lib/GlobalTransformCache.js
+++ b/packager/src/lib/GlobalTransformCache.js
@@ -12,6 +12,7 @@
 'use strict';
 
 const BatchProcessor = require('./BatchProcessor');
+const FetchError = require('node-fetch/lib/fetch-error');
 
 const crypto = require('crypto');
 const fetch = require('node-fetch');
@@ -21,9 +22,9 @@ const path = require('path');
 
 import type {Options as TransformOptions} from '../JSTransformer/worker/worker';
 import type {CachedResult, GetTransformCacheKey} from './TransformCache';
-import type {Reporter} from './reporting';
 
 type FetchResultURIs = (keys: Array<string>) => Promise<Map<string, string>>;
+type FetchResultFromURI = (uri: string) => Promise<?CachedResult>;
 type StoreResults = (resultsByKey: Map<string, CachedResult>) => Promise<void>;
 
 type FetchProps = {
@@ -43,7 +44,6 @@ class KeyURIFetcher {
 
   _batchProcessor: BatchProcessor<string, ?URI>;
   _fetchResultURIs: FetchResultURIs;
-  _processError: (error: Error) => mixed;
 
   /**
    * When a batch request fails for some reason, we process the error locally
@@ -51,13 +51,7 @@ class KeyURIFetcher {
    * a build will not fail just because of the cache.
    */
   async _processKeys(keys: Array<string>): Promise<Array<?URI>> {
-    let URIsByKey;
-    try {
-      URIsByKey = await this._fetchResultURIs(keys);
-    } catch (error) {
-      this._processError(error);
-      return new Array(keys.length);
-    }
+    const URIsByKey = await this._fetchResultURIs(keys);
     return keys.map(key => URIsByKey.get(key));
   }
 
@@ -65,14 +59,13 @@ class KeyURIFetcher {
     return await this._batchProcessor.queue(key);
   }
 
-  constructor(fetchResultURIs: FetchResultURIs, processError: (error: Error) => mixed) {
+  constructor(fetchResultURIs: FetchResultURIs) {
     this._fetchResultURIs = fetchResultURIs;
     this._batchProcessor = new BatchProcessor({
       maximumDelayMs: 10,
       maximumItems: 500,
       concurrency: 25,
     }, this._processKeys.bind(this));
-    this._processError = processError;
   }
 
 }
@@ -105,21 +98,6 @@ class KeyResultStore {
 
 }
 
-function validateCachedResult(cachedResult: mixed): ?CachedResult {
-  if (
-    cachedResult != null &&
-    typeof cachedResult === 'object' &&
-    typeof cachedResult.code === 'string' &&
-    Array.isArray(cachedResult.dependencies) &&
-    cachedResult.dependencies.every(dep => typeof dep === 'string') &&
-    Array.isArray(cachedResult.dependencyOffsets) &&
-    cachedResult.dependencyOffsets.every(offset => typeof offset === 'number')
-  ) {
-    return (cachedResult: any);
-  }
-  return undefined;
-}
-
 /**
  * The transform options contain absolute paths. This can contain, for
  * example, the username if someone works their home directory (very likely).
@@ -167,12 +145,30 @@ class TransformProfileSet {
   }
 }
 
+/**
+ * For some reason the result stored by the server for a key might mismatch what
+ * we expect a result to be. So we need to verify carefully the data.
+ */
+function validateCachedResult(cachedResult: mixed): ?CachedResult {
+  if (
+    cachedResult != null &&
+    typeof cachedResult === 'object' &&
+    typeof cachedResult.code === 'string' &&
+    Array.isArray(cachedResult.dependencies) &&
+    cachedResult.dependencies.every(dep => typeof dep === 'string') &&
+    Array.isArray(cachedResult.dependencyOffsets) &&
+    cachedResult.dependencyOffsets.every(offset => typeof offset === 'number')
+  ) {
+    return (cachedResult: any);
+  }
+  return null;
+}
+
 class GlobalTransformCache {
 
   _fetcher: KeyURIFetcher;
+  _fetchResultFromURI: FetchResultFromURI;
   _profileSet: TransformProfileSet;
-  _reporter: Reporter;
-  _retries: number;
   _store: ?KeyResultStore;
 
   /**
@@ -185,14 +181,13 @@ class GlobalTransformCache {
    */
   constructor(
     fetchResultURIs: FetchResultURIs,
+    fetchResultFromURI: FetchResultFromURI,
     storeResults: ?StoreResults,
     profiles: Iterable<TransformProfile>,
-    reporter: Reporter,
   ) {
-    this._fetcher = new KeyURIFetcher(fetchResultURIs, this._processError.bind(this));
+    this._fetcher = new KeyURIFetcher(fetchResultURIs);
     this._profileSet = new TransformProfileSet(profiles);
-    this._reporter = reporter;
-    this._retries = 4;
+    this._fetchResultFromURI = fetchResultFromURI;
     if (storeResults != null) {
       this._store = new KeyResultStore(storeResults);
     }
@@ -211,26 +206,12 @@ class GlobalTransformCache {
     return `${digest}-${path.basename(props.filePath)}`;
   }
 
-  /**
-   * If too many errors already happened, we just drop the additional errors.
-   */
-  _processError(error: Error) {
-    if (this._retries <= 0) {
-      return;
-    }
-    this._reporter.update({type: 'global_cache_error', error});
-    --this._retries;
-    if (this._retries <= 0) {
-      this._reporter.update({type: 'global_cache_disabled', reason: 'too_many_errors'});
-    }
-  }
-
   /**
    * We may want to improve that logic to return a stream instead of the whole
    * blob of transformed results. However the results are generally only a few
    * megabytes each.
    */
-  async _fetchFromURI(uri: string): Promise<CachedResult> {
+  static async _fetchResultFromURI(uri: string): Promise<CachedResult> {
     const response = await fetch(uri, {method: 'GET', timeout: 8000});
     if (response.status !== 200) {
       throw new Error(`Unexpected HTTP status: ${response.status} ${response.statusText} `);
@@ -244,16 +225,16 @@ class GlobalTransformCache {
   }
 
   /**
-   * Wrap `_fetchFromURI` with error logging, and return an empty result instead
-   * of errors. This is because the global cache is not critical to the normal
-   * packager operation.
+   * It happens from time to time that a fetch timeouts, we want to try these
+   * again a second time.
    */
-  async _tryFetchingFromURI(uri: string): Promise<?CachedResult> {
-    try {
-      return await this._fetchFromURI(uri);
-    } catch (error) {
-      this._processError(error);
-    }
+  static fetchResultFromURI(uri: string): Promise<CachedResult> {
+    return GlobalTransformCache._fetchResultFromURI(uri).catch(error => {
+      if (!(error instanceof FetchError && error.type === 'request-timeout')) {
+        throw error;
+      }
+      return this._fetchResultFromURI(uri);
+    });
   }
 
   /**
@@ -261,14 +242,14 @@ class GlobalTransformCache {
    * key yet, or an error happened, processed separately.
    */
   async fetch(props: FetchProps): Promise<?CachedResult> {
-    if (this._retries <= 0 || !this._profileSet.has(props.transformOptions)) {
+    if (!this._profileSet.has(props.transformOptions)) {
       return null;
     }
     const uri = await this._fetcher.fetch(GlobalTransformCache.keyOf(props));
     if (uri == null) {
       return null;
     }
-    return await this._tryFetchingFromURI(uri);
+    return await this._fetchResultFromURI(uri);
   }
 
   store(props: FetchProps, result: CachedResult) {

From a1694ba86b03a06979c6c5623332341fc354aceb Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Thu, 16 Mar 2017 13:49:51 -0700
Subject: [PATCH 056/366] packager: DependencyGraph-test: add broken use case

Summary:
This changeset adds a test that verifies that the duplicate modules use case is broken. The goal is to acknowledge the problem for now, and when we update `jest-haste`, we'll simply fix what needs to be fixed in that test.

See also, https://github.com/facebook/jest/pull/3107

Reviewed By: davidaurelio

Differential Revision: D4673431

fbshipit-source-id: 05e09bdf61a2eddf2e9d1e32a33d32065c9051f1
---
 .../__tests__/DependencyGraph-test.js         | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/packager/src/node-haste/__tests__/DependencyGraph-test.js b/packager/src/node-haste/__tests__/DependencyGraph-test.js
index 4a60d0b55c450c..f55ee0a9137123 100644
--- a/packager/src/node-haste/__tests__/DependencyGraph-test.js
+++ b/packager/src/node-haste/__tests__/DependencyGraph-test.js
@@ -5181,6 +5181,69 @@ describe('DependencyGraph', function() {
         expect(deps).toBeDefined();
       });
     });
+
+    it('should recover from multiple modules with the same name (but this is broken right now)', async () => {
+      const root = '/root';
+      console.warn = jest.fn();
+      const filesystem = setMockFileSystem({
+        'root': {
+          'index.js': [
+            '/**',
+            ' * @providesModule index',
+            ' */',
+            'require(\'a\')',
+            'require(\'b\')',
+          ].join('\n'),
+          'a.js': [
+            '/**',
+            ' * @providesModule a',
+            ' */',
+          ].join('\n'),
+          'b.js': [
+            '/**',
+            ' * @providesModule b',
+            ' */',
+          ].join('\n'),
+        },
+      });
+
+      const dgraph = DependencyGraph.load({...defaults, roots: [root]});
+      await getOrderedDependenciesAsJSON(dgraph, root + '/index.js');
+      filesystem.root['b.js'] = [
+        '/**',
+        ' * @providesModule a',
+        ' */',
+      ].join('\n');
+      await triggerAndProcessWatchEvent(dgraph, 'change', root + '/b.js');
+      try {
+        await getOrderedDependenciesAsJSON(dgraph, root + '/index.js');
+        throw new Error('expected `getOrderedDependenciesAsJSON` to fail');
+      } catch (error) {
+        if (error.type !== 'UnableToResolveError') {
+          throw error;
+        }
+        expect(console.warn).toBeCalled();
+        filesystem.root['b.js'] = [
+          '/**',
+          ' * @providesModule b',
+          ' */',
+        ].join('\n');
+        await triggerAndProcessWatchEvent(dgraph, 'change', root + '/b.js');
+      }
+
+      // This verifies that it is broken right now. Instead of throwing it should
+      // return correct results. Once this is fixed in `jest-haste`, remove
+      // the whole try catch and verify results are matching a snapshot.
+      try {
+        await getOrderedDependenciesAsJSON(dgraph, root + '/index.js');
+        throw new Error('expected `getOrderedDependenciesAsJSON` to fail');
+      } catch (error) {
+        if (error.type !== 'UnableToResolveError') {
+          throw error;
+        }
+      }
+    });
+
   });
 
   describe('Extensions', () => {

From 9d3292069d105aa097c265166c0256c6b6bea159 Mon Sep 17 00:00:00 2001
From: mlanter <matt@opendoor.com>
Date: Thu, 16 Mar 2017 14:44:23 -0700
Subject: [PATCH 057/366] Add support for animating nested styles

Summary:
This adds the ability to nest animated styles and is a follow up to #11030 .

**Test plan (required)**
Verify a component with a shadowOffset animation animates.

Example:
```
<Animated.View
  style={{
    shadowOffset: {
      width: 0,
      height: this._pressAnim.interpolate({
        inputRange: [0, 1],
        outputRange: [20, 5],
      }),
    },
  }},
/>

```

![example](https://cloud.githubusercontent.com/assets/19673711/23878825/e29f6ae4-0806-11e7-8650-9cff1f591204.gif)
Closes https://github.com/facebook/react-native/pull/12909

Differential Revision: D4723933

fbshipit-source-id: 751d7ceb4f9bb22283fb14a5e597730ffd1d9ff6
---
 .../Animated/src/AnimatedImplementation.js    | 42 +++++++++++++------
 .../Animated/src/__tests__/Animated-test.js   | 14 ++++++-
 2 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/Libraries/Animated/src/AnimatedImplementation.js b/Libraries/Animated/src/AnimatedImplementation.js
index 1c06b9a6e4ab13..769b3b0164a64e 100644
--- a/Libraries/Animated/src/AnimatedImplementation.js
+++ b/Libraries/Animated/src/AnimatedImplementation.js
@@ -1508,32 +1508,48 @@ class AnimatedStyle extends AnimatedWithChildren {
     this._style = style;
   }
 
-  __getValue(): Object {
-    var style = {};
-    for (var key in this._style) {
-      var value = this._style[key];
+  // Recursively get values for nested styles (like iOS's shadowOffset)
+  __walkStyleAndGetValues(style) {
+    let updatedStyle = {};
+    for (let key in style) {
+      let value = style[key];
       if (value instanceof Animated) {
         if (!value.__isNative) {
           // We cannot use value of natively driven nodes this way as the value we have access from
           // JS may not be up to date.
-          style[key] = value.__getValue();
+          updatedStyle[key] = value.__getValue();
         }
+      } else if (value && !Array.isArray(value) && typeof value === 'object') {
+        // Support animating nested values (for example: shadowOffset.height)
+        updatedStyle[key] = this.__walkStyleAndGetValues(value);
       } else {
-        style[key] = value;
+        updatedStyle[key] = value;
       }
     }
-    return style;
+    return updatedStyle;
   }
 
-  __getAnimatedValue(): Object {
-    var style = {};
-    for (var key in this._style) {
-      var value = this._style[key];
+  __getValue(): Object {
+    return this.__walkStyleAndGetValues(this._style);
+  }
+
+  // Recursively get animated values for nested styles (like iOS's shadowOffset)
+  __walkStyleAndGetAnimatedValues(style) {
+    let updatedStyle = {};
+    for (let key in style) {
+      let value = style[key];
       if (value instanceof Animated) {
-        style[key] = value.__getAnimatedValue();
+        updatedStyle[key] = value.__getAnimatedValue();
+      } else if (value && !Array.isArray(value) && typeof value === 'object') {
+        // Support animating nested values (for example: shadowOffset.height)
+        updatedStyle[key] = this.__walkStyleAndGetAnimatedValues(value);
       }
     }
-    return style;
+    return updatedStyle;
+  }
+
+  __getAnimatedValue(): Object {
+    return this.__walkStyleAndGetAnimatedValues(this._style);
   }
 
   __attach(): void {
diff --git a/Libraries/Animated/src/__tests__/Animated-test.js b/Libraries/Animated/src/__tests__/Animated-test.js
index c89d2979995a21..c081f1e9b7a67a 100644
--- a/Libraries/Animated/src/__tests__/Animated-test.js
+++ b/Libraries/Animated/src/__tests__/Animated-test.js
@@ -33,7 +33,11 @@ describe('Animated tests', () => {
               outputRange: [100, 200],
             })},
             {scale: anim},
-          ]
+          ],
+          shadowOffset: {
+            width: anim,
+            height: anim,
+          },
         }
       }, callback);
 
@@ -47,6 +51,10 @@ describe('Animated tests', () => {
             {translateX: 100},
             {scale: 0},
           ],
+          shadowOffset: {
+            width: 0,
+            height: 0,
+          },
         },
       });
 
@@ -62,6 +70,10 @@ describe('Animated tests', () => {
             {translateX: 150},
             {scale: 0.5},
           ],
+          shadowOffset: {
+            width: 0.5,
+            height: 0.5,
+          },
         },
       });
 

From 3637bce4790fd6c05ad81fe330dad6dc51c1d531 Mon Sep 17 00:00:00 2001
From: Andy Street <andrews@fb.com>
Date: Thu, 16 Mar 2017 15:13:53 -0700
Subject: [PATCH 058/366] Warn when timers longer than 1 min are set pending
 AlarmManager support

Summary:
These are bad since the app might not be foregrounded anymore and it also keeps the timing module awake. We could fix the latter but the former would require someone adding AlarmManager support.

Open to better/more helpful ideas for the warning message but there's not a ton we can tell them to do right now.

Reviewed By: achen1

Differential Revision: D4716273

fbshipit-source-id: c5d3a3ce8af53253b240477f2bde38094a138a02
---
 Libraries/Core/Timers/JSTimers.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/Libraries/Core/Timers/JSTimers.js b/Libraries/Core/Timers/JSTimers.js
index 842b47ba5455fc..967552c29ec833 100644
--- a/Libraries/Core/Timers/JSTimers.js
+++ b/Libraries/Core/Timers/JSTimers.js
@@ -15,6 +15,7 @@
 // in dependencies. NativeModules > BatchedBridge > MessageQueue > JSTimersExecution
 const RCTTiming = require('NativeModules').Timing;
 const JSTimersExecution = require('JSTimersExecution');
+const Platform = require('Platform');
 
 const parseErrorStack = require('parseErrorStack');
 
@@ -64,6 +65,14 @@ function _freeCallback(timerID: number) {
   }
 }
 
+const MAX_TIMER_DURATION_MS = 60 * 1000;
+const IS_ANDROID = Platform.OS === 'android';
+const ANDROID_LONG_TIMER_MESSAGE = 
+  'Setting a timer for a long period of time, i.e. multiple minutes, is a ' +
+  'performance and correctness issue on Android as it keeps the timer ' +
+  'module awake, and timers can only be called when the app is in the foreground. ' +
+  'See https://github.com/facebook/react-native/issues/12981 for more info.';
+
 /**
  * JS implementation of timer functions. Must be completely driven by an
  * external clock signal, all that's stored here is timerID, timer type, and
@@ -75,6 +84,11 @@ const JSTimers = {
    * @param {number} duration Number of milliseconds.
    */
   setTimeout: function(func: Function, duration: number, ...args?: any): number {
+    if (IS_ANDROID && duration > MAX_TIMER_DURATION_MS) {
+      console.warn(
+          ANDROID_LONG_TIMER_MESSAGE + '\n' + '(Saw setTimeout with duration ' +
+          duration + 'ms)');
+    }
     const id = _allocateCallback(() => func.apply(undefined, args), 'setTimeout');
     RCTTiming.createTimer(id, duration || 0, Date.now(), /* recurring */ false);
     return id;
@@ -85,6 +99,11 @@ const JSTimers = {
    * @param {number} duration Number of milliseconds.
    */
   setInterval: function(func: Function, duration: number, ...args?: any): number {
+    if (IS_ANDROID && duration > MAX_TIMER_DURATION_MS) {
+      console.warn(
+          ANDROID_LONG_TIMER_MESSAGE + '\n' + '(Saw setInterval with duration ' +
+          duration + 'ms)');
+    }
     const id = _allocateCallback(() => func.apply(undefined, args), 'setInterval');
     RCTTiming.createTimer(id, duration || 0, Date.now(), /* recurring */ true);
     return id;

From e1f493ebd2c6a8d44673648eeefe19c382789280 Mon Sep 17 00:00:00 2001
From: Martin Konicek <mkonicek@fb.com>
Date: Thu, 16 Mar 2017 15:18:20 -0700
Subject: [PATCH 059/366] Add a flag to support a simplified iOS test - just
 compile, don't run packager and tests

Reviewed By: gfosco

Differential Revision: D4690887

fbshipit-source-id: e6299c9146e1ac97a0606f538e9d10539f147a67
---
 .travis.yml               |  2 +-
 docs/Testing.md           |  2 +-
 scripts/objc-test-ios.sh  | 17 +++++++++++++++++
 scripts/objc-test-tvos.sh |  5 ++---
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5f0caaabc938ee..0cbf424aacd8f7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ install:
   - $yarn install
 
 script:
-  - if [[ "$TEST_TYPE" = objc-ios ]]; then travis_retry travis_wait ./scripts/objc-test-ios.sh; fi
+  - if [[ "$TEST_TYPE" = objc-ios ]]; then travis_retry travis_wait ./scripts/objc-test-ios.sh test; fi
   - if [[ "$TEST_TYPE" = objc-tvos ]]; then travis_retry travis_wait ./scripts/objc-test-tvos.sh; fi
   - if [[ "$TEST_TYPE" = e2e-objc ]]; then node ./scripts/run-ci-e2e-tests.js --ios --js --retries 3; fi
   - if [[ ( "$TEST_TYPE" = podspecs ) && ( "$TRAVIS_PULL_REQUEST" = "false" ) ]]; then gem install cocoapods && ./scripts/process-podspecs.sh; fi
diff --git a/docs/Testing.md b/docs/Testing.md
index ace4db3efc4958..eb7121788fdc80 100644
--- a/docs/Testing.md
+++ b/docs/Testing.md
@@ -97,7 +97,7 @@ See the following for example usage and integration points:
 You can run integration tests locally with cmd+U in the IntegrationTest and UIExplorer apps in Xcode, or by running the following in the command line on macOS:
 
     $ cd react-native
-    $ ./scripts/objc-test-ios.sh
+    $ ./scripts/objc-test-ios.sh test
 
 > Your Xcode install will come with a variety of Simulators running the latest OS. You may need to manually create a new Simulator to match what the `XCODE_DESTINATION` param in the test script.
 
diff --git a/scripts/objc-test-ios.sh b/scripts/objc-test-ios.sh
index a85caa073af04f..3f909f7a23a0c4 100755
--- a/scripts/objc-test-ios.sh
+++ b/scripts/objc-test-ios.sh
@@ -26,6 +26,12 @@ function cleanup {
 }
 trap cleanup INT TERM EXIT
 
+# If first argument is "test", actually start the packager and run tests.
+# Otherwise, just build UIExplorer for tvOS and exit
+
+if [ "$1" = "test" ];
+then
+
 # Start the packager
 (exec "./packager/launchPackager.command" || echo "Can't start packager automatically") &
 (exec "./IntegrationTests/launchWebSocketServer.command" || echo "Can't start web socket server automatically") &
@@ -60,6 +66,7 @@ rm temp.bundle
 curl 'http://localhost:8081/IntegrationTests/RCTRootViewIntegrationTestApp.bundle?platform=ios&dev=true' -o temp.bundle
 rm temp.bundle
 
+# Build and test for iOS
 # TODO: We use xcodebuild because xctool would stall when collecting info about
 # the tests before running them. Switch back when this issue with xctool has
 # been resolved.
@@ -70,3 +77,13 @@ xcodebuild \
   -destination "platform=iOS Simulator,name=iPhone 5s,OS=10.1" \
   build test
 
+else
+
+# Only build for iOS (check there are no missing files in the Xcode project)
+xcodebuild \
+  -project "Examples/UIExplorer/UIExplorer.xcodeproj" \
+  -scheme "UIExplorer" \
+  -sdk "iphonesimulator" \
+  build
+
+fi
diff --git a/scripts/objc-test-tvos.sh b/scripts/objc-test-tvos.sh
index 2266a5ba6fb40f..943d510914eece 100755
--- a/scripts/objc-test-tvos.sh
+++ b/scripts/objc-test-tvos.sh
@@ -23,7 +23,7 @@ function cleanup {
 }
 trap cleanup EXIT
 
-# If first argument is "test", actually start the packager and run tests as in the iOS script
+# If first argument is "test", actually start the packager and run tests.
 # Otherwise, just build UIExplorer for tvOS and exit
 
 if [ "$1" = "test" ];
@@ -57,12 +57,11 @@ xcodebuild \
 
 else
 
-# Build only (no test) for tvOS, to make sure there are no missing files
+# Only build for tvOS (check there are no missing files in the Xcode project)
 xcodebuild \
   -project "Examples/UIExplorer/UIExplorer.xcodeproj" \
   -scheme "UIExplorer-tvOS" \
   -sdk "appletvsimulator" \
-  -destination "platform=tvOS Simulator,name=Apple TV 1080p,OS=10.1" \
   build
 
 fi 

From 7e4c93d65ade762b401f64fa4017680a24a3415b Mon Sep 17 00:00:00 2001
From: Spencer Ahrens <sahrens@fb.com>
Date: Thu, 16 Mar 2017 15:49:54 -0700
Subject: [PATCH 060/366] Fix doubled ItemSeparators

Summary: Forgot to update these after rename...

Reviewed By: yungsters

Differential Revision: D4723788

fbshipit-source-id: 8cf7e8de57a23d9ee0a424aa9c0d62ab1cfbbb12
---
 Libraries/CustomComponents/Lists/VirtualizedSectionList.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Libraries/CustomComponents/Lists/VirtualizedSectionList.js b/Libraries/CustomComponents/Lists/VirtualizedSectionList.js
index 317891c4d3ebc2..cd4312e96f4a11 100644
--- a/Libraries/CustomComponents/Lists/VirtualizedSectionList.js
+++ b/Libraries/CustomComponents/Lists/VirtualizedSectionList.js
@@ -267,10 +267,8 @@ class VirtualizedSectionList<SectionT: SectionBase>
     return {
       childProps: {
         ...props,
-        FooterComponent: this.props.ListFooterComponent,
-        HeaderComponent: this.props.ListHeaderComponent,
         renderItem: this._renderItem,
-        SeparatorComponent: undefined, // Rendered with renderItem
+        ItemSeparatorComponent: undefined, // Rendered with renderItem
         data: props.sections,
         getItemCount: () => itemCount,
         getItem,

From 55f48eb9f6916a866df73d15f6c225c3b35d9273 Mon Sep 17 00:00:00 2001
From: Mehdi Mulani <mehdi@fb.com>
Date: Thu, 16 Mar 2017 15:59:10 -0700
Subject: [PATCH 061/366] Move RCTLinkingManager to the main thread

Reviewed By: shergin

Differential Revision: D4709352

fbshipit-source-id: 3fc86504b12fe64dd94dd7330073d1a4a4f272e2
---
 Libraries/LinkingIOS/RCTLinkingManager.m | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Libraries/LinkingIOS/RCTLinkingManager.m b/Libraries/LinkingIOS/RCTLinkingManager.m
index dd1ef0381072dc..d5eb10be1fc441 100644
--- a/Libraries/LinkingIOS/RCTLinkingManager.m
+++ b/Libraries/LinkingIOS/RCTLinkingManager.m
@@ -19,6 +19,11 @@ @implementation RCTLinkingManager
 
 RCT_EXPORT_MODULE()
 
+- (dispatch_queue_t)methodQueue
+{
+  return dispatch_get_main_queue();
+}
+
 - (void)startObserving
 {
   [[NSNotificationCenter defaultCenter] addObserver:self

From 63fa621df100df05fbdaf04e93304a7d1dc35f92 Mon Sep 17 00:00:00 2001
From: "Andrew Y. Chen" <ayc@fb.com>
Date: Thu, 16 Mar 2017 16:26:02 -0700
Subject: [PATCH 062/366] Fix FrescoModule not initialized in Nodes

Reviewed By: AaaChiuuu

Differential Revision: D4687127

fbshipit-source-id: d387ff665374bd4ef40fc2e9c19543f2bacf4a66
---
 ReactAndroid/src/main/java/com/facebook/react/flat/BUCK         | 1 +
 .../main/java/com/facebook/react/flat/FlatUIImplementation.java | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/BUCK b/ReactAndroid/src/main/java/com/facebook/react/flat/BUCK
index 0354f255e38d04..ed641a76eabe53 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/BUCK
@@ -19,6 +19,7 @@ android_library(
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_target("java/com/facebook/react/bridge:bridge"),
         react_native_target("java/com/facebook/react/common:common"),
+        react_native_target("java/com/facebook/react/modules/fresco:fresco"),
         react_native_target("java/com/facebook/react/modules/i18nmanager:i18nmanager"),
         react_native_target("java/com/facebook/react/touch:touch"),
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIImplementation.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIImplementation.java
index 755b43e645b9bb..add945cbb1f34b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIImplementation.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIImplementation.java
@@ -18,6 +18,7 @@
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.modules.fresco.FrescoModule;
 import com.facebook.react.modules.i18nmanager.I18nUtil;
 import com.facebook.react.uimanager.ReactShadowNode;
 import com.facebook.react.uimanager.ReactStylesDiffMap;
@@ -98,6 +99,7 @@ protected ReactShadowNode createRootShadowNode() {
       // initialization is undefined, and this is pretty much the earliest when we are guarantied
       // that Fresco is initalized and DraweeControllerBuilder can be queried. This also happens
       // relatively rarely to have any performance considerations.
+      mReactContext.getNativeModule(FrescoModule.class); // initialize Fresco
       DraweeRequestHelper.setDraweeControllerBuilder(
         mRCTImageViewManager.getDraweeControllerBuilder());
       mRCTImageViewManager = null;

From b1a63f00886ff4fbd557b391b83d38e81284f28f Mon Sep 17 00:00:00 2001
From: Spencer Ahrens <sahrens@fb.com>
Date: Thu, 16 Mar 2017 16:36:57 -0700
Subject: [PATCH 063/366] Fix minimumViewTime

Reviewed By: blairvanderhoof

Differential Revision: D4723575

fbshipit-source-id: a120eef4079a808bd3dead08df93989e1db3d96a
---
 Libraries/CustomComponents/Lists/ViewabilityHelper.js     | 8 ++++----
 .../Lists/__tests__/ViewabilityHelper-test.js             | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Libraries/CustomComponents/Lists/ViewabilityHelper.js b/Libraries/CustomComponents/Lists/ViewabilityHelper.js
index f3cc0e584b34d4..31ce384ba972aa 100644
--- a/Libraries/CustomComponents/Lists/ViewabilityHelper.js
+++ b/Libraries/CustomComponents/Lists/ViewabilityHelper.js
@@ -49,7 +49,7 @@ export type ViewabilityConfig = {|
 * layout.
 *
 * An item is said to be in a "viewable" state when any of the following
-* is true for longer than `minViewTime` milliseconds (after an interaction if `waitForInteraction`
+* is true for longer than `minimumViewTime` milliseconds (after an interaction if `waitForInteraction`
 * is true):
 *
 * - Occupying >= `viewAreaCoveragePercentThreshold` of the view area XOR fraction of the item
@@ -145,7 +145,7 @@ class ViewabilityHelper {
     renderRange?: {first: number, last: number}, // Optional optimization to reduce the scan size
   ): void {
     const updateTime = Date.now();
-    if (this._lastUpdateTime === 0 && getFrameMetrics(0)) {
+    if (this._lastUpdateTime === 0 && itemCount > 0 && getFrameMetrics(0)) {
       // Only count updates after the first item is rendered and has a frame.
       this._lastUpdateTime = updateTime;
     }
@@ -171,13 +171,13 @@ class ViewabilityHelper {
     }
     this._viewableIndices = viewableIndices;
     this._lastUpdateTime = updateTime;
-    if (this._config.minViewTime && updateElapsed < this._config.minViewTime) {
+    if (this._config.minimumViewTime && updateElapsed < this._config.minimumViewTime) {
       const handle = setTimeout(
         () => {
           this._timers.delete(handle);
           this._onUpdateSync(viewableIndices, onViewableItemsChanged, createViewToken);
         },
-        this._config.minViewTime,
+        this._config.minimumViewTime,
       );
       this._timers.add(handle);
     } else {
diff --git a/Libraries/CustomComponents/Lists/__tests__/ViewabilityHelper-test.js b/Libraries/CustomComponents/Lists/__tests__/ViewabilityHelper-test.js
index 199132ae8156bd..1d97105a7ad411 100644
--- a/Libraries/CustomComponents/Lists/__tests__/ViewabilityHelper-test.js
+++ b/Libraries/CustomComponents/Lists/__tests__/ViewabilityHelper-test.js
@@ -249,9 +249,9 @@ describe('onUpdate', function() {
   );
 
   it(
-    'minViewTime delays callback',
+    'minimumViewTime delays callback',
     function() {
-      const helper = new ViewabilityHelper({minViewTime: 350, viewAreaCoveragePercentThreshold: 0});
+      const helper = new ViewabilityHelper({minimumViewTime: 350, viewAreaCoveragePercentThreshold: 0});
       rowFrames = {
         a: {y: 0, height: 200},
         b: {y: 200, height: 200},
@@ -279,9 +279,9 @@ describe('onUpdate', function() {
   );
 
   it(
-    'minViewTime skips briefly visible items',
+    'minimumViewTime skips briefly visible items',
     function() {
-      const helper = new ViewabilityHelper({minViewTime: 350, viewAreaCoveragePercentThreshold: 0});
+      const helper = new ViewabilityHelper({minimumViewTime: 350, viewAreaCoveragePercentThreshold: 0});
       rowFrames = {
         a: {y: 0, height: 250},
         b: {y: 250, height: 200},

From 17cb70efdd1ed6378677e720a022c9d83ad87dd6 Mon Sep 17 00:00:00 2001
From: Sebastian Markbage <sema@fb.com>
Date: Thu, 16 Mar 2017 18:09:21 -0700
Subject: [PATCH 064/366] Apply numeric text event bubbling fix for Android

Reviewed By: bvaughn

Differential Revision: D4726029

fbshipit-source-id: 94c8025bb59cc0970b6cc8ce7f3caf6e867bf72b
---
 .../shared/shared/event/EventPluginHub.js          | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Libraries/Renderer/src/renderers/shared/shared/event/EventPluginHub.js b/Libraries/Renderer/src/renderers/shared/shared/event/EventPluginHub.js
index bba563c8c6d39d..bdd958571531f3 100644
--- a/Libraries/Renderer/src/renderers/shared/shared/event/EventPluginHub.js
+++ b/Libraries/Renderer/src/renderers/shared/shared/event/EventPluginHub.js
@@ -138,7 +138,10 @@ var EventPluginHub = {
         return null;
       }
     } else {
-      if (typeof inst._currentElement === 'string') {
+      const currentElement = inst._currentElement;
+      if (
+        typeof currentElement === 'string' || typeof currentElement === 'number'
+      ) {
         // Text node, let it bubble through.
         return null;
       }
@@ -146,12 +149,11 @@ var EventPluginHub = {
         // If the instance is already unmounted, we have no listeners.
         return null;
       }
-      const props = inst._currentElement.props;
-      if (!props) {
-        return null;
-      }
+      const props = currentElement.props;
       listener = props[registrationName];
-      if (shouldPreventMouseEvent(registrationName, inst._currentElement.type, props)) {
+      if (
+        shouldPreventMouseEvent(registrationName, currentElement.type, props)
+      ) {
         return null;
       }
     }

From 6620b1ff7db9e9cf906a2bcee3184a35c350f95b Mon Sep 17 00:00:00 2001
From: Brian Vaughn <bvaughn@fb.com>
Date: Thu, 16 Mar 2017 19:23:24 -0700
Subject: [PATCH 065/366] Added ReactNative feature-flag switch between Stack
 and Fiber builds

Reviewed By: sebmarkbage

Differential Revision: D4606164

fbshipit-source-id: 5f25dbc52298d359e11e52341ff3570c797a6ea9
---
 Libraries/Renderer/src/renderers/native/ReactNative.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Libraries/Renderer/src/renderers/native/ReactNative.js b/Libraries/Renderer/src/renderers/native/ReactNative.js
index 27c56d54ba9d56..527a53920b741a 100644
--- a/Libraries/Renderer/src/renderers/native/ReactNative.js
+++ b/Libraries/Renderer/src/renderers/native/ReactNative.js
@@ -11,5 +11,8 @@
  */
 'use strict';
 
-// TODO (bvaughn) Enable Fiber experiement via ReactNativeFeatureFlags
-module.exports = require('ReactNativeStack');
+const ReactNativeFeatureFlags = require('ReactNativeFeatureFlags');
+
+module.exports = ReactNativeFeatureFlags.useFiber
+  ? require('ReactNativeFiber')
+  : require('ReactNativeStack')

From fbf6d1aaeb69111f9188c0800dabdf1ee4292506 Mon Sep 17 00:00:00 2001
From: Adam Perry <adam.n.perry@gmail.com>
Date: Thu, 16 Mar 2017 19:56:32 -0700
Subject: [PATCH 066/366] Update CRNA blog post with youtube embed.

Summary:
Adds the lightning talk's YouTube video ID to the existing CRNA blog post.

cc hramos
Closes https://github.com/facebook/react-native/pull/12987

Differential Revision: D4727390

Pulled By: ericvicenti

fbshipit-source-id: 86412679f1c476b416d4bfe41e21c255100188df
---
 blog/2017-03-13-introducing-create-react-native-app.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/blog/2017-03-13-introducing-create-react-native-app.md b/blog/2017-03-13-introducing-create-react-native-app.md
index 4ff6714e8d05a6..6aa49895ee3c13 100644
--- a/blog/2017-03-13-introducing-create-react-native-app.md
+++ b/blog/2017-03-13-introducing-create-react-native-app.md
@@ -6,6 +6,7 @@ authorURL: https://github.com/dikaiosune
 authorImage: https://avatars2.githubusercontent.com/u/6812281
 authorTwitter: dika10sune
 category: engineering
+youtubeVideoId: 9baaVjGdBqs
 ---
 
 Today we’re announcing [Create React Native App](https://github.com/react-community/create-react-native-app): a new tool that makes it significantly easier to get started with a React Native project! It’s heavily inspired by the design of [Create React App](https://github.com/facebookincubator/create-react-app) and is the product of a collaboration between [Facebook](https://code.facebook.com) and [Expo](https://expo.io) (formerly Exponent).

From d7b37c405013926c2bb4fc98f1575bebf690aaff Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieterdb@fb.com>
Date: Fri, 17 Mar 2017 06:55:37 -0700
Subject: [PATCH 067/366] Remove JsToNativeBridge's nativeQueue

Reviewed By: mhorowitz

Differential Revision: D4589737

fbshipit-source-id: 3b2730417d99c4f98cfaad386bc50328f2551592
---
 React/CxxBridge/RCTCxxBridge.mm               | 81 +++++--------------
 .../jni/xreact/jni/CatalystInstanceImpl.cpp   | 42 ++++++----
 .../jni/xreact/jni/CatalystInstanceImpl.h     |  2 +
 .../main/jni/xreact/jni/JavaModuleWrapper.cpp | 42 ++++++----
 .../main/jni/xreact/jni/JavaModuleWrapper.h   | 13 ++-
 .../jni/xreact/jni/ModuleRegistryBuilder.cpp  | 10 ++-
 .../jni/xreact/jni/ModuleRegistryBuilder.h    |  5 +-
 ReactCommon/cxxreact/CxxNativeModule.cpp      | 52 +++++-------
 ReactCommon/cxxreact/CxxNativeModule.h        | 11 ++-
 ReactCommon/cxxreact/Instance.cpp             | 14 +---
 ReactCommon/cxxreact/Instance.h               |  1 -
 ReactCommon/cxxreact/NativeToJsBridge.cpp     | 50 +++++-------
 ReactCommon/cxxreact/NativeToJsBridge.h       |  1 -
 13 files changed, 143 insertions(+), 181 deletions(-)

diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm
index 16b8782ec07338..3e776b61232bb4 100644
--- a/React/CxxBridge/RCTCxxBridge.mm
+++ b/React/CxxBridge/RCTCxxBridge.mm
@@ -101,70 +101,25 @@ static bool isRAMBundle(NSData *script) {
 // is not the JS thread.  C++ modules don't use RCTNativeModule, so this little
 // adapter does the work.
 
-class QueueNativeModule : public NativeModule {
+class DispatchMessageQueueThread : public MessageQueueThread {
 public:
-  QueueNativeModule(RCTCxxBridge *bridge,
-                    std::unique_ptr<NativeModule> module)
-    : bridge_(bridge)
-    , module_(std::move(module))
-    // Create new queue (store queueName, as it isn't retained by dispatch_queue)
-    , queueName_("com.facebook.react." + module_->getName() + "Queue")
-    , queue_(dispatch_queue_create(queueName_.c_str(), DISPATCH_QUEUE_SERIAL)) {}
-
-  std::string getName() override {
-    return module_->getName();
-  }
-
-  std::vector<MethodDescriptor> getMethods() override {
-    return module_->getMethods();
-  }
-
-  folly::dynamic getConstants() override {
-    return module_->getConstants();
-  }
-
-  bool supportsWebWorkers() override {
-    return module_->supportsWebWorkers();
-  }
+  DispatchMessageQueueThread(RCTModuleData *moduleData)
+    : moduleData_(moduleData) {}
 
-  void invoke(ExecutorToken token, unsigned int reactMethodId,
-              folly::dynamic &&params) override {
-    __weak RCTCxxBridge *bridge = bridge_;
-    auto module = module_;
-    auto cparams = std::make_shared<folly::dynamic>(std::move(params));
-    dispatch_async(queue_, ^{
-      if (!bridge || !bridge.valid) {
-        return;
-      }
-
-      module->invoke(token, reactMethodId, std::move(*cparams));
+  void runOnQueue(std::function<void()>&& func) override {
+    dispatch_async(moduleData_.methodQueue, [func=std::move(func)] {
+      func();
     });
   }
-
-  MethodCallResult callSerializableNativeHook(
-      ExecutorToken token, unsigned int reactMethodId,
-      folly::dynamic &&args) override {
-    return module_->callSerializableNativeHook(token, reactMethodId, std::move(args));
+  void runOnQueueSync(std::function<void()>&& func) override {
+    LOG(FATAL) << "Unsupported operation";
+  }
+  void quitSynchronous() override {
+    LOG(FATAL) << "Unsupported operation";
   }
 
 private:
-  RCTCxxBridge *bridge_;
-  std::shared_ptr<NativeModule> module_;
-  std::string queueName_;
-  dispatch_queue_t queue_;
-};
-
-
-// This is a temporary hack.  The cxx bridge assumes a single native
-// queue handles all native method calls, but that's false on ios.  So
-// this is a no-thread passthrough, and queues are handled in
-// RCTNativeModule.  A similar refactoring should be done on the Java
-// bridge.
-class InlineMessageQueueThread : public MessageQueueThread {
-public:
-  void runOnQueue(std::function<void()>&& func) override { func(); }
-  void runOnQueueSync(std::function<void()>&& func) override { func(); }
-  void quitSynchronous() override {}
+  RCTModuleData *moduleData_;
 };
 
 }
@@ -551,12 +506,13 @@ - (BOOL)moduleIsInitialized:(Class)moduleClass
       if (![moduleData hasInstance]) {
         continue;
       }
-      modules.emplace_back(
-        new QueueNativeModule(self, std::make_unique<CxxNativeModule>(
-                                  _reactInstance, [moduleData.name UTF8String],
-                                  [moduleData] { return [(RCTCxxModule *)(moduleData.instance) move]; })));
+      modules.emplace_back(std::make_unique<CxxNativeModule>(
+        _reactInstance,
+        [moduleData.name UTF8String],
+        [moduleData] { return [(RCTCxxModule *)(moduleData.instance) move]; },
+        std::make_shared<DispatchMessageQueueThread>(moduleData)));
     } else {
-      modules.emplace_back(new RCTNativeModule(self, moduleData));
+      modules.emplace_back(std::make_unique<RCTNativeModule>(self, moduleData));
     }
   }
 
@@ -586,7 +542,6 @@ - (void)_initializeBridge:(std::shared_ptr<JSExecutorFactory>)executorFactory
       std::unique_ptr<RCTInstanceCallback>(new RCTInstanceCallback(self)),
       executorFactory,
       _jsMessageThread,
-      std::unique_ptr<MessageQueueThread>(new InlineMessageQueueThread),
       std::move([self _createModuleRegistry]));
 
 #if RCT_PROFILE
diff --git a/ReactAndroid/src/main/jni/xreact/jni/CatalystInstanceImpl.cpp b/ReactAndroid/src/main/jni/xreact/jni/CatalystInstanceImpl.cpp
index a38ed7713f2e2e..23b1e4d2d21d56 100644
--- a/ReactAndroid/src/main/jni/xreact/jni/CatalystInstanceImpl.cpp
+++ b/ReactAndroid/src/main/jni/xreact/jni/CatalystInstanceImpl.cpp
@@ -41,13 +41,17 @@ class Exception : public jni::JavaClass<Exception> {
 
 class JInstanceCallback : public InstanceCallback {
  public:
-  explicit JInstanceCallback(alias_ref<ReactCallback::javaobject> jobj)
-    : jobj_(make_global(jobj)) {}
+  explicit JInstanceCallback(
+    alias_ref<ReactCallback::javaobject> jobj,
+    std::shared_ptr<JMessageQueueThread> messageQueueThread)
+  : jobj_(make_global(jobj)), messageQueueThread_(std::move(messageQueueThread)) {}
 
   void onBatchComplete() override {
-    static auto method =
-      ReactCallback::javaClassStatic()->getMethod<void()>("onBatchComplete");
-    method(jobj_);
+    messageQueueThread_->runOnQueue([this] {
+      static auto method =
+        ReactCallback::javaClassStatic()->getMethod<void()>("onBatchComplete");
+      method(jobj_);
+    });
   }
 
   void incrementPendingJSCalls() override {
@@ -61,6 +65,7 @@ class JInstanceCallback : public InstanceCallback {
   }
 
   void decrementPendingJSCalls() override {
+    jni::ThreadScope guard;
     static auto method =
       ReactCallback::javaClassStatic()->getMethod<void()>("decrementPendingJSCalls");
     method(jobj_);
@@ -81,12 +86,11 @@ class JInstanceCallback : public InstanceCallback {
     return jobj->cthis()->getExecutorToken(jobj);
   }
 
-  void onExecutorStopped(ExecutorToken) override {
-    // TODO(cjhopman): implement this.
-  }
+  void onExecutorStopped(ExecutorToken) override {}
 
  private:
   global_ref<ReactCallback::javaobject> jobj_;
+  std::shared_ptr<JMessageQueueThread> messageQueueThread_;
 };
 
 }
@@ -97,7 +101,12 @@ jni::local_ref<CatalystInstanceImpl::jhybriddata> CatalystInstanceImpl::initHybr
 }
 
 CatalystInstanceImpl::CatalystInstanceImpl()
-    : instance_(folly::make_unique<Instance>()) {}
+  : instance_(folly::make_unique<Instance>()) {}
+
+CatalystInstanceImpl::~CatalystInstanceImpl() {
+  // TODO: 16669252: this prevents onCatalystInstanceDestroy from being called
+  moduleMessageQueue_->quitSynchronous();
+}
 
 void CatalystInstanceImpl::registerNatives() {
   registerHybrid({
@@ -127,11 +136,12 @@ void CatalystInstanceImpl::initializeBridge(
     // This executor is actually a factory holder.
     JavaScriptExecutorHolder* jseh,
     jni::alias_ref<JavaMessageQueueThread::javaobject> jsQueue,
-    jni::alias_ref<JavaMessageQueueThread::javaobject> moduleQueue,
+    jni::alias_ref<JavaMessageQueueThread::javaobject> nativeModulesQueue,
     jni::alias_ref<jni::JCollection<JavaModuleWrapper::javaobject>::javaobject> javaModules,
     jni::alias_ref<jni::JCollection<ModuleHolder::javaobject>::javaobject> cxxModules) {
   // TODO mhorowitz: how to assert here?
   // Assertions.assertCondition(mBridge == null, "initializeBridge should be called once");
+  moduleMessageQueue_ = std::make_shared<JMessageQueueThread>(nativeModulesQueue);
 
   // This used to be:
   //
@@ -149,12 +159,12 @@ void CatalystInstanceImpl::initializeBridge(
   // don't need jsModuleDescriptions any more, all the way up and down the
   // stack.
 
-  instance_->initializeBridge(folly::make_unique<JInstanceCallback>(callback),
-                              jseh->getExecutorFactory(),
-                              folly::make_unique<JMessageQueueThread>(jsQueue),
-                              folly::make_unique<JMessageQueueThread>(moduleQueue),
-                              buildModuleRegistry(std::weak_ptr<Instance>(instance_),
-                                                  javaModules, cxxModules));
+  instance_->initializeBridge(
+    folly::make_unique<JInstanceCallback>(callback, moduleMessageQueue_),
+    jseh->getExecutorFactory(),
+    folly::make_unique<JMessageQueueThread>(jsQueue),
+    buildModuleRegistry(
+      std::weak_ptr<Instance>(instance_), javaModules, cxxModules, moduleMessageQueue_));
 }
 
 void CatalystInstanceImpl::jniSetSourceURL(const std::string& sourceURL) {
diff --git a/ReactAndroid/src/main/jni/xreact/jni/CatalystInstanceImpl.h b/ReactAndroid/src/main/jni/xreact/jni/CatalystInstanceImpl.h
index 804fc927cbc1aa..0a811c1e65d52b 100644
--- a/ReactAndroid/src/main/jni/xreact/jni/CatalystInstanceImpl.h
+++ b/ReactAndroid/src/main/jni/xreact/jni/CatalystInstanceImpl.h
@@ -28,6 +28,7 @@ class CatalystInstanceImpl : public jni::HybridClass<CatalystInstanceImpl> {
   static constexpr auto kJavaDescriptor = "Lcom/facebook/react/cxxbridge/CatalystInstanceImpl;";
 
   static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jclass>);
+  ~CatalystInstanceImpl() override;
 
   static void registerNatives();
 
@@ -74,6 +75,7 @@ class CatalystInstanceImpl : public jni::HybridClass<CatalystInstanceImpl> {
   // This should be the only long-lived strong reference, but every C++ class
   // will have a weak reference.
   std::shared_ptr<Instance> instance_;
+  std::shared_ptr<JMessageQueueThread> moduleMessageQueue_;
 };
 
 }}
diff --git a/ReactAndroid/src/main/jni/xreact/jni/JavaModuleWrapper.cpp b/ReactAndroid/src/main/jni/xreact/jni/JavaModuleWrapper.cpp
index e3444346bcec6e..c545f1233a1576 100644
--- a/ReactAndroid/src/main/jni/xreact/jni/JavaModuleWrapper.cpp
+++ b/ReactAndroid/src/main/jni/xreact/jni/JavaModuleWrapper.cpp
@@ -87,30 +87,36 @@ bool JavaNativeModule::supportsWebWorkers() {
 }
 
 void JavaNativeModule::invoke(ExecutorToken token, unsigned int reactMethodId, folly::dynamic&& params) {
-  static auto invokeMethod =
-    wrapper_->getClass()->getMethod<void(JExecutorToken::javaobject, jint, ReadableNativeArray::javaobject)>("invoke");
-  invokeMethod(wrapper_, JExecutorToken::extractJavaPartFromToken(token).get(), static_cast<jint>(reactMethodId),
-               ReadableNativeArray::newObjectCxxArgs(std::move(params)).get());
+  messageQueueThread_->runOnQueue([this, token, reactMethodId, params=std::move(params)] {
+    static auto invokeMethod = wrapper_->getClass()->
+      getMethod<void(JExecutorToken::javaobject, jint, ReadableNativeArray::javaobject)>("invoke");
+    invokeMethod(wrapper_,
+        JExecutorToken::extractJavaPartFromToken(token).get(),
+        static_cast<jint>(reactMethodId),
+        ReadableNativeArray::newObjectCxxArgs(std::move(params)).get());
+  });
 }
 
 MethodCallResult JavaNativeModule::callSerializableNativeHook(ExecutorToken token, unsigned int reactMethodId, folly::dynamic&& params) {
-    // TODO: evaluate whether calling through invoke is potentially faster
-    if (reactMethodId >= syncMethods_.size()) {
-      throw std::invalid_argument(
-        folly::to<std::string>("methodId ", reactMethodId, " out of range [0..", syncMethods_.size(), "]"));
-    }
+  // TODO: evaluate whether calling through invoke is potentially faster
+  if (reactMethodId >= syncMethods_.size()) {
+    throw std::invalid_argument(
+      folly::to<std::string>("methodId ", reactMethodId, " out of range [0..", syncMethods_.size(), "]"));
+  }
 
-    auto& method = syncMethods_[reactMethodId];
-    CHECK(method.hasValue() && method->isSyncHook()) << "Trying to invoke a asynchronous method as synchronous hook";
-    return method->invoke(instance_, wrapper_->getModule(), token, params);
+  auto& method = syncMethods_[reactMethodId];
+  CHECK(method.hasValue() && method->isSyncHook()) << "Trying to invoke a asynchronous method as synchronous hook";
+  return method->invoke(instance_, wrapper_->getModule(), token, params);
 }
 
 NewJavaNativeModule::NewJavaNativeModule(
   std::weak_ptr<Instance> instance,
-  jni::alias_ref<JavaModuleWrapper::javaobject> wrapper)
-  : instance_(std::move(instance)),
-    wrapper_(make_global(wrapper)),
-    module_(make_global(wrapper->getModule())) {
+  jni::alias_ref<JavaModuleWrapper::javaobject> wrapper,
+  std::shared_ptr<MessageQueueThread> messageQueueThread)
+: instance_(std::move(instance))
+, wrapper_(make_global(wrapper))
+, module_(make_global(wrapper->getModule()))
+, messageQueueThread_(std::move(messageQueueThread)) {
   auto descs = wrapper_->getMethodDescriptors();
   std::string moduleName = getName();
   methods_.reserve(descs->size());
@@ -161,7 +167,9 @@ void NewJavaNativeModule::invoke(ExecutorToken token, unsigned int reactMethodId
       folly::to<std::string>("methodId ", reactMethodId, " out of range [0..", methods_.size(), "]"));
   }
   CHECK(!methods_[reactMethodId].isSyncHook()) << "Trying to invoke a synchronous hook asynchronously";
-  invokeInner(token, reactMethodId, std::move(params));
+  messageQueueThread_->runOnQueue([this, token, reactMethodId, params=std::move(params)] () mutable {
+    invokeInner(token, reactMethodId, std::move(params));
+  });
 }
 
 MethodCallResult NewJavaNativeModule::callSerializableNativeHook(ExecutorToken token, unsigned int reactMethodId, folly::dynamic&& params) {
diff --git a/ReactAndroid/src/main/jni/xreact/jni/JavaModuleWrapper.h b/ReactAndroid/src/main/jni/xreact/jni/JavaModuleWrapper.h
index 544b6eb167c169..222765de63d26b 100644
--- a/ReactAndroid/src/main/jni/xreact/jni/JavaModuleWrapper.h
+++ b/ReactAndroid/src/main/jni/xreact/jni/JavaModuleWrapper.h
@@ -12,6 +12,7 @@ namespace facebook {
 namespace react {
 
 class Instance;
+class MessageQueueThread;
 
 struct JMethodDescriptor : public jni::JavaClass<JMethodDescriptor> {
   static constexpr auto kJavaDescriptor =
@@ -44,8 +45,11 @@ class JavaNativeModule : public NativeModule {
  public:
   JavaNativeModule(
     std::weak_ptr<Instance> instance,
-    jni::alias_ref<JavaModuleWrapper::javaobject> wrapper)
-  : instance_(std::move(instance)), wrapper_(make_global(wrapper)) {}
+    jni::alias_ref<JavaModuleWrapper::javaobject> wrapper,
+    std::shared_ptr<MessageQueueThread> messageQueueThread)
+  : instance_(std::move(instance))
+  , wrapper_(make_global(wrapper))
+  , messageQueueThread_(std::move(messageQueueThread)) {}
 
   std::string getName() override;
   folly::dynamic getConstants() override;
@@ -57,6 +61,7 @@ class JavaNativeModule : public NativeModule {
  private:
   std::weak_ptr<Instance> instance_;
   jni::global_ref<JavaModuleWrapper::javaobject> wrapper_;
+  std::shared_ptr<MessageQueueThread> messageQueueThread_;
   std::vector<folly::Optional<MethodInvoker>> syncMethods_;
 };
 
@@ -65,7 +70,8 @@ class NewJavaNativeModule : public NativeModule {
  public:
   NewJavaNativeModule(
     std::weak_ptr<Instance> instance,
-    jni::alias_ref<JavaModuleWrapper::javaobject> wrapper);
+    jni::alias_ref<JavaModuleWrapper::javaobject> wrapper,
+    std::shared_ptr<MessageQueueThread> messageQueueThread);
 
   std::string getName() override;
   std::vector<MethodDescriptor> getMethods() override;
@@ -78,6 +84,7 @@ class NewJavaNativeModule : public NativeModule {
   std::weak_ptr<Instance> instance_;
   jni::global_ref<JavaModuleWrapper::javaobject> wrapper_;
   jni::global_ref<JBaseJavaModule::javaobject> module_;
+  std::shared_ptr<MessageQueueThread> messageQueueThread_;
   std::vector<MethodInvoker> methods_;
   std::vector<MethodDescriptor> methodDescriptors_;
 
diff --git a/ReactAndroid/src/main/jni/xreact/jni/ModuleRegistryBuilder.cpp b/ReactAndroid/src/main/jni/xreact/jni/ModuleRegistryBuilder.cpp
index 108091a8dfd934..0dd0c4836260ba 100644
--- a/ReactAndroid/src/main/jni/xreact/jni/ModuleRegistryBuilder.cpp
+++ b/ReactAndroid/src/main/jni/xreact/jni/ModuleRegistryBuilder.cpp
@@ -32,14 +32,16 @@ xplat::module::CxxModule::Provider ModuleHolder::getProvider() const {
 std::unique_ptr<ModuleRegistry> buildModuleRegistry(
     std::weak_ptr<Instance> winstance,
     jni::alias_ref<jni::JCollection<JavaModuleWrapper::javaobject>::javaobject> javaModules,
-    jni::alias_ref<jni::JCollection<ModuleHolder::javaobject>::javaobject> cxxModules) {
+    jni::alias_ref<jni::JCollection<ModuleHolder::javaobject>::javaobject> cxxModules,
+    std::shared_ptr<MessageQueueThread> moduleMessageQueue) {
   std::vector<std::unique_ptr<NativeModule>> modules;
   for (const auto& jm : *javaModules) {
-    modules.emplace_back(folly::make_unique<JavaNativeModule>(winstance, jm));
+    modules.emplace_back(folly::make_unique<JavaNativeModule>(
+      winstance, jm, moduleMessageQueue));
   }
   for (const auto& cm : *cxxModules) {
-    modules.emplace_back(
-      folly::make_unique<CxxNativeModule>(winstance, cm->getName(), cm->getProvider()));
+    modules.emplace_back(folly::make_unique<CxxNativeModule>(
+      winstance, cm->getName(), cm->getProvider(), moduleMessageQueue));
   }
   if (modules.empty()) {
     return nullptr;
diff --git a/ReactAndroid/src/main/jni/xreact/jni/ModuleRegistryBuilder.h b/ReactAndroid/src/main/jni/xreact/jni/ModuleRegistryBuilder.h
index 554473601173f8..0aeb7d5398e3df 100644
--- a/ReactAndroid/src/main/jni/xreact/jni/ModuleRegistryBuilder.h
+++ b/ReactAndroid/src/main/jni/xreact/jni/ModuleRegistryBuilder.h
@@ -12,6 +12,8 @@
 namespace facebook {
 namespace react {
 
+class MessageQueueThread;
+
 class ModuleHolder : public jni::JavaClass<ModuleHolder> {
  public:
   static auto constexpr kJavaDescriptor =
@@ -24,7 +26,8 @@ class ModuleHolder : public jni::JavaClass<ModuleHolder> {
 std::unique_ptr<ModuleRegistry> buildModuleRegistry(
   std::weak_ptr<Instance> winstance,
   jni::alias_ref<jni::JCollection<JavaModuleWrapper::javaobject>::javaobject> javaModules,
-  jni::alias_ref<jni::JCollection<ModuleHolder::javaobject>::javaobject> cxxModules);
+  jni::alias_ref<jni::JCollection<ModuleHolder::javaobject>::javaobject> cxxModules,
+  std::shared_ptr<MessageQueueThread> moduleMessageQueue);
 
 }
 }
diff --git a/ReactCommon/cxxreact/CxxNativeModule.cpp b/ReactCommon/cxxreact/CxxNativeModule.cpp
index c0cacd0b85b927..b487588bb76cbd 100644
--- a/ReactCommon/cxxreact/CxxNativeModule.cpp
+++ b/ReactCommon/cxxreact/CxxNativeModule.cpp
@@ -46,13 +46,6 @@ CxxModule::Callback convertCallback(
 
 }
 
-CxxNativeModule::CxxNativeModule(std::weak_ptr<Instance> instance,
-                                 std::string name,
-                                 CxxModule::Provider provider)
-  : instance_(instance)
-  , name_(std::move(name))
-  , provider_(provider) {}
-
 std::string CxxNativeModule::getName() {
   return name_;
 }
@@ -85,8 +78,8 @@ bool CxxNativeModule::supportsWebWorkers() {
 
 void CxxNativeModule::invoke(ExecutorToken token, unsigned int reactMethodId, folly::dynamic&& params) {
   if (reactMethodId >= methods_.size()) {
-    throw std::invalid_argument(
-      folly::to<std::string>("methodId ", reactMethodId, " out of range [0..", methods_.size(), "]"));
+    throw std::invalid_argument(folly::to<std::string>("methodId ", reactMethodId,
+        " out of range [0..", methods_.size(), "]"));
   }
   if (!params.isArray()) {
     throw std::invalid_argument(
@@ -99,25 +92,20 @@ void CxxNativeModule::invoke(ExecutorToken token, unsigned int reactMethodId, fo
   const auto& method = methods_[reactMethodId];
 
   if (!method.func) {
-    throw std::runtime_error(
-      folly::to<std::string>("Method ", method.name,
-                             " is synchronous but invoked asynchronously"));
+    throw std::runtime_error(folly::to<std::string>("Method ", method.name,
+        " is synchronous but invoked asynchronously"));
   }
 
   if (params.size() < method.callbacks) {
-    throw std::invalid_argument(
-      folly::to<std::string>("Expected ", method.callbacks, " callbacks, but only ",
-                             params.size(), " parameters provided"));
+    throw std::invalid_argument(folly::to<std::string>("Expected ", method.callbacks,
+        " callbacks, but only ", params.size(), " parameters provided"));
   }
 
   if (method.callbacks == 1) {
-    first = convertCallback(
-        makeCallback(instance_, token, params[params.size() - 1]));
+    first = convertCallback(makeCallback(instance_, token, params[params.size() - 1]));
   } else if (method.callbacks == 2) {
-    first = convertCallback(
-        makeCallback(instance_, token, params[params.size() - 2]));
-    second = convertCallback(
-        makeCallback(instance_, token, params[params.size() - 1]));
+    first = convertCallback(makeCallback(instance_, token, params[params.size() - 2]));
+    second = convertCallback(makeCallback(instance_, token, params[params.size() - 1]));
   }
 
   params.resize(params.size() - method.callbacks);
@@ -141,16 +129,18 @@ void CxxNativeModule::invoke(ExecutorToken token, unsigned int reactMethodId, fo
   // stack.  I'm told that will be possible in the future.  TODO
   // mhorowitz #7128529: convert C++ exceptions to Java
 
-  try {
-    method.func(std::move(params), first, second);
-  } catch (const facebook::xplat::JsArgumentException& ex) {
-    // This ends up passed to the onNativeException callback.
-    throw;
-  } catch (...) {
-    // This means some C++ code is buggy.  As above, we fail hard so the C++
-    // developer can debug and fix it.
-    std::terminate();
-  }
+  messageQueueThread_->runOnQueue([method, params=std::move(params), first, second] () {
+    try {
+      method.func(std::move(params), first, second);
+    } catch (const facebook::xplat::JsArgumentException& ex) {
+      // This ends up passed to the onNativeException callback.
+      throw;
+    } catch (...) {
+      // This means some C++ code is buggy.  As above, we fail hard so the C++
+      // developer can debug and fix it.
+      std::terminate();
+    }
+  });
 }
 
 MethodCallResult CxxNativeModule::callSerializableNativeHook(
diff --git a/ReactCommon/cxxreact/CxxNativeModule.h b/ReactCommon/cxxreact/CxxNativeModule.h
index ab6f3df87ffd4c..376ad7a19875a4 100644
--- a/ReactCommon/cxxreact/CxxNativeModule.h
+++ b/ReactCommon/cxxreact/CxxNativeModule.h
@@ -15,8 +15,14 @@ std::function<void(folly::dynamic)> makeCallback(
 
 class CxxNativeModule : public NativeModule {
 public:
-  CxxNativeModule(std::weak_ptr<Instance> instance, std::string name,
-                  xplat::module::CxxModule::Provider provider);
+  CxxNativeModule(std::weak_ptr<Instance> instance,
+                  std::string name,
+                  xplat::module::CxxModule::Provider provider,
+                  std::shared_ptr<MessageQueueThread> messageQueueThread)
+  : instance_(instance)
+  , name_(std::move(name))
+  , provider_(provider)
+  , messageQueueThread_(messageQueueThread) {}
 
   std::string getName() override;
   std::vector<MethodDescriptor> getMethods() override;
@@ -32,6 +38,7 @@ class CxxNativeModule : public NativeModule {
   std::weak_ptr<Instance> instance_;
   std::string name_;
   xplat::module::CxxModule::Provider provider_;
+  std::shared_ptr<MessageQueueThread> messageQueueThread_;
   std::unique_ptr<xplat::module::CxxModule> module_;
   std::vector<xplat::module::CxxModule::Method> methods_;
 };
diff --git a/ReactCommon/cxxreact/Instance.cpp b/ReactCommon/cxxreact/Instance.cpp
index f7ad78ed4e0266..300c809dbf18ca 100644
--- a/ReactCommon/cxxreact/Instance.cpp
+++ b/ReactCommon/cxxreact/Instance.cpp
@@ -33,24 +33,14 @@ void Instance::initializeBridge(
     std::unique_ptr<InstanceCallback> callback,
     std::shared_ptr<JSExecutorFactory> jsef,
     std::shared_ptr<MessageQueueThread> jsQueue,
-    std::unique_ptr<MessageQueueThread> nativeQueue,
     std::shared_ptr<ModuleRegistry> moduleRegistry) {
   callback_ = std::move(callback);
 
-  if (!nativeQueue) {
-    // TODO pass down a thread/queue from java, instead of creating our own.
-
-    auto queue = folly::make_unique<CxxMessageQueue>();
-    std::thread t(queue->getUnregisteredRunLoop());
-    t.detach();
-    nativeQueue = std::move(queue);
-  }
 
   jsQueue->runOnQueueSync(
-    [this, &jsef, moduleRegistry, jsQueue,
-     nativeQueue=folly::makeMoveWrapper(std::move(nativeQueue))] () mutable {
+    [this, &jsef, moduleRegistry, jsQueue] () mutable {
       nativeToJsBridge_ = folly::make_unique<NativeToJsBridge>(
-          jsef.get(), moduleRegistry, jsQueue, nativeQueue.move(), callback_);
+          jsef.get(), moduleRegistry, jsQueue, callback_);
 
       std::lock_guard<std::mutex> lock(m_syncMutex);
       m_syncReady = true;
diff --git a/ReactCommon/cxxreact/Instance.h b/ReactCommon/cxxreact/Instance.h
index 4b8da4f26084e6..cf1cd2459a5478 100644
--- a/ReactCommon/cxxreact/Instance.h
+++ b/ReactCommon/cxxreact/Instance.h
@@ -31,7 +31,6 @@ class Instance {
     std::unique_ptr<InstanceCallback> callback,
     std::shared_ptr<JSExecutorFactory> jsef,
     std::shared_ptr<MessageQueueThread> jsQueue,
-    std::unique_ptr<MessageQueueThread> nativeQueue,
     std::shared_ptr<ModuleRegistry> moduleRegistry);
 
   void setSourceURL(std::string sourceURL);
diff --git a/ReactCommon/cxxreact/NativeToJsBridge.cpp b/ReactCommon/cxxreact/NativeToJsBridge.cpp
index 8c6babfbf4e842..e863791bc78e49 100644
--- a/ReactCommon/cxxreact/NativeToJsBridge.cpp
+++ b/ReactCommon/cxxreact/NativeToJsBridge.cpp
@@ -24,11 +24,9 @@ class JsToNativeBridge : public react::ExecutorDelegate {
 public:
   JsToNativeBridge(NativeToJsBridge* nativeToJs,
                    std::shared_ptr<ModuleRegistry> registry,
-                   std::unique_ptr<MessageQueueThread> nativeQueue,
                    std::shared_ptr<InstanceCallback> callback)
     : m_nativeToJs(nativeToJs)
     , m_registry(registry)
-    , m_nativeQueue(std::move(nativeQueue))
     , m_callback(callback) {}
 
   void registerExecutor(std::unique_ptr<JSExecutor> executor,
@@ -51,24 +49,25 @@ class JsToNativeBridge : public react::ExecutorDelegate {
     CHECK(m_registry || calls.empty()) <<
       "native module calls cannot be completed with no native modules";
     ExecutorToken token = m_nativeToJs->getTokenForExecutor(executor);
-    m_nativeQueue->runOnQueue([this, token, calls=std::move(calls), isEndOfBatch] () mutable {
-      m_batchHadNativeModuleCalls = m_batchHadNativeModuleCalls || !calls.empty();
-
-      // An exception anywhere in here stops processing of the batch.  This
-      // was the behavior of the Android bridge, and since exception handling
-      // terminates the whole bridge, there's not much point in continuing.
-      for (auto& call : react::parseMethodCalls(std::move(calls))) {
-        m_registry->callNativeMethod(
-          token, call.moduleId, call.methodId, std::move(call.arguments), call.callId);
-      }
-      if (isEndOfBatch) {
-        if (m_batchHadNativeModuleCalls) {
-          m_callback->onBatchComplete();
-          m_batchHadNativeModuleCalls = false;
-        }
-        m_callback->decrementPendingJSCalls();
+    m_batchHadNativeModuleCalls = m_batchHadNativeModuleCalls || !calls.empty();
+
+    // An exception anywhere in here stops processing of the batch.  This
+    // was the behavior of the Android bridge, and since exception handling
+    // terminates the whole bridge, there's not much point in continuing.
+    for (auto& call : parseMethodCalls(std::move(calls))) {
+      m_registry->callNativeMethod(
+        token, call.moduleId, call.methodId, std::move(call.arguments), call.callId);
+    }
+    if (isEndOfBatch) {
+      // onBatchComplete will be called on the native (module) queue, but
+      // decrementPendingJSCalls will be called sync. Be aware that the bridge may still
+      // be processing native calls when the birdge idle signaler fires.
+      if (m_batchHadNativeModuleCalls) {
+        m_callback->onBatchComplete();
+        m_batchHadNativeModuleCalls = false;
       }
-    });
+      m_callback->decrementPendingJSCalls();
+    }
   }
 
   MethodCallResult callSerializableNativeHook(
@@ -78,10 +77,6 @@ class JsToNativeBridge : public react::ExecutorDelegate {
     return m_registry->callSerializableNativeHook(token, moduleId, methodId, std::move(args));
   }
 
-  void quitQueueSynchronous() {
-    m_nativeQueue->quitSynchronous();
-  }
-
 private:
 
   // These methods are always invoked from an Executor.  The NativeToJsBridge
@@ -91,7 +86,6 @@ class JsToNativeBridge : public react::ExecutorDelegate {
   // valid object during a call to a delegate method from an exectuto.
   NativeToJsBridge* m_nativeToJs;
   std::shared_ptr<ModuleRegistry> m_registry;
-  std::unique_ptr<MessageQueueThread> m_nativeQueue;
   std::shared_ptr<InstanceCallback> m_callback;
   bool m_batchHadNativeModuleCalls = false;
 };
@@ -100,12 +94,10 @@ NativeToJsBridge::NativeToJsBridge(
     JSExecutorFactory* jsExecutorFactory,
     std::shared_ptr<ModuleRegistry> registry,
     std::shared_ptr<MessageQueueThread> jsQueue,
-    std::unique_ptr<MessageQueueThread> nativeQueue,
     std::shared_ptr<InstanceCallback> callback)
     : m_destroyed(std::make_shared<bool>(false))
     , m_mainExecutorToken(callback->createExecutorToken())
-    , m_delegate(std::make_shared<JsToNativeBridge>(
-                   this, registry, std::move(nativeQueue), callback)) {
+    , m_delegate(std::make_shared<JsToNativeBridge>(this, registry, callback)) {
   std::unique_ptr<JSExecutor> mainExecutor =
     jsExecutorFactory->createJSExecutor(m_delegate, jsQueue);
   // cached to avoid locked map lookup in the common case
@@ -129,7 +121,6 @@ void NativeToJsBridge::loadApplication(
        startupScript=folly::makeMoveWrapper(std::move(startupScript)),
        startupScriptSourceURL=std::move(startupScriptSourceURL)]
         (JSExecutor* executor) mutable {
-
     auto unbundle = unbundleWrap.move();
     if (unbundle) {
       executor->setJSModulesUnbundle(std::move(unbundle));
@@ -322,7 +313,6 @@ ExecutorToken NativeToJsBridge::getTokenForExecutor(JSExecutor& executor) {
 }
 
 void NativeToJsBridge::destroy() {
-  m_delegate->quitQueueSynchronous();
   auto* executorMessageQueueThread = getMessageQueueThread(m_mainExecutorToken);
   // All calls made through runOnExecutorQueue have an early exit if
   // m_destroyed is true. Setting this before the runOnQueueSync will cause
@@ -331,7 +321,7 @@ void NativeToJsBridge::destroy() {
   executorMessageQueueThread->runOnQueueSync([this, executorMessageQueueThread] {
     m_mainExecutor->destroy();
     executorMessageQueueThread->quitSynchronous();
-    unregisterExecutor(*m_mainExecutor);
+    m_delegate->unregisterExecutor(*m_mainExecutor);
     m_mainExecutor = nullptr;
   });
 }
diff --git a/ReactCommon/cxxreact/NativeToJsBridge.h b/ReactCommon/cxxreact/NativeToJsBridge.h
index 70ef620b887710..1c2505f834cb95 100644
--- a/ReactCommon/cxxreact/NativeToJsBridge.h
+++ b/ReactCommon/cxxreact/NativeToJsBridge.h
@@ -61,7 +61,6 @@ class NativeToJsBridge {
       JSExecutorFactory* jsExecutorFactory,
       std::shared_ptr<ModuleRegistry> registry,
       std::shared_ptr<MessageQueueThread> jsQueue,
-      std::unique_ptr<MessageQueueThread> nativeQueue,
       std::shared_ptr<InstanceCallback> callback);
   virtual ~NativeToJsBridge();
 

From 73e81b87d3df80c406bec4ad0ad40e36531b7594 Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieterdb@fb.com>
Date: Fri, 17 Mar 2017 06:55:39 -0700
Subject: [PATCH 068/366] Remove unused onNativeException delegate method

Reviewed By: mhorowitz

Differential Revision: D4597914

fbshipit-source-id: 82a109d1e6d8b0c93380840c22ec74dc75ab1a45
---
 React/CxxBridge/RCTCxxBridge.mm                        |  4 ----
 .../facebook/react/cxxbridge/CatalystInstanceImpl.java |  8 --------
 .../com/facebook/react/cxxbridge/ReactCallback.java    |  3 ---
 .../src/main/jni/xreact/jni/CatalystInstanceImpl.cpp   | 10 ----------
 ReactCommon/cxxreact/CxxNativeModule.cpp               |  1 -
 ReactCommon/cxxreact/Instance.h                        |  1 -
 6 files changed, 27 deletions(-)

diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm
index 3e776b61232bb4..9eeceb387e6611 100644
--- a/React/CxxBridge/RCTCxxBridge.mm
+++ b/React/CxxBridge/RCTCxxBridge.mm
@@ -132,7 +132,6 @@ @interface RCTCxxBridge ()
 - (instancetype)initWithParentBridge:(RCTBridge *)bridge;
 - (void)partialBatchDidFlush;
 - (void)batchDidComplete;
-- (void)handleError:(NSError *)error;
 
 @end
 
@@ -146,9 +145,6 @@ void onBatchComplete() override {
   }
   void incrementPendingJSCalls() override {}
   void decrementPendingJSCalls() override {}
-  void onNativeException(const std::string &what) override {
-    [bridge_ handleError:RCTErrorWithMessage(@(what.c_str()))];
-  }
   ExecutorToken createExecutorToken() override {
     return ExecutorToken(std::make_shared<PlatformExecutorToken>());
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CatalystInstanceImpl.java b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CatalystInstanceImpl.java
index 38a9d548546131..80be1fbe51a559 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CatalystInstanceImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CatalystInstanceImpl.java
@@ -168,14 +168,6 @@ public void decrementPendingJSCalls() {
         impl.decrementPendingJSCalls();
       }
     }
-
-    @Override
-    public void onNativeException(Exception e) {
-      CatalystInstanceImpl impl = mOuter.get();
-      if (impl != null) {
-        impl.onNativeException(e);
-      }
-    }
   }
 
   private native void initializeBridge(
diff --git a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/ReactCallback.java b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/ReactCallback.java
index 6eb743dbe3035d..d4299a43994417 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/ReactCallback.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/ReactCallback.java
@@ -21,7 +21,4 @@
 
   @DoNotStrip
   void decrementPendingJSCalls();
-
-  @DoNotStrip
-  void onNativeException(Exception e);
 }
diff --git a/ReactAndroid/src/main/jni/xreact/jni/CatalystInstanceImpl.cpp b/ReactAndroid/src/main/jni/xreact/jni/CatalystInstanceImpl.cpp
index 23b1e4d2d21d56..3c6a45166c9231 100644
--- a/ReactAndroid/src/main/jni/xreact/jni/CatalystInstanceImpl.cpp
+++ b/ReactAndroid/src/main/jni/xreact/jni/CatalystInstanceImpl.cpp
@@ -71,16 +71,6 @@ class JInstanceCallback : public InstanceCallback {
     method(jobj_);
   }
 
-  void onNativeException(const std::string& what) override {
-    static auto exCtor =
-      Exception::javaClassStatic()->getConstructor<Exception::javaobject(jstring)>();
-    static auto method =
-      ReactCallback::javaClassStatic()->getMethod<void(Exception::javaobject)>("onNativeException");
-
-    method(jobj_, Exception::javaClassStatic()->newObject(
-             exCtor, jni::make_jstring(what).get()).get());
-  }
-
   ExecutorToken createExecutorToken() override {
     auto jobj = JExecutorToken::newObjectCxxArgs();
     return jobj->cthis()->getExecutorToken(jobj);
diff --git a/ReactCommon/cxxreact/CxxNativeModule.cpp b/ReactCommon/cxxreact/CxxNativeModule.cpp
index b487588bb76cbd..40d37f1a0ea7fc 100644
--- a/ReactCommon/cxxreact/CxxNativeModule.cpp
+++ b/ReactCommon/cxxreact/CxxNativeModule.cpp
@@ -133,7 +133,6 @@ void CxxNativeModule::invoke(ExecutorToken token, unsigned int reactMethodId, fo
     try {
       method.func(std::move(params), first, second);
     } catch (const facebook::xplat::JsArgumentException& ex) {
-      // This ends up passed to the onNativeException callback.
       throw;
     } catch (...) {
       // This means some C++ code is buggy.  As above, we fail hard so the C++
diff --git a/ReactCommon/cxxreact/Instance.h b/ReactCommon/cxxreact/Instance.h
index cf1cd2459a5478..13a66cfb38d2b0 100644
--- a/ReactCommon/cxxreact/Instance.h
+++ b/ReactCommon/cxxreact/Instance.h
@@ -19,7 +19,6 @@ struct InstanceCallback {
   virtual void onBatchComplete() = 0;
   virtual void incrementPendingJSCalls() = 0;
   virtual void decrementPendingJSCalls() = 0;
-  virtual void onNativeException(const std::string& what) = 0;
   virtual ExecutorToken createExecutorToken() = 0;
   virtual void onExecutorStopped(ExecutorToken) = 0;
 };

From 99d73c8927e67ddf5da7ebb7f35ac7804384b8a4 Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieterdb@fb.com>
Date: Fri, 17 Mar 2017 06:55:41 -0700
Subject: [PATCH 069/366] Move FBReactJSExecutor to Instance

Reviewed By: mhorowitz

Differential Revision: D4589940

fbshipit-source-id: e3f0c374e78f77e54cede5c617414e41844f0f4d
---
 ReactCommon/cxxreact/Instance.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ReactCommon/cxxreact/Instance.cpp b/ReactCommon/cxxreact/Instance.cpp
index 300c809dbf18ca..4188fe5720ea02 100644
--- a/ReactCommon/cxxreact/Instance.cpp
+++ b/ReactCommon/cxxreact/Instance.cpp
@@ -36,7 +36,6 @@ void Instance::initializeBridge(
     std::shared_ptr<ModuleRegistry> moduleRegistry) {
   callback_ = std::move(callback);
 
-
   jsQueue->runOnQueueSync(
     [this, &jsef, moduleRegistry, jsQueue] () mutable {
       nativeToJsBridge_ = folly::make_unique<NativeToJsBridge>(

From ea069b69de427832226c4fe6e32803b4c7c31d2c Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieterdb@fb.com>
Date: Fri, 17 Mar 2017 06:55:43 -0700
Subject: [PATCH 070/366] Make Cxx modules lazy on iOS

Reviewed By: mhorowitz

Differential Revision: D4716040

fbshipit-source-id: 08cc1317e15f0b3bd1df6d76c483a560f5c43d53
---
 React/CxxBridge/RCTCxxBridge.mm |  2 +-
 React/CxxModule/RCTCxxModule.h  | 15 ++++++-----
 React/CxxModule/RCTCxxModule.mm | 46 +++++++++++++++++----------------
 3 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm
index 9eeceb387e6611..a98b0e2a9beee2 100644
--- a/React/CxxBridge/RCTCxxBridge.mm
+++ b/React/CxxBridge/RCTCxxBridge.mm
@@ -505,7 +505,7 @@ - (BOOL)moduleIsInitialized:(Class)moduleClass
       modules.emplace_back(std::make_unique<CxxNativeModule>(
         _reactInstance,
         [moduleData.name UTF8String],
-        [moduleData] { return [(RCTCxxModule *)(moduleData.instance) move]; },
+        [moduleData] { return [(RCTCxxModule *)(moduleData.instance) createModule]; },
         std::make_shared<DispatchMessageQueueThread>(moduleData)));
     } else {
       modules.emplace_back(std::make_unique<RCTNativeModule>(self, moduleData));
diff --git a/React/CxxModule/RCTCxxModule.h b/React/CxxModule/RCTCxxModule.h
index b95889df7e64b8..0f08f3113f816a 100644
--- a/React/CxxModule/RCTCxxModule.h
+++ b/React/CxxModule/RCTCxxModule.h
@@ -14,14 +14,15 @@
 #import <React/RCTBridgeModule.h>
 #import <cxxreact/CxxModule.h>
 
+/**
+ * Subclass RCTCxxModule to use cross-platform CxxModule on iOS.
+ *
+ * Subclasses must implement the createModule method to lazily produce the module. When running under the Cxx bridge
+ * modules will be accessed directly, under the Objective-C bridge method access is wrapped through RCTCxxMethod.
+ */
 @interface RCTCxxModule : NSObject <RCTBridgeModule>
 
-- (instancetype)initWithCxxModule:(std::unique_ptr<facebook::xplat::module::CxxModule>)module;
-
-- (NSArray *)methodsToExport;
-- (NSDictionary *)constantsToExport;
-
-// Extracts the module from its objc wrapper
-- (std::unique_ptr<facebook::xplat::module::CxxModule>)move;
+// To be implemented by subclasses
+- (std::unique_ptr<facebook::xplat::module::CxxModule>)createModule;
 
 @end
diff --git a/React/CxxModule/RCTCxxModule.mm b/React/CxxModule/RCTCxxModule.mm
index a2be24170983f4..3838cb7bcc32e9 100644
--- a/React/CxxModule/RCTCxxModule.mm
+++ b/React/CxxModule/RCTCxxModule.mm
@@ -23,37 +23,36 @@ @implementation RCTCxxModule
   std::unique_ptr<facebook::xplat::module::CxxModule> _module;
 }
 
-- (instancetype)init
++ (NSString *)moduleName
 {
-  return nil;
+  return @"";
 }
 
-- (instancetype)initWithCxxModule:(std::unique_ptr<facebook::xplat::module::CxxModule>)module
+- (void)lazyInit
 {
-  RCTAssert([RCTBridgeModuleNameForClass([self class]) isEqualToString:@(module->getName().c_str())],
-            @"CxxModule class name %@ does not match runtime name %s",
-            RCTBridgeModuleNameForClass([self class]), module->getName().c_str());
-
-  if ((self = [super init])) {
-    _module = std::move(module);
+  if (!_module) {
+    _module = [self createModule];
+
+    if (_module) {
+      RCTAssert([RCTBridgeModuleNameForClass([self class]) isEqualToString:@(_module->getName().c_str())],
+                @"CxxModule class name %@ does not match runtime name %s",
+                RCTBridgeModuleNameForClass([self class]), _module->getName().c_str());
+    }
   }
-
-  return self;
 }
 
-- (std::unique_ptr<facebook::xplat::module::CxxModule>)move
+- (std::unique_ptr<facebook::xplat::module::CxxModule>)createModule
 {
-  return std::move(_module);
+  RCTAssert(NO, @"Subclass %@ must override createModule", [self class]);
+  return nullptr;
 }
 
-+ (NSString *)moduleName
+- (NSArray<id<RCTBridgeMethod>> *)methodsToExport;
 {
-  return @"";
-}
-
-- (NSArray *)methodsToExport
-{
-  CHECK(_module) << "Can't call methodsToExport on moved module";
+  [self lazyInit];
+  if (!_module) {
+    return nil;
+  }
 
   NSMutableArray *moduleMethods = [NSMutableArray new];
   for (const auto &method : _module->getMethods()) {
@@ -62,9 +61,12 @@ - (NSArray *)methodsToExport
   return moduleMethods;
 }
 
-- (NSDictionary *)constantsToExport
+- (NSDictionary<NSString *, id> *)constantsToExport;
 {
-  CHECK(_module) << "Can't call constantsToExport on moved module";
+  [self lazyInit];
+  if (!_module) {
+    return nil;
+  }
 
   NSMutableDictionary *moduleConstants = [NSMutableDictionary new];
   for (const auto &c : _module->getConstants()) {

From ce270220e45abfeabebaaf68643269907bd2605a Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieterdb@fb.com>
Date: Fri, 17 Mar 2017 06:55:44 -0700
Subject: [PATCH 071/366] Extract module registry creation to helper

Reviewed By: mhorowitz

Differential Revision: D4721817

fbshipit-source-id: 2fa17ca5317a57d429aa75d6c1865932af27e02f
---
 React/CxxBridge/RCTCxxBridge.mm               | 57 ++-----------------
 React/CxxModule/DispatchMessageQueueThread.h  | 40 +++++++++++++
 React/CxxModule/RCTCxxUtils.h                 | 10 ++++
 React/CxxModule/RCTCxxUtils.mm                | 35 +++++++++++-
 .../RCTNativeModule.h                         |  0
 .../RCTNativeModule.mm                        |  0
 6 files changed, 86 insertions(+), 56 deletions(-)
 create mode 100644 React/CxxModule/DispatchMessageQueueThread.h
 rename React/{CxxBridge => CxxModule}/RCTNativeModule.h (100%)
 rename React/{CxxBridge => CxxModule}/RCTNativeModule.mm (100%)

diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm
index a98b0e2a9beee2..e48906af72e4b9 100644
--- a/React/CxxBridge/RCTCxxBridge.mm
+++ b/React/CxxBridge/RCTCxxBridge.mm
@@ -42,7 +42,6 @@
 
 #import "NSDataBigString.h"
 #import "RCTMessageThread.h"
-#import "RCTNativeModule.h"
 #import "RCTObjcExecutor.h"
 
 #ifdef WITH_FBSYSTRACE
@@ -95,35 +94,6 @@ static bool isRAMBundle(NSData *script) {
 
 static std::atomic_bool cxxBridgeEnabled(false);
 
-namespace {
-
-// RCTNativeModule arranges for native methods to be invoked on a queue which
-// is not the JS thread.  C++ modules don't use RCTNativeModule, so this little
-// adapter does the work.
-
-class DispatchMessageQueueThread : public MessageQueueThread {
-public:
-  DispatchMessageQueueThread(RCTModuleData *moduleData)
-    : moduleData_(moduleData) {}
-
-  void runOnQueue(std::function<void()>&& func) override {
-    dispatch_async(moduleData_.methodQueue, [func=std::move(func)] {
-      func();
-    });
-  }
-  void runOnQueueSync(std::function<void()>&& func) override {
-    LOG(FATAL) << "Unsupported operation";
-  }
-  void quitSynchronous() override {
-    LOG(FATAL) << "Unsupported operation";
-  }
-
-private:
-  RCTModuleData *moduleData_;
-};
-
-}
-
 @interface RCTCxxBridge ()
 
 @property (nonatomic, weak, readonly) RCTBridge *parentBridge;
@@ -484,35 +454,16 @@ - (BOOL)moduleIsInitialized:(Class)moduleClass
   return _moduleDataByName[RCTBridgeModuleNameForClass(moduleClass)].hasInstance;
 }
 
-- (std::shared_ptr<ModuleRegistry>)_createModuleRegistry
+- (std::shared_ptr<ModuleRegistry>)_buildModuleRegistry
 {
   if (!self.valid) {
     return {};
   }
 
   [_performanceLogger markStartForTag:RCTPLNativeModulePrepareConfig];
-  RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"-[RCTCxxBridge createModuleRegistry]", nil);
-
-  std::vector<std::unique_ptr<NativeModule>> modules;
-  for (RCTModuleData *moduleData in _moduleDataByID) {
-    if ([moduleData.moduleClass isSubclassOfClass:[RCTCxxModule class]]) {
-      // If a module does not support automatic instantiation, and
-      // wasn't provided as an extra module, it may not have an
-      // instance.  If so, skip it.
-      if (![moduleData hasInstance]) {
-        continue;
-      }
-      modules.emplace_back(std::make_unique<CxxNativeModule>(
-        _reactInstance,
-        [moduleData.name UTF8String],
-        [moduleData] { return [(RCTCxxModule *)(moduleData.instance) createModule]; },
-        std::make_shared<DispatchMessageQueueThread>(moduleData)));
-    } else {
-      modules.emplace_back(std::make_unique<RCTNativeModule>(self, moduleData));
-    }
-  }
+  RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"-[RCTCxxBridge buildModuleRegistry]", nil);
 
-  auto registry = std::make_shared<ModuleRegistry>(std::move(modules));
+  auto registry = buildModuleRegistry(_moduleDataByID, self, _reactInstance);
 
   [_performanceLogger markStopForTag:RCTPLNativeModulePrepareConfig];
   RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
@@ -538,7 +489,7 @@ - (void)_initializeBridge:(std::shared_ptr<JSExecutorFactory>)executorFactory
       std::unique_ptr<RCTInstanceCallback>(new RCTInstanceCallback(self)),
       executorFactory,
       _jsMessageThread,
-      std::move([self _createModuleRegistry]));
+      std::move([self _buildModuleRegistry]));
 
 #if RCT_PROFILE
     if (RCTProfileIsProfiling()) {
diff --git a/React/CxxModule/DispatchMessageQueueThread.h b/React/CxxModule/DispatchMessageQueueThread.h
new file mode 100644
index 00000000000000..c1fb9fb0bdc696
--- /dev/null
+++ b/React/CxxModule/DispatchMessageQueueThread.h
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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.
+ */
+
+#include <cxxreact/MessageQueueThread.h>
+
+namespace facebook {
+namespace react {
+
+// RCTNativeModule arranges for native methods to be invoked on a queue which
+// is not the JS thread.  C++ modules don't use RCTNativeModule, so this little
+// adapter does the work.
+
+class DispatchMessageQueueThread : public MessageQueueThread {
+public:
+  DispatchMessageQueueThread(RCTModuleData *moduleData)
+    : moduleData_(moduleData) {}
+
+  void runOnQueue(std::function<void()>&& func) override {
+    dispatch_async(moduleData_.methodQueue, [func=std::move(func)] {
+      func();
+    });
+  }
+  void runOnQueueSync(std::function<void()>&& func) override {
+    LOG(FATAL) << "Unsupported operation";
+  }
+  void quitSynchronous() override {
+    LOG(FATAL) << "Unsupported operation";
+  }
+
+private:
+  RCTModuleData *moduleData_;
+};
+
+} }
diff --git a/React/CxxModule/RCTCxxUtils.h b/React/CxxModule/RCTCxxUtils.h
index 2278cf42de8371..e84032682d154d 100644
--- a/React/CxxModule/RCTCxxUtils.h
+++ b/React/CxxModule/RCTCxxUtils.h
@@ -7,12 +7,18 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
+#include <memory>
+
 #import <React/RCTConvert.h>
 #include <JavaScriptCore/JavaScriptCore.h>
 #include <cxxreact/JSCExecutor.h>
+#include <cxxreact/ModuleRegistry.h>
 #include <folly/dynamic.h>
 #include <jschelpers/JavaScriptCore.h>
 
+@class RCTBridge;
+@class RCTModuleData;
+
 @interface RCTConvert (folly)
 
 + (folly::dynamic)folly_dynamic:(id)json;
@@ -22,6 +28,10 @@
 namespace facebook {
 namespace react {
 
+class Instance;
+
+std::shared_ptr<ModuleRegistry> buildModuleRegistry(NSArray<RCTModuleData *> *modules, RCTBridge *bridge, const std::shared_ptr<Instance> &instance);
+
 JSContext *contextForGlobalContextRef(JSGlobalContextRef contextRef);
 
 /*
diff --git a/React/CxxModule/RCTCxxUtils.mm b/React/CxxModule/RCTCxxUtils.mm
index 3283f82032db63..740f5960aa3e96 100644
--- a/React/CxxModule/RCTCxxUtils.mm
+++ b/React/CxxModule/RCTCxxUtils.mm
@@ -10,10 +10,15 @@
 #import "RCTCxxUtils.h"
 
 #import <React/RCTFollyConvert.h>
+#import <React/RCTModuleData.h>
 #import <React/RCTUtils.h>
-
+#include <cxxreact/CxxNativeModule.h>
 #include <jschelpers/Value.h>
 
+#import "DispatchMessageQueueThread.h"
+#import "RCTCxxModule.h"
+#import "RCTNativeModule.h"
+
 using namespace facebook::react;
 
 @implementation RCTConvert (folly)
@@ -36,6 +41,30 @@ @implementation RCTConvert (folly)
 namespace facebook {
 namespace react {
 
+std::shared_ptr<ModuleRegistry> buildModuleRegistry(NSArray<RCTModuleData *> *modules, RCTBridge *bridge, const std::shared_ptr<Instance> &instance)
+{
+  std::vector<std::unique_ptr<NativeModule>> nativeModules;
+  for (RCTModuleData *moduleData in modules) {
+    if ([moduleData.moduleClass isSubclassOfClass:[RCTCxxModule class]]) {
+      // If a module does not support automatic instantiation, and
+      // wasn't provided as an extra module, it may not have an
+      // instance.  If so, skip it.
+      if (![moduleData hasInstance]) {
+        continue;
+      }
+      nativeModules.emplace_back(std::make_unique<CxxNativeModule>(
+        instance,
+        [moduleData.name UTF8String],
+        [moduleData] { return [(RCTCxxModule *)(moduleData.instance) createModule]; },
+        std::make_shared<DispatchMessageQueueThread>(moduleData)));
+    } else {
+      nativeModules.emplace_back(std::make_unique<RCTNativeModule>(bridge, moduleData));
+    }
+  }
+
+  return std::make_shared<ModuleRegistry>(std::move(nativeModules));
+}
+
 JSContext *contextForGlobalContextRef(JSGlobalContextRef contextRef)
 {
   static std::mutex s_mutex;
@@ -61,7 +90,7 @@ @implementation RCTConvert (folly)
   return ctx;
 }
 
-static NSError *errorWithException(const std::exception& e)
+static NSError *errorWithException(const std::exception &e)
 {
   NSString *msg = @(e.what());
   NSMutableDictionary *errorInfo = [NSMutableDictionary dictionary];
@@ -75,7 +104,7 @@ @implementation RCTConvert (folly)
   NSError *nestedError;
   try {
     std::rethrow_if_nested(e);
-  } catch(const std::exception& e) {
+  } catch(const std::exception &e) {
     nestedError = errorWithException(e);
   } catch(...) {}
 
diff --git a/React/CxxBridge/RCTNativeModule.h b/React/CxxModule/RCTNativeModule.h
similarity index 100%
rename from React/CxxBridge/RCTNativeModule.h
rename to React/CxxModule/RCTNativeModule.h
diff --git a/React/CxxBridge/RCTNativeModule.mm b/React/CxxModule/RCTNativeModule.mm
similarity index 100%
rename from React/CxxBridge/RCTNativeModule.mm
rename to React/CxxModule/RCTNativeModule.mm

From e85477552784f599ce7ec9274715affef183a2fa Mon Sep 17 00:00:00 2001
From: Emil Sjolander <emilsj@fb.com>
Date: Fri, 17 Mar 2017 09:07:23 -0700
Subject: [PATCH 072/366] Invalidate layout when node is removed from tree

Reviewed By: astreet

Differential Revision: D4716022

fbshipit-source-id: 399cc64a4b3f5fd3fc469ea37bdd31abe474dc6c
---
 ReactCommon/yoga/yoga/Yoga.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ReactCommon/yoga/yoga/Yoga.c b/ReactCommon/yoga/yoga/Yoga.c
index 323bb881545626..65a3ba46f98707 100644
--- a/ReactCommon/yoga/yoga/Yoga.c
+++ b/ReactCommon/yoga/yoga/Yoga.c
@@ -423,6 +423,7 @@ void YGNodeInsertChild(const YGNodeRef node, const YGNodeRef child, const uint32
 
 void YGNodeRemoveChild(const YGNodeRef node, const YGNodeRef child) {
   if (YGNodeListDelete(node->children, child) != NULL) {
+    child->layout = gYGNodeDefaults.layout; // layout is no longer valid
     child->parent = NULL;
     YGNodeMarkDirtyInternal(node);
   }

From f0240e004a021c2bb5889f507726949d849e8ea6 Mon Sep 17 00:00:00 2001
From: Emil Sjolander <emilsj@fb.com>
Date: Fri, 17 Mar 2017 09:07:24 -0700
Subject: [PATCH 073/366] Avoid transfering cached layout information to java

Reviewed By: astreet

Differential Revision: D4716024

fbshipit-source-id: c30763a6fc7426d653c7a6ca129615cddb4140e9
---
 .../src/main/jni/first-party/yogajni/jni/YGJNI.cpp  |  6 ++++++
 ReactCommon/yoga/yoga/Yoga.c                        | 13 +++++++++++++
 ReactCommon/yoga/yoga/Yoga.h                        |  2 ++
 3 files changed, 21 insertions(+)

diff --git a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
index 72e704c8c82e81..c0b0dd49505ec6 100644
--- a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
+++ b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
@@ -24,6 +24,12 @@ static void YGTransferLayoutDirection(YGNodeRef node, alias_ref<jobject> javaNod
 }
 
 static void YGTransferLayoutOutputsRecursive(YGNodeRef root) {
+  // If the node is using a cached layout it means we have already
+  // transfered it to java.
+  if (YGNodeIsUsingCachedLayout(root)) {
+    return;
+  }
+
   if (auto obj = YGNodeJobject(root)->lockLocal()) {
     static auto widthField = obj->getClass()->getField<jfloat>("mWidth");
     static auto heightField = obj->getClass()->getField<jfloat>("mHeight");
diff --git a/ReactCommon/yoga/yoga/Yoga.c b/ReactCommon/yoga/yoga/Yoga.c
index 65a3ba46f98707..1b3961c9c16804 100644
--- a/ReactCommon/yoga/yoga/Yoga.c
+++ b/ReactCommon/yoga/yoga/Yoga.c
@@ -459,6 +459,18 @@ void YGNodeCopyStyle(const YGNodeRef dstNode, const YGNodeRef srcNode) {
   }
 }
 
+static int YGNodeRootGenerationCount(const YGNodeRef node) {
+  if (node->parent) {
+    return YGNodeRootGenerationCount(node->parent);
+  } else {
+    return node->layout.generationCount;
+  }
+}
+
+bool YGNodeIsUsingCachedLayout(const YGNodeRef node) {
+  return node->layout.generationCount != YGNodeRootGenerationCount(node);
+}
+
 static inline float YGResolveFlexGrow(const YGNodeRef node) {
   if (!YGFloatIsUndefined(node->style.flexGrow)) {
     return node->style.flexGrow;
@@ -1811,6 +1823,7 @@ static void YGZeroOutLayoutRecursivly(const YGNodeRef node) {
   node->layout.cachedLayout.widthMeasureMode = YGMeasureModeExactly;
   node->layout.cachedLayout.computedWidth = 0;
   node->layout.cachedLayout.computedHeight = 0;
+  node->layout.generationCount = gCurrentGenerationCount;
   const uint32_t childCount = YGNodeGetChildCount(node);
   for (uint32_t i = 0; i < childCount; i++) {
     const YGNodeRef child = YGNodeListGet(node->children, i);
diff --git a/ReactCommon/yoga/yoga/Yoga.h b/ReactCommon/yoga/yoga/Yoga.h
index d5c5258a7dca15..054b5dc5079a0e 100644
--- a/ReactCommon/yoga/yoga/Yoga.h
+++ b/ReactCommon/yoga/yoga/Yoga.h
@@ -218,6 +218,8 @@ YG_NODE_LAYOUT_EDGE_PROPERTY(float, Margin);
 YG_NODE_LAYOUT_EDGE_PROPERTY(float, Border);
 YG_NODE_LAYOUT_EDGE_PROPERTY(float, Padding);
 
+bool YGNodeIsUsingCachedLayout(const YGNodeRef node);
+
 WIN_EXPORT void YGSetLogger(YGLogger logger);
 WIN_EXPORT void YGLog(YGLogLevel level, const char *message, ...);
 

From 50ff7167cbf6254cf21babd04ba1ac3369858c28 Mon Sep 17 00:00:00 2001
From: Emil Sjolander <emilsj@fb.com>
Date: Fri, 17 Mar 2017 09:28:55 -0700
Subject: [PATCH 074/366] Optimize ReactShadowNode by more manually converting
 between string and enums

Reviewed By: astreet

Differential Revision: D4713847

fbshipit-source-id: 5ef5b59f85bb26f0af9af0698c9fc1f36eb5f7bf
---
 .../react/uimanager/LayoutShadowNode.java     | 301 ++++++++++++++++--
 1 file changed, 275 insertions(+), 26 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java
index 3f5020e3ad4157..e57c9f6158ecb4 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java
@@ -4,9 +4,9 @@
 
 import javax.annotation.Nullable;
 
-import java.util.Locale;
 
 import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
 import com.facebook.react.bridge.ReadableType;
 
 import com.facebook.yoga.YogaAlign;
@@ -246,9 +246,34 @@ public void setFlexDirection(@Nullable String flexDirection) {
     if (isVirtual()) {
       return;
     }
-    setFlexDirection(
-        flexDirection == null ? YogaFlexDirection.COLUMN : YogaFlexDirection.valueOf(
-            flexDirection.toUpperCase(Locale.US).replace("-", "_")));
+
+    if (flexDirection == null) {
+      setFlexDirection(YogaFlexDirection.COLUMN);
+      return;
+    }
+
+    switch (flexDirection) {
+      case "column": {
+        setFlexDirection(YogaFlexDirection.COLUMN);
+        break;
+      }
+      case "column-reverse": {
+        setFlexDirection(YogaFlexDirection.COLUMN_REVERSE);
+        break;
+      }
+      case "row": {
+        setFlexDirection(YogaFlexDirection.ROW);
+        break;
+      }
+      case "row-reverse": {
+        setFlexDirection(YogaFlexDirection.ROW_REVERSE);
+        break;
+      }
+      default: {
+        throw new JSApplicationIllegalArgumentException(
+            "invalid value for flexDirection: " + flexDirection);
+      }
+    }
   }
 
   @ReactProp(name = ViewProps.FLEX_WRAP)
@@ -256,12 +281,25 @@ public void setFlexWrap(@Nullable String flexWrap) {
     if (isVirtual()) {
       return;
     }
-    if (flexWrap == null || flexWrap.equals("nowrap")) {
+
+    if (flexWrap == null) {
       setFlexWrap(YogaWrap.NO_WRAP);
-    } else if (flexWrap.equals("wrap")) {
-      setFlexWrap(YogaWrap.WRAP);
-    } else {
-      throw new IllegalArgumentException("Unknown flexWrap value: " + flexWrap);
+      return;
+    }
+
+    switch (flexWrap) {
+      case "nowrap": {
+        setFlexWrap(YogaWrap.NO_WRAP);
+        break;
+      }
+      case "wrap": {
+        setFlexWrap(YogaWrap.WRAP);
+        break;
+      }
+      default: {
+        throw new JSApplicationIllegalArgumentException(
+            "invalid value for flexWrap: " + flexWrap);
+      }
     }
   }
 
@@ -270,8 +308,50 @@ public void setAlignSelf(@Nullable String alignSelf) {
     if (isVirtual()) {
       return;
     }
-    setAlignSelf(alignSelf == null ? YogaAlign.AUTO : YogaAlign.valueOf(
-            alignSelf.toUpperCase(Locale.US).replace("-", "_")));
+
+    if (alignSelf == null) {
+      setAlignSelf(YogaAlign.AUTO);
+      return;
+    }
+
+    switch (alignSelf) {
+      case "auto": {
+        setAlignSelf(YogaAlign.FLEX_START);
+        return;
+      }
+      case "flex-start": {
+        setAlignSelf(YogaAlign.CENTER);
+        return;
+      }
+      case "center": {
+        setAlignSelf(YogaAlign.CENTER);
+        return;
+      }
+      case "flex-end": {
+        setAlignSelf(YogaAlign.FLEX_END);
+        return;
+      }
+      case "stretch": {
+        setAlignSelf(YogaAlign.STRETCH);
+        return;
+      }
+      case "baseline": {
+        setAlignSelf(YogaAlign.BASELINE);
+        return;
+      }
+      case "space-between": {
+        setAlignSelf(YogaAlign.SPACE_BETWEEN);
+        return;
+      }
+      case "space-around": {
+        setAlignSelf(YogaAlign.SPACE_AROUND);
+        return;
+      }
+      default: {
+        throw new JSApplicationIllegalArgumentException(
+            "invalid value for alignSelf: " + alignSelf);
+      }
+    }
   }
 
   @ReactProp(name = ViewProps.ALIGN_ITEMS)
@@ -279,9 +359,50 @@ public void setAlignItems(@Nullable String alignItems) {
     if (isVirtual()) {
       return;
     }
-    setAlignItems(
-        alignItems == null ? YogaAlign.STRETCH : YogaAlign.valueOf(
-            alignItems.toUpperCase(Locale.US).replace("-", "_")));
+
+    if (alignItems == null) {
+      setAlignItems(YogaAlign.STRETCH);
+      return;
+    }
+
+    switch (alignItems) {
+      case "auto": {
+        setAlignItems(YogaAlign.FLEX_START);
+        return;
+      }
+      case "flex-start": {
+        setAlignItems(YogaAlign.CENTER);
+        return;
+      }
+      case "center": {
+        setAlignItems(YogaAlign.CENTER);
+        return;
+      }
+      case "flex-end": {
+        setAlignItems(YogaAlign.FLEX_END);
+        return;
+      }
+      case "stretch": {
+        setAlignItems(YogaAlign.STRETCH);
+        return;
+      }
+      case "baseline": {
+        setAlignItems(YogaAlign.BASELINE);
+        return;
+      }
+      case "space-between": {
+        setAlignItems(YogaAlign.SPACE_BETWEEN);
+        return;
+      }
+      case "space-around": {
+        setAlignItems(YogaAlign.SPACE_AROUND);
+        return;
+      }
+      default: {
+        throw new JSApplicationIllegalArgumentException(
+            "invalid value for alignItems: " + alignItems);
+      }
+    }
   }
 
   @ReactProp(name = ViewProps.ALIGN_CONTENT)
@@ -289,9 +410,50 @@ public void setAlignContent(@Nullable String alignContent) {
     if (isVirtual()) {
       return;
     }
-    setAlignContent(
-        alignContent == null ? YogaAlign.FLEX_START : YogaAlign.valueOf(
-            alignContent.toUpperCase(Locale.US).replace("-", "_")));
+
+    if (alignContent == null) {
+      setAlignContent(YogaAlign.FLEX_START);
+      return;
+    }
+
+    switch (alignContent) {
+      case "auto": {
+        setAlignContent(YogaAlign.FLEX_START);
+        return;
+      }
+      case "flex-start": {
+        setAlignContent(YogaAlign.CENTER);
+        return;
+      }
+      case "center": {
+        setAlignContent(YogaAlign.CENTER);
+        return;
+      }
+      case "flex-end": {
+        setAlignContent(YogaAlign.FLEX_END);
+        return;
+      }
+      case "stretch": {
+        setAlignContent(YogaAlign.STRETCH);
+        return;
+      }
+      case "baseline": {
+        setAlignContent(YogaAlign.BASELINE);
+        return;
+      }
+      case "space-between": {
+        setAlignContent(YogaAlign.SPACE_BETWEEN);
+        return;
+      }
+      case "space-around": {
+        setAlignContent(YogaAlign.SPACE_AROUND);
+        return;
+      }
+      default: {
+        throw new JSApplicationIllegalArgumentException(
+            "invalid value for alignContent: " + alignContent);
+      }
+    }
   }
 
   @ReactProp(name = ViewProps.JUSTIFY_CONTENT)
@@ -299,8 +461,38 @@ public void setJustifyContent(@Nullable String justifyContent) {
     if (isVirtual()) {
       return;
     }
-    setJustifyContent(justifyContent == null ? YogaJustify.FLEX_START : YogaJustify.valueOf(
-            justifyContent.toUpperCase(Locale.US).replace("-", "_")));
+
+    if (justifyContent == null) {
+      setJustifyContent(YogaJustify.FLEX_START);
+      return;
+    }
+
+    switch (justifyContent) {
+      case "flex-start": {
+        setJustifyContent(YogaJustify.FLEX_START);
+        break;
+      }
+      case "center": {
+        setJustifyContent(YogaJustify.CENTER);
+        break;
+      }
+      case "flex-end": {
+        setJustifyContent(YogaJustify.FLEX_END);
+        break;
+      }
+      case "space-between": {
+        setJustifyContent(YogaJustify.SPACE_BETWEEN);
+        break;
+      }
+      case "space-around": {
+        setJustifyContent(YogaJustify.SPACE_AROUND);
+        break;
+      }
+      default: {
+        throw new JSApplicationIllegalArgumentException(
+            "invalid value for justifyContent: " + justifyContent);
+      }
+    }
   }
 
   @ReactProp(name = ViewProps.OVERFLOW)
@@ -308,8 +500,30 @@ public void setOverflow(@Nullable String overflow) {
     if (isVirtual()) {
       return;
     }
-    setOverflow(overflow == null ? YogaOverflow.VISIBLE : YogaOverflow.valueOf(
-            overflow.toUpperCase(Locale.US).replace("-", "_")));
+
+    if (overflow == null) {
+      setOverflow(YogaOverflow.VISIBLE);
+      return;
+    }
+
+    switch (overflow) {
+      case "visible": {
+        setOverflow(YogaOverflow.VISIBLE);
+        break;
+      }
+      case "hidden": {
+        setOverflow(YogaOverflow.HIDDEN);
+        break;
+      }
+      case "scroll": {
+        setOverflow(YogaOverflow.SCROLL);
+        break;
+      }
+      default: {
+        throw new JSApplicationIllegalArgumentException(
+            "invalid value for overflow: " + overflow);
+      }
+    }
   }
 
   @ReactProp(name = ViewProps.DISPLAY)
@@ -317,8 +531,26 @@ public void setDisplay(@Nullable String display) {
     if (isVirtual()) {
       return;
     }
-    setDisplay(display == null ? YogaDisplay.FLEX : YogaDisplay.valueOf(
-            display.toUpperCase(Locale.US).replace("-", "_")));
+
+    if (display == null) {
+      setDisplay(YogaDisplay.FLEX);
+      return;
+    }
+
+    switch (display) {
+      case "flex": {
+        setDisplay(YogaDisplay.FLEX);
+        break;
+      }
+      case "none": {
+        setDisplay(YogaDisplay.NONE);
+        break;
+      }
+      default: {
+        throw new JSApplicationIllegalArgumentException(
+            "invalid value for display: " + display);
+      }
+    }
   }
 
   @ReactPropGroup(names = {
@@ -424,9 +656,26 @@ public void setPosition(@Nullable String position) {
     if (isVirtual()) {
       return;
     }
-    YogaPositionType positionType = position == null ?
-        YogaPositionType.RELATIVE : YogaPositionType.valueOf(position.toUpperCase(Locale.US));
-    setPositionType(positionType);
+
+    if (position == null) {
+      setPositionType(YogaPositionType.RELATIVE);
+      return;
+    }
+
+    switch (position) {
+      case "relative": {
+        setPositionType(YogaPositionType.RELATIVE);
+        break;
+      }
+      case "absolute": {
+        setPositionType(YogaPositionType.ABSOLUTE);
+        break;
+      }
+      default: {
+        throw new JSApplicationIllegalArgumentException(
+            "invalid value for position: " + position);
+      }
+    }
   }
 
   @Override

From 60142adc72bdf11255c39c22b648a3d8c103aa5d Mon Sep 17 00:00:00 2001
From: Lukas Piatkowski <luk@fb.com>
Date: Fri, 17 Mar 2017 09:55:23 -0700
Subject: [PATCH 075/366] Extract PackagerConnectionSettings to ensure easier
 reusability of PackagerConnection module

Reviewed By: cwdick

Differential Revision: D4689535

fbshipit-source-id: f698837f407a03bf91521cc5e921c66f5755e6e0
---
 .../react/devsupport/DevInternalSettings.java | 12 ++--
 .../react/devsupport/DevServerHelper.java     | 51 ++++------------
 .../facebook/react/modules/systeminfo/BUCK    | 22 ++++++-
 .../facebook/react/packagerconnection/BUCK    |  1 +
 .../packagerconnection/JSPackagerClient.java  | 16 ++++-
 .../PackagerConnectionSettings.java           | 59 +++++++++++++++++++
 .../JSPackagerClientTest.java                 | 34 ++++++-----
 local-cli/server/util/messageSocket.js        |  2 +-
 8 files changed, 132 insertions(+), 65 deletions(-)
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/packagerconnection/PackagerConnectionSettings.java

diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevInternalSettings.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevInternalSettings.java
index ce9ea690ee5490..bfd8d0403f0e05 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevInternalSettings.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevInternalSettings.java
@@ -17,6 +17,7 @@
 
 import com.facebook.react.common.annotations.VisibleForTesting;
 import com.facebook.react.modules.debug.interfaces.DeveloperSettings;
+import com.facebook.react.packagerconnection.PackagerConnectionSettings;
 
 /**
  * Helper class for accessing developers settings that should not be accessed outside of the package
@@ -31,7 +32,6 @@ public class DevInternalSettings implements
   private static final String PREFS_FPS_DEBUG_KEY = "fps_debug";
   private static final String PREFS_JS_DEV_MODE_DEBUG_KEY = "js_dev_mode_debug";
   private static final String PREFS_JS_MINIFY_DEBUG_KEY = "js_minify_debug";
-  private static final String PREFS_DEBUG_SERVER_HOST_KEY = "debug_http_host";
   private static final String PREFS_ANIMATIONS_DEBUG_KEY = "animations_debug";
   private static final String PREFS_RELOAD_ON_JS_CHANGE_KEY = "reload_on_js_change";
   private static final String PREFS_INSPECTOR_DEBUG_KEY = "inspector_debug";
@@ -40,6 +40,7 @@ public class DevInternalSettings implements
 
   private final SharedPreferences mPreferences;
   private final Listener mListener;
+  private final PackagerConnectionSettings mPackagerConnectionSettings;
 
   public DevInternalSettings(
       Context applicationContext,
@@ -47,6 +48,11 @@ public DevInternalSettings(
     mListener = listener;
     mPreferences = PreferenceManager.getDefaultSharedPreferences(applicationContext);
     mPreferences.registerOnSharedPreferenceChangeListener(this);
+    mPackagerConnectionSettings = new PackagerConnectionSettings(applicationContext);
+  }
+
+  public PackagerConnectionSettings getPackagerConnectionSettings() {
+    return mPackagerConnectionSettings;
   }
 
   @Override
@@ -73,10 +79,6 @@ public boolean isJSMinifyEnabled() {
     return mPreferences.getBoolean(PREFS_JS_MINIFY_DEBUG_KEY, false);
   }
 
-  public @Nullable String getDebugServerHost() {
-    return mPreferences.getString(PREFS_DEBUG_SERVER_HOST_KEY, null);
-  }
-
   public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
     if (mListener != null) {
       if (PREFS_FPS_DEBUG_KEY.equals(key) ||
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
index 5c3750dfe1ea87..b102002d8a0eb8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
@@ -73,7 +73,6 @@ public class DevServerHelper {
   private static final String ONCHANGE_ENDPOINT_URL_FORMAT =
       "http://%s/onchange";
   private static final String WEBSOCKET_PROXY_URL_FORMAT = "ws://%s/debugger-proxy?role=client";
-  private static final String PACKAGER_CONNECTION_URL_FORMAT = "ws://%s/message?role=android-rn-devserverhelper";
   private static final String PACKAGER_STATUS_URL_FORMAT = "http://%s/status";
   private static final String HEAP_CAPTURE_UPLOAD_URL_FORMAT = "http://%s/jscheapcaptureupload";
   private static final String INSPECTOR_DEVICE_URL_FORMAT = "http://%s/inspector/device?name=%s";
@@ -152,7 +151,7 @@ public void onRequest(@Nullable Object params, JSPackagerClient.Responder respon
         });
         handlers.putAll(new FileIoHandler().handlers());
 
-        mPackagerClient = new JSPackagerClient(getPackagerConnectionURL(), handlers);
+        mPackagerClient = new JSPackagerClient("devserverhelper", mSettings.getPackagerConnectionSettings(), handlers);
         mPackagerClient.init();
 
         return null;
@@ -213,22 +212,18 @@ public static String getReloadAppAction(Context context) {
   }
 
   public String getWebsocketProxyURL() {
-    return String.format(Locale.US, WEBSOCKET_PROXY_URL_FORMAT, getDebugServerHost());
-  }
-
-  private String getPackagerConnectionURL() {
-    return String.format(Locale.US, PACKAGER_CONNECTION_URL_FORMAT, getDebugServerHost());
+    return String.format(Locale.US, WEBSOCKET_PROXY_URL_FORMAT, mSettings.getPackagerConnectionSettings().getDebugServerHost());
   }
 
   public String getHeapCaptureUploadUrl() {
-    return String.format(Locale.US, HEAP_CAPTURE_UPLOAD_URL_FORMAT, getDebugServerHost());
+    return String.format(Locale.US, HEAP_CAPTURE_UPLOAD_URL_FORMAT, mSettings.getPackagerConnectionSettings().getDebugServerHost());
   }
 
   public String getInspectorDeviceUrl() {
     return String.format(
         Locale.US,
         INSPECTOR_DEVICE_URL_FORMAT,
-        getDebugServerHost(),
+        mSettings.getPackagerConnectionSettings().getDebugServerHost(),
         AndroidInfoHelpers.getFriendlyDeviceName());
   }
 
@@ -260,30 +255,6 @@ private boolean getHMR() {
     return mSettings.isHotModuleReplacementEnabled();
   }
 
-  /**
-   * @return the host to use when connecting to the bundle server.
-   */
-  private String getDebugServerHost() {
-    // Check debug server host setting first. If empty try to detect emulator type and use default
-    // hostname for those
-    String hostFromSettings = mSettings.getDebugServerHost();
-
-    if (!TextUtils.isEmpty(hostFromSettings)) {
-      return Assertions.assertNotNull(hostFromSettings);
-    }
-
-    String host = AndroidInfoHelpers.getServerHost();
-
-    if (host.equals(AndroidInfoHelpers.DEVICE_LOCALHOST)) {
-      FLog.w(
-        ReactConstants.TAG,
-        "You seem to be running on device. Run 'adb reverse tcp:8081 tcp:8081' " +
-          "to forward the debug server's port to the device.");
-    }
-
-    return host;
-  }
-
   private static String createBundleURL(String host, String jsModulePath, boolean devMode, boolean hmr, boolean jsMinify) {
     return String.format(Locale.US, BUNDLE_URL_FORMAT, host, jsModulePath, devMode, hmr, jsMinify);
   }
@@ -294,7 +265,7 @@ private static String createResourceURL(String host, String resourcePath) {
 
   public String getDevServerBundleURL(final String jsModulePath) {
     return createBundleURL(
-      getDebugServerHost(),
+      mSettings.getPackagerConnectionSettings().getDebugServerHost(),
       jsModulePath,
       getDevMode(),
       getHMR(),
@@ -438,7 +409,7 @@ public void cancelDownloadBundleFromURL() {
   }
 
   public void isPackagerRunning(final PackagerStatusCallback callback) {
-    String statusURL = createPackagerStatusURL(getDebugServerHost());
+    String statusURL = createPackagerStatusURL(mSettings.getPackagerConnectionSettings().getDebugServerHost());
     Request request = new Request.Builder()
         .url(statusURL)
         .build();
@@ -558,11 +529,11 @@ public void onResponse(Call call, Response response) throws IOException {
   }
 
   private String createOnChangeEndpointUrl() {
-    return String.format(Locale.US, ONCHANGE_ENDPOINT_URL_FORMAT, getDebugServerHost());
+    return String.format(Locale.US, ONCHANGE_ENDPOINT_URL_FORMAT, mSettings.getPackagerConnectionSettings().getDebugServerHost());
   }
 
   private String createLaunchJSDevtoolsCommandUrl() {
-    return String.format(Locale.US, LAUNCH_JS_DEVTOOLS_COMMAND_URL_FORMAT, getDebugServerHost());
+    return String.format(Locale.US, LAUNCH_JS_DEVTOOLS_COMMAND_URL_FORMAT, mSettings.getPackagerConnectionSettings().getDebugServerHost());
   }
 
   public void launchJSDevtools() {
@@ -584,11 +555,11 @@ public void onResponse(Call call, Response response) throws IOException {
   }
 
   public String getSourceMapUrl(String mainModuleName) {
-    return String.format(Locale.US, SOURCE_MAP_URL_FORMAT, getDebugServerHost(), mainModuleName, getDevMode(), getHMR(), getJSMinifyMode());
+    return String.format(Locale.US, SOURCE_MAP_URL_FORMAT, mSettings.getPackagerConnectionSettings().getDebugServerHost(), mainModuleName, getDevMode(), getHMR(), getJSMinifyMode());
   }
 
   public String getSourceUrl(String mainModuleName) {
-    return String.format(Locale.US, BUNDLE_URL_FORMAT, getDebugServerHost(), mainModuleName, getDevMode(), getHMR(), getJSMinifyMode());
+    return String.format(Locale.US, BUNDLE_URL_FORMAT, mSettings.getPackagerConnectionSettings().getDebugServerHost(), mainModuleName, getDevMode(), getHMR(), getJSMinifyMode());
   }
 
   public String getJSBundleURLForRemoteDebugging(String mainModuleName) {
@@ -607,7 +578,7 @@ public String getJSBundleURLForRemoteDebugging(String mainModuleName) {
   public @Nullable File downloadBundleResourceFromUrlSync(
       final String resourcePath,
       final File outputFile) {
-    final String resourceURL = createResourceURL(getDebugServerHost(), resourcePath);
+    final String resourceURL = createResourceURL(mSettings.getPackagerConnectionSettings().getDebugServerHost(), resourcePath);
     final Request request = new Request.Builder()
         .url(resourceURL)
         .build();
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/BUCK
index cdbc287a7af3ec..9d59eff8107aca 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/BUCK
@@ -2,15 +2,33 @@ include_defs("//ReactAndroid/DEFS")
 
 android_library(
     name = "systeminfo",
-    srcs = glob(["**/*.java"]),
+    srcs = [
+        "AndroidInfoModule.java",
+    ],
+    exported_deps = [
+        ":systeminfo-moduleless",
+    ],
     visibility = [
         "PUBLIC",
     ],
     deps = [
-        react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_target("java/com/facebook/react/bridge:bridge"),
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
     ],
 )
+
+android_library(
+    name = "systeminfo-moduleless",
+    srcs = [
+        "AndroidInfoHelpers.java",
+    ],
+    visibility = [
+        "PUBLIC",
+    ],
+    deps = [
+        react_native_dep("third-party/java/infer-annotations:infer-annotations"),
+        react_native_dep("third-party/java/jsr-305:jsr-305"),
+    ],
+)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/BUCK b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/BUCK
index 125fa76df098c1..25f3213889469d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/BUCK
@@ -13,5 +13,6 @@ android_library(
         react_native_dep("third-party/java/okhttp:okhttp3"),
         react_native_dep("third-party/java/okhttp:okhttp3-ws"),
         react_native_dep("third-party/java/okio:okio"),
+        react_native_target("java/com/facebook/react/modules/systeminfo:systeminfo-moduleless"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/JSPackagerClient.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/JSPackagerClient.java
index d8cdc6544d706b..2568ca9eacea0d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/JSPackagerClient.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/JSPackagerClient.java
@@ -13,7 +13,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import android.net.Uri;
+
 import com.facebook.common.logging.FLog;
+import com.facebook.react.modules.systeminfo.AndroidInfoHelpers;
 
 import okhttp3.RequestBody;
 import okhttp3.ResponseBody;
@@ -26,6 +29,7 @@
  */
 final public class JSPackagerClient implements ReconnectingWebSocket.MessageCallback {
   private static final String TAG = JSPackagerClient.class.getSimpleName();
+  private static final String PACKAGER_CONNECTION_URL_FORMAT = "ws://%s/message?device=%s&app=%s&context=%s";
   private static final int PROTOCOL_VERSION = 2;
 
   public class Responder {
@@ -83,8 +87,18 @@ final public void onNotification(@Nullable Object params) {
   private ReconnectingWebSocket mWebSocket;
   private Map<String, RequestHandler> mRequestHandlers;
 
-  public JSPackagerClient(String url, Map<String, RequestHandler> requestHandlers) {
+  public JSPackagerClient(String clientId, PackagerConnectionSettings settings, Map<String, RequestHandler> requestHandlers) {
     super();
+
+    Uri.Builder builder = new Uri.Builder();
+    builder.scheme("ws")
+      .encodedAuthority(settings.getDebugServerHost())
+      .appendPath("message")
+      .appendQueryParameter("device", AndroidInfoHelpers.getFriendlyDeviceName())
+      .appendQueryParameter("app", settings.getPackageName())
+      .appendQueryParameter("clientid", clientId);
+    String url = builder.build().toString();
+
     mWebSocket = new ReconnectingWebSocket(url, this);
     mRequestHandlers = requestHandlers;
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/PackagerConnectionSettings.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/PackagerConnectionSettings.java
new file mode 100644
index 00000000000000..668931dd96bef2
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/PackagerConnectionSettings.java
@@ -0,0 +1,59 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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.
+ */
+
+package com.facebook.react.packagerconnection;
+
+import javax.annotation.Nullable;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import android.text.TextUtils;
+
+import com.facebook.common.logging.FLog;
+import com.facebook.infer.annotation.Assertions;
+import com.facebook.react.modules.systeminfo.AndroidInfoHelpers;
+
+public class PackagerConnectionSettings {
+  private static final String TAG = PackagerConnectionSettings.class.getSimpleName();
+  private static final String PREFS_DEBUG_SERVER_HOST_KEY = "debug_http_host";
+
+  private final SharedPreferences mPreferences;
+  private final String mPackageName;
+
+  public PackagerConnectionSettings(Context applicationContext) {
+    mPreferences = PreferenceManager.getDefaultSharedPreferences(applicationContext);
+    mPackageName = applicationContext.getPackageName();
+  }
+
+  public String getDebugServerHost() {
+    // Check host setting first. If empty try to detect emulator type and use default
+    // hostname for those
+    String hostFromSettings = mPreferences.getString(PREFS_DEBUG_SERVER_HOST_KEY, null);
+
+    if (!TextUtils.isEmpty(hostFromSettings)) {
+      return Assertions.assertNotNull(hostFromSettings);
+    }
+
+    String host = AndroidInfoHelpers.getServerHost();
+
+    if (host.equals(AndroidInfoHelpers.DEVICE_LOCALHOST)) {
+      FLog.w(
+        TAG,
+        "You seem to be running on device. Run 'adb reverse tcp:8081 tcp:8081' " +
+          "to forward the debug server's port to the device.");
+    }
+
+    return host;
+  }
+
+  public @Nullable String getPackageName() {
+    return mPackageName;
+  }
+}
diff --git a/ReactAndroid/src/test/java/com/facebook/react/packagerconnection/JSPackagerClientTest.java b/ReactAndroid/src/test/java/com/facebook/react/packagerconnection/JSPackagerClientTest.java
index 6c67780e0cec24..d930384a3bb6e3 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/packagerconnection/JSPackagerClientTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/packagerconnection/JSPackagerClientTest.java
@@ -9,6 +9,7 @@
 
 package com.facebook.react.packagerconnection;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -32,11 +33,19 @@ private static Map<String, JSPackagerClient.RequestHandler> createRH(
     return m;
   }
 
+  private PackagerConnectionSettings mSettings;
+
+  @Before
+  public void setUp() {
+    mSettings = mock(PackagerConnectionSettings.class);
+    when(mSettings.getDebugServerHost()).thenReturn("ws://not_needed");
+    when(mSettings.getPackageName()).thenReturn("my_test_package");
+  }
+
   @Test
   public void test_onMessage_ShouldTriggerNotification() throws IOException {
     JSPackagerClient.RequestHandler handler = mock(JSPackagerClient.RequestHandler.class);
-    final JSPackagerClient client = new JSPackagerClient("ws://not_needed", createRH("methodValue", handler));
-    WebSocket webSocket = mock(WebSocket.class);
+    final JSPackagerClient client = new JSPackagerClient("test_client", mSettings, createRH("methodValue", handler));
 
     client.onMessage(
         ResponseBody.create(
@@ -49,8 +58,7 @@ public void test_onMessage_ShouldTriggerNotification() throws IOException {
   @Test
   public void test_onMessage_ShouldTriggerRequest() throws IOException {
     JSPackagerClient.RequestHandler handler = mock(JSPackagerClient.RequestHandler.class);
-    final JSPackagerClient client = new JSPackagerClient("ws://not_needed", createRH("methodValue", handler));
-    WebSocket webSocket = mock(WebSocket.class);
+    final JSPackagerClient client = new JSPackagerClient("test_client", mSettings, createRH("methodValue", handler));
 
     client.onMessage(
         ResponseBody.create(
@@ -63,8 +71,7 @@ public void test_onMessage_ShouldTriggerRequest() throws IOException {
   @Test
   public void test_onMessage_WithoutParams_ShouldTriggerNotification() throws IOException {
     JSPackagerClient.RequestHandler handler = mock(JSPackagerClient.RequestHandler.class);
-    final JSPackagerClient client = new JSPackagerClient("ws://not_needed", createRH("methodValue", handler));
-    WebSocket webSocket = mock(WebSocket.class);
+    final JSPackagerClient client = new JSPackagerClient("test_client", mSettings, createRH("methodValue", handler));
 
     client.onMessage(
         ResponseBody.create(
@@ -77,8 +84,7 @@ public void test_onMessage_WithoutParams_ShouldTriggerNotification() throws IOEx
   @Test
   public void test_onMessage_WithInvalidContentType_ShouldNotTriggerCallback() throws IOException {
     JSPackagerClient.RequestHandler handler = mock(JSPackagerClient.RequestHandler.class);
-    final JSPackagerClient client = new JSPackagerClient("ws://not_needed", createRH("methodValue", handler));
-    WebSocket webSocket = mock(WebSocket.class);
+    final JSPackagerClient client = new JSPackagerClient("test_client", mSettings, createRH("methodValue", handler));
 
     client.onMessage(
         ResponseBody.create(
@@ -91,8 +97,7 @@ public void test_onMessage_WithInvalidContentType_ShouldNotTriggerCallback() thr
   @Test
   public void test_onMessage_WithoutMethod_ShouldNotTriggerCallback() throws IOException {
     JSPackagerClient.RequestHandler handler = mock(JSPackagerClient.RequestHandler.class);
-    final JSPackagerClient client = new JSPackagerClient("ws://not_needed", createRH("methodValue", handler));
-    WebSocket webSocket = mock(WebSocket.class);
+    final JSPackagerClient client = new JSPackagerClient("test_client", mSettings, createRH("methodValue", handler));
 
     client.onMessage(
         ResponseBody.create(
@@ -105,8 +110,7 @@ public void test_onMessage_WithoutMethod_ShouldNotTriggerCallback() throws IOExc
   @Test
   public void test_onMessage_With_Null_Action_ShouldNotTriggerCallback() throws IOException {
     JSPackagerClient.RequestHandler handler = mock(JSPackagerClient.RequestHandler.class);
-    final JSPackagerClient client = new JSPackagerClient("ws://not_needed", createRH("methodValue", handler));
-    WebSocket webSocket = mock(WebSocket.class);
+    final JSPackagerClient client = new JSPackagerClient("test_client", mSettings, createRH("methodValue", handler));
 
     client.onMessage(
         ResponseBody.create(
@@ -119,8 +123,7 @@ public void test_onMessage_With_Null_Action_ShouldNotTriggerCallback() throws IO
   @Test
   public void test_onMessage_WithInvalidMethod_ShouldNotTriggerCallback() throws IOException {
     JSPackagerClient.RequestHandler handler = mock(JSPackagerClient.RequestHandler.class);
-    final JSPackagerClient client = new JSPackagerClient("ws://not_needed", createRH("methodValue", handler));
-    WebSocket webSocket = mock(WebSocket.class);
+    final JSPackagerClient client = new JSPackagerClient("test_client", mSettings, createRH("methodValue", handler));
 
     client.onMessage(
         ResponseBody.create(
@@ -133,8 +136,7 @@ public void test_onMessage_WithInvalidMethod_ShouldNotTriggerCallback() throws I
   @Test
   public void test_onMessage_WrongVersion_ShouldNotTriggerCallback() throws IOException {
     JSPackagerClient.RequestHandler handler = mock(JSPackagerClient.RequestHandler.class);
-    final JSPackagerClient client = new JSPackagerClient("ws://not_needed", createRH("methodValue", handler));
-    WebSocket webSocket = mock(WebSocket.class);
+    final JSPackagerClient client = new JSPackagerClient("test_client", mSettings, createRH("methodValue", handler));
 
     client.onMessage(
         ResponseBody.create(
diff --git a/local-cli/server/util/messageSocket.js b/local-cli/server/util/messageSocket.js
index 45f9b06609a7ab..94b6eea1bd44e2 100644
--- a/local-cli/server/util/messageSocket.js
+++ b/local-cli/server/util/messageSocket.js
@@ -130,7 +130,7 @@ function attachToServer(server, path) {
           result = {};
           clients.forEach((otherWs, otherId) => {
             if (clientId !== otherId) {
-              result[otherId] = url.parse(otherWs.upgradeReq.url).query;
+              result[otherId] = url.parse(otherWs.upgradeReq.url, true).query;
             }
           });
           break;

From b956c111d8a32863587854c86de597562e44de3a Mon Sep 17 00:00:00 2001
From: Emil Sjolander <emilsj@fb.com>
Date: Fri, 17 Mar 2017 13:20:48 -0700
Subject: [PATCH 076/366] Revert D4716024: [yoga] Avoid transfering cached
 layout information to java

Differential Revision: D4716024

fbshipit-source-id: 7276b4bbf072aa444c5ae9fd1a3d62ea87a0cec1
---
 .../src/main/jni/first-party/yogajni/jni/YGJNI.cpp  |  6 ------
 ReactCommon/yoga/yoga/Yoga.c                        | 13 -------------
 ReactCommon/yoga/yoga/Yoga.h                        |  2 --
 3 files changed, 21 deletions(-)

diff --git a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
index c0b0dd49505ec6..72e704c8c82e81 100644
--- a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
+++ b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
@@ -24,12 +24,6 @@ static void YGTransferLayoutDirection(YGNodeRef node, alias_ref<jobject> javaNod
 }
 
 static void YGTransferLayoutOutputsRecursive(YGNodeRef root) {
-  // If the node is using a cached layout it means we have already
-  // transfered it to java.
-  if (YGNodeIsUsingCachedLayout(root)) {
-    return;
-  }
-
   if (auto obj = YGNodeJobject(root)->lockLocal()) {
     static auto widthField = obj->getClass()->getField<jfloat>("mWidth");
     static auto heightField = obj->getClass()->getField<jfloat>("mHeight");
diff --git a/ReactCommon/yoga/yoga/Yoga.c b/ReactCommon/yoga/yoga/Yoga.c
index 1b3961c9c16804..65a3ba46f98707 100644
--- a/ReactCommon/yoga/yoga/Yoga.c
+++ b/ReactCommon/yoga/yoga/Yoga.c
@@ -459,18 +459,6 @@ void YGNodeCopyStyle(const YGNodeRef dstNode, const YGNodeRef srcNode) {
   }
 }
 
-static int YGNodeRootGenerationCount(const YGNodeRef node) {
-  if (node->parent) {
-    return YGNodeRootGenerationCount(node->parent);
-  } else {
-    return node->layout.generationCount;
-  }
-}
-
-bool YGNodeIsUsingCachedLayout(const YGNodeRef node) {
-  return node->layout.generationCount != YGNodeRootGenerationCount(node);
-}
-
 static inline float YGResolveFlexGrow(const YGNodeRef node) {
   if (!YGFloatIsUndefined(node->style.flexGrow)) {
     return node->style.flexGrow;
@@ -1823,7 +1811,6 @@ static void YGZeroOutLayoutRecursivly(const YGNodeRef node) {
   node->layout.cachedLayout.widthMeasureMode = YGMeasureModeExactly;
   node->layout.cachedLayout.computedWidth = 0;
   node->layout.cachedLayout.computedHeight = 0;
-  node->layout.generationCount = gCurrentGenerationCount;
   const uint32_t childCount = YGNodeGetChildCount(node);
   for (uint32_t i = 0; i < childCount; i++) {
     const YGNodeRef child = YGNodeListGet(node->children, i);
diff --git a/ReactCommon/yoga/yoga/Yoga.h b/ReactCommon/yoga/yoga/Yoga.h
index 054b5dc5079a0e..d5c5258a7dca15 100644
--- a/ReactCommon/yoga/yoga/Yoga.h
+++ b/ReactCommon/yoga/yoga/Yoga.h
@@ -218,8 +218,6 @@ YG_NODE_LAYOUT_EDGE_PROPERTY(float, Margin);
 YG_NODE_LAYOUT_EDGE_PROPERTY(float, Border);
 YG_NODE_LAYOUT_EDGE_PROPERTY(float, Padding);
 
-bool YGNodeIsUsingCachedLayout(const YGNodeRef node);
-
 WIN_EXPORT void YGSetLogger(YGLogger logger);
 WIN_EXPORT void YGLog(YGLogLevel level, const char *message, ...);
 

From e69a80f7f9c330bb0dfa3f72181f503b3982a714 Mon Sep 17 00:00:00 2001
From: Emil Sjolander <emilsj@fb.com>
Date: Fri, 17 Mar 2017 13:21:10 -0700
Subject: [PATCH 077/366] Revert D4713847: [rn] Optimize ReactShadowNode by
 more manually converting between string and enums

Differential Revision: D4713847

fbshipit-source-id: c1a60ad133ec010556c0b4c6e5fd39cdc0eab337
---
 .../react/uimanager/LayoutShadowNode.java     | 301 ++----------------
 1 file changed, 26 insertions(+), 275 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java
index e57c9f6158ecb4..3f5020e3ad4157 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java
@@ -4,9 +4,9 @@
 
 import javax.annotation.Nullable;
 
+import java.util.Locale;
 
 import com.facebook.react.bridge.Dynamic;
-import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
 import com.facebook.react.bridge.ReadableType;
 
 import com.facebook.yoga.YogaAlign;
@@ -246,34 +246,9 @@ public void setFlexDirection(@Nullable String flexDirection) {
     if (isVirtual()) {
       return;
     }
-
-    if (flexDirection == null) {
-      setFlexDirection(YogaFlexDirection.COLUMN);
-      return;
-    }
-
-    switch (flexDirection) {
-      case "column": {
-        setFlexDirection(YogaFlexDirection.COLUMN);
-        break;
-      }
-      case "column-reverse": {
-        setFlexDirection(YogaFlexDirection.COLUMN_REVERSE);
-        break;
-      }
-      case "row": {
-        setFlexDirection(YogaFlexDirection.ROW);
-        break;
-      }
-      case "row-reverse": {
-        setFlexDirection(YogaFlexDirection.ROW_REVERSE);
-        break;
-      }
-      default: {
-        throw new JSApplicationIllegalArgumentException(
-            "invalid value for flexDirection: " + flexDirection);
-      }
-    }
+    setFlexDirection(
+        flexDirection == null ? YogaFlexDirection.COLUMN : YogaFlexDirection.valueOf(
+            flexDirection.toUpperCase(Locale.US).replace("-", "_")));
   }
 
   @ReactProp(name = ViewProps.FLEX_WRAP)
@@ -281,25 +256,12 @@ public void setFlexWrap(@Nullable String flexWrap) {
     if (isVirtual()) {
       return;
     }
-
-    if (flexWrap == null) {
+    if (flexWrap == null || flexWrap.equals("nowrap")) {
       setFlexWrap(YogaWrap.NO_WRAP);
-      return;
-    }
-
-    switch (flexWrap) {
-      case "nowrap": {
-        setFlexWrap(YogaWrap.NO_WRAP);
-        break;
-      }
-      case "wrap": {
-        setFlexWrap(YogaWrap.WRAP);
-        break;
-      }
-      default: {
-        throw new JSApplicationIllegalArgumentException(
-            "invalid value for flexWrap: " + flexWrap);
-      }
+    } else if (flexWrap.equals("wrap")) {
+      setFlexWrap(YogaWrap.WRAP);
+    } else {
+      throw new IllegalArgumentException("Unknown flexWrap value: " + flexWrap);
     }
   }
 
@@ -308,50 +270,8 @@ public void setAlignSelf(@Nullable String alignSelf) {
     if (isVirtual()) {
       return;
     }
-
-    if (alignSelf == null) {
-      setAlignSelf(YogaAlign.AUTO);
-      return;
-    }
-
-    switch (alignSelf) {
-      case "auto": {
-        setAlignSelf(YogaAlign.FLEX_START);
-        return;
-      }
-      case "flex-start": {
-        setAlignSelf(YogaAlign.CENTER);
-        return;
-      }
-      case "center": {
-        setAlignSelf(YogaAlign.CENTER);
-        return;
-      }
-      case "flex-end": {
-        setAlignSelf(YogaAlign.FLEX_END);
-        return;
-      }
-      case "stretch": {
-        setAlignSelf(YogaAlign.STRETCH);
-        return;
-      }
-      case "baseline": {
-        setAlignSelf(YogaAlign.BASELINE);
-        return;
-      }
-      case "space-between": {
-        setAlignSelf(YogaAlign.SPACE_BETWEEN);
-        return;
-      }
-      case "space-around": {
-        setAlignSelf(YogaAlign.SPACE_AROUND);
-        return;
-      }
-      default: {
-        throw new JSApplicationIllegalArgumentException(
-            "invalid value for alignSelf: " + alignSelf);
-      }
-    }
+    setAlignSelf(alignSelf == null ? YogaAlign.AUTO : YogaAlign.valueOf(
+            alignSelf.toUpperCase(Locale.US).replace("-", "_")));
   }
 
   @ReactProp(name = ViewProps.ALIGN_ITEMS)
@@ -359,50 +279,9 @@ public void setAlignItems(@Nullable String alignItems) {
     if (isVirtual()) {
       return;
     }
-
-    if (alignItems == null) {
-      setAlignItems(YogaAlign.STRETCH);
-      return;
-    }
-
-    switch (alignItems) {
-      case "auto": {
-        setAlignItems(YogaAlign.FLEX_START);
-        return;
-      }
-      case "flex-start": {
-        setAlignItems(YogaAlign.CENTER);
-        return;
-      }
-      case "center": {
-        setAlignItems(YogaAlign.CENTER);
-        return;
-      }
-      case "flex-end": {
-        setAlignItems(YogaAlign.FLEX_END);
-        return;
-      }
-      case "stretch": {
-        setAlignItems(YogaAlign.STRETCH);
-        return;
-      }
-      case "baseline": {
-        setAlignItems(YogaAlign.BASELINE);
-        return;
-      }
-      case "space-between": {
-        setAlignItems(YogaAlign.SPACE_BETWEEN);
-        return;
-      }
-      case "space-around": {
-        setAlignItems(YogaAlign.SPACE_AROUND);
-        return;
-      }
-      default: {
-        throw new JSApplicationIllegalArgumentException(
-            "invalid value for alignItems: " + alignItems);
-      }
-    }
+    setAlignItems(
+        alignItems == null ? YogaAlign.STRETCH : YogaAlign.valueOf(
+            alignItems.toUpperCase(Locale.US).replace("-", "_")));
   }
 
   @ReactProp(name = ViewProps.ALIGN_CONTENT)
@@ -410,50 +289,9 @@ public void setAlignContent(@Nullable String alignContent) {
     if (isVirtual()) {
       return;
     }
-
-    if (alignContent == null) {
-      setAlignContent(YogaAlign.FLEX_START);
-      return;
-    }
-
-    switch (alignContent) {
-      case "auto": {
-        setAlignContent(YogaAlign.FLEX_START);
-        return;
-      }
-      case "flex-start": {
-        setAlignContent(YogaAlign.CENTER);
-        return;
-      }
-      case "center": {
-        setAlignContent(YogaAlign.CENTER);
-        return;
-      }
-      case "flex-end": {
-        setAlignContent(YogaAlign.FLEX_END);
-        return;
-      }
-      case "stretch": {
-        setAlignContent(YogaAlign.STRETCH);
-        return;
-      }
-      case "baseline": {
-        setAlignContent(YogaAlign.BASELINE);
-        return;
-      }
-      case "space-between": {
-        setAlignContent(YogaAlign.SPACE_BETWEEN);
-        return;
-      }
-      case "space-around": {
-        setAlignContent(YogaAlign.SPACE_AROUND);
-        return;
-      }
-      default: {
-        throw new JSApplicationIllegalArgumentException(
-            "invalid value for alignContent: " + alignContent);
-      }
-    }
+    setAlignContent(
+        alignContent == null ? YogaAlign.FLEX_START : YogaAlign.valueOf(
+            alignContent.toUpperCase(Locale.US).replace("-", "_")));
   }
 
   @ReactProp(name = ViewProps.JUSTIFY_CONTENT)
@@ -461,38 +299,8 @@ public void setJustifyContent(@Nullable String justifyContent) {
     if (isVirtual()) {
       return;
     }
-
-    if (justifyContent == null) {
-      setJustifyContent(YogaJustify.FLEX_START);
-      return;
-    }
-
-    switch (justifyContent) {
-      case "flex-start": {
-        setJustifyContent(YogaJustify.FLEX_START);
-        break;
-      }
-      case "center": {
-        setJustifyContent(YogaJustify.CENTER);
-        break;
-      }
-      case "flex-end": {
-        setJustifyContent(YogaJustify.FLEX_END);
-        break;
-      }
-      case "space-between": {
-        setJustifyContent(YogaJustify.SPACE_BETWEEN);
-        break;
-      }
-      case "space-around": {
-        setJustifyContent(YogaJustify.SPACE_AROUND);
-        break;
-      }
-      default: {
-        throw new JSApplicationIllegalArgumentException(
-            "invalid value for justifyContent: " + justifyContent);
-      }
-    }
+    setJustifyContent(justifyContent == null ? YogaJustify.FLEX_START : YogaJustify.valueOf(
+            justifyContent.toUpperCase(Locale.US).replace("-", "_")));
   }
 
   @ReactProp(name = ViewProps.OVERFLOW)
@@ -500,30 +308,8 @@ public void setOverflow(@Nullable String overflow) {
     if (isVirtual()) {
       return;
     }
-
-    if (overflow == null) {
-      setOverflow(YogaOverflow.VISIBLE);
-      return;
-    }
-
-    switch (overflow) {
-      case "visible": {
-        setOverflow(YogaOverflow.VISIBLE);
-        break;
-      }
-      case "hidden": {
-        setOverflow(YogaOverflow.HIDDEN);
-        break;
-      }
-      case "scroll": {
-        setOverflow(YogaOverflow.SCROLL);
-        break;
-      }
-      default: {
-        throw new JSApplicationIllegalArgumentException(
-            "invalid value for overflow: " + overflow);
-      }
-    }
+    setOverflow(overflow == null ? YogaOverflow.VISIBLE : YogaOverflow.valueOf(
+            overflow.toUpperCase(Locale.US).replace("-", "_")));
   }
 
   @ReactProp(name = ViewProps.DISPLAY)
@@ -531,26 +317,8 @@ public void setDisplay(@Nullable String display) {
     if (isVirtual()) {
       return;
     }
-
-    if (display == null) {
-      setDisplay(YogaDisplay.FLEX);
-      return;
-    }
-
-    switch (display) {
-      case "flex": {
-        setDisplay(YogaDisplay.FLEX);
-        break;
-      }
-      case "none": {
-        setDisplay(YogaDisplay.NONE);
-        break;
-      }
-      default: {
-        throw new JSApplicationIllegalArgumentException(
-            "invalid value for display: " + display);
-      }
-    }
+    setDisplay(display == null ? YogaDisplay.FLEX : YogaDisplay.valueOf(
+            display.toUpperCase(Locale.US).replace("-", "_")));
   }
 
   @ReactPropGroup(names = {
@@ -656,26 +424,9 @@ public void setPosition(@Nullable String position) {
     if (isVirtual()) {
       return;
     }
-
-    if (position == null) {
-      setPositionType(YogaPositionType.RELATIVE);
-      return;
-    }
-
-    switch (position) {
-      case "relative": {
-        setPositionType(YogaPositionType.RELATIVE);
-        break;
-      }
-      case "absolute": {
-        setPositionType(YogaPositionType.ABSOLUTE);
-        break;
-      }
-      default: {
-        throw new JSApplicationIllegalArgumentException(
-            "invalid value for position: " + position);
-      }
-    }
+    YogaPositionType positionType = position == null ?
+        YogaPositionType.RELATIVE : YogaPositionType.valueOf(position.toUpperCase(Locale.US));
+    setPositionType(positionType);
   }
 
   @Override

From 238fd4ad190e294068cab341d57ef8800fa70e55 Mon Sep 17 00:00:00 2001
From: "Andrew Y. Chen" <ayc@fb.com>
Date: Fri, 17 Mar 2017 16:30:27 -0700
Subject: [PATCH 078/366] Move idle detection classes to its own directory

Reviewed By: AaaChiuuu

Differential Revision: D4676282

fbshipit-source-id: 1b07e66ba638d4293eec65cb4e336f21dfb78218
---
 .../java/com/facebook/react/testing/BUCK      |   6 +-
 .../ReactAppInstrumentationTestCase.java      |   2 +-
 .../react/testing/ReactAppTestActivity.java   |   2 +
 .../react/testing/ReactIdleDetectionUtil.java |   2 +-
 .../testing/ReactIntegrationTestCase.java     |   2 +
 .../testing/SingleTouchGestureGenerator.java  |   2 +
 .../facebook/react/testing/idledetection/BUCK |  14 ++
 .../{ => idledetection}/IdleWaiter.java       |   2 +-
 .../ReactBridgeIdleSignaler.java              |   2 +-
 .../idledetection/ReactIdleDetectionUtil.java | 125 ++++++++++++++++++
 .../java/com/facebook/react/tests/BUCK        |   1 +
 11 files changed, 155 insertions(+), 5 deletions(-)
 create mode 100644 ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/BUCK
 rename ReactAndroid/src/androidTest/java/com/facebook/react/testing/{ => idledetection}/IdleWaiter.java (90%)
 rename ReactAndroid/src/androidTest/java/com/facebook/react/testing/{ => idledetection}/ReactBridgeIdleSignaler.java (97%)
 create mode 100644 ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactIdleDetectionUtil.java

diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
index 5cf6affe9a6fab..6814e3aa316138 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
@@ -2,7 +2,10 @@ include_defs("//ReactAndroid/DEFS")
 
 android_library(
     name = "testing",
-    srcs = glob(["**/*.java"]),
+    srcs = glob(
+        ["**/*.java"],
+        excludes = ["idledetection/**/*.java"],
+    ),
     visibility = [
         "PUBLIC",
     ],
@@ -25,5 +28,6 @@ android_library(
         react_native_target("java/com/facebook/react/modules/debug:interfaces"),
         react_native_target("java/com/facebook/react/shell:shell"),
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
+        react_native_integration_tests_target("java/com/facebook/react/testing/idledetection:idledetection"),
     ],
 )
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppInstrumentationTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppInstrumentationTestCase.java
index aaba651def949c..eeb8c02e06715d 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppInstrumentationTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppInstrumentationTestCase.java
@@ -20,6 +20,7 @@
 
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.testing.idledetection.IdleWaiter;
 
 /**
  * Base class for instrumentation tests that runs React based react application in UI mode
@@ -123,7 +124,6 @@ public void run() {
       }
     };
 
-
     getActivity().runOnUiThread(getScreenshotRunnable);
     try {
       if (!latch.await(5000, TimeUnit.MILLISECONDS)) {
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java
index 022e7826c1fe83..11edda17a429b0 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java
@@ -28,6 +28,8 @@
 import com.facebook.react.common.LifecycleState;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.facebook.react.shell.MainReactPackage;
+import com.facebook.react.testing.idledetection.ReactBridgeIdleSignaler;
+import com.facebook.react.testing.idledetection.ReactIdleDetectionUtil;
 import com.facebook.react.uimanager.UIImplementationProvider;
 
 public class ReactAppTestActivity extends FragmentActivity implements
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIdleDetectionUtil.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIdleDetectionUtil.java
index 49e2219327b96f..af6ca2ebb82a55 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIdleDetectionUtil.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIdleDetectionUtil.java
@@ -6,7 +6,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package com.facebook.react.testing;
+package com.facebook.react.testing.idledetection;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java
index 752c89ea618161..77f5492c36cafd 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java
@@ -32,6 +32,8 @@
 import com.facebook.react.common.futures.SimpleSettableFuture;
 import com.facebook.react.devsupport.interfaces.DevSupportManager;
 import com.facebook.react.modules.core.Timing;
+import com.facebook.react.testing.idledetection.ReactBridgeIdleSignaler;
+import com.facebook.react.testing.idledetection.ReactIdleDetectionUtil;
 import com.facebook.soloader.SoLoader;
 
 import static org.mockito.Mockito.mock;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/SingleTouchGestureGenerator.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/SingleTouchGestureGenerator.java
index 278facbcb280b4..f0ae877a953d42 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/SingleTouchGestureGenerator.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/SingleTouchGestureGenerator.java
@@ -13,6 +13,8 @@
 import android.view.View;
 import android.view.ViewConfiguration;
 
+import com.facebook.react.testing.idledetection.IdleWaiter;
+
 /**
  * Provides methods for generating touch events and dispatching them directly to a given view.
  * Events scenarios are based on {@link android.test.TouchUtils} but they get gets dispatched
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/BUCK
new file mode 100644
index 00000000000000..f6b33535737d3f
--- /dev/null
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/BUCK
@@ -0,0 +1,14 @@
+include_defs("//ReactAndroid/DEFS")
+
+android_library(
+    name = "idledetection",
+    srcs = glob(["**/*.java"]),
+    visibility = [
+        "PUBLIC",
+    ],
+    deps = [
+        react_native_dep("third-party/java/testing-support-lib:runner"),
+        react_native_target("java/com/facebook/react/bridge:bridge"),
+        react_native_target("java/com/facebook/react/modules/core:core"),
+    ],
+)
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/IdleWaiter.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/IdleWaiter.java
similarity index 90%
rename from ReactAndroid/src/androidTest/java/com/facebook/react/testing/IdleWaiter.java
rename to ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/IdleWaiter.java
index 98884c1033a375..1b94b7c1fc88db 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/IdleWaiter.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/IdleWaiter.java
@@ -6,7 +6,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package com.facebook.react.testing;
+package com.facebook.react.testing.idledetection;
 
 /**
  * Interface for something that knows how to wait for bridge and UI idle.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactBridgeIdleSignaler.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactBridgeIdleSignaler.java
similarity index 97%
rename from ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactBridgeIdleSignaler.java
rename to ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactBridgeIdleSignaler.java
index ffd941f9a228e6..4aaa451e43ab24 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactBridgeIdleSignaler.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactBridgeIdleSignaler.java
@@ -6,7 +6,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package com.facebook.react.testing;
+package com.facebook.react.testing.idledetection;
 
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactIdleDetectionUtil.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactIdleDetectionUtil.java
new file mode 100644
index 00000000000000..af6ca2ebb82a55
--- /dev/null
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactIdleDetectionUtil.java
@@ -0,0 +1,125 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ * This source code is licensed under the BSD-style license found in the
+ * 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.
+ */
+
+package com.facebook.react.testing.idledetection;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import android.app.Instrumentation;
+import android.os.SystemClock;
+import android.support.test.InstrumentationRegistry;
+
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.UiThreadUtil;
+import com.facebook.react.modules.core.ChoreographerCompat;
+
+public class ReactIdleDetectionUtil {
+
+  /**
+   * Waits for both the UI thread and bridge to be idle. It determines this by waiting for the
+   * bridge to become idle, then waiting for the UI thread to become idle, then checking if the
+   * bridge is idle again (if the bridge was idle before and is still idle after running the UI
+   * thread to idle, then there are no more events to process in either place).
+   * <p/>
+   * Also waits for any Choreographer callbacks to run after the initial sync since things like UI
+   * events are initiated from Choreographer callbacks.
+   */
+  public static void waitForBridgeAndUIIdle(
+      ReactBridgeIdleSignaler idleSignaler,
+      final ReactContext reactContext,
+      long timeoutMs) {
+    UiThreadUtil.assertNotOnUiThread();
+
+    long startTime = SystemClock.uptimeMillis();
+    waitInner(idleSignaler, timeoutMs);
+
+    long timeToWait = Math.max(1, timeoutMs - (SystemClock.uptimeMillis() - startTime));
+    waitForChoreographer(timeToWait);
+    waitForJSIdle(reactContext);
+
+    timeToWait = Math.max(1, timeoutMs - (SystemClock.uptimeMillis() - startTime));
+    waitInner(idleSignaler, timeToWait);
+    timeToWait = Math.max(1, timeoutMs - (SystemClock.uptimeMillis() - startTime));
+    waitForChoreographer(timeToWait);
+  }
+
+  private static void waitForChoreographer(long timeToWait) {
+    final int waitFrameCount = 2;
+    final CountDownLatch latch = new CountDownLatch(1);
+    UiThreadUtil.runOnUiThread(
+        new Runnable() {
+          @Override
+          public void run() {
+            ChoreographerCompat.getInstance().postFrameCallback(
+                new ChoreographerCompat.FrameCallback() {
+
+                  private int frameCount = 0;
+
+                  @Override
+                  public void doFrame(long frameTimeNanos) {
+                    frameCount++;
+                    if (frameCount == waitFrameCount) {
+                      latch.countDown();
+                    } else {
+                      ChoreographerCompat.getInstance().postFrameCallback(this);
+                    }
+                  }
+                });
+          }
+        });
+    try {
+      if (!latch.await(timeToWait, TimeUnit.MILLISECONDS)) {
+        throw new RuntimeException("Timed out waiting for Choreographer");
+      }
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  private static void waitForJSIdle(ReactContext reactContext) {
+    if (!reactContext.hasActiveCatalystInstance()) {
+      return;
+    }
+    final CountDownLatch latch = new CountDownLatch(1);
+
+    reactContext.runOnJSQueueThread(
+        new Runnable() {
+          @Override
+          public void run() {
+            latch.countDown();
+          }
+        });
+
+    try {
+      if (!latch.await(5000, TimeUnit.MILLISECONDS)) {
+        throw new RuntimeException("Timed out waiting for JS thread");
+      }
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  private static void waitInner(ReactBridgeIdleSignaler idleSignaler, long timeToWait) {
+    // TODO gets broken in gradle, do we need it?
+    Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+    long startTime = SystemClock.uptimeMillis();
+    boolean bridgeWasIdle = false;
+    while (SystemClock.uptimeMillis() - startTime < timeToWait) {
+      boolean bridgeIsIdle = idleSignaler.isBridgeIdle();
+      if (bridgeIsIdle && bridgeWasIdle) {
+        return;
+      }
+      bridgeWasIdle = bridgeIsIdle;
+      long newTimeToWait = Math.max(1, timeToWait - (SystemClock.uptimeMillis() - startTime));
+      idleSignaler.waitForIdle(newTimeToWait);
+      instrumentation.waitForIdleSync();
+    }
+    throw new RuntimeException("Timed out waiting for bridge and UI idle!");
+  }
+}
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK
index 8188c87c6175c0..6e07e5fd24ae1f 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK
@@ -5,6 +5,7 @@ deps = [
     react_native_dep("third-party/java/jsr-305:jsr-305"),
     react_native_dep("third-party/java/junit:junit"),
     react_native_integration_tests_target("java/com/facebook/react/testing:testing"),
+    react_native_integration_tests_target("java/com/facebook/react/testing/idledetection:idledetection"),
     react_native_target("java/com/facebook/react:react"),
     react_native_target("java/com/facebook/react/bridge:bridge"),
     react_native_target("java/com/facebook/react/common:common"),

From 95c192619372e6b3dfdc55aeafa8f44faf013ecf Mon Sep 17 00:00:00 2001
From: Ashwin Bharambe <ashwin@fb.com>
Date: Fri, 17 Mar 2017 16:47:51 -0700
Subject: [PATCH 079/366] Introduce `DeviceInfo` as a new native module

Summary:
The `UIManager` already has a lot of responsibilities and is deeply
tied with React Native's view architecture. This diff separates out a
`DeviceInfo` native module to provide information about screen dimensions and
font scale, etc.

Reviewed By: fkgozali

Differential Revision: D4713834

fbshipit-source-id: f2ee93acf876a4221c29a8c731f5abeffbb97974
---
 Libraries/Utilities/DeviceInfo.js             |  20 +++
 Libraries/Utilities/Dimensions.js             |   4 +-
 .../react-native-implementation.js            |   1 +
 React/Modules/RCTDeviceInfo.h                 |  17 +++
 React/Modules/RCTDeviceInfo.m                 | 116 ++++++++++++++++++
 React/Modules/RCTUIManager.m                  |  57 ---------
 React/React.xcodeproj/project.pbxproj         |  12 ++
 React/ReactCxx.xcodeproj/project.pbxproj      |  12 ++
 .../java/com/facebook/react/tests/BUCK        |   1 +
 ...alystNativeJSToJavaParametersTestCase.java |   2 +
 ...talystNativeJavaToJSArgumentsTestCase.java |   2 +
 ...ystNativeJavaToJSReturnValuesTestCase.java |   2 +
 .../tests/CatalystUIManagerTestCase.java      |   2 +
 .../facebook/react/tests/JSLocaleTest.java    |   2 +
 .../react/tests/ProgressBarTestCase.java      |   2 +
 .../react/tests/ViewRenderingTestCase.java    |   2 +
 .../src/main/java/com/facebook/react/BUCK     |   1 +
 .../facebook/react/CoreModulesPackage.java    |   9 ++
 .../com/facebook/react/ReactRootView.java     |   4 +-
 .../facebook/react/modules/deviceinfo/BUCK    |  17 +++
 .../modules/deviceinfo/DeviceInfoModule.java  | 105 ++++++++++++++++
 .../react/uimanager/UIManagerModule.java      |  26 +---
 .../uimanager/UIManagerModuleConstants.java   |  31 +----
 .../UIManagerModuleConstantsHelper.java       |   5 +-
 jest/setup.js                                 |  18 +--
 25 files changed, 345 insertions(+), 125 deletions(-)
 create mode 100644 Libraries/Utilities/DeviceInfo.js
 create mode 100644 React/Modules/RCTDeviceInfo.h
 create mode 100644 React/Modules/RCTDeviceInfo.m
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/BUCK
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java

diff --git a/Libraries/Utilities/DeviceInfo.js b/Libraries/Utilities/DeviceInfo.js
new file mode 100644
index 00000000000000..d398f808312459
--- /dev/null
+++ b/Libraries/Utilities/DeviceInfo.js
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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 DeviceInfo
+ * @flow
+ */
+'use strict';
+
+const DeviceInfo = require('NativeModules').DeviceInfo;
+
+const invariant = require('invariant');
+
+invariant(DeviceInfo, 'DeviceInfo native module is not installed correctly');
+
+module.exports = DeviceInfo;
diff --git a/Libraries/Utilities/Dimensions.js b/Libraries/Utilities/Dimensions.js
index 2204ba4fcc331a..76b4098b8589cd 100644
--- a/Libraries/Utilities/Dimensions.js
+++ b/Libraries/Utilities/Dimensions.js
@@ -11,9 +11,9 @@
  */
 'use strict';
 
+var DeviceInfo = require('DeviceInfo');
 var EventEmitter = require('EventEmitter');
 var Platform = require('Platform');
-var UIManager = require('UIManager');
 var RCTDeviceEventEmitter = require('RCTDeviceEventEmitter');
 
 var invariant = require('fbjs/lib/invariant');
@@ -128,7 +128,7 @@ class Dimensions {
   }
 }
 
-Dimensions.set(UIManager.Dimensions);
+Dimensions.set(DeviceInfo.Dimensions);
 RCTDeviceEventEmitter.addListener('didUpdateDimensions', function(update) {
   Dimensions.set(update);
 });
diff --git a/Libraries/react-native/react-native-implementation.js b/Libraries/react-native/react-native-implementation.js
index d11a202215d013..3eff5dedd60ebe 100644
--- a/Libraries/react-native/react-native-implementation.js
+++ b/Libraries/react-native/react-native-implementation.js
@@ -85,6 +85,7 @@ const ReactNative = {
   get CameraRoll() { return require('CameraRoll'); },
   get Clipboard() { return require('Clipboard'); },
   get DatePickerAndroid() { return require('DatePickerAndroid'); },
+  get DeviceInfo() { return require('DeviceInfo'); },
   get Dimensions() { return require('Dimensions'); },
   get Easing() { return require('Easing'); },
   get I18nManager() { return require('I18nManager'); },
diff --git a/React/Modules/RCTDeviceInfo.h b/React/Modules/RCTDeviceInfo.h
new file mode 100644
index 00000000000000..2ff2ad965d5a08
--- /dev/null
+++ b/React/Modules/RCTDeviceInfo.h
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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.
+ */
+
+#import <UIKit/UIKit.h>
+
+#import <React/RCTBridge.h>
+#import <React/RCTBridgeModule.h>
+
+@interface RCTDeviceInfo : NSObject <RCTBridgeModule, RCTInvalidating>
+
+@end
diff --git a/React/Modules/RCTDeviceInfo.m b/React/Modules/RCTDeviceInfo.m
new file mode 100644
index 00000000000000..ef4b71a79ee411
--- /dev/null
+++ b/React/Modules/RCTDeviceInfo.m
@@ -0,0 +1,116 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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.
+ */
+
+#import "RCTDeviceInfo.h"
+
+#import "RCTAccessibilityManager.h"
+#import "RCTAssert.h"
+#import "RCTEventDispatcher.h"
+#import "RCTUtils.h"
+
+@implementation RCTDeviceInfo {
+#if !TARGET_OS_TV
+  UIInterfaceOrientation _currentInterfaceOrientation;
+#endif
+}
+
+@synthesize bridge = _bridge;
+
+RCT_EXPORT_MODULE()
+
+- (dispatch_queue_t)methodQueue
+{
+  return dispatch_get_main_queue();
+}
+
+- (void)setBridge:(RCTBridge *)bridge
+{
+  _bridge = bridge;
+
+  [[NSNotificationCenter defaultCenter] addObserver:self
+                                           selector:@selector(didReceiveNewContentSizeMultiplier)
+                                               name:RCTAccessibilityManagerDidUpdateMultiplierNotification
+                                             object:_bridge.accessibilityManager];
+#if !TARGET_OS_TV
+  _currentInterfaceOrientation = [RCTSharedApplication() statusBarOrientation];
+
+  [[NSNotificationCenter defaultCenter] addObserver:self
+                                           selector:@selector(interfaceOrientationDidChange)
+                                               name:UIApplicationDidChangeStatusBarOrientationNotification
+                                             object:nil];
+#endif
+}
+
+static NSDictionary *RCTExportedDimensions(RCTBridge *bridge)
+{
+  RCTAssertMainQueue();
+
+  // Don't use RCTScreenSize since it the interface orientation doesn't apply to it
+  CGRect screenSize = [[UIScreen mainScreen] bounds];
+  NSDictionary *dims = @{
+                         @"width": @(screenSize.size.width),
+                         @"height": @(screenSize.size.height),
+                         @"scale": @(RCTScreenScale()),
+                         @"fontScale": @(bridge.accessibilityManager.multiplier)
+                         };
+  return @{
+           @"window": dims,
+           @"screen": dims
+           };
+}
+
+- (void)invalidate
+{
+  dispatch_async(dispatch_get_main_queue(), ^{
+    self->_bridge = nil;
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+  });
+}
+
+- (NSDictionary<NSString *, id> *)constantsToExport
+{
+  NSMutableDictionary<NSString *, NSDictionary *> *constants = [NSMutableDictionary new];
+  constants[@"Dimensions"] = RCTExportedDimensions(_bridge);
+  return constants;
+}
+
+- (void)didReceiveNewContentSizeMultiplier
+{
+  // Report the event across the bridge.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+  [_bridge.eventDispatcher sendDeviceEventWithName:@"didUpdateDimensions"
+                                              body:RCTExportedDimensions(_bridge)];
+#pragma clang diagnostic pop
+}
+
+
+- (void)interfaceOrientationDidChange
+{
+#if !TARGET_OS_TV
+  UIInterfaceOrientation nextOrientation = [RCTSharedApplication() statusBarOrientation];
+
+  // Update when we go from portrait to landscape, or landscape to portrait
+  if ((UIInterfaceOrientationIsPortrait(_currentInterfaceOrientation) &&
+       !UIInterfaceOrientationIsPortrait(nextOrientation)) ||
+      (UIInterfaceOrientationIsLandscape(_currentInterfaceOrientation) &&
+       !UIInterfaceOrientationIsLandscape(nextOrientation))) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+        [_bridge.eventDispatcher sendDeviceEventWithName:@"didUpdateDimensions"
+                                                    body:RCTExportedDimensions(_bridge)];
+#pragma clang diagnostic pop
+      }
+
+  _currentInterfaceOrientation = nextOrientation;
+#endif
+}
+
+
+@end
diff --git a/React/Modules/RCTUIManager.m b/React/Modules/RCTUIManager.m
index b672cafbe1046b..6a1576236f01d9 100644
--- a/React/Modules/RCTUIManager.m
+++ b/React/Modules/RCTUIManager.m
@@ -225,9 +225,6 @@ @implementation RCTUIManager
   NSDictionary *_componentDataByName;
 
   NSMutableSet<id<RCTComponent>> *_bridgeTransactionListeners;
-#if !TARGET_OS_TV
-  UIInterfaceOrientation _currentInterfaceOrientation;
-#endif
 }
 
 @synthesize bridge = _bridge;
@@ -239,8 +236,6 @@ - (void)didReceiveNewContentSizeMultiplier
   // Report the event across the bridge.
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-  [_bridge.eventDispatcher sendDeviceEventWithName:@"didUpdateDimensions"
-                                              body:RCTExportedDimensions(_bridge)];
   [_bridge.eventDispatcher sendDeviceEventWithName:@"didUpdateContentSizeMultiplier"
                                               body:@([_bridge.accessibilityManager multiplier])];
 #pragma clang diagnostic pop
@@ -252,28 +247,6 @@ - (void)didReceiveNewContentSizeMultiplier
   });
 }
 
-- (void)interfaceOrientationDidChange
-{
-#if !TARGET_OS_TV
-  UIInterfaceOrientation nextOrientation =
-    [RCTSharedApplication() statusBarOrientation];
-
-  // Update when we go from portrait to landscape, or landscape to portrait
-  if ((UIInterfaceOrientationIsPortrait(_currentInterfaceOrientation) &&
-      !UIInterfaceOrientationIsPortrait(nextOrientation)) ||
-      (UIInterfaceOrientationIsLandscape(_currentInterfaceOrientation) &&
-      !UIInterfaceOrientationIsLandscape(nextOrientation))) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    [_bridge.eventDispatcher sendDeviceEventWithName:@"didUpdateDimensions"
-                                                body:RCTExportedDimensions(_bridge)];
-#pragma clang diagnostic pop
-  }
-
-  _currentInterfaceOrientation = nextOrientation;
-#endif
-}
-
 - (void)invalidate
 {
   /**
@@ -351,13 +324,6 @@ - (void)setBridge:(RCTBridge *)bridge
                                            selector:@selector(didReceiveNewContentSizeMultiplier)
                                                name:RCTAccessibilityManagerDidUpdateMultiplierNotification
                                              object:_bridge.accessibilityManager];
-#if !TARGET_OS_TV
-  [[NSNotificationCenter defaultCenter] addObserver:self
-                                           selector:@selector(interfaceOrientationDidChange)
-                                               name:UIApplicationDidChangeStatusBarOrientationNotification
-                                             object:nil];
-#endif
-
   [RCTAnimation initializeStatics];
 }
 
@@ -1544,35 +1510,12 @@ static void RCTMeasureLayout(RCTShadowView *view,
      constants[name] = moduleConstants;
   }];
 
-#if !TARGET_OS_TV
-  _currentInterfaceOrientation = [RCTSharedApplication() statusBarOrientation];
-#endif
-
   constants[@"customBubblingEventTypes"] = bubblingEvents;
   constants[@"customDirectEventTypes"] = directEvents;
-  constants[@"Dimensions"] = RCTExportedDimensions(_bridge);
 
   return constants;
 }
 
-static NSDictionary *RCTExportedDimensions(RCTBridge *bridge)
-{
-  RCTAssertMainQueue();
-
-  // Don't use RCTScreenSize since it the interface orientation doesn't apply to it
-  CGRect screenSize = [[UIScreen mainScreen] bounds];
-  NSDictionary *dims = @{
-    @"width": @(screenSize.size.width),
-    @"height": @(screenSize.size.height),
-    @"scale": @(RCTScreenScale()),
-    @"fontScale": @(bridge.accessibilityManager.multiplier)
-  };
-  return @{
-    @"window": dims,
-    @"screen": dims
-  };
-}
-
 RCT_EXPORT_METHOD(configureNextLayoutAnimation:(NSDictionary *)config
                   withCallback:(RCTResponseSenderBlock)callback
                   errorCallback:(__unused RCTResponseSenderBlock)errorCallback)
diff --git a/React/React.xcodeproj/project.pbxproj b/React/React.xcodeproj/project.pbxproj
index 1e2d1be93f3a55..a79946fbfa4b40 100644
--- a/React/React.xcodeproj/project.pbxproj
+++ b/React/React.xcodeproj/project.pbxproj
@@ -738,6 +738,10 @@
 		B50558421E43E14000F71A00 /* RCTDevSettings.mm in Sources */ = {isa = PBXBuildFile; fileRef = B505583D1E43DFB900F71A00 /* RCTDevSettings.mm */; };
 		B50558431E43E64600F71A00 /* RCTDevSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = B505583C1E43DFB900F71A00 /* RCTDevSettings.h */; };
 		B95154321D1B34B200FE7B80 /* RCTActivityIndicatorView.m in Sources */ = {isa = PBXBuildFile; fileRef = B95154311D1B34B200FE7B80 /* RCTActivityIndicatorView.m */; };
+		CF85BC321E79EC6B00F1EF3B /* RCTDeviceInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = CF85BC301E79EC6B00F1EF3B /* RCTDeviceInfo.h */; };
+		CF85BC331E79EC6B00F1EF3B /* RCTDeviceInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = CF85BC311E79EC6B00F1EF3B /* RCTDeviceInfo.m */; };
+		CF85BC341E79EC7A00F1EF3B /* RCTDeviceInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = CF85BC301E79EC6B00F1EF3B /* RCTDeviceInfo.h */; };
+		CF85BC351E79EC7D00F1EF3B /* RCTDeviceInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = CF85BC311E79EC6B00F1EF3B /* RCTDeviceInfo.m */; };
 		E9B20B7B1B500126007A2DA7 /* RCTAccessibilityManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E9B20B7A1B500126007A2DA7 /* RCTAccessibilityManager.m */; };
 /* End PBXBuildFile section */
 
@@ -1381,6 +1385,8 @@
 		B505583D1E43DFB900F71A00 /* RCTDevSettings.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTDevSettings.mm; sourceTree = "<group>"; };
 		B95154301D1B34B200FE7B80 /* RCTActivityIndicatorView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTActivityIndicatorView.h; sourceTree = "<group>"; };
 		B95154311D1B34B200FE7B80 /* RCTActivityIndicatorView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTActivityIndicatorView.m; sourceTree = "<group>"; };
+		CF85BC301E79EC6B00F1EF3B /* RCTDeviceInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTDeviceInfo.h; sourceTree = "<group>"; };
+		CF85BC311E79EC6B00F1EF3B /* RCTDeviceInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTDeviceInfo.m; sourceTree = "<group>"; };
 		E3BBC8EB1ADE6F47001BBD81 /* RCTTextDecorationLineType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTTextDecorationLineType.h; sourceTree = "<group>"; };
 		E9B20B791B500126007A2DA7 /* RCTAccessibilityManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTAccessibilityManager.h; sourceTree = "<group>"; };
 		E9B20B7A1B500126007A2DA7 /* RCTAccessibilityManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTAccessibilityManager.m; sourceTree = "<group>"; };
@@ -1456,6 +1462,8 @@
 				B505583B1E43DFB900F71A00 /* RCTDevMenu.m */,
 				B505583C1E43DFB900F71A00 /* RCTDevSettings.h */,
 				B505583D1E43DFB900F71A00 /* RCTDevSettings.mm */,
+				CF85BC301E79EC6B00F1EF3B /* RCTDeviceInfo.h */,
+				CF85BC311E79EC6B00F1EF3B /* RCTDeviceInfo.m */,
 				13D9FEE91CDCCECF00158BD7 /* RCTEventEmitter.h */,
 				13D9FEEA1CDCCECF00158BD7 /* RCTEventEmitter.m */,
 				13B07FE91A69327A00A75B9A /* RCTExceptionsManager.h */,
@@ -1869,6 +1877,7 @@
 				3D302F3E1DF828F800D6DDAE /* RCTKeyCommands.h in Headers */,
 				3D302F3F1DF828F800D6DDAE /* RCTLog.h in Headers */,
 				3D302F401DF828F800D6DDAE /* RCTModuleData.h in Headers */,
+				CF85BC341E79EC7A00F1EF3B /* RCTDeviceInfo.h in Headers */,
 				3D302F411DF828F800D6DDAE /* RCTModuleMethod.h in Headers */,
 				3D302F421DF828F800D6DDAE /* RCTMultipartDataTask.h in Headers */,
 				3D302F431DF828F800D6DDAE /* RCTMultipartStreamReader.h in Headers */,
@@ -2055,6 +2064,7 @@
 				A12E9E2A1E5DEB860029001B /* RCTReconnectingWebSocket.h in Headers */,
 				3D80DA311DF820620028D040 /* RCTJavaScriptLoader.h in Headers */,
 				3D80DA321DF820620028D040 /* RCTJSStackFrame.h in Headers */,
+				CF85BC321E79EC6B00F1EF3B /* RCTDeviceInfo.h in Headers */,
 				3D80DA331DF820620028D040 /* RCTKeyCommands.h in Headers */,
 				3D80DA341DF820620028D040 /* RCTLog.h in Headers */,
 				3D80DA351DF820620028D040 /* RCTModuleData.h in Headers */,
@@ -2465,6 +2475,7 @@
 				2D3B5EC21D9B093B00451313 /* RCTProfile.m in Sources */,
 				2D3B5ECB1D9B096200451313 /* RCTConvert+CoreLocation.m in Sources */,
 				A12E9E261E5DEB510029001B /* RCTPackagerClientResponder.m in Sources */,
+				CF85BC351E79EC7D00F1EF3B /* RCTDeviceInfo.m in Sources */,
 				2D3B5EEE1D9B09DA00451313 /* RCTView.m in Sources */,
 				594AD5D01E46D87500B07237 /* RCTScrollContentShadowView.m in Sources */,
 				2D3B5E981D9B089500451313 /* RCTConvert.m in Sources */,
@@ -2675,6 +2686,7 @@
 				945929C41DD62ADD00653A7D /* RCTConvert+Transform.m in Sources */,
 				13AB90C11B6FA36700713B4F /* RCTComponentData.m in Sources */,
 				13B0801B1A69489C00A75B9A /* RCTNavigatorManager.m in Sources */,
+				CF85BC331E79EC6B00F1EF3B /* RCTDeviceInfo.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/React/ReactCxx.xcodeproj/project.pbxproj b/React/ReactCxx.xcodeproj/project.pbxproj
index 1d9ac80584e181..cef7f0d506bb2b 100644
--- a/React/ReactCxx.xcodeproj/project.pbxproj
+++ b/React/ReactCxx.xcodeproj/project.pbxproj
@@ -980,6 +980,10 @@
 		AC70D2E91DE489E4002E6351 /* RCTJavaScriptLoader.mm in Sources */ = {isa = PBXBuildFile; fileRef = AC70D2E81DE489E4002E6351 /* RCTJavaScriptLoader.mm */; };
 		B233E6EA1D2D845D00BC68BA /* RCTI18nManager.m in Sources */ = {isa = PBXBuildFile; fileRef = B233E6E91D2D845D00BC68BA /* RCTI18nManager.m */; };
 		B95154321D1B34B200FE7B80 /* RCTActivityIndicatorView.m in Sources */ = {isa = PBXBuildFile; fileRef = B95154311D1B34B200FE7B80 /* RCTActivityIndicatorView.m */; };
+		CF2731C01E7B8DE40044CA4F /* RCTDeviceInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = CF2731BE1E7B8DE40044CA4F /* RCTDeviceInfo.h */; };
+		CF2731C11E7B8DE40044CA4F /* RCTDeviceInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = CF2731BF1E7B8DE40044CA4F /* RCTDeviceInfo.m */; };
+		CF2731C21E7B8DEF0044CA4F /* RCTDeviceInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = CF2731BE1E7B8DE40044CA4F /* RCTDeviceInfo.h */; };
+		CF2731C31E7B8DF30044CA4F /* RCTDeviceInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = CF2731BF1E7B8DE40044CA4F /* RCTDeviceInfo.m */; };
 		E9B20B7B1B500126007A2DA7 /* RCTAccessibilityManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E9B20B7A1B500126007A2DA7 /* RCTAccessibilityManager.m */; };
 /* End PBXBuildFile section */
 
@@ -1828,6 +1832,8 @@
 		B233E6E91D2D845D00BC68BA /* RCTI18nManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTI18nManager.m; sourceTree = "<group>"; };
 		B95154301D1B34B200FE7B80 /* RCTActivityIndicatorView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTActivityIndicatorView.h; sourceTree = "<group>"; };
 		B95154311D1B34B200FE7B80 /* RCTActivityIndicatorView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTActivityIndicatorView.m; sourceTree = "<group>"; };
+		CF2731BE1E7B8DE40044CA4F /* RCTDeviceInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTDeviceInfo.h; sourceTree = "<group>"; };
+		CF2731BF1E7B8DE40044CA4F /* RCTDeviceInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTDeviceInfo.m; sourceTree = "<group>"; };
 		E3BBC8EB1ADE6F47001BBD81 /* RCTTextDecorationLineType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTTextDecorationLineType.h; sourceTree = "<group>"; };
 		E9B20B791B500126007A2DA7 /* RCTAccessibilityManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTAccessibilityManager.h; sourceTree = "<group>"; };
 		E9B20B7A1B500126007A2DA7 /* RCTAccessibilityManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTAccessibilityManager.m; sourceTree = "<group>"; };
@@ -2034,6 +2040,8 @@
 		13B07FE01A69315300A75B9A /* Modules */ = {
 			isa = PBXGroup;
 			children = (
+				CF2731BE1E7B8DE40044CA4F /* RCTDeviceInfo.h */,
+				CF2731BF1E7B8DE40044CA4F /* RCTDeviceInfo.m */,
 				130E3D861E6A082100ACE484 /* RCTDevSettings.h */,
 				130E3D871E6A082100ACE484 /* RCTDevSettings.mm */,
 				369123DF1DDC75850095B341 /* JSCSamplingProfiler.h */,
@@ -2595,6 +2603,7 @@
 				3D302F881DF828F800D6DDAE /* RCTRootShadowView.h in Headers */,
 				3D302F891DF828F800D6DDAE /* RCTScrollableProtocol.h in Headers */,
 				3D302F8A1DF828F800D6DDAE /* RCTScrollView.h in Headers */,
+				CF2731C21E7B8DEF0044CA4F /* RCTDeviceInfo.h in Headers */,
 				3D302F8B1DF828F800D6DDAE /* RCTScrollViewManager.h in Headers */,
 				3D302F8C1DF828F800D6DDAE /* RCTSegmentedControl.h in Headers */,
 				3D302F8D1DF828F800D6DDAE /* RCTSegmentedControlManager.h in Headers */,
@@ -2837,6 +2846,7 @@
 				3D80DA5E1DF820620028D040 /* RCTProfile.h in Headers */,
 				3D80DA5F1DF820620028D040 /* RCTActivityIndicatorView.h in Headers */,
 				3D80DA601DF820620028D040 /* RCTActivityIndicatorViewManager.h in Headers */,
+				CF2731C01E7B8DE40044CA4F /* RCTDeviceInfo.h in Headers */,
 				3D80DA611DF820620028D040 /* RCTAnimationType.h in Headers */,
 				3D80DA621DF820620028D040 /* RCTAutoInsetsProtocol.h in Headers */,
 				3D80DA631DF820620028D040 /* RCTBorderDrawing.h in Headers */,
@@ -3314,6 +3324,7 @@
 				2D3B5EA51D9B08C700451313 /* RCTRootView.m in Sources */,
 				2D3B5EAC1D9B08EF00451313 /* RCTJSCExecutor.mm in Sources */,
 				13134C871E296B2A00B9F3CB /* RCTCxxBridge.mm in Sources */,
+				CF2731C31E7B8DF30044CA4F /* RCTDeviceInfo.m in Sources */,
 				2D3B5EB11D9B090100451313 /* RCTAppState.m in Sources */,
 				2D3B5EC21D9B093B00451313 /* RCTProfile.m in Sources */,
 				13134C931E296B2A00B9F3CB /* RCTNativeModule.mm in Sources */,
@@ -3524,6 +3535,7 @@
 				14C2CA781B3ACB0400E6CBB2 /* RCTBatchedBridge.m in Sources */,
 				13E067591A70F44B002CDEE1 /* UIView+React.m in Sources */,
 				14F484561AABFCE100FDF6B9 /* RCTSliderManager.m in Sources */,
+				CF2731C11E7B8DE40044CA4F /* RCTDeviceInfo.m in Sources */,
 				3D7AA9C41E548CD5001955CF /* NSDataBigString.mm in Sources */,
 				13D033631C1837FE0021DC29 /* RCTClipboard.m in Sources */,
 				14C2CA741B3AC64300E6CBB2 /* RCTModuleData.mm in Sources */,
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK
index 6e07e5fd24ae1f..992351f62026aa 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK
@@ -15,6 +15,7 @@ deps = [
     react_native_target("java/com/facebook/react/modules/datepicker:datepicker"),
     react_native_target("java/com/facebook/react/modules/share:share"),
     react_native_target("java/com/facebook/react/modules/systeminfo:systeminfo"),
+    react_native_target("java/com/facebook/react/modules/deviceinfo:deviceinfo"),
     react_native_target("java/com/facebook/react/modules/timepicker:timepicker"),
     react_native_target("java/com/facebook/react/touch:touch"),
     react_native_target("java/com/facebook/react/uimanager:uimanager"),
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJSToJavaParametersTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJSToJavaParametersTestCase.java
index ec2dcd5a82d876..7c2da8c8803fe1 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJSToJavaParametersTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJSToJavaParametersTestCase.java
@@ -31,6 +31,7 @@
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.modules.appstate.AppStateModule;
+import com.facebook.react.modules.deviceinfo.DeviceInfoModule;
 import com.facebook.react.modules.systeminfo.AndroidInfoModule;
 import com.facebook.react.testing.FakeWebSocketModule;
 import com.facebook.react.testing.ReactIntegrationTestCase;
@@ -101,6 +102,7 @@ public void run() {
     mCatalystInstance = ReactTestHelper.catalystInstanceBuilder(this)
         .addNativeModule(mRecordingTestModule)
         .addNativeModule(new AndroidInfoModule())
+        .addNativeModule(new DeviceInfoModule(getContext()))
         .addNativeModule(new AppStateModule(getContext()))
         .addNativeModule(new FakeWebSocketModule())
         .addNativeModule(mUIManager)
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSArgumentsTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSArgumentsTestCase.java
index 8d21e7f4291ed0..60b951ca5dcd90 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSArgumentsTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSArgumentsTestCase.java
@@ -20,6 +20,7 @@
 import com.facebook.react.bridge.WritableNativeArray;
 import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.modules.appstate.AppStateModule;
+import com.facebook.react.modules.deviceinfo.DeviceInfoModule;
 import com.facebook.react.testing.AssertModule;
 import com.facebook.react.testing.FakeWebSocketModule;
 import com.facebook.react.testing.ReactIntegrationTestCase;
@@ -78,6 +79,7 @@ public void run() {
 
     mInstance = ReactTestHelper.catalystInstanceBuilder(this)
         .addNativeModule(mAssertModule)
+        .addNativeModule(new DeviceInfoModule(getContext()))
         .addNativeModule(new AppStateModule(getContext()))
         .addNativeModule(new FakeWebSocketModule())
         .addJSModule(TestJavaToJSArgumentsModule.class)
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSReturnValuesTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSReturnValuesTestCase.java
index 236a51a0f3fc37..8dcc2d0d69fb17 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSReturnValuesTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSReturnValuesTestCase.java
@@ -19,6 +19,7 @@
 import com.facebook.react.bridge.WritableNativeArray;
 import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.modules.appstate.AppStateModule;
+import com.facebook.react.modules.deviceinfo.DeviceInfoModule;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.testing.AssertModule;
 import com.facebook.react.testing.FakeWebSocketModule;
@@ -119,6 +120,7 @@ protected void setUp() throws Exception {
 
     mInstance = ReactTestHelper.catalystInstanceBuilder(this)
         .addNativeModule(mAssertModule)
+        .addNativeModule(new DeviceInfoModule(getContext()))
         .addNativeModule(new AppStateModule(getContext()))
         .addNativeModule(new FakeWebSocketModule())
         .addJSModule(TestJavaToJSReturnValuesModule.class)
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystUIManagerTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystUIManagerTestCase.java
index 6f09e69af41c88..3bcecc6eca748b 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystUIManagerTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystUIManagerTestCase.java
@@ -22,6 +22,7 @@
 import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.modules.appstate.AppStateModule;
+import com.facebook.react.modules.deviceinfo.DeviceInfoModule;
 import com.facebook.react.modules.systeminfo.AndroidInfoModule;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.UIImplementation;
@@ -96,6 +97,7 @@ public void run() {
     jsModule = ReactTestHelper.catalystInstanceBuilder(this)
         .addNativeModule(uiManager)
         .addNativeModule(new AndroidInfoModule())
+        .addNativeModule(new DeviceInfoModule(getContext()))
         .addNativeModule(new AppStateModule(getContext()))
         .addNativeModule(new FakeWebSocketModule())
         .addJSModule(UIManagerTestModule.class)
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/JSLocaleTest.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/JSLocaleTest.java
index 67ccb8997d35da..4c524e020de001 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/JSLocaleTest.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/JSLocaleTest.java
@@ -19,6 +19,7 @@
 import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.modules.appstate.AppStateModule;
+import com.facebook.react.modules.deviceinfo.DeviceInfoModule;
 import com.facebook.react.uimanager.UIImplementationProvider;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.ViewManager;
@@ -62,6 +63,7 @@ public void run() {
     mInstance = ReactTestHelper.catalystInstanceBuilder(this)
         .addNativeModule(mStringRecordingModule)
         .addNativeModule(mUIManager)
+        .addNativeModule(new DeviceInfoModule(getContext()))
         .addNativeModule(new AppStateModule(getContext()))
         .addNativeModule(new FakeWebSocketModule())
         .addJSModule(TestJSLocaleModule.class)
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ProgressBarTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ProgressBarTestCase.java
index 9865ce343e0db5..40983432aedfd3 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ProgressBarTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ProgressBarTestCase.java
@@ -25,6 +25,7 @@
 import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.modules.appstate.AppStateModule;
+import com.facebook.react.modules.deviceinfo.DeviceInfoModule;
 import com.facebook.react.modules.systeminfo.AndroidInfoModule;
 import com.facebook.react.uimanager.UIImplementation;
 import com.facebook.react.uimanager.UIImplementationProvider;
@@ -87,6 +88,7 @@ public void run() {
     mInstance = ReactTestHelper.catalystInstanceBuilder(this)
         .addNativeModule(mUIManager)
         .addNativeModule(new AndroidInfoModule())
+        .addNativeModule(new DeviceInfoModule(getContext()))
         .addNativeModule(new AppStateModule(getContext()))
         .addNativeModule(new FakeWebSocketModule())
         .addJSModule(ProgressBarTestModule.class)
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ViewRenderingTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ViewRenderingTestCase.java
index 4c84c71816cc6e..956269d9683771 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ViewRenderingTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ViewRenderingTestCase.java
@@ -20,6 +20,7 @@
 import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.modules.appstate.AppStateModule;
+import com.facebook.react.modules.deviceinfo.DeviceInfoModule;
 import com.facebook.react.modules.systeminfo.AndroidInfoModule;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.UIImplementation;
@@ -68,6 +69,7 @@ public void run() {
     mCatalystInstance = ReactTestHelper.catalystInstanceBuilder(this)
         .addNativeModule(uiManager)
         .addNativeModule(new AndroidInfoModule())
+        .addNativeModule(new DeviceInfoModule(getContext()))
         .addNativeModule(new AppStateModule(getContext()))
         .addNativeModule(new FakeWebSocketModule())
         .addJSModule(ViewRenderingTestModule.class)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/BUCK b/ReactAndroid/src/main/java/com/facebook/react/BUCK
index 7d1d9342225aba..2982e603c15b76 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/BUCK
@@ -19,6 +19,7 @@ DEPS = [
     react_native_target("java/com/facebook/react/modules/core:core"),
     react_native_target("java/com/facebook/react/modules/debug:debug"),
     react_native_target("java/com/facebook/react/modules/debug:interfaces"),
+    react_native_target("java/com/facebook/react/modules/deviceinfo:deviceinfo"),
     react_native_target("java/com/facebook/react/modules/systeminfo:systeminfo"),
     react_native_target("java/com/facebook/react/modules/toast:toast"),
     react_native_target("java/com/facebook/react/uimanager:uimanager"),
diff --git a/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java b/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java
index 2827c47203bb8c..88e53489065cda 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java
@@ -36,6 +36,7 @@
 import com.facebook.react.modules.core.Timing;
 import com.facebook.react.modules.debug.AnimationsDebugModule;
 import com.facebook.react.modules.debug.SourceCodeModule;
+import com.facebook.react.modules.deviceinfo.DeviceInfoModule;
 import com.facebook.react.modules.systeminfo.AndroidInfoModule;
 import com.facebook.react.modules.appregistry.AppRegistry;
 import com.facebook.react.uimanager.UIImplementationProvider;
@@ -65,6 +66,7 @@
     SourceCodeModule.class,
     Timing.class,
     UIManagerModule.class,
+    DeviceInfoModule.class,
     // Debug only
     DebugComponentOwnershipModule.class,
     JSCHeapCapture.class,
@@ -151,6 +153,13 @@ public NativeModule get() {
           return createUIManager(reactContext);
         }
       }));
+    moduleSpecList.add(
+      new ModuleSpec(DeviceInfoModule.class, new Provider<NativeModule>() {
+        @Override
+        public NativeModule get() {
+          return new DeviceInfoModule(reactContext);
+        }
+      }));
 
     if (ReactBuildConfig.DEBUG) {
       moduleSpecList.add(
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
index 46ad7c6c47f658..8babff13d1d269 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
@@ -15,7 +15,6 @@
 import android.graphics.Rect;
 import android.os.Bundle;
 import android.util.AttributeSet;
-import android.util.DisplayMetrics;
 import android.view.MotionEvent;
 import android.view.Surface;
 import android.view.View;
@@ -32,6 +31,7 @@
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.common.annotations.VisibleForTesting;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
+import com.facebook.react.modules.deviceinfo.DeviceInfoModule;
 import com.facebook.react.uimanager.DisplayMetricsHolder;
 import com.facebook.react.uimanager.JSTouchDispatcher;
 import com.facebook.react.uimanager.PixelUtil;
@@ -396,7 +396,7 @@ private void emitOrientationChanged(final int newRotation) {
     private void emitUpdateDimensionsEvent() {
       mReactInstanceManager
           .getCurrentReactContext()
-          .getNativeModule(UIManagerModule.class)
+          .getNativeModule(DeviceInfoModule.class)
           .emitUpdateDimensionsEvent();
     }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/BUCK
new file mode 100644
index 00000000000000..14f601585c2cb7
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/BUCK
@@ -0,0 +1,17 @@
+include_defs("//ReactAndroid/DEFS")
+
+android_library(
+    name = "deviceinfo",
+    srcs = glob(["**/*.java"]),
+    visibility = [
+        "PUBLIC",
+    ],
+    deps = [
+        react_native_dep("third-party/java/jsr-305:jsr-305"),
+        react_native_target("java/com/facebook/react/bridge:bridge"),
+        react_native_target("java/com/facebook/react/common:common"),
+        react_native_target("java/com/facebook/react/module/annotations:annotations"),
+        react_native_target("java/com/facebook/react/modules/core:core"),
+        react_native_target("java/com/facebook/react/uimanager:uimanager"),
+    ],
+)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java
new file mode 100644
index 00000000000000..c7b5324145225b
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java
@@ -0,0 +1,105 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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.
+ */
+
+package com.facebook.react.modules.deviceinfo;
+
+import javax.annotation.Nullable;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import android.util.DisplayMetrics;
+
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.LifecycleEventListener;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.module.annotations.ReactModule;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
+import com.facebook.react.uimanager.DisplayMetricsHolder;
+
+/**
+ * Module that exposes Android Constants to JS.
+ */
+@ReactModule(name = "DeviceInfo")
+public class DeviceInfoModule extends ReactContextBaseJavaModule implements
+    LifecycleEventListener {
+
+  private float mFontScale;
+
+  public DeviceInfoModule(
+      ReactApplicationContext reactContext) {
+    super(reactContext);
+
+    mFontScale = getReactApplicationContext().getResources().getConfiguration().fontScale;
+  }
+
+  @Override
+  public String getName() {
+    return "DeviceInfo";
+  }
+
+  @Override
+  public @Nullable Map<String, Object> getConstants() {
+    HashMap<String, Object> constants = new HashMap<>();
+    constants.put(
+        "Dimensions",
+        getDimensionsConstants());
+    return constants;
+  }
+
+  @Override
+  public void onHostResume() {
+    float fontScale = getReactApplicationContext().getResources().getConfiguration().fontScale;
+    if (mFontScale != fontScale) {
+      mFontScale = fontScale;
+      emitUpdateDimensionsEvent();
+    }
+  }
+
+  @Override
+  public void onHostPause() {
+  }
+
+  @Override
+  public void onHostDestroy() {
+  }
+
+  public void emitUpdateDimensionsEvent() {
+    getReactApplicationContext()
+        .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+        .emit("didUpdateDimensions", getDimensionsConstants());
+  }
+
+  private WritableMap getDimensionsConstants() {
+    DisplayMetrics windowDisplayMetrics = DisplayMetricsHolder.getWindowDisplayMetrics();
+    DisplayMetrics screenDisplayMetrics = DisplayMetricsHolder.getScreenDisplayMetrics();
+
+    WritableMap windowDisplayMetricsMap = Arguments.createMap();
+    windowDisplayMetricsMap.putInt("width", windowDisplayMetrics.widthPixels);
+    windowDisplayMetricsMap.putInt("height", windowDisplayMetrics.heightPixels);
+    windowDisplayMetricsMap.putDouble("scale", windowDisplayMetrics.density);
+    windowDisplayMetricsMap.putDouble("fontScale", mFontScale);
+    windowDisplayMetricsMap.putDouble("densityDpi", windowDisplayMetrics.densityDpi);
+
+    WritableMap screenDisplayMetricsMap = Arguments.createMap();
+    screenDisplayMetricsMap.putInt("width", screenDisplayMetrics.widthPixels);
+    screenDisplayMetricsMap.putInt("height", screenDisplayMetrics.heightPixels);
+    screenDisplayMetricsMap.putDouble("scale", screenDisplayMetrics.density);
+    screenDisplayMetricsMap.putDouble("fontScale", mFontScale);
+    screenDisplayMetricsMap.putDouble("densityDpi", screenDisplayMetrics.densityDpi);
+
+    WritableMap dimensionsMap = Arguments.createMap();
+    dimensionsMap.putMap("windowPhysicalPixels", windowDisplayMetricsMap);
+    dimensionsMap.putMap("screenPhysicalPixels", screenDisplayMetricsMap);
+
+    return dimensionsMap;
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java
index 725554596559a1..bde687d5216930 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java
@@ -87,7 +87,6 @@ public class UIManagerModule extends ReactContextBaseJavaModule implements
   private final Map<String, Object> mModuleConstants;
   private final UIImplementation mUIImplementation;
   private final MemoryTrimCallback mMemoryTrimCallback = new MemoryTrimCallback();
-  private float mFontScale;
 
   private int mNextRootViewTag = 1;
   private int mBatchId = 0;
@@ -100,8 +99,7 @@ public UIManagerModule(
     super(reactContext);
     DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(reactContext);
     mEventDispatcher = new EventDispatcher(reactContext);
-    mFontScale = getReactApplicationContext().getResources().getConfiguration().fontScale;
-    mModuleConstants = createConstants(viewManagerList, lazyViewManagersEnabled, mFontScale);
+    mModuleConstants = createConstants(viewManagerList, lazyViewManagersEnabled);
     mUIImplementation = uiImplementationProvider
       .createUIImplementation(reactContext, viewManagerList, mEventDispatcher);
 
@@ -134,12 +132,6 @@ public void initialize() {
   @Override
   public void onHostResume() {
     mUIImplementation.onHostResume();
-
-    float fontScale = getReactApplicationContext().getResources().getConfiguration().fontScale;
-    if (mFontScale != fontScale) {
-      mFontScale = fontScale;
-      emitUpdateDimensionsEvent();
-    }
   }
 
   @Override
@@ -163,15 +155,13 @@ public void onCatalystInstanceDestroy() {
 
   private static Map<String, Object> createConstants(
     List<ViewManager> viewManagerList,
-    boolean lazyViewManagersEnabled,
-    float fontScale) {
+    boolean lazyViewManagersEnabled) {
     ReactMarker.logMarker(CREATE_UI_MANAGER_MODULE_CONSTANTS_START);
     Systrace.beginSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "CreateUIManagerConstants");
     try {
       return UIManagerModuleConstantsHelper.createConstants(
         viewManagerList,
-        lazyViewManagersEnabled,
-        fontScale);
+        lazyViewManagersEnabled);
     } finally {
       Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
       ReactMarker.logMarker(CREATE_UI_MANAGER_MODULE_CONSTANTS_END);
@@ -550,16 +540,6 @@ public void sendAccessibilityEvent(int tag, int eventType) {
     mUIImplementation.sendAccessibilityEvent(tag, eventType);
   }
 
-  public void emitUpdateDimensionsEvent() {
-    sendEvent("didUpdateDimensions", UIManagerModuleConstants.getDimensionsConstants(mFontScale));
-  }
-
-  private void sendEvent(String eventName, @Nullable WritableMap params) {
-    getReactApplicationContext()
-        .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-        .emit(eventName, params);
-  }
-
   /**
    * Schedule a block to be executed on the UI thread. Useful if you need to execute
    * view logic after all currently queued view updates have completed.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstants.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstants.java
index 7dc5602ae4b7c7..9dd93ac82f1e2f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstants.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstants.java
@@ -83,7 +83,7 @@
         .build();
   }
 
-  public static Map<String, Object> getConstants(float fontScale) {
+  public static Map<String, Object> getConstants() {
     HashMap<String, Object> constants = new HashMap<String, Object>();
     constants.put(
         "UIView",
@@ -97,10 +97,6 @@ public static Map<String, Object> getConstants(float fontScale) {
                 "ScaleAspectCenter",
                 ImageView.ScaleType.CENTER_INSIDE.ordinal())));
 
-    constants.put(
-        "Dimensions",
-        getDimensionsConstants(fontScale));
-
     constants.put(
         "StyleConstants",
         MapBuilder.of(
@@ -133,29 +129,4 @@ public static Map<String, Object> getConstants(float fontScale) {
 
     return constants;
   }
-
-  public static WritableMap getDimensionsConstants(float fontScale) {
-    DisplayMetrics windowDisplayMetrics = DisplayMetricsHolder.getWindowDisplayMetrics();
-    DisplayMetrics screenDisplayMetrics = DisplayMetricsHolder.getScreenDisplayMetrics();
-
-    WritableMap windowDisplayMetricsMap = Arguments.createMap();
-    windowDisplayMetricsMap.putInt("width", windowDisplayMetrics.widthPixels);
-    windowDisplayMetricsMap.putInt("height", windowDisplayMetrics.heightPixels);
-    windowDisplayMetricsMap.putDouble("scale", windowDisplayMetrics.density);
-    windowDisplayMetricsMap.putDouble("fontScale", fontScale);
-    windowDisplayMetricsMap.putDouble("densityDpi", windowDisplayMetrics.densityDpi);
-
-    WritableMap screenDisplayMetricsMap = Arguments.createMap();
-    screenDisplayMetricsMap.putInt("width", screenDisplayMetrics.widthPixels);
-    screenDisplayMetricsMap.putInt("height", screenDisplayMetrics.heightPixels);
-    screenDisplayMetricsMap.putDouble("scale", screenDisplayMetrics.density);
-    screenDisplayMetricsMap.putDouble("fontScale", fontScale);
-    screenDisplayMetricsMap.putDouble("densityDpi", screenDisplayMetrics.densityDpi);
-
-    WritableMap dimensionsMap = Arguments.createMap();
-    dimensionsMap.putMap("windowPhysicalPixels", windowDisplayMetricsMap);
-    dimensionsMap.putMap("screenPhysicalPixels", screenDisplayMetricsMap);
-    
-    return dimensionsMap;
-  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstantsHelper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstantsHelper.java
index dbbd283d0e3943..825f81dfe3220e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstantsHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstantsHelper.java
@@ -43,9 +43,8 @@
    */
   /* package */ static Map<String, Object> createConstants(
     List<ViewManager> viewManagers,
-    boolean lazyViewManagersEnabled,
-    float fontScale) {
-    Map<String, Object> constants = UIManagerModuleConstants.getConstants(fontScale);
+    boolean lazyViewManagersEnabled) {
+    Map<String, Object> constants = UIManagerModuleConstants.getConstants();
     Map bubblingEventTypesConstants = UIManagerModuleConstants.getBubblingEventTypeConstants();
     Map directEventTypesConstants = UIManagerModuleConstants.getDirectEventTypeConstants();
 
diff --git a/jest/setup.js b/jest/setup.js
index ee7ae562ae22a9..413d3b91a9260f 100644
--- a/jest/setup.js
+++ b/jest/setup.js
@@ -87,6 +87,16 @@ const mockNativeModules = {
   DataManager: {
     queryData: jest.fn(),
   },
+  DeviceInfo: {
+    Dimensions: {
+      window: {
+        fontScale: 2,
+        height: 1334,
+        scale: 2,
+        width: 750,
+      },
+    },
+  },
   FacebookSDK: {
     login: jest.fn(),
     logout: jest.fn(),
@@ -150,14 +160,6 @@ const mockNativeModules = {
     replaceExistingNonRootView: jest.fn(),
     customBubblingEventTypes: {},
     customDirectEventTypes: {},
-    Dimensions: {
-      window: {
-        fontScale: 2,
-        height: 1334,
-        scale: 2,
-        width: 750,
-      },
-    },
     ModalFullscreenView: {
       Constants: {},
     },

From 11814a5a81a1850a6c28c78252afa68be8348815 Mon Sep 17 00:00:00 2001
From: Ashwin Bharambe <ashwin@fb.com>
Date: Fri, 17 Mar 2017 16:47:56 -0700
Subject: [PATCH 080/366] Ensure `ResourceDrawableIdHelper` is thread-safe

Reviewed By: jaegs

Differential Revision: D4696625

fbshipit-source-id: e0aa7870ba02d8e6542c436d7f775bb251cf91ae
---
 .../imagehelper/ResourceDrawableIdHelper.java | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ResourceDrawableIdHelper.java b/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ResourceDrawableIdHelper.java
index fc0c041f02cf64..dd2465156add5b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ResourceDrawableIdHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ResourceDrawableIdHelper.java
@@ -10,6 +10,7 @@
 package com.facebook.react.views.imagehelper;
 
 import javax.annotation.Nullable;
+import javax.annotation.concurrent.ThreadSafe;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -21,12 +22,13 @@
 /**
  * Helper class for obtaining information about local images.
  */
+@ThreadSafe
 public class ResourceDrawableIdHelper {
 
   private Map<String, Integer> mResourceDrawableIdMap;
 
   private static final String LOCAL_RESOURCE_SCHEME = "res";
-  private static ResourceDrawableIdHelper sResourceDrawableIdHelper;
+  private static volatile ResourceDrawableIdHelper sResourceDrawableIdHelper;
 
   private ResourceDrawableIdHelper() {
     mResourceDrawableIdMap = new HashMap<String, Integer>();
@@ -34,12 +36,16 @@ private ResourceDrawableIdHelper() {
 
   public static ResourceDrawableIdHelper getInstance() {
     if (sResourceDrawableIdHelper == null) {
-      sResourceDrawableIdHelper = new ResourceDrawableIdHelper();
+      synchronized (ResourceDrawableIdHelper.class) {
+        if (sResourceDrawableIdHelper == null) {
+          sResourceDrawableIdHelper = new ResourceDrawableIdHelper();
+        }
+      }
     }
     return sResourceDrawableIdHelper;
   }
 
-  public void clear() {
+  public synchronized void clear() {
     mResourceDrawableIdMap.clear();
   }
 
@@ -48,15 +54,18 @@ public int getResourceDrawableId(Context context, @Nullable String name) {
       return 0;
     }
     name = name.toLowerCase().replace("-", "_");
-    if (mResourceDrawableIdMap.containsKey(name)) {
-      return mResourceDrawableIdMap.get(name);
-    }
-    int id = context.getResources().getIdentifier(
+
+    synchronized (this) {
+      if (mResourceDrawableIdMap.containsKey(name)) {
+        return mResourceDrawableIdMap.get(name);
+      }
+      int id = context.getResources().getIdentifier(
         name,
         "drawable",
         context.getPackageName());
-    mResourceDrawableIdMap.put(name, id);
-    return id;
+      mResourceDrawableIdMap.put(name, id);
+      return id;
+    }
   }
 
   public @Nullable Drawable getResourceDrawable(Context context, @Nullable String name) {

From f48b54bf6211dbbdd32839b0de68b1d0a451e486 Mon Sep 17 00:00:00 2001
From: Ashwin Bharambe <ashwin@fb.com>
Date: Fri, 17 Mar 2017 16:47:58 -0700
Subject: [PATCH 081/366] Expose RCTImageLocalAssetURL as a utility

Reviewed By: javache

Differential Revision: D4696627

fbshipit-source-id: 56d3e59983f524dfd5021835734b9b34203e20f2
---
 Libraries/Image/RCTLocalAssetImageLoader.m | 51 +-------------------
 React/Base/RCTUtils.h                      |  4 ++
 React/Base/RCTUtils.m                      | 54 ++++++++++++++++++++++
 3 files changed, 60 insertions(+), 49 deletions(-)

diff --git a/Libraries/Image/RCTLocalAssetImageLoader.m b/Libraries/Image/RCTLocalAssetImageLoader.m
index b1bf78c2ddaaaa..17acd15b88c29c 100644
--- a/Libraries/Image/RCTLocalAssetImageLoader.m
+++ b/Libraries/Image/RCTLocalAssetImageLoader.m
@@ -36,36 +36,6 @@ - (BOOL)shouldCacheLoadedImages
   return NO;
 }
 
-static NSString *bundleName(NSBundle *bundle)
-{
-  NSString *name = bundle.infoDictionary[@"CFBundleName"];
-  if (!name) {
-    name = [[bundle.bundlePath lastPathComponent] stringByDeletingPathExtension];
-  }
-  return name;
-}
-
-static NSBundle *bundleForPath(NSString *key)
-{
-  static NSMutableDictionary *bundleCache;
-  if (!bundleCache) {
-    bundleCache = [NSMutableDictionary new];
-    bundleCache[@"main"] = [NSBundle mainBundle];
-
-    // Initialize every bundle in the array
-    for (NSString *path in [[NSBundle mainBundle] pathsForResourcesOfType:@"bundle" inDirectory:nil]) {
-      [NSBundle bundleWithPath:path];
-    }
-
-    // The bundles initialized above will now also be in `allBundles`
-    for (NSBundle *bundle in [NSBundle allBundles]) {
-      bundleCache[bundleName(bundle)] = bundle;
-    }
-  }
-
-  return bundleCache[key];
-}
-
  - (RCTImageLoaderCancellationBlock)loadImageForURL:(NSURL *)imageURL
                                                size:(CGSize)size
                                               scale:(CGFloat)scale
@@ -80,31 +50,14 @@ - (RCTImageLoaderCancellationBlock)loadImageForURL:(NSURL *)imageURL
       return;
     }
 
-    NSString *imageName = RCTBundlePathForURL(imageURL);
-
-    NSBundle *bundle;
-    NSArray *imagePathComponents = [imageName pathComponents];
-    if ([imagePathComponents count] > 1 &&
-        [[[imagePathComponents firstObject] pathExtension] isEqualToString:@"bundle"]) {
-      NSString *bundlePath = [imagePathComponents firstObject];
-      bundle = bundleForPath([bundlePath stringByDeletingPathExtension]);
-      imageName = [imageName substringFromIndex:(bundlePath.length + 1)];
-    }
-
-    UIImage *image;
-    if (bundle) {
-      image = [UIImage imageNamed:imageName inBundle:bundle compatibleWithTraitCollection:nil];
-    } else {
-      image = [UIImage imageNamed:imageName];
-    }
-
+    UIImage *image = RCTImageFromLocalAssetURL(imageURL);
     if (image) {
       if (progressHandler) {
         progressHandler(1, 1);
       }
       completionHandler(nil, image);
     } else {
-      NSString *message = [NSString stringWithFormat:@"Could not find image named %@", imageName];
+      NSString *message = [NSString stringWithFormat:@"Could not find image %@", imageURL];
       RCTLogWarn(@"%@", message);
       completionHandler(RCTErrorWithMessage(message), nil);
     }
diff --git a/React/Base/RCTUtils.h b/React/Base/RCTUtils.h
index a277120e243acb..14e169ba22a9e3 100644
--- a/React/Base/RCTUtils.h
+++ b/React/Base/RCTUtils.h
@@ -114,6 +114,10 @@ RCT_EXTERN NSString *__nullable RCTBundlePathForURL(NSURL *__nullable URL);
 // Determines if a given image URL refers to a local image
 RCT_EXTERN BOOL RCTIsLocalAssetURL(NSURL *__nullable imageURL);
 
+// Returns an UIImage for a local image asset. Returns nil if the URL
+// does not correspond to a local asset.
+RCT_EXTERN UIImage *RCTImageFromLocalAssetURL(NSURL *imageURL);
+
 // Creates a new, unique temporary file path with the specified extension
 RCT_EXTERN NSString *__nullable RCTTempFilePath(NSString *__nullable extension, NSError **error);
 
diff --git a/React/Base/RCTUtils.m b/React/Base/RCTUtils.m
index 9617d0a3afb9db..80ff69ed538d49 100644
--- a/React/Base/RCTUtils.m
+++ b/React/Base/RCTUtils.m
@@ -599,6 +599,60 @@ BOOL RCTIsLocalAssetURL(NSURL *__nullable imageURL)
   return [extension isEqualToString:@"png"] || [extension isEqualToString:@"jpg"];
 }
 
+static NSString *bundleName(NSBundle *bundle)
+{
+  NSString *name = bundle.infoDictionary[@"CFBundleName"];
+  if (!name) {
+    name = [[bundle.bundlePath lastPathComponent] stringByDeletingPathExtension];
+  }
+  return name;
+}
+
+static NSBundle *bundleForPath(NSString *key)
+{
+  static NSMutableDictionary *bundleCache;
+  if (!bundleCache) {
+    bundleCache = [NSMutableDictionary new];
+    bundleCache[@"main"] = [NSBundle mainBundle];
+
+    // Initialize every bundle in the array
+    for (NSString *path in [[NSBundle mainBundle] pathsForResourcesOfType:@"bundle" inDirectory:nil]) {
+      [NSBundle bundleWithPath:path];
+    }
+
+    // The bundles initialized above will now also be in `allBundles`
+    for (NSBundle *bundle in [NSBundle allBundles]) {
+      bundleCache[bundleName(bundle)] = bundle;
+    }
+  }
+
+  return bundleCache[key];
+}
+
+UIImage *RCTImageFromLocalAssetURL(NSURL *imageURL)
+{
+  if (!RCTIsLocalAssetURL(imageURL)) {
+    return nil;
+  }
+
+  NSString *imageName = RCTBundlePathForURL(imageURL);
+
+  NSBundle *bundle;
+  NSArray *imagePathComponents = [imageName pathComponents];
+  if ([imagePathComponents count] > 1 &&
+      [[[imagePathComponents firstObject] pathExtension] isEqualToString:@"bundle"]) {
+    NSString *bundlePath = [imagePathComponents firstObject];
+    bundle = bundleForPath([bundlePath stringByDeletingPathExtension]);
+    imageName = [imageName substringFromIndex:(bundlePath.length + 1)];
+  }
+
+  if (bundle) {
+    return [UIImage imageNamed:imageName inBundle:bundle compatibleWithTraitCollection:nil];
+  } else {
+    return [UIImage imageNamed:imageName];
+  }
+}
+
 RCT_EXTERN NSString *__nullable RCTTempFilePath(NSString *extension, NSError **error)
 {
   static NSError *setupError = nil;

From 9c3e6ae9f0f246e5fd8cdc3599801c37d1c11690 Mon Sep 17 00:00:00 2001
From: Spencer Ahrens <sahrens@fb.com>
Date: Fri, 17 Mar 2017 22:02:04 -0700
Subject: [PATCH 082/366] Fix Animated.event attach/detach on component
 re-render

Summary:
Need to make sure `detach` happens on the old `scrollableNode` before it's unmounted and that `attach` happens on the new `scrollableNode` after it's mounted. This should also be more performant because the detach step no longer requires iterating through all the props, most of which are not animated, and we filter out unneeded updates if props or ref haven't changed.

= Test Plan =

Hook up native onscroll events in `FlatListExample` and toggle "debug" - before, the events would stop working because they would try to attach to the old unmounted node, but with this diff it keeps working as expected.

Reviewed By: fkgozali

Differential Revision: D4687186

fbshipit-source-id: 313a7964d4614190308490a51fc4f56abb6690f8
---
 .../Animated/src/AnimatedImplementation.js    | 74 +++++++++----------
 1 file changed, 35 insertions(+), 39 deletions(-)

diff --git a/Libraries/Animated/src/AnimatedImplementation.js b/Libraries/Animated/src/AnimatedImplementation.js
index 769b3b0164a64e..09c3c2129452a6 100644
--- a/Libraries/Animated/src/AnimatedImplementation.js
+++ b/Libraries/Animated/src/AnimatedImplementation.js
@@ -1510,9 +1510,9 @@ class AnimatedStyle extends AnimatedWithChildren {
 
   // Recursively get values for nested styles (like iOS's shadowOffset)
   __walkStyleAndGetValues(style) {
-    let updatedStyle = {};
-    for (let key in style) {
-      let value = style[key];
+    const updatedStyle = {};
+    for (const key in style) {
+      const value = style[key];
       if (value instanceof Animated) {
         if (!value.__isNative) {
           // We cannot use value of natively driven nodes this way as the value we have access from
@@ -1535,9 +1535,9 @@ class AnimatedStyle extends AnimatedWithChildren {
 
   // Recursively get animated values for nested styles (like iOS's shadowOffset)
   __walkStyleAndGetAnimatedValues(style) {
-    let updatedStyle = {};
-    for (let key in style) {
-      let value = style[key];
+    const updatedStyle = {};
+    for (const key in style) {
+      const value = style[key];
       if (value instanceof Animated) {
         updatedStyle[key] = value.__getAnimatedValue();
       } else if (value && !Array.isArray(value) && typeof value === 'object') {
@@ -1690,7 +1690,9 @@ class AnimatedProps extends Animated {
   }
 
   setNativeView(animatedView: any): void {
-    invariant(this._animatedView === undefined, 'Animated view already set.');
+    if (this._animatedView === animatedView) {
+      return;
+    }
     this._animatedView = animatedView;
     if (this.__isNative) {
       this.__connectAnimatedView();
@@ -1729,7 +1731,9 @@ class AnimatedProps extends Animated {
 function createAnimatedComponent(Component: any): any {
   class AnimatedComponent extends React.Component {
     _component: any;
+    _prevComponent: any;
     _propsAnimated: AnimatedProps;
+    _eventDetachers: Array<Function> = [];
     _setComponentRef: Function;
 
     constructor(props: Object) {
@@ -1739,7 +1743,7 @@ function createAnimatedComponent(Component: any): any {
 
     componentWillUnmount() {
       this._propsAnimated && this._propsAnimated.__detach();
-      this._detachNativeEvents(this.props);
+      this._detachNativeEvents();
     }
 
     setNativeProps(props) {
@@ -1752,42 +1756,28 @@ function createAnimatedComponent(Component: any): any {
 
     componentDidMount() {
       this._propsAnimated.setNativeView(this._component);
-
-      this._attachNativeEvents(this.props);
+      this._attachNativeEvents();
     }
 
-    _attachNativeEvents(newProps) {
-      if (newProps !== this.props) {
-        this._detachNativeEvents(this.props);
-      }
-
+    _attachNativeEvents() {
       // Make sure to get the scrollable node for components that implement
       // `ScrollResponder.Mixin`.
-      const ref = this._component.getScrollableNode ?
+      const scrollableNode = this._component.getScrollableNode ?
         this._component.getScrollableNode() :
         this._component;
 
-      for (const key in newProps) {
-        const prop = newProps[key];
+      for (const key in this.props) {
+        const prop = this.props[key];
         if (prop instanceof AnimatedEvent && prop.__isNative) {
-          prop.__attach(ref, key);
+           prop.__attach(scrollableNode, key);
+           this._eventDetachers.push(() => prop.__detach(scrollableNode, key));
         }
       }
     }
 
-    _detachNativeEvents(props) {
-      // Make sure to get the scrollable node for components that implement
-      // `ScrollResponder.Mixin`.
-      const ref = this._component.getScrollableNode ?
-        this._component.getScrollableNode() :
-        this._component;
-
-      for (const key in props) {
-        const prop = props[key];
-        if (prop instanceof AnimatedEvent && prop.__isNative) {
-          prop.__detach(ref, key);
-        }
-      }
+    _detachNativeEvents() {
+      this._eventDetachers.forEach(remove => remove());
+      this._eventDetachers = [];
     }
 
     _attachProps(nextProps) {
@@ -1820,10 +1810,6 @@ function createAnimatedComponent(Component: any): any {
         callback,
       );
 
-      if (this._component) {
-        this._propsAnimated.setNativeView(this._component);
-      }
-
       // When you call detach, it removes the element from the parent list
       // of children. If it goes to 0, then the parent also detaches itself
       // and so on.
@@ -1835,9 +1821,18 @@ function createAnimatedComponent(Component: any): any {
       oldPropsAnimated && oldPropsAnimated.__detach();
     }
 
-    componentWillReceiveProps(nextProps) {
-      this._attachProps(nextProps);
-      this._attachNativeEvents(nextProps);
+    componentWillReceiveProps(newProps) {
+      this._attachProps(newProps);
+    }
+
+    componentDidUpdate(prevProps) {
+      if (this._component !== this._prevComponent) {
+        this._propsAnimated.setNativeView(this._component);
+      }
+      if (this._component !== this._prevComponent || prevProps !== this.props) {
+        this._detachNativeEvents();
+        this._attachNativeEvents();
+      }
     }
 
     render() {
@@ -1850,6 +1845,7 @@ function createAnimatedComponent(Component: any): any {
     }
 
     _setComponentRef(c) {
+      this._prevComponent = this._component;
       this._component = c;
     }
 

From 09b8ef41e1ab937b660d513fe7728334272b3f00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eloy=20Dur=C3=A1n?= <eloy.de.enige@gmail.com>
Date: Sat, 18 Mar 2017 12:21:50 -0700
Subject: [PATCH 083/366] Fix issue with whitespace in path to source and
 stabilise CI.

Summary:
* Fixes issue where headers could not be found due to whitespace in an unquoted header search path. https://github.com/facebook/react-native/issues/11781#issuecomment-287176373
* Stabilises CI but not needing to download the source for Yoga, but use the existing cloned repo instead.

/cc mkonicek
Closes https://github.com/facebook/react-native/pull/13007

Differential Revision: D4735347

fbshipit-source-id: 933aefcb0e65537d2e759d25f4e3b81cdf4b8cb5
---
 React.podspec                 | 4 ++--
 ReactCommon/yoga/Yoga.podspec | 2 +-
 scripts/process-podspecs.sh   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/React.podspec b/React.podspec
index e6352b3fd821d2..dcc10543f45e61 100644
--- a/React.podspec
+++ b/React.podspec
@@ -62,7 +62,7 @@ Pod::Spec.new do |s|
   s.subspec "jschelpers" do |ss|
     ss.source_files         = "ReactCommon/jschelpers/{JavaScriptCore,JSCWrapper}.{cpp,h}", "ReactCommon/jschelpers/systemJSCWrapper.cpp"
     ss.private_header_files = "ReactCommon/jschelpers/{JavaScriptCore,JSCWrapper}.h"
-    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "$(PODS_TARGET_SRCROOT)/ReactCommon" }
+    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"" }
     ss.framework            = "JavaScriptCore"
   end
 
@@ -70,7 +70,7 @@ Pod::Spec.new do |s|
     ss.dependency             "React/jschelpers"
     ss.source_files         = "ReactCommon/cxxreact/{JSBundleType,oss-compat-util}.{cpp,h}"
     ss.private_header_files = "ReactCommon/cxxreact/{JSBundleType,oss-compat-util}.h"
-    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "$(PODS_TARGET_SRCROOT)/ReactCommon" }
+    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"" }
   end
 
   s.subspec "ART" do |ss|
diff --git a/ReactCommon/yoga/Yoga.podspec b/ReactCommon/yoga/Yoga.podspec
index 1e9c75ff7721ed..6d053b34eee654 100644
--- a/ReactCommon/yoga/Yoga.podspec
+++ b/ReactCommon/yoga/Yoga.podspec
@@ -1,7 +1,7 @@
 package = JSON.parse(File.read(File.expand_path('../../package.json', __dir__)))
 version = package['version']
 
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => ENV['INSTALL_YOGA_FROM_LOCATION'] || 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip
diff --git a/scripts/process-podspecs.sh b/scripts/process-podspecs.sh
index d87fa4f719131b..e39f8c78b421c1 100755
--- a/scripts/process-podspecs.sh
+++ b/scripts/process-podspecs.sh
@@ -44,7 +44,7 @@ push() {
   local SPEC_DIR="$SPEC_REPO_DIR/$POD_NAME/$(version $SPEC_NAME)"
   local SPEC_PATH="$SPEC_DIR/$SPEC_NAME.json"
   mkdir -p $SPEC_DIR
-  env INSTALL_YOGA_WITHOUT_PATH_OPTION=1 pod ipc spec $SPEC_NAME > $SPEC_PATH
+  env INSTALL_YOGA_WITHOUT_PATH_OPTION=1 INSTALL_YOGA_FROM_LOCATION="$ROOT" pod ipc spec $SPEC_NAME > $SPEC_PATH
 }
 
 # Perform linting and publishing of podspec in cwd.

From 06dd08316f449d63ccb67a788f4bc845c1e5c060 Mon Sep 17 00:00:00 2001
From: Kevin Cooper <cooperka92@gmail.com>
Date: Sat, 18 Mar 2017 12:48:19 -0700
Subject: [PATCH 084/366] Fix suggestion to "npm start -- --reset-cache"

Summary:
As discussed in https://github.com/facebook/react-native/pull/11983. The double dash is necessary to pass through the argument to node. Based on the comments [here](https://github.com/facebook/react-native/issues/1924#issuecomment-249861004), it looks like most people use the double dash; it's unclear whether it would do anything at all if the dashes were omitted. If anyone else has better insight, let me know!
Closes https://github.com/facebook/react-native/pull/13003

Differential Revision: D4731566

Pulled By: hramos

fbshipit-source-id: 62562536db7589a03a511762117cbf0e36d3aafb
---
 packager/src/node-haste/DependencyGraph/ResolutionRequest.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packager/src/node-haste/DependencyGraph/ResolutionRequest.js b/packager/src/node-haste/DependencyGraph/ResolutionRequest.js
index 46583d9643b529..0ffa7446373b32 100644
--- a/packager/src/node-haste/DependencyGraph/ResolutionRequest.js
+++ b/packager/src/node-haste/DependencyGraph/ResolutionRequest.js
@@ -391,7 +391,7 @@ class ResolutionRequest {
               `To resolve try the following:\n` +
               `  1. Clear watchman watches: \`watchman watch-del-all\`.\n` +
               `  2. Delete the \`node_modules\` folder: \`rm -rf node_modules && npm install\`.\n` +
-              '  3. Reset packager cache: `rm -fr $TMPDIR/react-*` or `npm start --reset-cache`.'
+              '  3. Reset packager cache: `rm -fr $TMPDIR/react-*` or `npm start -- --reset-cache`.'
             );
           });
         });

From 22da6f2f3f7bab852f05921d32d8425123e70b55 Mon Sep 17 00:00:00 2001
From: Arman Dezfuli-Arjomandi <rawrmaan@gmail.com>
Date: Sat, 18 Mar 2017 12:56:24 -0700
Subject: [PATCH 085/366] Fix typo in FlatList docs

Summary:
Thanks for submitting a PR! Please read these instructions carefully:

- [x] Explain the **motivation** for making this change.
- [x] Provide a **test plan** demonstrating that the code is solid.
- [x] Match the **code formatting** of the rest of the codebase.
- [x] Target the `master` branch, NOT a "stable" branch.

There was a typo in the FlatList docs for numColumns affecting the formatting of its description.

N/A

Sign the [CLA][2], if you haven't already.

Small pull requests are much easier to review and more likely to get merged. Make sure the PR does only one thing, otherwise please split it.

Make sure all **tests pass** on both [Travis][3] and [Circle CI][4]. PRs that break tests are unlikely to be merged.

For more info, see the ["Pull Requests"][5] section of our "Contributing" guidelines.

[1]: https://medium.com/martinkonicek/what-is-a-test-plan-8bfc840ec171#.y9lcuqqi9
[2]: https://code.facebook.com/cla
Closes https://github.com/facebook/react-native/pull/13002

Differential Revision: D4735343

fbshipit-source-id: f781c50c892d64e69f61aec980614e948a48f48b
---
 Libraries/CustomComponents/Lists/FlatList.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Libraries/CustomComponents/Lists/FlatList.js b/Libraries/CustomComponents/Lists/FlatList.js
index 5fedff5d612446..daf99d33c2fd51 100644
--- a/Libraries/CustomComponents/Lists/FlatList.js
+++ b/Libraries/CustomComponents/Lists/FlatList.js
@@ -103,7 +103,7 @@ type OptionalProps<ItemT> = {
    */
   keyExtractor: (item: ItemT, index: number) => string,
   /**
-   * Multiple columns can only be rendered with `horizontal={false}`` and will zig-zag like a
+   * Multiple columns can only be rendered with `horizontal={false}` and will zig-zag like a
    * `flexWrap` layout. Items should all be the same height - masonry layouts are not supported.
    */
   numColumns: number,

From cbd46aaa7c95a42be682736f4be9f7b11201b3c5 Mon Sep 17 00:00:00 2001
From: Nick <nick@remitly.com>
Date: Sat, 18 Mar 2017 13:01:54 -0700
Subject: [PATCH 086/366] more accurate product-name regex
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Summary:
Some projects define multiple targets, including app extensions, which are built with a “.appex” extension.   This fix prevents the buildProject method from selecting any app extension (e.g. a Today.appex today-widget extension) as the product name.

Thanks for submitting a PR! Please read these instructions carefully:

- [X] Explain the **motivation** for making this change.
- [X] Provide a **test plan** demonstrating that the code is solid.
- [X] Match the **code formatting** of the rest of the codebase.
- [X] Target the `master` branch, NOT a "stable" branch.

When building our workspace, ReactNative was failing to install the app to the simulator because it calculated an incorrect path to the app itself.   It was attempting to install "Today.app" when it should have been installing "Remitly.app".   I discovered that ReactNative parses the build output to identify the generated app name, and that this was broken when the build also generated an app extension.  The f
Closes https://github.com/facebook/react-native/pull/13001

Differential Revision: D4735360

fbshipit-source-id: afeeb2073ccd65c95916b153fcde574b5343af8c
---
 local-cli/runIOS/runIOS.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/local-cli/runIOS/runIOS.js b/local-cli/runIOS/runIOS.js
index ea605530c8a30a..e890d643b1317c 100644
--- a/local-cli/runIOS/runIOS.js
+++ b/local-cli/runIOS/runIOS.js
@@ -157,7 +157,7 @@ function buildProject(xcodeProject, udid, scheme, configuration = 'Debug', launc
     });
     buildProcess.on('close', function(code) {
       //FULL_PRODUCT_NAME is the actual file name of the app, which actually comes from the Product Name in the build config, which does not necessary match a scheme name,  example output line: export FULL_PRODUCT_NAME="Super App Dev.app"
-      let productNameMatch = /export FULL_PRODUCT_NAME="?(.+).app/.exec(buildOutput);
+      let productNameMatch = /export FULL_PRODUCT_NAME="?(.+).app"?$/.exec(buildOutput);
       if (productNameMatch && productNameMatch.length && productNameMatch.length > 1) {
         return resolve(productNameMatch[1]);//0 is the full match, 1 is the app name
       }

From 5328d952a8dd0945005d9f7305aba913f438ffa7 Mon Sep 17 00:00:00 2001
From: Aaron Chiu <aaronechiu@fb.com>
Date: Sun, 19 Mar 2017 13:16:04 -0700
Subject: [PATCH 087/366] kill bridge only after cleaning up NativeModules

Reviewed By: javache

Differential Revision: D4734634

fbshipit-source-id: c2d425485679454397d18b1a0c389714c0e3c484
---
 .../com/facebook/react/cxxbridge/CatalystInstanceImpl.java | 2 +-
 .../facebook/react/uimanager/events/EventDispatcher.java   | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CatalystInstanceImpl.java b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CatalystInstanceImpl.java
index 80be1fbe51a559..6133b2576765dc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CatalystInstanceImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CatalystInstanceImpl.java
@@ -292,11 +292,11 @@ public void destroy() {
 
     // TODO: tell all APIs to shut down
     mDestroyed = true;
-    mHybridData.resetNative();
     mReactQueueConfiguration.getNativeModulesQueueThread().runOnQueue(new Runnable() {
       @Override
       public void run() {
         mJavaRegistry.notifyJSInstanceDestroy();
+        mHybridData.resetNative();
       }
     });
     boolean wasIdle = (mPendingJSCalls.getAndSet(0) == 0);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcher.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcher.java
index d00d14c38e6ccb..540714b2feefb0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcher.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcher.java
@@ -171,7 +171,12 @@ public void onHostDestroy() {
   }
 
   public void onCatalystInstanceDestroyed() {
-    stopFrameCallback();
+    UiThreadUtil.runOnUiThread(new Runnable() {
+      @Override
+      public void run() {
+        stopFrameCallback();
+      }
+    });
   }
 
   private void stopFrameCallback() {

From 47d2cfeac5addb24f8fcfbeeb2cb8ff11a604e7a Mon Sep 17 00:00:00 2001
From: Adam Ernst <adamjernst@fb.com>
Date: Sun, 19 Mar 2017 13:59:41 -0700
Subject: [PATCH 088/366] Whitelist some stuff in React

Reviewed By: mzlee

Differential Revision: D4731968

fbshipit-source-id: 1d1ae12a50beef4cd024a467427ec3b6cd446f4c
---
 ReactCommon/cxxreact/BUCK      | 1 +
 ReactCommon/microprofiler/BUCK | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ReactCommon/cxxreact/BUCK b/ReactCommon/cxxreact/BUCK
index 5b58dbd2dc2c63..8e94880e254625 100644
--- a/ReactCommon/cxxreact/BUCK
+++ b/ReactCommon/cxxreact/BUCK
@@ -93,6 +93,7 @@ cxx_library(
     ],
     force_static = True,
     header_namespace = "cxxreact",
+    labels = ["accounts_for_platform_and_build_mode_flags"],
     visibility = [
         "PUBLIC",
     ],
diff --git a/ReactCommon/microprofiler/BUCK b/ReactCommon/microprofiler/BUCK
index adbc87ba12024f..d65e3f927d73e6 100644
--- a/ReactCommon/microprofiler/BUCK
+++ b/ReactCommon/microprofiler/BUCK
@@ -14,6 +14,7 @@ cxx_library(
     ],
     force_static = True,
     header_namespace = "microprofiler",
+    labels = ["accounts_for_platform_and_build_mode_flags"],
     visibility = [
         "PUBLIC",
     ],

From 23c2a6cf1ae297182a62d1a8143b55b186f5e1b7 Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Sun, 19 Mar 2017 21:43:14 -0700
Subject: [PATCH 089/366] Removed harmful optimization in
 ReactNativeEventEmitter

Reviewed By: spicyj

Differential Revision: D4729779

fbshipit-source-id: 2dd5ec10d42df7f24804796c4100eca107edeedb
---
 .../Renderer/src/renderers/native/ReactNativeEventEmitter.js | 5 -----
 .../src/renderers/shared/shared/event/EventPropagators.js    | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeEventEmitter.js b/Libraries/Renderer/src/renderers/native/ReactNativeEventEmitter.js
index 1e1c97e308f6e7..b7b18f9ff0177b 100644
--- a/Libraries/Renderer/src/renderers/native/ReactNativeEventEmitter.js
+++ b/Libraries/Renderer/src/renderers/native/ReactNativeEventEmitter.js
@@ -103,11 +103,6 @@ var ReactNativeEventEmitter = {
   ) {
     var nativeEvent = nativeEventParam || EMPTY_NATIVE_EVENT;
     var inst = ReactNativeComponentTree.getInstanceFromNode(rootNodeID);
-    if (!inst) {
-      // If the original instance is already gone, we don't have to dispatch
-      // any events.
-      return;
-    }
     ReactGenericBatching.batchedUpdates(function() {
       ReactNativeEventEmitter.handleTopLevel(
         topLevelType,
diff --git a/Libraries/Renderer/src/renderers/shared/shared/event/EventPropagators.js b/Libraries/Renderer/src/renderers/shared/shared/event/EventPropagators.js
index 159d2e6c1992b0..c97f880939d16d 100644
--- a/Libraries/Renderer/src/renderers/shared/shared/event/EventPropagators.js
+++ b/Libraries/Renderer/src/renderers/shared/shared/event/EventPropagators.js
@@ -93,7 +93,7 @@ function accumulateTwoPhaseDispatchesSingleSkipTarget(event) {
  * requiring that the `dispatchMarker` be the same as the dispatched ID.
  */
 function accumulateDispatches(inst, ignoredDirection, event) {
-  if (event && event.dispatchConfig.registrationName) {
+  if (inst && event && event.dispatchConfig.registrationName) {
     var registrationName = event.dispatchConfig.registrationName;
     var listener = getListener(inst, registrationName);
     if (listener) {

From 64c327ae684690ae9cabaff412467b54095839ea Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Sun, 19 Mar 2017 21:48:22 -0700
Subject: [PATCH 090/366] Fixed issue where setting `zero scale` transfrom
 matrix to UIView brokes `hitTest` mechanism

Summary:
The Math Strikes Back

Several related things:
 * When we specify `scale: 0;` style for some view it ends up with calling `CATransform3DScale` with zero scale parameter.
 * In this case `CATransform3DScale` returns transform matrix full of zeros. It actually depends on representation and matrix-type (2d or 3d) but in UIView debugger it appears as [0, 0, 0, 0, ...]. And probably it is correct result.
 * By default, for hit-testing, UIKit uses specially optimized logic based on GPU/CALayer infrastructure under the hood. And the transform matrix full of zeros breaks this algorithm. I guess, it happens because zero-matrix doesn't quite make sense.

So, `scale: 0;` is a weird edge case, and in this diff, we are trying to illuminate it by replacing with epsilon value.

Related SO issues:
http://stackoverflow.com/questions/25964224/cgaffinetransformscale-not-working-with-zero-scale
http://stackoverflow.com/questions/7937369/animate-uiview-scale-to-zero

Reviewed By: blairvanderhoof

Differential Revision: D4734475

fbshipit-source-id: 7241cdffa86c05a6552860a25789e2281588ba23
---
 React/Views/RCTConvert+Transform.m | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/React/Views/RCTConvert+Transform.m b/React/Views/RCTConvert+Transform.m
index 11639105626725..32a1abfb57c7e2 100644
--- a/React/Views/RCTConvert+Transform.m
+++ b/React/Views/RCTConvert+Transform.m
@@ -90,15 +90,15 @@ + (CATransform3D)CATransform3D:(id)json
       transform = CATransform3DRotate(transform, rotate, 0, 0, 1);
 
     } else if ([property isEqualToString:@"scale"]) {
-      CGFloat scale = [value floatValue];
+      CGFloat scale = MAX([value floatValue], FLT_EPSILON);
       transform = CATransform3DScale(transform, scale, scale, 1);
 
     } else if ([property isEqualToString:@"scaleX"]) {
-      CGFloat scale = [value floatValue];
+      CGFloat scale = MAX([value floatValue], FLT_EPSILON);
       transform = CATransform3DScale(transform, scale, 1, 1);
 
     } else if ([property isEqualToString:@"scaleY"]) {
-      CGFloat scale = [value floatValue];
+      CGFloat scale = MAX([value floatValue], FLT_EPSILON);
       transform = CATransform3DScale(transform, 1, scale, 1);
 
     } else if ([property isEqualToString:@"translate"]) {

From d2723341864b92e7ad44e39aad2436cb1c9a3394 Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Sun, 19 Mar 2017 21:49:26 -0700
Subject: [PATCH 091/366] RCTRootView is now has empty autoresizing mask by
 default

Summary: `autoresizingMask` is supposed to be set outside self class, this is UIKit convention.

Reviewed By: mmmulani

Differential Revision: D4697098

fbshipit-source-id: 7e0aa5d3032184de980b3cecafebbc4ce8ef9ada
---
 React/Base/RCTRootView.m | 1 -
 1 file changed, 1 deletion(-)

diff --git a/React/Base/RCTRootView.m b/React/Base/RCTRootView.m
index db1ed02343c415..9870ebfaeee436 100644
--- a/React/Base/RCTRootView.m
+++ b/React/Base/RCTRootView.m
@@ -69,7 +69,6 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
     _loadingViewFadeDelay = 0.25;
     _loadingViewFadeDuration = 0.25;
     _sizeFlexibility = RCTRootViewSizeFlexibilityNone;
-    self.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
 
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(bridgeDidReload)

From 3acafd1f3dd42cc27a592cdee0530e0dbf1c8afd Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Mon, 20 Mar 2017 00:00:17 -0700
Subject: [PATCH 092/366] Better TextInput: Removed redundant UIScrollView from
 RCTTextView

Reviewed By: mmmulani

Differential Revision: D4640207

fbshipit-source-id: 01fc65b0212ad6baef500625679dab5e99da9db5
---
 Libraries/Text/RCTTextView.m | 65 ++++++++++++++++++------------------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/Libraries/Text/RCTTextView.m b/Libraries/Text/RCTTextView.m
index 83cde446a19355..b640d7a3712133 100644
--- a/Libraries/Text/RCTTextView.m
+++ b/Libraries/Text/RCTTextView.m
@@ -58,6 +58,13 @@ - (void)didMoveToWindow
   }
 }
 
+- (void)setContentOffset:(CGPoint)contentOffset animated:(__unused BOOL)animated
+{
+  // Turning off scroll animation.
+  // This fixes the problem also known as "flaky scrolling".
+  [super setContentOffset:contentOffset animated:NO];
+}
+
 @end
 
 @implementation RCTTextView
@@ -69,7 +76,6 @@ @implementation RCTTextView
   UITextView *_textView;
   RCTText *_richTextView;
   NSAttributedString *_pendingAttributedText;
-  UIScrollView *_scrollView;
 
   UITextRange *_previousSelectionRange;
   NSUInteger _previousTextLength;
@@ -100,17 +106,10 @@ - (instancetype)initWithEventDispatcher:(RCTEventDispatcher *)eventDispatcher
 #if !TARGET_OS_TV
     _textView.scrollsToTop = NO;
 #endif
-    _textView.scrollEnabled = NO;
+    _textView.scrollEnabled = YES;
     _textView.delegate = self;
 
-    _scrollView = [[UIScrollView alloc] initWithFrame:CGRectZero];
-#if !TARGET_OS_TV
-    _scrollView.scrollsToTop = NO;
-#endif
-    _scrollView.delegate = self;
-    [_scrollView addSubview:_textView];
-
-    [self addSubview:_scrollView];
+    [self addSubview:_textView];
   }
   return self;
 }
@@ -118,9 +117,12 @@ - (instancetype)initWithEventDispatcher:(RCTEventDispatcher *)eventDispatcher
 RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
 RCT_NOT_IMPLEMENTED(- (instancetype)initWithCoder:(NSCoder *)aDecoder)
 
+#pragma mark - RCTComponent
+
 - (void)insertReactSubview:(UIView *)subview atIndex:(NSInteger)index
 {
   [super insertReactSubview:subview atIndex:index];
+
   if ([subview isKindOfClass:[RCTText class]]) {
     if (_richTextView) {
       RCTLogError(@"Tried to insert a second <Text> into <TextInput> - there can only be one.");
@@ -143,11 +145,6 @@ - (void)insertReactSubview:(UIView *)subview atIndex:(NSInteger)index
   }
 }
 
-- (void)dealloc
-{
-  _scrollView.delegate = nil;
-}
-
 - (void)removeReactSubview:(UIView *)subview
 {
   [super removeReactSubview:subview];
@@ -159,9 +156,11 @@ - (void)removeReactSubview:(UIView *)subview
 
 - (void)didUpdateReactSubviews
 {
-  // Do nothing, as we don't allow non-text subviews
+  // Do nothing, as we don't allow non-text subviews.
 }
 
+#pragma mark - Routine
+
 - (void)setMostRecentEventCount:(NSInteger)mostRecentEventCount
 {
   _mostRecentEventCount = mostRecentEventCount;
@@ -262,7 +261,6 @@ - (void)updateFrames
   CGRect frame = UIEdgeInsetsInsetRect(self.bounds, adjustedFrameInset);
   _textView.frame = frame;
   _placeholderView.frame = frame;
-  _scrollView.frame = frame;
   [self updateContentSize];
 
   _textView.textContainerInset = adjustedTextContainerInset;
@@ -271,10 +269,8 @@ - (void)updateFrames
 
 - (void)updateContentSize
 {
-  CGSize size = (CGSize){_scrollView.frame.size.width, INFINITY};
-  size.height = [_textView sizeThatFits:size].height;
-  _scrollView.contentSize = size;
-  _textView.frame = (CGRect){CGPointZero, size};
+  CGSize size = _textView.frame.size;
+  size.height = [_textView sizeThatFits:CGSizeMake(size.width, INFINITY)].height;
 
   if (_viewDidCompleteInitialLayout && _onContentSizeChange && !CGSizeEqualToSize(_previousContentSize, size)) {
     _previousContentSize = size;
@@ -725,26 +721,31 @@ - (UIColor *)defaultPlaceholderTextColor
 - (void)scrollViewDidScroll:(UIScrollView *)scrollView
 {
   if (_onScroll) {
+    CGPoint contentOffset = scrollView.contentOffset;
+    CGSize contentSize = scrollView.contentSize;
+    CGSize size = scrollView.bounds.size;
+    UIEdgeInsets contentInset = scrollView.contentInset;
+
     _onScroll(@{
       @"contentOffset": @{
-        @"x": @(scrollView.contentOffset.x),
-        @"y": @(scrollView.contentOffset.y)
+        @"x": @(contentOffset.x),
+        @"y": @(contentOffset.y)
       },
       @"contentInset": @{
-        @"top": @(_scrollView.contentInset.top),
-        @"left": @(_scrollView.contentInset.left),
-        @"bottom": @(_scrollView.contentInset.bottom),
-        @"right": @(_scrollView.contentInset.right)
+        @"top": @(contentInset.top),
+        @"left": @(contentInset.left),
+        @"bottom": @(contentInset.bottom),
+        @"right": @(contentInset.right)
       },
       @"contentSize": @{
-        @"width": @(_scrollView.contentSize.width),
-        @"height": @(_scrollView.contentSize.height)
+        @"width": @(contentSize.width),
+        @"height": @(contentSize.height)
       },
       @"layoutMeasurement": @{
-        @"width": @(_scrollView.frame.size.width),
-        @"height": @(_scrollView.frame.size.height)
+        @"width": @(size.width),
+        @"height": @(size.height)
       },
-      @"zoomScale": @(_scrollView.zoomScale ?: 1),
+      @"zoomScale": @(scrollView.zoomScale ?: 1),
     });
   }
 }

From 1b013cd30ce201cafb376782bdf427f601940220 Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Mon, 20 Mar 2017 00:00:18 -0700
Subject: [PATCH 093/366] Better TextInput: Fixing multiline <TextInput> insets
 and prepare for auto-expanding feature

Summary:
Several things:
 * The mess with insets was fixed. Previously we tried to compensate the insets difference with `UITextField` by adjusting `textContainerInset` property, moreover we delegated negative part of this compensation to the view inset. That was terrible because it breaks `contentSize` computation, complicates whole insets consept, complicates everything; it just was not right. Now we are fixing the top and left inset differences in different places. We disable left and right 5pt margin by setting `_textView.textContainer.lineFragmentPadding = 0` and we introduce top 5px inset as a DEFAULT value for top inset for common multiline <TextInput> (this value can be easilly overwritten in Javascript).
 * Internal layout and contentSize computations were unified and simplified.
 * Now we report `intrinsicContentSize` value to Yoga, one step before auto-expandable TextInput.

Depends on D4640207.

Reviewed By: mmmulani

Differential Revision: D4645921

fbshipit-source-id: da5988ebac50be967caecd71e780c014f6eb257a
---
 Libraries/Components/TextInput/TextInput.js |   7 +
 Libraries/Text/RCTTextView.h                |   5 +-
 Libraries/Text/RCTTextView.m                | 136 +++++++++++---------
 Libraries/Text/RCTTextViewManager.m         |   2 +-
 React/Modules/RCTUIManager.h                |   3 +-
 5 files changed, 88 insertions(+), 65 deletions(-)

diff --git a/Libraries/Components/TextInput/TextInput.js b/Libraries/Components/TextInput/TextInput.js
index d1c3e6fd27f723..c3c9eff2b4ae9b 100644
--- a/Libraries/Components/TextInput/TextInput.js
+++ b/Libraries/Components/TextInput/TextInput.js
@@ -678,6 +678,7 @@ const TextInput = React.createClass({
       if (props.inputView) {
         children = [children, props.inputView];
       }
+      props.style.unshift(styles.multilineInput);
       textContainer =
         <RCTTextView
           ref={this._setNativeRef}
@@ -867,6 +868,12 @@ var styles = StyleSheet.create({
   input: {
     alignSelf: 'stretch',
   },
+  multilineInput: {
+    // This default top inset makes RCTTextView seem as close as possible
+    // to single-line RCTTextField defaults, using the system defaults
+    // of font size 17 and a height of 31 points.
+    paddingTop: 5,
+  },
 });
 
 module.exports = TextInput;
diff --git a/Libraries/Text/RCTTextView.h b/Libraries/Text/RCTTextView.h
index 1b93c39ccec576..34f4cb828d6f52 100644
--- a/Libraries/Text/RCTTextView.h
+++ b/Libraries/Text/RCTTextView.h
@@ -12,7 +12,7 @@
 #import <React/RCTView.h>
 #import <React/UIView+React.h>
 
-@class RCTEventDispatcher;
+@class RCTBridge;
 
 @interface RCTTextView : RCTView <UITextViewDelegate>
 
@@ -28,6 +28,7 @@
 @property (nonatomic, strong) UIFont *font;
 @property (nonatomic, assign) NSInteger mostRecentEventCount;
 @property (nonatomic, strong) NSNumber *maxLength;
+@property (nonatomic, assign, readonly) CGSize contentSize;
 
 @property (nonatomic, copy) RCTDirectEventBlock onChange;
 @property (nonatomic, copy) RCTDirectEventBlock onContentSizeChange;
@@ -35,7 +36,7 @@
 @property (nonatomic, copy) RCTDirectEventBlock onTextInput;
 @property (nonatomic, copy) RCTDirectEventBlock onScroll;
 
-- (instancetype)initWithEventDispatcher:(RCTEventDispatcher *)eventDispatcher NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithBridge:(RCTBridge *)bridge NS_DESIGNATED_INITIALIZER;
 
 - (void)performTextUpdate;
 
diff --git a/Libraries/Text/RCTTextView.m b/Libraries/Text/RCTTextView.m
index b640d7a3712133..b88f34bff0aad5 100644
--- a/Libraries/Text/RCTTextView.m
+++ b/Libraries/Text/RCTTextView.m
@@ -11,6 +11,7 @@
 
 #import <React/RCTConvert.h>
 #import <React/RCTEventDispatcher.h>
+#import <React/RCTUIManager.h>
 #import <React/RCTUtils.h>
 #import <React/UIView+React.h>
 
@@ -69,6 +70,7 @@ - (void)setContentOffset:(CGPoint)contentOffset animated:(__unused BOOL)animated
 
 @implementation RCTTextView
 {
+  RCTBridge *_bridge;
   RCTEventDispatcher *_eventDispatcher;
 
   NSString *_placeholder;
@@ -87,22 +89,25 @@ @implementation RCTTextView
   NSInteger _nativeEventCount;
 
   CGSize _previousContentSize;
-  BOOL _viewDidCompleteInitialLayout;
 }
 
-- (instancetype)initWithEventDispatcher:(RCTEventDispatcher *)eventDispatcher
+- (instancetype)initWithBridge:(RCTBridge *)bridge
 {
-  RCTAssertParam(eventDispatcher);
+  RCTAssertParam(bridge);
 
-  if ((self = [super initWithFrame:CGRectZero])) {
+  if (self = [super initWithFrame:CGRectZero]) {
     _contentInset = UIEdgeInsetsZero;
-    _eventDispatcher = eventDispatcher;
+    _bridge = bridge;
+    _eventDispatcher = bridge.eventDispatcher;
     _placeholderTextColor = [self defaultPlaceholderTextColor];
     _blurOnSubmit = NO;
 
-    _textView = [[RCTUITextView alloc] initWithFrame:CGRectZero];
+    _textView = [[RCTUITextView alloc] initWithFrame:self.bounds];
+    _textView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
     _textView.backgroundColor = [UIColor clearColor];
     _textView.textColor = [UIColor blackColor];
+    // This line actually removes 5pt (default value) left and right padding in UITextView.
+    _textView.textContainer.lineFragmentPadding = 0;
 #if !TARGET_OS_TV
     _textView.scrollsToTop = NO;
 #endif
@@ -132,7 +137,7 @@ - (void)insertReactSubview:(UIView *)subview atIndex:(NSInteger)index
     // If this <TextInput> is in rich text editing mode, and the child <Text> node providing rich text
     // styling has a backgroundColor, then the attributedText produced by the child <Text> node will have an
     // NSBackgroundColor attribute. We need to forward this attribute to the text view manually because the text view
-    // always has a clear background color in -initWithEventDispatcher:.
+    // always has a clear background color in `initWithBridge:`.
     //
     // TODO: This should be removed when the related hack in -performPendingTextUpdate is removed.
     if (subview.backgroundColor) {
@@ -237,60 +242,20 @@ - (void)performPendingTextUpdate
   [_textView layoutIfNeeded];
 
   [self updatePlaceholderVisibility];
-  [self updateContentSize];
+  [self invalidateContentSize];
 
   _blockTextShouldChange = NO;
 }
 
-- (void)updateFrames
-{
-  // Adjust the insets so that they are as close as possible to single-line
-  // RCTTextField defaults, using the system defaults of font size 17 and a
-  // height of 31 points.
-  //
-  // We apply the left inset to the frame since a negative left text-container
-  // inset mysteriously causes the text to be hidden until the text view is
-  // first focused.
-  UIEdgeInsets adjustedFrameInset = UIEdgeInsetsZero;
-  adjustedFrameInset.left = _contentInset.left - 5;
-
-  UIEdgeInsets adjustedTextContainerInset = _contentInset;
-  adjustedTextContainerInset.top += 5;
-  adjustedTextContainerInset.left = 0;
-
-  CGRect frame = UIEdgeInsetsInsetRect(self.bounds, adjustedFrameInset);
-  _textView.frame = frame;
-  _placeholderView.frame = frame;
-  [self updateContentSize];
-
-  _textView.textContainerInset = adjustedTextContainerInset;
-  _placeholderView.textContainerInset = adjustedTextContainerInset;
-}
-
-- (void)updateContentSize
-{
-  CGSize size = _textView.frame.size;
-  size.height = [_textView sizeThatFits:CGSizeMake(size.width, INFINITY)].height;
-
-  if (_viewDidCompleteInitialLayout && _onContentSizeChange && !CGSizeEqualToSize(_previousContentSize, size)) {
-    _previousContentSize = size;
-    _onContentSizeChange(@{
-      @"contentSize": @{
-        @"height": @(size.height),
-        @"width": @(size.width),
-      },
-      @"target": self.reactTag,
-    });
-  }
-}
-
 - (void)updatePlaceholder
 {
   [_placeholderView removeFromSuperview];
   _placeholderView = nil;
 
   if (_placeholder) {
-    _placeholderView = [[UITextView alloc] initWithFrame:self.bounds];
+    _placeholderView = [[UITextView alloc] initWithFrame:_textView.frame];
+    _placeholderView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+    _placeholderView.textContainer.lineFragmentPadding = 0;
     _placeholderView.userInteractionEnabled = NO;
     _placeholderView.backgroundColor = [UIColor clearColor];
     _placeholderView.scrollEnabled = NO;
@@ -340,7 +305,9 @@ - (void)setPlaceholderTextColor:(UIColor *)placeholderTextColor
 - (void)setContentInset:(UIEdgeInsets)contentInset
 {
   _contentInset = contentInset;
-  [self updateFrames];
+  _textView.textContainerInset = contentInset;
+  _placeholderView.textContainerInset = contentInset;
+  [self setNeedsLayout];
 }
 
 #pragma mark - UITextViewDelegate
@@ -503,8 +470,7 @@ - (void)setText:(NSString *)text
     }
 
     [self updatePlaceholderVisibility];
-    [self updateContentSize]; //keep the text wrapping when the length of
-    //the textline has been extended longer than the length of textinputView
+    [self invalidateContentSize];
   } else if (eventLag > RCTTextUpdateLagWarningThreshold) {
     RCTLogWarn(@"Native TextInput(%@) is %zd events ahead of JS - try to make your JS faster.", self.text, eventLag);
   }
@@ -595,7 +561,7 @@ static BOOL findMismatch(NSString *first, NSString *second, NSRange *firstRange,
 - (void)textViewDidChange:(UITextView *)textView
 {
   [self updatePlaceholderVisibility];
-  [self updateContentSize];
+  [self invalidateContentSize];
 
   // Detect when textView updates happend that didn't invoke `shouldChangeTextInRange`
   // (e.g. typing simplified chinese in pinyin will insert and remove spaces without
@@ -664,6 +630,8 @@ - (void)textViewDidEndEditing:(UITextView *)textView
                                eventCount:_nativeEventCount];
 }
 
+#pragma mark - UIResponder
+
 - (BOOL)isFirstResponder
 {
   return [_textView isFirstResponder];
@@ -695,17 +663,63 @@ - (BOOL)resignFirstResponder
   return [_textView resignFirstResponder];
 }
 
-- (void)layoutSubviews
+#pragma mark - Content Size
+
+- (CGSize)contentSize
 {
-  [super layoutSubviews];
+  // Returning value does NOT include insets.
+  CGSize contentSize = self.intrinsicContentSize;
+  contentSize.width -= _contentInset.left + _contentInset.right;
+  contentSize.height -= _contentInset.top + _contentInset.bottom;
+  return contentSize;
+}
+
+- (void)invalidateContentSize
+{
+  CGSize contentSize = self.contentSize;
+
+  if (CGSizeEqualToSize(_previousContentSize, contentSize)) {
+    return;
+  }
+  _previousContentSize = contentSize;
+
+  [_bridge.uiManager setIntrinsicContentSize:contentSize forView:self];
+
+  if (_onContentSizeChange) {
+    _onContentSizeChange(@{
+      @"contentSize": @{
+        @"height": @(contentSize.height),
+        @"width": @(contentSize.width),
+      },
+      @"target": self.reactTag,
+    });
+  }
+}
+
+#pragma mark - Layout
+
+- (CGSize)intrinsicContentSize
+{
+  // Calling `sizeThatFits:` is probably more expensive method to compute
+  // content size compare to direct access `_textView.contentSize` property,
+  // but seems `sizeThatFits:` returns more reliable and consistent result.
+  // Returning value DOES include insets.
+  return [self sizeThatFits:CGSizeMake(self.bounds.size.width, INFINITY)];
+}
 
-  // Start sending content size updates only after the view has been laid out
-  // otherwise we send multiple events with bad dimensions on initial render.
-  _viewDidCompleteInitialLayout = YES;
+- (CGSize)sizeThatFits:(CGSize)size
+{
+  return [_textView sizeThatFits:size];
+}
 
-  [self updateFrames];
+- (void)layoutSubviews
+{
+  [super layoutSubviews];
+  [self invalidateContentSize];
 }
 
+#pragma mark - Default values
+
 - (UIFont *)defaultPlaceholderFont
 {
   return [UIFont systemFontOfSize:17];
diff --git a/Libraries/Text/RCTTextViewManager.m b/Libraries/Text/RCTTextViewManager.m
index 7b7f5d0473d422..ab26d1b8ec8858 100644
--- a/Libraries/Text/RCTTextViewManager.m
+++ b/Libraries/Text/RCTTextViewManager.m
@@ -29,7 +29,7 @@ - (RCTShadowView *)shadowView
 
 - (UIView *)view
 {
-  return [[RCTTextView alloc] initWithEventDispatcher:self.bridge.eventDispatcher];
+  return [[RCTTextView alloc] initWithBridge:self.bridge];
 }
 
 RCT_REMAP_VIEW_PROPERTY(autoCapitalize, textView.autocapitalizationType, UITextAutocapitalizationType)
diff --git a/React/Modules/RCTUIManager.h b/React/Modules/RCTUIManager.h
index 14f866f754b69c..f1aa37b954aba4 100644
--- a/React/Modules/RCTUIManager.h
+++ b/React/Modules/RCTUIManager.h
@@ -87,7 +87,8 @@ RCT_EXTERN NSString *const RCTUIManagerRootViewKey;
 
 /**
  * Set the natural size of a view, which is used when no explicit size is set.
- * Use UIViewNoIntrinsicMetric to ignore a dimension.
+ * Use `UIViewNoIntrinsicMetric` to ignore a dimension.
+ * The `size` must NOT include padding and border.
  */
 - (void)setIntrinsicContentSize:(CGSize)size forView:(UIView *)view;
 

From 26e2c08544f3beac9926652f1b8f38ca7647df6e Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Mon, 20 Mar 2017 00:00:21 -0700
Subject: [PATCH 094/366] Better TextInput: Native auto-expandable <TextInput>
 is here (iOS only)

Reviewed By: mmmulani

Differential Revision: D4646962

fbshipit-source-id: bc054d9c68c385b13222e7c9fb8728d21f987a48
---
 .../UIExplorer/js/TextInputExample.ios.js     | 39 +++++--------------
 1 file changed, 9 insertions(+), 30 deletions(-)

diff --git a/Examples/UIExplorer/js/TextInputExample.ios.js b/Examples/UIExplorer/js/TextInputExample.ios.js
index f6499160448063..960066872b270c 100644
--- a/Examples/UIExplorer/js/TextInputExample.ios.js
+++ b/Examples/UIExplorer/js/TextInputExample.ios.js
@@ -103,34 +103,6 @@ class TextEventsExample extends React.Component {
   }
 }
 
-class AutoExpandingTextInput extends React.Component {
-  state: any;
-
-  constructor(props) {
-    super(props);
-    this.state = {
-      text: 'React Native enables you to build world-class application experiences on native platforms using a consistent developer experience based on JavaScript and React. The focus of React Native is on developer efficiency across all the platforms you care about — learn once, write anywhere. Facebook uses React Native in multiple production apps and will continue investing in React Native.',
-      height: 0,
-    };
-  }
-  render() {
-    return (
-      <TextInput
-        {...this.props}
-        multiline={true}
-        onChangeText={(text) => {
-          this.setState({text});
-        }}
-        onContentSizeChange={(event) => {
-          this.setState({height: event.nativeEvent.contentSize.height});
-        }}
-        style={[styles.default, {height: Math.max(35, this.state.height)}]}
-        value={this.state.text}
-      />
-    );
-  }
-}
-
 class RewriteExample extends React.Component {
   state: any;
 
@@ -403,6 +375,10 @@ var styles = StyleSheet.create({
     padding: 4,
     marginBottom: 4,
   },
+  multilineExpandable: {
+    height: 'auto',
+    maxHeight: 100,
+  },
   multilineWithFontStyles: {
     color: 'blue',
     fontWeight: 'bold',
@@ -801,10 +777,13 @@ exports.examples = [
     render: function() {
       return (
         <View>
-          <AutoExpandingTextInput
+          <TextInput
             placeholder="height increases with content"
+            defaultValue="React Native enables you to build world-class application experiences on native platforms using a consistent developer experience based on JavaScript and React. The focus of React Native is on developer efficiency across all the platforms you care about — learn once, write anywhere. Facebook uses React Native in multiple production apps and will continue investing in React Native."
+            multiline={true}
             enablesReturnKeyAutomatically={true}
-            returnKeyType="default"
+            returnKeyType="go"
+            style={[styles.multiline, styles.multilineExpandable]}
           />
         </View>
       );

From b53d76efb7c5e7239061267a28d69b51fb068dfe Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Mon, 20 Mar 2017 00:00:23 -0700
Subject: [PATCH 095/366] Better TextInput: RCTUITextView was decoupled in
 separate file and now handles placeholder feature

Reviewed By: mmmulani

Differential Revision: D4663151

fbshipit-source-id: ce57ca4bebf4676df2ae5e586a1b175ec2aac760
---
 .../UIExplorer/js/TextInputExample.ios.js     |   2 +-
 .../Text/RCTText.xcodeproj/project.pbxproj    |   8 +
 Libraries/Text/RCTTextView.h                  |   1 +
 Libraries/Text/RCTTextView.m                  | 283 ++++++------------
 Libraries/Text/RCTUITextView.h                |  28 ++
 Libraries/Text/RCTUITextView.m                | 189 ++++++++++++
 React/Base/RCTBatchedBridge.m                 |   1 +
 7 files changed, 319 insertions(+), 193 deletions(-)
 create mode 100644 Libraries/Text/RCTUITextView.h
 create mode 100644 Libraries/Text/RCTUITextView.m

diff --git a/Examples/UIExplorer/js/TextInputExample.ios.js b/Examples/UIExplorer/js/TextInputExample.ios.js
index 960066872b270c..89f8ccaff2ec2b 100644
--- a/Examples/UIExplorer/js/TextInputExample.ios.js
+++ b/Examples/UIExplorer/js/TextInputExample.ios.js
@@ -779,7 +779,7 @@ exports.examples = [
         <View>
           <TextInput
             placeholder="height increases with content"
-            defaultValue="React Native enables you to build world-class application experiences on native platforms using a consistent developer experience based on JavaScript and React. The focus of React Native is on developer efficiency across all the platforms you care about — learn once, write anywhere. Facebook uses React Native in multiple production apps and will continue investing in React Native."
+            defaultValue="React Native enables you to build world-class application experiences on native platforms using a consistent developer experience based on JavaScript and React. The focus of React Native is on developer efficiency across all the platforms you care about - learn once, write anywhere. Facebook uses React Native in multiple production apps and will continue investing in React Native."
             multiline={true}
             enablesReturnKeyAutomatically={true}
             returnKeyType="go"
diff --git a/Libraries/Text/RCTText.xcodeproj/project.pbxproj b/Libraries/Text/RCTText.xcodeproj/project.pbxproj
index e2cfafd68291b7..c9813036d48f43 100644
--- a/Libraries/Text/RCTText.xcodeproj/project.pbxproj
+++ b/Libraries/Text/RCTText.xcodeproj/project.pbxproj
@@ -27,6 +27,8 @@
 		58B511D01A9E6C5C00147676 /* RCTShadowText.m in Sources */ = {isa = PBXBuildFile; fileRef = 58B511CB1A9E6C5C00147676 /* RCTShadowText.m */; };
 		58B511D11A9E6C5C00147676 /* RCTTextManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 58B511CD1A9E6C5C00147676 /* RCTTextManager.m */; };
 		58B512161A9E6EFF00147676 /* RCTText.m in Sources */ = {isa = PBXBuildFile; fileRef = 58B512141A9E6EFF00147676 /* RCTText.m */; };
+		59B125C91E6E4E15004E2A67 /* RCTUITextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59B125C81E6E4E15004E2A67 /* RCTUITextView.m */; };
+		59B125CA1E6E4E15004E2A67 /* RCTUITextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59B125C81E6E4E15004E2A67 /* RCTUITextView.m */; };
 		59F60E911E661BDD0081153B /* RCTShadowTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 59F60E8E1E661BDD0081153B /* RCTShadowTextField.m */; };
 		59F60E921E661BDD0081153B /* RCTShadowTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 59F60E8E1E661BDD0081153B /* RCTShadowTextField.m */; };
 		59F60E931E661BDD0081153B /* RCTShadowTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59F60E901E661BDD0081153B /* RCTShadowTextView.m */; };
@@ -58,6 +60,8 @@
 		58B511CD1A9E6C5C00147676 /* RCTTextManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTextManager.m; sourceTree = "<group>"; };
 		58B512141A9E6EFF00147676 /* RCTText.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTText.m; sourceTree = "<group>"; };
 		58B512151A9E6EFF00147676 /* RCTText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTText.h; sourceTree = "<group>"; };
+		59B125C71E6E4E15004E2A67 /* RCTUITextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTUITextView.h; sourceTree = "<group>"; };
+		59B125C81E6E4E15004E2A67 /* RCTUITextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTUITextView.m; sourceTree = "<group>"; };
 		59F60E8D1E661BDD0081153B /* RCTShadowTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTShadowTextField.h; sourceTree = "<group>"; };
 		59F60E8E1E661BDD0081153B /* RCTShadowTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTShadowTextField.m; sourceTree = "<group>"; };
 		59F60E8F1E661BDD0081153B /* RCTShadowTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTShadowTextView.h; sourceTree = "<group>"; };
@@ -97,6 +101,8 @@
 				131B6ABD1AF0CD0600FFC3E0 /* RCTTextView.m */,
 				131B6ABE1AF0CD0600FFC3E0 /* RCTTextViewManager.h */,
 				131B6ABF1AF0CD0600FFC3E0 /* RCTTextViewManager.m */,
+				59B125C71E6E4E15004E2A67 /* RCTUITextView.h */,
+				59B125C81E6E4E15004E2A67 /* RCTUITextView.m */,
 			);
 			indentWidth = 2;
 			sourceTree = "<group>";
@@ -194,6 +200,7 @@
 				2D3B5F341D9B103100451313 /* RCTRawTextManager.m in Sources */,
 				59F60E921E661BDD0081153B /* RCTShadowTextField.m in Sources */,
 				AF3225FA1DE5574F00D3E7E7 /* RCTConvert+Text.m in Sources */,
+				59B125CA1E6E4E15004E2A67 /* RCTUITextView.m in Sources */,
 				2D3B5F3C1D9B106F00451313 /* RCTTextViewManager.m in Sources */,
 				59F60E941E661BDD0081153B /* RCTShadowTextView.m in Sources */,
 				2D3B5F331D9B102D00451313 /* RCTTextSelection.m in Sources */,
@@ -214,6 +221,7 @@
 				1362F1011B4D51F400E06D8C /* RCTTextFieldManager.m in Sources */,
 				59F60E911E661BDD0081153B /* RCTShadowTextField.m in Sources */,
 				AF3225F91DE5574F00D3E7E7 /* RCTConvert+Text.m in Sources */,
+				59B125C91E6E4E15004E2A67 /* RCTUITextView.m in Sources */,
 				131B6AC11AF0CD0600FFC3E0 /* RCTTextViewManager.m in Sources */,
 				59F60E931E661BDD0081153B /* RCTShadowTextView.m in Sources */,
 				58B511CF1A9E6C5C00147676 /* RCTShadowRawText.m in Sources */,
diff --git a/Libraries/Text/RCTTextView.h b/Libraries/Text/RCTTextView.h
index 34f4cb828d6f52..d77ff5777a3c2b 100644
--- a/Libraries/Text/RCTTextView.h
+++ b/Libraries/Text/RCTTextView.h
@@ -25,6 +25,7 @@
 @property (nonatomic, assign) BOOL automaticallyAdjustContentInsets;
 @property (nonatomic, copy) NSString *text;
 @property (nonatomic, strong) UIColor *placeholderTextColor;
+@property (nonatomic, copy) NSString *placeholder;
 @property (nonatomic, strong) UIFont *font;
 @property (nonatomic, assign) NSInteger mostRecentEventCount;
 @property (nonatomic, strong) NSNumber *maxLength;
diff --git a/Libraries/Text/RCTTextView.m b/Libraries/Text/RCTTextView.m
index b88f34bff0aad5..dc0d289fc22205 100644
--- a/Libraries/Text/RCTTextView.m
+++ b/Libraries/Text/RCTTextView.m
@@ -18,64 +18,14 @@
 #import "RCTShadowText.h"
 #import "RCTText.h"
 #import "RCTTextSelection.h"
-
-@interface RCTUITextView : UITextView
-
-@property (nonatomic, assign) BOOL textWasPasted;
-
-@end
-
-@implementation RCTUITextView
-{
-  BOOL _jsRequestingFirstResponder;
-}
-
-- (void)paste:(id)sender
-{
-  _textWasPasted = YES;
-  [super paste:sender];
-}
-
-- (void)reactWillMakeFirstResponder
-{
-  _jsRequestingFirstResponder = YES;
-}
-
-- (BOOL)canBecomeFirstResponder
-{
-  return _jsRequestingFirstResponder;
-}
-
-- (void)reactDidMakeFirstResponder
-{
-  _jsRequestingFirstResponder = NO;
-}
-
-- (void)didMoveToWindow
-{
-  if (_jsRequestingFirstResponder) {
-    [self becomeFirstResponder];
-    [self reactDidMakeFirstResponder];
-  }
-}
-
-- (void)setContentOffset:(CGPoint)contentOffset animated:(__unused BOOL)animated
-{
-  // Turning off scroll animation.
-  // This fixes the problem also known as "flaky scrolling".
-  [super setContentOffset:contentOffset animated:NO];
-}
-
-@end
+#import "RCTUITextView.h"
 
 @implementation RCTTextView
 {
   RCTBridge *_bridge;
   RCTEventDispatcher *_eventDispatcher;
 
-  NSString *_placeholder;
-  UITextView *_placeholderView;
-  UITextView *_textView;
+  RCTUITextView *_textView;
   RCTText *_richTextView;
   NSAttributedString *_pendingAttributedText;
 
@@ -99,7 +49,6 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
     _contentInset = UIEdgeInsetsZero;
     _bridge = bridge;
     _eventDispatcher = bridge.eventDispatcher;
-    _placeholderTextColor = [self defaultPlaceholderTextColor];
     _blurOnSubmit = NO;
 
     _textView = [[RCTUITextView alloc] initWithFrame:self.bounds];
@@ -241,39 +190,12 @@ - (void)performPendingTextUpdate
 
   [_textView layoutIfNeeded];
 
-  [self updatePlaceholderVisibility];
   [self invalidateContentSize];
 
   _blockTextShouldChange = NO;
 }
 
-- (void)updatePlaceholder
-{
-  [_placeholderView removeFromSuperview];
-  _placeholderView = nil;
-
-  if (_placeholder) {
-    _placeholderView = [[UITextView alloc] initWithFrame:_textView.frame];
-    _placeholderView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-    _placeholderView.textContainer.lineFragmentPadding = 0;
-    _placeholderView.userInteractionEnabled = NO;
-    _placeholderView.backgroundColor = [UIColor clearColor];
-    _placeholderView.scrollEnabled = NO;
-#if !TARGET_OS_TV
-    _placeholderView.editable = NO;
-    _placeholderView.scrollsToTop = NO;
-#endif
-    _placeholderView.attributedText =
-    [[NSAttributedString alloc] initWithString:_placeholder attributes:@{
-      NSFontAttributeName : (_textView.font ? _textView.font : [self defaultPlaceholderFont]),
-      NSForegroundColorAttributeName : _placeholderTextColor
-    }];
-    _placeholderView.textAlignment = _textView.textAlignment;
-
-    [self insertSubview:_placeholderView belowSubview:_textView];
-    [self updatePlaceholderVisibility];
-  }
-}
+#pragma mark - Properties
 
 - (UIFont *)font
 {
@@ -283,40 +205,110 @@ - (UIFont *)font
 - (void)setFont:(UIFont *)font
 {
   _textView.font = font;
-  [self updatePlaceholder];
+}
+
+- (void)setContentInset:(UIEdgeInsets)contentInset
+{
+  _contentInset = contentInset;
+  _textView.textContainerInset = contentInset;
+  [self setNeedsLayout];
+}
+
+- (void)setSelection:(RCTTextSelection *)selection
+{
+  if (!selection) {
+    return;
+  }
+
+  UITextRange *currentSelection = _textView.selectedTextRange;
+  UITextPosition *start = [_textView positionFromPosition:_textView.beginningOfDocument offset:selection.start];
+  UITextPosition *end = [_textView positionFromPosition:_textView.beginningOfDocument offset:selection.end];
+  UITextRange *selectedTextRange = [_textView textRangeFromPosition:start toPosition:end];
+
+  NSInteger eventLag = _nativeEventCount - _mostRecentEventCount;
+  if (eventLag == 0 && ![currentSelection isEqual:selectedTextRange]) {
+    _previousSelectionRange = selectedTextRange;
+    _textView.selectedTextRange = selectedTextRange;
+  } else if (eventLag > RCTTextUpdateLagWarningThreshold) {
+    RCTLogWarn(@"Native TextInput(%@) is %zd events ahead of JS - try to make your JS faster.", self.text, eventLag);
+  }
+}
+
+- (NSString *)text
+{
+  return _textView.text;
+}
+
+- (void)setText:(NSString *)text
+{
+  NSInteger eventLag = _nativeEventCount - _mostRecentEventCount;
+  if (eventLag == 0 && ![text isEqualToString:_textView.text]) {
+    UITextRange *selection = _textView.selectedTextRange;
+    NSInteger oldTextLength = _textView.text.length;
+
+    _predictedText = text;
+    _textView.text = text;
+
+    if (selection.empty) {
+      // maintain cursor position relative to the end of the old text
+      NSInteger start = [_textView offsetFromPosition:_textView.beginningOfDocument toPosition:selection.start];
+      NSInteger offsetFromEnd = oldTextLength - start;
+      NSInteger newOffset = text.length - offsetFromEnd;
+      UITextPosition *position = [_textView positionFromPosition:_textView.beginningOfDocument offset:newOffset];
+      _textView.selectedTextRange = [_textView textRangeFromPosition:position toPosition:position];
+    }
+
+    [self invalidateContentSize];
+  } else if (eventLag > RCTTextUpdateLagWarningThreshold) {
+    RCTLogWarn(@"Native TextInput(%@) is %zd events ahead of JS - try to make your JS faster.", self.text, eventLag);
+  }
+}
+
+- (NSString *)placeholder
+{
+  return _textView.placeholderText;
 }
 
 - (void)setPlaceholder:(NSString *)placeholder
 {
-  _placeholder = placeholder;
-  [self updatePlaceholder];
+  _textView.placeholderText = placeholder;
+}
+
+- (UIColor *)placeholderTextColor
+{
+  return _textView.placeholderTextColor;
 }
 
 - (void)setPlaceholderTextColor:(UIColor *)placeholderTextColor
 {
-  if (placeholderTextColor) {
-    _placeholderTextColor = placeholderTextColor;
-  } else {
-    _placeholderTextColor = [self defaultPlaceholderTextColor];
-  }
-  [self updatePlaceholder];
+  _textView.placeholderTextColor = placeholderTextColor;
 }
 
-- (void)setContentInset:(UIEdgeInsets)contentInset
+- (void)setAutocorrectionType:(UITextAutocorrectionType)autocorrectionType
 {
-  _contentInset = contentInset;
-  _textView.textContainerInset = contentInset;
-  _placeholderView.textContainerInset = contentInset;
-  [self setNeedsLayout];
+  _textView.autocorrectionType = autocorrectionType;
+}
+
+- (UITextAutocorrectionType)autocorrectionType
+{
+  return _textView.autocorrectionType;
+}
+
+- (void)setSpellCheckingType:(UITextSpellCheckingType)spellCheckingType
+{
+  _textView.spellCheckingType = spellCheckingType;
+}
+
+- (UITextSpellCheckingType)spellCheckingType
+{
+  return _textView.spellCheckingType;
 }
 
 #pragma mark - UITextViewDelegate
 
 - (BOOL)textView:(RCTUITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text
 {
-  if (textView.textWasPasted) {
-    textView.textWasPasted = NO;
-  } else {
+  if (!textView.textWasPasted) {
     [_eventDispatcher sendTextEventWithType:RCTTextEventTypeKeyPress
                                    reactTag:self.reactTag
                                        text:nil
@@ -425,86 +417,6 @@ - (void)textViewDidChangeSelection:(RCTUITextView *)textView
   }
 }
 
-- (NSString *)text
-{
-  return _textView.text;
-}
-
-- (void)setSelection:(RCTTextSelection *)selection
-{
-  if (!selection) {
-    return;
-  }
-
-  UITextRange *currentSelection = _textView.selectedTextRange;
-  UITextPosition *start = [_textView positionFromPosition:_textView.beginningOfDocument offset:selection.start];
-  UITextPosition *end = [_textView positionFromPosition:_textView.beginningOfDocument offset:selection.end];
-  UITextRange *selectedTextRange = [_textView textRangeFromPosition:start toPosition:end];
-
-  NSInteger eventLag = _nativeEventCount - _mostRecentEventCount;
-  if (eventLag == 0 && ![currentSelection isEqual:selectedTextRange]) {
-    _previousSelectionRange = selectedTextRange;
-    _textView.selectedTextRange = selectedTextRange;
-  } else if (eventLag > RCTTextUpdateLagWarningThreshold) {
-    RCTLogWarn(@"Native TextInput(%@) is %zd events ahead of JS - try to make your JS faster.", self.text, eventLag);
-  }
-}
-
-- (void)setText:(NSString *)text
-{
-  NSInteger eventLag = _nativeEventCount - _mostRecentEventCount;
-  if (eventLag == 0 && ![text isEqualToString:_textView.text]) {
-    UITextRange *selection = _textView.selectedTextRange;
-    NSInteger oldTextLength = _textView.text.length;
-
-    _predictedText = text;
-    _textView.text = text;
-
-    if (selection.empty) {
-      // maintain cursor position relative to the end of the old text
-      NSInteger start = [_textView offsetFromPosition:_textView.beginningOfDocument toPosition:selection.start];
-      NSInteger offsetFromEnd = oldTextLength - start;
-      NSInteger newOffset = text.length - offsetFromEnd;
-      UITextPosition *position = [_textView positionFromPosition:_textView.beginningOfDocument offset:newOffset];
-      _textView.selectedTextRange = [_textView textRangeFromPosition:position toPosition:position];
-    }
-
-    [self updatePlaceholderVisibility];
-    [self invalidateContentSize];
-  } else if (eventLag > RCTTextUpdateLagWarningThreshold) {
-    RCTLogWarn(@"Native TextInput(%@) is %zd events ahead of JS - try to make your JS faster.", self.text, eventLag);
-  }
-}
-
-- (void)updatePlaceholderVisibility
-{
-  if (_textView.text.length > 0) {
-    [_placeholderView setHidden:YES];
-  } else {
-    [_placeholderView setHidden:NO];
-  }
-}
-
-- (void)setAutocorrectionType:(UITextAutocorrectionType)autocorrectionType
-{
-  _textView.autocorrectionType = autocorrectionType;
-}
-
-- (UITextAutocorrectionType)autocorrectionType
-{
-  return _textView.autocorrectionType;
-}
-
-- (void)setSpellCheckingType:(UITextSpellCheckingType)spellCheckingType
-{
-  _textView.spellCheckingType = spellCheckingType;
-}
-
-- (UITextSpellCheckingType)spellCheckingType
-{
-  return _textView.spellCheckingType;
-}
-
 - (BOOL)textViewShouldBeginEditing:(UITextView *)textView
 {
   if (_selectTextOnFocus) {
@@ -519,7 +431,6 @@ - (void)textViewDidBeginEditing:(UITextView *)textView
 {
   if (_clearTextOnFocus) {
     _textView.text = @"";
-    [self updatePlaceholderVisibility];
   }
 
   [_eventDispatcher sendTextEventWithType:RCTTextEventTypeFocus
@@ -560,7 +471,6 @@ static BOOL findMismatch(NSString *first, NSString *second, NSRange *firstRange,
 
 - (void)textViewDidChange:(UITextView *)textView
 {
-  [self updatePlaceholderVisibility];
   [self invalidateContentSize];
 
   // Detect when textView updates happend that didn't invoke `shouldChangeTextInRange`
@@ -580,6 +490,7 @@ - (void)textViewDidChange:(UITextView *)textView
   _nativeUpdatesInFlight = NO;
   _nativeEventCount++;
 
+  // TODO: t16435709 This part will be removed soon.
   if (!self.reactTag || !_onChange) {
     return;
   }
@@ -718,18 +629,6 @@ - (void)layoutSubviews
   [self invalidateContentSize];
 }
 
-#pragma mark - Default values
-
-- (UIFont *)defaultPlaceholderFont
-{
-  return [UIFont systemFontOfSize:17];
-}
-
-- (UIColor *)defaultPlaceholderTextColor
-{
-  return [UIColor colorWithRed:0.0/255.0 green:0.0/255.0 blue:0.098/255.0 alpha:0.22];
-}
-
 #pragma mark - UIScrollViewDelegate
 
 - (void)scrollViewDidScroll:(UIScrollView *)scrollView
diff --git a/Libraries/Text/RCTUITextView.h b/Libraries/Text/RCTUITextView.h
new file mode 100644
index 00000000000000..762c1c2ad70cdb
--- /dev/null
+++ b/Libraries/Text/RCTUITextView.h
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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.
+ */
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/*
+ * Just regular UITextView... but much better!
+ */
+@interface RCTUITextView : UITextView
+
+- (instancetype)initWithFrame:(CGRect)frame textContainer:(nullable NSTextContainer *)textContainer NS_UNAVAILABLE;
+- (instancetype)initWithCoder:(NSCoder *)aDecoder NS_UNAVAILABLE;
+
+@property (nonatomic, assign, readonly) BOOL textWasPasted;
+@property (nonatomic, copy, nullable) NSString *placeholderText;
+@property (nonatomic, assign, nullable) UIColor *placeholderTextColor;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/Libraries/Text/RCTUITextView.m b/Libraries/Text/RCTUITextView.m
new file mode 100644
index 00000000000000..24302f823ed89a
--- /dev/null
+++ b/Libraries/Text/RCTUITextView.m
@@ -0,0 +1,189 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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.
+ */
+
+#import "RCTUITextView.h"
+
+@implementation RCTUITextView
+{
+  BOOL _jsRequestingFirstResponder;
+  UILabel *_placeholderView;
+  UITextView *_detachedTextView;
+}
+
+static UIFont *defaultPlaceholderFont()
+{
+  return [UIFont systemFontOfSize:17];
+}
+
+static UIColor *defaultPlaceholderTextColor()
+{
+  // Default placeholder color from UITextField.
+  return [UIColor colorWithRed:0 green:0 blue:0.0980392 alpha:0.22];
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(textDidChange)
+                                                 name:UITextViewTextDidChangeNotification
+                                               object:self];
+
+    _placeholderView = [[UILabel alloc] initWithFrame:self.bounds];
+    _placeholderView.hidden = YES;
+    _placeholderView.isAccessibilityElement = NO;
+    _placeholderView.numberOfLines = 0;
+    [self addSubview:_placeholderView];
+  }
+
+  return self;
+}
+
+- (void)dealloc
+{
+  [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
+#pragma mark - Properties
+
+- (void)setPlaceholderText:(NSString *)placeholderText
+{
+  _placeholderText = placeholderText;
+  [self invalidatePlaceholder];
+}
+
+- (void)setPlaceholderTextColor:(UIColor *)placeholderTextColor
+{
+  _placeholderTextColor = placeholderTextColor;
+  [self invalidatePlaceholder];
+}
+
+
+- (void)textDidChange
+{
+  _textWasPasted = NO;
+  [self invalidatePlaceholder];
+}
+
+#pragma mark - UIResponder
+
+- (void)reactWillMakeFirstResponder
+{
+  _jsRequestingFirstResponder = YES;
+}
+
+- (BOOL)canBecomeFirstResponder
+{
+  return _jsRequestingFirstResponder;
+}
+
+- (void)reactDidMakeFirstResponder
+{
+  _jsRequestingFirstResponder = NO;
+}
+
+- (void)didMoveToWindow
+{
+  if (_jsRequestingFirstResponder) {
+    [self becomeFirstResponder];
+    [self reactDidMakeFirstResponder];
+  }
+}
+
+#pragma mark - Overrides
+
+- (void)setFont:(UIFont *)font
+{
+  [super setFont:font];
+  [self invalidatePlaceholder];
+}
+
+- (void)setText:(NSString *)text
+{
+  [super setText:text];
+  [self textDidChange];
+}
+
+- (void)setAttributedText:(NSAttributedString *)attributedText
+{
+  [super setAttributedText:attributedText];
+  [self textDidChange];
+}
+
+- (void)paste:(id)sender
+{
+  [super paste:sender];
+  _textWasPasted = YES;
+}
+
+- (void)setContentOffset:(CGPoint)contentOffset animated:(__unused BOOL)animated
+{
+  // Turning off scroll animation.
+  // This fixes the problem also known as "flaky scrolling".
+  [super setContentOffset:contentOffset animated:NO];
+}
+
+#pragma mark - Layout
+
+- (void)layoutSubviews
+{
+  [super layoutSubviews];
+
+  CGRect textFrame = UIEdgeInsetsInsetRect(self.bounds, self.textContainerInset);
+  CGFloat placeholderHeight = [_placeholderView sizeThatFits:textFrame.size].height;
+  textFrame.size.height = MIN(placeholderHeight, textFrame.size.height);
+  _placeholderView.frame = textFrame;
+}
+
+- (CGSize)sizeThatFits:(CGSize)size
+{
+  // UITextView on iOS 8 has a bug that automatically scrolls to the top
+  // when calling `sizeThatFits:`. Use a copy so that self is not screwed up.
+  static BOOL useCustomImplementation = NO;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    useCustomImplementation = ![[NSProcessInfo processInfo] isOperatingSystemAtLeastVersion:(NSOperatingSystemVersion){9,0,0}];
+  });
+
+  if (!useCustomImplementation) {
+    return [super sizeThatFits:size];
+  }
+
+  if (!_detachedTextView) {
+    _detachedTextView = [UITextView new];
+  }
+
+  _detachedTextView.attributedText = self.attributedText;
+  _detachedTextView.font = self.font;
+  _detachedTextView.textContainerInset = self.textContainerInset;
+
+  return [_detachedTextView sizeThatFits:size];
+}
+
+#pragma mark - Placeholder
+
+- (void)invalidatePlaceholder
+{
+  BOOL wasVisible = !_placeholderView.isHidden;
+  BOOL isVisible = _placeholderText.length != 0 && self.text.length == 0;
+
+  if (wasVisible != isVisible) {
+    _placeholderView.hidden = !isVisible;
+  }
+
+  if (isVisible) {
+    _placeholderView.font = self.font ?: defaultPlaceholderFont();
+    _placeholderView.textColor = _placeholderTextColor ?: defaultPlaceholderTextColor();
+    _placeholderView.textAlignment = self.textAlignment;
+    _placeholderView.text = _placeholderText;
+    [self setNeedsLayout];
+  }
+}
+
+@end
diff --git a/React/Base/RCTBatchedBridge.m b/React/Base/RCTBatchedBridge.m
index 4c065d0d612f61..480df01a953518 100644
--- a/React/Base/RCTBatchedBridge.m
+++ b/React/Base/RCTBatchedBridge.m
@@ -10,6 +10,7 @@
 #import <Foundation/Foundation.h>
 
 #import "RCTAssert.h"
+
 #import "RCTBridge+Private.h"
 #import "RCTBridge.h"
 #import "RCTBridgeMethod.h"

From 7168ed295496dbfb503076737f1931eee9d6e137 Mon Sep 17 00:00:00 2001
From: Martin Konicek <mkonicek@fb.com>
Date: Mon, 20 Mar 2017 04:57:35 -0700
Subject: [PATCH 096/366] Revert D4676282: [rn] Move idle detection classes to
 its own directory

Differential Revision: D4676282

fbshipit-source-id: ad5ee4f2cdbe407f67cfed74af7ddec18dabff3d
---
 .../java/com/facebook/react/testing/BUCK      |   6 +-
 .../{idledetection => }/IdleWaiter.java       |   2 +-
 .../ReactAppInstrumentationTestCase.java      |   2 +-
 .../react/testing/ReactAppTestActivity.java   |   2 -
 .../ReactBridgeIdleSignaler.java              |   2 +-
 .../react/testing/ReactIdleDetectionUtil.java |   2 +-
 .../testing/ReactIntegrationTestCase.java     |   2 -
 .../testing/SingleTouchGestureGenerator.java  |   2 -
 .../facebook/react/testing/idledetection/BUCK |  14 --
 .../idledetection/ReactIdleDetectionUtil.java | 125 ------------------
 .../java/com/facebook/react/tests/BUCK        |   1 -
 11 files changed, 5 insertions(+), 155 deletions(-)
 rename ReactAndroid/src/androidTest/java/com/facebook/react/testing/{idledetection => }/IdleWaiter.java (90%)
 rename ReactAndroid/src/androidTest/java/com/facebook/react/testing/{idledetection => }/ReactBridgeIdleSignaler.java (97%)
 delete mode 100644 ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/BUCK
 delete mode 100644 ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactIdleDetectionUtil.java

diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
index 6814e3aa316138..5cf6affe9a6fab 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
@@ -2,10 +2,7 @@ include_defs("//ReactAndroid/DEFS")
 
 android_library(
     name = "testing",
-    srcs = glob(
-        ["**/*.java"],
-        excludes = ["idledetection/**/*.java"],
-    ),
+    srcs = glob(["**/*.java"]),
     visibility = [
         "PUBLIC",
     ],
@@ -28,6 +25,5 @@ android_library(
         react_native_target("java/com/facebook/react/modules/debug:interfaces"),
         react_native_target("java/com/facebook/react/shell:shell"),
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
-        react_native_integration_tests_target("java/com/facebook/react/testing/idledetection:idledetection"),
     ],
 )
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/IdleWaiter.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/IdleWaiter.java
similarity index 90%
rename from ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/IdleWaiter.java
rename to ReactAndroid/src/androidTest/java/com/facebook/react/testing/IdleWaiter.java
index 1b94b7c1fc88db..98884c1033a375 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/IdleWaiter.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/IdleWaiter.java
@@ -6,7 +6,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package com.facebook.react.testing.idledetection;
+package com.facebook.react.testing;
 
 /**
  * Interface for something that knows how to wait for bridge and UI idle.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppInstrumentationTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppInstrumentationTestCase.java
index eeb8c02e06715d..aaba651def949c 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppInstrumentationTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppInstrumentationTestCase.java
@@ -20,7 +20,6 @@
 
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.testing.idledetection.IdleWaiter;
 
 /**
  * Base class for instrumentation tests that runs React based react application in UI mode
@@ -124,6 +123,7 @@ public void run() {
       }
     };
 
+
     getActivity().runOnUiThread(getScreenshotRunnable);
     try {
       if (!latch.await(5000, TimeUnit.MILLISECONDS)) {
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java
index 11edda17a429b0..022e7826c1fe83 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java
@@ -28,8 +28,6 @@
 import com.facebook.react.common.LifecycleState;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.facebook.react.shell.MainReactPackage;
-import com.facebook.react.testing.idledetection.ReactBridgeIdleSignaler;
-import com.facebook.react.testing.idledetection.ReactIdleDetectionUtil;
 import com.facebook.react.uimanager.UIImplementationProvider;
 
 public class ReactAppTestActivity extends FragmentActivity implements
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactBridgeIdleSignaler.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactBridgeIdleSignaler.java
similarity index 97%
rename from ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactBridgeIdleSignaler.java
rename to ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactBridgeIdleSignaler.java
index 4aaa451e43ab24..ffd941f9a228e6 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactBridgeIdleSignaler.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactBridgeIdleSignaler.java
@@ -6,7 +6,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package com.facebook.react.testing.idledetection;
+package com.facebook.react.testing;
 
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIdleDetectionUtil.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIdleDetectionUtil.java
index af6ca2ebb82a55..49e2219327b96f 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIdleDetectionUtil.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIdleDetectionUtil.java
@@ -6,7 +6,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package com.facebook.react.testing.idledetection;
+package com.facebook.react.testing;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java
index 77f5492c36cafd..752c89ea618161 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java
@@ -32,8 +32,6 @@
 import com.facebook.react.common.futures.SimpleSettableFuture;
 import com.facebook.react.devsupport.interfaces.DevSupportManager;
 import com.facebook.react.modules.core.Timing;
-import com.facebook.react.testing.idledetection.ReactBridgeIdleSignaler;
-import com.facebook.react.testing.idledetection.ReactIdleDetectionUtil;
 import com.facebook.soloader.SoLoader;
 
 import static org.mockito.Mockito.mock;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/SingleTouchGestureGenerator.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/SingleTouchGestureGenerator.java
index f0ae877a953d42..278facbcb280b4 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/SingleTouchGestureGenerator.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/SingleTouchGestureGenerator.java
@@ -13,8 +13,6 @@
 import android.view.View;
 import android.view.ViewConfiguration;
 
-import com.facebook.react.testing.idledetection.IdleWaiter;
-
 /**
  * Provides methods for generating touch events and dispatching them directly to a given view.
  * Events scenarios are based on {@link android.test.TouchUtils} but they get gets dispatched
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/BUCK
deleted file mode 100644
index f6b33535737d3f..00000000000000
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/BUCK
+++ /dev/null
@@ -1,14 +0,0 @@
-include_defs("//ReactAndroid/DEFS")
-
-android_library(
-    name = "idledetection",
-    srcs = glob(["**/*.java"]),
-    visibility = [
-        "PUBLIC",
-    ],
-    deps = [
-        react_native_dep("third-party/java/testing-support-lib:runner"),
-        react_native_target("java/com/facebook/react/bridge:bridge"),
-        react_native_target("java/com/facebook/react/modules/core:core"),
-    ],
-)
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactIdleDetectionUtil.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactIdleDetectionUtil.java
deleted file mode 100644
index af6ca2ebb82a55..00000000000000
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactIdleDetectionUtil.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * 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.
- */
-
-package com.facebook.react.testing.idledetection;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import android.app.Instrumentation;
-import android.os.SystemClock;
-import android.support.test.InstrumentationRegistry;
-
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.bridge.UiThreadUtil;
-import com.facebook.react.modules.core.ChoreographerCompat;
-
-public class ReactIdleDetectionUtil {
-
-  /**
-   * Waits for both the UI thread and bridge to be idle. It determines this by waiting for the
-   * bridge to become idle, then waiting for the UI thread to become idle, then checking if the
-   * bridge is idle again (if the bridge was idle before and is still idle after running the UI
-   * thread to idle, then there are no more events to process in either place).
-   * <p/>
-   * Also waits for any Choreographer callbacks to run after the initial sync since things like UI
-   * events are initiated from Choreographer callbacks.
-   */
-  public static void waitForBridgeAndUIIdle(
-      ReactBridgeIdleSignaler idleSignaler,
-      final ReactContext reactContext,
-      long timeoutMs) {
-    UiThreadUtil.assertNotOnUiThread();
-
-    long startTime = SystemClock.uptimeMillis();
-    waitInner(idleSignaler, timeoutMs);
-
-    long timeToWait = Math.max(1, timeoutMs - (SystemClock.uptimeMillis() - startTime));
-    waitForChoreographer(timeToWait);
-    waitForJSIdle(reactContext);
-
-    timeToWait = Math.max(1, timeoutMs - (SystemClock.uptimeMillis() - startTime));
-    waitInner(idleSignaler, timeToWait);
-    timeToWait = Math.max(1, timeoutMs - (SystemClock.uptimeMillis() - startTime));
-    waitForChoreographer(timeToWait);
-  }
-
-  private static void waitForChoreographer(long timeToWait) {
-    final int waitFrameCount = 2;
-    final CountDownLatch latch = new CountDownLatch(1);
-    UiThreadUtil.runOnUiThread(
-        new Runnable() {
-          @Override
-          public void run() {
-            ChoreographerCompat.getInstance().postFrameCallback(
-                new ChoreographerCompat.FrameCallback() {
-
-                  private int frameCount = 0;
-
-                  @Override
-                  public void doFrame(long frameTimeNanos) {
-                    frameCount++;
-                    if (frameCount == waitFrameCount) {
-                      latch.countDown();
-                    } else {
-                      ChoreographerCompat.getInstance().postFrameCallback(this);
-                    }
-                  }
-                });
-          }
-        });
-    try {
-      if (!latch.await(timeToWait, TimeUnit.MILLISECONDS)) {
-        throw new RuntimeException("Timed out waiting for Choreographer");
-      }
-    } catch (Exception e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  private static void waitForJSIdle(ReactContext reactContext) {
-    if (!reactContext.hasActiveCatalystInstance()) {
-      return;
-    }
-    final CountDownLatch latch = new CountDownLatch(1);
-
-    reactContext.runOnJSQueueThread(
-        new Runnable() {
-          @Override
-          public void run() {
-            latch.countDown();
-          }
-        });
-
-    try {
-      if (!latch.await(5000, TimeUnit.MILLISECONDS)) {
-        throw new RuntimeException("Timed out waiting for JS thread");
-      }
-    } catch (Exception e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  private static void waitInner(ReactBridgeIdleSignaler idleSignaler, long timeToWait) {
-    // TODO gets broken in gradle, do we need it?
-    Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-    long startTime = SystemClock.uptimeMillis();
-    boolean bridgeWasIdle = false;
-    while (SystemClock.uptimeMillis() - startTime < timeToWait) {
-      boolean bridgeIsIdle = idleSignaler.isBridgeIdle();
-      if (bridgeIsIdle && bridgeWasIdle) {
-        return;
-      }
-      bridgeWasIdle = bridgeIsIdle;
-      long newTimeToWait = Math.max(1, timeToWait - (SystemClock.uptimeMillis() - startTime));
-      idleSignaler.waitForIdle(newTimeToWait);
-      instrumentation.waitForIdleSync();
-    }
-    throw new RuntimeException("Timed out waiting for bridge and UI idle!");
-  }
-}
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK
index 992351f62026aa..96872ba647b382 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK
@@ -5,7 +5,6 @@ deps = [
     react_native_dep("third-party/java/jsr-305:jsr-305"),
     react_native_dep("third-party/java/junit:junit"),
     react_native_integration_tests_target("java/com/facebook/react/testing:testing"),
-    react_native_integration_tests_target("java/com/facebook/react/testing/idledetection:idledetection"),
     react_native_target("java/com/facebook/react:react"),
     react_native_target("java/com/facebook/react/bridge:bridge"),
     react_native_target("java/com/facebook/react/common:common"),

From 5b3920567d98f4b6219b6752dd06e1a5a82f9755 Mon Sep 17 00:00:00 2001
From: David Aurelio <davidaurelio@fb.com>
Date: Mon, 20 Mar 2017 05:34:57 -0700
Subject: [PATCH 097/366] Fix indentation of polyfills/require.js

Summary: Fixes the messed-up indentation of `polyfills/require.js`. Over half of the lines were indented with an odd number of spaces.

Reviewed By: arcanis, bestander

Differential Revision: D4737435

fbshipit-source-id: a5b9baf0a27f236a4d3d6b6c1c5a92f52859f62c
---
 packager/src/Resolver/polyfills/require.js | 360 ++++++++++-----------
 1 file changed, 180 insertions(+), 180 deletions(-)

diff --git a/packager/src/Resolver/polyfills/require.js b/packager/src/Resolver/polyfills/require.js
index d532f4a90b1ae8..7638675a44048d 100644
--- a/packager/src/Resolver/polyfills/require.js
+++ b/packager/src/Resolver/polyfills/require.js
@@ -10,30 +10,30 @@
  * @flow
  */
 
- 'use strict';
+'use strict';
 
- declare var __DEV__: boolean;
+declare var __DEV__: boolean;
 
- type DependencyMap = Array<ModuleID>;
- type Exports = any;
- type FactoryFn = (
+type DependencyMap = Array<ModuleID>;
+type Exports = any;
+type FactoryFn = (
   global: Object,
   require: RequireFn,
   moduleObject: {exports: {}},
   exports: {},
   dependencyMap: ?DependencyMap,
 ) => void;
- type HotModuleReloadingAcceptFn = Function;
- type HotModuleReloadingData = {|
+type HotModuleReloadingAcceptFn = Function;
+type HotModuleReloadingData = {|
   acceptCallback: ?HotModuleReloadingAcceptFn,
   accept: (callback: HotModuleReloadingAcceptFn) => void,
 |};
- type Module = {
+type Module = {
   exports: Exports,
   hot?: HotModuleReloadingData,
 };
- type ModuleID = number;
- type ModuleDefinition = {|
+type ModuleID = number;
+type ModuleDefinition = {|
   dependencyMap: ?DependencyMap,
   exports: Exports,
   factory: FactoryFn,
@@ -42,247 +42,247 @@
   isInitialized: boolean,
   verboseName?: string,
 |};
- type ModuleMap =
+type ModuleMap =
   {[key: ModuleID]: (ModuleDefinition)};
- type RequireFn = (id: ModuleID | VerboseModuleNameForDev) => Exports;
- type VerboseModuleNameForDev = string;
+type RequireFn = (id: ModuleID | VerboseModuleNameForDev) => Exports;
+type VerboseModuleNameForDev = string;
 
- global.require = require;
- global.__d = define;
+global.require = require;
+global.__d = define;
 
- const modules: ModuleMap = Object.create(null);
- if (__DEV__) {
-   var verboseNamesToModuleIds: {[key: string]: number} = Object.create(null);
- }
+const modules: ModuleMap = Object.create(null);
+if (__DEV__) {
+  var verboseNamesToModuleIds: {[key: string]: number} = Object.create(null);
+}
 
- function define(
+function define(
   factory: FactoryFn,
   moduleId: number,
   dependencyMap?: DependencyMap,
 ) {
-   if (moduleId in modules) {
+  if (moduleId in modules) {
     // prevent repeated calls to `global.nativeRequire` to overwrite modules
     // that are already loaded
-     return;
-   }
-   modules[moduleId] = {
-     dependencyMap,
-     exports: undefined,
-     factory,
-     hasError: false,
-     isInitialized: false,
-   };
-   if (__DEV__) {
+    return;
+  }
+  modules[moduleId] = {
+    dependencyMap,
+    exports: undefined,
+    factory,
+    hasError: false,
+    isInitialized: false,
+  };
+  if (__DEV__) {
     // HMR
-     modules[moduleId].hot = createHotReloadingObject();
+    modules[moduleId].hot = createHotReloadingObject();
 
     // DEBUGGABLE MODULES NAMES
     // we take `verboseName` from `arguments` to avoid an unused named parameter
     // in `define` in production.
-     const verboseName: string | void = arguments[3];
-     if (verboseName) {
-       modules[moduleId].verboseName = verboseName;
-       verboseNamesToModuleIds[verboseName] = moduleId;
-     }
-   }
- }
-
- function require(moduleId: ModuleID | VerboseModuleNameForDev) {
-   if (__DEV__ && typeof moduleId === 'string') {
-     const verboseName = moduleId;
-     moduleId = verboseNamesToModuleIds[moduleId];
-     if (moduleId == null) {
-       throw new Error(`Unknown named module: '${verboseName}'`);
-     } else {
-       console.warn(
+    const verboseName: string | void = arguments[3];
+    if (verboseName) {
+      modules[moduleId].verboseName = verboseName;
+      verboseNamesToModuleIds[verboseName] = moduleId;
+    }
+  }
+}
+
+function require(moduleId: ModuleID | VerboseModuleNameForDev) {
+  if (__DEV__ && typeof moduleId === 'string') {
+    const verboseName = moduleId;
+    moduleId = verboseNamesToModuleIds[moduleId];
+    if (moduleId == null) {
+      throw new Error(`Unknown named module: '${verboseName}'`);
+    } else {
+      console.warn(
         `Requiring module '${verboseName}' by name is only supported for ` +
         'debugging purposes and will BREAK IN PRODUCTION!'
       );
-     }
-   }
+    }
+  }
 
   //$FlowFixMe: at this point we know that moduleId is a number
-   const moduleIdReallyIsNumber: number = moduleId;
-   const module = modules[moduleIdReallyIsNumber];
-   return module && module.isInitialized
+  const moduleIdReallyIsNumber: number = moduleId;
+  const module = modules[moduleIdReallyIsNumber];
+  return module && module.isInitialized
     ? module.exports
     : guardedLoadModule(moduleIdReallyIsNumber, module);
- }
-
- let inGuard = false;
- function guardedLoadModule(moduleId: ModuleID, module) {
-   if (!inGuard && global.ErrorUtils) {
-     inGuard = true;
-     let returnValue;
-     try {
-       returnValue = loadModuleImplementation(moduleId, module);
-     } catch (e) {
-       global.ErrorUtils.reportFatalError(e);
-     }
-     inGuard = false;
-     return returnValue;
-   } else {
-     return loadModuleImplementation(moduleId, module);
-   }
- }
-
- function loadModuleImplementation(moduleId, module) {
-   const nativeRequire = global.nativeRequire;
-   if (!module && nativeRequire) {
-     nativeRequire(moduleId);
-     module = modules[moduleId];
-   }
-
-   if (!module) {
-     throw unknownModuleError(moduleId);
-   }
-
-   if (module.hasError) {
-     throw moduleThrewError(moduleId);
-   }
+}
+
+let inGuard = false;
+function guardedLoadModule(moduleId: ModuleID, module) {
+  if (!inGuard && global.ErrorUtils) {
+    inGuard = true;
+    let returnValue;
+    try {
+      returnValue = loadModuleImplementation(moduleId, module);
+    } catch (e) {
+      global.ErrorUtils.reportFatalError(e);
+    }
+    inGuard = false;
+    return returnValue;
+  } else {
+    return loadModuleImplementation(moduleId, module);
+  }
+}
+
+function loadModuleImplementation(moduleId, module) {
+  const nativeRequire = global.nativeRequire;
+  if (!module && nativeRequire) {
+    nativeRequire(moduleId);
+    module = modules[moduleId];
+  }
+
+  if (!module) {
+    throw unknownModuleError(moduleId);
+  }
+
+  if (module.hasError) {
+    throw moduleThrewError(moduleId);
+  }
 
   // `require` calls int  the require polyfill itself are not analyzed and
   // replaced so that they use numeric module IDs.
   // The systrace module will expose itself on the require function so that
   // it can be used here.
   // TODO(davidaurelio) Scan polyfills for dependencies, too (t9759686)
-   if (__DEV__) {
-     var {Systrace} = require;
-   }
+  if (__DEV__) {
+    var {Systrace} = require;
+  }
 
   // We must optimistically mark module as initialized before running the
   // factory to keep any require cycles inside the factory from causing an
   // infinite require loop.
-   module.isInitialized = true;
-   const exports = module.exports = {};
-   const {factory, dependencyMap} = module;
-   try {
-     if (__DEV__) {
+  module.isInitialized = true;
+  const exports = module.exports = {};
+  const {factory, dependencyMap} = module;
+  try {
+    if (__DEV__) {
       // $FlowFixMe: we know that __DEV__ is const and `Systrace` exists
-       Systrace.beginEvent('JS_require_' + (module.verboseName || moduleId));
-     }
+      Systrace.beginEvent('JS_require_' + (module.verboseName || moduleId));
+    }
 
-     const moduleObject: Module = {exports};
-     if (__DEV__ && module.hot) {
-       moduleObject.hot = module.hot;
-     }
+    const moduleObject: Module = {exports};
+    if (__DEV__ && module.hot) {
+      moduleObject.hot = module.hot;
+    }
 
     // keep args in sync with with defineModuleCode in
     // packager/src//Resolver/index.js
     // and packager/src//ModuleGraph/worker.js
-     factory(global, require, moduleObject, exports, dependencyMap);
+    factory(global, require, moduleObject, exports, dependencyMap);
 
     // avoid removing factory in DEV mode as it breaks HMR
-     if (!__DEV__) {
+    if (!__DEV__) {
       // $FlowFixMe: This is only sound because we never access `factory` again
-       module.factory = undefined;
-     }
+      module.factory = undefined;
+    }
 
-     if (__DEV__) {
+    if (__DEV__) {
       // $FlowFixMe: we know that __DEV__ is const and `Systrace` exists
-       Systrace.endEvent();
-     }
-     return (module.exports = moduleObject.exports);
-   } catch (e) {
-     module.hasError = true;
-     module.isInitialized = false;
-     module.exports = undefined;
-     throw e;
-   }
- }
-
- function unknownModuleError(id) {
-   let message = 'Requiring unknown module "' + id + '".';
-   if (__DEV__) {
-     message +=
+      Systrace.endEvent();
+    }
+    return (module.exports = moduleObject.exports);
+  } catch (e) {
+    module.hasError = true;
+    module.isInitialized = false;
+    module.exports = undefined;
+    throw e;
+  }
+}
+
+function unknownModuleError(id) {
+  let message = 'Requiring unknown module "' + id + '".';
+  if (__DEV__) {
+    message +=
       'If you are sure the module is there, try restarting the packager. ' +
       'You may also want to run `npm install`, or `yarn` (depending on your environment).';
-   }
-   return Error(message);
- }
+  }
+  return Error(message);
+}
 
- function moduleThrewError(id) {
-   return Error('Requiring module "' + id + '", which threw an exception.');
- }
+function moduleThrewError(id) {
+  return Error('Requiring module "' + id + '", which threw an exception.');
+}
 
- if (__DEV__) {
-   require.Systrace = {beginEvent: () => {}, endEvent: () => {}};
+if (__DEV__) {
+  require.Systrace = {beginEvent: () => {}, endEvent: () => {}};
 
   // HOT MODULE RELOADING
-   var createHotReloadingObject = function() {
-     const hot: HotModuleReloadingData = {
-       acceptCallback: null,
-       accept: callback => { hot.acceptCallback = callback; },
-     };
-     return hot;
-   };
-
-   const acceptAll = function(
+  var createHotReloadingObject = function() {
+    const hot: HotModuleReloadingData = {
+      acceptCallback: null,
+      accept: callback => { hot.acceptCallback = callback; },
+    };
+    return hot;
+  };
+
+  const acceptAll = function(
     dependentModules,
     inverseDependencies,
   ) {
-     if (!dependentModules || dependentModules.length === 0) {
-       return true;
-     }
+    if (!dependentModules || dependentModules.length === 0) {
+      return true;
+    }
 
-     const notAccepted = dependentModules.filter(
+    const notAccepted = dependentModules.filter(
       module => !accept(module, /*factory*/ undefined, inverseDependencies));
 
-     const parents = [];
-     for (let i = 0; i < notAccepted.length; i++) {
+    const parents = [];
+    for (let i = 0; i < notAccepted.length; i++) {
       // if the module has no parents then the change cannot be hot loaded
-       if (inverseDependencies[notAccepted[i]].length === 0) {
-         return false;
-       }
+      if (inverseDependencies[notAccepted[i]].length === 0) {
+        return false;
+      }
 
-       parents.push(...inverseDependencies[notAccepted[i]]);
-     }
+      parents.push(...inverseDependencies[notAccepted[i]]);
+    }
 
-     return acceptAll(parents, inverseDependencies);
-   };
+    return acceptAll(parents, inverseDependencies);
+  };
 
-   const accept = function(
+  const accept = function(
     id: ModuleID,
     factory?: FactoryFn,
     inverseDependencies: {[key: ModuleID]: Array<ModuleID>},
   ) {
-     const mod = modules[id];
+    const mod = modules[id];
 
-     if (!mod && factory) { // new modules need a factory
-       define(factory, id);
-       return true; // new modules don't need to be accepted
-     }
+    if (!mod && factory) { // new modules need a factory
+      define(factory, id);
+      return true; // new modules don't need to be accepted
+    }
 
-     const {hot} = mod;
-     if (!hot) {
-       console.warn(
+    const {hot} = mod;
+    if (!hot) {
+      console.warn(
         'Cannot accept module because Hot Module Replacement ' +
         'API was not installed.'
       );
-       return false;
-     }
+      return false;
+    }
 
     // replace and initialize factory
-     if (factory) {
-       mod.factory = factory;
-     }
-     mod.hasError = false;
-     mod.isInitialized = false;
-     require(id);
-
-     if (hot.acceptCallback) {
-       hot.acceptCallback();
-       return true;
-     } else {
+    if (factory) {
+      mod.factory = factory;
+    }
+    mod.hasError = false;
+    mod.isInitialized = false;
+    require(id);
+
+    if (hot.acceptCallback) {
+      hot.acceptCallback();
+      return true;
+    } else {
       // need to have inverseDependencies to bubble up accept
-       if (!inverseDependencies) {
-         throw new Error('Undefined `inverseDependencies`');
-       }
+      if (!inverseDependencies) {
+        throw new Error('Undefined `inverseDependencies`');
+      }
 
       // accept parent modules recursively up until all siblings are accepted
-       return acceptAll(inverseDependencies[id], inverseDependencies);
-     }
-   };
+      return acceptAll(inverseDependencies[id], inverseDependencies);
+    }
+  };
 
-   global.__accept = accept;
- }
+  global.__accept = accept;
+}

From 2f92ee8a9cb95f6e67e25f2ed9061e1e255666bf Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieter.debaets@gmail.com>
Date: Mon, 20 Mar 2017 05:57:48 -0700
Subject: [PATCH 098/366] Attempt to fix CircleCI tests

Summary:
Attempt to always call `mBridgeIdleListeners` on the native modules thread mBridgeIdleListeners
Closes https://github.com/facebook/react-native/pull/13004

Differential Revision: D4734342

Pulled By: mkonicek

fbshipit-source-id: f7054015a1d4517abab9bb8fc61402efabdd6ac1
---
 .../react/cxxbridge/CatalystInstanceImpl.java | 42 ++++++++++++-------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CatalystInstanceImpl.java b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CatalystInstanceImpl.java
index 6133b2576765dc..81f2773befcb34 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CatalystInstanceImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CatalystInstanceImpl.java
@@ -93,6 +93,7 @@ public PendingJSCall(
 
   private final NativeModuleRegistry mJavaRegistry;
   private final NativeModuleCallExceptionHandler mNativeModuleCallExceptionHandler;
+  private final MessageQueueThread mNativeModulesQueueThread;
   private boolean mInitialized = false;
   private volatile boolean mAcceptCalls = false;
 
@@ -121,6 +122,7 @@ private CatalystInstanceImpl(
     mJSModuleRegistry = jsModuleRegistry;
     mJSBundleLoader = jsBundleLoader;
     mNativeModuleCallExceptionHandler = nativeModuleCallExceptionHandler;
+    mNativeModulesQueueThread = mReactQueueConfiguration.getNativeModulesQueueThread();
     mTraceListener = new JSProfilerTraceListener(this);
 
     FLog.w(ReactConstants.TAG, "Initializing React Xplat Bridge before initializeBridge");
@@ -128,7 +130,7 @@ private CatalystInstanceImpl(
       new BridgeCallback(this),
       jsExecutor,
       mReactQueueConfiguration.getJSQueueThread(),
-      mReactQueueConfiguration.getNativeModulesQueueThread(),
+      mNativeModulesQueueThread,
       mJavaRegistry.getJavaModules(this),
       mJavaRegistry.getCxxModules());
     FLog.w(ReactConstants.TAG, "Initializing React Xplat Bridge after initializeBridge");
@@ -292,19 +294,19 @@ public void destroy() {
 
     // TODO: tell all APIs to shut down
     mDestroyed = true;
-    mReactQueueConfiguration.getNativeModulesQueueThread().runOnQueue(new Runnable() {
+    mNativeModulesQueueThread.runOnQueue(new Runnable() {
       @Override
       public void run() {
         mJavaRegistry.notifyJSInstanceDestroy();
+        boolean wasIdle = (mPendingJSCalls.getAndSet(0) == 0);
+        if (!wasIdle && !mBridgeIdleListeners.isEmpty()) {
+          for (NotThreadSafeBridgeIdleDebugListener listener : mBridgeIdleListeners) {
+            listener.onTransitionToBridgeIdle();
+          }
+        }
         mHybridData.resetNative();
       }
     });
-    boolean wasIdle = (mPendingJSCalls.getAndSet(0) == 0);
-    if (!wasIdle && !mBridgeIdleListeners.isEmpty()) {
-      for (NotThreadSafeBridgeIdleDebugListener listener : mBridgeIdleListeners) {
-        listener.onTransitionToBridgeIdle();
-      }
-    }
 
     // This is a noop if the listener was not yet registered.
     Systrace.unregisterListener(mTraceListener);
@@ -332,7 +334,7 @@ public void initialize() {
         mAcceptCalls,
         "RunJSBundle hasn't completed.");
     mInitialized = true;
-    mReactQueueConfiguration.getNativeModulesQueueThread().runOnQueue(new Runnable() {
+    mNativeModulesQueueThread.runOnQueue(new Runnable() {
       @Override
       public void run() {
         mJavaRegistry.notifyJSInstanceInitialized();
@@ -442,9 +444,14 @@ private void incrementPendingJSCalls() {
         mJsPendingCallsTitleForTrace,
         oldPendingCalls + 1);
     if (wasIdle && !mBridgeIdleListeners.isEmpty()) {
-      for (NotThreadSafeBridgeIdleDebugListener listener : mBridgeIdleListeners) {
-        listener.onTransitionToBridgeBusy();
-      }
+      mNativeModulesQueueThread.runOnQueue(new Runnable() {
+        @Override
+        public void run() {
+          for (NotThreadSafeBridgeIdleDebugListener listener : mBridgeIdleListeners) {
+            listener.onTransitionToBridgeBusy();
+          }
+        }
+      });
     }
   }
 
@@ -459,9 +466,14 @@ private void decrementPendingJSCalls() {
         newPendingCalls);
 
     if (isNowIdle && !mBridgeIdleListeners.isEmpty()) {
-      for (NotThreadSafeBridgeIdleDebugListener listener : mBridgeIdleListeners) {
-        listener.onTransitionToBridgeIdle();
-      }
+      mNativeModulesQueueThread.runOnQueue(new Runnable() {
+        @Override
+        public void run() {
+          for (NotThreadSafeBridgeIdleDebugListener listener : mBridgeIdleListeners) {
+            listener.onTransitionToBridgeIdle();
+          }
+        }
+      });
     }
   }
 

From 68c77395b182dd2d673ba60b7a9a63f585a12de7 Mon Sep 17 00:00:00 2001
From: David Aurelio <davidaurelio@fb.com>
Date: Mon, 20 Mar 2017 07:57:58 -0700
Subject: [PATCH 099/366] Allow flow-declared variables when inlining

Summary: The logic of the `inline` babel transform regarded identifiers as global if no binding exists for them. We extend that logic to also accept flow-declared variables.

Reviewed By: arcanis

Differential Revision: D4737620

fbshipit-source-id: e71cfdf77c7b7751265cfa4412430b4f29e9e853
---
 packager/package.json                         |  2 +-
 .../worker/__tests__/inline-test.js           | 28 +++++++++++++++++++
 packager/src/JSTransformer/worker/inline.js   |  8 +++++-
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/packager/package.json b/packager/package.json
index 2ea83333e54065..91de355c3be53f 100644
--- a/packager/package.json
+++ b/packager/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.5.0",
+  "version": "0.5.1",
   "name": "react-native-packager",
   "description": "Build native apps with React!",
   "repository": {
diff --git a/packager/src/JSTransformer/worker/__tests__/inline-test.js b/packager/src/JSTransformer/worker/__tests__/inline-test.js
index d2a10f556452f1..a08a242f791d93 100644
--- a/packager/src/JSTransformer/worker/__tests__/inline-test.js
+++ b/packager/src/JSTransformer/worker/__tests__/inline-test.js
@@ -306,4 +306,32 @@ describe('inline constants', () => {
     expect(toString(ast)).toEqual(
       normalize(code.replace(/require\([^)]+\)\.Platform\.OS/, '"android"')));
   });
+
+  it('works with flow-declared variables', () => {
+    const stripFlow = require('babel-plugin-transform-flow-strip-types');
+    const code = `declare var __DEV__;
+      const a: boolean = __DEV__;`;
+
+    const transformed = transform(
+      code,
+      {...babelOptions, plugins: [stripFlow, [inline.plugin, {dev: false}]]},
+    ).code;
+
+    expect(transformed).toEqual('const a=false;');
+  });
+
+  it('works with flow-declared variables in wrapped modules', () => {
+    const stripFlow = require('babel-plugin-transform-flow-strip-types');
+    const code = `__d(() => {
+      declare var __DEV__;
+      const a: boolean = __DEV__;
+    });`;
+
+    const transformed = transform(
+      code,
+      {...babelOptions, plugins: [stripFlow, [inline.plugin, {dev: true}]]},
+    ).code;
+
+    expect(transformed).toEqual('__d(()=>{const a=true;});');
+  });
 });
diff --git a/packager/src/JSTransformer/worker/inline.js b/packager/src/JSTransformer/worker/inline.js
index 1b14bcdcbc8940..91811a1f864432 100644
--- a/packager/src/JSTransformer/worker/inline.js
+++ b/packager/src/JSTransformer/worker/inline.js
@@ -34,6 +34,12 @@ const importMap = new Map([['ReactNative', 'react-native']]);
 
 const isGlobal = binding => !binding;
 
+const isFlowDeclared = binding =>
+  t.isDeclareVariable(binding.path);
+
+const isGlobalOrFlowDeclared = binding =>
+  isGlobal(binding) || isFlowDeclared(binding);
+
 const isToplevelBinding = (binding, isWrappedModule) =>
   isGlobal(binding) ||
   !binding.scope.parent ||
@@ -93,7 +99,7 @@ const isReactPlatformSelect = (node, scope, isWrappedModule) =>
 
 const isDev = (node, parent, scope) =>
   t.isIdentifier(node, dev) &&
-  isGlobal(scope.getBinding(dev.name)) &&
+  isGlobalOrFlowDeclared(scope.getBinding(dev.name)) &&
   !(t.isMemberExpression(parent));
 
 function findProperty(objectExpression, key, fallback) {

From 14fee735a2fde73f1e505543ee40af0df66f63aa Mon Sep 17 00:00:00 2001
From: David Aurelio <davidaurelio@fb.com>
Date: Mon, 20 Mar 2017 08:24:31 -0700
Subject: [PATCH 100/366] Use verbose module name when requiring module that
 errored

Summary: When requiring a module that has previously errored, the implementation of `require` only used the numerical module ID. In this diff, we enable usage of the verbose module name if present.

Reviewed By: bestander

Differential Revision: D4737723

fbshipit-source-id: 1c2d3906435a637f3e440e57f904489d84495bd2
---
 packager/src/Resolver/polyfills/require.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packager/src/Resolver/polyfills/require.js b/packager/src/Resolver/polyfills/require.js
index 7638675a44048d..655d762ac0a663 100644
--- a/packager/src/Resolver/polyfills/require.js
+++ b/packager/src/Resolver/polyfills/require.js
@@ -202,7 +202,8 @@ function unknownModuleError(id) {
 }
 
 function moduleThrewError(id) {
-  return Error('Requiring module "' + id + '", which threw an exception.');
+  const displayName = __DEV__ && modules[id] && modules[id].verboseName || id;
+  return Error('Requiring module "' + displayName + '", which threw an exception.');
 }
 
 if (__DEV__) {

From c451dd6cceb526d4814993e4d0eb431375a9b01c Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Mon, 20 Mar 2017 10:37:58 -0700
Subject: [PATCH 101/366] Update message with instructions

Summary:
The middleware for automatically converting Systrace traces to HTML and popping the browser hasn't worked properly for a while, since the version on Homebrew generates some code that uses `Object.observe`, which was deleted from Chrome ages ago. People have complained about it, but fixing it properly has proven to be harder than expected, so I suggest we simply update the message with instructions for people to load it on Chrome, which is what all of us have been doing anyway (AFAIK).
Closes https://github.com/facebook/react-native/pull/12445

Reviewed By: javache

Differential Revision: D4700153

Pulled By: gaearon

fbshipit-source-id: 0c33099babed93b3c70d36ae9dfc7d82460c8269
---
 .../middleware/systraceProfileMiddleware.js   | 37 ++++---------------
 1 file changed, 7 insertions(+), 30 deletions(-)

diff --git a/local-cli/server/middleware/systraceProfileMiddleware.js b/local-cli/server/middleware/systraceProfileMiddleware.js
index 02b274c9e7a475..a06f0100a9ddd9 100644
--- a/local-cli/server/middleware/systraceProfileMiddleware.js
+++ b/local-cli/server/middleware/systraceProfileMiddleware.js
@@ -8,9 +8,7 @@
  */
 'use strict';
 
-const exec = require('child_process').exec;
 const fs = require('fs');
-const path = require('path');
 
 module.exports = function(req, res, next) {
   if (req.url !== '/systrace') {
@@ -20,33 +18,12 @@ module.exports = function(req, res, next) {
 
   console.log('Dumping profile information...');
   var dumpName = '/tmp/dump_' + Date.now() + '.json';
-  var prefix = process.env.TRACE_VIEWER_PATH || '';
-  var cmd = path.join(prefix, 'trace2html') + ' ' + dumpName;
   fs.writeFileSync(dumpName, req.rawBody);
-  exec(cmd, function(error) {
-    if (error) {
-      if (error.code === 127) {
-        var response = '\n** Failed executing `' + cmd + '` **\n\n' +
-          'Google trace-viewer is required to visualize the data, ' +
-          'You can install it with `brew install trace2html`\n\n' +
-          'NOTE: Your profile data was kept at:\n' + dumpName;
-        console.log(response);
-        res.end(response);
-      } else {
-        console.error(error);
-        res.end('Unknown error: ' + error.message);
-      }
-      return;
-    } else {
-      exec('rm ' + dumpName);
-      exec('open ' + dumpName.replace(/json$/, 'html'), function(err) {
-        if (err) {
-          console.error(err);
-          res.end(err.message);
-        } else {
-          res.end();
-        }
-      });
-    }
-  });
+  var response =
+    'Your profile was saved at:\n' + dumpName + '\n\n' +
+    'On Google Chrome navigate to chrome://tracing and then click on "load" ' +
+    'to load and visualise your profile.\n\n' +
+    'This message is also printed to your console by the packager so you can copy it :)';
+  console.log(response);
+  res.end(response);
 };

From 439889262c9055faa3582a18441029ea063a7a6b Mon Sep 17 00:00:00 2001
From: Jeff Thomas <jeffdthomas@fb.com>
Date: Mon, 20 Mar 2017 11:48:04 -0700
Subject: [PATCH 102/366] RCTLocalAssetImageLoader: Add searching shipped
 frameworks beyond mainBundle

Reviewed By: javache

Differential Revision: D4715608

fbshipit-source-id: 5cb2febf543e2ff6e30d0c6d8737de9a2cce2383
---
 React/Base/RCTUtils.m | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/React/Base/RCTUtils.m b/React/Base/RCTUtils.m
index 80ff69ed538d49..130c5b1b358955 100644
--- a/React/Base/RCTUtils.m
+++ b/React/Base/RCTUtils.m
@@ -637,7 +637,7 @@ BOOL RCTIsLocalAssetURL(NSURL *__nullable imageURL)
 
   NSString *imageName = RCTBundlePathForURL(imageURL);
 
-  NSBundle *bundle;
+  NSBundle *bundle = nil;
   NSArray *imagePathComponents = [imageName pathComponents];
   if ([imagePathComponents count] > 1 &&
       [[[imagePathComponents firstObject] pathExtension] isEqualToString:@"bundle"]) {
@@ -646,11 +646,30 @@ BOOL RCTIsLocalAssetURL(NSURL *__nullable imageURL)
     imageName = [imageName substringFromIndex:(bundlePath.length + 1)];
   }
 
+  UIImage *image = nil;
   if (bundle) {
-    return [UIImage imageNamed:imageName inBundle:bundle compatibleWithTraitCollection:nil];
+    image = [UIImage imageNamed:imageName inBundle:bundle compatibleWithTraitCollection:nil];
   } else {
-    return [UIImage imageNamed:imageName];
+    image = [UIImage imageNamed:imageName];
+  }
+
+  if (!image && !bundle) {
+    // We did not find the image in the mainBundle, check in other shipped frameworks.
+    NSArray<NSURL *> *possibleFrameworks = [[NSFileManager defaultManager] contentsOfDirectoryAtURL:[[NSBundle mainBundle] privateFrameworksURL]
+                                                                        includingPropertiesForKeys:@[]
+                                                                                           options:nil
+                                                                                             error:nil];
+    for (NSURL *frameworkURL in possibleFrameworks) {
+      bundle = [NSBundle bundleWithURL:frameworkURL];
+      image = [UIImage imageNamed:imageName inBundle:bundle compatibleWithTraitCollection:nil];
+      if (image) {
+        RCTLogWarn(@"Image %@ not found in mainBundle, but found in %@", imageName, bundle);
+        break;
+      }
+    }
   }
+
+  return image;
 }
 
 RCT_EXTERN NSString *__nullable RCTTempFilePath(NSString *extension, NSError **error)

From f352aa129a0264671d7e294a1f895eb1beddc3f1 Mon Sep 17 00:00:00 2001
From: Jhen <developer@jhen.me>
Date: Mon, 20 Mar 2017 12:40:16 -0700
Subject: [PATCH 103/366] Add missing `toggleElementInspector` event send when
 `jsLoaded`

Summary:
- [x] Explain the **motivation** for making this change.
- [x] Provide a **test plan** demonstrating that the code is solid.
- [x] Match the **code formatting** of the rest of the codebase.
- [x] Target the `master` branch, NOT a "stable" branch.

The PR #11613 (0.43) removed this missing `toggleElementInspector` event send when `jsLoaded` in DevMenu (Now is DevSettings), it should open the inspector if `isElementInspectorShown` is true when we reload JS.

The dev menu text `Show / Hide Inspector` is dependent on `isElementInspectorShown` bool value.

([This behavior in 0.42](https://github.com/facebook/react-native/blob/0.42-stable/React/Modules/RCTDevMenu.mm#L436-L442))

Manual testing in UIExplorer:

* Open the dev menu and click `Show Inspector`
* Open the dev menu and click `Reload JS`
* The built-in inspector should keep open (dev menu text: `Hide Inspector`)
Closes https://github.com/facebook/react-native/pull/12999

Differential Revision: D4738959

Pulled By: javache

fbshipit-source-id: b3f584db51aa0e1b463c52003967b00bcd81bc99
---
 React/Modules/RCTDevSettings.mm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/React/Modules/RCTDevSettings.mm b/React/Modules/RCTDevSettings.mm
index 171b2532094946..d97aa6031feefe 100644
--- a/React/Modules/RCTDevSettings.mm
+++ b/React/Modules/RCTDevSettings.mm
@@ -454,6 +454,14 @@ - (void)jsLoaded:(NSNotification *)notification
   dispatch_async(dispatch_get_main_queue(), ^{
     // update state again after the bridge has finished loading
     [self _synchronizeAllSettings];
+
+    // Inspector can only be shown after JS has loaded
+    if ([self isElementInspectorShown]) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+      [self.bridge.eventDispatcher sendDeviceEventWithName:@"toggleElementInspector" body:nil];
+#pragma clang diagnostic pop
+    }
   });
 }
 

From 08c404d2939a3c2e75a514da1a7c03151fbb30e7 Mon Sep 17 00:00:00 2001
From: Daniele Conti <dnlcnt@gmail.com>
Date: Mon, 20 Mar 2017 12:40:45 -0700
Subject: [PATCH 104/366] Eagerly change the listeners count

Summary:
While working with `RCTEventEmitter` I noticed that if an event is emitted before `_listenerCount` is updated, it will not go through because the listeners count hasn't been updated. Moving the count update before the invokation of `startObserving` and `stopObserving` fixes the issue. Same way if you remove the last listener and an event is fired before the count is updated (while it shouldn't be fired).

**Test plan (required)**

An easy test to demonstrate it is to implement `startObserving` to synchronously fire an event. Without the change, a warning is thrown, with the change, the event is fired. Not very strong on Obj-C here and I didn't know how to mock out the native stuff. Would be glad to write a failing unit test tho :)
Closes https://github.com/facebook/react-native/pull/11907

Differential Revision: D4738965

Pulled By: javache

fbshipit-source-id: cf175051be5b9c5de761d3dcd290560e1639b05e
---
 React/Modules/RCTEventEmitter.m | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/React/Modules/RCTEventEmitter.m b/React/Modules/RCTEventEmitter.m
index 4cfec65755b1fa..9f54f1f499dc29 100644
--- a/React/Modules/RCTEventEmitter.m
+++ b/React/Modules/RCTEventEmitter.m
@@ -78,10 +78,10 @@ - (void)dealloc
     RCTLogError(@"`%@` is not a supported event type for %@. Supported events are: `%@`",
                 eventName, [self class], [[self supportedEvents] componentsJoinedByString:@"`, `"]);
   }
-  if (_listenerCount == 0) {
+  _listenerCount++;
+  if (_listenerCount == 1) {
     [self startObserving];
   }
-  _listenerCount++;
 }
 
 RCT_EXPORT_METHOD(removeListeners:(NSInteger)count)
@@ -89,10 +89,10 @@ - (void)dealloc
   if (RCT_DEBUG && count > _listenerCount) {
     RCTLogError(@"Attempted to remove more %@ listeners than added", [self class]);
   }
-  if (count == _listenerCount) {
+  _listenerCount = MAX(_listenerCount - count, 0);
+  if (_listenerCount == 0) {
     [self stopObserving];
   }
-  _listenerCount -= count;
 }
 
 @end

From 242a58ffe08bf89ec4156ddc0bda89055f410886 Mon Sep 17 00:00:00 2001
From: Petter Hesselberg <petterh@microsoft.com>
Date: Mon, 20 Mar 2017 12:44:41 -0700
Subject: [PATCH 105/366] Fix NullPointerException in
 ReactShadowNode.toString()

Summary:
Fix `NullPointerException` in `ReactShadowNode.toString`
Simplified `ReactShadowNode.hasNewLayout` since I was already in there

It seems to me unlikely that this bug impacts anything but the debugging experience, so no biggie.
Closes https://github.com/facebook/react-native/pull/12953

Differential Revision: D4739215

fbshipit-source-id: 94955cc783216fdb8868fc8d08010e0d8a238052
---
 .../com/facebook/react/uimanager/ReactShadowNode.java     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java
index 2cad696e502860..d8c34346f261fd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java
@@ -372,7 +372,7 @@ public void calculateLayout() {
   }
 
   public final boolean hasNewLayout() {
-    return mYogaNode == null ? false : mYogaNode.hasNewLayout();
+    return mYogaNode != null && mYogaNode.hasNewLayout();
   }
 
   public final void markLayoutSeen() {
@@ -770,7 +770,11 @@ public void setMeasureFunction(YogaMeasureFunction measureFunction) {
 
   @Override
   public String toString() {
-    return mYogaNode.toString();
+    if (mYogaNode != null) {
+      return mYogaNode.toString();
+    }
+
+    return getClass().getSimpleName() + " (virtual node)";
   }
 
   public void dispose() {

From ebb55c6bcc05f60aa04f9ca08a872a73b17832be Mon Sep 17 00:00:00 2001
From: Aaron Chiu <aaronechiu@fb.com>
Date: Mon, 20 Mar 2017 12:50:20 -0700
Subject: [PATCH 106/366] log difference in QPL vs PerformanceLogger

Reviewed By: alexeylang

Differential Revision: D4736500

fbshipit-source-id: e5f8590ae7482dbfbbe64403b0162fb496572ac6
---
 Libraries/Utilities/PerformanceLogger.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Libraries/Utilities/PerformanceLogger.js b/Libraries/Utilities/PerformanceLogger.js
index fd77037d890c4f..053abb9ae6c69f 100644
--- a/Libraries/Utilities/PerformanceLogger.js
+++ b/Libraries/Utilities/PerformanceLogger.js
@@ -108,6 +108,10 @@ var PerformanceLogger = {
     extras = {};
   },
 
+  currentTimestamp() {
+    return performanceNow();
+  },
+
   getTimespans() {
     return timespans;
   },

From d7314661fb4930f0c9e01ccc8de21be1f53d6f54 Mon Sep 17 00:00:00 2001
From: Marc Horowitz <mhorowitz@fb.com>
Date: Mon, 20 Mar 2017 12:56:30 -0700
Subject: [PATCH 107/366] Don't swallow the error if a module require fails

Reviewed By: davidaurelio

Differential Revision: D4733269

fbshipit-source-id: 2cca14c023b148b62cf24f204cdb355f8d2f3590
---
 packager/src/Resolver/polyfills/require.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packager/src/Resolver/polyfills/require.js b/packager/src/Resolver/polyfills/require.js
index 655d762ac0a663..3c1f0b24bad46b 100644
--- a/packager/src/Resolver/polyfills/require.js
+++ b/packager/src/Resolver/polyfills/require.js
@@ -38,6 +38,7 @@ type ModuleDefinition = {|
   exports: Exports,
   factory: FactoryFn,
   hasError: boolean,
+  error?: any,
   hot?: HotModuleReloadingData,
   isInitialized: boolean,
   verboseName?: string,
@@ -138,7 +139,7 @@ function loadModuleImplementation(moduleId, module) {
   }
 
   if (module.hasError) {
-    throw moduleThrewError(moduleId);
+    throw moduleThrewError(moduleId, module.error);
   }
 
   // `require` calls int  the require polyfill itself are not analyzed and
@@ -185,6 +186,7 @@ function loadModuleImplementation(moduleId, module) {
     return (module.exports = moduleObject.exports);
   } catch (e) {
     module.hasError = true;
+    module.error = e;
     module.isInitialized = false;
     module.exports = undefined;
     throw e;
@@ -201,9 +203,9 @@ function unknownModuleError(id) {
   return Error(message);
 }
 
-function moduleThrewError(id) {
+function moduleThrewError(id, error: any) {
   const displayName = __DEV__ && modules[id] && modules[id].verboseName || id;
-  return Error('Requiring module "' + displayName + '", which threw an exception.');
+  return Error('Requiring module "' + displayName + '", which threw an exception: ' + error);
 }
 
 if (__DEV__) {

From 9344f3a95b56833d29cd18438a94a0c22f67b0f8 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <bvaughn@fb.com>
Date: Mon, 20 Mar 2017 12:58:08 -0700
Subject: [PATCH 108/366] Support string return type from RN
 createReactNativeFiberComponentClass()

Reviewed By: sebmarkbage

Differential Revision: D4607283

fbshipit-source-id: 466d2373dd570f77ebcced306d2f20a3f72d79c6
---
 Libraries/Components/TextInput/TextInput.js   |   7 -
 Libraries/Components/View/View.js             |  19 +-
 Libraries/ReactNative/UIManager.js            |  23 +-
 .../ReactNative/requireNativeComponent.js     |   2 +-
 .../renderers/native/NativeMethodsMixin.js    | 206 +++++++++++-------
 .../native/NativeMethodsMixinUtils.js         | 100 +++++++++
 .../src/renderers/native/ReactNative.js       |   2 +-
 .../src/renderers/native/ReactNativeFiber.js  |  44 ++--
 .../native/ReactNativeFiberHostComponent.js   | 108 +++++++++
 .../src/renderers/native/ReactNativeStack.js  |  18 +-
 .../native/ReactNativeStackInjection.js       |   4 +-
 .../native/createReactNativeComponentClass.js |  16 +-
 .../src/renderers/native/findNodeHandle.js    |   5 +-
 13 files changed, 424 insertions(+), 130 deletions(-)
 create mode 100644 Libraries/Renderer/src/renderers/native/NativeMethodsMixinUtils.js
 create mode 100644 Libraries/Renderer/src/renderers/native/ReactNativeFiberHostComponent.js

diff --git a/Libraries/Components/TextInput/TextInput.js b/Libraries/Components/TextInput/TextInput.js
index c3c9eff2b4ae9b..3f01022cb6c405 100644
--- a/Libraries/Components/TextInput/TextInput.js
+++ b/Libraries/Components/TextInput/TextInput.js
@@ -540,13 +540,6 @@ const TextInput = React.createClass({
    */
   mixins: [NativeMethodsMixin, TimerMixin],
 
-  viewConfig:
-    ((Platform.OS === 'ios' && RCTTextField ?
-      RCTTextField.viewConfig :
-      (Platform.OS === 'android' && AndroidTextInput ?
-        AndroidTextInput.viewConfig :
-        {})) : Object),
-
   /**
    * Returns `true` if the input is currently focused; `false` otherwise.
    */
diff --git a/Libraries/Components/View/View.js b/Libraries/Components/View/View.js
index a519dfbb6b1edc..385ffb124a48c8 100644
--- a/Libraries/Components/View/View.js
+++ b/Libraries/Components/View/View.js
@@ -16,6 +16,7 @@ const NativeMethodsMixin = require('NativeMethodsMixin');
 const NativeModules = require('NativeModules');
 const Platform = require('Platform');
 const React = require('React');
+const ReactNativeFeatureFlags = require('ReactNativeFeatureFlags');
 const ReactNativeStyleAttributes = require('ReactNativeStyleAttributes');
 const ReactNativeViewAttributes = require('ReactNativeViewAttributes');
 const StyleSheetPropType = require('StyleSheetPropType');
@@ -119,6 +120,9 @@ const View = React.createClass({
     ...statics,
   },
 
+  // TODO (bvaughn) Replace this with a deprecated getter warning. This object
+  // should be accessible via a separate import. It will not be available in
+  // production mode in the future and so should not be directly accessed.
   propTypes: {
     ...TVViewPropTypes,
 
@@ -536,11 +540,20 @@ if (__DEV__) {
   }
 }
 
+// TODO (bvaughn) Remove feature flags once all static View accessors are gone.
+// We temporarily wrap fiber native views with the create-class View above,
+// Because external code sometimes accesses static properties of this view.
 let ViewToExport = RCTView;
-if (__DEV__) {
+if (
+  __DEV__ ||
+  ReactNativeFeatureFlags.useFiber
+) {
   ViewToExport = View;
 } else {
-  Object.assign(RCTView, statics);
+  // TODO (bvaughn) Remove this mixin once all static View accessors are gone.
+  Object.assign((RCTView : any), statics);
 }
 
-module.exports = ViewToExport;
+// TODO (bvaughn) Temporarily mask Flow warnings for View property accesses.
+// We're wrapping the string type (Fiber) for now to avoid any actual problems.
+module.exports = ((ViewToExport : any) : typeof View);
diff --git a/Libraries/ReactNative/UIManager.js b/Libraries/ReactNative/UIManager.js
index ee2fc4b8625c71..3b131de7041c11 100644
--- a/Libraries/ReactNative/UIManager.js
+++ b/Libraries/ReactNative/UIManager.js
@@ -26,6 +26,27 @@ invariant(UIManager, 'UIManager is undefined. The native module config is probab
 
 const _takeSnapshot = UIManager.takeSnapshot;
 
+// findNodeHandle() returns a reference to a wrapper component with viewConfig.
+// This wrapper is required for NativeMethodsMixin.setNativeProps, but most
+// callers want the native tag (number) and not the wrapper. For this purpose,
+// the ReactNative renderer decorates findNodeHandle() and extracts the tag.
+// However UIManager can't require ReactNative without introducing a cycle, and
+// deferring the require causes a significant performance regression in Wilde
+// (along the lines of 17% regression in RN Bridge startup). So as a temporary
+// workaround, this wrapper method mimics what the native renderer does.
+// TODO (bvaughn) Remove this and use findNodeHandle directly once stack is gone
+function findNodeHandleWrapper(componentOrHandle : any) : ?number {
+  const instance: any = findNodeHandle(componentOrHandle);
+
+  if (instance) {
+    return typeof instance._nativeTag === 'number'
+      ? instance._nativeTag
+      : instance.getHostNode();
+  } else {
+    return null;
+  }
+}
+
 /**
  * Capture an image of the screen, window or an individual view. The image
  * will be stored in a temporary file that will only exist for as long as the
@@ -57,7 +78,7 @@ UIManager.takeSnapshot = async function(
     return;
   }
   if (typeof view !== 'number' && view !== 'window') {
-    view = findNodeHandle(view) || 'window';
+    view = findNodeHandleWrapper(view) || 'window';
   }
   return _takeSnapshot(view, options);
 };
diff --git a/Libraries/ReactNative/requireNativeComponent.js b/Libraries/ReactNative/requireNativeComponent.js
index c404e60bf66ac1..682a8240c57b43 100644
--- a/Libraries/ReactNative/requireNativeComponent.js
+++ b/Libraries/ReactNative/requireNativeComponent.js
@@ -46,7 +46,7 @@ function requireNativeComponent(
   viewName: string,
   componentInterface?: ?ComponentInterface,
   extraConfig?: ?{nativeOnly?: Object},
-): Function {
+): ReactClass<any> | string {
   const viewConfig = UIManager[viewName];
   if (!viewConfig || !viewConfig.NativeProps) {
     warning(false, 'Native component for "%s" does not exist', viewName);
diff --git a/Libraries/Renderer/src/renderers/native/NativeMethodsMixin.js b/Libraries/Renderer/src/renderers/native/NativeMethodsMixin.js
index aa7af7f066a004..f3d0570a246138 100644
--- a/Libraries/Renderer/src/renderers/native/NativeMethodsMixin.js
+++ b/Libraries/Renderer/src/renderers/native/NativeMethodsMixin.js
@@ -13,45 +13,25 @@
 
 var ReactNative = require('ReactNative');
 var ReactNativeAttributePayload = require('ReactNativeAttributePayload');
+var ReactNativeFeatureFlags = require('ReactNativeFeatureFlags');
 var TextInputState = require('TextInputState');
 var UIManager = require('UIManager');
 
 var invariant = require('fbjs/lib/invariant');
+var findNodeHandle = require('findNodeHandle');
 
-type MeasureOnSuccessCallback = (
-  x: number,
-  y: number,
-  width: number,
-  height: number,
-  pageX: number,
-  pageY: number
-) => void
-
-type MeasureInWindowOnSuccessCallback = (
-  x: number,
-  y: number,
-  width: number,
-  height: number,
-) => void
-
-type MeasureLayoutOnSuccessCallback = (
-  left: number,
-  top: number,
-  width: number,
-  height: number
-) => void
-
-function warnForStyleProps(props, validAttributes) {
-  for (var key in validAttributes.style) {
-    if (!(validAttributes[key] || props[key] === undefined)) {
-      console.error(
-        'You are setting the style `{ ' + key + ': ... }` as a prop. You ' +
-        'should nest it in a style object. ' +
-        'E.g. `{ style: { ' + key + ': ... } }`'
-      );
-    }
-  }
-}
+var {
+  mountSafeCallback,
+  throwOnStylesProp,
+  warnForStyleProps,
+} = require('NativeMethodsMixinUtils');
+
+import type {
+  MeasureInWindowOnSuccessCallback,
+  MeasureLayoutOnSuccessCallback,
+  MeasureOnSuccessCallback,
+} from 'NativeMethodsMixinUtils';
+import type { ReactNativeBaseComponentViewConfig } from 'ReactNativeViewConfigRegistry';
 
 /**
  * `NativeMethodsMixin` provides methods to access the underlying native
@@ -65,6 +45,10 @@ function warnForStyleProps(props, validAttributes) {
  * information, see [Direct
  * Manipulation](docs/direct-manipulation.html).
  */
+// TODO (bvaughn) Figure out how to use the NativeMethodsInterface type to-
+// ensure that these mixins and ReactNativeFiberHostComponent stay in sync.
+// Unfortunately, using it causes Flow to complain WRT createClass mixins:
+// "call of method `createClass`. Expected an exact object instead of ..."
 var NativeMethodsMixin = {
   /**
    * Determines the location on screen, width, and height of the given view and
@@ -140,20 +124,15 @@ var NativeMethodsMixin = {
    * Manipulation](docs/direct-manipulation.html)).
    */
   setNativeProps: function(nativeProps: Object) {
-    if (__DEV__) {
-      warnForStyleProps(nativeProps, this.viewConfig.validAttributes);
-    }
+    // Ensure ReactNative factory function has configured findNodeHandle.
+    // Requiring it won't execute the factory function until first referenced.
+    // It's possible for tests that use ReactTestRenderer to reach this point,
+    // Without having executed ReactNative.
+    // Defer the factory function until now to avoid a cycle with UIManager.
+    // TODO (bvaughn) Remove this once ReactNativeStack is dropped.
+    require('ReactNative');
 
-    var updatePayload = ReactNativeAttributePayload.create(
-      nativeProps,
-      this.viewConfig.validAttributes
-    );
-
-    UIManager.updateView(
-      (ReactNative.findNodeHandle(this) : any),
-      this.viewConfig.uiViewClassName,
-      updatePayload
-    );
+    injectedSetNativeProps(this, nativeProps);
   },
 
   /**
@@ -172,19 +151,116 @@ var NativeMethodsMixin = {
   },
 };
 
-function throwOnStylesProp(component, props) {
-  if (props.styles !== undefined) {
-    var owner = component._owner || null;
-    var name = component.constructor.displayName;
-    var msg = '`styles` is not a supported property of `' + name + '`, did ' +
-      'you mean `style` (singular)?';
-    if (owner && owner.constructor && owner.constructor.displayName) {
-      msg += '\n\nCheck the `' + owner.constructor.displayName + '` parent ' +
-        ' component.';
+// TODO (bvaughn) Inline this once ReactNativeStack is dropped.
+function setNativePropsFiber(componentOrHandle: any, nativeProps: Object) {
+  // Class components don't have viewConfig -> validateAttributes.
+  // Nor does it make sense to set native props on a non-native component.
+  // Instead, find the nearest host component and set props on it.
+  // Use findNodeHandle() rather than ReactNative.findNodeHandle() because
+  // We want the instance/wrapper (not the native tag).
+  let maybeInstance;
+
+  // Fiber errors if findNodeHandle is called for an umounted component.
+  // Tests using ReactTestRenderer will trigger this case indirectly.
+  // Mimicking stack behavior, we should silently ignore this case.
+  // TODO Fix ReactTestRenderer so we can remove this try/catch.
+  try {
+    maybeInstance = findNodeHandle(componentOrHandle);
+  } catch (error) {}
+
+  // If there is no host component beneath this we should fail silently.
+  // This is not an error; it could mean a class component rendered null.
+  if (maybeInstance == null) {
+    return;
+  }
+
+  const viewConfig : ReactNativeBaseComponentViewConfig =
+    maybeInstance.viewConfig;
+
+  if (__DEV__) {
+    warnForStyleProps(nativeProps, viewConfig.validAttributes);
+  }
+
+  var updatePayload = ReactNativeAttributePayload.create(
+    nativeProps,
+    viewConfig.validAttributes,
+  );
+
+  UIManager.updateView(
+    maybeInstance._nativeTag,
+    viewConfig.uiViewClassName,
+    updatePayload,
+  );
+}
+
+// TODO (bvaughn) Remove this once ReactNativeStack is dropped.
+function setNativePropsStack(componentOrHandle: any, nativeProps: Object) {
+  // Class components don't have viewConfig -> validateAttributes.
+  // Nor does it make sense to set native props on a non-native component.
+  // Instead, find the nearest host component and set props on it.
+  // Use findNodeHandle() rather than ReactNative.findNodeHandle() because
+  // We want the instance/wrapper (not the native tag).
+  let maybeInstance = findNodeHandle(componentOrHandle);
+
+  // If there is no host component beneath this we should fail silently.
+  // This is not an error; it could mean a class component rendered null.
+  if (maybeInstance == null) {
+    return;
+  }
+
+  let viewConfig : ReactNativeBaseComponentViewConfig;
+  if (maybeInstance.viewConfig !== undefined) {
+    // ReactNativeBaseComponent
+    viewConfig = maybeInstance.viewConfig;
+  } else if (
+    maybeInstance._instance !== undefined &&
+    maybeInstance._instance.viewConfig !== undefined
+  ) {
+    // ReactCompositeComponentWrapper
+    // Some instances (eg Text) define their own viewConfig
+    viewConfig = maybeInstance._instance.viewConfig;
+  } else {
+    // ReactCompositeComponentWrapper
+    // Other instances (eg TextInput) defer to their children's viewConfig
+    while (maybeInstance._renderedComponent !== undefined) {
+      maybeInstance = maybeInstance._renderedComponent;
     }
-    throw new Error(msg);
+    viewConfig = maybeInstance.viewConfig;
+  }
+
+  const tag : number = typeof maybeInstance.getHostNode === 'function'
+    ? maybeInstance.getHostNode()
+    : maybeInstance._rootNodeID;
+
+  if (__DEV__) {
+    warnForStyleProps(nativeProps, viewConfig.validAttributes);
   }
+
+  var updatePayload = ReactNativeAttributePayload.create(
+    nativeProps,
+    viewConfig.validAttributes,
+  );
+
+  UIManager.updateView(
+    tag,
+    viewConfig.uiViewClassName,
+    updatePayload,
+  );
+}
+
+// Switching based on fiber vs stack to avoid a lot of inline checks at runtime.
+// HACK Normally this injection would be done by the renderer, but in this case
+// that would result in a cycle between ReactNative and NativeMethodsMixin.
+// We avoid requiring additional code for this injection so it's probably ok?
+// TODO (bvaughn) Remove this once ReactNativeStack is gone.
+let injectedSetNativeProps :
+  (componentOrHandle: any, nativeProps: Object) => void;
+if (ReactNativeFeatureFlags.useFiber) {
+  injectedSetNativeProps = setNativePropsFiber;
+} else {
+  injectedSetNativeProps = setNativePropsStack;
 }
+
 if (__DEV__) {
   // hide this from Flow since we can't define these properties outside of
   // __DEV__ without actually implementing them (setting them to undefined
@@ -203,20 +279,4 @@ if (__DEV__) {
   };
 }
 
-/**
- * In the future, we should cleanup callbacks by cancelling them instead of
- * using this.
- */
-function mountSafeCallback(
-  context: ReactComponent<any, any, any>,
-  callback: ?Function
-): any {
-  return function() {
-    if (!callback || (typeof context.isMounted === 'function' && !context.isMounted())) {
-      return undefined;
-    }
-    return callback.apply(context, arguments);
-  };
-}
-
 module.exports = NativeMethodsMixin;
diff --git a/Libraries/Renderer/src/renderers/native/NativeMethodsMixinUtils.js b/Libraries/Renderer/src/renderers/native/NativeMethodsMixinUtils.js
new file mode 100644
index 00000000000000..b5aa4ae8d0ad78
--- /dev/null
+++ b/Libraries/Renderer/src/renderers/native/NativeMethodsMixinUtils.js
@@ -0,0 +1,100 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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 NativeMethodsMixinUtils
+ * @flow
+ */
+'use strict';
+
+export type MeasureOnSuccessCallback = (
+  x: number,
+  y: number,
+  width: number,
+  height: number,
+  pageX: number,
+  pageY: number
+) => void
+
+export type MeasureInWindowOnSuccessCallback = (
+  x: number,
+  y: number,
+  width: number,
+  height: number,
+) => void
+
+export type MeasureLayoutOnSuccessCallback = (
+  left: number,
+  top: number,
+  width: number,
+  height: number
+) => void
+
+/**
+ * Shared between ReactNativeFiberHostComponent and NativeMethodsMixin to keep
+ * API in sync.
+ */
+export interface NativeMethodsInterface {
+  blur() : void,
+  focus() : void,
+  measure(callback : MeasureOnSuccessCallback) : void,
+  measureInWindow(callback : MeasureInWindowOnSuccessCallback) : void,
+  measureLayout(
+    relativeToNativeNode: number,
+    onSuccess: MeasureLayoutOnSuccessCallback,
+    onFail: () => void /* currently unused */
+  ) : void,
+  setNativeProps(nativeProps: Object) : void,
+}
+
+/**
+ * In the future, we should cleanup callbacks by cancelling them instead of
+ * using this.
+ */
+function mountSafeCallback(
+  context: any,
+  callback: ?Function
+): any {
+  return function() {
+    if (!callback || (typeof context.isMounted === 'function' && !context.isMounted())) {
+      return undefined;
+    }
+    return callback.apply(context, arguments);
+  };
+}
+
+function throwOnStylesProp(component : any, props : any) {
+  if (props.styles !== undefined) {
+    var owner = component._owner || null;
+    var name = component.constructor.displayName;
+    var msg = '`styles` is not a supported property of `' + name + '`, did ' +
+      'you mean `style` (singular)?';
+    if (owner && owner.constructor && owner.constructor.displayName) {
+      msg += '\n\nCheck the `' + owner.constructor.displayName + '` parent ' +
+        ' component.';
+    }
+    throw new Error(msg);
+  }
+}
+
+function warnForStyleProps(props : any, validAttributes : any) {
+  for (var key in validAttributes.style) {
+    if (!(validAttributes[key] || props[key] === undefined)) {
+      console.error(
+        'You are setting the style `{ ' + key + ': ... }` as a prop. You ' +
+        'should nest it in a style object. ' +
+        'E.g. `{ style: { ' + key + ': ... } }`'
+      );
+    }
+  }
+}
+
+module.exports = {
+  mountSafeCallback,
+  throwOnStylesProp,
+  warnForStyleProps,
+};
diff --git a/Libraries/Renderer/src/renderers/native/ReactNative.js b/Libraries/Renderer/src/renderers/native/ReactNative.js
index 527a53920b741a..82b12de9a1ca7d 100644
--- a/Libraries/Renderer/src/renderers/native/ReactNative.js
+++ b/Libraries/Renderer/src/renderers/native/ReactNative.js
@@ -15,4 +15,4 @@ const ReactNativeFeatureFlags = require('ReactNativeFeatureFlags');
 
 module.exports = ReactNativeFeatureFlags.useFiber
   ? require('ReactNativeFiber')
-  : require('ReactNativeStack')
+  : require('ReactNativeStack');
diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeFiber.js b/Libraries/Renderer/src/renderers/native/ReactNativeFiber.js
index 1d73e80b88af19..e2ad6701a4c0aa 100644
--- a/Libraries/Renderer/src/renderers/native/ReactNativeFiber.js
+++ b/Libraries/Renderer/src/renderers/native/ReactNativeFiber.js
@@ -12,16 +12,11 @@
 
 'use strict';
 
-import type { Element } from 'React';
-import type { Fiber } from 'ReactFiber';
-import type { ReactNodeList } from 'ReactTypes';
-import type { ReactNativeBaseComponentViewConfig } from 'ReactNativeViewConfigRegistry';
-
-const NativeMethodsMixin = require('NativeMethodsMixin');
 const ReactFiberReconciler = require('ReactFiberReconciler');
 const ReactGenericBatching = require('ReactGenericBatching');
 const ReactNativeAttributePayload = require('ReactNativeAttributePayload');
 const ReactNativeComponentTree = require('ReactNativeComponentTree');
+const ReactNativeFiberHostComponent = require('ReactNativeFiberHostComponent');
 const ReactNativeInjection = require('ReactNativeInjection');
 const ReactNativeTagHandles = require('ReactNativeTagHandles');
 const ReactNativeViewConfigRegistry = require('ReactNativeViewConfigRegistry');
@@ -34,6 +29,11 @@ const findNodeHandle = require('findNodeHandle');
 const invariant = require('fbjs/lib/invariant');
 
 const { injectInternals } = require('ReactFiberDevToolsHook');
+
+import type { Element } from 'React';
+import type { Fiber } from 'ReactFiber';
+import type { ReactNativeBaseComponentViewConfig } from 'ReactNativeViewConfigRegistry';
+import type { ReactNodeList } from 'ReactTypes';
 const {
   precacheFiberNode,
   uncacheFiberNode,
@@ -43,7 +43,7 @@ const {
 ReactNativeInjection.inject();
 
 type Container = number;
-type Instance = {
+export type Instance = {
   _children: Array<Instance | number>,
   _nativeTag: number,
   viewConfig: ReactNativeBaseComponentViewConfig,
@@ -51,13 +51,6 @@ type Instance = {
 type Props = Object;
 type TextInstance = number;
 
-function NativeHostComponent(tag, viewConfig) {
-  this._nativeTag = tag;
-  this._children = [];
-  this.viewConfig = viewConfig;
-}
-Object.assign(NativeHostComponent.prototype, NativeMethodsMixin);
-
 function recursivelyUncacheFiberNode(node : Instance | TextInstance) {
   if (typeof node === 'number') { // Leaf node (eg text)
     uncacheFiberNode(node);
@@ -156,7 +149,7 @@ const NativeRenderer = ReactFiberReconciler({
     const viewConfig = ReactNativeViewConfigRegistry.get(type);
 
     if (__DEV__) {
-      for (let key in viewConfig.validAttributes) {
+      for (const key in viewConfig.validAttributes) {
         if (props.hasOwnProperty(key)) {
           deepFreezeAndThrowOnMutationInDev(props[key]);
         }
@@ -175,12 +168,14 @@ const NativeRenderer = ReactFiberReconciler({
       updatePayload, // props
     );
 
-    const component = new NativeHostComponent(tag, viewConfig);
+    const component = new ReactNativeFiberHostComponent(tag, viewConfig);
 
     precacheFiberNode(internalInstanceHandle, tag);
     updateFiberProps(tag, props);
 
-    return component;
+    // Not sure how to avoid this cast. Flow is okay if the component is defined
+    // in the same file but if it's external it can't see the types.
+    return ((component : any) : Instance);
   },
 
   createTextInstance(
@@ -367,17 +362,20 @@ ReactGenericBatching.injection.injectFiberBatchedUpdates(
 const roots = new Map();
 
 findNodeHandle.injection.injectFindNode(
-  (fiber: Fiber) => {
-    const instance: any = NativeRenderer.findHostInstance(fiber);
-    return instance ? instance._nativeTag : null;
-  }
+  (fiber: Fiber) => NativeRenderer.findHostInstance(fiber)
 );
 findNodeHandle.injection.injectFindRootNodeID(
-  (instance) => instance._nativeTag
+  (instance) => instance
 );
 
 const ReactNative = {
-  findNodeHandle,
+  // External users of findNodeHandle() expect the host tag number return type.
+  // The injected findNodeHandle() strategy returns the instance wrapper though.
+  // See NativeMethodsMixin#setNativeProps for more info on why this is done.
+  findNodeHandle(componentOrHandle : any) : ?number {
+    const instance: any = findNodeHandle(componentOrHandle);
+    return instance ? instance._nativeTag : null;
+  },
 
   render(element : Element<any>, containerTag : any, callback: ?Function) {
     let root = roots.get(containerTag);
diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeFiberHostComponent.js b/Libraries/Renderer/src/renderers/native/ReactNativeFiberHostComponent.js
new file mode 100644
index 00000000000000..2935b199d15f0b
--- /dev/null
+++ b/Libraries/Renderer/src/renderers/native/ReactNativeFiberHostComponent.js
@@ -0,0 +1,108 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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 ReactNativeFiberHostComponent
+ * @flow
+ * @preventMunge
+ */
+
+'use strict';
+
+var ReactNativeAttributePayload = require('ReactNativeAttributePayload');
+var TextInputState = require('TextInputState');
+var UIManager = require('UIManager');
+
+var {
+  mountSafeCallback,
+  warnForStyleProps,
+} = require('NativeMethodsMixinUtils');
+
+import type {
+  MeasureInWindowOnSuccessCallback,
+  MeasureLayoutOnSuccessCallback,
+  MeasureOnSuccessCallback,
+  NativeMethodsInterface,
+} from 'NativeMethodsMixinUtils';
+import type { Instance } from 'ReactNativeFiber';
+import type { ReactNativeBaseComponentViewConfig } from 'ReactNativeViewConfigRegistry';
+
+/**
+ * This component defines the same methods as NativeMethodsMixin but without the
+ * findNodeHandle wrapper. This wrapper is unnecessary for HostComponent views
+ * and would also result in a circular require.js dependency (since
+ * ReactNativeFiber depends on this component and NativeMethodsMixin depends on
+ * ReactNativeFiber).
+ */
+class ReactNativeFiberHostComponent implements NativeMethodsInterface {
+  _children: Array<Instance | number>
+  _nativeTag: number
+  viewConfig: ReactNativeBaseComponentViewConfig
+
+  constructor(
+    tag : number,
+    viewConfig : ReactNativeBaseComponentViewConfig
+  ) {
+    this._nativeTag = tag;
+    this._children = [];
+    this.viewConfig = viewConfig;
+  }
+
+  blur() {
+    TextInputState.blurTextInput(this._nativeTag);
+  }
+
+  focus() {
+    TextInputState.focusTextInput(this._nativeTag);
+  }
+
+  measure(callback: MeasureOnSuccessCallback) {
+    UIManager.measure(
+      this._nativeTag,
+      mountSafeCallback(this, callback)
+    );
+  }
+
+  measureInWindow(callback: MeasureInWindowOnSuccessCallback) {
+    UIManager.measureInWindow(
+      this._nativeTag,
+      mountSafeCallback(this, callback)
+    );
+  }
+
+  measureLayout(
+    relativeToNativeNode: number,
+    onSuccess: MeasureLayoutOnSuccessCallback,
+    onFail: () => void /* currently unused */
+  ) {
+    UIManager.measureLayout(
+      this._nativeTag,
+      relativeToNativeNode,
+      mountSafeCallback(this, onFail),
+      mountSafeCallback(this, onSuccess)
+    );
+  }
+
+  setNativeProps(nativeProps: Object) {
+    if (__DEV__) {
+      warnForStyleProps(nativeProps, this.viewConfig.validAttributes);
+    }
+
+    var updatePayload = ReactNativeAttributePayload.create(
+      nativeProps,
+      this.viewConfig.validAttributes
+    );
+
+    UIManager.updateView(
+      this._nativeTag,
+      this.viewConfig.uiViewClassName,
+      updatePayload
+    );
+  }
+}
+
+module.exports = ReactNativeFiberHostComponent;
diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeStack.js b/Libraries/Renderer/src/renderers/native/ReactNativeStack.js
index 55cf71fa1c6bec..d6ae88792d9d1e 100644
--- a/Libraries/Renderer/src/renderers/native/ReactNativeStack.js
+++ b/Libraries/Renderer/src/renderers/native/ReactNativeStack.js
@@ -13,8 +13,8 @@
 
 var ReactNativeComponentTree = require('ReactNativeComponentTree');
 var ReactNativeInjection = require('ReactNativeInjection');
-var ReactNativeStackInjection = require('ReactNativeStackInjection');
 var ReactNativeMount = require('ReactNativeMount');
+var ReactNativeStackInjection = require('ReactNativeStackInjection');
 var ReactUpdates = require('ReactUpdates');
 
 var findNodeHandle = require('findNodeHandle');
@@ -30,16 +30,16 @@ var render = function(
   return ReactNativeMount.renderComponent(element, mountInto, callback);
 };
 
-findNodeHandle.injection.injectFindNode(
-  (instance) => instance.getHostNode()
-);
-findNodeHandle.injection.injectFindRootNodeID(
-  (instance) => instance._rootNodeID
-);
-
 var ReactNative = {
   hasReactNativeInitialized: false,
-  findNodeHandle: findNodeHandle,
+
+  // External users of findNodeHandle() expect the host tag number return type.
+  // The injected findNodeHandle() strategy returns the instance wrapper though.
+  // See NativeMethodsMixin#setNativeProps for more info on why this is done.
+  findNodeHandle(componentOrHandle : any) : ?number {
+    return findNodeHandle(componentOrHandle).getHostNode();
+  },
+
   render: render,
   unmountComponentAtNode: ReactNativeMount.unmountComponentAtNode,
 
diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeStackInjection.js b/Libraries/Renderer/src/renderers/native/ReactNativeStackInjection.js
index fe4f4cd4c03566..cc1f812a65cf21 100644
--- a/Libraries/Renderer/src/renderers/native/ReactNativeStackInjection.js
+++ b/Libraries/Renderer/src/renderers/native/ReactNativeStackInjection.js
@@ -63,10 +63,10 @@ function inject() {
   };
 
   findNodeHandle.injection.injectFindNode(
-    (instance) => instance.getHostNode()
+    (instance) => instance
   );
   findNodeHandle.injection.injectFindRootNodeID(
-    (instance) => instance._rootNodeID
+    (instance) => instance
   );
 
   ReactEmptyComponent.injection.injectEmptyComponentFactory(EmptyComponent);
diff --git a/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass.js b/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass.js
index bf53cf81616e8f..3549c750fbeebe 100644
--- a/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass.js
+++ b/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass.js
@@ -13,8 +13,8 @@
 'use strict';
 
 const ReactNativeBaseComponent = require('ReactNativeBaseComponent');
-const ReactNativeViewConfigRegistry = require('ReactNativeViewConfigRegistry');
 const ReactNativeFeatureFlags = require('ReactNativeFeatureFlags');
+const ReactNativeViewConfigRegistry = require('ReactNativeViewConfigRegistry');
 
 // See also ReactNativeBaseComponent
 type ReactNativeBaseComponentViewConfig = {
@@ -27,14 +27,12 @@ type ReactNativeBaseComponentViewConfig = {
  * @param {string} config iOS View configuration.
  * @private
  */
- const createReactNativeFiberComponentClass = function(
-   viewConfig: ReactNativeBaseComponentViewConfig
- ): ReactClass<any> {
-   // TODO(sema): This actually returns a string. Need to fix this before
-   // we deploy Fiber.
-   return (ReactNativeViewConfigRegistry.register(viewConfig) : any);
- };
- 
+const createReactNativeFiberComponentClass = function(
+  viewConfig: ReactNativeBaseComponentViewConfig
+): string {
+  return ReactNativeViewConfigRegistry.register(viewConfig);
+};
+
 /**
  * @param {string} config iOS View configuration.
  * @private
diff --git a/Libraries/Renderer/src/renderers/native/findNodeHandle.js b/Libraries/Renderer/src/renderers/native/findNodeHandle.js
index 7edb378924d441..2230ee37b45ac0 100644
--- a/Libraries/Renderer/src/renderers/native/findNodeHandle.js
+++ b/Libraries/Renderer/src/renderers/native/findNodeHandle.js
@@ -53,7 +53,10 @@ import type { ReactInstance } from 'ReactInstanceType';
 let injectedFindNode;
 let injectedFindRootNodeID;
 
-function findNodeHandle(componentOrHandle: any): ?number {
+// TODO (bvaughn) Rename the findNodeHandle module to something more descriptive
+// eg findInternalHostInstance. This will reduce the likelihood of someone
+// accidentally deep-requiring this version.
+function findNodeHandle(componentOrHandle: any): any {
   if (__DEV__) {
     // TODO: fix this unsafe cast to work with Fiber.
     var owner = ((ReactCurrentOwner.current: any): ReactInstance | null);

From 6dc3a83e88ed120decbeaed8e4e62dc2bb7107a3 Mon Sep 17 00:00:00 2001
From: Marc Horowitz <mhorowitz@fb.com>
Date: Mon, 20 Mar 2017 13:03:04 -0700
Subject: [PATCH 109/366] Don't load native module support as part of the
 initial CS bundle

Reviewed By: javache

Differential Revision: D4720386

fbshipit-source-id: cd8b6137aaff2d907adf089060bf7d356cd2f437
---
 ReactCommon/cxxreact/JSCExecutor.cpp | 84 ++++++++++++++++++----------
 ReactCommon/cxxreact/JSCExecutor.h   |  2 +
 ReactCommon/jschelpers/Value.h       |  7 +++
 3 files changed, 63 insertions(+), 30 deletions(-)

diff --git a/ReactCommon/cxxreact/JSCExecutor.cpp b/ReactCommon/cxxreact/JSCExecutor.cpp
index cee2f2ece2e350..810d0ecfcf5cb9 100644
--- a/ReactCommon/cxxreact/JSCExecutor.cpp
+++ b/ReactCommon/cxxreact/JSCExecutor.cpp
@@ -361,7 +361,6 @@ void JSCExecutor::loadApplicationScript(std::unique_ptr<const JSBigString> scrip
 
       evaluateSourceCode(m_context, bcSourceCode, jsSourceURL);
 
-      bindBridge();
       flush();
 
       ReactMarker::logMarker("CREATE_REACT_CONTEXT_END");
@@ -412,7 +411,6 @@ void JSCExecutor::loadApplicationScript(std::unique_ptr<const JSBigString> scrip
     evaluateScript(m_context, jsScript, jsSourceURL);
   }
 
-  bindBridge();
   flush();
 
   ReactMarker::logMarker("CREATE_REACT_CONTEXT_END");
@@ -428,24 +426,32 @@ void JSCExecutor::setJSModulesUnbundle(std::unique_ptr<JSModulesUnbundle> unbund
 
 void JSCExecutor::bindBridge() throw(JSException) {
   SystraceSection s("JSCExecutor::bindBridge");
-  if (!m_delegate || !m_delegate->getModuleRegistry()) {
-    return;
-  }
-  auto global = Object::getGlobalObject(m_context);
-  auto batchedBridgeValue = global.getProperty("__fbBatchedBridge");
-  if (batchedBridgeValue.isUndefined()) {
-    throwJSExecutionException("Could not get BatchedBridge, make sure your bundle is packaged correctly");
-  }
+  std::call_once(m_bindFlag, [this] {
+    auto global = Object::getGlobalObject(m_context);
+    auto batchedBridgeValue = global.getProperty("__fbBatchedBridge");
+    if (batchedBridgeValue.isUndefined()) {
+      auto requireBatchedBridge = global.getProperty("__fbRequireBatchedBridge");
+      if (!requireBatchedBridge.isUndefined()) {
+        batchedBridgeValue = requireBatchedBridge.asObject().callAsFunction({});
+      }
+      if (batchedBridgeValue.isUndefined()) {
+        throwJSExecutionException("Could not get BatchedBridge, make sure your bundle is packaged correctly");
+      }
+    }
 
-  auto batchedBridge = batchedBridgeValue.asObject();
-  m_callFunctionReturnFlushedQueueJS = batchedBridge.getProperty("callFunctionReturnFlushedQueue").asObject();
-  m_invokeCallbackAndReturnFlushedQueueJS = batchedBridge.getProperty("invokeCallbackAndReturnFlushedQueue").asObject();
-  m_flushedQueueJS = batchedBridge.getProperty("flushedQueue").asObject();
-  m_callFunctionReturnResultAndFlushedQueueJS = batchedBridge.getProperty("callFunctionReturnResultAndFlushedQueue").asObject();
+    auto batchedBridge = batchedBridgeValue.asObject();
+    m_callFunctionReturnFlushedQueueJS = batchedBridge.getProperty("callFunctionReturnFlushedQueue").asObject();
+    m_invokeCallbackAndReturnFlushedQueueJS = batchedBridge.getProperty("invokeCallbackAndReturnFlushedQueue").asObject();
+    m_flushedQueueJS = batchedBridge.getProperty("flushedQueue").asObject();
+    m_callFunctionReturnResultAndFlushedQueueJS = batchedBridge.getProperty("callFunctionReturnResultAndFlushedQueue").asObject();
+  });
 }
 
 void JSCExecutor::callNativeModules(Value&& value) {
   SystraceSection s("JSCExecutor::callNativeModules");
+  // If this fails, you need to pass a fully functional delegate with a
+  // module registry to the factory/ctor.
+  CHECK(m_delegate) << "Attempting to use native modules without a delegate";
   try {
     auto calls = value.toJSONString();
     m_delegate->callNativeModules(*this, folly::parseJson(calls), true);
@@ -462,17 +468,31 @@ void JSCExecutor::callNativeModules(Value&& value) {
 
 void JSCExecutor::flush() {
   SystraceSection s("JSCExecutor::flush");
-  if (!m_delegate) {
-    // do nothing
-  } else if (!m_delegate->getModuleRegistry()) {
-    callNativeModules(Value::makeNull(m_context));
-  } else {
-    // If this is failing, chances are you have provided a delegate with a
-    // module registry, but haven't loaded the JS which enables native function
-    // queueing.  Add BatchedBridge.js to your bundle, pass a nullptr delegate,
-    // or make delegate->getModuleRegistry() return nullptr.
-    CHECK(m_flushedQueueJS) << "Attempting to use native methods without loading BatchedBridge.js";
+
+  if (m_flushedQueueJS) {
     callNativeModules(m_flushedQueueJS->callAsFunction({}));
+    return;
+  }
+
+  // When a native module is called from JS, BatchedBridge.enqueueNativeCall()
+  // is invoked.  For that to work, require('BatchedBridge') has to be called,
+  // and when that happens, __fbBatchedBridge is set as a side effect.
+  auto global = Object::getGlobalObject(m_context);
+  auto batchedBridgeValue = global.getProperty("__fbBatchedBridge");
+  // So here, if __fbBatchedBridge doesn't exist, then we know no native calls
+  // have happened, and we were able to determine this without forcing
+  // BatchedBridge to be loaded as a side effect.
+  if (!batchedBridgeValue.isUndefined()) {
+    // If calls were made, we bind to the JS bridge methods, and use them to
+    // get the pending queue of native calls.
+    bindBridge();
+    callNativeModules(m_flushedQueueJS->callAsFunction({}));
+  } else if (m_delegate) {
+    // If we have a delegate, we need to call it; we pass a null list to
+    // callNativeModules, since we know there are no native calls, without
+    // calling into JS again.  If no calls were made and there's no delegate,
+    // nothing happens, which is correct.
+    callNativeModules(Value::makeNull(m_context));
   }
 }
 
@@ -483,9 +503,9 @@ void JSCExecutor::callFunction(const std::string& moduleId, const std::string& m
 
   auto result = [&] {
     try {
-      // See flush()
-      CHECK(m_callFunctionReturnFlushedQueueJS)
-        << "Attempting to call native methods without loading BatchedBridge.js";
+      if (!m_callFunctionReturnResultAndFlushedQueueJS) {
+        bindBridge();
+      }
       return m_callFunctionReturnFlushedQueueJS->callAsFunction({
         Value(m_context, String::createExpectingAscii(m_context, moduleId)),
         Value(m_context, String::createExpectingAscii(m_context, methodId)),
@@ -504,6 +524,9 @@ void JSCExecutor::invokeCallback(const double callbackId, const folly::dynamic&
   SystraceSection s("JSCExecutor::invokeCallback");
   auto result = [&] {
     try {
+      if (!m_invokeCallbackAndReturnFlushedQueueJS) {
+        bindBridge();
+      }
       return m_invokeCallbackAndReturnFlushedQueueJS->callAsFunction({
         Value::makeNumber(m_context, callbackId),
         Value::fromDynamic(m_context, std::move(arguments))
@@ -521,8 +544,9 @@ Value JSCExecutor::callFunctionSyncWithValue(
     const std::string& module, const std::string& method, Value args) {
   SystraceSection s("JSCExecutor::callFunction");
 
-  // See flush()
-  CHECK(m_callFunctionReturnResultAndFlushedQueueJS);
+  if (!m_callFunctionReturnResultAndFlushedQueueJS) {
+    bindBridge();
+  }
   Object result = m_callFunctionReturnResultAndFlushedQueueJS->callAsFunction({
     Value(m_context, String::createExpectingAscii(m_context, module)),
     Value(m_context, String::createExpectingAscii(m_context, method)),
diff --git a/ReactCommon/cxxreact/JSCExecutor.h b/ReactCommon/cxxreact/JSCExecutor.h
index 3fbb03504a6f2b..c3a1449e05949f 100644
--- a/ReactCommon/cxxreact/JSCExecutor.h
+++ b/ReactCommon/cxxreact/JSCExecutor.h
@@ -4,6 +4,7 @@
 
 #include <cstdint>
 #include <memory>
+#include <mutex>
 #include <unordered_map>
 
 #include <cxxreact/Executor.h>
@@ -112,6 +113,7 @@ class RN_EXPORT JSCExecutor : public JSExecutor {
   std::unique_ptr<JSModulesUnbundle> m_unbundle;
   JSCNativeModules m_nativeModules;
   folly::dynamic m_jscConfig;
+  std::once_flag m_bindFlag;
 
   folly::Optional<Object> m_invokeCallbackAndReturnFlushedQueueJS;
   folly::Optional<Object> m_callFunctionReturnFlushedQueueJS;
diff --git a/ReactCommon/jschelpers/Value.h b/ReactCommon/jschelpers/Value.h
index b5d79c53df283f..ca8b86bf65f8e2 100644
--- a/ReactCommon/jschelpers/Value.h
+++ b/ReactCommon/jschelpers/Value.h
@@ -237,6 +237,13 @@ class Value : public noncopyable {
   Value(JSContextRef context, JSStringRef value);
   Value(Value&&);
 
+  Value& operator=(Value&& other) {
+    m_context = other.m_context;
+    m_value = other.m_value;
+    other.m_value = NULL;
+    return *this;
+  };
+
   operator JSValueRef() const {
     return m_value;
   }

From 39544005650f886f8741e20e081fa91e4a9eb7b4 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <bvaughn@fb.com>
Date: Mon, 20 Mar 2017 16:22:24 -0700
Subject: [PATCH 110/366] Added MobileConfig for ReactNative use-fiber

Reviewed By: yungsters

Differential Revision: D4740267

fbshipit-source-id: d2cf76a22ce0f6337e1055b9f4b869c8bd82fa7d
---
 .../Renderer/src/renderers/native/ReactNativeFeatureFlags.js     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeFeatureFlags.js b/Libraries/Renderer/src/renderers/native/ReactNativeFeatureFlags.js
index 1686eec51aed2f..1224b86f7b74b9 100644
--- a/Libraries/Renderer/src/renderers/native/ReactNativeFeatureFlags.js
+++ b/Libraries/Renderer/src/renderers/native/ReactNativeFeatureFlags.js
@@ -7,6 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  *
  * @providesModule ReactNativeFeatureFlags
+ * @flow
  */
 
 'use strict';

From a4300dab6726aa0588ab10476164846b10794f2f Mon Sep 17 00:00:00 2001
From: "Andrew Y. Chen" <ayc@fb.com>
Date: Mon, 20 Mar 2017 17:22:50 -0700
Subject: [PATCH 111/366] Move idle detection classes to its own directory

Reviewed By: AaaChiuuu

Differential Revision: D4738755

fbshipit-source-id: df3b215991a45932283f6ba9d800aeff1c31d2e6
---
 .../java/com/facebook/react/testing/BUCK           |  6 +++++-
 .../testing/ReactAppInstrumentationTestCase.java   |  2 +-
 .../react/testing/ReactAppTestActivity.java        |  2 ++
 .../react/testing/ReactIntegrationTestCase.java    |  2 ++
 .../react/testing/SingleTouchGestureGenerator.java |  2 ++
 .../com/facebook/react/testing/idledetection/BUCK  | 14 ++++++++++++++
 .../testing/{ => idledetection}/IdleWaiter.java    |  2 +-
 .../ReactBridgeIdleSignaler.java                   |  2 +-
 .../ReactIdleDetectionUtil.java                    |  2 +-
 .../androidTest/java/com/facebook/react/tests/BUCK |  1 +
 10 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/BUCK
 rename ReactAndroid/src/androidTest/java/com/facebook/react/testing/{ => idledetection}/IdleWaiter.java (90%)
 rename ReactAndroid/src/androidTest/java/com/facebook/react/testing/{ => idledetection}/ReactBridgeIdleSignaler.java (97%)
 rename ReactAndroid/src/androidTest/java/com/facebook/react/testing/{ => idledetection}/ReactIdleDetectionUtil.java (98%)

diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
index 5cf6affe9a6fab..6814e3aa316138 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
@@ -2,7 +2,10 @@ include_defs("//ReactAndroid/DEFS")
 
 android_library(
     name = "testing",
-    srcs = glob(["**/*.java"]),
+    srcs = glob(
+        ["**/*.java"],
+        excludes = ["idledetection/**/*.java"],
+    ),
     visibility = [
         "PUBLIC",
     ],
@@ -25,5 +28,6 @@ android_library(
         react_native_target("java/com/facebook/react/modules/debug:interfaces"),
         react_native_target("java/com/facebook/react/shell:shell"),
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
+        react_native_integration_tests_target("java/com/facebook/react/testing/idledetection:idledetection"),
     ],
 )
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppInstrumentationTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppInstrumentationTestCase.java
index aaba651def949c..eeb8c02e06715d 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppInstrumentationTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppInstrumentationTestCase.java
@@ -20,6 +20,7 @@
 
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.testing.idledetection.IdleWaiter;
 
 /**
  * Base class for instrumentation tests that runs React based react application in UI mode
@@ -123,7 +124,6 @@ public void run() {
       }
     };
 
-
     getActivity().runOnUiThread(getScreenshotRunnable);
     try {
       if (!latch.await(5000, TimeUnit.MILLISECONDS)) {
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java
index 022e7826c1fe83..11edda17a429b0 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java
@@ -28,6 +28,8 @@
 import com.facebook.react.common.LifecycleState;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.facebook.react.shell.MainReactPackage;
+import com.facebook.react.testing.idledetection.ReactBridgeIdleSignaler;
+import com.facebook.react.testing.idledetection.ReactIdleDetectionUtil;
 import com.facebook.react.uimanager.UIImplementationProvider;
 
 public class ReactAppTestActivity extends FragmentActivity implements
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java
index 752c89ea618161..77f5492c36cafd 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java
@@ -32,6 +32,8 @@
 import com.facebook.react.common.futures.SimpleSettableFuture;
 import com.facebook.react.devsupport.interfaces.DevSupportManager;
 import com.facebook.react.modules.core.Timing;
+import com.facebook.react.testing.idledetection.ReactBridgeIdleSignaler;
+import com.facebook.react.testing.idledetection.ReactIdleDetectionUtil;
 import com.facebook.soloader.SoLoader;
 
 import static org.mockito.Mockito.mock;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/SingleTouchGestureGenerator.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/SingleTouchGestureGenerator.java
index 278facbcb280b4..f0ae877a953d42 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/SingleTouchGestureGenerator.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/SingleTouchGestureGenerator.java
@@ -13,6 +13,8 @@
 import android.view.View;
 import android.view.ViewConfiguration;
 
+import com.facebook.react.testing.idledetection.IdleWaiter;
+
 /**
  * Provides methods for generating touch events and dispatching them directly to a given view.
  * Events scenarios are based on {@link android.test.TouchUtils} but they get gets dispatched
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/BUCK
new file mode 100644
index 00000000000000..f6b33535737d3f
--- /dev/null
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/BUCK
@@ -0,0 +1,14 @@
+include_defs("//ReactAndroid/DEFS")
+
+android_library(
+    name = "idledetection",
+    srcs = glob(["**/*.java"]),
+    visibility = [
+        "PUBLIC",
+    ],
+    deps = [
+        react_native_dep("third-party/java/testing-support-lib:runner"),
+        react_native_target("java/com/facebook/react/bridge:bridge"),
+        react_native_target("java/com/facebook/react/modules/core:core"),
+    ],
+)
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/IdleWaiter.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/IdleWaiter.java
similarity index 90%
rename from ReactAndroid/src/androidTest/java/com/facebook/react/testing/IdleWaiter.java
rename to ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/IdleWaiter.java
index 98884c1033a375..1b94b7c1fc88db 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/IdleWaiter.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/IdleWaiter.java
@@ -6,7 +6,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package com.facebook.react.testing;
+package com.facebook.react.testing.idledetection;
 
 /**
  * Interface for something that knows how to wait for bridge and UI idle.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactBridgeIdleSignaler.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactBridgeIdleSignaler.java
similarity index 97%
rename from ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactBridgeIdleSignaler.java
rename to ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactBridgeIdleSignaler.java
index ffd941f9a228e6..4aaa451e43ab24 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactBridgeIdleSignaler.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactBridgeIdleSignaler.java
@@ -6,7 +6,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package com.facebook.react.testing;
+package com.facebook.react.testing.idledetection;
 
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIdleDetectionUtil.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactIdleDetectionUtil.java
similarity index 98%
rename from ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIdleDetectionUtil.java
rename to ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactIdleDetectionUtil.java
index 49e2219327b96f..af6ca2ebb82a55 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIdleDetectionUtil.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactIdleDetectionUtil.java
@@ -6,7 +6,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package com.facebook.react.testing;
+package com.facebook.react.testing.idledetection;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK
index 96872ba647b382..992351f62026aa 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK
@@ -5,6 +5,7 @@ deps = [
     react_native_dep("third-party/java/jsr-305:jsr-305"),
     react_native_dep("third-party/java/junit:junit"),
     react_native_integration_tests_target("java/com/facebook/react/testing:testing"),
+    react_native_integration_tests_target("java/com/facebook/react/testing/idledetection:idledetection"),
     react_native_target("java/com/facebook/react:react"),
     react_native_target("java/com/facebook/react/bridge:bridge"),
     react_native_target("java/com/facebook/react/common:common"),

From b3be5743e99f01acdf628c48d3a6f9126aca2c5b Mon Sep 17 00:00:00 2001
From: Ben Roth <spongebucket@gmail.com>
Date: Tue, 21 Mar 2017 04:03:00 -0700
Subject: [PATCH 112/366] Fix property accessor warning in
 RCTDevSettings::websocketExecutorName

Summary:
Motivation: Fixes Xcode warning `Ivar '_websocketExecutorName' which backs the property is not referenced in this property's accessor` which shows up because this property has no setter (and is never set anywhere).
Closes https://github.com/facebook/react-native/pull/12639

Differential Revision: D4745437

Pulled By: javache

fbshipit-source-id: 3ab4b0df62f90adc2b62d891197dc783e07da4e3
---
 React/Modules/RCTDevSettings.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/React/Modules/RCTDevSettings.h b/React/Modules/RCTDevSettings.h
index 6fb6fb4652f936..d8ffd7c9095de7 100644
--- a/React/Modules/RCTDevSettings.h
+++ b/React/Modules/RCTDevSettings.h
@@ -46,7 +46,7 @@
  * Alternate name for the websocket executor, if not the generic term "remote".
  * TODO t16297016: this seems to be unused, remove?
  */
-@property (nonatomic, copy) NSString *websocketExecutorName;
+@property (nonatomic, readonly) NSString *websocketExecutorName;
 
 /*
  * Whether shaking will show RCTDevMenu. The menu is enabled by default if RCT_DEV=1, but

From 2f69c5f46cad550692f41000f7fa6f32efc72745 Mon Sep 17 00:00:00 2001
From: Aaron Chiu <aaronechiu@fb.com>
Date: Tue, 21 Mar 2017 05:05:54 -0700
Subject: [PATCH 113/366] exit out early and continue if no annotations are
 found

Differential Revision: D4742299

fbshipit-source-id: 8006c5c9b25c951aec12ad5c63fdaf03fe1f6e67
---
 .../react/module/processing/ReactModuleSpecProcessor.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/module/processing/ReactModuleSpecProcessor.java b/ReactAndroid/src/main/java/com/facebook/react/module/processing/ReactModuleSpecProcessor.java
index add1ef0b6ef904..d7c419cda8a852 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/module/processing/ReactModuleSpecProcessor.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/module/processing/ReactModuleSpecProcessor.java
@@ -80,11 +80,15 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
       ReactModuleList.class);
     for (Element reactModuleListElement : reactModuleListElements) {
       TypeElement typeElement = (TypeElement) reactModuleListElement;
+      ReactModuleList reactModuleList = typeElement.getAnnotation(ReactModuleList.class);
+      if (reactModuleList == null) {
+        continue;
+      }
+
       ClassName className = ClassName.get(typeElement);
       String packageName = ClassName.get(typeElement).packageName();
       String fileName = className.simpleName();
 
-      ReactModuleList reactModuleList = typeElement.getAnnotation(ReactModuleList.class);
       List<String> nativeModules = new ArrayList<>();
       try {
         reactModuleList.nativeModules(); // throws MirroredTypesException

From 80e1dbf69227af7a16932a7f443e116799811a3b Mon Sep 17 00:00:00 2001
From: David Aurelio <davidaurelio@fb.com>
Date: Tue, 21 Mar 2017 05:35:57 -0700
Subject: [PATCH 114/366] require `fbjs/lib/invariant`, not `invariant`

Summary: `invariant` is only available in open source because we install it as a transitive dependency into node_modules

Reviewed By: jeanlauliac

Differential Revision: D4745582

fbshipit-source-id: 27c49b576254c8d1d667dea7097d16cdd1205daf
---
 Libraries/Utilities/DeviceInfo.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Libraries/Utilities/DeviceInfo.js b/Libraries/Utilities/DeviceInfo.js
index d398f808312459..819916b153f84a 100644
--- a/Libraries/Utilities/DeviceInfo.js
+++ b/Libraries/Utilities/DeviceInfo.js
@@ -13,7 +13,7 @@
 
 const DeviceInfo = require('NativeModules').DeviceInfo;
 
-const invariant = require('invariant');
+const invariant = require('fbjs/lib/invariant');
 
 invariant(DeviceInfo, 'DeviceInfo native module is not installed correctly');
 

From 5c128ad0491808b8aa22828ee14fcc1672201995 Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Tue, 21 Mar 2017 05:54:03 -0700
Subject: [PATCH 115/366] packager: GlobalTransformCache: add unit test

Summary: Finally adding some unit test to increase confidence in the correctness of that piece of code.

Reviewed By: davidaurelio

Differential Revision: D4721543

fbshipit-source-id: 56776290d61f2b51c69d7eeae09663e3bc892b50
---
 .../__tests__/GlobalTransformCache-test.js    | 91 +++++++++++++++++++
 .../GlobalTransformCache-test.js.snap         | 32 +++++++
 2 files changed, 123 insertions(+)
 create mode 100644 packager/src/lib/__tests__/GlobalTransformCache-test.js
 create mode 100644 packager/src/lib/__tests__/__snapshots__/GlobalTransformCache-test.js.snap

diff --git a/packager/src/lib/__tests__/GlobalTransformCache-test.js b/packager/src/lib/__tests__/GlobalTransformCache-test.js
new file mode 100644
index 00000000000000..1900ed85f884ae
--- /dev/null
+++ b/packager/src/lib/__tests__/GlobalTransformCache-test.js
@@ -0,0 +1,91 @@
+/**
+ * Copyright (c) 2016-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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.
+ */
+
+'use strict';
+
+jest.disableAutomock();
+jest.useRealTimers();
+
+const fetchMock = jest.fn();
+jest.mock('node-fetch', () => fetchMock);
+
+const GlobalTransformCache = require('../GlobalTransformCache');
+const FetchError = require('node-fetch/lib/fetch-error');
+
+async function fetchResultURIs(keys: Array<string>): Promise<Map<string, string>> {
+  return new Map(keys.map(key => [key, `http://globalcache.com/${key}`]));
+}
+
+async function fetchResultFromURI(uri: string): Promise<?CachedResult> {
+  return {
+    code: `/* code from ${uri} */`,
+    dependencies: [],
+    dependencyOffsets: [],
+  };
+}
+
+describe('GlobalTransformCache', () => {
+
+  it('fetches results', async () => {
+    const cache = new GlobalTransformCache(fetchResultURIs, fetchResultFromURI, null, [
+      {dev: true, minify: false, platform: 'ios'},
+    ]);
+    const transformOptions = {
+      dev: true,
+      minify: false,
+      platform: 'ios',
+      transform: {projectRoots: [__dirname]},
+    };
+    const result = await Promise.all([cache.fetch({
+      filePath: 'foo.js',
+      sourceCode: '/* beep */',
+      getTransformCacheKey: () => 'abcd',
+      transformOptions,
+    }), cache.fetch({
+      filePath: 'bar.js',
+      sourceCode: '/* boop */',
+      getTransformCacheKey: () => 'abcd',
+      transformOptions,
+    })]);
+    expect(result).toMatchSnapshot();
+  });
+
+  describe('fetchResultFromURI', () => {
+
+    const defaultFetchMockImpl = async uri => ({
+      status: 200,
+      json: async () => ({
+        code: `/* code from ${uri} */`,
+        dependencies: [],
+        dependencyOffsets: [],
+      }),
+    });
+
+    beforeEach(() => {
+      fetchMock.mockReset();
+    });
+
+    it('fetches result', async () => {
+      fetchMock.mockImplementation(defaultFetchMockImpl);
+      const result = await GlobalTransformCache.fetchResultFromURI('http://globalcache.com/foo');
+      expect(result).toMatchSnapshot();
+    });
+
+    it('retries once on timeout', async () => {
+      fetchMock.mockImplementation(async uri => {
+        fetchMock.mockImplementation(defaultFetchMockImpl);
+        throw new FetchError('timeout!', 'request-timeout');
+      });
+      const result = await GlobalTransformCache.fetchResultFromURI('http://globalcache.com/foo');
+      expect(result).toMatchSnapshot();
+    });
+
+  });
+
+});
diff --git a/packager/src/lib/__tests__/__snapshots__/GlobalTransformCache-test.js.snap b/packager/src/lib/__tests__/__snapshots__/GlobalTransformCache-test.js.snap
new file mode 100644
index 00000000000000..c0fdf1ad5bb838
--- /dev/null
+++ b/packager/src/lib/__tests__/__snapshots__/GlobalTransformCache-test.js.snap
@@ -0,0 +1,32 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`GlobalTransformCache fetchResultFromURI fetches result 1`] = `
+Object {
+  "code": "/* code from http://globalcache.com/foo */",
+  "dependencies": Array [],
+  "dependencyOffsets": Array [],
+}
+`;
+
+exports[`GlobalTransformCache fetchResultFromURI retries once on timeout 1`] = `
+Object {
+  "code": "/* code from http://globalcache.com/foo */",
+  "dependencies": Array [],
+  "dependencyOffsets": Array [],
+}
+`;
+
+exports[`GlobalTransformCache fetches results 1`] = `
+Array [
+  Object {
+    "code": "/* code from http://globalcache.com/2ad175cb80ae79fd33b914bfb392fb6742982d2a-foo.js */",
+    "dependencies": Array [],
+    "dependencyOffsets": Array [],
+  },
+  Object {
+    "code": "/* code from http://globalcache.com/d6c0a1a4199d572ab68b36c07d0d68607eebb131-bar.js */",
+    "dependencies": Array [],
+    "dependencyOffsets": Array [],
+  },
+]
+`;

From 4cbb64521a9a3fbbef9cf741314060ef71f07357 Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Tue, 21 Mar 2017 05:54:06 -0700
Subject: [PATCH 116/366] packager: GlobalTransformCache: ignore errors related
 to fetching

Reviewed By: davidaurelio

Differential Revision: D4745584

fbshipit-source-id: 2c9b2451d3525c90308fb88784945462cd827d1f
---
 packager/src/lib/GlobalTransformCache.js | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/packager/src/lib/GlobalTransformCache.js b/packager/src/lib/GlobalTransformCache.js
index b74a1981cc2330..79a169ed26c2a0 100644
--- a/packager/src/lib/GlobalTransformCache.js
+++ b/packager/src/lib/GlobalTransformCache.js
@@ -145,6 +145,13 @@ class TransformProfileSet {
   }
 }
 
+class FetchFailedError extends Error {
+  constructor(message) {
+    super();
+    this.message = message;
+  }
+}
+
 /**
  * For some reason the result stored by the server for a key might mismatch what
  * we expect a result to be. So we need to verify carefully the data.
@@ -171,6 +178,8 @@ class GlobalTransformCache {
   _profileSet: TransformProfileSet;
   _store: ?KeyResultStore;
 
+  static FetchFailedError;
+
   /**
    * For using the global cache one needs to have some kind of central key-value
    * store that gets prefilled using keyOf() and the transformed results. The
@@ -214,12 +223,13 @@ class GlobalTransformCache {
   static async _fetchResultFromURI(uri: string): Promise<CachedResult> {
     const response = await fetch(uri, {method: 'GET', timeout: 8000});
     if (response.status !== 200) {
-      throw new Error(`Unexpected HTTP status: ${response.status} ${response.statusText} `);
+      const msg = `Unexpected HTTP status: ${response.status} ${response.statusText} `;
+      throw new FetchFailedError(msg);
     }
     const unvalidatedResult = await response.json();
     const result = validateCachedResult(unvalidatedResult);
     if (result == null) {
-      throw new Error('Server returned invalid result.');
+      throw new FetchFailedError('Server returned invalid result.');
     }
     return result;
   }
@@ -260,4 +270,6 @@ class GlobalTransformCache {
 
 }
 
+GlobalTransformCache.FetchFailedError = FetchFailedError;
+
 module.exports = GlobalTransformCache;

From 439cb76a005fbffd23be6c5b6a61c7806f1b716d Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Tue, 21 Mar 2017 05:54:08 -0700
Subject: [PATCH 117/366] packager: GlobalTransformCache: reduce asynchronicity
 for non-cached bundles

Reviewed By: davidaurelio

Differential Revision: D4745595

fbshipit-source-id: 3126fdcc11dd1c8085316457ead0cabae633d0db
---
 packager/src/lib/GlobalTransformCache.js | 7 ++++---
 packager/src/node-haste/Module.js        | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packager/src/lib/GlobalTransformCache.js b/packager/src/lib/GlobalTransformCache.js
index 79a169ed26c2a0..31d27cef26128c 100644
--- a/packager/src/lib/GlobalTransformCache.js
+++ b/packager/src/lib/GlobalTransformCache.js
@@ -247,14 +247,15 @@ class GlobalTransformCache {
     });
   }
 
+  shouldFetch(props: FetchProps): boolean {
+    return this._profileSet.has(props.transformOptions);
+  }
+
   /**
    * This may return `null` if either the cache doesn't have a value for that
    * key yet, or an error happened, processed separately.
    */
   async fetch(props: FetchProps): Promise<?CachedResult> {
-    if (!this._profileSet.has(props.transformOptions)) {
-      return null;
-    }
     const uri = await this._fetcher.fetch(GlobalTransformCache.keyOf(props));
     if (uri == null) {
       return null;
diff --git a/packager/src/node-haste/Module.js b/packager/src/node-haste/Module.js
index 0f1892ca56a231..5b89683ecfa7a5 100644
--- a/packager/src/node-haste/Module.js
+++ b/packager/src/node-haste/Module.js
@@ -303,7 +303,7 @@ class Module {
     callback: (error: ?Error, result: ?TransformedCode) => void,
   ) {
     const {_globalCache} = this;
-    if (_globalCache == null) {
+    if (_globalCache == null || !_globalCache.shouldFetch(cacheProps)) {
       this._transformCodeForCallback(cacheProps, callback);
       return;
     }

From a34956f2fb51a95096a519feaae12a0b9db12fb1 Mon Sep 17 00:00:00 2001
From: David Aurelio <davidaurelio@fb.com>
Date: Tue, 21 Mar 2017 07:49:54 -0700
Subject: [PATCH 118/366] Remove `copyProperties`

Summary: remove `copyProperties` module, and replace the functionality with `Object.assign`

Reviewed By: javache

Differential Revision: D4745771

fbshipit-source-id: 2440620757e7539dbd7fd39f5920ac0b5b4183c5
---
 Libraries/EventEmitter/EventValidator.js    |  4 +-
 Libraries/EventEmitter/mixInEventEmitter.js |  7 ++-
 Libraries/vendor/core/copyProperties.js     | 48 ---------------------
 3 files changed, 4 insertions(+), 55 deletions(-)
 delete mode 100644 Libraries/vendor/core/copyProperties.js

diff --git a/Libraries/EventEmitter/EventValidator.js b/Libraries/EventEmitter/EventValidator.js
index 26fda76dfab7f5..5fc234b2263ab4 100644
--- a/Libraries/EventEmitter/EventValidator.js
+++ b/Libraries/EventEmitter/EventValidator.js
@@ -11,8 +11,6 @@
  */
 'use strict';
 
-const copyProperties = require('copyProperties');
-
 /**
  * EventValidator is designed to validate event types to make it easier to catch
  * common mistakes. It accepts a map of all of the different types of events
@@ -37,7 +35,7 @@ const EventValidator = {
     const eventTypes = Object.keys(types);
     const emitterWithValidation = Object.create(emitter);
 
-    copyProperties(emitterWithValidation, {
+    Object.assign(emitterWithValidation, {
       emit: function emit(type, a, b, c, d, e, _) {
         assertAllowsEventType(type, eventTypes);
         return emitter.emit.call(this, type, a, b, c, d, e, _);
diff --git a/Libraries/EventEmitter/mixInEventEmitter.js b/Libraries/EventEmitter/mixInEventEmitter.js
index 2e2f47e025488f..27b6726ed6b52d 100644
--- a/Libraries/EventEmitter/mixInEventEmitter.js
+++ b/Libraries/EventEmitter/mixInEventEmitter.js
@@ -16,7 +16,6 @@ const EventEmitterWithHolding = require('EventEmitterWithHolding');
 const EventHolder = require('EventHolder');
 const EventValidator = require('EventValidator');
 
-const copyProperties = require('copyProperties');
 const invariant = require('fbjs/lib/invariant');
 const keyOf = require('fbjs/lib/keyOf');
 
@@ -63,13 +62,13 @@ function mixInEventEmitter(cls: Function | Object, types: Object) {
   // Keep track of the provided types, union the types if they already exist,
   // which allows for prototype subclasses to provide more types.
   if (target.hasOwnProperty(TYPES_KEY)) {
-    copyProperties(target.__types, types);
+    Object.assign(target.__types, types);
   } else if (target.__types) {
-    target.__types = copyProperties({}, target.__types, types);
+    target.__types = Object.assign({}, target.__types, types);
   } else {
     target.__types = types;
   }
-  copyProperties(target, EventEmitterMixin);
+  Object.assign(target, EventEmitterMixin);
 }
 
 const EventEmitterMixin = {
diff --git a/Libraries/vendor/core/copyProperties.js b/Libraries/vendor/core/copyProperties.js
deleted file mode 100644
index d98ed905580bd0..00000000000000
--- a/Libraries/vendor/core/copyProperties.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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 copyProperties
- */
-'use strict';
-
-/**
- * Copy properties from one or more objects (up to 5) into the first object.
- * This is a shallow copy. It mutates the first object and also returns it.
- *
- * NOTE: `arguments` has a very significant performance penalty, which is why
- * we don't support unlimited arguments.
- */
-function copyProperties(obj, a, b, c, d, e, f) {
-  obj = obj || {};
-
-  if (__DEV__) {
-    if (f) {
-      throw new Error('Too many arguments passed to copyProperties');
-    }
-  }
-
-  var args = [a, b, c, d, e];
-  var ii = 0, v;
-  while (args[ii]) {
-    v = args[ii++];
-    for (var k in v) {
-      obj[k] = v[k];
-    }
-
-    // IE ignores toString in object iteration.. See:
-    // webreflection.blogspot.com/2007/07/quick-fix-internet-explorer-and.html
-    if (v.hasOwnProperty && v.hasOwnProperty('toString') &&
-        (typeof v.toString !== 'undefined') && (obj.toString !== v.toString)) {
-      obj.toString = v.toString;
-    }
-  }
-
-  return obj;
-}
-
-module.exports = copyProperties;

From 2b4762f18469a12f4056e18b5e6b76b2babb5579 Mon Sep 17 00:00:00 2001
From: David Aurelio <davidaurelio@fb.com>
Date: Tue, 21 Mar 2017 09:52:31 -0700
Subject: [PATCH 119/366] Only use `EventValidator` in development mode

Summary: Only pulls in `EventValidator` for development mode, as warnings about invalid events are pointless in production builds.

Reviewed By: javache

Differential Revision: D4745852

fbshipit-source-id: dbab1026df35d54a82e1e620fac08304c58fbeae
---
 Libraries/EventEmitter/mixInEventEmitter.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Libraries/EventEmitter/mixInEventEmitter.js b/Libraries/EventEmitter/mixInEventEmitter.js
index 27b6726ed6b52d..d5db027bb630bc 100644
--- a/Libraries/EventEmitter/mixInEventEmitter.js
+++ b/Libraries/EventEmitter/mixInEventEmitter.js
@@ -14,7 +14,6 @@
 const EventEmitter = require('EventEmitter');
 const EventEmitterWithHolding = require('EventEmitterWithHolding');
 const EventHolder = require('EventHolder');
-const EventValidator = require('EventValidator');
 
 const invariant = require('fbjs/lib/invariant');
 const keyOf = require('fbjs/lib/keyOf');
@@ -119,7 +118,10 @@ const EventEmitterMixin = {
   __getEventEmitter: function() {
     if (!this.__eventEmitter) {
       let emitter = new EventEmitter();
-      emitter = EventValidator.addValidation(emitter, this.__types);
+      if (__DEV__) {
+        const EventValidator = require('EventValidator');
+        emitter = EventValidator.addValidation(emitter, this.__types);
+      }
 
       const holder = new EventHolder();
       this.__eventEmitter = new EventEmitterWithHolding(emitter, holder);

From 4797701b66a1e1b6eef4f283703b4245de52e17b Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Tue, 21 Mar 2017 11:32:14 -0700
Subject: [PATCH 120/366] packager: clear cache

Reviewed By: davidaurelio

Differential Revision: D4746429

fbshipit-source-id: 1a49a4b6db75658749346f0fd94dad68ff084203
---
 packager/src/node-haste/index.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packager/src/node-haste/index.js b/packager/src/node-haste/index.js
index fef220c58b473b..0bf17a9115e192 100644
--- a/packager/src/node-haste/index.js
+++ b/packager/src/node-haste/index.js
@@ -71,6 +71,8 @@ type Options = {
   watch: boolean,
 };
 
+const JEST_HASTE_MAP_CACHE_BREAKER = 1;
+
 class DependencyGraph extends EventEmitter {
 
   _opts: Options;
@@ -104,7 +106,7 @@ class DependencyGraph extends EventEmitter {
       ignorePattern: {test: opts.ignoreFilePath},
       maxWorkers: opts.maxWorkerCount,
       mocksPattern: '',
-      name: 'react-native-packager',
+      name: 'react-native-packager-' + JEST_HASTE_MAP_CACHE_BREAKER,
       platforms: Array.from(opts.platforms),
       providesModuleNodeModules: opts.providesModuleNodeModules,
       resetCache: opts.resetCache,

From 314ec8726960e381371d2ce48728c41f5fc51f39 Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieterdb@fb.com>
Date: Tue, 21 Mar 2017 12:37:10 -0700
Subject: [PATCH 121/366] Remove unused CxxMessageQueue

Differential Revision: D4713064

fbshipit-source-id: 511b782279b89076228f00290e78ed155e2e723e
---
 React/ReactCxx.xcodeproj/project.pbxproj      |  16 -
 ReactCommon/cxxreact/Android.mk               |   1 -
 ReactCommon/cxxreact/BUCK                     |   1 -
 ReactCommon/cxxreact/CxxMessageQueue.cpp      | 320 ------------------
 ReactCommon/cxxreact/CxxMessageQueue.h        |  83 -----
 ReactCommon/cxxreact/Instance.cpp             |   1 -
 ReactCommon/cxxreact/tests/BUCK               |   1 -
 .../cxxreact/tests/CxxMessageQueueTest.cpp    | 188 ----------
 8 files changed, 611 deletions(-)
 delete mode 100644 ReactCommon/cxxreact/CxxMessageQueue.cpp
 delete mode 100644 ReactCommon/cxxreact/CxxMessageQueue.h
 delete mode 100644 ReactCommon/cxxreact/tests/CxxMessageQueueTest.cpp

diff --git a/React/ReactCxx.xcodeproj/project.pbxproj b/React/ReactCxx.xcodeproj/project.pbxproj
index cef7f0d506bb2b..c375179209e0dc 100644
--- a/React/ReactCxx.xcodeproj/project.pbxproj
+++ b/React/ReactCxx.xcodeproj/project.pbxproj
@@ -172,7 +172,6 @@
 		13F887581E2971D400C3C7A1 /* Demangle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 13F887521E2971C500C3C7A1 /* Demangle.cpp */; };
 		13F887591E2971D400C3C7A1 /* StringBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 13F887531E2971C500C3C7A1 /* StringBase.cpp */; };
 		13F8875A1E2971D400C3C7A1 /* Unicode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 13F887541E2971C500C3C7A1 /* Unicode.cpp */; };
-		13F8876D1E29726200C3C7A1 /* CxxMessageQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0A51E03699D0018521A /* CxxMessageQueue.cpp */; };
 		13F8876E1E29726200C3C7A1 /* CxxNativeModule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0A81E03699D0018521A /* CxxNativeModule.cpp */; };
 		13F887701E29726200C3C7A1 /* Instance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0AE1E03699D0018521A /* Instance.cpp */; };
 		13F887711E29726200C3C7A1 /* JSBundleType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC70D2EB1DE48A22002E6351 /* JSBundleType.cpp */; };
@@ -191,7 +190,6 @@
 		13F8877E1E29726200C3C7A1 /* NativeToJsBridge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0CF1E03699D0018521A /* NativeToJsBridge.cpp */; };
 		13F8877F1E29726200C3C7A1 /* Platform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0D11E03699D0018521A /* Platform.cpp */; };
 		13F887801E29726200C3C7A1 /* SampleCxxModule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0D31E03699D0018521A /* SampleCxxModule.cpp */; };
-		13F887811E29726300C3C7A1 /* CxxMessageQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0A51E03699D0018521A /* CxxMessageQueue.cpp */; };
 		13F887821E29726300C3C7A1 /* CxxNativeModule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0A81E03699D0018521A /* CxxNativeModule.cpp */; };
 		13F887841E29726300C3C7A1 /* Instance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0AE1E03699D0018521A /* Instance.cpp */; };
 		13F887851E29726300C3C7A1 /* JSCExecutor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0B21E03699D0018521A /* JSCExecutor.cpp */; };
@@ -229,7 +227,6 @@
 		191E3EBE1C29D9AF00C180A6 /* RCTRefreshControlManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 191E3EBD1C29D9AF00C180A6 /* RCTRefreshControlManager.m */; };
 		191E3EC11C29DC3800C180A6 /* RCTRefreshControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 191E3EC01C29DC3800C180A6 /* RCTRefreshControl.m */; };
 		19DED2291E77E29200F089BB /* systemJSCWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 19DED2281E77E29200F089BB /* systemJSCWrapper.cpp */; };
-		27595AA31E575C7800CCE2B1 /* CxxMessageQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0A61E03699D0018521A /* CxxMessageQueue.h */; };
 		27595AA41E575C7800CCE2B1 /* CxxModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0A71E03699D0018521A /* CxxModule.h */; };
 		27595AA51E575C7800CCE2B1 /* CxxNativeModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0A91E03699D0018521A /* CxxNativeModule.h */; };
 		27595AA61E575C7800CCE2B1 /* Executor.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0AB1E03699D0018521A /* Executor.h */; };
@@ -256,7 +253,6 @@
 		27595ABB1E575C7800CCE2B1 /* Platform.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0D21E03699D0018521A /* Platform.h */; };
 		27595ABC1E575C7800CCE2B1 /* SampleCxxModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0D41E03699D0018521A /* SampleCxxModule.h */; };
 		27595ABD1E575C7800CCE2B1 /* SystraceSection.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0D51E03699D0018521A /* SystraceSection.h */; };
-		27595ABE1E575C7800CCE2B1 /* CxxMessageQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0A61E03699D0018521A /* CxxMessageQueue.h */; };
 		27595ABF1E575C7800CCE2B1 /* CxxModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0A71E03699D0018521A /* CxxModule.h */; };
 		27595AC01E575C7800CCE2B1 /* CxxNativeModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0A91E03699D0018521A /* CxxNativeModule.h */; };
 		27595AC11E575C7800CCE2B1 /* Executor.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0AB1E03699D0018521A /* Executor.h */; };
@@ -744,7 +740,6 @@
 		3D8ED92C1E5B120100D83D20 /* libcxxreact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D3CD9321DE5FBEE00167DC4 /* libcxxreact.a */; };
 		3D8ED92D1E5B120100D83D20 /* libyoga.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D3C06751DE3340C00C268FA /* libyoga.a */; };
 		3DA9819E1E5B0DBB004F2374 /* NSDataBigString.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7454B31E54786200E74ADD /* NSDataBigString.h */; };
-		3DA9819F1E5B0E34004F2374 /* CxxMessageQueue.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0A61E03699D0018521A /* CxxMessageQueue.h */; };
 		3DA981A01E5B0E34004F2374 /* CxxModule.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0A71E03699D0018521A /* CxxModule.h */; };
 		3DA981A11E5B0E34004F2374 /* CxxNativeModule.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0A91E03699D0018521A /* CxxNativeModule.h */; };
 		3DA981A21E5B0E34004F2374 /* Executor.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0AB1E03699D0018521A /* Executor.h */; };
@@ -891,7 +886,6 @@
 		3DA982361E5B0F7F004F2374 /* RCTWrapperViewController.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13B080231A694A8400A75B9A /* RCTWrapperViewController.h */; };
 		3DA982381E5B0F7F004F2374 /* UIView+React.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13E067531A70F44B002CDEE1 /* UIView+React.h */; };
 		3DA982391E5B0F8A004F2374 /* UIView+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 83F15A171B7CC46900F10295 /* UIView+Private.h */; };
-		3DA9823A1E5B1053004F2374 /* CxxMessageQueue.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0A61E03699D0018521A /* CxxMessageQueue.h */; };
 		3DA9823B1E5B1053004F2374 /* CxxModule.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0A71E03699D0018521A /* CxxModule.h */; };
 		3DA9823C1E5B1053004F2374 /* CxxNativeModule.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0A91E03699D0018521A /* CxxNativeModule.h */; };
 		3DA9823D1E5B1053004F2374 /* Executor.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0AB1E03699D0018521A /* Executor.h */; };
@@ -1201,7 +1195,6 @@
 			dstPath = include/cxxreact;
 			dstSubfolderSpec = 16;
 			files = (
-				3DA9823A1E5B1053004F2374 /* CxxMessageQueue.h in Copy Headers */,
 				3DA9823B1E5B1053004F2374 /* CxxModule.h in Copy Headers */,
 				3DA9823C1E5B1053004F2374 /* CxxNativeModule.h in Copy Headers */,
 				3DA9823D1E5B1053004F2374 /* Executor.h in Copy Headers */,
@@ -1400,7 +1393,6 @@
 			dstPath = include/cxxreact;
 			dstSubfolderSpec = 16;
 			files = (
-				3DA9819F1E5B0E34004F2374 /* CxxMessageQueue.h in Copy Headers */,
 				3DA981A01E5B0E34004F2374 /* CxxModule.h in Copy Headers */,
 				3DA981A11E5B0E34004F2374 /* CxxNativeModule.h in Copy Headers */,
 				3DA981A21E5B0E34004F2374 /* Executor.h in Copy Headers */,
@@ -1720,8 +1712,6 @@
 		3D7A27DE1DE32541002E3F95 /* JSCWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCWrapper.h; sourceTree = "<group>"; };
 		3D7A27E11DE325B7002E3F95 /* RCTJSCErrorHandling.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTJSCErrorHandling.mm; sourceTree = "<group>"; };
 		3D7AA9C31E548CD5001955CF /* NSDataBigString.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NSDataBigString.mm; sourceTree = "<group>"; };
-		3D92B0A51E03699D0018521A /* CxxMessageQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CxxMessageQueue.cpp; sourceTree = "<group>"; };
-		3D92B0A61E03699D0018521A /* CxxMessageQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CxxMessageQueue.h; sourceTree = "<group>"; };
 		3D92B0A71E03699D0018521A /* CxxModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CxxModule.h; sourceTree = "<group>"; };
 		3D92B0A81E03699D0018521A /* CxxNativeModule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CxxNativeModule.cpp; sourceTree = "<group>"; };
 		3D92B0A91E03699D0018521A /* CxxNativeModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CxxNativeModule.h; sourceTree = "<group>"; };
@@ -2416,8 +2406,6 @@
 		AC70D2EA1DE489FC002E6351 /* cxxreact */ = {
 			isa = PBXGroup;
 			children = (
-				3D92B0A51E03699D0018521A /* CxxMessageQueue.cpp */,
-				3D92B0A61E03699D0018521A /* CxxMessageQueue.h */,
 				3D92B0A71E03699D0018521A /* CxxModule.h */,
 				3D92B0A81E03699D0018521A /* CxxNativeModule.cpp */,
 				3D92B0A91E03699D0018521A /* CxxNativeModule.h */,
@@ -2660,7 +2648,6 @@
 				3D3030221DF8294C00D6DDAE /* JSBundleType.h in Headers */,
 				27595ACA1E575C7800CCE2B1 /* JSCMemory.h in Headers */,
 				3D74547D1E54758900E74ADD /* JSBigString.h in Headers */,
-				27595ABE1E575C7800CCE2B1 /* CxxMessageQueue.h in Headers */,
 				27595AC71E575C7800CCE2B1 /* JSCExecutor.h in Headers */,
 				27595ACD1E575C7800CCE2B1 /* JSCSamplingProfiler.h in Headers */,
 				27595ABF1E575C7800CCE2B1 /* CxxModule.h in Headers */,
@@ -2732,7 +2719,6 @@
 				3D3CD9471DE5FC7800167DC4 /* oss-compat-util.h in Headers */,
 				27595AAF1E575C7800CCE2B1 /* JSCMemory.h in Headers */,
 				3D74547C1E54758900E74ADD /* JSBigString.h in Headers */,
-				27595AA31E575C7800CCE2B1 /* CxxMessageQueue.h in Headers */,
 				27595AAC1E575C7800CCE2B1 /* JSCExecutor.h in Headers */,
 				27595AB21E575C7800CCE2B1 /* JSCSamplingProfiler.h in Headers */,
 				27595AA41E575C7800CCE2B1 /* CxxModule.h in Headers */,
@@ -3436,7 +3422,6 @@
 				13F8877F1E29726200C3C7A1 /* Platform.cpp in Sources */,
 				13F887701E29726200C3C7A1 /* Instance.cpp in Sources */,
 				13F8877E1E29726200C3C7A1 /* NativeToJsBridge.cpp in Sources */,
-				13F8876D1E29726200C3C7A1 /* CxxMessageQueue.cpp in Sources */,
 				13F887761E29726200C3C7A1 /* JSCNativeModules.cpp in Sources */,
 				13F887801E29726200C3C7A1 /* SampleCxxModule.cpp in Sources */,
 			);
@@ -3460,7 +3445,6 @@
 				3D80D9181DF6F7A80028D040 /* JSBundleType.cpp in Sources */,
 				13F8878F1E29726300C3C7A1 /* MethodCall.cpp in Sources */,
 				13F887921E29726300C3C7A1 /* Platform.cpp in Sources */,
-				13F887811E29726300C3C7A1 /* CxxMessageQueue.cpp in Sources */,
 				13F887911E29726300C3C7A1 /* NativeToJsBridge.cpp in Sources */,
 				13F887821E29726300C3C7A1 /* CxxNativeModule.cpp in Sources */,
 				13F887891E29726300C3C7A1 /* JSCNativeModules.cpp in Sources */,
diff --git a/ReactCommon/cxxreact/Android.mk b/ReactCommon/cxxreact/Android.mk
index 6f33a13ef738f8..f9cdb1976ab87e 100644
--- a/ReactCommon/cxxreact/Android.mk
+++ b/ReactCommon/cxxreact/Android.mk
@@ -5,7 +5,6 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libreactnativefb
 
 LOCAL_SRC_FILES := \
-  CxxMessageQueue.cpp \
   CxxNativeModule.cpp \
   Instance.cpp \
   JSCExecutor.cpp \
diff --git a/ReactCommon/cxxreact/BUCK b/ReactCommon/cxxreact/BUCK
index 8e94880e254625..49b2b54e5eca75 100644
--- a/ReactCommon/cxxreact/BUCK
+++ b/ReactCommon/cxxreact/BUCK
@@ -127,7 +127,6 @@ cxx_library(
 )
 
 CXXREACT_PUBLIC_HEADERS = [
-    "CxxMessageQueue.h",
     "CxxNativeModule.h",
     "Executor.h",
     "ExecutorToken.h",
diff --git a/ReactCommon/cxxreact/CxxMessageQueue.cpp b/ReactCommon/cxxreact/CxxMessageQueue.cpp
deleted file mode 100644
index e83a3c90a42aa4..00000000000000
--- a/ReactCommon/cxxreact/CxxMessageQueue.cpp
+++ /dev/null
@@ -1,320 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#include "CxxMessageQueue.h"
-
-#include <folly/AtomicIntrusiveLinkedList.h>
-
-#include <unordered_map>
-#include <mutex>
-#include <queue>
-
-#include <glog/logging.h>
-
-namespace facebook {
-namespace react {
-
-using detail::BinarySemaphore;
-using detail::EventFlag;
-
-using clock = std::chrono::steady_clock;
-using time_point = clock::time_point;
-static_assert(std::is_same<time_point, EventFlag::time_point>::value, "");
-
-namespace {
-time_point now() {
-  return clock::now();
-}
-
-class Task {
- public:
-  static Task* create(std::function<void()>&& func) {
-    return new Task{std::move(func), false, time_point()};
-  }
-
-  static Task* createSync(std::function<void()>&& func) {
-    return new Task{std::move(func), true, time_point()};
-  }
-
-  static Task* createDelayed(std::function<void()>&& func, time_point startTime) {
-    return new Task{std::move(func), false, startTime};
-  }
-
-  std::function<void()> func;
-  // This flag is just to mark that the task is expected to be synchronous. If
-  // a synchronous task races with stopping the queue, the thread waiting on
-  // the synchronous task might never resume. We use this flag to detect this
-  // case and throw an error.
-  bool sync;
-  time_point startTime;
-
-  folly::AtomicIntrusiveLinkedListHook<Task> hook;
-
-  // Should this sort consider id also?
-  struct Compare {
-    bool operator()(const Task* a, const Task* b) {
-      return a->startTime > b->startTime;
-    }
-  };
-};
-
-class DelayedTaskQueue {
- public:
-  ~DelayedTaskQueue() {
-    while (!queue_.empty()) {
-      delete queue_.top();
-      queue_.pop();
-    }
-  }
-
-  void process() {
-    while (!queue_.empty()) {
-      Task* d = queue_.top();
-      if (now() < d->startTime) {
-        break;
-      }
-      auto owned = std::unique_ptr<Task>(queue_.top());
-      queue_.pop();
-      owned->func();
-    }
-  }
-
-  void push(Task* t) {
-    queue_.push(t);
-  }
-
-  bool empty() {
-    return queue_.empty();
-  }
-
-  time_point nextTime() {
-    return queue_.top()->startTime;
-  }
- private:
-  std::priority_queue<Task*, std::vector<Task*>, Task::Compare> queue_;
-};
-
-}
-
-class CxxMessageQueue::QueueRunner {
- public:
-  ~QueueRunner() {
-    queue_.sweep([] (Task* t) {
-        delete t;
-      });
-  }
-
-  void enqueue(std::function<void()>&& func) {
-    enqueueTask(Task::create(std::move(func)));
-  }
-
-  void enqueueDelayed(std::function<void()>&& func, uint64_t delayMs) {
-    if (delayMs) {
-      enqueueTask(Task::createDelayed(std::move(func), now() + std::chrono::milliseconds(delayMs)));
-    } else {
-      enqueue(std::move(func));
-    }
-  }
-
-  void enqueueSync(std::function<void()>&& func) {
-    EventFlag done;
-    enqueueTask(Task::createSync([&] () mutable {
-        func();
-        done.set();
-      }));
-    if (stopped_) {
-      // If this queue is stopped_, the sync task might never actually run.
-      throw std::runtime_error("Stopped within enqueueSync.");
-    }
-    done.wait();
-  }
-
-  void stop() {
-    stopped_ = true;
-    pending_.set();
-  }
-
-  bool isStopped() {
-    return stopped_;
-  }
-
-  void quitSynchronous() {
-    stop();
-    finished_.wait();
-  }
-
-  void run() {
-    // If another thread stops this one, then the acquire-release on pending_
-    // ensures that we read stopped some time after it was set (and other
-    // threads just have to deal with the fact that we might run a task "after"
-    // they stop us).
-    //
-    // If we are stopped on this thread, then memory order doesn't really
-    // matter reading stopped_.
-    while (!stopped_.load(std::memory_order_relaxed)) {
-      sweep();
-      if (delayed_.empty()) {
-        pending_.wait();
-      } else {
-        pending_.wait_until(delayed_.nextTime());
-      }
-    }
-    // This sweep is just to catch erroneous enqueueSync. That is, there could
-    // be a task marked sync that another thread is waiting for, but we'll
-    // never actually run it.
-    sweep();
-    finished_.set();
-  }
-
-  // We are processing two queues, the posted tasks (queue_) and the delayed
-  // tasks (delayed_). Delayed tasks first go into posted tasks, and then are
-  // moved to the delayed queue if we pop them before the time they are
-  // scheduled for.
-  // As we pop things from queue_, before dealing with that thing, we run any
-  // delayed tasks whose scheduled time has arrived.
-  void sweep() {
-    queue_.sweep([this] (Task* t) {
-        std::unique_ptr<Task> owned(t);
-        if (stopped_.load(std::memory_order_relaxed)) {
-          if (t->sync) {
-            throw std::runtime_error("Sync task posted while stopped.");
-          }
-          return;
-        }
-
-        delayed_.process();
-        if (t->startTime != time_point() && now() <= t->startTime) {
-          delayed_.push(owned.release());
-        } else {
-          t->func();
-        }
-    });
-    delayed_.process();
-  }
-
-  void bindToThisThread() {
-    // TODO: handle nested runloops (either allow them or throw an exception).
-    if (tid_ != std::thread::id{}) {
-      throw std::runtime_error("Message queue already bound to thread.");
-    }
-    tid_ = std::this_thread::get_id();
-  }
-
-  bool isOnQueue() {
-    return std::this_thread::get_id() == tid_;
-  }
-
- private:
-  void enqueueTask(Task* task) {
-    if (queue_.insertHead(task)) {
-      pending_.set();
-    }
-  }
-
-  std::thread::id tid_;
-
-  folly::AtomicIntrusiveLinkedList<Task, &Task::hook> queue_;
-
-  std::atomic_bool stopped_{false};
-  DelayedTaskQueue delayed_;
-
-  BinarySemaphore pending_;
-  EventFlag finished_;
-};
-
-
-CxxMessageQueue::CxxMessageQueue() : qr_(new QueueRunner()) {
-
-}
-
-CxxMessageQueue::~CxxMessageQueue() {
-  // TODO(cjhopman): Add detach() so that the queue doesn't have to be
-  // explicitly stopped.
-  if (!qr_->isStopped()) {
-    LOG(FATAL) << "Queue not stopped.";
-  }
-}
-
-void CxxMessageQueue::runOnQueue(std::function<void()>&& func) {
-  qr_->enqueue(std::move(func));
-}
-
-void CxxMessageQueue::runOnQueueDelayed(std::function<void()>&& func, uint64_t delayMs) {
-  qr_->enqueueDelayed(std::move(func), delayMs);
-}
-
-void CxxMessageQueue::runOnQueueSync(std::function<void()>&& func) {
-  if (isOnQueue()) {
-    func();
-    return;
-  }
-  qr_->enqueueSync(std::move(func));
-}
-
-void CxxMessageQueue::quitSynchronous() {
-  if (isOnQueue()) {
-    qr_->stop();
-  } else {
-    qr_->quitSynchronous();
-  }
-}
-
-bool CxxMessageQueue::isOnQueue() {
-  return qr_->isOnQueue();
-}
-
-namespace {
-struct MQRegistry {
-  std::weak_ptr<CxxMessageQueue> find(std::thread::id tid) {
-    std::lock_guard<std::mutex> g(lock_);
-    auto iter = registry_.find(tid);
-    if (iter == registry_.end()) return std::weak_ptr<CxxMessageQueue>();
-    return iter->second;
-  }
-
-  void registerQueue(std::thread::id tid, std::weak_ptr<CxxMessageQueue> mq) {
-    std::lock_guard<std::mutex> g(lock_);
-    registry_[tid] = mq;
-  }
-
-  void unregister(std::thread::id tid) {
-    std::lock_guard<std::mutex> g(lock_);
-    registry_.erase(tid);
-  }
- private:
-  std::mutex lock_;
-  std::unordered_map<std::thread::id, std::weak_ptr<CxxMessageQueue>> registry_;
-};
-
-MQRegistry& getMQRegistry() {
-  static MQRegistry* mq_registry = new MQRegistry();
-  return *mq_registry;
-}
-}
-
-std::shared_ptr<CxxMessageQueue> CxxMessageQueue::current() {
-  auto tid = std::this_thread::get_id();
-  return getMQRegistry().find(tid).lock();
-}
-
-std::function<void()> CxxMessageQueue::getUnregisteredRunLoop() {
-  return [capture=qr_] {
-    capture->bindToThisThread();
-    capture->run();
-  };
-}
-
-std::function<void()> CxxMessageQueue::getRunLoop(std::shared_ptr<CxxMessageQueue> mq) {
-  return [capture=mq->qr_, weakMq=std::weak_ptr<CxxMessageQueue>(mq)] {
-    capture->bindToThisThread();
-    auto tid = std::this_thread::get_id();
-
-    getMQRegistry().registerQueue(tid, weakMq);
-    capture->run();
-    getMQRegistry().unregister(tid);
-  };
-}
-
-
-
-}  // namespace react
-}  // namespace facebook
diff --git a/ReactCommon/cxxreact/CxxMessageQueue.h b/ReactCommon/cxxreact/CxxMessageQueue.h
deleted file mode 100644
index 626d058993a8b2..00000000000000
--- a/ReactCommon/cxxreact/CxxMessageQueue.h
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#pragma once
-
-#include <atomic>
-#include <chrono>
-#include <functional>
-#include <memory>
-#include <mutex>
-#include <thread>
-
-#include <cxxreact/MessageQueueThread.h>
-
-namespace facebook {
-namespace react {
-
-namespace detail {
-template<bool clearOnWait>
-class CVFlag {
- public:
-  using time_point = std::chrono::steady_clock::time_point;
-  void set() {
-    std::lock_guard<std::mutex> lk(mtx_);
-    flag_ = true;
-    cv_.notify_one();
-  }
-
-  void wait() {
-    std::unique_lock<std::mutex> lk(mtx_);
-    cv_.wait(lk, [this] { return flag_; });
-    if (clearOnWait) flag_ = false;
-  }
-
-  bool wait_until(time_point d) {
-    std::unique_lock<std::mutex> lk(mtx_);
-    bool res = cv_.wait_until(lk, d, [this] { return flag_; });
-    if (clearOnWait && res) flag_ = false;
-    return res;
-  }
-
- private:
-  bool flag_{false};
-  std::condition_variable cv_;
-  std::mutex mtx_;
-};
-
-using BinarySemaphore = CVFlag<true>;
-using EventFlag = CVFlag<false>;
-}
-
-class CxxMessageQueue : public MessageQueueThread {
- public:
-  CxxMessageQueue();
-  virtual ~CxxMessageQueue() override;
-  virtual void runOnQueue(std::function<void()>&&) override;
-  void runOnQueueDelayed(std::function<void()>&&, uint64_t delayMs);
-  // runOnQueueSync and quitSynchronous are dangerous.  They should only be
-  // used for initialization and cleanup.
-  virtual void runOnQueueSync(std::function<void()>&&) override;
-  // Once quitSynchronous() returns, no further work should run on the queue.
-  virtual void quitSynchronous() override;
-
-  bool isOnQueue();
-
-  // If this getRunLoop is used, current() will not work.
-  std::function<void()> getUnregisteredRunLoop();
-
-  // This returns a function that will actually run the runloop.
-  // This runloop will return some time after quitSynchronous (or after this is destroyed).
-  //
-  // When running the runloop, it is important to ensure that no frames in the
-  // current stack have a strong reference to the queue.
-  //
-  // Only one thread should run the runloop.
-  static std::function<void()> getRunLoop(std::shared_ptr<CxxMessageQueue> mq);
-
-  static std::shared_ptr<CxxMessageQueue> current();
- private:
-  class QueueRunner;
-  std::shared_ptr<QueueRunner> qr_;
-};
-
-}}
diff --git a/ReactCommon/cxxreact/Instance.cpp b/ReactCommon/cxxreact/Instance.cpp
index 4188fe5720ea02..5b80fa5df9010a 100644
--- a/ReactCommon/cxxreact/Instance.cpp
+++ b/ReactCommon/cxxreact/Instance.cpp
@@ -2,7 +2,6 @@
 
 #include "Instance.h"
 
-#include "CxxMessageQueue.h"
 #include "Executor.h"
 #include "MethodCall.h"
 #include "RecoverableError.h"
diff --git a/ReactCommon/cxxreact/tests/BUCK b/ReactCommon/cxxreact/tests/BUCK
index f181d7474a9153..f8f29de4247357 100644
--- a/ReactCommon/cxxreact/tests/BUCK
+++ b/ReactCommon/cxxreact/tests/BUCK
@@ -1,5 +1,4 @@
 TEST_SRCS = [
-    "CxxMessageQueueTest.cpp",
     "RecoverableErrorTest.cpp",
     "jsarg_helpers.cpp",
     "jsbigstring.cpp",
diff --git a/ReactCommon/cxxreact/tests/CxxMessageQueueTest.cpp b/ReactCommon/cxxreact/tests/CxxMessageQueueTest.cpp
deleted file mode 100644
index f0949cb4043cb7..00000000000000
--- a/ReactCommon/cxxreact/tests/CxxMessageQueueTest.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-#include <gtest/gtest.h>
-
-#include <cxxreact/CxxMessageQueue.h>
-
-#include <mutex>
-#include <condition_variable>
-
-using namespace facebook::react;
-using detail::EventFlag;
-using time_point = EventFlag::time_point;
-
-using std::chrono::milliseconds;
-
-namespace {
-time_point now() {
-  return std::chrono::steady_clock::now();
-}
-
-std::shared_ptr<CxxMessageQueue> createAndStartQueue(EventFlag& finishedFlag) {
-  auto q = std::make_shared<CxxMessageQueue>();
-  std::thread t([q, &finishedFlag] () mutable {
-      auto loop = CxxMessageQueue::getRunLoop(q);
-      // Note: make sure that no stack frames above loop() have a strong reference to q.
-      q.reset();
-      loop();
-      finishedFlag.set();
-    });
-  t.detach();
-  return q;
-}
-
-std::unique_ptr<CxxMessageQueue> createAndStartUnregisteredQueue(
-    EventFlag& finishedFlag) {
-  auto q = std::make_unique<CxxMessageQueue>();
-  std::thread t([loop=q->getUnregisteredRunLoop(), &finishedFlag] {
-      loop();
-      finishedFlag.set();
-    });
-  t.detach();
-  return q;
-}
-
-// This is just used to start up a queue for a test and make sure that it is
-// actually shut down after the test.
-struct QueueWithThread {
-  QueueWithThread() {
-    queue = createAndStartQueue(done);
-  }
-
-  ~QueueWithThread() {
-    queue->quitSynchronous();
-    queue.reset();
-    EXPECT_TRUE(done.wait_until(now() + milliseconds(300))) << "Queue did not exit";
-  }
-
-  EventFlag done;
-  std::shared_ptr<CxxMessageQueue> queue;
-};
-}
-
-TEST(CxxMessageQueue, TestQuit) {
-  EventFlag done;
-  auto q = createAndStartQueue(done);
-  q->quitSynchronous();
-  EXPECT_TRUE(done.wait_until(now() + milliseconds(300)))
-    << "Queue did not exit runloop after quitSynchronous";
-}
-
-TEST(CxxMessageQueue, TestPostTask) {
-  QueueWithThread qt;
-  auto q = qt.queue;
-
-  EventFlag flag;
-  q->runOnQueue([&] {
-      flag.set();
-    });
-  flag.wait();
-}
-
-TEST(CxxMessageQueue, TestPostUnregistered) {
-  EventFlag qdone;
-  auto q = createAndStartUnregisteredQueue(qdone);
-
-  EventFlag tflag;
-  q->runOnQueue([&] {
-      tflag.set();
-    });
-  tflag.wait();
-
-  q->quitSynchronous();
-  q.reset();
-  EXPECT_TRUE(qdone.wait_until(now() + milliseconds(300))) << "Queue did not exit";
-}
-
-TEST(CxxMessageQueue, TestPostCurrent) {
-  QueueWithThread qt;
-  auto q = qt.queue;
-
-  EventFlag flag;
-  q->runOnQueue([&] {
-      CxxMessageQueue::current()->runOnQueue([&] {
-          flag.set();
-        });
-    });
-  flag.wait();
-}
-
-TEST(CxxMessageQueue, TestPostTaskMultiple) {
-  QueueWithThread qt;
-  auto q = qt.queue;
-
-  std::vector<EventFlag> vec(10);
-  for (int i = 0; i < 10; i++) {
-    q->runOnQueue([&, i] {
-        vec[i].set();
-      });
-  }
-  for (int i = 0; i < 10; i++) {
-    vec[i].wait();
-  }
-}
-
-TEST(CxxMessageQueue, TestQueuedTaskOrdering) {
-  QueueWithThread qt;
-  auto q = qt.queue;
-
-  // Block the runloop so we can get some queued tasks.
-  EventFlag wait;
-  q->runOnQueue([&] {
-      wait.wait();
-    });
-
-  // These tasks should run in order.
-  int failed = -1;
-  int i = 0;
-  for (int j = 0; j < 10; j++) {
-    q->runOnQueue([&, j] {
-        if (i != j) {
-          failed = j;
-        }
-        i++;
-      });
-  }
-  wait.set();
-
-  // Flush the queue.
-  q->runOnQueueSync([&] {});
-
-  ASSERT_EQ(failed, -1);
-  ASSERT_EQ(i, 10);
-}
-
-TEST(CxxMessageQueue, TestDelayedTaskOrdering) {
-  QueueWithThread qt;
-  auto q = qt.queue;
-
-  // Block the runloop so we can get some queued tasks.
-  EventFlag wait;
-  q->runOnQueue([&] {
-      wait.wait();
-    });
-
-  int ids[] = {8, 4, 6, 1, 3, 2, 9, 5, 0, 7};
-
-  int failed = -1;
-  int i = 0;
-  EventFlag done;
-  // If this loop actually takes longer than the difference between delays, the
-  // ordering could get screwed up :/
-  for (int j = 0; j < 10; j++) {
-    q->runOnQueueDelayed([&, j] {
-        if (i != ids[j]) {
-          failed = j;
-        }
-        i++;
-        if (ids[j] == 9) {
-          done.set();
-        }
-      }, 50 + 10 * ids[j]);
-  }
-  wait.set();
-  done.wait();
-
-  ASSERT_EQ(failed, -1);
-  ASSERT_EQ(i, 10);
-}

From 1433185a092f70047cc8ef3f90a953a32d756326 Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Tue, 21 Mar 2017 12:53:48 -0700
Subject: [PATCH 122/366] Improved implementation of placeholer feature in
 RCTUITextView

Reviewed By: fkgozali

Differential Revision: D4746177

fbshipit-source-id: a8c27ec052b046d4732b14ed081dcaebb44bdaa7
---
 Libraries/Text/RCTUITextView.m | 32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/Libraries/Text/RCTUITextView.m b/Libraries/Text/RCTUITextView.m
index 24302f823ed89a..67ae7e5798ba2f 100644
--- a/Libraries/Text/RCTUITextView.m
+++ b/Libraries/Text/RCTUITextView.m
@@ -36,7 +36,6 @@ - (instancetype)initWithFrame:(CGRect)frame
                                                object:self];
 
     _placeholderView = [[UILabel alloc] initWithFrame:self.bounds];
-    _placeholderView.hidden = YES;
     _placeholderView.isAccessibilityElement = NO;
     _placeholderView.numberOfLines = 0;
     [self addSubview:_placeholderView];
@@ -55,20 +54,19 @@ - (void)dealloc
 - (void)setPlaceholderText:(NSString *)placeholderText
 {
   _placeholderText = placeholderText;
-  [self invalidatePlaceholder];
+  _placeholderView.text = _placeholderText;
 }
 
 - (void)setPlaceholderTextColor:(UIColor *)placeholderTextColor
 {
   _placeholderTextColor = placeholderTextColor;
-  [self invalidatePlaceholder];
+  _placeholderView.textColor = _placeholderTextColor ?: defaultPlaceholderTextColor();
 }
 
-
 - (void)textDidChange
 {
   _textWasPasted = NO;
-  [self invalidatePlaceholder];
+  [self invalidatePlaceholderVisibility];
 }
 
 #pragma mark - UIResponder
@@ -101,7 +99,13 @@ - (void)didMoveToWindow
 - (void)setFont:(UIFont *)font
 {
   [super setFont:font];
-  [self invalidatePlaceholder];
+  _placeholderView.font = font ?: defaultPlaceholderFont();
+}
+
+- (void)setTextAlignment:(NSTextAlignment)textAlignment
+{
+  [super setTextAlignment:textAlignment];
+  _placeholderView.textAlignment = textAlignment;
 }
 
 - (void)setText:(NSString *)text
@@ -168,22 +172,10 @@ - (CGSize)sizeThatFits:(CGSize)size
 
 #pragma mark - Placeholder
 
-- (void)invalidatePlaceholder
+- (void)invalidatePlaceholderVisibility
 {
-  BOOL wasVisible = !_placeholderView.isHidden;
   BOOL isVisible = _placeholderText.length != 0 && self.text.length == 0;
-
-  if (wasVisible != isVisible) {
-    _placeholderView.hidden = !isVisible;
-  }
-
-  if (isVisible) {
-    _placeholderView.font = self.font ?: defaultPlaceholderFont();
-    _placeholderView.textColor = _placeholderTextColor ?: defaultPlaceholderTextColor();
-    _placeholderView.textAlignment = self.textAlignment;
-    _placeholderView.text = _placeholderText;
-    [self setNeedsLayout];
-  }
+  _placeholderView.hidden = !isVisible;
 }
 
 @end

From ee245b9be8e05b6e2a37b2771bd1b2d9e00ad16d Mon Sep 17 00:00:00 2001
From: "Andrew Y. Chen" <ayc@fb.com>
Date: Tue, 21 Mar 2017 14:45:37 -0700
Subject: [PATCH 123/366] Fix instrumentation tests for api 22

Summary:
Bug in Android https://code.google.com/p/android/issues/detail?id=33868 causes the RN catalyst instrumentation test to fail with

```
java.lang.ArrayIndexOutOfBoundsException: length=253; index=-1
	at android.text.StaticLayout.calculateEllipsis(StaticLayout.java:667)
	at android.text.StaticLayout.out(StaticLayout.java:631)
	at android.text.StaticLayout.generate(StaticLayout.java:423)
	...
```

The fix is to set singleLine to true when there is only one line of text

Reviewed By: AaaChiuuu

Differential Revision: D4562000

fbshipit-source-id: 84248e3982063b767e8b0465effe2321b54a7fa2
---
 .../main/java/com/facebook/react/views/text/ReactTextView.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java
index 3d5d9668bd8106..fa8f87710b1b8f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java
@@ -231,6 +231,7 @@ public void setBackgroundColor(int color) {
 
   public void setNumberOfLines(int numberOfLines) {
     mNumberOfLines = numberOfLines == 0 ? ViewDefaults.NUMBER_OF_LINES : numberOfLines;
+    setSingleLine(mNumberOfLines == 1);
     setMaxLines(mNumberOfLines);
   }
 

From a0304327a9c1989b49ac4c106d824e2b31a6cc16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <hramos@users.noreply.github.com>
Date: Tue, 21 Mar 2017 15:13:04 -0700
Subject: [PATCH 124/366] Remove Navigator recommendation

Summary:
We recommend using `react-navigation` over `Navigator`. Adds a link to the new `native-navigation` component as well.

Did not test website generation, this is a comments only edit that should work fine.
Closes https://github.com/facebook/react-native/pull/12963

Differential Revision: D4749072

Pulled By: hramos

fbshipit-source-id: 4506630306c44b24b95c4f5d5a42c1caa9e2cd4e
---
 Libraries/Components/Navigation/NavigatorIOS.ios.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Libraries/Components/Navigation/NavigatorIOS.ios.js b/Libraries/Components/Navigation/NavigatorIOS.ios.js
index 90a6c37e9820c1..10c18e0c507767 100644
--- a/Libraries/Components/Navigation/NavigatorIOS.ios.js
+++ b/Libraries/Components/Navigation/NavigatorIOS.ios.js
@@ -133,10 +133,10 @@ type Event = Object;
  * animations and behavior from UIKIt.
  *
  * As the name implies, it is only available on iOS. Take a look at
- * [`Navigator`](docs/navigator.html) for a similar solution for your
- * cross-platform needs, or check out
- * [react-native-navigation](https://github.com/wix/react-native-navigation), a
- * component that aims to provide native navigation on both iOS and Android.
+ * [`React Navigation`](https://reactnavigation.org/) for a cross-platform 
+ * solution in JavaScript, or check out either of these components for native
+ * solutions: [native-navigation](http://airbnb.io/native-navigation/),
+ * [react-native-navigation](https://github.com/wix/react-native-navigation).
  *
  * To set up the navigator, provide the `initialRoute` prop with a route
  * object. A route object is used to describe each scene that your app

From 68c655a2fdabcd053f7dbf92dcbe70d1f45a40c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <hramos@users.noreply.github.com>
Date: Tue, 21 Mar 2017 15:40:04 -0700
Subject: [PATCH 125/366] Update ISSUE_TEMPLATE.md

Summary:
Some quick copy changes.
Closes https://github.com/facebook/react-native/pull/13061

Differential Revision: D4749511

Pulled By: hramos

fbshipit-source-id: 5b6f67be40ed071367507ac3c87f7ac67a0584e7
---
 .github/ISSUE_TEMPLATE.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 7acc05e46e1629..dcb01c326bed0e 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -15,7 +15,7 @@ Your issue may be closed without explanation if it does not provide the informat
 
 ### Reproduction
 
-[FILL THIS OUT: Try to reproduce your bug on https://sketch.expo.io/ and provide a link. If you can't reproduce the bug on Sketch, provide a sample project.]
+[FILL THIS OUT: Try to reproduce your bug on https://sketch.expo.io/ and provide a link. If you can't reproduce the bug on Sketch, provide a sample project. At the very least, provide an example of your code.]
 
 ### Solution
 
@@ -23,7 +23,7 @@ Your issue may be closed without explanation if it does not provide the informat
 
 ### Additional Information
 
-* React Native version: [FILL THIS OUT: Does the bug reproduce on the latest RN release?]
+* React Native version: [FILL THIS OUT: Be specific, filling out "latest" here is not enough.]
 * Platform: [FILL THIS OUT: iOS, Android, or both?]
-* Operating System: [FILL THIS OUT: MacOS, Linux, or Windows?]
+* Development Operating System: [FILL THIS OUT: Are you developing on MacOS, Linux, or Windows?]
 * Dev tools: [FILL THIS OUT: Xcode or Android Studio version, iOS or Android SDK version, if applicable]

From ba75d9903368e90b5c7a9b61e222609b5ac9acb7 Mon Sep 17 00:00:00 2001
From: Aaron Chiu <aaronechiu@fb.com>
Date: Tue, 21 Mar 2017 16:01:44 -0700
Subject: [PATCH 126/366] don't call clearFrameCallback() if we don't have a
 ReactChoreographer to clear the frame callback on

Reviewed By: achen1

Differential Revision: D4741906

fbshipit-source-id: 2d5fabab6e04c08252513f77149c04e3b8314d2c
---
 .../facebook/react/animated/NativeAnimatedModule.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java
index c16e2acd0bcbda..d4fd0680ff5147 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java
@@ -13,6 +13,7 @@
 
 import java.util.ArrayList;
 
+import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Callback;
@@ -70,10 +71,12 @@
  * isolates us from the problems that may be caused by concurrent updates of animated graph while UI
  * thread is "executing" the animation loop.
  */
-@ReactModule(name = "NativeAnimatedModule")
+@ReactModule(name = NativeAnimatedModule.NAME)
 public class NativeAnimatedModule extends ReactContextBaseJavaModule implements
     OnBatchCompleteListener, LifecycleEventListener {
 
+  protected static final String NAME = "NativeAnimatedModule";
+
   private interface UIThreadOperation {
     void execute(NativeAnimatedNodesManager animatedNodesManager);
   }
@@ -159,6 +162,10 @@ public void onBatchComplete() {
 
   @Override
   public void onHostPause() {
+    if (mReactChoreographer == null) {
+      FLog.e(NAME, "Called NativeAnimated.onHostPause() with a null ReactChoreographer.");
+      return;
+    }
     clearFrameCallback();
   }
 
@@ -169,7 +176,7 @@ public void onHostDestroy() {
 
   @Override
   public String getName() {
-    return "NativeAnimatedModule";
+    return NAME;
   }
 
   private void clearFrameCallback() {

From c41b29d6de8241e5b9269034ece30d5c8803c938 Mon Sep 17 00:00:00 2001
From: Jeremi Stadler <stadler.jeremi@gmail.com>
Date: Tue, 21 Mar 2017 16:21:46 -0700
Subject: [PATCH 127/366] Fixes missleading comment on getInitialURL

Summary:
The returned value from Linking.getInitialURL is a promise that returns an url.

Can be seen here: https://github.com/facebook/react-native/blob/f126540519bd276c0048aa77b543dc863412de46/Libraries/Linking/Linking.js#L175
Closes https://github.com/facebook/react-native/pull/12851

Differential Revision: D4716084

Pulled By: hramos

fbshipit-source-id: 309881cfb423a5c9a3f9010ae7ca226b63c91599
---
 Libraries/Linking/Linking.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Libraries/Linking/Linking.js b/Libraries/Linking/Linking.js
index 1902bfb2a793ef..0f50b15bd5ee19 100644
--- a/Libraries/Linking/Linking.js
+++ b/Libraries/Linking/Linking.js
@@ -33,7 +33,7 @@ const LinkingManager = Platform.OS === 'android' ?
  *
  * ```
  * componentDidMount() {
- *   var url = Linking.getInitialURL().then((url) => {
+ *   Linking.getInitialURL().then((url) => {
  *     if (url) {
  *       console.log('Initial url is: ' + url);
  *     }

From d9ac00735c7670eb41e46c6effdb3ae4a91e5ec0 Mon Sep 17 00:00:00 2001
From: Marc Horowitz <mhorowitz@fb.com>
Date: Tue, 21 Mar 2017 18:24:58 -0700
Subject: [PATCH 128/366] Make the choice of bridge based on an optional
 delegate method

Reviewed By: javache

Differential Revision: D4679644

fbshipit-source-id: f53e554e283fdb0b59c41623e690fd1a21e03a57
---
 React/Base/RCTBridge.m          | 26 ++++++++++++++++-
 React/Base/RCTBridgeDelegate.h  | 14 ++++++++++
 React/CxxBridge/RCTCxxBridge.h  | 17 ------------
 React/CxxBridge/RCTCxxBridge.mm | 49 ++-------------------------------
 4 files changed, 42 insertions(+), 64 deletions(-)
 delete mode 100644 React/CxxBridge/RCTCxxBridge.h

diff --git a/React/Base/RCTBridge.m b/React/Base/RCTBridge.m
index 5fa260caf6fd4a..0fe05ca8bb4ae1 100644
--- a/React/Base/RCTBridge.m
+++ b/React/Base/RCTBridge.m
@@ -302,7 +302,31 @@ - (void)setUp
 
 - (void)createBatchedBridge
 {
-  self.batchedBridge = [[RCTBatchedBridge alloc] initWithParentBridge:self];
+  // In order to facilitate switching between bridges with only build
+  // file changes, this uses reflection to check which bridges are
+  // available.  This is a short-term hack until RCTBatchedBridge is
+  // removed.
+
+  Class batchedBridgeClass = objc_lookUpClass("RCTBatchedBridge");
+  Class cxxBridgeClass = objc_lookUpClass("RCTCxxBridge");
+
+  Class implClass = nil;
+
+  if ([self.delegate respondsToSelector:@selector(shouldBridgeUseCxxBridge:)]) {
+    if ([self.delegate shouldBridgeUseCxxBridge:self]) {
+      implClass = cxxBridgeClass;
+    } else {
+      implClass = batchedBridgeClass;
+    }
+  } else if (batchedBridgeClass != nil) {
+    implClass = batchedBridgeClass;
+  } else if (cxxBridgeClass != nil) {
+    implClass = cxxBridgeClass;
+  }
+
+  RCTAssert(implClass != nil, @"No bridge implementation is available, giving up.");
+
+  self.batchedBridge = [[implClass alloc] initWithParentBridge:self];
 }
 
 - (BOOL)isLoading
diff --git a/React/Base/RCTBridgeDelegate.h b/React/Base/RCTBridgeDelegate.h
index 343a2275dcf069..7639339858ca55 100644
--- a/React/Base/RCTBridgeDelegate.h
+++ b/React/Base/RCTBridgeDelegate.h
@@ -91,6 +91,20 @@
  */
 - (BOOL)shouldBridgeUseCustomJSC:(RCTBridge *)bridge;
 
+/**
+ * Configure whether the legacy RCTBatchedBridge or new RCTCxxBridge
+ * should be used.  If this method is implemented and the specified
+ * bridge is not linked in, startup will fail.  If this method is not
+ * implemented, the implementation will default to RCTBatchedBridge,
+ * but if it is not linked in, will try RCTCxxBridge instead.  If
+ * neither bridge is linked in, startup will fail.  This order will be
+ * reversed in the near future, as the legacy bridge is closer to
+ * being removed.
+ *
+ * @experimental
+ */
+- (BOOL)shouldBridgeUseCxxBridge:(RCTBridge *)bridge;
+
 /**
  * The bridge will automatically attempt to load the JS source code from the
  * location specified by the `sourceURLForBridge:` method, however, if you want
diff --git a/React/CxxBridge/RCTCxxBridge.h b/React/CxxBridge/RCTCxxBridge.h
deleted file mode 100644
index 89ac4d01e0ce31..00000000000000
--- a/React/CxxBridge/RCTCxxBridge.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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.
- */
-
-#import <React/RCTBridge.h>
-
-@interface RCTCxxBridge : RCTBridge
-
-+ (void)enable;
-+ (void)disable;
-
-@end
diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm
index e48906af72e4b9..ee84db6be1adf5 100644
--- a/React/CxxBridge/RCTCxxBridge.mm
+++ b/React/CxxBridge/RCTCxxBridge.mm
@@ -9,8 +9,6 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#include "RCTCxxBridge.h"
-
 #include <atomic>
 #include <future>
 #include <libkern/OSAtomic.h>
@@ -48,6 +46,9 @@
 #import <React/RCTFBSystrace.h>
 #endif
 
+@interface RCTCxxBridge : RCTBridge
+@end
+
 #define RCTAssertJSThread() \
   RCTAssert(self.executorClass || self->_jsThread == [NSThread currentThread], \
             @"This method must be called on JS thread")
@@ -92,8 +93,6 @@ static bool isRAMBundle(NSData *script) {
   return parseTypeFromHeader(header) == ScriptTag::RAMBundle;
 }
 
-static std::atomic_bool cxxBridgeEnabled(false);
-
 @interface RCTCxxBridge ()
 
 @property (nonatomic, weak, readonly) RCTBridge *parentBridge;
@@ -121,19 +120,6 @@ ExecutorToken createExecutorToken() override {
   void onExecutorStopped(ExecutorToken) override {}
 };
 
-@implementation RCTBridge (CxxBridge)
-
-- (void)CXX_createBatchedBridge
-{
-  if (cxxBridgeEnabled) {
-    self.batchedBridge = [[RCTCxxBridge alloc] initWithParentBridge:self];
-  } else {
-    self.batchedBridge = [[RCTBatchedBridge alloc] initWithParentBridge:self];
-  }
-}
-
-@end
-
 @implementation RCTCxxBridge
 {
   BOOL _wasBatchActive;
@@ -172,35 +158,6 @@ + (void)initialize
   }
 }
 
-+ (void)swizzleBridge
-{
-  // Swizzle RCTBridge to use this, instead of RCTBatchedBridge
-  static dispatch_once_t once;
-  dispatch_once(&once, ^{
-    RCTSwapInstanceMethods([RCTBridge class],
-                           NSSelectorFromString(@"createBatchedBridge"),
-                           @selector(CXX_createBatchedBridge));
-  });
-}
-
-+ (void)enable
-{
-  [RCTCxxBridge swizzleBridge];
-#ifdef WITH_FBSYSTRACE
-  [RCTFBSystrace registerCallbacks];
-#endif
-  cxxBridgeEnabled = true;
-}
-
-+ (void)disable
-{
-  [RCTCxxBridge swizzleBridge];
-#ifdef WITH_FBSYSTRACE
-  [RCTFBSystrace unregisterCallbacks];
-#endif
-  cxxBridgeEnabled = false;
-}
-
 - (JSContext *)jsContext
 {
   return contextForGlobalContextRef((JSGlobalContextRef) self->_reactInstance->getJavaScriptContext());

From ba149d72772111758b12b76db56c60dea5b1ef26 Mon Sep 17 00:00:00 2001
From: Marc Horowitz <mhorowitz@fb.com>
Date: Tue, 21 Mar 2017 18:25:00 -0700
Subject: [PATCH 129/366] Tease apart React and RCTBatchedBridge targets

Reviewed By: javache

Differential Revision: D4679655

fbshipit-source-id: 8123488c2d50dd7cc2329b5131e99998fe1f1e2f
---
 Examples/UIExplorer/UIExplorer/maincxx.m      |  28 ---
 .../UIExplorerCxx.xcodeproj/project.pbxproj   | 202 +++++++++---------
 .../xcschemes/UIExplorer.xcscheme             |  31 +++
 Libraries/RCTTest/RCTTestRunner.m             |  18 --
 React/Base/RCTBatchedBridge.m                 |   5 +-
 React/Base/RCTBridge.m                        |  62 +++---
 .../{Executors => Base}/RCTJSCErrorHandling.h |   0
 .../RCTJSCErrorHandling.mm                    |   0
 React/CxxBridge/RCTCxxBridge.mm               |  26 +--
 React/CxxBridge/RCTJSCHelpers.h               |  19 ++
 React/CxxBridge/RCTJSCHelpers.mm              |  52 +++++
 React/Executors/RCTJSCExecutor.mm             |  22 +-
 React/Profiler/RCTJSCProfiler.m               |   2 +-
 React/Profiler/RCTPerfMonitor.m               |   1 -
 React/Profiler/RCTProfile.m                   |   4 +-
 React/React.xcodeproj/project.pbxproj         |  24 +--
 React/ReactCxx.xcodeproj/project.pbxproj      | 127 ++++-------
 17 files changed, 309 insertions(+), 314 deletions(-)
 delete mode 100644 Examples/UIExplorer/UIExplorer/maincxx.m
 rename React/{Executors => Base}/RCTJSCErrorHandling.h (100%)
 rename React/{Executors => Base}/RCTJSCErrorHandling.mm (100%)
 create mode 100644 React/CxxBridge/RCTJSCHelpers.h
 create mode 100644 React/CxxBridge/RCTJSCHelpers.mm

diff --git a/Examples/UIExplorer/UIExplorer/maincxx.m b/Examples/UIExplorer/UIExplorer/maincxx.m
deleted file mode 100644
index 8a294046c659d6..00000000000000
--- a/Examples/UIExplorer/UIExplorer/maincxx.m
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-/**
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <UIKit/UIKit.h>
-
-#import <React/RCTCxxBridge.h>
-
-#import "AppDelegate.h"
-
-int main(int argc, char * argv[]) {
-  @autoreleasepool {
-    [RCTCxxBridge enable];
-    return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
-  }
-}
diff --git a/Examples/UIExplorer/UIExplorerCxx.xcodeproj/project.pbxproj b/Examples/UIExplorer/UIExplorerCxx.xcodeproj/project.pbxproj
index ad832206603f87..b56552e8c7331e 100644
--- a/Examples/UIExplorer/UIExplorerCxx.xcodeproj/project.pbxproj
+++ b/Examples/UIExplorer/UIExplorerCxx.xcodeproj/project.pbxproj
@@ -16,6 +16,7 @@
 		134454601AAFCABD003F0779 /* libRCTAdSupport.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1344545A1AAFCAAE003F0779 /* libRCTAdSupport.a */; };
 		134A8A2A1AACED7A00945AAE /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 134A8A251AACED6A00945AAE /* libRCTGeolocation.a */; };
 		134CB92A1C85A38800265FA6 /* RCTModuleInitTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 134CB9291C85A38800265FA6 /* RCTModuleInitTests.m */; };
+		1380DCD41E70C44800E7C47D /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1380DC991E70C0DD00E7C47D /* libReact.a */; };
 		138D6A181B53CD440074A87E /* RCTShadowViewTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 138D6A161B53CD440074A87E /* RCTShadowViewTests.m */; };
 		138DEE241B9EDFB6007F4EA5 /* libRCTCameraRoll.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 138DEE091B9EDDDB007F4EA5 /* libRCTCameraRoll.a */; };
 		1393D0381B68CD1300E1B601 /* RCTModuleMethodTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1393D0371B68CD1300E1B601 /* RCTModuleMethodTests.m */; };
@@ -23,10 +24,9 @@
 		13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
 		13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; };
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
+		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		13B6C1A31C34225900D3FAF5 /* RCTURLUtilsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B6C1A21C34225900D3FAF5 /* RCTURLUtilsTests.m */; };
 		13BCE84F1C9C209600DD7AAD /* RCTComponentPropsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 13BCE84E1C9C209600DD7AAD /* RCTComponentPropsTests.m */; };
-		13CF8FD11E2966FF0005310D /* maincxx.m in Sources */ = {isa = PBXBuildFile; fileRef = 13CF8FD01E2966FF0005310D /* maincxx.m */; };
-		13CF8FF31E2967D10005310D /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 13CF8FE01E2967C40005310D /* libReact.a */; };
 		13DB03481B5D2ED500C27245 /* RCTJSONTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 13DB03471B5D2ED500C27245 /* RCTJSONTests.m */; };
 		13DF61B61B67A45000EDB188 /* RCTMethodArgumentTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 13DF61B51B67A45000EDB188 /* RCTMethodArgumentTests.m */; };
 		13E501F11D07A84A005F35D8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 13E501A31D07A502005F35D8 /* libRCTAnimation.a */; };
@@ -90,6 +90,7 @@
 		2DD323DD1DA2DDBF000FE1B8 /* UpdatePropertiesExampleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 272E6B3C1BEA849E001FCF37 /* UpdatePropertiesExampleView.m */; };
 		2DD323DE1DA2DDBF000FE1B8 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
 		2DD323DF1DA2DDBF000FE1B8 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
+		2DD323E01DA2DDBF000FE1B8 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		2DD323E11DA2DDBF000FE1B8 /* legacy_image@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D2AFAF41D646CF80089D1A3 /* legacy_image@2x.png */; };
 		2DD323E21DA2DDBF000FE1B8 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB61A68108700A75B9A /* Info.plist */; };
 		2DD323E31DA2DE3F000FE1B8 /* libRCTAnimation-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD323B51DA2DD8B000FE1B8 /* libRCTAnimation-tvOS.a */; };
@@ -154,89 +155,89 @@
 			remoteGlobalIDString = 134814201AA4EA6300B7C361;
 			remoteInfo = RCTGeolocation;
 		};
-		138DEE081B9EDDDB007F4EA5 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 138DEE021B9EDDDB007F4EA5 /* RCTCameraRoll.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 58B5115D1A9E6B3D00147676;
-			remoteInfo = RCTImage;
-		};
-		139FDED81B0651EA00C62182 /* PBXContainerItemProxy */ = {
+		1380DC981E70C0DD00E7C47D /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 139FDECA1B0651EA00C62182 /* RCTWebSocket.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 3C86DF461ADF2C930047B81A;
-			remoteInfo = RCTWebSocket;
-		};
-		13CF8FDF1E2967C40005310D /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 13CF8FD21E2967C40005310D /* ReactCxx.xcodeproj */;
+			containerPortal = 1380DC8B1E70C0DC00E7C47D /* ReactCxx.xcodeproj */;
 			proxyType = 2;
 			remoteGlobalIDString = 83CBBA2E1A601D0E00E9B192;
-			remoteInfo = ReactCxx;
+			remoteInfo = React;
 		};
-		13CF8FE11E2967C40005310D /* PBXContainerItemProxy */ = {
+		1380DC9A1E70C0DD00E7C47D /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 13CF8FD21E2967C40005310D /* ReactCxx.xcodeproj */;
+			containerPortal = 1380DC8B1E70C0DC00E7C47D /* ReactCxx.xcodeproj */;
 			proxyType = 2;
 			remoteGlobalIDString = 2D2A28131D9B038B00D4039D;
-			remoteInfo = "ReactCxx-tvOS";
+			remoteInfo = "React-tvOS";
 		};
-		13CF8FE31E2967C40005310D /* PBXContainerItemProxy */ = {
+		1380DC9C1E70C0DD00E7C47D /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 13CF8FD21E2967C40005310D /* ReactCxx.xcodeproj */;
+			containerPortal = 1380DC8B1E70C0DC00E7C47D /* ReactCxx.xcodeproj */;
 			proxyType = 2;
 			remoteGlobalIDString = 3D3C059A1DE3340900C268FA;
 			remoteInfo = yoga;
 		};
-		13CF8FE51E2967C40005310D /* PBXContainerItemProxy */ = {
+		1380DC9E1E70C0DD00E7C47D /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 13CF8FD21E2967C40005310D /* ReactCxx.xcodeproj */;
+			containerPortal = 1380DC8B1E70C0DC00E7C47D /* ReactCxx.xcodeproj */;
 			proxyType = 2;
 			remoteGlobalIDString = 3D3C06751DE3340C00C268FA;
 			remoteInfo = "yoga-tvOS";
 		};
-		13CF8FE71E2967C40005310D /* PBXContainerItemProxy */ = {
+		1380DCA01E70C0DD00E7C47D /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 13CF8FD21E2967C40005310D /* ReactCxx.xcodeproj */;
+			containerPortal = 1380DC8B1E70C0DC00E7C47D /* ReactCxx.xcodeproj */;
 			proxyType = 2;
 			remoteGlobalIDString = 3D3CD9251DE5FBEC00167DC4;
 			remoteInfo = cxxreact;
 		};
-		13CF8FE91E2967C40005310D /* PBXContainerItemProxy */ = {
+		1380DCA21E70C0DD00E7C47D /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 13CF8FD21E2967C40005310D /* ReactCxx.xcodeproj */;
+			containerPortal = 1380DC8B1E70C0DC00E7C47D /* ReactCxx.xcodeproj */;
 			proxyType = 2;
 			remoteGlobalIDString = 3D3CD9321DE5FBEE00167DC4;
 			remoteInfo = "cxxreact-tvOS";
 		};
-		13CF8FEB1E2967C40005310D /* PBXContainerItemProxy */ = {
+		1380DCA41E70C0DD00E7C47D /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 13CF8FD21E2967C40005310D /* ReactCxx.xcodeproj */;
+			containerPortal = 1380DC8B1E70C0DC00E7C47D /* ReactCxx.xcodeproj */;
 			proxyType = 2;
 			remoteGlobalIDString = 3D3CD90B1DE5FBD600167DC4;
 			remoteInfo = jschelpers;
 		};
-		13CF8FED1E2967C40005310D /* PBXContainerItemProxy */ = {
+		1380DCA61E70C0DD00E7C47D /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 13CF8FD21E2967C40005310D /* ReactCxx.xcodeproj */;
+			containerPortal = 1380DC8B1E70C0DC00E7C47D /* ReactCxx.xcodeproj */;
 			proxyType = 2;
 			remoteGlobalIDString = 3D3CD9181DE5FBD800167DC4;
 			remoteInfo = "jschelpers-tvOS";
 		};
-		13CF8FEF1E2967C40005310D /* PBXContainerItemProxy */ = {
+		1380DCA81E70C0DD00E7C47D /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 1380DC8B1E70C0DC00E7C47D /* ReactCxx.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 139D7ECE1E25DB7D00323FB7;
+			remoteInfo = "third-party";
+		};
+		1380DCAA1E70C0DD00E7C47D /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 13CF8FD21E2967C40005310D /* ReactCxx.xcodeproj */;
+			containerPortal = 1380DC8B1E70C0DC00E7C47D /* ReactCxx.xcodeproj */;
 			proxyType = 2;
 			remoteGlobalIDString = 139D7E881E25C6D100323FB7;
 			remoteInfo = "double-conversion";
 		};
-		13CF8FF11E2967C40005310D /* PBXContainerItemProxy */ = {
+		138DEE081B9EDDDB007F4EA5 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 13CF8FD21E2967C40005310D /* ReactCxx.xcodeproj */;
+			containerPortal = 138DEE021B9EDDDB007F4EA5 /* RCTCameraRoll.xcodeproj */;
 			proxyType = 2;
-			remoteGlobalIDString = 139D7ECE1E25DB7D00323FB7;
-			remoteInfo = "third-party";
+			remoteGlobalIDString = 58B5115D1A9E6B3D00147676;
+			remoteInfo = RCTImage;
+		};
+		139FDED81B0651EA00C62182 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 139FDECA1B0651EA00C62182 /* RCTWebSocket.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 3C86DF461ADF2C930047B81A;
+			remoteInfo = RCTWebSocket;
 		};
 		13E501A21D07A502005F35D8 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
@@ -391,6 +392,7 @@
 		134454551AAFCAAE003F0779 /* RCTAdSupport.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAdSupport.xcodeproj; path = ../../Libraries/AdSupport/RCTAdSupport.xcodeproj; sourceTree = "<group>"; };
 		134A8A201AACED6A00945AAE /* RCTGeolocation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTGeolocation.xcodeproj; path = ../../Libraries/Geolocation/RCTGeolocation.xcodeproj; sourceTree = "<group>"; };
 		134CB9291C85A38800265FA6 /* RCTModuleInitTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTModuleInitTests.m; sourceTree = "<group>"; };
+		1380DC8B1E70C0DC00E7C47D /* ReactCxx.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReactCxx.xcodeproj; path = ../../React/ReactCxx.xcodeproj; sourceTree = "<group>"; };
 		138D6A161B53CD440074A87E /* RCTShadowViewTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTShadowViewTests.m; sourceTree = "<group>"; };
 		138DEE021B9EDDDB007F4EA5 /* RCTCameraRoll.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTCameraRoll.xcodeproj; path = ../../Libraries/CameraRoll/RCTCameraRoll.xcodeproj; sourceTree = "<group>"; };
 		1393D0371B68CD1300E1B601 /* RCTModuleMethodTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTModuleMethodTests.m; sourceTree = "<group>"; };
@@ -401,11 +403,10 @@
 		13B07FB21A68108700A75B9A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
 		13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = UIExplorer/Images.xcassets; sourceTree = "<group>"; };
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = UIExplorer/Info.plist; sourceTree = "<group>"; };
+		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = UIExplorer/main.m; sourceTree = "<group>"; };
 		13B6C1A21C34225900D3FAF5 /* RCTURLUtilsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTURLUtilsTests.m; sourceTree = "<group>"; };
 		13BCE84E1C9C209600DD7AAD /* RCTComponentPropsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTComponentPropsTests.m; sourceTree = "<group>"; };
 		13CC9D481AEED2B90020D1C2 /* RCTSettings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTSettings.xcodeproj; path = ../../Libraries/Settings/RCTSettings.xcodeproj; sourceTree = "<group>"; };
-		13CF8FD01E2966FF0005310D /* maincxx.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = maincxx.m; path = UIExplorer/maincxx.m; sourceTree = "<group>"; };
-		13CF8FD21E2967C40005310D /* ReactCxx.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReactCxx.xcodeproj; path = ../../React/ReactCxx.xcodeproj; sourceTree = "<group>"; };
 		13DB03471B5D2ED500C27245 /* RCTJSONTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTJSONTests.m; sourceTree = "<group>"; };
 		13DF61B51B67A45000EDB188 /* RCTMethodArgumentTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTMethodArgumentTests.m; sourceTree = "<group>"; };
 		13E5019C1D07A502005F35D8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = ../../Libraries/NativeAnimation/RCTAnimation.xcodeproj; sourceTree = "<group>"; };
@@ -486,7 +487,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				13CF8FF31E2967D10005310D /* libReact.a in Frameworks */,
+				1380DCD41E70C44800E7C47D /* libReact.a in Frameworks */,
 				147CED4C1AB3532B00DA3E4C /* libRCTActionSheet.a in Frameworks */,
 				134454601AAFCABD003F0779 /* libRCTAdSupport.a in Frameworks */,
 				13E501F11D07A84A005F35D8 /* libRCTAnimation.a in Frameworks */,
@@ -555,7 +556,7 @@
 		1316A21D1AA397F400C0188E /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				13CF8FD21E2967C40005310D /* ReactCxx.xcodeproj */,
+				1380DC8B1E70C0DC00E7C47D /* ReactCxx.xcodeproj */,
 				14E0EEC81AB118F7000DECC3 /* RCTActionSheet.xcodeproj */,
 				134454551AAFCAAE003F0779 /* RCTAdSupport.xcodeproj */,
 				13E5019C1D07A502005F35D8 /* RCTAnimation.xcodeproj */,
@@ -626,6 +627,23 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		1380DC8C1E70C0DC00E7C47D /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				1380DC991E70C0DD00E7C47D /* libReact.a */,
+				1380DC9B1E70C0DD00E7C47D /* libReact.a */,
+				1380DC9D1E70C0DD00E7C47D /* libyoga.a */,
+				1380DC9F1E70C0DD00E7C47D /* libyoga.a */,
+				1380DCA11E70C0DD00E7C47D /* libcxxreact.a */,
+				1380DCA31E70C0DD00E7C47D /* libcxxreact.a */,
+				1380DCA51E70C0DD00E7C47D /* libjschelpers.a */,
+				1380DCA71E70C0DD00E7C47D /* libjschelpers.a */,
+				1380DCA91E70C0DD00E7C47D /* libthird-party.a */,
+				1380DCAB1E70C0DD00E7C47D /* libdouble-conversion.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		138DEE031B9EDDDB007F4EA5 /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -651,29 +669,12 @@
 				13B07FB01A68108700A75B9A /* AppDelegate.m */,
 				13B07FB51A68108700A75B9A /* Images.xcassets */,
 				13B07FB11A68108700A75B9A /* LaunchScreen.xib */,
-				13CF8FD01E2966FF0005310D /* maincxx.m */,
+				13B07FB71A68108700A75B9A /* main.m */,
 				1323F18D1C04ABAC0091BED0 /* Supporting Files */,
 			);
 			name = UIExplorer;
 			sourceTree = "<group>";
 		};
-		13CF8FD31E2967C40005310D /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				13CF8FE01E2967C40005310D /* libReact.a */,
-				13CF8FE21E2967C40005310D /* libReact.a */,
-				13CF8FE41E2967C40005310D /* libyoga.a */,
-				13CF8FE61E2967C40005310D /* libyoga.a */,
-				13CF8FE81E2967C40005310D /* libcxxreact.a */,
-				13CF8FEA1E2967C40005310D /* libcxxreact.a */,
-				13CF8FEC1E2967C40005310D /* libjschelpers.a */,
-				13CF8FEE1E2967C40005310D /* libjschelpers.a */,
-				13CF8FF21E2967C40005310D /* libthird-party.a */,
-				13CF8FF01E2967C40005310D /* libdouble-conversion.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
 		13E5019D1D07A502005F35D8 /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -1101,8 +1102,8 @@
 					ProjectRef = 139FDECA1B0651EA00C62182 /* RCTWebSocket.xcodeproj */;
 				},
 				{
-					ProductGroup = 13CF8FD31E2967C40005310D /* Products */;
-					ProjectRef = 13CF8FD21E2967C40005310D /* ReactCxx.xcodeproj */;
+					ProductGroup = 1380DC8C1E70C0DC00E7C47D /* Products */;
+					ProjectRef = 1380DC8B1E70C0DC00E7C47D /* ReactCxx.xcodeproj */;
 				},
 			);
 			projectRoot = "";
@@ -1154,88 +1155,88 @@
 			remoteRef = 134A8A241AACED6A00945AAE /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		138DEE091B9EDDDB007F4EA5 /* libRCTCameraRoll.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libRCTCameraRoll.a;
-			remoteRef = 138DEE081B9EDDDB007F4EA5 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		139FDED91B0651EA00C62182 /* libRCTWebSocket.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libRCTWebSocket.a;
-			remoteRef = 139FDED81B0651EA00C62182 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		13CF8FE01E2967C40005310D /* libReact.a */ = {
+		1380DC991E70C0DD00E7C47D /* libReact.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
 			path = libReact.a;
-			remoteRef = 13CF8FDF1E2967C40005310D /* PBXContainerItemProxy */;
+			remoteRef = 1380DC981E70C0DD00E7C47D /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		13CF8FE21E2967C40005310D /* libReact.a */ = {
+		1380DC9B1E70C0DD00E7C47D /* libReact.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
 			path = libReact.a;
-			remoteRef = 13CF8FE11E2967C40005310D /* PBXContainerItemProxy */;
+			remoteRef = 1380DC9A1E70C0DD00E7C47D /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		13CF8FE41E2967C40005310D /* libyoga.a */ = {
+		1380DC9D1E70C0DD00E7C47D /* libyoga.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
 			path = libyoga.a;
-			remoteRef = 13CF8FE31E2967C40005310D /* PBXContainerItemProxy */;
+			remoteRef = 1380DC9C1E70C0DD00E7C47D /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		13CF8FE61E2967C40005310D /* libyoga.a */ = {
+		1380DC9F1E70C0DD00E7C47D /* libyoga.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
 			path = libyoga.a;
-			remoteRef = 13CF8FE51E2967C40005310D /* PBXContainerItemProxy */;
+			remoteRef = 1380DC9E1E70C0DD00E7C47D /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		13CF8FE81E2967C40005310D /* libcxxreact.a */ = {
+		1380DCA11E70C0DD00E7C47D /* libcxxreact.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
 			path = libcxxreact.a;
-			remoteRef = 13CF8FE71E2967C40005310D /* PBXContainerItemProxy */;
+			remoteRef = 1380DCA01E70C0DD00E7C47D /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		13CF8FEA1E2967C40005310D /* libcxxreact.a */ = {
+		1380DCA31E70C0DD00E7C47D /* libcxxreact.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
 			path = libcxxreact.a;
-			remoteRef = 13CF8FE91E2967C40005310D /* PBXContainerItemProxy */;
+			remoteRef = 1380DCA21E70C0DD00E7C47D /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		13CF8FEC1E2967C40005310D /* libjschelpers.a */ = {
+		1380DCA51E70C0DD00E7C47D /* libjschelpers.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
 			path = libjschelpers.a;
-			remoteRef = 13CF8FEB1E2967C40005310D /* PBXContainerItemProxy */;
+			remoteRef = 1380DCA41E70C0DD00E7C47D /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		13CF8FEE1E2967C40005310D /* libjschelpers.a */ = {
+		1380DCA71E70C0DD00E7C47D /* libjschelpers.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
 			path = libjschelpers.a;
-			remoteRef = 13CF8FED1E2967C40005310D /* PBXContainerItemProxy */;
+			remoteRef = 1380DCA61E70C0DD00E7C47D /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		13CF8FF01E2967C40005310D /* libdouble-conversion.a */ = {
+		1380DCA91E70C0DD00E7C47D /* libthird-party.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libthird-party.a";
+			remoteRef = 1380DCA81E70C0DD00E7C47D /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		1380DCAB1E70C0DD00E7C47D /* libdouble-conversion.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
 			path = "libdouble-conversion.a";
-			remoteRef = 13CF8FEF1E2967C40005310D /* PBXContainerItemProxy */;
+			remoteRef = 1380DCAA1E70C0DD00E7C47D /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		13CF8FF21E2967C40005310D /* libthird-party.a */ = {
+		138DEE091B9EDDDB007F4EA5 /* libRCTCameraRoll.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
-			path = "libthird-party.a";
-			remoteRef = 13CF8FF11E2967C40005310D /* PBXContainerItemProxy */;
+			path = libRCTCameraRoll.a;
+			remoteRef = 138DEE081B9EDDDB007F4EA5 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		139FDED91B0651EA00C62182 /* libRCTWebSocket.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libRCTWebSocket.a;
+			remoteRef = 139FDED81B0651EA00C62182 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 		13E501A31D07A502005F35D8 /* libRCTAnimation.a */ = {
@@ -1480,10 +1481,10 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				13CF8FD11E2966FF0005310D /* maincxx.m in Sources */,
 				272E6B3F1BEA849E001FCF37 /* UpdatePropertiesExampleView.m in Sources */,
 				13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */,
 				27F441EC1BEBE5030039B79C /* FlexibleSizeExampleView.m in Sources */,
+				13B07FC11A68108700A75B9A /* main.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1517,6 +1518,7 @@
 			files = (
 				2DD323DC1DA2DDBF000FE1B8 /* FlexibleSizeExampleView.m in Sources */,
 				2DD323DD1DA2DDBF000FE1B8 /* UpdatePropertiesExampleView.m in Sources */,
+				2DD323E01DA2DDBF000FE1B8 /* main.m in Sources */,
 				2DD323DE1DA2DDBF000FE1B8 /* AppDelegate.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/Examples/UIExplorer/UIExplorerCxx.xcodeproj/xcshareddata/xcschemes/UIExplorer.xcscheme b/Examples/UIExplorer/UIExplorerCxx.xcodeproj/xcshareddata/xcschemes/UIExplorer.xcscheme
index aa4516c991545d..f5551bb9306749 100644
--- a/Examples/UIExplorer/UIExplorerCxx.xcodeproj/xcshareddata/xcschemes/UIExplorer.xcscheme
+++ b/Examples/UIExplorer/UIExplorerCxx.xcodeproj/xcshareddata/xcschemes/UIExplorer.xcscheme
@@ -62,6 +62,20 @@
                ReferencedContainer = "container:UIExplorerCxx.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "143BC5941B21E3E100462512"
+               BuildableName = "UIExplorerIntegrationTests.xctest"
+               BlueprintName = "UIExplorerIntegrationTests"
+               ReferencedContainer = "container:UIExplorerCxx.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
@@ -70,6 +84,16 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "004D289D1AAF61C70097A701"
+               BuildableName = "UIExplorerUnitTests.xctest"
+               BlueprintName = "UIExplorerUnitTests"
+               ReferencedContainer = "container:UIExplorerCxx.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
          <TestableReference
             skipped = "NO">
             <BuildableReference
@@ -113,6 +137,13 @@
             ReferencedContainer = "container:UIExplorerCxx.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "CI_USE_PACKAGER"
+            value = "1"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
diff --git a/Libraries/RCTTest/RCTTestRunner.m b/Libraries/RCTTest/RCTTestRunner.m
index df74872f348bdf..ff90ac2ea0e7f6 100644
--- a/Libraries/RCTTest/RCTTestRunner.m
+++ b/Libraries/RCTTest/RCTTestRunner.m
@@ -11,7 +11,6 @@
 
 #import <React/RCTAssert.h>
 #import <React/RCTBridge+Private.h>
-#import <React/RCTJSCExecutor.h>
 #import <React/RCTLog.h>
 #import <React/RCTRootView.h>
 #import <React/RCTUtils.h>
@@ -20,7 +19,6 @@
 #import "RCTTestModule.h"
 
 static const NSTimeInterval kTestTimeoutSeconds = 120;
-static const NSTimeInterval kTestTeardownTimeoutSeconds = 30;
 
 @implementation RCTTestRunner
 {
@@ -97,8 +95,6 @@ - (void)runTest:(SEL)test module:(NSString *)moduleName
 configurationBlock:(void(^)(RCTRootView *rootView))configurationBlock
 expectErrorBlock:(BOOL(^)(NSString *error))expectErrorBlock
 {
-  __weak id weakJSContext;
-
   @autoreleasepool {
     __block NSString *error = nil;
     RCTSetLogFunction(^(RCTLogLevel level, RCTLogSource source, NSString *fileName, NSNumber *lineNumber, NSString *message) {
@@ -139,12 +135,6 @@ - (void)runTest:(SEL)test module:(NSString *)moduleName
       [[NSRunLoop mainRunLoop] runMode:NSRunLoopCommonModes beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
     }
 
-    // Take a weak reference to the JS context, so we track its deallocation later
-    // (we can only do this now, since it's been lazily initialized)
-    id jsExecutor = [bridge.batchedBridge valueForKey:@"javaScriptExecutor"];
-    if ([jsExecutor isKindOfClass:[RCTJSCExecutor class]]) {
-      weakJSContext = [jsExecutor valueForKey:@"_context"];
-    }
     [rootView removeFromSuperview];
 
     RCTSetLogFunction(RCTDefaultLogFunction);
@@ -163,14 +153,6 @@ - (void)runTest:(SEL)test module:(NSString *)moduleName
     }
     [bridge invalidate];
   }
-
-  // Wait for the executor to have shut down completely before returning
-  NSDate *teardownTimeout = [NSDate dateWithTimeIntervalSinceNow:kTestTeardownTimeoutSeconds];
-  while (teardownTimeout.timeIntervalSinceNow > 0 && weakJSContext) {
-    [[NSRunLoop mainRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
-    [[NSRunLoop mainRunLoop] runMode:NSRunLoopCommonModes beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
-  }
-  RCTAssert(!weakJSContext, @"JS context was not deallocated after being invalidated");
 }
 
 @end
diff --git a/React/Base/RCTBatchedBridge.m b/React/Base/RCTBatchedBridge.m
index 480df01a953518..56c5a6db05e355 100644
--- a/React/Base/RCTBatchedBridge.m
+++ b/React/Base/RCTBatchedBridge.m
@@ -21,10 +21,11 @@
 #import "RCTLog.h"
 #import "RCTModuleData.h"
 #import "RCTPerformanceLogger.h"
-#import "RCTProfile.h"
-#import "RCTRedBox.h"
 #import "RCTUtils.h"
 
+#import <React/RCTProfile.h>
+#import <React/RCTRedBox.h>
+
 #if RCT_DEV && __has_include("RCTDevLoadingView.h")
 #import "RCTDevLoadingView.h"
 #endif
diff --git a/React/Base/RCTBridge.m b/React/Base/RCTBridge.m
index 0fe05ca8bb4ae1..51074272337c55 100644
--- a/React/Base/RCTBridge.m
+++ b/React/Base/RCTBridge.m
@@ -276,31 +276,7 @@ - (void)requestReload
   [self reload];
 }
 
-- (void)setUp
-{
-  RCT_PROFILE_BEGIN_EVENT(0, @"-[RCTBridge setUp]", nil);
-
-  _performanceLogger = [RCTPerformanceLogger new];
-  [_performanceLogger markStartForTag:RCTPLBridgeStartup];
-  [_performanceLogger markStartForTag:RCTPLTTI];
-
-  // Only update bundleURL from delegate if delegate bundleURL has changed
-  NSURL *previousDelegateURL = _delegateBundleURL;
-  _delegateBundleURL = [self.delegate sourceURLForBridge:self];
-  if (_delegateBundleURL && ![_delegateBundleURL isEqual:previousDelegateURL]) {
-    _bundleURL = _delegateBundleURL;
-  }
-
-  // Sanitize the bundle URL
-  _bundleURL = [RCTConvert NSURL:_bundleURL.absoluteString];
-
-  [self createBatchedBridge];
-  [self.batchedBridge start];
-
-  RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
-}
-
-- (void)createBatchedBridge
+- (Class)bridgeClass
 {
   // In order to facilitate switching between bridges with only build
   // file changes, this uses reflection to check which bridges are
@@ -326,7 +302,41 @@ - (void)createBatchedBridge
 
   RCTAssert(implClass != nil, @"No bridge implementation is available, giving up.");
 
-  self.batchedBridge = [[implClass alloc] initWithParentBridge:self];
+#ifdef WITH_FBSYSTRACE
+  if (implClass == cxxBridgeClass) {
+    [RCTFBSystrace registerCallbacks];
+  } else {
+    [RCTFBSystrace unregisterCallbacks];
+  }
+#endif
+
+  return implClass;
+}
+
+- (void)setUp
+{
+  Class bridgeClass = self.bridgeClass;
+
+  RCT_PROFILE_BEGIN_EVENT(0, @"-[RCTBridge setUp]", nil);
+
+  _performanceLogger = [RCTPerformanceLogger new];
+  [_performanceLogger markStartForTag:RCTPLBridgeStartup];
+  [_performanceLogger markStartForTag:RCTPLTTI];
+
+  // Only update bundleURL from delegate if delegate bundleURL has changed
+  NSURL *previousDelegateURL = _delegateBundleURL;
+  _delegateBundleURL = [self.delegate sourceURLForBridge:self];
+  if (_delegateBundleURL && ![_delegateBundleURL isEqual:previousDelegateURL]) {
+    _bundleURL = _delegateBundleURL;
+  }
+
+  // Sanitize the bundle URL
+  _bundleURL = [RCTConvert NSURL:_bundleURL.absoluteString];
+
+  self.batchedBridge = [[bridgeClass alloc] initWithParentBridge:self];
+  [self.batchedBridge start];
+
+  RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
 }
 
 - (BOOL)isLoading
diff --git a/React/Executors/RCTJSCErrorHandling.h b/React/Base/RCTJSCErrorHandling.h
similarity index 100%
rename from React/Executors/RCTJSCErrorHandling.h
rename to React/Base/RCTJSCErrorHandling.h
diff --git a/React/Executors/RCTJSCErrorHandling.mm b/React/Base/RCTJSCErrorHandling.mm
similarity index 100%
rename from React/Executors/RCTJSCErrorHandling.mm
rename to React/Base/RCTJSCErrorHandling.mm
diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm
index ee84db6be1adf5..461b01d8f39f61 100644
--- a/React/CxxBridge/RCTCxxBridge.mm
+++ b/React/CxxBridge/RCTCxxBridge.mm
@@ -39,6 +39,7 @@
 #import <jschelpers/Value.h>
 
 #import "NSDataBigString.h"
+#import "RCTJSCHelpers.h"
 #import "RCTMessageThread.h"
 #import "RCTObjcExecutor.h"
 
@@ -67,26 +68,6 @@ typedef NS_ENUM(NSUInteger, RCTBridgeFields) {
   RCTBridgeFieldCallID,
 };
 
-static JSValueRef nativeLoggingHook(
-    JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount,
-    const JSValueRef arguments[], JSValueRef *exception) {
-  RCTLogLevel level = RCTLogLevelInfo;
-  if (argumentCount > 1) {
-    level = MAX(level, (RCTLogLevel)Value(ctx, arguments[1]).asNumber());
-  }
-  if (argumentCount > 0) {
-    String message = Value(ctx, arguments[0]).toString();
-    _RCTLogJavaScriptInternal(level, @(message.str().c_str()));
-  }
-  return Value::makeUndefined(ctx);
-}
-
-static JSValueRef nativePerformanceNow(
-    JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount,
-    const JSValueRef arguments[], JSValueRef *exception) {
-  return Value::makeNumber(ctx, CACurrentMediaTime() * 1000);
-}
-
 static bool isRAMBundle(NSData *script) {
   BundleHeader header;
   [script getBytes:&header length:sizeof(header)];
@@ -151,10 +132,7 @@ @implementation RCTCxxBridge
 + (void)initialize
 {
   if (self == [RCTCxxBridge class]) {
-    ReactMarker::logMarker = [](const std::string&) {};
-    PerfLogging::installNativeHooks = RCTFBQuickPerformanceLoggerConfigureHooks;
-    JSNativeHooks::loggingHook = nativeLoggingHook;
-    JSNativeHooks::nowHook = nativePerformanceNow;
+    RCTPrepareJSCExecutor();
   }
 }
 
diff --git a/React/CxxBridge/RCTJSCHelpers.h b/React/CxxBridge/RCTJSCHelpers.h
new file mode 100644
index 00000000000000..3c3775b31c8acd
--- /dev/null
+++ b/React/CxxBridge/RCTJSCHelpers.h
@@ -0,0 +1,19 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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.
+ */
+
+#pragma once
+
+/**
+ * This must be invoked on iOS to set up platform dependencies before
+ * creating an instance of JSCExecutor.
+ */
+
+void RCTPrepareJSCExecutor();
diff --git a/React/CxxBridge/RCTJSCHelpers.mm b/React/CxxBridge/RCTJSCHelpers.mm
new file mode 100644
index 00000000000000..41651c1c7607b1
--- /dev/null
+++ b/React/CxxBridge/RCTJSCHelpers.mm
@@ -0,0 +1,52 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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.
+ */
+
+#include "RCTJSCHelpers.h"
+
+#import <Foundation/Foundation.h>
+
+#import <React/RCTBridge+Private.h>
+#import <React/RCTLog.h>
+#import <cxxreact/Platform.h>
+#import <jschelpers/Value.h>
+
+using namespace facebook::react;
+
+namespace {
+
+JSValueRef nativeLoggingHook(
+    JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount,
+    const JSValueRef arguments[], JSValueRef *exception) {
+  RCTLogLevel level = RCTLogLevelInfo;
+  if (argumentCount > 1) {
+    level = MAX(level, (RCTLogLevel)Value(ctx, arguments[1]).asNumber());
+  }
+  if (argumentCount > 0) {
+    String message = Value(ctx, arguments[0]).toString();
+    _RCTLogJavaScriptInternal(level, @(message.str().c_str()));
+  }
+  return Value::makeUndefined(ctx);
+}
+
+JSValueRef nativePerformanceNow(
+    JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount,
+    const JSValueRef arguments[], JSValueRef *exception) {
+  return Value::makeNumber(ctx, CACurrentMediaTime() * 1000);
+}
+
+}
+
+void RCTPrepareJSCExecutor() {
+  ReactMarker::logMarker = [](const std::string&) {};
+  PerfLogging::installNativeHooks = RCTFBQuickPerformanceLoggerConfigureHooks;
+  JSNativeHooks::loggingHook = nativeLoggingHook;
+  JSNativeHooks::nowHook = nativePerformanceNow;
+}
diff --git a/React/Executors/RCTJSCExecutor.mm b/React/Executors/RCTJSCExecutor.mm
index 18a645a56a53ad..75be11f54b6fe9 100644
--- a/React/Executors/RCTJSCExecutor.mm
+++ b/React/Executors/RCTJSCExecutor.mm
@@ -19,19 +19,19 @@
 
 #import <cxxreact/JSBundleType.h>
 #import <jschelpers/JavaScriptCore.h>
+#import <React/JSCSamplingProfiler.h>
+#import <React/RCTAssert.h>
+#import <React/RCTBridge+Private.h>
+#import <React/RCTDefines.h>
+#import <React/RCTDevSettings.h>
+#import <React/RCTJSCErrorHandling.h>
+#import <React/RCTJavaScriptLoader.h>
+#import <React/RCTLog.h>
+#import <React/RCTPerformanceLogger.h>
+#import <React/RCTProfile.h>
+#import <React/RCTUtils.h>
 
-#import "JSCSamplingProfiler.h"
-#import "RCTAssert.h"
-#import "RCTBridge+Private.h"
-#import "RCTDefines.h"
-#import "RCTDevSettings.h"
-#import "RCTJSCErrorHandling.h"
 #import "RCTJSCProfiler.h"
-#import "RCTJavaScriptLoader.h"
-#import "RCTLog.h"
-#import "RCTPerformanceLogger.h"
-#import "RCTProfile.h"
-#import "RCTUtils.h"
 
 #if (RCT_PROFILE || RCT_DEV) && __has_include("RCTDevMenu.h")
 #import "RCTDevMenu.h"
diff --git a/React/Profiler/RCTJSCProfiler.m b/React/Profiler/RCTJSCProfiler.m
index 7ae2a2b2f5f088..4d5333b777614b 100644
--- a/React/Profiler/RCTJSCProfiler.m
+++ b/React/Profiler/RCTJSCProfiler.m
@@ -11,7 +11,7 @@
 
 #import <UIKit/UIKit.h>
 
-#import "RCTLog.h"
+#import <React/RCTLog.h>
 
 #ifndef RCT_JSC_PROFILER
 #define RCT_JSC_PROFILER RCT_PROFILE
diff --git a/React/Profiler/RCTPerfMonitor.m b/React/Profiler/RCTPerfMonitor.m
index 4d6b6e1cfcc44d..52efbcf267f6ab 100644
--- a/React/Profiler/RCTPerfMonitor.m
+++ b/React/Profiler/RCTPerfMonitor.m
@@ -20,7 +20,6 @@
 #import "RCTFPSGraph.h"
 #import "RCTInvalidating.h"
 #import "RCTJavaScriptExecutor.h"
-#import "RCTJSCExecutor.h"
 #import "RCTPerformanceLogger.h"
 #import "RCTRootView.h"
 #import "RCTUIManager.h"
diff --git a/React/Profiler/RCTProfile.m b/React/Profiler/RCTProfile.m
index d2b0f479d136a7..47f5eb87431fea 100644
--- a/React/Profiler/RCTProfile.m
+++ b/React/Profiler/RCTProfile.m
@@ -22,7 +22,6 @@
 #import "RCTBridge.h"
 #import "RCTComponentData.h"
 #import "RCTDefines.h"
-#import "RCTJSCExecutor.h"
 #import "RCTLog.h"
 #import "RCTModuleData.h"
 #import "RCTUIManager.h"
@@ -473,7 +472,8 @@ void RCTProfileInit(RCTBridge *bridge)
 
   // Set up thread ordering
   dispatch_async(RCTProfileGetQueue(), ^{
-    NSArray *orderedThreads = @[@"JS async", @"RCTPerformanceLogger", RCTJSCThreadName, @(RCTUIManagerQueueName), @"main"];
+    NSArray *orderedThreads = @[@"JS async", @"RCTPerformanceLogger", @"com.facebook.react.JavaScript",
+                                @(RCTUIManagerQueueName), @"main"];
     [orderedThreads enumerateObjectsUsingBlock:^(NSString *thread, NSUInteger idx, __unused BOOL *stop) {
       RCTProfileAddEvent(RCTProfileTraceEvents,
         @"ph": @"M", // metadata event
diff --git a/React/React.xcodeproj/project.pbxproj b/React/React.xcodeproj/project.pbxproj
index a79946fbfa4b40..b807434e77b8af 100644
--- a/React/React.xcodeproj/project.pbxproj
+++ b/React/React.xcodeproj/project.pbxproj
@@ -27,6 +27,8 @@
 		137327E81AA5CF210034F82E /* RCTTabBarItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 137327E21AA5CF210034F82E /* RCTTabBarItem.m */; };
 		137327E91AA5CF210034F82E /* RCTTabBarItemManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 137327E41AA5CF210034F82E /* RCTTabBarItemManager.m */; };
 		137327EA1AA5CF210034F82E /* RCTTabBarManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 137327E61AA5CF210034F82E /* RCTTabBarManager.m */; };
+		139324FE1E70B069009FD7E0 /* RCTJSCErrorHandling.h in Headers */ = {isa = PBXBuildFile; fileRef = 139324FC1E70B069009FD7E0 /* RCTJSCErrorHandling.h */; };
+		139324FF1E70B069009FD7E0 /* RCTJSCErrorHandling.mm in Sources */ = {isa = PBXBuildFile; fileRef = 139324FD1E70B069009FD7E0 /* RCTJSCErrorHandling.mm */; };
 		13A0C2891B74F71200B29F6F /* RCTDevLoadingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 13A0C2861B74F71200B29F6F /* RCTDevLoadingView.m */; };
 		13A1F71E1A75392D00D3D453 /* RCTKeyCommands.m in Sources */ = {isa = PBXBuildFile; fileRef = 13A1F71D1A75392D00D3D453 /* RCTKeyCommands.m */; };
 		13A6E20E1C19AA0C00845B82 /* RCTParserUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 13A6E20D1C19AA0C00845B82 /* RCTParserUtils.m */; };
@@ -211,7 +213,6 @@
 		3D302F4E1DF828F800D6DDAE /* RCTURLRequestHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 1345A83B1B265A0E00583190 /* RCTURLRequestHandler.h */; };
 		3D302F4F1DF828F800D6DDAE /* RCTUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 83CBBA4F1A601E3B00E9B192 /* RCTUtils.h */; };
 		3D302F501DF828F800D6DDAE /* RCTWebSocketObserverProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DB910701C74B21600838BBE /* RCTWebSocketObserverProtocol.h */; };
-		3D302F521DF828F800D6DDAE /* RCTJSCErrorHandling.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DC724301D8BF99A00808C32 /* RCTJSCErrorHandling.h */; };
 		3D302F531DF828F800D6DDAE /* RCTJSCExecutor.h in Headers */ = {isa = PBXBuildFile; fileRef = 134FCB391A6E7F0800051CC8 /* RCTJSCExecutor.h */; };
 		3D302F541DF828F800D6DDAE /* JSCSamplingProfiler.h in Headers */ = {isa = PBXBuildFile; fileRef = 369123DF1DDC75850095B341 /* JSCSamplingProfiler.h */; };
 		3D302F551DF828F800D6DDAE /* RCTAccessibilityManager.h in Headers */ = {isa = PBXBuildFile; fileRef = E9B20B791B500126007A2DA7 /* RCTAccessibilityManager.h */; };
@@ -322,7 +323,6 @@
 		3D302FCA1DF8290600D6DDAE /* RCTURLRequestHandler.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 1345A83B1B265A0E00583190 /* RCTURLRequestHandler.h */; };
 		3D302FCB1DF8290600D6DDAE /* RCTUtils.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 83CBBA4F1A601E3B00E9B192 /* RCTUtils.h */; };
 		3D302FCC1DF8290600D6DDAE /* RCTWebSocketObserverProtocol.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3DB910701C74B21600838BBE /* RCTWebSocketObserverProtocol.h */; };
-		3D302FCE1DF8290600D6DDAE /* RCTJSCErrorHandling.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3DC724301D8BF99A00808C32 /* RCTJSCErrorHandling.h */; };
 		3D302FCF1DF8290600D6DDAE /* RCTJSCExecutor.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 134FCB391A6E7F0800051CC8 /* RCTJSCExecutor.h */; };
 		3D302FD01DF8290600D6DDAE /* JSCSamplingProfiler.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 369123DF1DDC75850095B341 /* JSCSamplingProfiler.h */; };
 		3D302FD11DF8290600D6DDAE /* RCTAccessibilityManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = E9B20B791B500126007A2DA7 /* RCTAccessibilityManager.h */; };
@@ -414,8 +414,6 @@
 		3D5AC7221E005763000F9153 /* RCTTVRemoteHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D5AC71E1E005750000F9153 /* RCTTVRemoteHandler.h */; };
 		3D5AC7231E005766000F9153 /* RCTTVRemoteHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D5AC71F1E005750000F9153 /* RCTTVRemoteHandler.m */; };
 		3D7749441DC1065C007EC8D8 /* RCTPlatform.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D7749431DC1065C007EC8D8 /* RCTPlatform.m */; };
-		3D7A27E21DE325B7002E3F95 /* RCTJSCErrorHandling.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3D7A27E11DE325B7002E3F95 /* RCTJSCErrorHandling.mm */; };
-		3D7A27E31DE325DA002E3F95 /* RCTJSCErrorHandling.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3D7A27E11DE325B7002E3F95 /* RCTJSCErrorHandling.mm */; };
 		3D80D9171DF6F7A80028D040 /* JSBundleType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC70D2EB1DE48A22002E6351 /* JSBundleType.cpp */; };
 		3D80D9181DF6F7A80028D040 /* JSBundleType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC70D2EB1DE48A22002E6351 /* JSBundleType.cpp */; };
 		3D80D9191DF6F7CF0028D040 /* JSCWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D7A27DD1DE32541002E3F95 /* JSCWrapper.cpp */; };
@@ -465,7 +463,6 @@
 		3D80D9491DF6FA890028D040 /* RCTURLRequestHandler.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 1345A83B1B265A0E00583190 /* RCTURLRequestHandler.h */; };
 		3D80D94A1DF6FA890028D040 /* RCTUtils.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 83CBBA4F1A601E3B00E9B192 /* RCTUtils.h */; };
 		3D80D94B1DF6FA890028D040 /* RCTWebSocketObserverProtocol.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3DB910701C74B21600838BBE /* RCTWebSocketObserverProtocol.h */; };
-		3D80D94D1DF6FA890028D040 /* RCTJSCErrorHandling.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3DC724301D8BF99A00808C32 /* RCTJSCErrorHandling.h */; };
 		3D80D94E1DF6FA890028D040 /* RCTJSCExecutor.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 134FCB391A6E7F0800051CC8 /* RCTJSCExecutor.h */; };
 		3D80D94F1DF6FA890028D040 /* JSCSamplingProfiler.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 369123DF1DDC75850095B341 /* JSCSamplingProfiler.h */; };
 		3D80D9501DF6FA890028D040 /* RCTAccessibilityManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = E9B20B791B500126007A2DA7 /* RCTAccessibilityManager.h */; };
@@ -583,7 +580,6 @@
 		3D80DA431DF820620028D040 /* RCTURLRequestHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 1345A83B1B265A0E00583190 /* RCTURLRequestHandler.h */; };
 		3D80DA441DF820620028D040 /* RCTUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 83CBBA4F1A601E3B00E9B192 /* RCTUtils.h */; };
 		3D80DA451DF820620028D040 /* RCTWebSocketObserverProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DB910701C74B21600838BBE /* RCTWebSocketObserverProtocol.h */; };
-		3D80DA471DF820620028D040 /* RCTJSCErrorHandling.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DC724301D8BF99A00808C32 /* RCTJSCErrorHandling.h */; };
 		3D80DA481DF820620028D040 /* RCTJSCExecutor.h in Headers */ = {isa = PBXBuildFile; fileRef = 134FCB391A6E7F0800051CC8 /* RCTJSCExecutor.h */; };
 		3D80DA491DF820620028D040 /* JSCSamplingProfiler.h in Headers */ = {isa = PBXBuildFile; fileRef = 369123DF1DDC75850095B341 /* JSCSamplingProfiler.h */; };
 		3D80DA4A1DF820620028D040 /* RCTAccessibilityManager.h in Headers */ = {isa = PBXBuildFile; fileRef = E9B20B791B500126007A2DA7 /* RCTAccessibilityManager.h */; };
@@ -853,7 +849,6 @@
 				3D302FCA1DF8290600D6DDAE /* RCTURLRequestHandler.h in Copy Headers */,
 				3D302FCB1DF8290600D6DDAE /* RCTUtils.h in Copy Headers */,
 				3D302FCC1DF8290600D6DDAE /* RCTWebSocketObserverProtocol.h in Copy Headers */,
-				3D302FCE1DF8290600D6DDAE /* RCTJSCErrorHandling.h in Copy Headers */,
 				3D302FCF1DF8290600D6DDAE /* RCTJSCExecutor.h in Copy Headers */,
 				3D302FD01DF8290600D6DDAE /* JSCSamplingProfiler.h in Copy Headers */,
 				3D302FD11DF8290600D6DDAE /* RCTAccessibilityManager.h in Copy Headers */,
@@ -1012,7 +1007,6 @@
 				3D80D9491DF6FA890028D040 /* RCTURLRequestHandler.h in Copy Headers */,
 				3D80D94A1DF6FA890028D040 /* RCTUtils.h in Copy Headers */,
 				3D80D94B1DF6FA890028D040 /* RCTWebSocketObserverProtocol.h in Copy Headers */,
-				3D80D94D1DF6FA890028D040 /* RCTJSCErrorHandling.h in Copy Headers */,
 				3D80D94E1DF6FA890028D040 /* RCTJSCExecutor.h in Copy Headers */,
 				3D80D94F1DF6FA890028D040 /* JSCSamplingProfiler.h in Copy Headers */,
 				3D80D9501DF6FA890028D040 /* RCTAccessibilityManager.h in Copy Headers */,
@@ -1171,6 +1165,8 @@
 		137327E41AA5CF210034F82E /* RCTTabBarItemManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTabBarItemManager.m; sourceTree = "<group>"; };
 		137327E51AA5CF210034F82E /* RCTTabBarManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTabBarManager.h; sourceTree = "<group>"; };
 		137327E61AA5CF210034F82E /* RCTTabBarManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTabBarManager.m; sourceTree = "<group>"; };
+		139324FC1E70B069009FD7E0 /* RCTJSCErrorHandling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTJSCErrorHandling.h; sourceTree = "<group>"; };
+		139324FD1E70B069009FD7E0 /* RCTJSCErrorHandling.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTJSCErrorHandling.mm; sourceTree = "<group>"; };
 		13A0C2851B74F71200B29F6F /* RCTDevLoadingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTDevLoadingView.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		13A0C2861B74F71200B29F6F /* RCTDevLoadingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTDevLoadingView.m; sourceTree = "<group>"; };
 		13A0C2871B74F71200B29F6F /* RCTDevMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTDevMenu.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
@@ -1309,9 +1305,7 @@
 		3D7A27DC1DE32541002E3F95 /* JavaScriptCore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavaScriptCore.h; sourceTree = "<group>"; };
 		3D7A27DD1DE32541002E3F95 /* JSCWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCWrapper.cpp; sourceTree = "<group>"; };
 		3D7A27DE1DE32541002E3F95 /* JSCWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCWrapper.h; sourceTree = "<group>"; };
-		3D7A27E11DE325B7002E3F95 /* RCTJSCErrorHandling.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTJSCErrorHandling.mm; sourceTree = "<group>"; };
 		3DB910701C74B21600838BBE /* RCTWebSocketObserverProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTWebSocketObserverProtocol.h; sourceTree = "<group>"; };
-		3DC724301D8BF99A00808C32 /* RCTJSCErrorHandling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTJSCErrorHandling.h; sourceTree = "<group>"; };
 		3EDCA8A21D3591E700450C31 /* RCTErrorCustomizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTErrorCustomizer.h; sourceTree = "<group>"; };
 		3EDCA8A31D3591E700450C31 /* RCTErrorInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTErrorInfo.h; sourceTree = "<group>"; };
 		3EDCA8A41D3591E700450C31 /* RCTErrorInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTErrorInfo.m; sourceTree = "<group>"; };
@@ -1433,8 +1427,6 @@
 		134FCB381A6E7F0800051CC8 /* Executors */ = {
 			isa = PBXGroup;
 			children = (
-				3DC724301D8BF99A00808C32 /* RCTJSCErrorHandling.h */,
-				3D7A27E11DE325B7002E3F95 /* RCTJSCErrorHandling.mm */,
 				134FCB391A6E7F0800051CC8 /* RCTJSCExecutor.h */,
 				134FCB3A1A6E7F0800051CC8 /* RCTJSCExecutor.mm */,
 			);
@@ -1726,6 +1718,8 @@
 		83CBBA491A601E3B00E9B192 /* Base */ = {
 			isa = PBXGroup;
 			children = (
+				139324FC1E70B069009FD7E0 /* RCTJSCErrorHandling.h */,
+				139324FD1E70B069009FD7E0 /* RCTJSCErrorHandling.mm */,
 				83CBBA4A1A601E3B00E9B192 /* RCTAssert.h */,
 				83CBBA4B1A601E3B00E9B192 /* RCTAssert.m */,
 				14C2CA771B3ACB0400E6CBB2 /* RCTBatchedBridge.m */,
@@ -1894,7 +1888,6 @@
 				3D302F4E1DF828F800D6DDAE /* RCTURLRequestHandler.h in Headers */,
 				3D302F4F1DF828F800D6DDAE /* RCTUtils.h in Headers */,
 				3D302F501DF828F800D6DDAE /* RCTWebSocketObserverProtocol.h in Headers */,
-				3D302F521DF828F800D6DDAE /* RCTJSCErrorHandling.h in Headers */,
 				3D302F531DF828F800D6DDAE /* RCTJSCExecutor.h in Headers */,
 				3D302F541DF828F800D6DDAE /* JSCSamplingProfiler.h in Headers */,
 				3D302F551DF828F800D6DDAE /* RCTAccessibilityManager.h in Headers */,
@@ -2084,7 +2077,6 @@
 				3D80DA431DF820620028D040 /* RCTURLRequestHandler.h in Headers */,
 				3D80DA441DF820620028D040 /* RCTUtils.h in Headers */,
 				3D80DA451DF820620028D040 /* RCTWebSocketObserverProtocol.h in Headers */,
-				3D80DA471DF820620028D040 /* RCTJSCErrorHandling.h in Headers */,
 				3D80DA481DF820620028D040 /* RCTJSCExecutor.h in Headers */,
 				3D80DA491DF820620028D040 /* JSCSamplingProfiler.h in Headers */,
 				3D80DA4A1DF820620028D040 /* RCTAccessibilityManager.h in Headers */,
@@ -2152,6 +2144,7 @@
 				3D80DA881DF820620028D040 /* RCTTabBar.h in Headers */,
 				3D80DA891DF820620028D040 /* RCTTabBarItem.h in Headers */,
 				3D80DA8A1DF820620028D040 /* RCTTabBarItemManager.h in Headers */,
+				139324FE1E70B069009FD7E0 /* RCTJSCErrorHandling.h in Headers */,
 				3D80DA8B1DF820620028D040 /* RCTTabBarManager.h in Headers */,
 				3D80DA8C1DF820620028D040 /* RCTTextDecorationLineType.h in Headers */,
 				3D80DA8D1DF820620028D040 /* RCTView.h in Headers */,
@@ -2495,7 +2488,6 @@
 				594AD5D41E46D87500B07237 /* RCTScrollContentViewManager.m in Sources */,
 				A12E9E5D1E5DF8720029001B /* RCTReloadPackagerMethod.m in Sources */,
 				3D5AC71A1E0056E0000F9153 /* RCTTVNavigationEventEmitter.m in Sources */,
-				3D7A27E31DE325DA002E3F95 /* RCTJSCErrorHandling.mm in Sources */,
 				2D3B5EA61D9B08CA00451313 /* RCTTouchEvent.m in Sources */,
 				2D8C2E331DA40441000EE098 /* RCTMultipartStreamReader.m in Sources */,
 				2D3B5EF01D9B09E300451313 /* RCTWrapperViewController.m in Sources */,
@@ -2631,8 +2623,8 @@
 				13B080051A6947C200A75B9A /* RCTScrollView.m in Sources */,
 				A2440AA31DF8D854006E7BFC /* RCTReloadCommand.m in Sources */,
 				E9B20B7B1B500126007A2DA7 /* RCTAccessibilityManager.m in Sources */,
-				3D7A27E21DE325B7002E3F95 /* RCTJSCErrorHandling.mm in Sources */,
 				13A0C2891B74F71200B29F6F /* RCTDevLoadingView.m in Sources */,
+				139324FF1E70B069009FD7E0 /* RCTJSCErrorHandling.mm in Sources */,
 				13B07FF21A69327A00A75B9A /* RCTTiming.m in Sources */,
 				1372B70A1AB030C200659ED6 /* RCTAppState.m in Sources */,
 				134FCB3D1A6E7F0800051CC8 /* RCTJSCExecutor.mm in Sources */,
diff --git a/React/ReactCxx.xcodeproj/project.pbxproj b/React/ReactCxx.xcodeproj/project.pbxproj
index c375179209e0dc..b1f0b1ccccc6ef 100644
--- a/React/ReactCxx.xcodeproj/project.pbxproj
+++ b/React/ReactCxx.xcodeproj/project.pbxproj
@@ -25,18 +25,12 @@
 		130E3D891E6A082100ACE484 /* RCTDevSettings.mm in Sources */ = {isa = PBXBuildFile; fileRef = 130E3D871E6A082100ACE484 /* RCTDevSettings.mm */; };
 		130E3D8A1E6A083600ACE484 /* RCTDevSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = 130E3D861E6A082100ACE484 /* RCTDevSettings.h */; };
 		130E3D8B1E6A083900ACE484 /* RCTDevSettings.mm in Sources */ = {isa = PBXBuildFile; fileRef = 130E3D871E6A082100ACE484 /* RCTDevSettings.mm */; };
-		13134C841E296B2A00B9F3CB /* RCTCxxBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 13134C731E296B2A00B9F3CB /* RCTCxxBridge.h */; };
-		13134C851E296B2A00B9F3CB /* RCTCxxBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 13134C731E296B2A00B9F3CB /* RCTCxxBridge.h */; };
 		13134C861E296B2A00B9F3CB /* RCTCxxBridge.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13134C741E296B2A00B9F3CB /* RCTCxxBridge.mm */; };
 		13134C871E296B2A00B9F3CB /* RCTCxxBridge.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13134C741E296B2A00B9F3CB /* RCTCxxBridge.mm */; };
 		13134C8C1E296B2A00B9F3CB /* RCTMessageThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 13134C771E296B2A00B9F3CB /* RCTMessageThread.h */; };
 		13134C8D1E296B2A00B9F3CB /* RCTMessageThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 13134C771E296B2A00B9F3CB /* RCTMessageThread.h */; };
 		13134C8E1E296B2A00B9F3CB /* RCTMessageThread.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13134C781E296B2A00B9F3CB /* RCTMessageThread.mm */; };
 		13134C8F1E296B2A00B9F3CB /* RCTMessageThread.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13134C781E296B2A00B9F3CB /* RCTMessageThread.mm */; };
-		13134C901E296B2A00B9F3CB /* RCTNativeModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 13134C791E296B2A00B9F3CB /* RCTNativeModule.h */; };
-		13134C911E296B2A00B9F3CB /* RCTNativeModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 13134C791E296B2A00B9F3CB /* RCTNativeModule.h */; };
-		13134C921E296B2A00B9F3CB /* RCTNativeModule.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13134C7A1E296B2A00B9F3CB /* RCTNativeModule.mm */; };
-		13134C931E296B2A00B9F3CB /* RCTNativeModule.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13134C7A1E296B2A00B9F3CB /* RCTNativeModule.mm */; };
 		13134C941E296B2A00B9F3CB /* RCTObjcExecutor.h in Headers */ = {isa = PBXBuildFile; fileRef = 13134C7B1E296B2A00B9F3CB /* RCTObjcExecutor.h */; };
 		13134C951E296B2A00B9F3CB /* RCTObjcExecutor.h in Headers */ = {isa = PBXBuildFile; fileRef = 13134C7B1E296B2A00B9F3CB /* RCTObjcExecutor.h */; };
 		13134C961E296B2A00B9F3CB /* RCTObjcExecutor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13134C7C1E296B2A00B9F3CB /* RCTObjcExecutor.mm */; };
@@ -61,14 +55,27 @@
 		1339578B1DF76D3500EC27BE /* Yoga.h in Headers */ = {isa = PBXBuildFile; fileRef = 130A77081DF767AF001F9587 /* Yoga.h */; };
 		133CAE8E1B8E5CFD00F6AD92 /* RCTDatePicker.m in Sources */ = {isa = PBXBuildFile; fileRef = 133CAE8D1B8E5CFD00F6AD92 /* RCTDatePicker.m */; };
 		13456E931ADAD2DE009F94A7 /* RCTConvert+CoreLocation.m in Sources */ = {isa = PBXBuildFile; fileRef = 13456E921ADAD2DE009F94A7 /* RCTConvert+CoreLocation.m */; };
-		134FCB3D1A6E7F0800051CC8 /* RCTJSCExecutor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 134FCB3A1A6E7F0800051CC8 /* RCTJSCExecutor.mm */; };
 		13513F3C1B1F43F400FCE529 /* RCTProgressViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 13513F3B1B1F43F400FCE529 /* RCTProgressViewManager.m */; };
+		135A9BFB1E7B0EAE00587AEB /* RCTJSCErrorHandling.h in Headers */ = {isa = PBXBuildFile; fileRef = 135A9BF91E7B0EAE00587AEB /* RCTJSCErrorHandling.h */; };
+		135A9BFC1E7B0EAE00587AEB /* RCTJSCErrorHandling.mm in Sources */ = {isa = PBXBuildFile; fileRef = 135A9BFA1E7B0EAE00587AEB /* RCTJSCErrorHandling.mm */; };
+		135A9BFF1E7B0EE600587AEB /* RCTJSCHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 135A9BFD1E7B0EE600587AEB /* RCTJSCHelpers.h */; };
+		135A9C001E7B0EE600587AEB /* RCTJSCHelpers.mm in Sources */ = {isa = PBXBuildFile; fileRef = 135A9BFE1E7B0EE600587AEB /* RCTJSCHelpers.mm */; };
+		135A9C011E7B0F4700587AEB /* systemJSCWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 19DED2281E77E29200F089BB /* systemJSCWrapper.cpp */; };
+		135A9C021E7B0F4800587AEB /* systemJSCWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 19DED2281E77E29200F089BB /* systemJSCWrapper.cpp */; };
+		135A9C031E7B0F6100587AEB /* RCTJSCErrorHandling.h in Headers */ = {isa = PBXBuildFile; fileRef = 135A9BF91E7B0EAE00587AEB /* RCTJSCErrorHandling.h */; };
+		135A9C041E7B0F6400587AEB /* RCTJSCErrorHandling.mm in Sources */ = {isa = PBXBuildFile; fileRef = 135A9BFA1E7B0EAE00587AEB /* RCTJSCErrorHandling.mm */; };
+		135A9C051E7B0F7500587AEB /* RCTJSCHelpers.mm in Sources */ = {isa = PBXBuildFile; fileRef = 135A9BFE1E7B0EE600587AEB /* RCTJSCHelpers.mm */; };
+		135A9C061E7B0F7800587AEB /* RCTJSCHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 135A9BFD1E7B0EE600587AEB /* RCTJSCHelpers.h */; };
 		13723B501A82FD3C00F88898 /* RCTStatusBarManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 13723B4F1A82FD3C00F88898 /* RCTStatusBarManager.m */; };
 		1372B70A1AB030C200659ED6 /* RCTAppState.m in Sources */ = {isa = PBXBuildFile; fileRef = 1372B7091AB030C200659ED6 /* RCTAppState.m */; };
 		137327E71AA5CF210034F82E /* RCTTabBar.m in Sources */ = {isa = PBXBuildFile; fileRef = 137327E01AA5CF210034F82E /* RCTTabBar.m */; };
 		137327E81AA5CF210034F82E /* RCTTabBarItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 137327E21AA5CF210034F82E /* RCTTabBarItem.m */; };
 		137327E91AA5CF210034F82E /* RCTTabBarItemManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 137327E41AA5CF210034F82E /* RCTTabBarItemManager.m */; };
 		137327EA1AA5CF210034F82E /* RCTTabBarManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 137327E61AA5CF210034F82E /* RCTTabBarManager.m */; };
+		1384E2081E806D4E00545659 /* RCTNativeModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 1384E2061E806D4E00545659 /* RCTNativeModule.h */; };
+		1384E2091E806D4E00545659 /* RCTNativeModule.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1384E2071E806D4E00545659 /* RCTNativeModule.mm */; };
+		1384E20A1E806D5700545659 /* RCTNativeModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 1384E2061E806D4E00545659 /* RCTNativeModule.h */; };
+		1384E20B1E806D5B00545659 /* RCTNativeModule.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1384E2071E806D4E00545659 /* RCTNativeModule.mm */; };
 		139D7E4C1E25C5A300323FB7 /* bignum-dtoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E3A1E25C5A300323FB7 /* bignum-dtoa.h */; };
 		139D7E4E1E25C5A300323FB7 /* bignum.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E3C1E25C5A300323FB7 /* bignum.h */; };
 		139D7E501E25C5A300323FB7 /* cached-powers.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E3E1E25C5A300323FB7 /* cached-powers.h */; };
@@ -167,7 +174,6 @@
 		13F880391E296D2800C3C7A1 /* noncopyable.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B1091E0369AD0018521A /* noncopyable.h */; };
 		13F8803A1E296D2800C3C7A1 /* Unicode.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B10B1E0369AD0018521A /* Unicode.h */; };
 		13F8803B1E296D2800C3C7A1 /* Value.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B10D1E0369AD0018521A /* Value.h */; };
-		13F8803C1E296DF600C3C7A1 /* RCTCxxBridge.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13134C731E296B2A00B9F3CB /* RCTCxxBridge.h */; };
 		13F880411E29709F00C3C7A1 /* libdouble-conversion.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139D7E881E25C6D100323FB7 /* libdouble-conversion.a */; };
 		13F887581E2971D400C3C7A1 /* Demangle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 13F887521E2971C500C3C7A1 /* Demangle.cpp */; };
 		13F887591E2971D400C3C7A1 /* StringBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 13F887531E2971C500C3C7A1 /* StringBase.cpp */; };
@@ -214,11 +220,9 @@
 		1450FF871BCFF28A00208362 /* RCTProfileTrampoline-arm.S in Sources */ = {isa = PBXBuildFile; fileRef = 1450FF821BCFF28A00208362 /* RCTProfileTrampoline-arm.S */; };
 		1450FF881BCFF28A00208362 /* RCTProfileTrampoline-arm64.S in Sources */ = {isa = PBXBuildFile; fileRef = 1450FF831BCFF28A00208362 /* RCTProfileTrampoline-arm64.S */; };
 		1450FF8A1BCFF28A00208362 /* RCTProfileTrampoline-x86_64.S in Sources */ = {isa = PBXBuildFile; fileRef = 1450FF851BCFF28A00208362 /* RCTProfileTrampoline-x86_64.S */; };
-		14A43DF31C20B1C900794BC8 /* RCTJSCProfiler.m in Sources */ = {isa = PBXBuildFile; fileRef = 14A43DF21C20B1C900794BC8 /* RCTJSCProfiler.m */; };
 		14C2CA711B3AC63800E6CBB2 /* RCTModuleMethod.m in Sources */ = {isa = PBXBuildFile; fileRef = 14C2CA701B3AC63800E6CBB2 /* RCTModuleMethod.m */; };
 		14C2CA741B3AC64300E6CBB2 /* RCTModuleData.mm in Sources */ = {isa = PBXBuildFile; fileRef = 14C2CA731B3AC64300E6CBB2 /* RCTModuleData.mm */; };
 		14C2CA761B3AC64F00E6CBB2 /* RCTFrameUpdate.m in Sources */ = {isa = PBXBuildFile; fileRef = 14C2CA751B3AC64F00E6CBB2 /* RCTFrameUpdate.m */; };
-		14C2CA781B3ACB0400E6CBB2 /* RCTBatchedBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = 14C2CA771B3ACB0400E6CBB2 /* RCTBatchedBridge.m */; };
 		14F3620D1AABD06A001CE568 /* RCTSwitch.m in Sources */ = {isa = PBXBuildFile; fileRef = 14F362081AABD06A001CE568 /* RCTSwitch.m */; };
 		14F3620E1AABD06A001CE568 /* RCTSwitchManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 14F3620A1AABD06A001CE568 /* RCTSwitchManager.m */; };
 		14F484561AABFCE100FDF6B9 /* RCTSliderManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 14F484551AABFCE100FDF6B9 /* RCTSliderManager.m */; };
@@ -283,7 +287,6 @@
 		2D3B5E931D9B087300451313 /* RCTErrorInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 3EDCA8A41D3591E700450C31 /* RCTErrorInfo.m */; };
 		2D3B5E941D9B087900451313 /* RCTBundleURLProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 68EFE4ED1CF6EB3900A1DE13 /* RCTBundleURLProvider.m */; };
 		2D3B5E951D9B087C00451313 /* RCTAssert.m in Sources */ = {isa = PBXBuildFile; fileRef = 83CBBA4B1A601E3B00E9B192 /* RCTAssert.m */; };
-		2D3B5E961D9B088500451313 /* RCTBatchedBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = 14C2CA771B3ACB0400E6CBB2 /* RCTBatchedBridge.m */; };
 		2D3B5E971D9B089000451313 /* RCTBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = 83CBBA5F1A601EAA00E9B192 /* RCTBridge.m */; };
 		2D3B5E981D9B089500451313 /* RCTConvert.m in Sources */ = {isa = PBXBuildFile; fileRef = 83CBBACB1A6023D300E9B192 /* RCTConvert.m */; };
 		2D3B5E991D9B089A00451313 /* RCTDisplayLink.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D1E68D91CABD13900DD7465 /* RCTDisplayLink.m */; };
@@ -301,7 +304,6 @@
 		2D3B5EA61D9B08CA00451313 /* RCTTouchEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 391E86A21C623EC800009732 /* RCTTouchEvent.m */; };
 		2D3B5EA71D9B08CE00451313 /* RCTTouchHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 83CBBA971A6020BB00E9B192 /* RCTTouchHandler.m */; };
 		2D3B5EA81D9B08D300451313 /* RCTUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 83CBBA501A601E3B00E9B192 /* RCTUtils.m */; };
-		2D3B5EAC1D9B08EF00451313 /* RCTJSCExecutor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 134FCB3A1A6E7F0800051CC8 /* RCTJSCExecutor.mm */; };
 		2D3B5EAE1D9B08F800451313 /* RCTEventEmitter.m in Sources */ = {isa = PBXBuildFile; fileRef = 13D9FEEA1CDCCECF00158BD7 /* RCTEventEmitter.m */; };
 		2D3B5EAF1D9B08FB00451313 /* RCTAccessibilityManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E9B20B7A1B500126007A2DA7 /* RCTAccessibilityManager.m */; };
 		2D3B5EB01D9B08FE00451313 /* RCTAlertManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FE81A69327A00A75B9A /* RCTAlertManager.m */; };
@@ -317,7 +319,6 @@
 		2D3B5EBC1D9B092600451313 /* RCTKeyboardObserver.m in Sources */ = {isa = PBXBuildFile; fileRef = 13D9FEED1CDCD93000158BD7 /* RCTKeyboardObserver.m */; };
 		2D3B5EBD1D9B092A00451313 /* RCTTiming.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FEE1A69327A00A75B9A /* RCTTiming.m */; };
 		2D3B5EBE1D9B092D00451313 /* RCTUIManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 13E067491A70F434002CDEE1 /* RCTUIManager.m */; };
-		2D3B5EBF1D9B093300451313 /* RCTJSCProfiler.m in Sources */ = {isa = PBXBuildFile; fileRef = 14A43DF21C20B1C900794BC8 /* RCTJSCProfiler.m */; };
 		2D3B5EC01D9B093600451313 /* RCTPerfMonitor.m in Sources */ = {isa = PBXBuildFile; fileRef = 14F7A0EB1BDA3B3C003C6C10 /* RCTPerfMonitor.m */; };
 		2D3B5EC11D9B093900451313 /* RCTFPSGraph.m in Sources */ = {isa = PBXBuildFile; fileRef = 14F7A0EF1BDA714B003C6C10 /* RCTFPSGraph.m */; };
 		2D3B5EC21D9B093B00451313 /* RCTProfile.m in Sources */ = {isa = PBXBuildFile; fileRef = 1450FF811BCFF28A00208362 /* RCTProfile.m */; };
@@ -408,8 +409,6 @@
 		3D302F4E1DF828F800D6DDAE /* RCTURLRequestHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 1345A83B1B265A0E00583190 /* RCTURLRequestHandler.h */; };
 		3D302F4F1DF828F800D6DDAE /* RCTUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 83CBBA4F1A601E3B00E9B192 /* RCTUtils.h */; };
 		3D302F501DF828F800D6DDAE /* RCTWebSocketObserverProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DB910701C74B21600838BBE /* RCTWebSocketObserverProtocol.h */; };
-		3D302F521DF828F800D6DDAE /* RCTJSCErrorHandling.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DC724301D8BF99A00808C32 /* RCTJSCErrorHandling.h */; };
-		3D302F531DF828F800D6DDAE /* RCTJSCExecutor.h in Headers */ = {isa = PBXBuildFile; fileRef = 134FCB391A6E7F0800051CC8 /* RCTJSCExecutor.h */; };
 		3D302F541DF828F800D6DDAE /* JSCSamplingProfiler.h in Headers */ = {isa = PBXBuildFile; fileRef = 369123DF1DDC75850095B341 /* JSCSamplingProfiler.h */; };
 		3D302F551DF828F800D6DDAE /* RCTAccessibilityManager.h in Headers */ = {isa = PBXBuildFile; fileRef = E9B20B791B500126007A2DA7 /* RCTAccessibilityManager.h */; };
 		3D302F561DF828F800D6DDAE /* RCTAlertManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B07FE71A69327A00A75B9A /* RCTAlertManager.h */; };
@@ -429,7 +428,6 @@
 		3D302F641DF828F800D6DDAE /* RCTTiming.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B07FED1A69327A00A75B9A /* RCTTiming.h */; };
 		3D302F651DF828F800D6DDAE /* RCTUIManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E067481A70F434002CDEE1 /* RCTUIManager.h */; };
 		3D302F661DF828F800D6DDAE /* RCTFPSGraph.h in Headers */ = {isa = PBXBuildFile; fileRef = 14F7A0EE1BDA714B003C6C10 /* RCTFPSGraph.h */; };
-		3D302F671DF828F800D6DDAE /* RCTJSCProfiler.h in Headers */ = {isa = PBXBuildFile; fileRef = 14A43DF11C20B1C900794BC8 /* RCTJSCProfiler.h */; };
 		3D302F681DF828F800D6DDAE /* RCTMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 14BF71811C04795500C97D0C /* RCTMacros.h */; };
 		3D302F691DF828F800D6DDAE /* RCTProfile.h in Headers */ = {isa = PBXBuildFile; fileRef = 1450FF801BCFF28A00208362 /* RCTProfile.h */; };
 		3D302F6A1DF828F800D6DDAE /* RCTActivityIndicatorView.h in Headers */ = {isa = PBXBuildFile; fileRef = B95154301D1B34B200FE7B80 /* RCTActivityIndicatorView.h */; };
@@ -492,8 +490,6 @@
 		3D7454801E5475AF00E74ADD /* RecoverableError.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7454791E54757500E74ADD /* RecoverableError.h */; };
 		3D7454811E5475AF00E74ADD /* RecoverableError.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7454791E54757500E74ADD /* RecoverableError.h */; };
 		3D7749441DC1065C007EC8D8 /* RCTPlatform.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D7749431DC1065C007EC8D8 /* RCTPlatform.m */; };
-		3D7A27E21DE325B7002E3F95 /* RCTJSCErrorHandling.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3D7A27E11DE325B7002E3F95 /* RCTJSCErrorHandling.mm */; };
-		3D7A27E31DE325DA002E3F95 /* RCTJSCErrorHandling.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3D7A27E11DE325B7002E3F95 /* RCTJSCErrorHandling.mm */; };
 		3D7AA9C41E548CD5001955CF /* NSDataBigString.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3D7AA9C31E548CD5001955CF /* NSDataBigString.mm */; };
 		3D7AA9C51E548CDB001955CF /* NSDataBigString.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7454B31E54786200E74ADD /* NSDataBigString.h */; };
 		3D7AA9C61E548CDD001955CF /* NSDataBigString.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3D7AA9C31E548CD5001955CF /* NSDataBigString.mm */; };
@@ -543,8 +539,6 @@
 		3D80D9491DF6FA890028D040 /* RCTURLRequestHandler.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 1345A83B1B265A0E00583190 /* RCTURLRequestHandler.h */; };
 		3D80D94A1DF6FA890028D040 /* RCTUtils.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 83CBBA4F1A601E3B00E9B192 /* RCTUtils.h */; };
 		3D80D94B1DF6FA890028D040 /* RCTWebSocketObserverProtocol.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3DB910701C74B21600838BBE /* RCTWebSocketObserverProtocol.h */; };
-		3D80D94D1DF6FA890028D040 /* RCTJSCErrorHandling.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3DC724301D8BF99A00808C32 /* RCTJSCErrorHandling.h */; };
-		3D80D94E1DF6FA890028D040 /* RCTJSCExecutor.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 134FCB391A6E7F0800051CC8 /* RCTJSCExecutor.h */; };
 		3D80D94F1DF6FA890028D040 /* JSCSamplingProfiler.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 369123DF1DDC75850095B341 /* JSCSamplingProfiler.h */; };
 		3D80D9501DF6FA890028D040 /* RCTAccessibilityManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = E9B20B791B500126007A2DA7 /* RCTAccessibilityManager.h */; };
 		3D80D9511DF6FA890028D040 /* RCTAlertManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13B07FE71A69327A00A75B9A /* RCTAlertManager.h */; };
@@ -564,7 +558,6 @@
 		3D80D95F1DF6FA890028D040 /* RCTTiming.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13B07FED1A69327A00A75B9A /* RCTTiming.h */; };
 		3D80D9601DF6FA890028D040 /* RCTUIManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13E067481A70F434002CDEE1 /* RCTUIManager.h */; };
 		3D80D9611DF6FA890028D040 /* RCTFPSGraph.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 14F7A0EE1BDA714B003C6C10 /* RCTFPSGraph.h */; };
-		3D80D9621DF6FA890028D040 /* RCTJSCProfiler.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 14A43DF11C20B1C900794BC8 /* RCTJSCProfiler.h */; };
 		3D80D9631DF6FA890028D040 /* RCTMacros.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 14BF71811C04795500C97D0C /* RCTMacros.h */; };
 		3D80D9641DF6FA890028D040 /* RCTProfile.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 1450FF801BCFF28A00208362 /* RCTProfile.h */; };
 		3D80D9651DF6FA890028D040 /* RCTActivityIndicatorView.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = B95154301D1B34B200FE7B80 /* RCTActivityIndicatorView.h */; };
@@ -661,8 +654,6 @@
 		3D80DA431DF820620028D040 /* RCTURLRequestHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 1345A83B1B265A0E00583190 /* RCTURLRequestHandler.h */; };
 		3D80DA441DF820620028D040 /* RCTUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 83CBBA4F1A601E3B00E9B192 /* RCTUtils.h */; };
 		3D80DA451DF820620028D040 /* RCTWebSocketObserverProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DB910701C74B21600838BBE /* RCTWebSocketObserverProtocol.h */; };
-		3D80DA471DF820620028D040 /* RCTJSCErrorHandling.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DC724301D8BF99A00808C32 /* RCTJSCErrorHandling.h */; };
-		3D80DA481DF820620028D040 /* RCTJSCExecutor.h in Headers */ = {isa = PBXBuildFile; fileRef = 134FCB391A6E7F0800051CC8 /* RCTJSCExecutor.h */; };
 		3D80DA491DF820620028D040 /* JSCSamplingProfiler.h in Headers */ = {isa = PBXBuildFile; fileRef = 369123DF1DDC75850095B341 /* JSCSamplingProfiler.h */; };
 		3D80DA4A1DF820620028D040 /* RCTAccessibilityManager.h in Headers */ = {isa = PBXBuildFile; fileRef = E9B20B791B500126007A2DA7 /* RCTAccessibilityManager.h */; };
 		3D80DA4B1DF820620028D040 /* RCTAlertManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B07FE71A69327A00A75B9A /* RCTAlertManager.h */; };
@@ -682,7 +673,6 @@
 		3D80DA591DF820620028D040 /* RCTTiming.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B07FED1A69327A00A75B9A /* RCTTiming.h */; };
 		3D80DA5A1DF820620028D040 /* RCTUIManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E067481A70F434002CDEE1 /* RCTUIManager.h */; };
 		3D80DA5B1DF820620028D040 /* RCTFPSGraph.h in Headers */ = {isa = PBXBuildFile; fileRef = 14F7A0EE1BDA714B003C6C10 /* RCTFPSGraph.h */; };
-		3D80DA5C1DF820620028D040 /* RCTJSCProfiler.h in Headers */ = {isa = PBXBuildFile; fileRef = 14A43DF11C20B1C900794BC8 /* RCTJSCProfiler.h */; };
 		3D80DA5D1DF820620028D040 /* RCTMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 14BF71811C04795500C97D0C /* RCTMacros.h */; };
 		3D80DA5E1DF820620028D040 /* RCTProfile.h in Headers */ = {isa = PBXBuildFile; fileRef = 1450FF801BCFF28A00208362 /* RCTProfile.h */; };
 		3D80DA5F1DF820620028D040 /* RCTActivityIndicatorView.h in Headers */ = {isa = PBXBuildFile; fileRef = B95154301D1B34B200FE7B80 /* RCTActivityIndicatorView.h */; };
@@ -809,8 +799,6 @@
 		3DA981E41E5B0F29004F2374 /* RCTURLRequestHandler.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 1345A83B1B265A0E00583190 /* RCTURLRequestHandler.h */; };
 		3DA981E51E5B0F29004F2374 /* RCTUtils.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 83CBBA4F1A601E3B00E9B192 /* RCTUtils.h */; };
 		3DA981E61E5B0F29004F2374 /* RCTWebSocketObserverProtocol.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3DB910701C74B21600838BBE /* RCTWebSocketObserverProtocol.h */; };
-		3DA981E71E5B0F7F004F2374 /* RCTJSCErrorHandling.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3DC724301D8BF99A00808C32 /* RCTJSCErrorHandling.h */; };
-		3DA981E81E5B0F7F004F2374 /* RCTJSCExecutor.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 134FCB391A6E7F0800051CC8 /* RCTJSCExecutor.h */; };
 		3DA981E91E5B0F7F004F2374 /* JSCSamplingProfiler.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 369123DF1DDC75850095B341 /* JSCSamplingProfiler.h */; };
 		3DA981EA1E5B0F7F004F2374 /* RCTAccessibilityManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = E9B20B791B500126007A2DA7 /* RCTAccessibilityManager.h */; };
 		3DA981EB1E5B0F7F004F2374 /* RCTAlertManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13B07FE71A69327A00A75B9A /* RCTAlertManager.h */; };
@@ -830,7 +818,6 @@
 		3DA981F91E5B0F7F004F2374 /* RCTTiming.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13B07FED1A69327A00A75B9A /* RCTTiming.h */; };
 		3DA981FA1E5B0F7F004F2374 /* RCTUIManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13E067481A70F434002CDEE1 /* RCTUIManager.h */; };
 		3DA981FB1E5B0F7F004F2374 /* RCTFPSGraph.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 14F7A0EE1BDA714B003C6C10 /* RCTFPSGraph.h */; };
-		3DA981FC1E5B0F7F004F2374 /* RCTJSCProfiler.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 14A43DF11C20B1C900794BC8 /* RCTJSCProfiler.h */; };
 		3DA981FD1E5B0F7F004F2374 /* RCTMacros.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 14BF71811C04795500C97D0C /* RCTMacros.h */; };
 		3DA981FE1E5B0F7F004F2374 /* RCTProfile.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 1450FF801BCFF28A00208362 /* RCTProfile.h */; };
 		3DA981FF1E5B0F7F004F2374 /* RCTActivityIndicatorView.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = B95154301D1B34B200FE7B80 /* RCTActivityIndicatorView.h */; };
@@ -1058,8 +1045,6 @@
 			dstPath = include/React;
 			dstSubfolderSpec = 16;
 			files = (
-				3DA981E71E5B0F7F004F2374 /* RCTJSCErrorHandling.h in Copy Headers */,
-				3DA981E81E5B0F7F004F2374 /* RCTJSCExecutor.h in Copy Headers */,
 				3DA981E91E5B0F7F004F2374 /* JSCSamplingProfiler.h in Copy Headers */,
 				3DA981EA1E5B0F7F004F2374 /* RCTAccessibilityManager.h in Copy Headers */,
 				3DA981EB1E5B0F7F004F2374 /* RCTAlertManager.h in Copy Headers */,
@@ -1079,7 +1064,6 @@
 				3DA981F91E5B0F7F004F2374 /* RCTTiming.h in Copy Headers */,
 				3DA981FA1E5B0F7F004F2374 /* RCTUIManager.h in Copy Headers */,
 				3DA981FB1E5B0F7F004F2374 /* RCTFPSGraph.h in Copy Headers */,
-				3DA981FC1E5B0F7F004F2374 /* RCTJSCProfiler.h in Copy Headers */,
 				3DA981FD1E5B0F7F004F2374 /* RCTMacros.h in Copy Headers */,
 				3DA981FE1E5B0F7F004F2374 /* RCTProfile.h in Copy Headers */,
 				3DA981FF1E5B0F7F004F2374 /* RCTActivityIndicatorView.h in Copy Headers */,
@@ -1252,7 +1236,6 @@
 			dstPath = include/React;
 			dstSubfolderSpec = 16;
 			files = (
-				13F8803C1E296DF600C3C7A1 /* RCTCxxBridge.h in Copy Headers */,
 				3D80D91F1DF6FA890028D040 /* RCTImageLoader.h in Copy Headers */,
 				3D80D9201DF6FA890028D040 /* RCTImageStoreManager.h in Copy Headers */,
 				3D80D9211DF6FA890028D040 /* RCTResizeMode.h in Copy Headers */,
@@ -1297,8 +1280,6 @@
 				3D80D9491DF6FA890028D040 /* RCTURLRequestHandler.h in Copy Headers */,
 				3D80D94A1DF6FA890028D040 /* RCTUtils.h in Copy Headers */,
 				3D80D94B1DF6FA890028D040 /* RCTWebSocketObserverProtocol.h in Copy Headers */,
-				3D80D94D1DF6FA890028D040 /* RCTJSCErrorHandling.h in Copy Headers */,
-				3D80D94E1DF6FA890028D040 /* RCTJSCExecutor.h in Copy Headers */,
 				3D80D94F1DF6FA890028D040 /* JSCSamplingProfiler.h in Copy Headers */,
 				3D80D9501DF6FA890028D040 /* RCTAccessibilityManager.h in Copy Headers */,
 				3D80D9511DF6FA890028D040 /* RCTAlertManager.h in Copy Headers */,
@@ -1318,7 +1299,6 @@
 				3D80D95F1DF6FA890028D040 /* RCTTiming.h in Copy Headers */,
 				3D80D9601DF6FA890028D040 /* RCTUIManager.h in Copy Headers */,
 				3D80D9611DF6FA890028D040 /* RCTFPSGraph.h in Copy Headers */,
-				3D80D9621DF6FA890028D040 /* RCTJSCProfiler.h in Copy Headers */,
 				3D80D9631DF6FA890028D040 /* RCTMacros.h in Copy Headers */,
 				3D80D9641DF6FA890028D040 /* RCTProfile.h in Copy Headers */,
 				3D80D9651DF6FA890028D040 /* RCTActivityIndicatorView.h in Copy Headers */,
@@ -1469,12 +1449,9 @@
 		130A77081DF767AF001F9587 /* Yoga.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Yoga.h; sourceTree = "<group>"; };
 		130E3D861E6A082100ACE484 /* RCTDevSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTDevSettings.h; sourceTree = "<group>"; };
 		130E3D871E6A082100ACE484 /* RCTDevSettings.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTDevSettings.mm; sourceTree = "<group>"; };
-		13134C731E296B2A00B9F3CB /* RCTCxxBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTCxxBridge.h; sourceTree = "<group>"; };
 		13134C741E296B2A00B9F3CB /* RCTCxxBridge.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTCxxBridge.mm; sourceTree = "<group>"; };
 		13134C771E296B2A00B9F3CB /* RCTMessageThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTMessageThread.h; sourceTree = "<group>"; };
 		13134C781E296B2A00B9F3CB /* RCTMessageThread.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTMessageThread.mm; sourceTree = "<group>"; };
-		13134C791E296B2A00B9F3CB /* RCTNativeModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTNativeModule.h; sourceTree = "<group>"; };
-		13134C7A1E296B2A00B9F3CB /* RCTNativeModule.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTNativeModule.mm; sourceTree = "<group>"; };
 		13134C7B1E296B2A00B9F3CB /* RCTObjcExecutor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTObjcExecutor.h; sourceTree = "<group>"; };
 		13134C7C1E296B2A00B9F3CB /* RCTObjcExecutor.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTObjcExecutor.mm; sourceTree = "<group>"; };
 		13134C7E1E296B2A00B9F3CB /* RCTCxxMethod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTCxxMethod.h; sourceTree = "<group>"; };
@@ -1497,10 +1474,12 @@
 		13456E921ADAD2DE009F94A7 /* RCTConvert+CoreLocation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "RCTConvert+CoreLocation.m"; sourceTree = "<group>"; };
 		1345A83A1B265A0E00583190 /* RCTURLRequestDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTURLRequestDelegate.h; sourceTree = "<group>"; };
 		1345A83B1B265A0E00583190 /* RCTURLRequestHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTURLRequestHandler.h; sourceTree = "<group>"; };
-		134FCB391A6E7F0800051CC8 /* RCTJSCExecutor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTJSCExecutor.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
-		134FCB3A1A6E7F0800051CC8 /* RCTJSCExecutor.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTJSCExecutor.mm; sourceTree = "<group>"; };
 		13513F3A1B1F43F400FCE529 /* RCTProgressViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTProgressViewManager.h; sourceTree = "<group>"; };
 		13513F3B1B1F43F400FCE529 /* RCTProgressViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTProgressViewManager.m; sourceTree = "<group>"; };
+		135A9BF91E7B0EAE00587AEB /* RCTJSCErrorHandling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTJSCErrorHandling.h; sourceTree = "<group>"; };
+		135A9BFA1E7B0EAE00587AEB /* RCTJSCErrorHandling.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTJSCErrorHandling.mm; sourceTree = "<group>"; };
+		135A9BFD1E7B0EE600587AEB /* RCTJSCHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTJSCHelpers.h; sourceTree = "<group>"; };
+		135A9BFE1E7B0EE600587AEB /* RCTJSCHelpers.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTJSCHelpers.mm; sourceTree = "<group>"; };
 		13723B4E1A82FD3C00F88898 /* RCTStatusBarManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTStatusBarManager.h; sourceTree = "<group>"; };
 		13723B4F1A82FD3C00F88898 /* RCTStatusBarManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTStatusBarManager.m; sourceTree = "<group>"; };
 		1372B7081AB030C200659ED6 /* RCTAppState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTAppState.h; sourceTree = "<group>"; };
@@ -1513,6 +1492,8 @@
 		137327E41AA5CF210034F82E /* RCTTabBarItemManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTabBarItemManager.m; sourceTree = "<group>"; };
 		137327E51AA5CF210034F82E /* RCTTabBarManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTabBarManager.h; sourceTree = "<group>"; };
 		137327E61AA5CF210034F82E /* RCTTabBarManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTabBarManager.m; sourceTree = "<group>"; };
+		1384E2061E806D4E00545659 /* RCTNativeModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTNativeModule.h; sourceTree = "<group>"; };
+		1384E2071E806D4E00545659 /* RCTNativeModule.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTNativeModule.mm; sourceTree = "<group>"; };
 		139D7E391E25C5A300323FB7 /* bignum-dtoa.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "bignum-dtoa.cc"; path = "double-conversion-1.1.5/src/bignum-dtoa.cc"; sourceTree = "<group>"; };
 		139D7E3A1E25C5A300323FB7 /* bignum-dtoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "bignum-dtoa.h"; path = "double-conversion-1.1.5/src/bignum-dtoa.h"; sourceTree = "<group>"; };
 		139D7E3B1E25C5A300323FB7 /* bignum.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = bignum.cc; path = "double-conversion-1.1.5/src/bignum.cc"; sourceTree = "<group>"; };
@@ -1652,8 +1633,6 @@
 		1450FF851BCFF28A00208362 /* RCTProfileTrampoline-x86_64.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = "RCTProfileTrampoline-x86_64.S"; sourceTree = "<group>"; };
 		1482F9E61B55B927000ADFF3 /* RCTBridgeDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTBridgeDelegate.h; sourceTree = "<group>"; };
 		14A43DB81C1F849600794BC8 /* RCTBridge+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RCTBridge+Private.h"; sourceTree = "<group>"; };
-		14A43DF11C20B1C900794BC8 /* RCTJSCProfiler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTJSCProfiler.h; sourceTree = "<group>"; };
-		14A43DF21C20B1C900794BC8 /* RCTJSCProfiler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTJSCProfiler.m; sourceTree = "<group>"; };
 		14BF717F1C04793D00C97D0C /* RCTProfileTrampoline-i386.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = "RCTProfileTrampoline-i386.S"; sourceTree = "<group>"; };
 		14BF71811C04795500C97D0C /* RCTMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTMacros.h; sourceTree = "<group>"; };
 		14C2CA6F1B3AC63800E6CBB2 /* RCTModuleMethod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTModuleMethod.h; sourceTree = "<group>"; };
@@ -1661,7 +1640,6 @@
 		14C2CA721B3AC64300E6CBB2 /* RCTModuleData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTModuleData.h; sourceTree = "<group>"; };
 		14C2CA731B3AC64300E6CBB2 /* RCTModuleData.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTModuleData.mm; sourceTree = "<group>"; };
 		14C2CA751B3AC64F00E6CBB2 /* RCTFrameUpdate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTFrameUpdate.m; sourceTree = "<group>"; };
-		14C2CA771B3ACB0400E6CBB2 /* RCTBatchedBridge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTBatchedBridge.m; sourceTree = "<group>"; };
 		14F362071AABD06A001CE568 /* RCTSwitch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTSwitch.h; sourceTree = "<group>"; };
 		14F362081AABD06A001CE568 /* RCTSwitch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTSwitch.m; sourceTree = "<group>"; };
 		14F362091AABD06A001CE568 /* RCTSwitchManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTSwitchManager.h; sourceTree = "<group>"; };
@@ -1675,7 +1653,7 @@
 		191E3EBD1C29D9AF00C180A6 /* RCTRefreshControlManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTRefreshControlManager.m; sourceTree = "<group>"; };
 		191E3EBF1C29DC3800C180A6 /* RCTRefreshControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTRefreshControl.h; sourceTree = "<group>"; };
 		191E3EC01C29DC3800C180A6 /* RCTRefreshControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTRefreshControl.m; sourceTree = "<group>"; };
-		19DED2281E77E29200F089BB /* systemJSCWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = systemJSCWrapper.cpp; path = ../jschelpers/systemJSCWrapper.cpp; sourceTree = "<group>"; };
+		19DED2281E77E29200F089BB /* systemJSCWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = systemJSCWrapper.cpp; sourceTree = "<group>"; };
 		27B958731E57587D0096647A /* JSBigString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSBigString.cpp; sourceTree = "<group>"; };
 		2D2A28131D9B038B00D4039D /* libReact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libReact.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		352DCFEE1D19F4C20056D623 /* RCTI18nUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTI18nUtil.h; sourceTree = "<group>"; };
@@ -1710,7 +1688,6 @@
 		3D7A27DC1DE32541002E3F95 /* JavaScriptCore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavaScriptCore.h; sourceTree = "<group>"; };
 		3D7A27DD1DE32541002E3F95 /* JSCWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCWrapper.cpp; sourceTree = "<group>"; };
 		3D7A27DE1DE32541002E3F95 /* JSCWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCWrapper.h; sourceTree = "<group>"; };
-		3D7A27E11DE325B7002E3F95 /* RCTJSCErrorHandling.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTJSCErrorHandling.mm; sourceTree = "<group>"; };
 		3D7AA9C31E548CD5001955CF /* NSDataBigString.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NSDataBigString.mm; sourceTree = "<group>"; };
 		3D92B0A71E03699D0018521A /* CxxModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CxxModule.h; sourceTree = "<group>"; };
 		3D92B0A81E03699D0018521A /* CxxNativeModule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CxxNativeModule.cpp; sourceTree = "<group>"; };
@@ -1764,7 +1741,6 @@
 		3D92B10C1E0369AD0018521A /* Value.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Value.cpp; sourceTree = "<group>"; };
 		3D92B10D1E0369AD0018521A /* Value.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Value.h; sourceTree = "<group>"; };
 		3DB910701C74B21600838BBE /* RCTWebSocketObserverProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTWebSocketObserverProtocol.h; sourceTree = "<group>"; };
-		3DC724301D8BF99A00808C32 /* RCTJSCErrorHandling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTJSCErrorHandling.h; sourceTree = "<group>"; };
 		3EDCA8A21D3591E700450C31 /* RCTErrorCustomizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTErrorCustomizer.h; sourceTree = "<group>"; };
 		3EDCA8A31D3591E700450C31 /* RCTErrorInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTErrorInfo.h; sourceTree = "<group>"; };
 		3EDCA8A41D3591E700450C31 /* RCTErrorInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTErrorInfo.m; sourceTree = "<group>"; };
@@ -1904,12 +1880,11 @@
 			children = (
 				3D7454B31E54786200E74ADD /* NSDataBigString.h */,
 				3D7AA9C31E548CD5001955CF /* NSDataBigString.mm */,
-				13134C731E296B2A00B9F3CB /* RCTCxxBridge.h */,
 				13134C741E296B2A00B9F3CB /* RCTCxxBridge.mm */,
+				135A9BFD1E7B0EE600587AEB /* RCTJSCHelpers.h */,
+				135A9BFE1E7B0EE600587AEB /* RCTJSCHelpers.mm */,
 				13134C771E296B2A00B9F3CB /* RCTMessageThread.h */,
 				13134C781E296B2A00B9F3CB /* RCTMessageThread.mm */,
-				13134C791E296B2A00B9F3CB /* RCTNativeModule.h */,
-				13134C7A1E296B2A00B9F3CB /* RCTNativeModule.mm */,
 				13134C7B1E296B2A00B9F3CB /* RCTObjcExecutor.h */,
 				13134C7C1E296B2A00B9F3CB /* RCTObjcExecutor.mm */,
 			);
@@ -1919,6 +1894,8 @@
 		13134C7D1E296B2A00B9F3CB /* CxxModule */ = {
 			isa = PBXGroup;
 			children = (
+				1384E2061E806D4E00545659 /* RCTNativeModule.h */,
+				1384E2071E806D4E00545659 /* RCTNativeModule.mm */,
 				13134C7E1E296B2A00B9F3CB /* RCTCxxMethod.h */,
 				13134C7F1E296B2A00B9F3CB /* RCTCxxMethod.mm */,
 				13134C801E296B2A00B9F3CB /* RCTCxxModule.h */,
@@ -1929,17 +1906,6 @@
 			path = CxxModule;
 			sourceTree = "<group>";
 		};
-		134FCB381A6E7F0800051CC8 /* Executors */ = {
-			isa = PBXGroup;
-			children = (
-				3DC724301D8BF99A00808C32 /* RCTJSCErrorHandling.h */,
-				3D7A27E11DE325B7002E3F95 /* RCTJSCErrorHandling.mm */,
-				134FCB391A6E7F0800051CC8 /* RCTJSCExecutor.h */,
-				134FCB3A1A6E7F0800051CC8 /* RCTJSCExecutor.mm */,
-			);
-			path = Executors;
-			sourceTree = "<group>";
-		};
 		139D7E381E25C55B00323FB7 /* double-conversion */ = {
 			isa = PBXGroup;
 			children = (
@@ -2183,8 +2149,6 @@
 			children = (
 				14F7A0EE1BDA714B003C6C10 /* RCTFPSGraph.h */,
 				14F7A0EF1BDA714B003C6C10 /* RCTFPSGraph.m */,
-				14A43DF11C20B1C900794BC8 /* RCTJSCProfiler.h */,
-				14A43DF21C20B1C900794BC8 /* RCTJSCProfiler.m */,
 				14BF71811C04795500C97D0C /* RCTMacros.h */,
 				14F7A0EB1BDA3B3C003C6C10 /* RCTPerfMonitor.m */,
 				1450FF801BCFF28A00208362 /* RCTProfile.h */,
@@ -2258,6 +2222,7 @@
 		3D4A621D1DDD3985001F41B4 /* jschelpers */ = {
 			isa = PBXGroup;
 			children = (
+				19DED2281E77E29200F089BB /* systemJSCWrapper.cpp */,
 				3D7A27DC1DE32541002E3F95 /* JavaScriptCore.h */,
 				3D92B1071E0369AD0018521A /* JSCHelpers.cpp */,
 				3D92B1081E0369AD0018521A /* JSCHelpers.h */,
@@ -2321,7 +2286,6 @@
 				13134C721E296B2A00B9F3CB /* CxxBridge */,
 				13134C7D1E296B2A00B9F3CB /* CxxModule */,
 				83CBBA491A601E3B00E9B192 /* Base */,
-				134FCB381A6E7F0800051CC8 /* Executors */,
 				13B07FE01A69315300A75B9A /* Modules */,
 				1450FF7F1BCFF28A00208362 /* Profiler */,
 				13B07FF31A6947C200A75B9A /* Views */,
@@ -2332,9 +2296,10 @@
 		83CBBA491A601E3B00E9B192 /* Base */ = {
 			isa = PBXGroup;
 			children = (
+				135A9BF91E7B0EAE00587AEB /* RCTJSCErrorHandling.h */,
+				135A9BFA1E7B0EAE00587AEB /* RCTJSCErrorHandling.mm */,
 				83CBBA4A1A601E3B00E9B192 /* RCTAssert.h */,
 				83CBBA4B1A601E3B00E9B192 /* RCTAssert.m */,
-				14C2CA771B3ACB0400E6CBB2 /* RCTBatchedBridge.m */,
 				83CBBA5E1A601EAA00E9B192 /* RCTBridge.h */,
 				83CBBA5F1A601EAA00E9B192 /* RCTBridge.m */,
 				14A43DB81C1F849600794BC8 /* RCTBridge+Private.h */,
@@ -2455,7 +2420,6 @@
 				3D7454791E54757500E74ADD /* RecoverableError.h */,
 				3D92B0D31E03699D0018521A /* SampleCxxModule.cpp */,
 				3D92B0D41E03699D0018521A /* SampleCxxModule.h */,
-				19DED2281E77E29200F089BB /* systemJSCWrapper.cpp */,
 				3D92B0D51E03699D0018521A /* SystraceSection.h */,
 			);
 			path = cxxreact;
@@ -2524,6 +2488,7 @@
 				3D302F3C1DF828F800D6DDAE /* RCTJavaScriptLoader.h in Headers */,
 				3D302F3D1DF828F800D6DDAE /* RCTJSStackFrame.h in Headers */,
 				3D302F3E1DF828F800D6DDAE /* RCTKeyCommands.h in Headers */,
+				135A9C031E7B0F6100587AEB /* RCTJSCErrorHandling.h in Headers */,
 				3D302F3F1DF828F800D6DDAE /* RCTLog.h in Headers */,
 				3D302F401DF828F800D6DDAE /* RCTModuleData.h in Headers */,
 				3D302F411DF828F800D6DDAE /* RCTModuleMethod.h in Headers */,
@@ -2541,8 +2506,6 @@
 				3D302F4E1DF828F800D6DDAE /* RCTURLRequestHandler.h in Headers */,
 				3D302F4F1DF828F800D6DDAE /* RCTUtils.h in Headers */,
 				3D302F501DF828F800D6DDAE /* RCTWebSocketObserverProtocol.h in Headers */,
-				3D302F521DF828F800D6DDAE /* RCTJSCErrorHandling.h in Headers */,
-				3D302F531DF828F800D6DDAE /* RCTJSCExecutor.h in Headers */,
 				3D302F541DF828F800D6DDAE /* JSCSamplingProfiler.h in Headers */,
 				3D302F551DF828F800D6DDAE /* RCTAccessibilityManager.h in Headers */,
 				3D302F561DF828F800D6DDAE /* RCTAlertManager.h in Headers */,
@@ -2562,7 +2525,6 @@
 				3D302F641DF828F800D6DDAE /* RCTTiming.h in Headers */,
 				3D302F651DF828F800D6DDAE /* RCTUIManager.h in Headers */,
 				3D302F661DF828F800D6DDAE /* RCTFPSGraph.h in Headers */,
-				3D302F671DF828F800D6DDAE /* RCTJSCProfiler.h in Headers */,
 				3D302F681DF828F800D6DDAE /* RCTMacros.h in Headers */,
 				3D302F691DF828F800D6DDAE /* RCTProfile.h in Headers */,
 				3D302F6A1DF828F800D6DDAE /* RCTActivityIndicatorView.h in Headers */,
@@ -2576,6 +2538,7 @@
 				3D302F721DF828F800D6DDAE /* RCTConvert+CoreLocation.h in Headers */,
 				3D302F761DF828F800D6DDAE /* RCTFont.h in Headers */,
 				3D302F7B1DF828F800D6DDAE /* RCTModalHostView.h in Headers */,
+				1384E20A1E806D5700545659 /* RCTNativeModule.h in Headers */,
 				3D302F7C1DF828F800D6DDAE /* RCTModalHostViewController.h in Headers */,
 				3D302F7D1DF828F800D6DDAE /* RCTModalHostViewManager.h in Headers */,
 				3D302F7E1DF828F800D6DDAE /* RCTNavigator.h in Headers */,
@@ -2583,6 +2546,7 @@
 				130443DD1E401AF500D93A67 /* RCTConvert+Transform.h in Headers */,
 				3D302F801DF828F800D6DDAE /* RCTNavItem.h in Headers */,
 				3D302F811DF828F800D6DDAE /* RCTNavItemManager.h in Headers */,
+				135A9C061E7B0F7800587AEB /* RCTJSCHelpers.h in Headers */,
 				3D302F841DF828F800D6DDAE /* RCTPointerEvents.h in Headers */,
 				3D302F851DF828F800D6DDAE /* RCTProgressViewManager.h in Headers */,
 				3D302F861DF828F800D6DDAE /* RCTRefreshControl.h in Headers */,
@@ -2610,9 +2574,7 @@
 				3D302F9A1DF828F800D6DDAE /* RCTViewManager.h in Headers */,
 				3D302F9D1DF828F800D6DDAE /* RCTWrapperViewController.h in Headers */,
 				3D302F9F1DF828F800D6DDAE /* UIView+React.h in Headers */,
-				13134C911E296B2A00B9F3CB /* RCTNativeModule.h in Headers */,
 				13134CA11E296B2A00B9F3CB /* RCTCxxUtils.h in Headers */,
-				13134C851E296B2A00B9F3CB /* RCTCxxBridge.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2743,7 +2705,6 @@
 				3D80DA191DF820620028D040 /* RCTImageLoader.h in Headers */,
 				13134C941E296B2A00B9F3CB /* RCTObjcExecutor.h in Headers */,
 				3D80DA1A1DF820620028D040 /* RCTImageStoreManager.h in Headers */,
-				13134C841E296B2A00B9F3CB /* RCTCxxBridge.h in Headers */,
 				130443A11E3FEAA900D93A67 /* RCTFollyConvert.h in Headers */,
 				59FBEFB41E46D91C0095D885 /* RCTScrollContentViewManager.h in Headers */,
 				3D80DA1B1DF820620028D040 /* RCTResizeMode.h in Headers */,
@@ -2767,6 +2728,7 @@
 				139D7E541E25C5A300323FB7 /* double-conversion.h in Headers */,
 				3D80DA2A1DF820620028D040 /* RCTErrorCustomizer.h in Headers */,
 				3D80DA2B1DF820620028D040 /* RCTErrorInfo.h in Headers */,
+				1384E2081E806D4E00545659 /* RCTNativeModule.h in Headers */,
 				3D80DA2C1DF820620028D040 /* RCTEventDispatcher.h in Headers */,
 				3D80DA2D1DF820620028D040 /* RCTFrameUpdate.h in Headers */,
 				3D80DA2E1DF820620028D040 /* RCTImageSource.h in Headers */,
@@ -2774,6 +2736,7 @@
 				3D80DA2F1DF820620028D040 /* RCTInvalidating.h in Headers */,
 				139D7E5C1E25C5A300323FB7 /* utils.h in Headers */,
 				3D80DA301DF820620028D040 /* RCTJavaScriptExecutor.h in Headers */,
+				135A9BFF1E7B0EE600587AEB /* RCTJSCHelpers.h in Headers */,
 				3D80DA311DF820620028D040 /* RCTJavaScriptLoader.h in Headers */,
 				130E3D881E6A082100ACE484 /* RCTDevSettings.h in Headers */,
 				3D80DA321DF820620028D040 /* RCTJSStackFrame.h in Headers */,
@@ -2791,6 +2754,7 @@
 				3D80DA3B1DF820620028D040 /* RCTPerformanceLogger.h in Headers */,
 				3D80DA3C1DF820620028D040 /* RCTPlatform.h in Headers */,
 				3D80DA3D1DF820620028D040 /* RCTRootView.h in Headers */,
+				135A9BFB1E7B0EAE00587AEB /* RCTJSCErrorHandling.h in Headers */,
 				3D80DA3E1DF820620028D040 /* RCTRootViewDelegate.h in Headers */,
 				3D80DA3F1DF820620028D040 /* RCTRootViewInternal.h in Headers */,
 				3D80DA401DF820620028D040 /* RCTTouchEvent.h in Headers */,
@@ -2798,13 +2762,10 @@
 				13F880391E296D2800C3C7A1 /* noncopyable.h in Headers */,
 				13134C8C1E296B2A00B9F3CB /* RCTMessageThread.h in Headers */,
 				3D80DA421DF820620028D040 /* RCTURLRequestDelegate.h in Headers */,
-				13134C901E296B2A00B9F3CB /* RCTNativeModule.h in Headers */,
 				3D80DA431DF820620028D040 /* RCTURLRequestHandler.h in Headers */,
 				3D80DA441DF820620028D040 /* RCTUtils.h in Headers */,
 				3D80DA451DF820620028D040 /* RCTWebSocketObserverProtocol.h in Headers */,
 				139D7EEA1E25DBDC00323FB7 /* symbolize.h in Headers */,
-				3D80DA471DF820620028D040 /* RCTJSCErrorHandling.h in Headers */,
-				3D80DA481DF820620028D040 /* RCTJSCExecutor.h in Headers */,
 				13134C981E296B2A00B9F3CB /* RCTCxxMethod.h in Headers */,
 				3D80DA491DF820620028D040 /* JSCSamplingProfiler.h in Headers */,
 				3D80DA4A1DF820620028D040 /* RCTAccessibilityManager.h in Headers */,
@@ -2827,7 +2788,6 @@
 				3D80DA591DF820620028D040 /* RCTTiming.h in Headers */,
 				3D80DA5A1DF820620028D040 /* RCTUIManager.h in Headers */,
 				3D80DA5B1DF820620028D040 /* RCTFPSGraph.h in Headers */,
-				3D80DA5C1DF820620028D040 /* RCTJSCProfiler.h in Headers */,
 				3D80DA5D1DF820620028D040 /* RCTMacros.h in Headers */,
 				3D80DA5E1DF820620028D040 /* RCTProfile.h in Headers */,
 				3D80DA5F1DF820620028D040 /* RCTActivityIndicatorView.h in Headers */,
@@ -3267,7 +3227,6 @@
 				2DD0EFE11DA84F2800B0C975 /* RCTStatusBarManager.m in Sources */,
 				2D3B5EC91D9B095C00451313 /* RCTBorderDrawing.m in Sources */,
 				2D3B5E991D9B089A00451313 /* RCTDisplayLink.m in Sources */,
-				2D3B5EBF1D9B093300451313 /* RCTJSCProfiler.m in Sources */,
 				2D3B5EA11D9B08B600451313 /* RCTModuleData.mm in Sources */,
 				2D3B5EEA1D9B09CD00451313 /* RCTTabBar.m in Sources */,
 				2D3B5EAE1D9B08F800451313 /* RCTEventEmitter.m in Sources */,
@@ -3304,16 +3263,14 @@
 				2D3B5E951D9B087C00451313 /* RCTAssert.m in Sources */,
 				2D3B5EB61D9B091400451313 /* RCTExceptionsManager.m in Sources */,
 				2D3B5EEB1D9B09D000451313 /* RCTTabBarItem.m in Sources */,
-				2D3B5E961D9B088500451313 /* RCTBatchedBridge.m in Sources */,
 				2D3B5ED41D9B097D00451313 /* RCTModalHostView.m in Sources */,
 				2D3B5E9F1D9B08AF00451313 /* RCTKeyCommands.m in Sources */,
 				2D3B5EA51D9B08C700451313 /* RCTRootView.m in Sources */,
-				2D3B5EAC1D9B08EF00451313 /* RCTJSCExecutor.mm in Sources */,
 				13134C871E296B2A00B9F3CB /* RCTCxxBridge.mm in Sources */,
 				CF2731C31E7B8DF30044CA4F /* RCTDeviceInfo.m in Sources */,
 				2D3B5EB11D9B090100451313 /* RCTAppState.m in Sources */,
+				1384E20B1E806D5B00545659 /* RCTNativeModule.mm in Sources */,
 				2D3B5EC21D9B093B00451313 /* RCTProfile.m in Sources */,
-				13134C931E296B2A00B9F3CB /* RCTNativeModule.mm in Sources */,
 				2D3B5ECB1D9B096200451313 /* RCTConvert+CoreLocation.m in Sources */,
 				2D3B5EEE1D9B09DA00451313 /* RCTView.m in Sources */,
 				2D3B5E981D9B089500451313 /* RCTConvert.m in Sources */,
@@ -3327,12 +3284,12 @@
 				2D3B5EB81D9B091B00451313 /* RCTSourceCode.m in Sources */,
 				2D3B5EB51D9B091100451313 /* RCTDevMenu.m in Sources */,
 				2D3B5EBD1D9B092A00451313 /* RCTTiming.m in Sources */,
+				135A9C041E7B0F6400587AEB /* RCTJSCErrorHandling.mm in Sources */,
 				2D3B5EA81D9B08D300451313 /* RCTUtils.m in Sources */,
 				2D3B5EC81D9B095800451313 /* RCTActivityIndicatorViewManager.m in Sources */,
 				3DCD185D1DF978E7007FE5A1 /* RCTReloadCommand.m in Sources */,
 				130443DB1E401ADD00D93A67 /* RCTConvert+Transform.m in Sources */,
 				2D3B5EC61D9B095000451313 /* RCTProfileTrampoline-x86_64.S in Sources */,
-				3D7A27E31DE325DA002E3F95 /* RCTJSCErrorHandling.mm in Sources */,
 				2D3B5EA61D9B08CA00451313 /* RCTTouchEvent.m in Sources */,
 				2D8C2E331DA40441000EE098 /* RCTMultipartStreamReader.m in Sources */,
 				2D3B5EF01D9B09E300451313 /* RCTWrapperViewController.m in Sources */,
@@ -3356,6 +3313,7 @@
 				2D3B5E9A1D9B089D00451313 /* RCTEventDispatcher.m in Sources */,
 				2D3B5ED61D9B098400451313 /* RCTModalHostViewManager.m in Sources */,
 				2D3B5EE51D9B09BE00451313 /* RCTShadowView.m in Sources */,
+				135A9C051E7B0F7500587AEB /* RCTJSCHelpers.mm in Sources */,
 				2D3B5EC71D9B095600451313 /* RCTActivityIndicatorView.m in Sources */,
 				2D3B5EB21D9B090300451313 /* RCTAsyncLocalStorage.m in Sources */,
 				2D3B5EC01D9B093600451313 /* RCTPerfMonitor.m in Sources */,
@@ -3387,6 +3345,7 @@
 				13EBC6711E2870DE00880AC5 /* JSCWrapper.cpp in Sources */,
 				13EBC6731E2870DE00880AC5 /* Value.cpp in Sources */,
 				13EBC67D1E28725900880AC5 /* JSCHelpers.cpp in Sources */,
+				135A9C021E7B0F4800587AEB /* systemJSCWrapper.cpp in Sources */,
 				13EBC67B1E28723000880AC5 /* Unicode.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -3398,6 +3357,7 @@
 				13EBC6791E2870E400880AC5 /* Unicode.cpp in Sources */,
 				13EBC6781E2870E400880AC5 /* JSCWrapper.cpp in Sources */,
 				13EBC6771E2870E400880AC5 /* JSCHelpers.cpp in Sources */,
+				135A9C011E7B0F4700587AEB /* systemJSCWrapper.cpp in Sources */,
 				13EBC67A1E2870E400880AC5 /* Value.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -3460,7 +3420,6 @@
 				59FBEFB61E46D91C0095D885 /* RCTScrollContentViewManager.m in Sources */,
 				13723B501A82FD3C00F88898 /* RCTStatusBarManager.m in Sources */,
 				000E6CEB1AB0E980000CDF4D /* RCTSourceCode.m in Sources */,
-				14A43DF31C20B1C900794BC8 /* RCTJSCProfiler.m in Sources */,
 				001BFCD01D8381DE008E587E /* RCTMultipartStreamReader.m in Sources */,
 				133CAE8E1B8E5CFD00F6AD92 /* RCTDatePicker.m in Sources */,
 				14C2CA761B3AC64F00E6CBB2 /* RCTFrameUpdate.m in Sources */,
@@ -3510,13 +3469,10 @@
 				13B080051A6947C200A75B9A /* RCTScrollView.m in Sources */,
 				A2440AA31DF8D854006E7BFC /* RCTReloadCommand.m in Sources */,
 				E9B20B7B1B500126007A2DA7 /* RCTAccessibilityManager.m in Sources */,
-				3D7A27E21DE325B7002E3F95 /* RCTJSCErrorHandling.mm in Sources */,
 				13A0C2891B74F71200B29F6F /* RCTDevLoadingView.m in Sources */,
 				13B07FF21A69327A00A75B9A /* RCTTiming.m in Sources */,
 				1372B70A1AB030C200659ED6 /* RCTAppState.m in Sources */,
 				59A7B9FE1E577DBF0068EDBF /* RCTRootContentView.m in Sources */,
-				134FCB3D1A6E7F0800051CC8 /* RCTJSCExecutor.mm in Sources */,
-				14C2CA781B3ACB0400E6CBB2 /* RCTBatchedBridge.m in Sources */,
 				13E067591A70F44B002CDEE1 /* UIView+React.m in Sources */,
 				14F484561AABFCE100FDF6B9 /* RCTSliderManager.m in Sources */,
 				CF2731C11E7B8DE40044CA4F /* RCTDeviceInfo.m in Sources */,
@@ -3532,6 +3488,7 @@
 				13E067571A70F44B002CDEE1 /* RCTView.m in Sources */,
 				3D7749441DC1065C007EC8D8 /* RCTPlatform.m in Sources */,
 				13D9FEEE1CDCD93000158BD7 /* RCTKeyboardObserver.m in Sources */,
+				135A9C001E7B0EE600587AEB /* RCTJSCHelpers.mm in Sources */,
 				B233E6EA1D2D845D00BC68BA /* RCTI18nManager.m in Sources */,
 				13456E931ADAD2DE009F94A7 /* RCTConvert+CoreLocation.m in Sources */,
 				137327E91AA5CF210034F82E /* RCTTabBarItemManager.m in Sources */,
@@ -3543,7 +3500,6 @@
 				83CBBA601A601EAA00E9B192 /* RCTBridge.m in Sources */,
 				13C156061AB1A2840079392D /* RCTWebViewManager.m in Sources */,
 				139D7EE71E25DBDC00323FB7 /* signalhandler.cc in Sources */,
-				13134C921E296B2A00B9F3CB /* RCTNativeModule.mm in Sources */,
 				58114A161AAE854800E7D092 /* RCTPicker.m in Sources */,
 				137327E81AA5CF210034F82E /* RCTTabBarItem.m in Sources */,
 				83A1FE8C1B62640A00BE0E65 /* RCTModalHostView.m in Sources */,
@@ -3558,12 +3514,13 @@
 				13B0801A1A69489C00A75B9A /* RCTNavigator.m in Sources */,
 				137327E71AA5CF210034F82E /* RCTTabBar.m in Sources */,
 				13F17A851B8493E5007D4C75 /* RCTRedBox.m in Sources */,
+				135A9BFC1E7B0EAE00587AEB /* RCTJSCErrorHandling.mm in Sources */,
 				83392EB31B6634E10013B15F /* RCTModalHostViewController.m in Sources */,
 				13B0801C1A69489C00A75B9A /* RCTNavItem.m in Sources */,
-				19DED2291E77E29200F089BB /* systemJSCWrapper.cpp in Sources */,
 				83CBBA691A601EF300E9B192 /* RCTEventDispatcher.m in Sources */,
 				83A1FE8F1B62643A00BE0E65 /* RCTModalHostViewManager.m in Sources */,
 				13E0674A1A70F434002CDEE1 /* RCTUIManager.m in Sources */,
+				1384E2091E806D4E00545659 /* RCTNativeModule.mm in Sources */,
 				391E86A41C623EC800009732 /* RCTTouchEvent.m in Sources */,
 				1450FF861BCFF28A00208362 /* RCTProfile.m in Sources */,
 				13AB90C11B6FA36700713B4F /* RCTComponentData.m in Sources */,

From 462352e609102d137df1ce45220cd5b54d9b3bd4 Mon Sep 17 00:00:00 2001
From: Spencer Ahrens <sahrens@fb.com>
Date: Tue, 21 Mar 2017 22:18:57 -0700
Subject: [PATCH 130/366] add jest snapshot tests

Reviewed By: yungsters

Differential Revision: D4726519

fbshipit-source-id: 1ae98743cdb89acb2708d84073527015dbeee906
---
 .../Lists/__tests__/FlatList-test.js          |  64 ++++
 .../Lists/__tests__/SectionList-test.js       |  67 +++++
 .../__snapshots__/FlatList-test.js.snap       | 247 +++++++++++++++
 .../__snapshots__/SectionList-test.js.snap    | 281 ++++++++++++++++++
 4 files changed, 659 insertions(+)
 create mode 100644 Libraries/CustomComponents/Lists/__tests__/FlatList-test.js
 create mode 100644 Libraries/CustomComponents/Lists/__tests__/SectionList-test.js
 create mode 100644 Libraries/CustomComponents/Lists/__tests__/__snapshots__/FlatList-test.js.snap
 create mode 100644 Libraries/CustomComponents/Lists/__tests__/__snapshots__/SectionList-test.js.snap

diff --git a/Libraries/CustomComponents/Lists/__tests__/FlatList-test.js b/Libraries/CustomComponents/Lists/__tests__/FlatList-test.js
new file mode 100644
index 00000000000000..945e5f64e64361
--- /dev/null
+++ b/Libraries/CustomComponents/Lists/__tests__/FlatList-test.js
@@ -0,0 +1,64 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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.
+ *
+ */
+'use strict';
+
+jest.disableAutomock();
+
+const React = require('React');
+const ReactTestRenderer = require('react-test-renderer');
+
+const FlatList = require('FlatList');
+
+describe('FlatList', () => {
+  it('renders simple list', () => {
+    const component = ReactTestRenderer.create(
+      <FlatList
+        data={[{key: 'i1'}, {key: 'i2'}, {key: 'i3'}]}
+        renderItem={({item}) => <item value={item.key} />}
+      />
+    );
+    expect(component).toMatchSnapshot();
+  });
+  it('renders empty list', () => {
+    const component = ReactTestRenderer.create(
+      <FlatList
+        data={[]}
+        renderItem={({item}) => <item value={item.key} />}
+      />
+    );
+    expect(component).toMatchSnapshot();
+  });
+  it('renders null list', () => {
+    const component = ReactTestRenderer.create(
+      <FlatList
+        data={undefined}
+        renderItem={({item}) => <item value={item.key} />}
+      />
+    );
+    expect(component).toMatchSnapshot();
+  });
+  it('renders all the bells and whistles', () => {
+    const component = ReactTestRenderer.create(
+      <FlatList
+        ItemSeparatorComponent={() => <separator />}
+        ListFooterComponent={() => <footer />}
+        ListHeaderComponent={() => <header />}
+        data={new Array(5).fill().map((_, ii) => ({id: String(ii)}))}
+        keyExtractor={(item, index) => item.id}
+        getItemLayout={({index}) => ({length: 50, offset: index * 50})}
+        numColumns={2}
+        refreshing={false}
+        onRefresh={jest.fn()}
+        renderItem={({item}) => <item value={item.id} />}
+      />
+    );
+    expect(component).toMatchSnapshot();
+  });
+});
diff --git a/Libraries/CustomComponents/Lists/__tests__/SectionList-test.js b/Libraries/CustomComponents/Lists/__tests__/SectionList-test.js
new file mode 100644
index 00000000000000..945e660261eb2a
--- /dev/null
+++ b/Libraries/CustomComponents/Lists/__tests__/SectionList-test.js
@@ -0,0 +1,67 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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.
+ *
+ */
+'use strict';
+
+jest.disableAutomock();
+
+const React = require('React');
+const ReactTestRenderer = require('react-test-renderer');
+
+const SectionList = require('SectionList');
+
+describe('SectionList', () => {
+  it('renders empty list', () => {
+    const component = ReactTestRenderer.create(
+      <SectionList
+        sections={[]}
+        renderItem={({item}) => <item value={item.key} />}
+      />
+    );
+    expect(component).toMatchSnapshot();
+  });
+  it('rendering empty section headers is fine', () => {
+    const component = ReactTestRenderer.create(
+      <SectionList
+        sections={[{key: 's1', data: [{key: 'i1'}, {key: 'i2'}]}]}
+        renderItem={({item}) => <item value={item.key} />}
+        renderSectionHeader={() => null}
+      />
+    );
+    expect(component).toMatchSnapshot();
+  });
+  it('renders all the bells and whistles', () => {
+    const component = ReactTestRenderer.create(
+      <SectionList
+        ItemSeparatorComponent={() => <defaultItemSeparator />}
+        ListFooterComponent={() => <footer />}
+        ListHeaderComponent={() => <header />}
+        SectionSeparatorComponent={() => <sectionSeparator />}
+        sections={[
+          {
+            renderItem: ({item}) => <itemForSection1 value={item.id} />,
+            key: '1st Section',
+            keyExtractor: (item, index) => item.id,
+            SeparatorComponent: () => <itemSeparatorForSection1 />,
+            data: [{id: 'i1s1'}, {id: 'i2s1'}],
+          },
+          {
+            key: '2nd Section',
+            data: [{key: 'i1s2'}, {key: 'i2s2'}],
+          },
+        ]}
+        refreshing={false}
+        onRefresh={jest.fn()}
+        renderItem={({item}) => <defaultItem value={item.key} />}
+        renderSectionHeader={({section}) => <sectionHeader value={section.key} />}
+      />
+    );
+    expect(component).toMatchSnapshot();
+  });
+});
diff --git a/Libraries/CustomComponents/Lists/__tests__/__snapshots__/FlatList-test.js.snap b/Libraries/CustomComponents/Lists/__tests__/__snapshots__/FlatList-test.js.snap
new file mode 100644
index 00000000000000..cafff52235495f
--- /dev/null
+++ b/Libraries/CustomComponents/Lists/__tests__/__snapshots__/FlatList-test.js.snap
@@ -0,0 +1,247 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`FlatList renders all the bells and whistles 1`] = `
+<RCTScrollView
+  ItemSeparatorComponent={[Function]}
+  ListFooterComponent={[Function]}
+  ListHeaderComponent={[Function]}
+  data={
+    Array [
+      Object {
+        "id": "0",
+      },
+      Object {
+        "id": "1",
+      },
+      Object {
+        "id": "2",
+      },
+      Object {
+        "id": "3",
+      },
+      Object {
+        "id": "4",
+      },
+    ]
+  }
+  disableVirtualization={false}
+  getItem={[Function]}
+  getItemCount={[Function]}
+  getItemLayout={[Function]}
+  horizontal={false}
+  initialNumToRender={10}
+  keyExtractor={[Function]}
+  maxToRenderPerBatch={10}
+  numColumns={2}
+  onContentSizeChange={[Function]}
+  onEndReached={[Function]}
+  onEndReachedThreshold={2}
+  onLayout={[Function]}
+  onRefresh={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onViewableItemsChanged={undefined}
+  refreshControl={
+    <RefreshControlMock
+      onRefresh={[Function]}
+      refreshing={false}
+    />
+  }
+  refreshing={false}
+  removeClippedSubviews={true}
+  renderItem={[Function]}
+  renderScrollComponent={[Function]}
+  scrollEventThrottle={50}
+  shouldItemUpdate={[Function]}
+  updateCellsBatchingPeriod={50}
+  windowSize={21}
+>
+  <RCTRefreshControl />
+  <View>
+    <View
+      onLayout={[Function]}
+    >
+      <header />
+    </View>
+    <View
+      style={
+        Array [
+          Object {
+            "flexDirection": "row",
+          },
+          undefined,
+        ]
+      }
+    >
+      <item
+        value="0"
+      />
+      <item
+        value="1"
+      />
+    </View>
+    <separator />
+    <View
+      style={
+        Array [
+          Object {
+            "flexDirection": "row",
+          },
+          undefined,
+        ]
+      }
+    >
+      <item
+        value="2"
+      />
+      <item
+        value="3"
+      />
+    </View>
+    <separator />
+    <View
+      style={
+        Array [
+          Object {
+            "flexDirection": "row",
+          },
+          undefined,
+        ]
+      }
+    >
+      <item
+        value="4"
+      />
+    </View>
+    <View
+      onLayout={[Function]}
+    >
+      <footer />
+    </View>
+  </View>
+</RCTScrollView>
+`;
+
+exports[`FlatList renders empty list 1`] = `
+<RCTScrollView
+  data={Array []}
+  disableVirtualization={false}
+  getItem={[Function]}
+  getItemCount={[Function]}
+  horizontal={false}
+  initialNumToRender={10}
+  keyExtractor={[Function]}
+  maxToRenderPerBatch={10}
+  numColumns={1}
+  onContentSizeChange={[Function]}
+  onEndReached={[Function]}
+  onEndReachedThreshold={2}
+  onLayout={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onViewableItemsChanged={undefined}
+  removeClippedSubviews={true}
+  renderItem={[Function]}
+  renderScrollComponent={[Function]}
+  scrollEventThrottle={50}
+  shouldItemUpdate={[Function]}
+  updateCellsBatchingPeriod={50}
+  windowSize={21}
+>
+  <View />
+</RCTScrollView>
+`;
+
+exports[`FlatList renders null list 1`] = `
+<RCTScrollView
+  data={undefined}
+  disableVirtualization={false}
+  getItem={[Function]}
+  getItemCount={[Function]}
+  horizontal={false}
+  initialNumToRender={10}
+  keyExtractor={[Function]}
+  maxToRenderPerBatch={10}
+  numColumns={1}
+  onContentSizeChange={[Function]}
+  onEndReached={[Function]}
+  onEndReachedThreshold={2}
+  onLayout={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onViewableItemsChanged={undefined}
+  removeClippedSubviews={true}
+  renderItem={[Function]}
+  renderScrollComponent={[Function]}
+  scrollEventThrottle={50}
+  shouldItemUpdate={[Function]}
+  updateCellsBatchingPeriod={50}
+  windowSize={21}
+>
+  <View />
+</RCTScrollView>
+`;
+
+exports[`FlatList renders simple list 1`] = `
+<RCTScrollView
+  data={
+    Array [
+      Object {
+        "key": "i1",
+      },
+      Object {
+        "key": "i2",
+      },
+      Object {
+        "key": "i3",
+      },
+    ]
+  }
+  disableVirtualization={false}
+  getItem={[Function]}
+  getItemCount={[Function]}
+  horizontal={false}
+  initialNumToRender={10}
+  keyExtractor={[Function]}
+  maxToRenderPerBatch={10}
+  numColumns={1}
+  onContentSizeChange={[Function]}
+  onEndReached={[Function]}
+  onEndReachedThreshold={2}
+  onLayout={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onViewableItemsChanged={undefined}
+  removeClippedSubviews={true}
+  renderItem={[Function]}
+  renderScrollComponent={[Function]}
+  scrollEventThrottle={50}
+  shouldItemUpdate={[Function]}
+  updateCellsBatchingPeriod={50}
+  windowSize={21}
+>
+  <View>
+    <View
+      onLayout={[Function]}
+    >
+      <item
+        value="i1"
+      />
+    </View>
+    <View
+      onLayout={[Function]}
+    >
+      <item
+        value="i2"
+      />
+    </View>
+    <View
+      onLayout={[Function]}
+    >
+      <item
+        value="i3"
+      />
+    </View>
+  </View>
+</RCTScrollView>
+`;
diff --git a/Libraries/CustomComponents/Lists/__tests__/__snapshots__/SectionList-test.js.snap b/Libraries/CustomComponents/Lists/__tests__/__snapshots__/SectionList-test.js.snap
new file mode 100644
index 00000000000000..5b4f27b3dd2f00
--- /dev/null
+++ b/Libraries/CustomComponents/Lists/__tests__/__snapshots__/SectionList-test.js.snap
@@ -0,0 +1,281 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`SectionList rendering empty section headers is fine 1`] = `
+<RCTScrollView
+  ItemSeparatorComponent={undefined}
+  data={
+    Array [
+      Object {
+        "data": Array [
+          Object {
+            "key": "i1",
+          },
+          Object {
+            "key": "i2",
+          },
+        ],
+        "key": "s1",
+      },
+    ]
+  }
+  disableVirtualization={false}
+  getItem={[Function]}
+  getItemCount={[Function]}
+  horizontal={false}
+  initialNumToRender={10}
+  isItemSticky={[Function]}
+  keyExtractor={[Function]}
+  maxToRenderPerBatch={10}
+  onContentSizeChange={[Function]}
+  onEndReached={[Function]}
+  onEndReachedThreshold={2}
+  onLayout={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onViewableItemsChanged={undefined}
+  removeClippedSubviews={true}
+  renderItem={[Function]}
+  renderScrollComponent={[Function]}
+  renderSectionHeader={[Function]}
+  scrollEventThrottle={50}
+  sections={
+    Array [
+      Object {
+        "data": Array [
+          Object {
+            "key": "i1",
+          },
+          Object {
+            "key": "i2",
+          },
+        ],
+        "key": "s1",
+      },
+    ]
+  }
+  shouldItemUpdate={[Function]}
+  updateCellsBatchingPeriod={50}
+  windowSize={21}
+>
+  <View>
+    <View
+      onLayout={[Function]}
+    />
+    <View
+      onLayout={[Function]}
+    >
+      <View>
+        <item
+          value="i1"
+        />
+      </View>
+    </View>
+    <View
+      onLayout={[Function]}
+    >
+      <View>
+        <item
+          value="i2"
+        />
+      </View>
+    </View>
+  </View>
+</RCTScrollView>
+`;
+
+exports[`SectionList renders all the bells and whistles 1`] = `
+<RCTScrollView
+  ItemSeparatorComponent={undefined}
+  ListFooterComponent={[Function]}
+  ListHeaderComponent={[Function]}
+  SectionSeparatorComponent={[Function]}
+  data={
+    Array [
+      Object {
+        "SeparatorComponent": [Function],
+        "data": Array [
+          Object {
+            "id": "i1s1",
+          },
+          Object {
+            "id": "i2s1",
+          },
+        ],
+        "key": "1st Section",
+        "keyExtractor": [Function],
+        "renderItem": [Function],
+      },
+      Object {
+        "data": Array [
+          Object {
+            "key": "i1s2",
+          },
+          Object {
+            "key": "i2s2",
+          },
+        ],
+        "key": "2nd Section",
+      },
+    ]
+  }
+  disableVirtualization={false}
+  getItem={[Function]}
+  getItemCount={[Function]}
+  horizontal={false}
+  initialNumToRender={10}
+  isItemSticky={[Function]}
+  keyExtractor={[Function]}
+  maxToRenderPerBatch={10}
+  onContentSizeChange={[Function]}
+  onEndReached={[Function]}
+  onEndReachedThreshold={2}
+  onLayout={[Function]}
+  onRefresh={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onViewableItemsChanged={undefined}
+  refreshControl={
+    <RefreshControlMock
+      onRefresh={[Function]}
+      refreshing={false}
+    />
+  }
+  refreshing={false}
+  removeClippedSubviews={true}
+  renderItem={[Function]}
+  renderScrollComponent={[Function]}
+  renderSectionHeader={[Function]}
+  scrollEventThrottle={50}
+  sections={
+    Array [
+      Object {
+        "SeparatorComponent": [Function],
+        "data": Array [
+          Object {
+            "id": "i1s1",
+          },
+          Object {
+            "id": "i2s1",
+          },
+        ],
+        "key": "1st Section",
+        "keyExtractor": [Function],
+        "renderItem": [Function],
+      },
+      Object {
+        "data": Array [
+          Object {
+            "key": "i1s2",
+          },
+          Object {
+            "key": "i2s2",
+          },
+        ],
+        "key": "2nd Section",
+      },
+    ]
+  }
+  shouldItemUpdate={[Function]}
+  updateCellsBatchingPeriod={50}
+  windowSize={21}
+>
+  <RCTRefreshControl />
+  <View>
+    <View
+      onLayout={[Function]}
+    >
+      <header />
+    </View>
+    <View
+      onLayout={[Function]}
+    >
+      <sectionHeader
+        value="1st Section"
+      />
+    </View>
+    <View
+      onLayout={[Function]}
+    >
+      <View>
+        <itemForSection1
+          value="i1s1"
+        />
+        <itemSeparatorForSection1 />
+      </View>
+    </View>
+    <View
+      onLayout={[Function]}
+    >
+      <View>
+        <itemForSection1
+          value="i2s1"
+        />
+        <sectionSeparator />
+      </View>
+    </View>
+    <View
+      onLayout={[Function]}
+    >
+      <sectionHeader
+        value="2nd Section"
+      />
+    </View>
+    <View
+      onLayout={[Function]}
+    >
+      <View>
+        <defaultItem
+          value="i1s2"
+        />
+        <defaultItemSeparator />
+      </View>
+    </View>
+    <View
+      onLayout={[Function]}
+    >
+      <View>
+        <defaultItem
+          value="i2s2"
+        />
+      </View>
+    </View>
+    <View
+      onLayout={[Function]}
+    >
+      <footer />
+    </View>
+  </View>
+</RCTScrollView>
+`;
+
+exports[`SectionList renders empty list 1`] = `
+<RCTScrollView
+  ItemSeparatorComponent={undefined}
+  data={Array []}
+  disableVirtualization={false}
+  getItem={[Function]}
+  getItemCount={[Function]}
+  horizontal={false}
+  initialNumToRender={10}
+  isItemSticky={[Function]}
+  keyExtractor={[Function]}
+  maxToRenderPerBatch={10}
+  onContentSizeChange={[Function]}
+  onEndReached={[Function]}
+  onEndReachedThreshold={2}
+  onLayout={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onViewableItemsChanged={undefined}
+  removeClippedSubviews={true}
+  renderItem={[Function]}
+  renderScrollComponent={[Function]}
+  scrollEventThrottle={50}
+  sections={Array []}
+  shouldItemUpdate={[Function]}
+  updateCellsBatchingPeriod={50}
+  windowSize={21}
+>
+  <View />
+</RCTScrollView>
+`;

From edd5624fde9b34c9210bb018e1ae89aa59f19553 Mon Sep 17 00:00:00 2001
From: Spencer Ahrens <sahrens@fb.com>
Date: Tue, 21 Mar 2017 22:18:59 -0700
Subject: [PATCH 131/366] invariants around scrollToIndex without getItemLayout

Summary: People might be tempted to try and scrollTo an index that hasn't been rendered yet, which is broken, so instead of jank let's throw.

Reviewed By: yungsters

Differential Revision: D4727402

fbshipit-source-id: b6f9fd5b70b6f076c30141d00b2b9e2a51b14e87
---
 .../CustomComponents/Lists/VirtualizedList.js  | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/Libraries/CustomComponents/Lists/VirtualizedList.js b/Libraries/CustomComponents/Lists/VirtualizedList.js
index 9040fcf1b81763..62faf5ffbb2101 100644
--- a/Libraries/CustomComponents/Lists/VirtualizedList.js
+++ b/Libraries/CustomComponents/Lists/VirtualizedList.js
@@ -195,12 +195,17 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
 
   // scrollToIndex may be janky without getItemLayout prop
   scrollToIndex(params: {animated?: ?boolean, index: number, viewPosition?: number}) {
-    const {data, horizontal, getItemCount} = this.props;
+    const {data, horizontal, getItemCount, getItemLayout} = this.props;
     const {animated, index, viewPosition} = params;
-    if (!(index >= 0 && index < getItemCount(data))) {
-      console.warn('scrollToIndex out of range ' + index);
-      return;
-    }
+    invariant(
+      index >= 0 && index < getItemCount(data),
+      `scrollToIndex out of range: ${index} vs ${getItemCount(data) - 1}`,
+    );
+    invariant(
+      getItemLayout || index < this._highestMeasuredFrameIndex,
+      'scrollToIndex should be used in conjunction with getItemLayout, ' +
+        'otherwise there is no way to know the location of an arbitrary index.',
+    );
     const frame = this._getFrameMetricsApprox(index);
     const offset = Math.max(
       0,
@@ -390,6 +395,9 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
       }
       if (!disableVirtualization && last < itemCount - 1) {
         const lastFrame = this._getFrameMetricsApprox(last);
+        // Without getItemLayout, we limit our tail spacer to the _highestMeasuredFrameIndex to
+        // prevent the user for hyperscrolling into un-measured area because otherwise content will
+        // likely jump around as it renders in above the viewport.
         const end = this.props.getItemLayout ?
           itemCount - 1 :
           Math.min(itemCount - 1, this._highestMeasuredFrameIndex);

From 7861fdd974eda93befbb045c18d7671480fdeb4a Mon Sep 17 00:00:00 2001
From: Spencer Ahrens <sahrens@fb.com>
Date: Tue, 21 Mar 2017 22:19:01 -0700
Subject: [PATCH 132/366] Componentize Spindicator and add to
 SectionListExample

Reviewed By: yungsters

Differential Revision: D4688309

fbshipit-source-id: 4e1c70039050170cc0bc2eca0bba0fd077c692d2
---
 Examples/UIExplorer/js/FlatListExample.js    | 17 ++-----------
 Examples/UIExplorer/js/ListExampleShared.js  | 25 ++++++++++++++++++++
 Examples/UIExplorer/js/SectionListExample.js | 15 +++++++++++-
 3 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/Examples/UIExplorer/js/FlatListExample.js b/Examples/UIExplorer/js/FlatListExample.js
index 6ff92e6dcdf24e..080cf6c3586033 100644
--- a/Examples/UIExplorer/js/FlatListExample.js
+++ b/Examples/UIExplorer/js/FlatListExample.js
@@ -42,6 +42,7 @@ const {
   ItemComponent,
   PlainInput,
   SeparatorComponent,
+  Spindicator,
   genItemData,
   getItemLayout,
   pressItem,
@@ -120,15 +121,7 @@ class FlatListExample extends React.PureComponent {
             {renderSmallSwitchOption(this, 'fixedHeight')}
             {renderSmallSwitchOption(this, 'logViewable')}
             {renderSmallSwitchOption(this, 'debug')}
-            <Animated.View style={[styles.spindicator, {
-              transform: [
-                {rotate: this._scrollPos.interpolate({
-                  inputRange: [0, 5000],
-                  outputRange: ['0deg', '360deg'],
-                  extrapolate: 'extend',
-                })}
-              ]
-            }]} />
+            <Spindicator value={this._scrollPos} />
           </View>
         </View>
         <SeparatorComponent />
@@ -222,12 +215,6 @@ const styles = StyleSheet.create({
   searchRow: {
     paddingHorizontal: 10,
   },
-  spindicator: {
-    marginLeft: 'auto',
-    width: 2,
-    height: 16,
-    backgroundColor: 'darkgray',
-  },
 });
 
 module.exports = FlatListExample;
diff --git a/Examples/UIExplorer/js/ListExampleShared.js b/Examples/UIExplorer/js/ListExampleShared.js
index d4a870cdd87055..abaf10d967527c 100644
--- a/Examples/UIExplorer/js/ListExampleShared.js
+++ b/Examples/UIExplorer/js/ListExampleShared.js
@@ -26,6 +26,7 @@
 const React = require('react');
 const ReactNative = require('react-native');
 const {
+  Animated,
   Image,
   Platform,
   TouchableHighlight,
@@ -129,6 +130,22 @@ class SeparatorComponent extends React.PureComponent {
   }
 }
 
+class Spindicator extends React.PureComponent {
+  render() {
+    return (
+      <Animated.View style={[styles.spindicator, {
+        transform: [
+          {rotate: this.props.value.interpolate({
+            inputRange: [0, 5000],
+            outputRange: ['0deg', '360deg'],
+            extrapolate: 'extend',
+          })}
+        ]
+      }]} />
+    );
+  }
+}
+
 const THUMB_URLS = [
   require('./Thumbnails/like.png'),
   require('./Thumbnails/dislike.png'),
@@ -266,6 +283,13 @@ const styles = StyleSheet.create({
     width: 64,
     height: 64,
   },
+  spindicator: {
+    marginLeft: 'auto',
+    marginTop: 8,
+    width: 2,
+    height: 16,
+    backgroundColor: 'darkgray',
+  },
   stackedText: {
     padding: 4,
     fontSize: 18,
@@ -281,6 +305,7 @@ module.exports = {
   ItemComponent,
   PlainInput,
   SeparatorComponent,
+  Spindicator,
   genItemData,
   getItemLayout,
   pressItem,
diff --git a/Examples/UIExplorer/js/SectionListExample.js b/Examples/UIExplorer/js/SectionListExample.js
index 08ed9572d8976e..6a2a36f91a1aff 100644
--- a/Examples/UIExplorer/js/SectionListExample.js
+++ b/Examples/UIExplorer/js/SectionListExample.js
@@ -26,6 +26,7 @@
 const React = require('react');
 const ReactNative = require('react-native');
 const {
+  Animated,
   SectionList,
   StyleSheet,
   Text,
@@ -42,12 +43,15 @@ const {
   ItemComponent,
   PlainInput,
   SeparatorComponent,
+  Spindicator,
   genItemData,
   pressItem,
   renderSmallSwitchOption,
   renderStackedItem,
 } = require('./ListExampleShared');
 
+const AnimatedSectionList = Animated.createAnimatedComponent(SectionList);
+
 const VIEWABILITY_CONFIG = {
   minimumViewTime: 3000,
   viewAreaCoveragePercentThreshold: 100,
@@ -79,6 +83,13 @@ class SectionListExample extends React.PureComponent {
     logViewable: false,
     virtualized: true,
   };
+
+  _scrollPos = new Animated.Value(0);
+  _scrollSinkY = Animated.event(
+    [{nativeEvent: { contentOffset: { y: this._scrollPos } }}],
+    {useNativeDriver: true},
+  );
+
   render() {
     const filterRegex = new RegExp(String(this.state.filterText), 'i');
     const filter = (item) => (
@@ -100,10 +111,11 @@ class SectionListExample extends React.PureComponent {
           <View style={styles.optionSection}>
             {renderSmallSwitchOption(this, 'virtualized')}
             {renderSmallSwitchOption(this, 'logViewable')}
+            <Spindicator value={this._scrollPos} />
           </View>
         </View>
         <SeparatorComponent />
-        <SectionList
+        <AnimatedSectionList
           ListHeaderComponent={HeaderComponent}
           ListFooterComponent={FooterComponent}
           SectionSeparatorComponent={() =>
@@ -114,6 +126,7 @@ class SectionListExample extends React.PureComponent {
           }
           enableVirtualization={this.state.virtualized}
           onRefresh={() => alert('onRefresh: nothing to refresh :P')}
+          onScroll={this._scrollSinkY}
           onViewableItemsChanged={this._onViewableItemsChanged}
           refreshing={false}
           renderItem={this._renderItemComponent}

From 72670bf8d2b1556c2e8e5381477b652a1deaeda2 Mon Sep 17 00:00:00 2001
From: Spencer Ahrens <sahrens@fb.com>
Date: Tue, 21 Mar 2017 22:19:03 -0700
Subject: [PATCH 133/366] support sticky headers

Summary:
This adds support for both automagical sticky section headers in
`SectionList` as well as the more free-form `stickyHeaderIndices` on
`FlatList` or `VirtualizedList`.

The basic concept is to take the initial `stickySectionHeaders` and remap them
to the indices corresponding to the mounted subset in the render window. The
main trick here is that the currently stuck header might itself be outside of
the render window, so we need to search the gap to see if that's the case and
render it (with spacers above and below it instead of one big spacer).

In the `SectionList` we simply pre-compute the sticky headers at the same time
as when we scan the sections to determine the flattened length and pass those
to `VirtualizedList`.

This also requires some updates to `ScrollView` to work in the churny
environment of `VirtualizedList`. We propogate the keys on the children to the
animated wrappers so that as items are removed and the indices of the
remaining items change, react can keep proper track of them. We also fix the
scroll back case where new headers are rendered from the top down and aren't
updated with the `setNextLayoutY` callback because the `onLayout` call for the
next header happened before it was mounted. This is done by just tracking all
the layout values in a map and providing them to the sticky components at
render time. This might also improve perf a little by property configuring the
animations syncronously instead of waiting for the `onLayout` callback. We
also need to protect against stale onLayout callbacks and other fun stuff.

== Test Plan ==

https://www.facebook.com/groups/react.native.community/permalink/940332509435661/

Scroll a lot with and without debug mode on. Make sure spinner
still spins and there are no crashes (lots of crashes during development due
to the animated configuration being non-monotonic if anything stale values get
through). Also made sure that tapping a row to change it's height would
properly update the animation configurations so the collision point would
still be correct.

Reviewed By: yungsters

Differential Revision: D4695065

fbshipit-source-id: 855c4e31c8f8b450d32150dbdb2e07f1a9f9f98e
---
 Examples/UIExplorer/js/SectionListExample.js  | 15 +++-
 Libraries/Components/ScrollView/ScrollView.js | 85 ++++++++++++-------
 .../ScrollView/ScrollViewStickyHeader.js      | 29 +++++--
 .../CustomComponents/Lists/SectionList.js     | 27 ++++--
 .../CustomComponents/Lists/VirtualizedList.js | 84 +++++++++++++-----
 .../Lists/VirtualizedSectionList.js           | 23 +++--
 .../__snapshots__/FlatList-test.js.snap       |  4 +
 .../__snapshots__/SectionList-test.js.snap    | 18 +++-
 8 files changed, 204 insertions(+), 81 deletions(-)

diff --git a/Examples/UIExplorer/js/SectionListExample.js b/Examples/UIExplorer/js/SectionListExample.js
index 6a2a36f91a1aff..441aa19cb0dccd 100644
--- a/Examples/UIExplorer/js/SectionListExample.js
+++ b/Examples/UIExplorer/js/SectionListExample.js
@@ -79,6 +79,7 @@ class SectionListExample extends React.PureComponent {
 
   state = {
     data: genItemData(1000),
+    debug: false,
     filterText: '',
     logViewable: false,
     virtualized: true,
@@ -96,6 +97,16 @@ class SectionListExample extends React.PureComponent {
       filterRegex.test(item.text) || filterRegex.test(item.title)
     );
     const filteredData = this.state.data.filter(filter);
+    const filteredSectionData = [];
+    let startIndex = 0;
+    const endIndex = filteredData.length - 1;
+    for (let ii = 10; ii <= endIndex + 10; ii += 10) {
+      filteredSectionData.push({
+        key: `${filteredData[startIndex].key} - ${filteredData[Math.min(ii - 1, endIndex)].key}`,
+        data: filteredData.slice(startIndex, ii),
+      });
+      startIndex = ii;
+    }
     return (
       <UIExplorerPage
         noSpacer={true}
@@ -111,6 +122,7 @@ class SectionListExample extends React.PureComponent {
           <View style={styles.optionSection}>
             {renderSmallSwitchOption(this, 'virtualized')}
             {renderSmallSwitchOption(this, 'logViewable')}
+            {renderSmallSwitchOption(this, 'debug')}
             <Spindicator value={this._scrollPos} />
           </View>
         </View>
@@ -124,6 +136,7 @@ class SectionListExample extends React.PureComponent {
           ItemSeparatorComponent={() =>
             <CustomSeparatorComponent text="ITEM SEPARATOR" />
           }
+          debug={this.state.debug}
           enableVirtualization={this.state.virtualized}
           onRefresh={() => alert('onRefresh: nothing to refresh :P')}
           onScroll={this._scrollSinkY}
@@ -139,7 +152,7 @@ class SectionListExample extends React.PureComponent {
               {noImage: true, title: '1st item', text: 'Section s2', key: '0'},
               {noImage: true, title: '2nd item', text: 'Section s2', key: '1'},
             ]},
-            {key: 'Filtered Items', data: filteredData},
+            ...filteredSectionData,
           ]}
           viewabilityConfig={VIEWABILITY_CONFIG}
         />
diff --git a/Libraries/Components/ScrollView/ScrollView.js b/Libraries/Components/ScrollView/ScrollView.js
index 0f167228b70d73..bdd50b3dc06c1a 100644
--- a/Libraries/Components/ScrollView/ScrollView.js
+++ b/Libraries/Components/ScrollView/ScrollView.js
@@ -383,7 +383,7 @@ const ScrollView = React.createClass({
   _scrollAnimatedValue: (new Animated.Value(0): Animated.Value),
   _scrollAnimatedValueAttachment: (null: ?{detach: () => void}),
   _stickyHeaderRefs: (new Map(): Map<number, ScrollViewStickyHeader>),
-
+  _headerLayoutYs: (new Map(): Map<string, number>),
   getInitialState: function() {
     return this.scrollResponderMixinGetInitialState();
   },
@@ -391,6 +391,7 @@ const ScrollView = React.createClass({
   componentWillMount: function() {
     this._scrollAnimatedValue = new Animated.Value(0);
     this._stickyHeaderRefs = new Map();
+    this._headerLayoutYs = new Map();
   },
 
   componentDidMount: function() {
@@ -482,6 +483,11 @@ const ScrollView = React.createClass({
     this.scrollTo({x, y, animated: false});
   },
 
+  _getKeyForIndex: function(index, childArray) {
+    const child = childArray[index];
+    return child && child.key;
+  },
+
   _updateAnimatedNodeAttachment: function() {
     if (this.props.stickyHeaderIndices && this.props.stickyHeaderIndices.length > 0) {
       if (!this._scrollAnimatedValueAttachment) {
@@ -498,21 +504,34 @@ const ScrollView = React.createClass({
     }
   },
 
-  _setStickyHeaderRef: function(index, ref) {
-    this._stickyHeaderRefs.set(index, ref);
+  _setStickyHeaderRef: function(key, ref) {
+    if (ref) {
+      this._stickyHeaderRefs.set(key, ref);
+    } else {
+      this._stickyHeaderRefs.delete(key);
+    }
   },
 
-  _onStickyHeaderLayout: function(index, event) {
+  _onStickyHeaderLayout: function(index, event, key) {
     if (!this.props.stickyHeaderIndices) {
       return;
     }
+    const childArray = React.Children.toArray(this.props.children);
+    if (key !== this._getKeyForIndex(index, childArray)) {
+      // ignore stale layout update
+      return;
+    }
 
-    const previousHeaderIndex = this.props.stickyHeaderIndices[
-      this.props.stickyHeaderIndices.indexOf(index) - 1
-    ];
+    const layoutY = event.nativeEvent.layout.y;
+    this._headerLayoutYs.set(key, layoutY);
+
+    const indexOfIndex = this.props.stickyHeaderIndices.indexOf(index);
+    const previousHeaderIndex = this.props.stickyHeaderIndices[indexOfIndex - 1];
     if (previousHeaderIndex != null) {
-      const previousHeader = this._stickyHeaderRefs.get(previousHeaderIndex);
-      previousHeader && previousHeader.setNextHeaderY(event.nativeEvent.layout.y);
+      const previousHeader = this._stickyHeaderRefs.get(
+        this._getKeyForIndex(previousHeaderIndex, childArray)
+      );
+      previousHeader && previousHeader.setNextHeaderY(layoutY);
     }
   },
 
@@ -599,27 +618,33 @@ const ScrollView = React.createClass({
       };
     }
 
-      const {stickyHeaderIndices} = this.props;
-      const hasStickyHeaders = stickyHeaderIndices && stickyHeaderIndices.length > 0;
-      const children = stickyHeaderIndices && hasStickyHeaders ?
-        React.Children.toArray(this.props.children).map((child, index) => {
-          const stickyHeaderIndex = stickyHeaderIndices.indexOf(index);
-          if (child && stickyHeaderIndex >= 0) {
-            return (
-              <ScrollViewStickyHeader
-                key={index}
-                ref={(ref) => this._setStickyHeaderRef(index, ref)}
-                onLayout={(event) => this._onStickyHeaderLayout(index, event)}
-                scrollAnimatedValue={this._scrollAnimatedValue}>
-                {child}
-              </ScrollViewStickyHeader>
-            );
-          } else {
-            return child;
-          }
-        }) :
-        this.props.children;
-      const contentContainer =
+    const {stickyHeaderIndices} = this.props;
+    const hasStickyHeaders = stickyHeaderIndices && stickyHeaderIndices.length > 0;
+    const childArray = hasStickyHeaders && React.Children.toArray(this.props.children);
+    const children = hasStickyHeaders ?
+      childArray.map((child, index) => {
+        const indexOfIndex = child ? stickyHeaderIndices.indexOf(index) : -1;
+        if (indexOfIndex > -1) {
+          const key = child.key;
+          const nextIndex = stickyHeaderIndices[indexOfIndex + 1];
+          return (
+            <ScrollViewStickyHeader
+              key={key}
+              ref={(ref) => this._setStickyHeaderRef(key, ref)}
+              nextHeaderLayoutY={
+                this._headerLayoutYs.get(this._getKeyForIndex(nextIndex, childArray))
+              }
+              onLayout={(event) => this._onStickyHeaderLayout(index, event, key)}
+              scrollAnimatedValue={this._scrollAnimatedValue}>
+              {child}
+            </ScrollViewStickyHeader>
+          );
+        } else {
+          return child;
+        }
+      }) :
+      this.props.children;
+    const contentContainer =
       <ScrollContentContainerViewClass
         {...contentSizeChangeProps}
         ref={this._setInnerViewRef}
diff --git a/Libraries/Components/ScrollView/ScrollViewStickyHeader.js b/Libraries/Components/ScrollView/ScrollViewStickyHeader.js
index da640b56090adc..8db0f0b4f43b99 100644
--- a/Libraries/Components/ScrollView/ScrollViewStickyHeader.js
+++ b/Libraries/Components/ScrollView/ScrollViewStickyHeader.js
@@ -17,19 +17,30 @@ const StyleSheet = require('StyleSheet');
 
 type Props = {
   children?: React.Element<*>,
-  scrollAnimatedValue: Animated.Value,
+  nextHeaderLayoutY: ?number,
   onLayout: (event: Object) => void,
+  scrollAnimatedValue: Animated.Value,
 };
 
 class ScrollViewStickyHeader extends React.Component {
   props: Props;
-  state = {
-    measured: false,
-    layoutY: 0,
-    layoutHeight: 0,
-    nextHeaderLayoutY: (null: ?number),
+  state: {
+    measured: boolean,
+    layoutY: number,
+    layoutHeight: number,
+    nextHeaderLayoutY: ?number,
   };
 
+  constructor(props: Props, context: Object) {
+    super(props, context);
+    this.state = {
+      measured: false,
+      layoutY: 0,
+      layoutHeight: 0,
+      nextHeaderLayoutY: props.nextHeaderLayoutY,
+    };
+  }
+
   setNextHeaderY(y: number) {
     this.setState({ nextHeaderLayoutY: y });
   }
@@ -65,8 +76,10 @@ class ScrollViewStickyHeader extends React.Component {
       // scroll indefinetly.
       const inputRange = [-1, 0, layoutY];
       const outputRange: Array<number> = [0, 0, 0];
-      if (nextHeaderLayoutY != null) {
-        const collisionPoint = nextHeaderLayoutY - layoutHeight;
+      // Sometimes headers jump around so we make sure we don't violate the monotonic inputRange
+      // condition.
+      const collisionPoint = (nextHeaderLayoutY || 0) - layoutHeight;
+      if (collisionPoint >= layoutY) {
         inputRange.push(collisionPoint, collisionPoint + 1);
         outputRange.push(collisionPoint - layoutY, collisionPoint - layoutY);
       } else {
diff --git a/Libraries/CustomComponents/Lists/SectionList.js b/Libraries/CustomComponents/Lists/SectionList.js
index 2bc66a65affe54..71a9dcbca3ed73 100644
--- a/Libraries/CustomComponents/Lists/SectionList.js
+++ b/Libraries/CustomComponents/Lists/SectionList.js
@@ -33,6 +33,7 @@
 'use strict';
 
 const MetroListView = require('MetroListView');
+const Platform = require('Platform');
 const React = require('React');
 const VirtualizedSectionList = require('VirtualizedSectionList');
 
@@ -52,9 +53,7 @@ type SectionBase<SectionItemT> = {
   keyExtractor?: (item: SectionItemT) => string,
 
   // TODO: support more optional/override props
-  // FooterComponent?: ?ReactClass<*>,
-  // HeaderComponent?: ?ReactClass<*>,
-  // onViewableItemsChanged?: ({viewableItems: Array<ViewToken>, changed: Array<ViewToken>}) => void,
+  // onViewableItemsChanged?: ...
 };
 
 type RequiredProps<SectionT: SectionBase<any>> = {
@@ -102,7 +101,10 @@ type OptionalProps<SectionT: SectionBase<any>> = {
    * Called when the viewability of rows changes, as defined by the
    * `viewabilityConfig` prop.
    */
-  onViewableItemsChanged?: ?(info: {viewableItems: Array<ViewToken>, changed: Array<ViewToken>}) => void,
+  onViewableItemsChanged?: ?(info: {
+    viewableItems: Array<ViewToken>,
+    changed: Array<ViewToken>,
+  }) => void,
   /**
    * Set this true while waiting for new data from a refresh.
    */
@@ -114,13 +116,23 @@ type OptionalProps<SectionT: SectionBase<any>> = {
     prevProps: {item: Item, index: number},
     nextProps: {item: Item, index: number}
   ) => boolean,
+  /**
+   * Makes section headers stick to the top of the screen until the next one pushes it off. Only
+   * enabled by default on iOS because that is the platform standard there.
+   */
+  stickySectionHeadersEnabled?: boolean,
 };
 
 type Props<SectionT> = RequiredProps<SectionT>
   & OptionalProps<SectionT>
   & VirtualizedSectionListProps<SectionT>;
 
-type DefaultProps = typeof VirtualizedSectionList.defaultProps;
+const defaultProps = {
+  ...VirtualizedSectionList.defaultProps,
+  stickySectionHeadersEnabled: Platform.OS === 'ios',
+};
+
+type DefaultProps = typeof defaultProps;
 
 /**
  * A performant interface for rendering sectioned lists, supporting the most handy features:
@@ -136,7 +148,8 @@ type DefaultProps = typeof VirtualizedSectionList.defaultProps;
  *  - Pull to Refresh.
  *  - Scroll loading.
  *
- * If you don't need section support and want a simpler interface, use [`<FlatList>`](/react-native/docs/flatlist.html).
+ * If you don't need section support and want a simpler interface, use
+ * [`<FlatList>`](/react-native/docs/flatlist.html).
  *
  * If you need _sticky_ section header support, use `ListView` for now.
  *
@@ -180,7 +193,7 @@ class SectionList<SectionT: SectionBase<any>>
   extends React.PureComponent<DefaultProps, Props<SectionT>, void>
 {
   props: Props<SectionT>;
-  static defaultProps: DefaultProps = VirtualizedSectionList.defaultProps;
+  static defaultProps: DefaultProps = defaultProps;
 
   render() {
     const List = this.props.legacyImplementation ? MetroListView : VirtualizedSectionList;
diff --git a/Libraries/CustomComponents/Lists/VirtualizedList.js b/Libraries/CustomComponents/Lists/VirtualizedList.js
index 62faf5ffbb2101..ffdc7e3b82ed6a 100644
--- a/Libraries/CustomComponents/Lists/VirtualizedList.js
+++ b/Libraries/CustomComponents/Lists/VirtualizedList.js
@@ -105,7 +105,10 @@ type OptionalProps = {
    * Called when the viewability of rows changes, as defined by the
    * `viewabilityConfig` prop.
    */
-  onViewableItemsChanged?: ?(info: {viewableItems: Array<ViewToken>, changed: Array<ViewToken>}) => void,
+  onViewableItemsChanged?: ?(info: {
+    viewableItems: Array<ViewToken>,
+    changed: Array<ViewToken>,
+  }) => void,
   /**
    * Set this true while waiting for new data from a refresh.
    */
@@ -336,21 +339,31 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
     this._updateCellsToRenderBatcher.schedule();
   }
 
-  _pushCells(cells, first, last) {
+  _pushCells(
+    cells: Array<Object>,
+    stickyHeaderIndices: Array<number>,
+    stickyIndicesFromProps: Set<number>,
+    first: number,
+    last: number,
+  ) {
     const {ItemSeparatorComponent, data, getItem, getItemCount, keyExtractor} = this.props;
+    const stickyOffset = this.props.ListHeaderComponent ? 1 : 0;
     const end = getItemCount(data) - 1;
     last = Math.min(end, last);
     for (let ii = first; ii <= last; ii++) {
       const item = getItem(data, ii);
       invariant(item, 'No item for index ' + ii);
       const key = keyExtractor(item, ii);
+      if (stickyIndicesFromProps.has(ii + stickyOffset)) {
+        stickyHeaderIndices.push(cells.length);
+      }
       cells.push(
         <CellRenderer
           cellKey={key}
           index={ii}
           item={item}
           key={key}
-          onCellLayout={this._onCellLayout}
+          onLayout={(e) => this._onCellLayout(e, key, ii)}
           onUnmount={this._onCellUnmount}
           parentProps={this.props}
         />
@@ -364,6 +377,8 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
     const {ListFooterComponent, ListHeaderComponent} = this.props;
     const {data, disableVirtualization, horizontal} = this.props;
     const cells = [];
+    const stickyIndicesFromProps = new Set(this.props.stickyHeaderIndices);
+    const stickyHeaderIndices = [];
     if (ListHeaderComponent) {
       cells.push(
         <View key="$header" onLayout={this._onLayoutHeader}>
@@ -374,18 +389,45 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
     const itemCount = this.props.getItemCount(data);
     if (itemCount > 0) {
       _usedIndexForKey = false;
+      const spacerKey = !horizontal ? 'height' : 'width';
       const lastInitialIndex = this.props.initialNumToRender - 1;
       const {first, last} = this.state;
-      this._pushCells(cells, 0, lastInitialIndex);
-      if (!disableVirtualization && first > lastInitialIndex) {
-        const initBlock = this._getFrameMetricsApprox(lastInitialIndex);
-        const firstSpace = this._getFrameMetricsApprox(first).offset -
-          (initBlock.offset + initBlock.length);
-        cells.push(
-          <View key="$lead_spacer" style={{[!horizontal ? 'height' : 'width']: firstSpace}} />
-        );
+      this._pushCells(cells, stickyHeaderIndices, stickyIndicesFromProps, 0, lastInitialIndex);
+      const firstAfterInitial = Math.max(lastInitialIndex + 1, first);
+      if (!disableVirtualization && first > lastInitialIndex + 1) {
+        let insertedStickySpacer = false;
+        if (stickyIndicesFromProps.size > 0) {
+          const stickyOffset = ListHeaderComponent ? 1 : 0;
+          // See if there are any sticky headers in the virtualized space that we need to render.
+          for (let ii = firstAfterInitial - 1; ii > lastInitialIndex; ii--) {
+            if (stickyIndicesFromProps.has(ii + stickyOffset)) {
+              const initBlock = this._getFrameMetricsApprox(lastInitialIndex);
+              const stickyBlock = this._getFrameMetricsApprox(ii);
+              const leadSpace = stickyBlock.offset - (initBlock.offset + initBlock.length);
+              cells.push(
+                <View key="$sticky_lead" style={{[spacerKey]: leadSpace}} />
+              );
+              this._pushCells(cells, stickyHeaderIndices, stickyIndicesFromProps, ii, ii);
+              const trailSpace = this._getFrameMetricsApprox(first).offset -
+                (stickyBlock.offset + stickyBlock.length);
+              cells.push(
+                <View key="$sticky_trail" style={{[spacerKey]: trailSpace}} />
+              );
+              insertedStickySpacer = true;
+              break;
+            }
+          }
+        }
+        if (!insertedStickySpacer) {
+          const initBlock = this._getFrameMetricsApprox(lastInitialIndex);
+          const firstSpace = this._getFrameMetricsApprox(first).offset -
+            (initBlock.offset + initBlock.length);
+          cells.push(
+            <View key="$lead_spacer" style={{[spacerKey]: firstSpace}} />
+          );
+        }
       }
-      this._pushCells(cells, Math.max(lastInitialIndex + 1, first), last);
+      this._pushCells(cells, stickyHeaderIndices, stickyIndicesFromProps, firstAfterInitial, last);
       if (!this._hasWarned.keys && _usedIndexForKey) {
         console.warn(
           'VirtualizedList: missing keys for items, make sure to specify a key property on each ' +
@@ -406,7 +448,7 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
           (endFrame.offset + endFrame.length) -
           (lastFrame.offset + lastFrame.length);
         cells.push(
-          <View key="$tail_spacer" style={{[!horizontal ? 'height' : 'width']: tailSpacerLength}} />
+          <View key="$tail_spacer" style={{[spacerKey]: tailSpacerLength}} />
         );
       }
     }
@@ -426,6 +468,7 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
         onScrollBeginDrag: this._onScrollBeginDrag,
         ref: this._captureScrollRef,
         scrollEventThrottle: 50, // TODO: Android support
+        stickyHeaderIndices,
       },
       cells,
     );
@@ -460,7 +503,7 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
     this._scrollRef = ref;
   };
 
-  _onCellLayout = (e, cellKey, index) => {
+  _onCellLayout(e, cellKey, index) {
     const layout = e.nativeEvent.layout;
     const next = {
       offset: this._selectOffset(layout),
@@ -480,8 +523,10 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
       this._frames[cellKey] = next;
       this._highestMeasuredFrameIndex = Math.max(this._highestMeasuredFrameIndex, index);
       this._updateCellsToRenderBatcher.schedule();
+    } else {
+      this._frames[cellKey].inLayout = true;
     }
-  };
+  }
 
   _onCellUnmount = (cellKey: string) => {
     const curr = this._frames[cellKey];
@@ -710,7 +755,7 @@ class CellRenderer extends React.Component {
     cellKey: string,
     index: number,
     item: Item,
-    onCellLayout: (event: Object, cellKey: string, index: number) => void,
+    onLayout: (event: Object) => void, // This is extracted by ScrollViewStickyHeader
     onUnmount: (cellKey: string) => void,
     parentProps: {
       renderItem: renderItemType,
@@ -721,9 +766,6 @@ class CellRenderer extends React.Component {
       ) => boolean,
     },
   };
-  _onLayout = (e) => {
-    this.props.onCellLayout(e, this.props.cellKey, this.props.index);
-  }
   componentWillUnmount() {
     this.props.onUnmount(this.props.cellKey);
   }
@@ -740,8 +782,10 @@ class CellRenderer extends React.Component {
     if (getItemLayout && !parentProps.debug) {
       return element;
     }
+    // NOTE: that when this is a sticky header, `onLayout` will get automatically extracted and
+    // called explicitly by `ScrollViewStickyHeader`.
     return (
-      <View onLayout={this._onLayout}>
+      <View onLayout={this.props.onLayout}>
         {element}
       </View>
     );
diff --git a/Libraries/CustomComponents/Lists/VirtualizedSectionList.js b/Libraries/CustomComponents/Lists/VirtualizedSectionList.js
index cd4312e96f4a11..291e4c96db20bc 100644
--- a/Libraries/CustomComponents/Lists/VirtualizedSectionList.js
+++ b/Libraries/CustomComponents/Lists/VirtualizedSectionList.js
@@ -79,7 +79,7 @@ type OptionalProps<SectionT: SectionBase> = {
    */
   renderItem: ({item: Item, index: number}) => ?React.Element<*>,
   /**
-   * Rendered at the top of each section. In the future, a sticky option will be added.
+   * Rendered at the top of each section.
    */
   renderSectionHeader?: ?({section: SectionT}) => ?React.Element<*>,
   /**
@@ -210,11 +210,6 @@ class VirtualizedSectionList<SectionT: SectionBase>
     }
   }
 
-  _isItemSticky = (item, index) => {
-    const info = this._subExtractor(index);
-    return info && info.index == null;
-  };
-
   _renderItem = ({item, index}: {item: Item, index: number}) => {
     const info = this._subExtractor(index);
     if (!info) {
@@ -263,7 +258,15 @@ class VirtualizedSectionList<SectionT: SectionBase>
   }
 
   _computeState(props: Props<SectionT>): State {
-    const itemCount = props.sections.reduce((v, section) => v + section.data.length + 1, 0);
+    const offset = props.ListHeaderComponent ? 1 : 0;
+    const stickyHeaderIndices = [];
+    const itemCount = props.sections.reduce(
+      (v, section) => {
+        stickyHeaderIndices.push(v + offset);
+        return v + section.data.length + 1;
+      },
+      0
+    );
     return {
       childProps: {
         ...props,
@@ -272,21 +275,17 @@ class VirtualizedSectionList<SectionT: SectionBase>
         data: props.sections,
         getItemCount: () => itemCount,
         getItem,
-        isItemSticky: this._isItemSticky,
         keyExtractor: this._keyExtractor,
         onViewableItemsChanged:
           props.onViewableItemsChanged ? this._onViewableItemsChanged : undefined,
         shouldItemUpdate: this._shouldItemUpdate,
+        stickyHeaderIndices: props.stickySectionHeadersEnabled ? stickyHeaderIndices : undefined,
       },
     };
   }
 
   constructor(props: Props<SectionT>, context: Object) {
     super(props, context);
-    warning(
-      !props.stickySectionHeadersEnabled,
-      'VirtualizedSectionList: Sticky headers only supported with legacyImplementation for now.'
-    );
     this.state = this._computeState(props);
   }
 
diff --git a/Libraries/CustomComponents/Lists/__tests__/__snapshots__/FlatList-test.js.snap b/Libraries/CustomComponents/Lists/__tests__/__snapshots__/FlatList-test.js.snap
index cafff52235495f..216ae57ab6b3c0 100644
--- a/Libraries/CustomComponents/Lists/__tests__/__snapshots__/FlatList-test.js.snap
+++ b/Libraries/CustomComponents/Lists/__tests__/__snapshots__/FlatList-test.js.snap
@@ -53,6 +53,7 @@ exports[`FlatList renders all the bells and whistles 1`] = `
   renderScrollComponent={[Function]}
   scrollEventThrottle={50}
   shouldItemUpdate={[Function]}
+  stickyHeaderIndices={Array []}
   updateCellsBatchingPeriod={50}
   windowSize={21}
 >
@@ -145,6 +146,7 @@ exports[`FlatList renders empty list 1`] = `
   renderScrollComponent={[Function]}
   scrollEventThrottle={50}
   shouldItemUpdate={[Function]}
+  stickyHeaderIndices={Array []}
   updateCellsBatchingPeriod={50}
   windowSize={21}
 >
@@ -175,6 +177,7 @@ exports[`FlatList renders null list 1`] = `
   renderScrollComponent={[Function]}
   scrollEventThrottle={50}
   shouldItemUpdate={[Function]}
+  stickyHeaderIndices={Array []}
   updateCellsBatchingPeriod={50}
   windowSize={21}
 >
@@ -217,6 +220,7 @@ exports[`FlatList renders simple list 1`] = `
   renderScrollComponent={[Function]}
   scrollEventThrottle={50}
   shouldItemUpdate={[Function]}
+  stickyHeaderIndices={Array []}
   updateCellsBatchingPeriod={50}
   windowSize={21}
 >
diff --git a/Libraries/CustomComponents/Lists/__tests__/__snapshots__/SectionList-test.js.snap b/Libraries/CustomComponents/Lists/__tests__/__snapshots__/SectionList-test.js.snap
index 5b4f27b3dd2f00..e91124aaeb8bd4 100644
--- a/Libraries/CustomComponents/Lists/__tests__/__snapshots__/SectionList-test.js.snap
+++ b/Libraries/CustomComponents/Lists/__tests__/__snapshots__/SectionList-test.js.snap
@@ -23,7 +23,6 @@ exports[`SectionList rendering empty section headers is fine 1`] = `
   getItemCount={[Function]}
   horizontal={false}
   initialNumToRender={10}
-  isItemSticky={[Function]}
   keyExtractor={[Function]}
   maxToRenderPerBatch={10}
   onContentSizeChange={[Function]}
@@ -54,6 +53,12 @@ exports[`SectionList rendering empty section headers is fine 1`] = `
     ]
   }
   shouldItemUpdate={[Function]}
+  stickyHeaderIndices={
+    Array [
+      0,
+    ]
+  }
+  stickySectionHeadersEnabled={true}
   updateCellsBatchingPeriod={50}
   windowSize={21}
 >
@@ -123,7 +128,6 @@ exports[`SectionList renders all the bells and whistles 1`] = `
   getItemCount={[Function]}
   horizontal={false}
   initialNumToRender={10}
-  isItemSticky={[Function]}
   keyExtractor={[Function]}
   maxToRenderPerBatch={10}
   onContentSizeChange={[Function]}
@@ -176,6 +180,13 @@ exports[`SectionList renders all the bells and whistles 1`] = `
     ]
   }
   shouldItemUpdate={[Function]}
+  stickyHeaderIndices={
+    Array [
+      1,
+      4,
+    ]
+  }
+  stickySectionHeadersEnabled={true}
   updateCellsBatchingPeriod={50}
   windowSize={21}
 >
@@ -257,7 +268,6 @@ exports[`SectionList renders empty list 1`] = `
   getItemCount={[Function]}
   horizontal={false}
   initialNumToRender={10}
-  isItemSticky={[Function]}
   keyExtractor={[Function]}
   maxToRenderPerBatch={10}
   onContentSizeChange={[Function]}
@@ -273,6 +283,8 @@ exports[`SectionList renders empty list 1`] = `
   scrollEventThrottle={50}
   sections={Array []}
   shouldItemUpdate={[Function]}
+  stickyHeaderIndices={Array []}
+  stickySectionHeadersEnabled={true}
   updateCellsBatchingPeriod={50}
   windowSize={21}
 >

From 5c856150ff66250e8d86ceb74d27740b49a5e06d Mon Sep 17 00:00:00 2001
From: Spencer Ahrens <sahrens@fb.com>
Date: Tue, 21 Mar 2017 22:19:08 -0700
Subject: [PATCH 134/366] Kill shouldItemUpdate

Summary:
It was just adding unnecessary complexity. Users should just use standard React perf best practices, like `PureComponent` and `shouldComponentUpdate`.

This should be backwards compatible - existing `shouldItemUpdate` usage will just be ignored and should consider migrating to this pattern:

```
class MyItem extends React.PureComponent {
  _onPress = () => {
  	this.props.onPressItem(this.props.id);
  };
  render() {
    return (
      <SomeOtherWidget title={this.props.title} onPress={this._onPress} />
    )
  }
}
...
_renderItem = ({item}) => (
  <MyItem onPressItem={this._onPressItem} title={item.title} id={item.id} />
);
```

Which will automatically prevent re-renders unless the relavent data changes.

Reviewed By: yungsters

Differential Revision: D4730599

fbshipit-source-id: 0f61efe96eb4d95bb3b7c4ec889e3e0e34436e56
---
 Examples/UIExplorer/js/FlatListExample.js     | 10 --------
 Examples/UIExplorer/js/MultiColumnExample.js  |  6 -----
 Libraries/CustomComponents/Lists/FlatList.js  | 14 -----------
 .../CustomComponents/Lists/MetroListView.js   |  4 +---
 .../CustomComponents/Lists/SectionList.js     |  7 ------
 .../CustomComponents/Lists/VirtualizedList.js | 23 +++----------------
 .../Lists/VirtualizedSectionList.js           | 16 -------------
 .../__snapshots__/FlatList-test.js.snap       |  4 ----
 .../__snapshots__/SectionList-test.js.snap    |  3 ---
 9 files changed, 4 insertions(+), 83 deletions(-)

diff --git a/Examples/UIExplorer/js/FlatListExample.js b/Examples/UIExplorer/js/FlatListExample.js
index 080cf6c3586033..be147580f9ce6e 100644
--- a/Examples/UIExplorer/js/FlatListExample.js
+++ b/Examples/UIExplorer/js/FlatListExample.js
@@ -148,7 +148,6 @@ class FlatListExample extends React.PureComponent {
           ref={this._captureRef}
           refreshing={false}
           renderItem={this._renderItemComponent}
-          shouldItemUpdate={this._shouldItemUpdate}
           viewabilityConfig={VIEWABILITY_CONFIG}
         />
       </UIExplorerPage>
@@ -169,15 +168,6 @@ class FlatListExample extends React.PureComponent {
       />
     );
   };
-  _shouldItemUpdate(prev, next) {
-    /**
-     * Note that this does not check state.horizontal or state.fixedheight
-     * because we blow away the whole list by changing the key in those cases.
-     * Make sure that you do the same in your code, or incorporate all relevant
-     * data into the item data, or skip this optimization entirely.
-     */
-    return prev.item !== next.item;
-  }
   // This is called when items change viewability by scrolling into or out of
   // the viewable area.
   _onViewableItemsChanged = (info: {
diff --git a/Examples/UIExplorer/js/MultiColumnExample.js b/Examples/UIExplorer/js/MultiColumnExample.js
index 9b4477240f56ac..3427c8aeba20cc 100644
--- a/Examples/UIExplorer/js/MultiColumnExample.js
+++ b/Examples/UIExplorer/js/MultiColumnExample.js
@@ -107,7 +107,6 @@ class MultiColumnExample extends React.PureComponent {
           onRefresh={() => alert('onRefresh: nothing to refresh :P')}
           refreshing={false}
           renderItem={this._renderItemComponent}
-          shouldItemUpdate={this._shouldItemUpdate}
           disableVirtualization={!this.state.virtualized}
           onViewableItemsChanged={this._onViewableItemsChanged}
           legacyImplementation={false}
@@ -127,11 +126,6 @@ class MultiColumnExample extends React.PureComponent {
       />
     );
   };
-  _shouldItemUpdate(prev, next) {
-    // Note that this does not check state.fixedHeight because we blow away the whole list by
-    // changing the key anyway.
-    return prev.item !== next.item;
-  }
   // This is called when items change viewability by scrolling into or out of the viewable area.
   _onViewableItemsChanged = (info: {
     changed: Array<{
diff --git a/Libraries/CustomComponents/Lists/FlatList.js b/Libraries/CustomComponents/Lists/FlatList.js
index daf99d33c2fd51..2f7bd1536382ac 100644
--- a/Libraries/CustomComponents/Lists/FlatList.js
+++ b/Libraries/CustomComponents/Lists/FlatList.js
@@ -354,19 +354,6 @@ class FlatList<ItemT> extends React.PureComponent<DefaultProps, Props<ItemT>, vo
     }
   };
 
-  _shouldItemUpdate = (prev, next) => {
-    const {numColumns, shouldItemUpdate} = this.props;
-    if (numColumns > 1) {
-      return prev.item.length !== next.item.length ||
-        prev.item.some((prevItem, ii) => shouldItemUpdate(
-          {item: prevItem, index: prev.index + ii},
-          {item: next.item[ii], index: next.index + ii},
-        ));
-    } else {
-      return shouldItemUpdate(prev, next);
-    }
-  };
-
   render() {
     if (this.props.legacyImplementation) {
       return <MetroListView {...this.props} items={this.props.data} ref={this._captureRef} />;
@@ -379,7 +366,6 @@ class FlatList<ItemT> extends React.PureComponent<DefaultProps, Props<ItemT>, vo
           getItemCount={this._getItemCount}
           keyExtractor={this._keyExtractor}
           ref={this._captureRef}
-          shouldItemUpdate={this._shouldItemUpdate}
           onViewableItemsChanged={this.props.onViewableItemsChanged && this._onViewableItemsChanged}
         />
       );
diff --git a/Libraries/CustomComponents/Lists/MetroListView.js b/Libraries/CustomComponents/Lists/MetroListView.js
index 93524121456c0b..73e8a9b46983e2 100644
--- a/Libraries/CustomComponents/Lists/MetroListView.js
+++ b/Libraries/CustomComponents/Lists/MetroListView.js
@@ -62,7 +62,6 @@ type NormalProps = {
   refreshing?: boolean,
 };
 type DefaultProps = {
-  shouldItemUpdate: (curr: {item: Item}, next: {item: Item}) => boolean,
   keyExtractor: (item: Item) => string,
 };
 type Props = NormalProps & DefaultProps;
@@ -90,7 +89,6 @@ class MetroListView extends React.Component {
     );
   }
   static defaultProps: DefaultProps = {
-    shouldItemUpdate: () => true,
     keyExtractor: (item, index) => item.key || index,
     renderScrollComponent: (props: Props) => {
       if (props.onRefresh) {
@@ -114,7 +112,7 @@ class MetroListView extends React.Component {
     this.props,
     {
       ds: new ListView.DataSource({
-        rowHasChanged: (itemA, itemB) => this.props.shouldItemUpdate({item: itemA}, {item: itemB}),
+        rowHasChanged: (itemA, itemB) => true,
         sectionHeaderHasChanged: () => true,
         getSectionHeaderData: (dataBlob, sectionID) => this.state.sectionHeaderData[sectionID],
       }),
diff --git a/Libraries/CustomComponents/Lists/SectionList.js b/Libraries/CustomComponents/Lists/SectionList.js
index 71a9dcbca3ed73..c3b64114f43bb4 100644
--- a/Libraries/CustomComponents/Lists/SectionList.js
+++ b/Libraries/CustomComponents/Lists/SectionList.js
@@ -109,13 +109,6 @@ type OptionalProps<SectionT: SectionBase<any>> = {
    * Set this true while waiting for new data from a refresh.
    */
   refreshing?: ?boolean,
-  /**
-   * This is an optional optimization to minimize re-rendering items.
-   */
-  shouldItemUpdate: (
-    prevProps: {item: Item, index: number},
-    nextProps: {item: Item, index: number}
-  ) => boolean,
   /**
    * Makes section headers stick to the top of the screen until the next one pushes it off. Only
    * enabled by default on iOS because that is the platform standard there.
diff --git a/Libraries/CustomComponents/Lists/VirtualizedList.js b/Libraries/CustomComponents/Lists/VirtualizedList.js
index ffdc7e3b82ed6a..85839147c1faa4 100644
--- a/Libraries/CustomComponents/Lists/VirtualizedList.js
+++ b/Libraries/CustomComponents/Lists/VirtualizedList.js
@@ -123,10 +123,6 @@ type OptionalProps = {
    * Render a custom scroll component, e.g. with a differently styled `RefreshControl`.
    */
   renderScrollComponent: (props: Object) => React.Element<any>,
-  shouldItemUpdate: (
-    props: {item: Item, index: number},
-    nextProps: {item: Item, index: number}
-  ) => boolean,
   /**
    * Amount of time between low-pri item render batches, e.g. for rendering items quite a ways off
    * screen. Similar fill rate/responsiveness tradeoff as `maxToRenderPerBatch`.
@@ -290,10 +286,6 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
         return <ScrollView {...props} />;
       }
     },
-    shouldItemUpdate: (
-      props: {item: Item, index: number},
-      nextProps: {item: Item, index: number},
-    ) => true,
     updateCellsBatchingPeriod: 50,
     windowSize: 21, // multiples of length
   };
@@ -624,9 +616,9 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
     if (dt > 500 && this._scrollMetrics.dt > 500 && (contentLength > (5 * visibleLength)) &&
         !this._hasWarned.perf) {
       infoLog(
-        'VirtualizedList: You have a large list that is slow to update - make sure ' +
-        'shouldItemUpdate is implemented effectively and consider getItemLayout, PureComponent, ' +
-        'etc.',
+        'VirtualizedList: You have a large list that is slow to update - make sure your ' +
+        'renderItem function renders components that follow React performance best practices ' +
+        'like PureComponent, shouldComponentUpdate, etc.',
         {dt, prevDt: this._scrollMetrics.dt, contentLength},
       );
       this._hasWarned.perf = true;
@@ -760,20 +752,11 @@ class CellRenderer extends React.Component {
     parentProps: {
       renderItem: renderItemType,
       getItemLayout?: ?Function,
-      shouldItemUpdate: (
-        props: {item: Item, index: number},
-        nextProps: {item: Item, index: number}
-      ) => boolean,
     },
   };
   componentWillUnmount() {
     this.props.onUnmount(this.props.cellKey);
   }
-  shouldComponentUpdate(nextProps, nextState) {
-    const curr = {item: this.props.item, index: this.props.index};
-    const next = {item: nextProps.item, index: nextProps.index};
-    return nextProps.parentProps.shouldItemUpdate(curr, next);
-  }
   render() {
     const {item, index, parentProps} = this.props;
     const {renderItem, getItemLayout} = parentProps;
diff --git a/Libraries/CustomComponents/Lists/VirtualizedSectionList.js b/Libraries/CustomComponents/Lists/VirtualizedSectionList.js
index 291e4c96db20bc..e0154e941c4bca 100644
--- a/Libraries/CustomComponents/Lists/VirtualizedSectionList.js
+++ b/Libraries/CustomComponents/Lists/VirtualizedSectionList.js
@@ -113,13 +113,6 @@ type OptionalProps<SectionT: SectionBase> = {
    * Set this true while waiting for new data from a refresh.
    */
   refreshing?: ?boolean,
-  /**
-   * This is an optional optimization to minimize re-rendering items.
-   */
-  shouldItemUpdate: (
-    prevProps: {item: Item, index: number},
-    nextProps: {item: Item, index: number}
-  ) => boolean,
 };
 
 export type Props<SectionT> =
@@ -249,14 +242,6 @@ class VirtualizedSectionList<SectionT: SectionBase>
     return null;
   }
 
-  _shouldItemUpdate = (prev, next) => {
-    const {shouldItemUpdate} = this.props;
-    if (!shouldItemUpdate || shouldItemUpdate(prev, next)) {
-      return true;
-    }
-    return this._getSeparatorComponent(prev.index) !== this._getSeparatorComponent(next.index);
-  }
-
   _computeState(props: Props<SectionT>): State {
     const offset = props.ListHeaderComponent ? 1 : 0;
     const stickyHeaderIndices = [];
@@ -278,7 +263,6 @@ class VirtualizedSectionList<SectionT: SectionBase>
         keyExtractor: this._keyExtractor,
         onViewableItemsChanged:
           props.onViewableItemsChanged ? this._onViewableItemsChanged : undefined,
-        shouldItemUpdate: this._shouldItemUpdate,
         stickyHeaderIndices: props.stickySectionHeadersEnabled ? stickyHeaderIndices : undefined,
       },
     };
diff --git a/Libraries/CustomComponents/Lists/__tests__/__snapshots__/FlatList-test.js.snap b/Libraries/CustomComponents/Lists/__tests__/__snapshots__/FlatList-test.js.snap
index 216ae57ab6b3c0..19591edab96a02 100644
--- a/Libraries/CustomComponents/Lists/__tests__/__snapshots__/FlatList-test.js.snap
+++ b/Libraries/CustomComponents/Lists/__tests__/__snapshots__/FlatList-test.js.snap
@@ -52,7 +52,6 @@ exports[`FlatList renders all the bells and whistles 1`] = `
   renderItem={[Function]}
   renderScrollComponent={[Function]}
   scrollEventThrottle={50}
-  shouldItemUpdate={[Function]}
   stickyHeaderIndices={Array []}
   updateCellsBatchingPeriod={50}
   windowSize={21}
@@ -145,7 +144,6 @@ exports[`FlatList renders empty list 1`] = `
   renderItem={[Function]}
   renderScrollComponent={[Function]}
   scrollEventThrottle={50}
-  shouldItemUpdate={[Function]}
   stickyHeaderIndices={Array []}
   updateCellsBatchingPeriod={50}
   windowSize={21}
@@ -176,7 +174,6 @@ exports[`FlatList renders null list 1`] = `
   renderItem={[Function]}
   renderScrollComponent={[Function]}
   scrollEventThrottle={50}
-  shouldItemUpdate={[Function]}
   stickyHeaderIndices={Array []}
   updateCellsBatchingPeriod={50}
   windowSize={21}
@@ -219,7 +216,6 @@ exports[`FlatList renders simple list 1`] = `
   renderItem={[Function]}
   renderScrollComponent={[Function]}
   scrollEventThrottle={50}
-  shouldItemUpdate={[Function]}
   stickyHeaderIndices={Array []}
   updateCellsBatchingPeriod={50}
   windowSize={21}
diff --git a/Libraries/CustomComponents/Lists/__tests__/__snapshots__/SectionList-test.js.snap b/Libraries/CustomComponents/Lists/__tests__/__snapshots__/SectionList-test.js.snap
index e91124aaeb8bd4..8c564adb0e0f36 100644
--- a/Libraries/CustomComponents/Lists/__tests__/__snapshots__/SectionList-test.js.snap
+++ b/Libraries/CustomComponents/Lists/__tests__/__snapshots__/SectionList-test.js.snap
@@ -52,7 +52,6 @@ exports[`SectionList rendering empty section headers is fine 1`] = `
       },
     ]
   }
-  shouldItemUpdate={[Function]}
   stickyHeaderIndices={
     Array [
       0,
@@ -179,7 +178,6 @@ exports[`SectionList renders all the bells and whistles 1`] = `
       },
     ]
   }
-  shouldItemUpdate={[Function]}
   stickyHeaderIndices={
     Array [
       1,
@@ -282,7 +280,6 @@ exports[`SectionList renders empty list 1`] = `
   renderScrollComponent={[Function]}
   scrollEventThrottle={50}
   sections={Array []}
-  shouldItemUpdate={[Function]}
   stickyHeaderIndices={Array []}
   stickySectionHeadersEnabled={true}
   updateCellsBatchingPeriod={50}

From 1531f5f284b0828959dc56919448e87781780eec Mon Sep 17 00:00:00 2001
From: Spencer Ahrens <sahrens@fb.com>
Date: Tue, 21 Mar 2017 22:19:09 -0700
Subject: [PATCH 135/366] change section-specific SeparatorComponent ->
 ItemSeparatorComponent for consistency

Summary: Not sure how I missed this in https://github.com/facebook/react-native/commit/3ce31c24dad8a52ce17772c8e65687a14d320c09

Reviewed By: yungsters

Differential Revision: D4731083

fbshipit-source-id: 860ed9d2f99312cd02b84ba467ba66afc5cdd5c5
---
 Libraries/CustomComponents/Lists/SectionList.js           | 2 +-
 .../CustomComponents/Lists/VirtualizedSectionList.js      | 8 ++++----
 .../CustomComponents/Lists/__tests__/SectionList-test.js  | 2 +-
 .../__tests__/__snapshots__/SectionList-test.js.snap      | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Libraries/CustomComponents/Lists/SectionList.js b/Libraries/CustomComponents/Lists/SectionList.js
index c3b64114f43bb4..83d50cc2cb4643 100644
--- a/Libraries/CustomComponents/Lists/SectionList.js
+++ b/Libraries/CustomComponents/Lists/SectionList.js
@@ -49,7 +49,7 @@ type SectionBase<SectionItemT> = {
 
   // Optional props will override list-wide props just for this section.
   renderItem?: ?(info: {item: SectionItemT, index: number}) => ?React.Element<any>,
-  SeparatorComponent?: ?ReactClass<any>,
+  ItemSeparatorComponent?: ?ReactClass<any>,
   keyExtractor?: (item: SectionItemT) => string,
 
   // TODO: support more optional/override props
diff --git a/Libraries/CustomComponents/Lists/VirtualizedSectionList.js b/Libraries/CustomComponents/Lists/VirtualizedSectionList.js
index e0154e941c4bca..c3e724fee26acb 100644
--- a/Libraries/CustomComponents/Lists/VirtualizedSectionList.js
+++ b/Libraries/CustomComponents/Lists/VirtualizedSectionList.js
@@ -52,7 +52,7 @@ type SectionBase = {
 
   // Optional props will override list-wide props just for this section.
   renderItem?: ?({item: SectionItem, index: number}) => ?React.Element<*>,
-  SeparatorComponent?: ?ReactClass<*>,
+  ItemSeparatorComponent?: ?ReactClass<*>,
   keyExtractor?: (item: SectionItem) => string,
 
   // TODO: support more optional/override props
@@ -229,15 +229,15 @@ class VirtualizedSectionList<SectionT: SectionBase>
     if (!info) {
       return null;
     }
-    const SeparatorComponent = info.section.SeparatorComponent || this.props.ItemSeparatorComponent;
+    const ItemSeparatorComponent = info.section.ItemSeparatorComponent || this.props.ItemSeparatorComponent;
     const {SectionSeparatorComponent} = this.props;
     const isLastItemInList = index === this.state.childProps.getItemCount() - 1;
     const isLastItemInSection = info.index === info.section.data.length - 1;
     if (SectionSeparatorComponent && isLastItemInSection && !isLastItemInList) {
       return SectionSeparatorComponent;
     }
-    if (SeparatorComponent && !isLastItemInSection && !isLastItemInList) {
-      return SeparatorComponent;
+    if (ItemSeparatorComponent && !isLastItemInSection && !isLastItemInList) {
+      return ItemSeparatorComponent;
     }
     return null;
   }
diff --git a/Libraries/CustomComponents/Lists/__tests__/SectionList-test.js b/Libraries/CustomComponents/Lists/__tests__/SectionList-test.js
index 945e660261eb2a..295cd75da51bd7 100644
--- a/Libraries/CustomComponents/Lists/__tests__/SectionList-test.js
+++ b/Libraries/CustomComponents/Lists/__tests__/SectionList-test.js
@@ -48,7 +48,7 @@ describe('SectionList', () => {
             renderItem: ({item}) => <itemForSection1 value={item.id} />,
             key: '1st Section',
             keyExtractor: (item, index) => item.id,
-            SeparatorComponent: () => <itemSeparatorForSection1 />,
+            ItemSeparatorComponent: () => <itemSeparatorForSection1 />,
             data: [{id: 'i1s1'}, {id: 'i2s1'}],
           },
           {
diff --git a/Libraries/CustomComponents/Lists/__tests__/__snapshots__/SectionList-test.js.snap b/Libraries/CustomComponents/Lists/__tests__/__snapshots__/SectionList-test.js.snap
index 8c564adb0e0f36..7ec08054c36f08 100644
--- a/Libraries/CustomComponents/Lists/__tests__/__snapshots__/SectionList-test.js.snap
+++ b/Libraries/CustomComponents/Lists/__tests__/__snapshots__/SectionList-test.js.snap
@@ -96,7 +96,7 @@ exports[`SectionList renders all the bells and whistles 1`] = `
   data={
     Array [
       Object {
-        "SeparatorComponent": [Function],
+        "ItemSeparatorComponent": [Function],
         "data": Array [
           Object {
             "id": "i1s1",
@@ -152,7 +152,7 @@ exports[`SectionList renders all the bells and whistles 1`] = `
   sections={
     Array [
       Object {
-        "SeparatorComponent": [Function],
+        "ItemSeparatorComponent": [Function],
         "data": Array [
           Object {
             "id": "i1s1",

From 46d6766a53f6fa7550ad4dd34bcb97549e716ef7 Mon Sep 17 00:00:00 2001
From: Spencer Ahrens <sahrens@fb.com>
Date: Tue, 21 Mar 2017 22:19:13 -0700
Subject: [PATCH 136/366] useful error when switching numColumns on the fly

Reviewed By: blairvanderhoof, bvaughn

Differential Revision: D4742842

fbshipit-source-id: a11a088194ead02cc11eb6ccd9ce6d6f75ead3a3
---
 Libraries/CustomComponents/Lists/FlatList.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Libraries/CustomComponents/Lists/FlatList.js b/Libraries/CustomComponents/Lists/FlatList.js
index 2f7bd1536382ac..77ca170845ca2f 100644
--- a/Libraries/CustomComponents/Lists/FlatList.js
+++ b/Libraries/CustomComponents/Lists/FlatList.js
@@ -242,6 +242,11 @@ class FlatList<ItemT> extends React.PureComponent<DefaultProps, Props<ItemT>, vo
   }
 
   componentWillReceiveProps(nextProps: Props<ItemT>) {
+    invariant(
+      nextProps.numColumns === this.props.numColumns,
+      'Changing numColumns on the fly is not supported. Change the key prop on FlatList when ' +
+      'changing the number of columns to force a fresh render of the component.'
+    );
     this._checkProps(nextProps);
   }
 

From 93c438d47078111f44aec69c8864b3a26f098842 Mon Sep 17 00:00:00 2001
From: Spencer Ahrens <sahrens@fb.com>
Date: Tue, 21 Mar 2017 22:45:50 -0700
Subject: [PATCH 137/366] Fix nodeHandle crash

Summary:
It's supposed to take a component or a handle, per the arg name, so switch on the type (and handle `null`).

`FlatListExample` no longer crashes.

Reviewed By: bvaughn, sebmarkbage

Differential Revision: D4752619

fbshipit-source-id: 720421f648f7c2049b5cc44f006484eb47d22d86
---
 Libraries/Renderer/src/renderers/native/ReactNativeStack.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeStack.js b/Libraries/Renderer/src/renderers/native/ReactNativeStack.js
index d6ae88792d9d1e..ef1d68fcb447ce 100644
--- a/Libraries/Renderer/src/renderers/native/ReactNativeStack.js
+++ b/Libraries/Renderer/src/renderers/native/ReactNativeStack.js
@@ -37,7 +37,11 @@ var ReactNative = {
   // The injected findNodeHandle() strategy returns the instance wrapper though.
   // See NativeMethodsMixin#setNativeProps for more info on why this is done.
   findNodeHandle(componentOrHandle : any) : ?number {
-    return findNodeHandle(componentOrHandle).getHostNode();
+    const nodeHandle = findNodeHandle(componentOrHandle);
+    if (nodeHandle == null || typeof nodeHandle === 'number') {
+      return nodeHandle;
+    }
+    return nodeHandle.getHostNode();
   },
 
   render: render,

From f39ef3619073aae83d5b71a2b17798e5d19c9324 Mon Sep 17 00:00:00 2001
From: sunnylqm <sunnylqm@qq.com>
Date: Tue, 21 Mar 2017 23:55:50 -0700
Subject: [PATCH 138/366] Update FlatList doc

Summary:
1. Mention scrollToIndex support.
2. Fix a format error.
3. Use relative links like https://github.com/facebook/react-native/blob/59257d6976656f4eeaf389ae5527dfaff08e7354/Libraries/Components/Navigation/NavigatorIOS.ios.js#L136 for links in "next version" to work properly.

~~4. BREAKING: `columnWrapperStyle` should be `rowWrapperStyle`?~~
Closes https://github.com/facebook/react-native/pull/12714

Differential Revision: D4730476

Pulled By: sahrens

fbshipit-source-id: 643aab659064e6f5275ec89fd7f967dd9de866c4
---
 Libraries/CustomComponents/Lists/FlatList.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Libraries/CustomComponents/Lists/FlatList.js b/Libraries/CustomComponents/Lists/FlatList.js
index 77ca170845ca2f..9c90549ca4ea6e 100644
--- a/Libraries/CustomComponents/Lists/FlatList.js
+++ b/Libraries/CustomComponents/Lists/FlatList.js
@@ -158,8 +158,9 @@ type DefaultProps = typeof defaultProps;
  *  - Separator support.
  *  - Pull to Refresh.
  *  - Scroll loading.
+ *  - ScrollToIndex support.
  *
- * If you need section support, use [`<SectionList>`](/react-native/docs/sectionlist.html).
+ * If you need section support, use [`<SectionList>`](docs/sectionlist.html).
  *
  * Minimal Example:
  *
@@ -168,7 +169,7 @@ type DefaultProps = typeof defaultProps;
  *       renderItem={({item}) => <Text>{item.key}</Text>}
  *     />
  *
- * This is a convenience wrapper around [`<VirtualizedList>`](/react-native/docs/virtualizedlist.html),
+ * This is a convenience wrapper around [`<VirtualizedList>`](docs/virtualizedlist.html),
  * and thus inherits the following caveats:
  *
  * - Internal state is not preserved when content scrolls out of the render window. Make sure all

From 0ea1ea5fb7cdcd8c47ccf08d94fdce2f49f3b819 Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieterdb@fb.com>
Date: Wed, 22 Mar 2017 05:27:58 -0700
Subject: [PATCH 139/366] Remove unused websocket-executor-name and
 websocket-executor-port options

Reviewed By: davidaurelio

Differential Revision: D4745529

fbshipit-source-id: 2c69aca33c999ccf2af8dbf8d9af2c1d123b59cd
---
 Libraries/WebSocket/RCTWebSocketExecutor.m | 14 ++------------
 React/Modules/RCTDevMenu.m                 | 11 ++++-------
 React/Modules/RCTDevSettings.h             |  6 ------
 React/Modules/RCTDevSettings.mm            |  7 -------
 4 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/Libraries/WebSocket/RCTWebSocketExecutor.m b/Libraries/WebSocket/RCTWebSocketExecutor.m
index 7534181bd7ceeb..b256374fc59bf7 100644
--- a/Libraries/WebSocket/RCTWebSocketExecutor.m
+++ b/Libraries/WebSocket/RCTWebSocketExecutor.m
@@ -54,18 +54,8 @@ - (instancetype)initWithURL:(NSURL *)URL
 - (void)setUp
 {
   if (!_url) {
-    NSUserDefaults *standardDefaults = [NSUserDefaults standardUserDefaults];
-
-    // TODO t16297016: this seems to be unused, remove?
-    NSInteger port = [standardDefaults integerForKey:@"websocket-executor-port"];
-    if (!port) {
-      port = [[[_bridge bundleURL] port] integerValue] ?: 8081;
-    }
-
-    NSString *host = [[_bridge bundleURL] host];
-    if (!host) {
-      host = @"localhost";
-    }
+    NSInteger port = [[[_bridge bundleURL] port] integerValue] ?: 8081;
+    NSString *host = [[_bridge bundleURL] host] ?: @"localhost";
     NSString *URLString = [NSString stringWithFormat:@"http://%@:%zd/debugger-proxy?role=client", host, port];
     _url = [RCTConvert NSURL:URLString];
   }
diff --git a/React/Modules/RCTDevMenu.m b/React/Modules/RCTDevMenu.m
index 2c0ce388345540..7dcce131cc60f3 100644
--- a/React/Modules/RCTDevMenu.m
+++ b/React/Modules/RCTDevMenu.m
@@ -193,20 +193,17 @@ - (void)addItem:(RCTDevMenuItem *)item
     [bridge reload];
   }]];
 
-  NSString *executorName = devSettings.websocketExecutorName ?: @"Remote JS";
   if (!devSettings.isRemoteDebuggingAvailable) {
-    [items addObject:[RCTDevMenuItem buttonItemWithTitle:[NSString stringWithFormat:@"%@ Debugger Unavailable", executorName] handler:^{
+    [items addObject:[RCTDevMenuItem buttonItemWithTitle:@"Remote JS Debugger Unavailable" handler:^{
       UIAlertController *alertController = [UIAlertController
-        alertControllerWithTitle:[NSString stringWithFormat:@"%@ Debugger Unavailable", executorName]
-        message:[NSString stringWithFormat:@"You need to include the RCTWebSocket library to enable %@ debugging", executorName]
+        alertControllerWithTitle:@"Remote JS Debugger Unavailable"
+        message:@"You need to include the RCTWebSocket library to enable remote JS debugging"
         preferredStyle:UIAlertControllerStyleAlert];
       [RCTPresentedViewController() presentViewController:alertController animated:YES completion:NULL];
     }]];
   } else {
     [items addObject:[RCTDevMenuItem buttonItemWithTitleBlock:^NSString *{
-      return devSettings.isDebuggingRemotely ?
-        [NSString stringWithFormat:@"Stop %@ Debugging", executorName] :
-        [NSString stringWithFormat:@"Debug %@", executorName];
+      return devSettings.isDebuggingRemotely ? @"Stop Remote JS Debugging" : @"Debug JS Remotely";
     } handler:^{
       devSettings.isDebuggingRemotely = !devSettings.isDebuggingRemotely;
     }]];
diff --git a/React/Modules/RCTDevSettings.h b/React/Modules/RCTDevSettings.h
index d8ffd7c9095de7..cfecfa5d57927e 100644
--- a/React/Modules/RCTDevSettings.h
+++ b/React/Modules/RCTDevSettings.h
@@ -42,12 +42,6 @@
  */
 @property (nonatomic, assign) BOOL isDebuggingRemotely;
 
-/**
- * Alternate name for the websocket executor, if not the generic term "remote".
- * TODO t16297016: this seems to be unused, remove?
- */
-@property (nonatomic, readonly) NSString *websocketExecutorName;
-
 /*
  * Whether shaking will show RCTDevMenu. The menu is enabled by default if RCT_DEV=1, but
  * you may wish to disable it so that you can provide your own shake handler.
diff --git a/React/Modules/RCTDevSettings.mm b/React/Modules/RCTDevSettings.mm
index d97aa6031feefe..241838b0d98bdf 100644
--- a/React/Modules/RCTDevSettings.mm
+++ b/React/Modules/RCTDevSettings.mm
@@ -28,7 +28,6 @@
 NSString *const kRCTDevSettingLiveReloadEnabled = @"liveReloadEnabled";
 NSString *const kRCTDevSettingIsInspectorShown = @"showInspector";
 NSString *const kRCTDevSettingIsDebuggingRemotely = @"isDebuggingRemotely";
-NSString *const kRCTDevSettingWebsocketExecutorName = @"websocket-executor-name";
 NSString *const kRCTDevSettingExecutorOverrideClass = @"executor-override";
 NSString *const kRCTDevSettingShakeToShowDevMenu = @"shakeToShow";
 NSString *const kRCTDevSettingIsPerfMonitorShown = @"RCTPerfMonitorKey";
@@ -197,12 +196,6 @@ - (BOOL)isJSCSamplingProfilerAvailable
   [_bridge reload];
 }
 
-- (NSString *)websocketExecutorName
-{
-  // This value is passed as a command-line argument, so fall back to reading from NSUserDefaults directly
-  return [[NSUserDefaults standardUserDefaults] stringForKey:kRCTDevSettingWebsocketExecutorName];
-}
-
 - (void)setIsShakeToShowDevMenuEnabled:(BOOL)isShakeToShowDevMenuEnabled
 {
   [self _updateSettingWithValue:@(isShakeToShowDevMenuEnabled) forKey:kRCTDevSettingShakeToShowDevMenu];

From 005fbe6aa46d6866cb74bb721b310cee05da0103 Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieterdb@fb.com>
Date: Wed, 22 Mar 2017 05:36:40 -0700
Subject: [PATCH 140/366] Fix PerformanceLogger clearing unfinished events

Reviewed By: alexeylang

Differential Revision: D4749516

fbshipit-source-id: 348f1cf51c01b39a410be8b39598e8e98cd52d55
---
 Libraries/Utilities/PerformanceLogger.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Libraries/Utilities/PerformanceLogger.js b/Libraries/Utilities/PerformanceLogger.js
index 053abb9ae6c69f..e0f0ccbe3ffba1 100644
--- a/Libraries/Utilities/PerformanceLogger.js
+++ b/Libraries/Utilities/PerformanceLogger.js
@@ -98,6 +98,15 @@ var PerformanceLogger = {
     extras = {};
   },
 
+  clearCompleted() {
+    for (var key in timespans) {
+      if (timespans[key].totalTime) {
+        delete timespans[key];
+      }
+    }
+    extras = {};
+  },
+
   clearExceptTimespans(keys) {
     timespans = Object.keys(timespans).reduce(function(previous, key) {
       if (keys.indexOf(key) !== -1) {

From 950637672a3b18938c41756fcd77a46beb842179 Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieterdb@fb.com>
Date: Wed, 22 Mar 2017 05:36:42 -0700
Subject: [PATCH 141/366] Add flow typing to PerformanceLogger

Reviewed By: AaaChiuuu

Differential Revision: D4749896

fbshipit-source-id: 8a3f12e5d7b209c48c95f8564d8e3bcbd19f90c8
---
 Libraries/Utilities/PerformanceLogger.js | 52 ++++++++++++++----------
 1 file changed, 31 insertions(+), 21 deletions(-)

diff --git a/Libraries/Utilities/PerformanceLogger.js b/Libraries/Utilities/PerformanceLogger.js
index e0f0ccbe3ffba1..451b344158e88c 100644
--- a/Libraries/Utilities/PerformanceLogger.js
+++ b/Libraries/Utilities/PerformanceLogger.js
@@ -7,16 +7,25 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  *
  * @providesModule PerformanceLogger
+ * @flow
  */
 'use strict';
 
 const BatchedBridge = require('BatchedBridge');
-const performanceNow = global.nativePerformanceNow || require('fbjs/lib/performanceNow');
 const Systrace = require('Systrace');
 
-var timespans = {};
-var extras = {};
-var cookies = {};
+const performanceNow = global.nativePerformanceNow || require('fbjs/lib/performanceNow');
+
+type Timespan = {
+  description?: string,
+  totalTime?: number,
+  startTime?: number,
+  endTime?: number,
+};
+
+let timespans: {[key:string]: Timespan} = {};
+let extras: {[key:string]: any} = {};
+const cookies: {[key:string]: number} = {};
 
 const PRINT_TO_CONSOLE = false;
 
@@ -24,8 +33,8 @@ const PRINT_TO_CONSOLE = false;
  * This is meant to collect and log performance data in production, which means
  * it needs to have minimal overhead.
  */
-var PerformanceLogger = {
-  addTimespan(key, lengthInMs, description) {
+const PerformanceLogger = {
+  addTimespan(key: string, lengthInMs: number, description?: string) {
     if (timespans[key]) {
       if (__DEV__) {
         console.log(
@@ -42,7 +51,7 @@ var PerformanceLogger = {
     };
   },
 
-  startTimespan(key, description) {
+  startTimespan(key: string, description?: string) {
     if (timespans[key]) {
       if (__DEV__) {
         console.log(
@@ -63,8 +72,9 @@ var PerformanceLogger = {
     }
   },
 
-  stopTimespan(key) {
-    if (!timespans[key] || !timespans[key].startTime) {
+  stopTimespan(key: string) {
+    const timespan = timespans[key];
+    if (!timespan || !timespan.startTime) {
       if (__DEV__) {
         console.log(
           'PerformanceLogger: Attempting to end a timespan that has not started ',
@@ -73,7 +83,7 @@ var PerformanceLogger = {
       }
       return;
     }
-    if (timespans[key].endTime) {
+    if (timespan.endTime) {
       if (__DEV__) {
         console.log(
           'PerformanceLogger: Attempting to end a timespan that has already ended ',
@@ -83,14 +93,14 @@ var PerformanceLogger = {
       return;
     }
 
+    timespan.endTime = performanceNow();
+    timespan.totalTime = timespan.endTime - (timespan.startTime || 0);
     if (__DEV__ && PRINT_TO_CONSOLE) {
       console.log('PerformanceLogger.js', 'end: ' + key);
     }
+
     Systrace.endAsyncEvent(key, cookies[key]);
     delete cookies[key];
-    timespans[key].endTime = performanceNow();
-    timespans[key].totalTime =
-      timespans[key].endTime - timespans[key].startTime;
   },
 
   clear() {
@@ -99,7 +109,7 @@ var PerformanceLogger = {
   },
 
   clearCompleted() {
-    for (var key in timespans) {
+    for (const key in timespans) {
       if (timespans[key].totalTime) {
         delete timespans[key];
       }
@@ -107,7 +117,7 @@ var PerformanceLogger = {
     extras = {};
   },
 
-  clearExceptTimespans(keys) {
+  clearExceptTimespans(keys: Array<string>) {
     timespans = Object.keys(timespans).reduce(function(previous, key) {
       if (keys.indexOf(key) !== -1) {
         previous[key] = timespans[key];
@@ -125,21 +135,21 @@ var PerformanceLogger = {
     return timespans;
   },
 
-  hasTimespan(key) {
+  hasTimespan(key: string) {
     return !!timespans[key];
   },
 
   logTimespans() {
-    for (var key in timespans) {
+    for (const key in timespans) {
       if (timespans[key].totalTime) {
         console.log(key + ': ' + timespans[key].totalTime + 'ms');
       }
     }
   },
 
-  addTimespans(newTimespans, labels) {
-    for (var i = 0, l = newTimespans.length; i < l; i += 2) {
-      var label = labels[i / 2];
+  addTimespans(newTimespans: Array<number>, labels: Array<string>) {
+    for (let i = 0, l = newTimespans.length; i < l; i += 2) {
+      const label = labels[i / 2];
       PerformanceLogger.addTimespan(
         label,
         (newTimespans[i + 1] - newTimespans[i]),
@@ -148,7 +158,7 @@ var PerformanceLogger = {
     }
   },
 
-  setExtra(key, value) {
+  setExtra(key: string, value: any) {
     if (extras[key]) {
       if (__DEV__) {
         console.log(

From 54989d0aafe95dc4fbe4958227be3147ba561ff7 Mon Sep 17 00:00:00 2001
From: Brent Vatne <brentvatne@gmail.com>
Date: Wed, 22 Mar 2017 05:38:21 -0700
Subject: [PATCH 142/366] Lock version to 2.7.5 to avoid breakage like #12772

Summary:
As per uglify-js maintainer kzc's comment in https://github.com/mishoo/UglifyJS2/issues/1573#issuecomment-284940371 we should be locking our version to prevent issues like #12772 from happening again.

No test plan needed, people are already using this version of uglify-js (it's the latest).
Closes https://github.com/facebook/react-native/pull/12802

Differential Revision: D4749853

Pulled By: javache

fbshipit-source-id: 866a19cb2c1add31b55e14d0f4dadb7f68fda64c
---
 package.json          | 2 +-
 packager/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 69d7cbd7ce1f99..615c75787fdb78 100644
--- a/package.json
+++ b/package.json
@@ -201,7 +201,7 @@
     "stacktrace-parser": "^0.1.3",
     "temp": "0.8.3",
     "throat": "^3.0.0",
-    "uglify-js": "^2.6.2",
+    "uglify-js": "2.7.5",
     "whatwg-fetch": "^1.0.0",
     "wordwrap": "^1.0.0",
     "worker-farm": "^1.3.1",
diff --git a/packager/package.json b/packager/package.json
index 91de355c3be53f..e6386cc9165199 100644
--- a/packager/package.json
+++ b/packager/package.json
@@ -37,7 +37,7 @@
     "rimraf": "^2.5.4",
     "source-map": "^0.5.6",
     "throat": "^3.0.0",
-    "uglify-js": "^2.6.2",
+    "uglify-js": "2.7.5",
     "worker-farm": "^1.3.1",
     "write-file-atomic": "^1.2.0",
     "xpipe": "^1.0.5"

From d5288e76987cfdff90ff67a606af40fb4ad688d5 Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Wed, 22 Mar 2017 06:07:10 -0700
Subject: [PATCH 143/366] packager: GlobalTransformCache-test: disable
 non-deterministic test

Reviewed By: davidaurelio

Differential Revision: D4751434

fbshipit-source-id: 1be748387abe9ca0ce030bd2423827dfe5c2a146
---
 packager/src/lib/GlobalTransformCache.js            | 13 ++++++-------
 .../src/lib/__tests__/GlobalTransformCache-test.js  |  2 +-
 .../__snapshots__/GlobalTransformCache-test.js.snap |  4 ++--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/packager/src/lib/GlobalTransformCache.js b/packager/src/lib/GlobalTransformCache.js
index 31d27cef26128c..c0a03e1c33988e 100644
--- a/packager/src/lib/GlobalTransformCache.js
+++ b/packager/src/lib/GlobalTransformCache.js
@@ -99,10 +99,11 @@ class KeyResultStore {
 }
 
 /**
- * The transform options contain absolute paths. This can contain, for
- * example, the username if someone works their home directory (very likely).
- * We need to get rid of this user-and-machine-dependent data for the global
- * cache, otherwise nobody  would share the same cache keys.
+ * The transform options contain absolute paths. This can contain, for example,
+ * the username if someone works their home directory (very likely). We get rid
+ * of this local data for the global cache, otherwise nobody would share the
+ * same cache keys. The project roots should not be needed as part of the cache
+ * key as they should not affect the transformation of a single particular file.
  */
 function globalizeTransformOptions(
   options: TransformOptions,
@@ -115,9 +116,7 @@ function globalizeTransformOptions(
     ...options,
     transform: {
       ...transform,
-      projectRoots: transform.projectRoots.map(p => {
-        return path.relative(path.join(__dirname, '../../../../..'), p);
-      }),
+      projectRoots: [],
     },
   };
 }
diff --git a/packager/src/lib/__tests__/GlobalTransformCache-test.js b/packager/src/lib/__tests__/GlobalTransformCache-test.js
index 1900ed85f884ae..17fee4a4d45333 100644
--- a/packager/src/lib/__tests__/GlobalTransformCache-test.js
+++ b/packager/src/lib/__tests__/GlobalTransformCache-test.js
@@ -40,7 +40,7 @@ describe('GlobalTransformCache', () => {
       dev: true,
       minify: false,
       platform: 'ios',
-      transform: {projectRoots: [__dirname]},
+      transform: {},
     };
     const result = await Promise.all([cache.fetch({
       filePath: 'foo.js',
diff --git a/packager/src/lib/__tests__/__snapshots__/GlobalTransformCache-test.js.snap b/packager/src/lib/__tests__/__snapshots__/GlobalTransformCache-test.js.snap
index c0fdf1ad5bb838..70472f3afb25cd 100644
--- a/packager/src/lib/__tests__/__snapshots__/GlobalTransformCache-test.js.snap
+++ b/packager/src/lib/__tests__/__snapshots__/GlobalTransformCache-test.js.snap
@@ -19,12 +19,12 @@ Object {
 exports[`GlobalTransformCache fetches results 1`] = `
 Array [
   Object {
-    "code": "/* code from http://globalcache.com/2ad175cb80ae79fd33b914bfb392fb6742982d2a-foo.js */",
+    "code": "/* code from http://globalcache.com/17ce731dadd36402f15abb768843cb5e8ecf9ca7-foo.js */",
     "dependencies": Array [],
     "dependencyOffsets": Array [],
   },
   Object {
-    "code": "/* code from http://globalcache.com/d6c0a1a4199d572ab68b36c07d0d68607eebb131-bar.js */",
+    "code": "/* code from http://globalcache.com/d78572916bd877b6ac0e819e99be9fc2954f0e00-bar.js */",
     "dependencies": Array [],
     "dependencyOffsets": Array [],
   },

From ebd8b2ab43045ec97b00aa1c9e640ab1f8a36b65 Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Wed, 22 Mar 2017 06:41:14 -0700
Subject: [PATCH 144/366] packager: Package.js: make read()-based API sync

Reviewed By: davidaurelio

Differential Revision: D4745885

fbshipit-source-id: 3d327e5ca91fcbe7ec1d30ff8e6135b415074aa4
---
 .../DependencyGraph/ResolutionRequest.js      |  14 +-
 packager/src/node-haste/Package.js            | 135 +++++++++---------
 2 files changed, 73 insertions(+), 76 deletions(-)

diff --git a/packager/src/node-haste/DependencyGraph/ResolutionRequest.js b/packager/src/node-haste/DependencyGraph/ResolutionRequest.js
index 0ffa7446373b32..22e7aaf6400152 100644
--- a/packager/src/node-haste/DependencyGraph/ResolutionRequest.js
+++ b/packager/src/node-haste/DependencyGraph/ResolutionRequest.js
@@ -232,7 +232,7 @@ class ResolutionRequest {
 
     let p = fromModule.getPackage();
     if (p) {
-      p = p.redirectRequire(toModuleName);
+      p = Promise.resolve(p.redirectRequire(toModuleName));
     } else {
       p = Promise.resolve(toModuleName);
     }
@@ -470,13 +470,11 @@ class ResolutionRequest {
 
       const packageJsonPath = path.join(potentialDirPath, 'package.json');
       if (this._hasteFS.exists(packageJsonPath)) {
-        return this._moduleCache.getPackage(packageJsonPath)
-          .getMain().then(
-            main => this._tryResolve(
-              () => this._loadAsFile(main, fromModule, toModule),
-              () => this._loadAsDir(main, fromModule, toModule)
-            )
-          );
+        const main = this._moduleCache.getPackage(packageJsonPath).getMain();
+        return this._tryResolve(
+          () => this._loadAsFile(main, fromModule, toModule),
+          () => this._loadAsDir(main, fromModule, toModule),
+        );
       }
 
       return this._loadAsFile(
diff --git a/packager/src/node-haste/Package.js b/packager/src/node-haste/Package.js
index f32608afa509d0..fa5bb05b093ab1 100644
--- a/packager/src/node-haste/Package.js
+++ b/packager/src/node-haste/Package.js
@@ -17,6 +17,13 @@ const path = require('path');
 
 import type Cache from './Cache';
 
+type PackageContent = {
+  name: string,
+  'react-native': mixed,
+  browser: mixed,
+  main: ?string,
+};
+
 class Package {
 
   path: string;
@@ -24,12 +31,7 @@ class Package {
   type: string;
   _cache: Cache;
 
-  _reading: Promise<{
-    name: string,
-    'react-native': mixed,
-    browser: mixed,
-    main: ?string,
-  }>;
+  _content: ?PackageContent;
 
   constructor({file, cache}: {
     file: string,
@@ -39,39 +41,39 @@ class Package {
     this.root = path.dirname(this.path);
     this.type = 'Package';
     this._cache = cache;
+    this._content = null;
   }
 
   getMain() {
-    return this.read().then(json => {
-      var replacements = getReplacements(json);
-      if (typeof replacements === 'string') {
-        return path.join(this.root, replacements);
-      }
+    const json = this.read();
+    var replacements = getReplacements(json);
+    if (typeof replacements === 'string') {
+      return path.join(this.root, replacements);
+    }
 
-      let main = json.main || 'index';
+    let main = json.main || 'index';
 
-      if (replacements && typeof replacements === 'object') {
-        main = replacements[main] ||
-          replacements[main + '.js'] ||
-          replacements[main + '.json'] ||
-          replacements[main.replace(/(\.js|\.json)$/, '')] ||
-          main;
-      }
+    if (replacements && typeof replacements === 'object') {
+      main = replacements[main] ||
+        replacements[main + '.js'] ||
+        replacements[main + '.json'] ||
+        replacements[main.replace(/(\.js|\.json)$/, '')] ||
+        main;
+    }
 
-      /* $FlowFixMe: `getReplacements` doesn't validate the return value. */
-      return path.join(this.root, main);
-    });
+    /* $FlowFixMe: `getReplacements` doesn't validate the return value. */
+    return path.join(this.root, main);
   }
 
   isHaste() {
     return this._cache.get(this.path, 'package-haste', () =>
-      this.read().then(json => !!json.name)
+      Promise.resolve(!!this.read().name)
     );
   }
 
   getName(): Promise<string> {
     return this._cache.get(this.path, 'package-name', () =>
-      this.read().then(json => json.name)
+      Promise.resolve(this.read().name)
     );
   }
 
@@ -79,66 +81,63 @@ class Package {
     this._cache.invalidate(this.path);
   }
 
-  redirectRequire(name: string) {
-    return this.read().then(json => {
-      var replacements = getReplacements(json);
+  redirectRequire(name: string): string | false {
+    const json = this.read();
+    const replacements = getReplacements(json);
 
-      if (!replacements || typeof replacements !== 'object') {
-        return name;
-      }
+    if (!replacements || typeof replacements !== 'object') {
+      return name;
+    }
 
-      if (!isAbsolutePath(name)) {
-        const replacement = replacements[name];
-        // support exclude with "someDependency": false
-        return replacement === false
-          ? false
-          : replacement || name;
-      }
+    if (!isAbsolutePath(name)) {
+      const replacement = replacements[name];
+      // support exclude with "someDependency": false
+      return replacement === false
+        ? false
+        /* $FlowFixMe: type of replacements is not being validated */
+        : replacement || name;
+    }
 
-      let relPath = './' + path.relative(this.root, name);
-      if (path.sep !== '/') {
-        relPath = relPath.replace(new RegExp('\\' + path.sep, 'g'), '/');
-      }
+    let relPath = './' + path.relative(this.root, name);
+    if (path.sep !== '/') {
+      relPath = relPath.replace(new RegExp('\\' + path.sep, 'g'), '/');
+    }
 
-      let redirect = replacements[relPath];
+    let redirect = replacements[relPath];
 
-      // false is a valid value
+    // false is a valid value
+    if (redirect == null) {
+      redirect = replacements[relPath + '.js'];
       if (redirect == null) {
-        redirect = replacements[relPath + '.js'];
-        if (redirect == null) {
-          redirect = replacements[relPath + '.json'];
-        }
+        redirect = replacements[relPath + '.json'];
       }
+    }
 
-      // support exclude with "./someFile": false
-      if (redirect === false) {
-        return false;
-      }
+    // support exclude with "./someFile": false
+    if (redirect === false) {
+      return false;
+    }
 
-      if (redirect) {
-        return path.join(
-          this.root,
-          /* $FlowFixMe: `getReplacements` doesn't validate the return value. */
-          redirect
-        );
-      }
+    if (redirect) {
+      return path.join(
+        this.root,
+        /* $FlowFixMe: `getReplacements` doesn't validate the return value. */
+        redirect
+      );
+    }
 
-      return name;
-    });
+    return name;
   }
 
-  read() {
-    if (!this._reading) {
-      this._reading = new Promise(
-        resolve => resolve(JSON.parse(fs.readFileSync(this.path, 'utf8')))
-      );
+  read(): PackageContent {
+    if (this._content == null) {
+      this._content = JSON.parse(fs.readFileSync(this.path, 'utf8'));
     }
-
-    return this._reading;
+    return this._content;
   }
 }
 
-function getReplacements(pkg) {
+function getReplacements(pkg: PackageContent): mixed {
   let rn = pkg['react-native'];
   let browser = pkg.browser;
   if (rn == null) {

From e22898bcffba7b12c34cbf9f63223796919335b6 Mon Sep 17 00:00:00 2001
From: Alexey Lang <alexeylang@fb.com>
Date: Wed, 22 Mar 2017 07:54:19 -0700
Subject: [PATCH 145/366] Refactor measuring app require time

Reviewed By: javache

Differential Revision: D4746020

fbshipit-source-id: cfc9de286feeac49b4b569560dc29c7a1c25eee1
---
 Libraries/ReactNative/AppRegistry.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/Libraries/ReactNative/AppRegistry.js b/Libraries/ReactNative/AppRegistry.js
index ac4a1c126311a7..15773d1f7c90ca 100644
--- a/Libraries/ReactNative/AppRegistry.js
+++ b/Libraries/ReactNative/AppRegistry.js
@@ -29,6 +29,8 @@ if (__DEV__) {
 type Task = (taskData: any) => Promise<void>;
 type TaskProvider = () => Task;
 export type ComponentProvider = () => ReactClass<any>;
+export type ComponentProviderInstrumentationHook =
+  (component: ComponentProvider) => ReactClass<any>;
 export type AppConfig = {
   appKey: string,
   component?: ComponentProvider,
@@ -51,6 +53,8 @@ const runnables: Runnables = {};
 let runCount = 1;
 const sections: Runnables = {};
 const tasks: Map<string, TaskProvider> = new Map();
+let componentProviderInstrumentationHook: ComponentProviderInstrumentationHook =
+  (component: ComponentProvider) => component();
 
 /**
  * `AppRegistry` is the JS entry point to running all React Native apps.  App
@@ -96,7 +100,11 @@ const AppRegistry = {
     runnables[appKey] = {
       component,
       run: (appParameters) =>
-        renderApplication(component(), appParameters.initialProps, appParameters.rootTag)
+        renderApplication(
+          componentProviderInstrumentationHook(component),
+          appParameters.initialProps,
+          appParameters.rootTag
+        )
     };
     if (section) {
       sections[appKey] = runnables[appKey];
@@ -138,6 +146,10 @@ const AppRegistry = {
     };
   },
 
+  setComponentProviderInstrumentationHook(hook: ComponentProviderInstrumentationHook) {
+    componentProviderInstrumentationHook = hook;
+  },
+
   runApplication(appKey: string, appParameters: any): void {
     const msg =
       'Running application "' + appKey + '" with appParams: ' +

From 5eb954f660d4d102aebbb0abb497ed55ca722713 Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Wed, 22 Mar 2017 08:28:18 -0700
Subject: [PATCH 146/366] packager: Module.js: make read()-based API sync

Reviewed By: davidaurelio

Differential Revision: D4746218

fbshipit-source-id: 1a36bd00a47a6b871cc77433b2325a11e90035b2
---
 packager/src/node-haste/Module.js | 122 +++++++++++++++---------------
 1 file changed, 60 insertions(+), 62 deletions(-)

diff --git a/packager/src/node-haste/Module.js b/packager/src/node-haste/Module.js
index 5b89683ecfa7a5..98ed7ce3e9bddd 100644
--- a/packager/src/node-haste/Module.js
+++ b/packager/src/node-haste/Module.js
@@ -74,6 +74,8 @@ export type ConstructorArgs = {
   transformCode: ?TransformCode,
 };
 
+type DocBlock = {+[key: string]: string};
+
 class Module {
 
   path: string;
@@ -88,9 +90,9 @@ class Module {
   _reporter: Reporter;
   _globalCache: ?GlobalTransformCache;
 
-  _docBlock: Promise<{[key: string]: string}>;
-  _hasteName: Promise<string | void>;
-  _readSourceCodePromise: Promise<string>;
+  _docBlock: ?DocBlock;
+  _hasteNameCache: ?{+hasteName: ?string};
+  _sourceCode: ?string;
   _readPromises: Map<string, Promise<ReadResult>>;
 
   constructor({
@@ -127,7 +129,7 @@ class Module {
     return this._cache.get(
       this.path,
       'isHaste',
-      () => this._getHasteName().then(name => !!name),
+      () => Promise.resolve(this._getHasteName() != null),
     );
   }
 
@@ -143,8 +145,9 @@ class Module {
     return this._cache.get(
       this.path,
       'name',
-      () => this._getHasteName().then(name => {
-        if (name !== undefined) {
+      () => Promise.resolve().then(() => {
+        const name = this._getHasteName();
+        if (name != null) {
           return name;
         }
 
@@ -183,67 +186,63 @@ class Module {
   invalidate() {
     this._cache.invalidate(this.path);
     this._readPromises.clear();
+    this._sourceCode = null;
+    this._docBlock = null;
+    this._hasteNameCache = null;
   }
 
-  _readSourceCode() {
-    if (!this._readSourceCodePromise) {
-      this._readSourceCodePromise = new Promise(
-        resolve => resolve(fs.readFileSync(this.path, 'utf8'))
-      );
+  _readSourceCode(): string {
+    if (this._sourceCode == null) {
+      this._sourceCode = fs.readFileSync(this.path, 'utf8');
     }
-    return this._readSourceCodePromise;
+    return this._sourceCode;
   }
 
-  _readDocBlock() {
-    if (!this._docBlock) {
-      this._docBlock = this._readSourceCode()
-        .then(source => docblock.parseAsObject(source));
+  _readDocBlock(): DocBlock {
+    if (this._docBlock == null) {
+      this._docBlock = docblock.parseAsObject(this._readSourceCode());
     }
     return this._docBlock;
   }
 
-  _getHasteName(): Promise<string | void> {
-    if (!this._hasteName) {
-      const hasteImpl = this._options.hasteImpl;
-      if (hasteImpl === undefined || hasteImpl.enforceHasteNameMatches) {
-        this._hasteName = this._readDocBlock().then(moduleDocBlock => {
-          const {providesModule} = moduleDocBlock;
-          return providesModule
-            && !this._depGraphHelpers.isNodeModulesDir(this.path)
-              ? /^\S+/.exec(providesModule)[0]
-              : undefined;
-        });
-      }
-      if (hasteImpl !== undefined) {
-        const {enforceHasteNameMatches} = hasteImpl;
-        if (enforceHasteNameMatches) {
-          this._hasteName = this._hasteName.then(providesModule => {
-            enforceHasteNameMatches(
-              this.path,
-              providesModule,
-            );
-            return hasteImpl.getHasteName(this.path);
-          });
-        } else {
-          this._hasteName = Promise.resolve(hasteImpl.getHasteName(this.path));
-        }
-      } else {
-        // Extract an id for the module if it's using @providesModule syntax
-        // and if it's NOT in node_modules (and not a whitelisted node_module).
-        // This handles the case where a project may have a dep that has @providesModule
-        // docblock comments, but doesn't want it to conflict with whitelisted @providesModule
-        // modules, such as react-haste, fbjs-haste, or react-native or with non-dependency,
-        // project-specific code that is using @providesModule.
-        this._hasteName = this._readDocBlock().then(moduleDocBlock => {
-          const {providesModule} = moduleDocBlock;
-          return providesModule
-            && !this._depGraphHelpers.isNodeModulesDir(this.path)
-              ? /^\S+/.exec(providesModule)[0]
-              : undefined;
-        });
+  _getHasteName(): ?string {
+    if (this._hasteNameCache != null) {
+      return this._hasteNameCache.hasteName;
+    }
+    const hasteImpl = this._options.hasteImpl;
+    if (hasteImpl === undefined || hasteImpl.enforceHasteNameMatches) {
+      const moduleDocBlock = this._readDocBlock();
+      const {providesModule} = moduleDocBlock;
+      this._hasteNameCache = {
+        hasteName: providesModule && !this._depGraphHelpers.isNodeModulesDir(this.path)
+          ? /^\S+/.exec(providesModule)[0]
+          : undefined,
+      };
+    }
+    if (hasteImpl !== undefined) {
+      const {enforceHasteNameMatches} = hasteImpl;
+      if (enforceHasteNameMatches) {
+        /* $FlowFixMe: this rely on the above if being executed, that is fragile. Rework the algo. */
+        enforceHasteNameMatches(this.path, this._hasteNameCache.hasteName);
       }
+      this._hasteNameCache = {hasteName: hasteImpl.getHasteName(this.path)};
+    } else {
+      // Extract an id for the module if it's using @providesModule syntax
+      // and if it's NOT in node_modules (and not a whitelisted node_module).
+      // This handles the case where a project may have a dep that has @providesModule
+      // docblock comments, but doesn't want it to conflict with whitelisted @providesModule
+      // modules, such as react-haste, fbjs-haste, or react-native or with non-dependency,
+      // project-specific code that is using @providesModule.
+      const moduleDocBlock = this._readDocBlock();
+      const {providesModule} = moduleDocBlock;
+      this._hasteNameCache = {
+        hasteName:
+          providesModule && !this._depGraphHelpers.isNodeModulesDir(this.path)
+            ? /^\S+/.exec(providesModule)[0]
+            : undefined,
+      };
     }
-    return this._hasteName;
+    return this._hasteNameCache.hasteName;
   }
 
   /**
@@ -251,7 +250,7 @@ class Module {
    */
   _finalizeReadResult(
     source: string,
-    id?: string,
+    id: ?string,
     extern: boolean,
     result: TransformedCode,
   ): ReadResult {
@@ -345,11 +344,10 @@ class Module {
     if (promise != null) {
       return promise;
     }
-    const freshPromise = Promise.all([
-      this._readSourceCode(),
-      this._readDocBlock(),
-      this._getHasteName(),
-    ]).then(([sourceCode, moduleDocBlock, id]) => {
+    const freshPromise = Promise.resolve().then(() => {
+      const sourceCode = this._readSourceCode();
+      const moduleDocBlock = this._readDocBlock();
+      const id = this._getHasteName();
       // Ignore requires in JSON files or generated code. An example of this
       // is prebuilt files like the SourceMap library.
       const extern = this.isJSON() || 'extern' in moduleDocBlock;

From ef3db66bb179b29b71b108074aa3280833aa7160 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <bvaughn@fb.com>
Date: Wed, 22 Mar 2017 09:58:00 -0700
Subject: [PATCH 147/366] Added deprecation warning for View.* static
 accessibility traits accessors

Reviewed By: spicyj

Differential Revision: D4749932

fbshipit-source-id: 5f07200e953f589f939196a161a1bc796c553868
---
 Examples/UIExplorer/js/TouchableExample.js    |  7 +-
 .../Touchable/TouchableWithoutFeedback.js     | 14 +++-
 Libraries/Components/View/View.js             | 75 +++++++++++++++----
 3 files changed, 76 insertions(+), 20 deletions(-)

diff --git a/Examples/UIExplorer/js/TouchableExample.js b/Examples/UIExplorer/js/TouchableExample.js
index 9ae2f06e248206..ede3f1ccb7e63b 100644
--- a/Examples/UIExplorer/js/TouchableExample.js
+++ b/Examples/UIExplorer/js/TouchableExample.js
@@ -37,6 +37,11 @@ var {
   View,
 } = ReactNative;
 
+const NativeModules = require('NativeModules');
+
+const forceTouchAvailable = (NativeModules.PlatformConstants &&
+  NativeModules.PlatformConstants.forceTouchAvailable) || false;
+
 exports.displayName = (undefined: ?string);
 exports.description = 'Touchable and onPress examples.';
 exports.title = '<Touchable*> and onPress';
@@ -263,7 +268,7 @@ class ForceTouchExample extends React.Component {
   };
 
   _renderConsoleText = () => {
-    return View.forceTouchAvailable ?
+    return forceTouchAvailable ?
       'Force: ' + this.state.force.toFixed(3) :
       '3D Touch is not available on this device';
   };
diff --git a/Libraries/Components/Touchable/TouchableWithoutFeedback.js b/Libraries/Components/Touchable/TouchableWithoutFeedback.js
index 582832b2a6292b..0886c577e09494 100755
--- a/Libraries/Components/Touchable/TouchableWithoutFeedback.js
+++ b/Libraries/Components/Touchable/TouchableWithoutFeedback.js
@@ -15,11 +15,15 @@ const EdgeInsetsPropType = require('EdgeInsetsPropType');
 const React = require('React');
 const TimerMixin = require('react-timer-mixin');
 const Touchable = require('Touchable');
-const View = require('View');
 
 const ensurePositiveDelayProps = require('ensurePositiveDelayProps');
 const warning = require('fbjs/lib/warning');
 
+const {
+  AccessibilityComponentTypes,
+  AccessibilityTraits,
+} = require('ViewAccessibility');
+
 type Event = Object;
 
 const PRESS_RETENTION_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
@@ -37,10 +41,12 @@ const TouchableWithoutFeedback = React.createClass({
 
   propTypes: {
     accessible: React.PropTypes.bool,
-    accessibilityComponentType: React.PropTypes.oneOf(View.AccessibilityComponentType),
+    accessibilityComponentType: React.PropTypes.oneOf(
+      AccessibilityComponentTypes
+    ),
     accessibilityTraits: React.PropTypes.oneOfType([
-      React.PropTypes.oneOf(View.AccessibilityTraits),
-      React.PropTypes.arrayOf(React.PropTypes.oneOf(View.AccessibilityTraits)),
+      React.PropTypes.oneOf(AccessibilityTraits),
+      React.PropTypes.arrayOf(React.PropTypes.oneOf(AccessibilityTraits)),
     ]),
     /**
      * If true, disable all interactions for this component.
diff --git a/Libraries/Components/View/View.js b/Libraries/Components/View/View.js
index 385ffb124a48c8..e3b4d1b77d489b 100644
--- a/Libraries/Components/View/View.js
+++ b/Libraries/Components/View/View.js
@@ -23,6 +23,7 @@ const StyleSheetPropType = require('StyleSheetPropType');
 const ViewStylePropTypes = require('ViewStylePropTypes');
 
 const invariant = require('fbjs/lib/invariant');
+const warning = require('fbjs/lib/warning');
 
 const {
   AccessibilityComponentTypes,
@@ -43,16 +44,6 @@ const stylePropType = StyleSheetPropType(ViewStylePropTypes);
 const forceTouchAvailable = (NativeModules.PlatformConstants &&
   NativeModules.PlatformConstants.forceTouchAvailable) || false;
 
-const statics = {
-  AccessibilityTraits,
-  AccessibilityComponentType: AccessibilityComponentTypes,
-  /**
-   * Is 3D Touch / Force Touch available (i.e. will touch events include `force`)
-   * @platform ios
-   */
-  forceTouchAvailable,
-};
-
 /**
  * The most fundamental component for building a UI, `View` is a container that supports layout with
  * [flexbox](docs/flexbox.html), [style](docs/style.html),
@@ -116,10 +107,6 @@ const View = React.createClass({
     validAttributes: ReactNativeViewAttributes.RCTView
   },
 
-  statics: {
-    ...statics,
-  },
-
   // TODO (bvaughn) Replace this with a deprecated getter warning. This object
   // should be accessible via a separate import. It will not be available in
   // production mode in the future and so should not be directly accessed.
@@ -520,6 +507,63 @@ const View = React.createClass({
   },
 });
 
+// Warn about unsupported use of View static properties as these will no longer
+// be supported with React fiber. This warning message will go away in the next
+// ReactNative release. Use defineProperty() rather than createClass() statics
+// because the mixin process auto-triggers the 1-time warning message.
+// TODO (bvaughn) Remove these warning messages after the April ReactNative tag.
+function mixinStatics (target) {
+  let warnedAboutAccessibilityTraits = false;
+  let warnedAboutAccessibilityComponentType = false;
+  let warnedAboutForceTouchAvailable = false;
+
+  // $FlowFixMe https://github.com/facebook/flow/issues/285
+  Object.defineProperty(target, 'AccessibilityTraits', {
+    get: function() {
+      if (!warnedAboutAccessibilityTraits) {
+        warnedAboutAccessibilityTraits = true;
+        warning(
+          false,
+          'View.AccessibilityTraits has been deprecated and will be ' +
+          'removed in a future version of ReactNative. Use ' +
+          'ViewAccessibility.AccessibilityTraits instead.'
+        );
+      }
+      return AccessibilityTraits;
+    }
+  });
+  // $FlowFixMe https://github.com/facebook/flow/issues/285
+  Object.defineProperty(target, 'AccessibilityComponentType', {
+    get: function() {
+      if (!warnedAboutAccessibilityComponentType) {
+        warnedAboutAccessibilityComponentType = true;
+        warning(
+          false,
+          'View.AccessibilityComponentType has been deprecated and will be ' +
+          'removed in a future version of ReactNative. Use ' +
+          'ViewAccessibility.AccessibilityComponentTypes instead.'
+        );
+      }
+      return AccessibilityComponentTypes;
+    }
+  });
+  // $FlowFixMe https://github.com/facebook/flow/issues/285
+  Object.defineProperty(target, 'forceTouchAvailable', {
+    get: function() {
+      if (!warnedAboutForceTouchAvailable) {
+        warnedAboutForceTouchAvailable = true;
+        warning(
+          false,
+          'View.forceTouchAvailable has been deprecated and will be removed ' +
+          'in a future version of ReactNative. Use ' +
+          'NativeModules.PlatformConstants.forceTouchAvailable instead.'
+        );
+      }
+      return forceTouchAvailable;
+    }
+  });
+}
+
 const RCTView = requireNativeComponent('RCTView', View, {
   nativeOnly: {
     nativeBackgroundAndroid: true,
@@ -548,10 +592,11 @@ if (
   __DEV__ ||
   ReactNativeFeatureFlags.useFiber
 ) {
+  mixinStatics(View);
   ViewToExport = View;
 } else {
   // TODO (bvaughn) Remove this mixin once all static View accessors are gone.
-  Object.assign((RCTView : any), statics);
+  mixinStatics((RCTView : any));
 }
 
 // TODO (bvaughn) Temporarily mask Flow warnings for View property accesses.

From 379b60d5e8a2418f438e4291bf5ba140778db5bc Mon Sep 17 00:00:00 2001
From: Jonathan Lawlor <lawlor@fb.com>
Date: Wed, 22 Mar 2017 11:10:45 -0700
Subject: [PATCH 148/366] Fix ClassCastException in ReactModuleSpecProcessor

Reviewed By: AaaChiuuu

Differential Revision: D4752195

fbshipit-source-id: 7c01f9be4d82dbc605f1e6d3b217f0c83f177165
---
 .../react/module/processing/ReactModuleSpecProcessor.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/module/processing/ReactModuleSpecProcessor.java b/ReactAndroid/src/main/java/com/facebook/react/module/processing/ReactModuleSpecProcessor.java
index d7c419cda8a852..fe2c9ff6c8f851 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/module/processing/ReactModuleSpecProcessor.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/module/processing/ReactModuleSpecProcessor.java
@@ -79,6 +79,10 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
     Set<? extends Element> reactModuleListElements = roundEnv.getElementsAnnotatedWith(
       ReactModuleList.class);
     for (Element reactModuleListElement : reactModuleListElements) {
+      if (!(reactModuleListElement instanceof TypeElement)) {
+        continue;
+      }
+
       TypeElement typeElement = (TypeElement) reactModuleListElement;
       ReactModuleList reactModuleList = typeElement.getAnnotation(ReactModuleList.class);
       if (reactModuleList == null) {

From 909d2e5503db90283a7a849a4fb2408f311a1ecb Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Wed, 22 Mar 2017 11:47:46 -0700
Subject: [PATCH 149/366] packager: Package.js: cover the error cases

Summary: In case the sync function throws, it wouldn't be handled through the promise anymore, that is not what we want. So we revert that in this changeset.

Reviewed By: davidaurelio

Differential Revision: D4754740

fbshipit-source-id: 4da360f4b629bbdf9cd284389060429cc9259c2c
---
 packager/src/node-haste/Package.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packager/src/node-haste/Package.js b/packager/src/node-haste/Package.js
index fa5bb05b093ab1..34456563f1f5a1 100644
--- a/packager/src/node-haste/Package.js
+++ b/packager/src/node-haste/Package.js
@@ -67,13 +67,13 @@ class Package {
 
   isHaste() {
     return this._cache.get(this.path, 'package-haste', () =>
-      Promise.resolve(!!this.read().name)
+      Promise.resolve().then(() => !!this.read().name)
     );
   }
 
   getName(): Promise<string> {
     return this._cache.get(this.path, 'package-name', () =>
-      Promise.resolve(this.read().name)
+      Promise.resolve().then(() => this.read().name)
     );
   }
 

From 30548427efe1e5260faa0ea6c3367fab5407ebfa Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Wed, 22 Mar 2017 11:59:40 -0700
Subject: [PATCH 150/366] packager: Module.js: cover the error cases

Summary: We want any exception thrown by `_getHasteName` to be captured by the promise instead of breaking the outer stack.

Reviewed By: davidaurelio

Differential Revision: D4754825

fbshipit-source-id: 173c7c8867da73efb198ed3159704d6fd0e7b87d
---
 packager/src/node-haste/Module.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packager/src/node-haste/Module.js b/packager/src/node-haste/Module.js
index 98ed7ce3e9bddd..6b5102f8beed6d 100644
--- a/packager/src/node-haste/Module.js
+++ b/packager/src/node-haste/Module.js
@@ -129,7 +129,7 @@ class Module {
     return this._cache.get(
       this.path,
       'isHaste',
-      () => Promise.resolve(this._getHasteName() != null),
+      () => Promise.resolve().then(() => this._getHasteName() != null),
     );
   }
 

From d9910a5d610ca46e38349e49a99200bd6860cce6 Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@fb.com>
Date: Wed, 22 Mar 2017 15:58:29 -0700
Subject: [PATCH 151/366] Use checkPropTypes instead of directly calling
 PropTypes

Reviewed By: sebmarkbage

Differential Revision: D4748563

fbshipit-source-id: 137c8bd637549c455bff3be61143e8e438c6a886
---
 .flowconfig                                   |  1 +
 .../android/app/src/main/AndroidManifest.xml  |  1 +
 Examples/UIExplorer/js/CameraRollView.js      | 29 +++++++++--
 Libraries/CameraRoll/CameraRoll.js            | 52 ++++++++++---------
 Libraries/LayoutAnimation/LayoutAnimation.js  | 23 ++++----
 5 files changed, 68 insertions(+), 38 deletions(-)

diff --git a/.flowconfig b/.flowconfig
index 3e5608c4e3bfc2..b4f1efecbae983 100644
--- a/.flowconfig
+++ b/.flowconfig
@@ -13,6 +13,7 @@
 
 ; Ignore unexpected extra "@providesModule"
 .*/node_modules/.*/node_modules/fbjs/.*
++.*/node_modules/react-dom/.*
 
 ; Ignore duplicate module providers
 ; For RN Apps installed via npm, "Libraries" folder is inside
diff --git a/Examples/UIExplorer/android/app/src/main/AndroidManifest.xml b/Examples/UIExplorer/android/app/src/main/AndroidManifest.xml
index 308604da5383f0..ddad36d21910bf 100644
--- a/Examples/UIExplorer/android/app/src/main/AndroidManifest.xml
+++ b/Examples/UIExplorer/android/app/src/main/AndroidManifest.xml
@@ -10,6 +10,7 @@
   <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
   <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
   <uses-permission android:name="android.permission.VIBRATE"/>
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 
   <!--Just to show permissions example-->
   <uses-permission android:name="android.permission.CAMERA"/>
diff --git a/Examples/UIExplorer/js/CameraRollView.js b/Examples/UIExplorer/js/CameraRollView.js
index ca5f1dc5e8e26a..e3a9572e290427 100644
--- a/Examples/UIExplorer/js/CameraRollView.js
+++ b/Examples/UIExplorer/js/CameraRollView.js
@@ -27,9 +27,11 @@ var React = require('react');
 var ReactNative = require('react-native');
 var {
   ActivityIndicator,
+  Alert,
   CameraRoll,
   Image,
   ListView,
+  PermissionsAndroid,
   Platform,
   StyleSheet,
   View,
@@ -139,13 +141,27 @@ var CameraRollView = React.createClass({
     }
   },
 
-  _fetch: function(clear?: boolean) {
+  _fetch: async function(clear?: boolean) {
     if (clear) {
       this.setState(this.getInitialState(), this.fetch);
       return;
     }
 
-    var fetchParams: Object = {
+    if (Platform.OS === 'android') {
+      const result = await PermissionsAndroid.request(
+        PermissionsAndroid.PERMISSIONS.READ_EXTERNAL_STORAGE,
+        {
+          title: 'Permission Explanation',
+          message: 'UIExplorer would like to access your pictures.',
+        },
+      );
+      if (result !== 'granted') {
+        Alert.alert('Access to pictures was denied.');
+        return;
+      }
+    }
+
+    const fetchParams: Object = {
       first: this.props.batchSize,
       groupTypes: this.props.groupTypes,
       assetType: this.props.assetType,
@@ -158,8 +174,12 @@ var CameraRollView = React.createClass({
       fetchParams.after = this.state.lastCursor;
     }
 
-    CameraRoll.getPhotos(fetchParams)
-      .then((data) => this._appendAssets(data), (e) => logError(e));
+    try {
+      const data = await CameraRoll.getPhotos(fetchParams);
+      this._appendAssets(data);
+    } catch (e) {
+      logError(e);
+    }
   },
 
   /**
@@ -180,6 +200,7 @@ var CameraRollView = React.createClass({
         onEndReached={this._onEndReached}
         style={styles.container}
         dataSource={this.state.dataSource}
+        enableEmptySections
       />
     );
   },
diff --git a/Libraries/CameraRoll/CameraRoll.js b/Libraries/CameraRoll/CameraRoll.js
index 2a4c23f9721314..54d9ae708027b4 100644
--- a/Libraries/CameraRoll/CameraRoll.js
+++ b/Libraries/CameraRoll/CameraRoll.js
@@ -11,7 +11,8 @@
  */
 'use strict';
 
-var ReactPropTypes = require('React').PropTypes
+// $FlowFixMe `checkPropTypes` is not in Flow's built in React typedefs yet.
+var {PropTypes, checkPropTypes} = require('React');
 var RCTCameraRollManager = require('NativeModules').CameraRollManager;
 
 var createStrictShapeTypeChecker = require('createStrictShapeTypeChecker');
@@ -47,34 +48,34 @@ var getPhotosParamChecker = createStrictShapeTypeChecker({
    * The number of photos wanted in reverse order of the photo application
    * (i.e. most recent first for SavedPhotos).
    */
-  first: ReactPropTypes.number.isRequired,
+  first: PropTypes.number.isRequired,
 
   /**
    * A cursor that matches `page_info { end_cursor }` returned from a previous
    * call to `getPhotos`
    */
-  after: ReactPropTypes.string,
+  after: PropTypes.string,
 
   /**
    * Specifies which group types to filter the results to.
    */
-  groupTypes: ReactPropTypes.oneOf(GROUP_TYPES_OPTIONS),
+  groupTypes: PropTypes.oneOf(GROUP_TYPES_OPTIONS),
 
   /**
    * Specifies filter on group names, like 'Recent Photos' or custom album
    * titles.
    */
-  groupName: ReactPropTypes.string,
+  groupName: PropTypes.string,
 
   /**
   * Specifies filter on asset type
   */
-  assetType: ReactPropTypes.oneOf(ASSET_TYPE_OPTIONS),
+  assetType: PropTypes.oneOf(ASSET_TYPE_OPTIONS),
 
   /**
    * Filter by mimetype (e.g. image/jpeg).
    */
-  mimeTypes: ReactPropTypes.arrayOf(ReactPropTypes.string),
+  mimeTypes: PropTypes.arrayOf(PropTypes.string),
 });
 
 /**
@@ -82,30 +83,30 @@ var getPhotosParamChecker = createStrictShapeTypeChecker({
  */
 var getPhotosReturnChecker = createStrictShapeTypeChecker({
   // $FlowFixMe(>=0.41.0)
-  edges: ReactPropTypes.arrayOf(createStrictShapeTypeChecker({
+  edges: PropTypes.arrayOf(createStrictShapeTypeChecker({
     node: createStrictShapeTypeChecker({
-      type: ReactPropTypes.string.isRequired,
-      group_name: ReactPropTypes.string.isRequired,
+      type: PropTypes.string.isRequired,
+      group_name: PropTypes.string.isRequired,
       image: createStrictShapeTypeChecker({
-        uri: ReactPropTypes.string.isRequired,
-        height: ReactPropTypes.number.isRequired,
-        width: ReactPropTypes.number.isRequired,
-        isStored: ReactPropTypes.bool,
+        uri: PropTypes.string.isRequired,
+        height: PropTypes.number.isRequired,
+        width: PropTypes.number.isRequired,
+        isStored: PropTypes.bool,
       }).isRequired,
-      timestamp: ReactPropTypes.number.isRequired,
+      timestamp: PropTypes.number.isRequired,
       location: createStrictShapeTypeChecker({
-        latitude: ReactPropTypes.number,
-        longitude: ReactPropTypes.number,
-        altitude: ReactPropTypes.number,
-        heading: ReactPropTypes.number,
-        speed: ReactPropTypes.number,
+        latitude: PropTypes.number,
+        longitude: PropTypes.number,
+        altitude: PropTypes.number,
+        heading: PropTypes.number,
+        speed: PropTypes.number,
       }),
     }).isRequired,
   })).isRequired,
   page_info: createStrictShapeTypeChecker({
-    has_next_page: ReactPropTypes.bool.isRequired,
-    start_cursor: ReactPropTypes.string,
-    end_cursor: ReactPropTypes.string,
+    has_next_page: PropTypes.bool.isRequired,
+    start_cursor: PropTypes.string,
+    end_cursor: PropTypes.string,
   }).isRequired,
 });
 
@@ -214,7 +215,7 @@ class CameraRoll {
    */
   static getPhotos(params) {
     if (__DEV__) {
-      getPhotosParamChecker({params}, 'params', 'CameraRoll.getPhotos');
+      checkPropTypes({params: getPhotosParamChecker}, {params}, 'params', 'CameraRoll.getPhotos');
     }
     if (arguments.length > 1) {
       console.warn('CameraRoll.getPhotos(tag, success, error) is deprecated.  Use the returned Promise instead');
@@ -222,7 +223,8 @@ class CameraRoll {
       if (__DEV__) {
         const callback = arguments[1];
         successCallback = (response) => {
-          getPhotosReturnChecker(
+          checkPropTypes(
+            {response: getPhotosReturnChecker},
             {response},
             'response',
             'CameraRoll.getPhotos callback'
diff --git a/Libraries/LayoutAnimation/LayoutAnimation.js b/Libraries/LayoutAnimation/LayoutAnimation.js
index 61d62601d71789..a6670cab2f253e 100644
--- a/Libraries/LayoutAnimation/LayoutAnimation.js
+++ b/Libraries/LayoutAnimation/LayoutAnimation.js
@@ -11,12 +11,13 @@
  */
 'use strict';
 
-var {PropTypes} = require('React');
 var UIManager = require('UIManager');
 
-var createStrictShapeTypeChecker = require('createStrictShapeTypeChecker');
 var keyMirror = require('fbjs/lib/keyMirror');
 
+// $FlowFixMe checkPropTypes not yet landed to Flow
+var {checkPropTypes, PropTypes} = require('react');
+
 var TypesEnum = {
   spring: true,
   linear: true,
@@ -33,7 +34,7 @@ var PropertiesEnum = {
 };
 var Properties = keyMirror(PropertiesEnum);
 
-var animChecker = createStrictShapeTypeChecker({
+var animType = PropTypes.shape({
   duration: PropTypes.number,
   delay: PropTypes.number,
   springDamping: PropTypes.number,
@@ -55,11 +56,11 @@ type Anim = {
   property?: $Enum<typeof PropertiesEnum>,
 }
 
-var configChecker = createStrictShapeTypeChecker({
+var configType = PropTypes.shape({
   duration: PropTypes.number.isRequired,
-  create: animChecker,
-  update: animChecker,
-  delete: animChecker,
+  create: animType,
+  update: animType,
+  delete: animType,
 });
 
 type Config = {
@@ -69,9 +70,13 @@ type Config = {
   delete?: Anim,
 }
 
+function checkConfig(config: Config, location: string, name: string) {
+  checkPropTypes({config: configType}, {config}, location, name);
+}
+
 function configureNext(config: Config, onAnimationDidEnd?: Function) {
   if (__DEV__) {
-    configChecker({config}, 'config', 'LayoutAnimation.configureNext');
+    checkConfig(config, 'config', 'LayoutAnimation.configureNext');
   }
   UIManager.configureNextLayoutAnimation(
     config, onAnimationDidEnd || function() {}, function() { /* unused */ }
@@ -151,7 +156,7 @@ var LayoutAnimation = {
   create,
   Types,
   Properties,
-  configChecker: configChecker,
+  checkConfig,
   Presets,
   easeInEaseOut: configureNext.bind(
     null, Presets.easeInEaseOut

From 14c31d93da30842be45c1d10879c09d744c29381 Mon Sep 17 00:00:00 2001
From: Janic Duplessis <janicduplessis@gmail.com>
Date: Wed, 22 Mar 2017 17:34:28 -0700
Subject: [PATCH 152/366] Remove React addons from react-native-implementation

Summary:
These modules don't exist in React anymore so this causes new apps to redscreen because the packager cannot resolve those modules.

**Test plan**
Tested that this and removing NavigationExperimental (it also uses removed React exports) causes UIExplorer to work again.
Closes https://github.com/facebook/react-native/pull/13095

Differential Revision: D4757762

Pulled By: ericvicenti

fbshipit-source-id: bb246d4c6b15f5d3c71e31f133a468aea220f308
---
 .../react-native-implementation.js            | 44 -------------------
 1 file changed, 44 deletions(-)

diff --git a/Libraries/react-native/react-native-implementation.js b/Libraries/react-native/react-native-implementation.js
index 3eff5dedd60ebe..b0e86440ba11cd 100644
--- a/Libraries/react-native/react-native-implementation.js
+++ b/Libraries/react-native/react-native-implementation.js
@@ -124,50 +124,6 @@ const ReactNative = {
   get ColorPropType() { return require('ColorPropType'); },
   get EdgeInsetsPropType() { return require('EdgeInsetsPropType'); },
   get PointPropType() { return require('PointPropType'); },
-
-  // See http://facebook.github.io/react/docs/addons.html
-  addons: {
-    get PureRenderMixin() {
-      if (__DEV__) {
-        addonWarn('PureRenderMixin', 'react-addons-pure-render-mixin');
-      }
-      return require('react/lib/ReactComponentWithPureRenderMixin');
-    },
-    get TestModule() {
-      if (__DEV__) {
-        warning(
-          warningDedupe.TestModule,
-          'React.addons.TestModule is deprecated. ' +
-          'Use ReactNative.NativeModules.TestModule instead.'
-        );
-        warningDedupe.TestModule = true;
-      }
-      return require('NativeModules').TestModule;
-    },
-    get batchedUpdates() {
-      if (__DEV__) {
-        warning(
-          warningDedupe.batchedUpdates,
-          'React.addons.batchedUpdates is deprecated. ' +
-          'Use ReactNative.unstable_batchedUpdates instead.'
-        );
-        warningDedupe.batchedUpdates = true;
-      }
-      return require('ReactUpdates').batchedUpdates;
-    },
-    get createFragment() {
-      if (__DEV__) {
-        addonWarn('createFragment', 'react-addons-create-fragment');
-      }
-      return require('react/lib/ReactFragment').create;
-    },
-    get update() {
-      if (__DEV__) {
-        addonWarn('update', 'react-addons-update');
-      }
-      return require('react/lib/update');
-    },
-  },
 };
 
 // Better error messages when accessing React APIs on ReactNative

From 703936d9e30d6d7c25013281459d2fcf86244a77 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <bvaughn@fb.com>
Date: Wed, 22 Mar 2017 21:22:44 -0700
Subject: [PATCH 153/366] Sync React master (and 16 alpha 4)

Reviewed By: sebmarkbage

Differential Revision: D4747529

fbshipit-source-id: 5efea6422a2502f27c1b23506cbae2187c7f7b0d
---
 .flowconfig                                   |   5 +
 Libraries/Renderer/src/ReactVersion.js        |   2 +-
 .../renderers/native/NativeMethodsMixin.js    |  37 +-
 .../native/NativeMethodsMixinUtils.js         |  56 +-
 .../native/ReactNativeAttributePayload.js     | 184 +++--
 .../native/ReactNativeBaseComponent.js        |  24 +-
 .../native/ReactNativeBridgeEventPlugin.js    |  13 +-
 .../native/ReactNativeComponentEnvironment.js |   5 +-
 .../native/ReactNativeDOMIDOperations.js      |   2 +-
 .../native/ReactNativeEventEmitter.js         |  31 +-
 .../src/renderers/native/ReactNativeFiber.js  | 197 ++---
 .../native/ReactNativeFiberHostComponent.js   |  32 +-
 .../renderers/native/ReactNativeInjection.js  |   6 +-
 .../src/renderers/native/ReactNativeMount.js  |  54 +-
 .../native/ReactNativeReconcileTransaction.js |   2 +-
 .../src/renderers/native/ReactNativeStack.js  |   7 +-
 .../native/ReactNativeStackInjection.js       |  28 +-
 .../renderers/native/ReactNativeTagHandles.js |   3 +-
 .../native/ReactNativeTextComponent.js        |  28 +-
 .../native/ReactNativeViewConfigRegistry.js   |  10 +-
 .../ReactNativeAttributePayload-test.js       | 307 ++++---
 .../__tests__/ReactNativeEvents-test.js       | 120 ++-
 .../native/__tests__/ReactNativeMount-test.js |  15 +-
 .../native/createReactNativeComponentClass.js |   4 +-
 .../src/renderers/native/findNodeHandle.js    |  34 +-
 .../Renderer/src/renderers/noop/ReactNoop.js  |   4 +
 .../src/renderers/shared/ReactDebugTool.js    | 100 ++-
 .../src/renderers/shared/ReactPerf.js         |  60 +-
 .../shared/__tests__/ReactDebugTool-test.js   |   3 +-
 .../renderers/shared/fiber/ReactChildFiber.js | 494 ++++++------
 .../shared/fiber/ReactDebugCurrentFiber.js    |  16 +-
 .../shared/fiber/ReactDebugFiberPerf.js       | 400 +++++++++
 .../src/renderers/shared/fiber/ReactFiber.js  | 106 +--
 .../shared/fiber/ReactFiberBeginWork.js       | 248 ++++--
 .../shared/fiber/ReactFiberClassComponent.js  | 285 ++++---
 .../shared/fiber/ReactFiberCommitWork.js      | 192 +++--
 .../shared/fiber/ReactFiberCompleteWork.js    | 102 ++-
 .../shared/fiber/ReactFiberContext.js         | 116 ++-
 .../shared/fiber/ReactFiberDevToolsHook.js    |  12 +-
 .../shared/fiber/ReactFiberErrorLogger.js     |  33 +-
 .../shared/fiber/ReactFiberHostContext.js     |  56 +-
 .../shared/fiber/ReactFiberReconciler.js      | 213 +++--
 .../renderers/shared/fiber/ReactFiberRoot.js  |   6 +-
 .../shared/fiber/ReactFiberScheduler.js       | 485 +++++++----
 .../renderers/shared/fiber/ReactFiberStack.js |  25 +-
 .../shared/fiber/ReactFiberTreeReflection.js  |  60 +-
 .../shared/fiber/ReactFiberUpdateQueue.js     | 178 ++--
 .../shared/fiber/ReactTypeOfSideEffect.js     |  18 +-
 .../fiber/__tests__/ReactCoroutine-test.js    |  73 +-
 .../fiber/__tests__/ReactIncremental-test.js  | 209 +++--
 .../ReactIncrementalErrorHandling-test.js     | 192 ++---
 .../__tests__/ReactIncrementalPerf-test.js    | 486 +++++++++++
 .../ReactIncrementalReflection-test.js        |  73 +-
 .../ReactIncrementalScheduling-test.js        |  66 +-
 .../ReactIncrementalSideEffects-test.js       | 294 +++----
 .../__tests__/ReactIncrementalUpdates-test.js |  87 +-
 .../__tests__/ReactTopLevelFragment-test.js   |  41 +-
 .../fiber/__tests__/ReactTopLevelText-test.js |   3 +-
 .../ReactIncrementalPerf-test.js.snap         | 260 ++++++
 .../shared/fiber/isomorphic/ReactCoroutine.js |  30 +-
 .../shared/fiber/isomorphic/ReactPortal.js    |  25 +-
 .../shared/fiber/isomorphic/ReactTypes.js     |  12 +-
 .../hooks/ReactHostOperationHistoryHook.js    |  27 +-
 .../hooks/ReactInvalidSetStateWarningHook.js  |   2 +-
 .../shared/shared/ReactInstanceMap.js         |   2 -
 .../shared/shared/ReactTreeTraversal.js       |   6 +-
 .../shared/shared/event/EventPluginHub.js     |  40 +-
 .../shared/event/EventPluginRegistry.js       | 117 +--
 .../shared/shared/event/EventPluginUtils.js   |  54 +-
 .../shared/shared/event/EventPropagators.js   |  41 +-
 .../shared/shared/event/PluginModuleType.js   |   6 +-
 .../shared/event/ReactControlledComponent.js  |  10 +-
 .../shared/event/ReactEventEmitterMixin.js    |  12 +-
 .../shared/event/ReactSyntheticEventType.js   |  18 +-
 .../shared/shared/event/SyntheticEvent.js     |  63 +-
 .../__tests__/EventPluginRegistry-test.js     |  71 +-
 .../eventPlugins/ResponderEventPlugin.js      | 125 ++-
 .../eventPlugins/ResponderSyntheticEvent.js   |  15 +-
 .../ResponderTouchHistoryStore.js             |  25 +-
 .../event/eventPlugins/TouchHistoryMath.js    |  88 +-
 .../__tests__/ResponderEventPlugin-test.js    | 761 +++++++++++++-----
 .../shared/shared/getContextForSubtree.js     |   4 +-
 .../shared/shouldUpdateReactComponent.js      |   8 +-
 .../shared/stack/reconciler/CallbackQueue.js  |   2 +-
 .../stack/reconciler/ReactChildReconciler.js  |  60 +-
 .../reconciler/ReactComponentEnvironment.js   |  10 +-
 .../reconciler/ReactCompositeComponent.js     | 319 ++++----
 .../ReactDefaultBatchingStrategy.js           |  14 +-
 .../stack/reconciler/ReactHostComponent.js    |   2 +-
 .../stack/reconciler/ReactMultiChild.js       |  64 +-
 .../reconciler/ReactMultiChildUpdateTypes.js  |  10 +-
 .../shared/stack/reconciler/ReactNodeTypes.js |   2 +-
 .../shared/stack/reconciler/ReactOwner.js     |  44 +-
 .../stack/reconciler/ReactReconciler.js       |  58 +-
 .../shared/stack/reconciler/ReactRef.js       |  29 +-
 .../reconciler/ReactSimpleEmptyComponent.js   |  10 +-
 .../stack/reconciler/ReactUpdateQueue.js      |  63 +-
 .../shared/stack/reconciler/ReactUpdates.js   |  72 +-
 .../shared/stack/reconciler/Transaction.js    |  34 +-
 .../reconciler/__tests__/Transaction-test.js  |  47 +-
 .../reconciler/instantiateReactComponent.js   |  40 +-
 .../renderers/shared/utils/ReactErrorUtils.js | 120 ++-
 .../utils/__tests__/ReactErrorUtils-test.js   | 177 +++-
 .../utils/__tests__/accumulateInto-test.js    |   3 +-
 .../shared/utils/__tests__/adler32-test.js    |   4 +-
 .../src/renderers/shared/utils/accumulate.js  |   7 +-
 .../renderers/shared/utils/accumulateInto.js  |   7 +-
 .../src/renderers/shared/utils/adler32.js     |   8 +-
 .../shared/utils/forEachAccumulated.js        |   2 +-
 .../shared/utils/isTextInputElement.js        |  28 +-
 .../shared/utils/validateCallback.js          |   4 +-
 .../src/shared/ReactFiberComponentTreeHook.js |  74 ++
 .../src/shared/types/checkReactTypeSpec.js    |  12 +-
 .../src/shared/utils/KeyEscapeUtils.js        |  23 +-
 .../Renderer/src/shared/utils/PooledClass.js  |   4 +-
 .../src/shared/utils/ReactElementSymbol.js    |   5 +-
 .../utils/__tests__/PooledClass-test.js       |  50 +-
 .../__tests__/reactProdInvariant-test.js      |  18 +-
 .../Renderer/src/shared/utils/deprecated.js   |   7 +-
 .../src/shared/utils/flattenChildren.js       |  25 +-
 .../src/shared/utils/getComponentName.js      |  12 +-
 .../src/shared/utils/getIteratorFn.js         |   9 +-
 .../src/shared/utils/reactProdInvariant.js    |  17 +-
 .../src/shared/utils/traverseAllChildren.js   |  48 +-
 jest/setup.js                                 |   6 +
 package.json                                  |   6 +-
 126 files changed, 5701 insertions(+), 3619 deletions(-)
 create mode 100644 Libraries/Renderer/src/renderers/shared/fiber/ReactDebugFiberPerf.js
 create mode 100644 Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactIncrementalPerf-test.js
 create mode 100644 Libraries/Renderer/src/renderers/shared/fiber/__tests__/__snapshots__/ReactIncrementalPerf-test.js.snap
 create mode 100644 Libraries/Renderer/src/shared/ReactFiberComponentTreeHook.js

diff --git a/.flowconfig b/.flowconfig
index b4f1efecbae983..e6f09f99d9fc9b 100644
--- a/.flowconfig
+++ b/.flowconfig
@@ -21,6 +21,11 @@
 .*/Libraries/react-native/React.js
 .*/Libraries/react-native/ReactNative.js
 
+; Ignore duplicate ReactErrorUtils in react-dom/lib in React 16 alpha 4.
+; TODO (bvaughn) Remove this once we've synced to React 16 alpha 5.
+; For more info see https://phabricator.intern.facebook.com/D4747529#10
+<PROJECT_ROOT>/node_modules/react-dom/lib/ReactErrorUtils.js
+
 [include]
 
 [libs]
diff --git a/Libraries/Renderer/src/ReactVersion.js b/Libraries/Renderer/src/ReactVersion.js
index 594ac0e3aea582..6800654f5d6d29 100644
--- a/Libraries/Renderer/src/ReactVersion.js
+++ b/Libraries/Renderer/src/ReactVersion.js
@@ -11,4 +11,4 @@
 
 'use strict';
 
-module.exports = '16.0.0-alpha.3';
+module.exports = '16.0.0-alpha.4';
diff --git a/Libraries/Renderer/src/renderers/native/NativeMethodsMixin.js b/Libraries/Renderer/src/renderers/native/NativeMethodsMixin.js
index f3d0570a246138..893668fb25f2a4 100644
--- a/Libraries/Renderer/src/renderers/native/NativeMethodsMixin.js
+++ b/Libraries/Renderer/src/renderers/native/NativeMethodsMixin.js
@@ -12,8 +12,8 @@
 'use strict';
 
 var ReactNative = require('ReactNative');
-var ReactNativeAttributePayload = require('ReactNativeAttributePayload');
 var ReactNativeFeatureFlags = require('ReactNativeFeatureFlags');
+var ReactNativeAttributePayload = require('ReactNativeAttributePayload');
 var TextInputState = require('TextInputState');
 var UIManager = require('UIManager');
 
@@ -31,7 +31,9 @@ import type {
   MeasureLayoutOnSuccessCallback,
   MeasureOnSuccessCallback,
 } from 'NativeMethodsMixinUtils';
-import type { ReactNativeBaseComponentViewConfig } from 'ReactNativeViewConfigRegistry';
+import type {
+  ReactNativeBaseComponentViewConfig,
+} from 'ReactNativeViewConfigRegistry';
 
 /**
  * `NativeMethodsMixin` provides methods to access the underlying native
@@ -70,7 +72,7 @@ var NativeMethodsMixin = {
   measure: function(callback: MeasureOnSuccessCallback) {
     UIManager.measure(
       ReactNative.findNodeHandle(this),
-      mountSafeCallback(this, callback)
+      mountSafeCallback(this, callback),
     );
   },
 
@@ -92,7 +94,7 @@ var NativeMethodsMixin = {
   measureInWindow: function(callback: MeasureInWindowOnSuccessCallback) {
     UIManager.measureInWindow(
       ReactNative.findNodeHandle(this),
-      mountSafeCallback(this, callback)
+      mountSafeCallback(this, callback),
     );
   },
 
@@ -107,13 +109,13 @@ var NativeMethodsMixin = {
   measureLayout: function(
     relativeToNativeNode: number,
     onSuccess: MeasureLayoutOnSuccessCallback,
-    onFail: () => void /* currently unused */
+    onFail: () => void /* currently unused */,
   ) {
     UIManager.measureLayout(
       ReactNative.findNodeHandle(this),
       relativeToNativeNode,
       mountSafeCallback(this, onFail),
-      mountSafeCallback(this, onSuccess)
+      mountSafeCallback(this, onSuccess),
     );
   },
 
@@ -174,8 +176,7 @@ function setNativePropsFiber(componentOrHandle: any, nativeProps: Object) {
     return;
   }
 
-  const viewConfig : ReactNativeBaseComponentViewConfig =
-    maybeInstance.viewConfig;
+  const viewConfig: ReactNativeBaseComponentViewConfig = maybeInstance.viewConfig;
 
   if (__DEV__) {
     warnForStyleProps(nativeProps, viewConfig.validAttributes);
@@ -208,7 +209,7 @@ function setNativePropsStack(componentOrHandle: any, nativeProps: Object) {
     return;
   }
 
-  let viewConfig : ReactNativeBaseComponentViewConfig;
+  let viewConfig: ReactNativeBaseComponentViewConfig;
   if (maybeInstance.viewConfig !== undefined) {
     // ReactNativeBaseComponent
     viewConfig = maybeInstance.viewConfig;
@@ -228,7 +229,7 @@ function setNativePropsStack(componentOrHandle: any, nativeProps: Object) {
     viewConfig = maybeInstance.viewConfig;
   }
 
-  const tag : number = typeof maybeInstance.getHostNode === 'function'
+  const tag: number = typeof maybeInstance.getHostNode === 'function'
     ? maybeInstance.getHostNode()
     : maybeInstance._rootNodeID;
 
@@ -241,11 +242,7 @@ function setNativePropsStack(componentOrHandle: any, nativeProps: Object) {
     viewConfig.validAttributes,
   );
 
-  UIManager.updateView(
-    tag,
-    viewConfig.uiViewClassName,
-    updatePayload,
-  );
+  UIManager.updateView(tag, viewConfig.uiViewClassName, updatePayload);
 }
 
 // Switching based on fiber vs stack to avoid a lot of inline checks at runtime.
@@ -253,8 +250,10 @@ function setNativePropsStack(componentOrHandle: any, nativeProps: Object) {
 // that would result in a cycle between ReactNative and NativeMethodsMixin.
 // We avoid requiring additional code for this injection so it's probably ok?
 // TODO (bvaughn) Remove this once ReactNativeStack is gone.
-let injectedSetNativeProps :
-  (componentOrHandle: any, nativeProps: Object) => void;
+let injectedSetNativeProps: (
+  componentOrHandle: any,
+  nativeProps: Object,
+) => void;
 if (ReactNativeFeatureFlags.useFiber) {
   injectedSetNativeProps = setNativePropsFiber;
 } else {
@@ -268,8 +267,8 @@ if (__DEV__) {
   var NativeMethodsMixin_DEV = (NativeMethodsMixin: any);
   invariant(
     !NativeMethodsMixin_DEV.componentWillMount &&
-    !NativeMethodsMixin_DEV.componentWillReceiveProps,
-    'Do not override existing functions.'
+      !NativeMethodsMixin_DEV.componentWillReceiveProps,
+    'Do not override existing functions.',
   );
   NativeMethodsMixin_DEV.componentWillMount = function() {
     throwOnStylesProp(this, this.props);
diff --git a/Libraries/Renderer/src/renderers/native/NativeMethodsMixinUtils.js b/Libraries/Renderer/src/renderers/native/NativeMethodsMixinUtils.js
index b5aa4ae8d0ad78..68e4150869a808 100644
--- a/Libraries/Renderer/src/renderers/native/NativeMethodsMixinUtils.js
+++ b/Libraries/Renderer/src/renderers/native/NativeMethodsMixinUtils.js
@@ -17,77 +17,85 @@ export type MeasureOnSuccessCallback = (
   width: number,
   height: number,
   pageX: number,
-  pageY: number
-) => void
+  pageY: number,
+) => void;
 
 export type MeasureInWindowOnSuccessCallback = (
   x: number,
   y: number,
   width: number,
   height: number,
-) => void
+) => void;
 
 export type MeasureLayoutOnSuccessCallback = (
   left: number,
   top: number,
   width: number,
-  height: number
-) => void
+  height: number,
+) => void;
 
 /**
  * Shared between ReactNativeFiberHostComponent and NativeMethodsMixin to keep
  * API in sync.
  */
 export interface NativeMethodsInterface {
-  blur() : void,
-  focus() : void,
-  measure(callback : MeasureOnSuccessCallback) : void,
-  measureInWindow(callback : MeasureInWindowOnSuccessCallback) : void,
+  blur(): void,
+  focus(): void,
+  measure(callback: MeasureOnSuccessCallback): void,
+  measureInWindow(callback: MeasureInWindowOnSuccessCallback): void,
   measureLayout(
     relativeToNativeNode: number,
     onSuccess: MeasureLayoutOnSuccessCallback,
-    onFail: () => void /* currently unused */
-  ) : void,
-  setNativeProps(nativeProps: Object) : void,
+    onFail: () => void,
+  ): void,
+  setNativeProps(nativeProps: Object): void,
 }
 
 /**
  * In the future, we should cleanup callbacks by cancelling them instead of
  * using this.
  */
-function mountSafeCallback(
-  context: any,
-  callback: ?Function
-): any {
+function mountSafeCallback(context: any, callback: ?Function): any {
   return function() {
-    if (!callback || (typeof context.isMounted === 'function' && !context.isMounted())) {
+    if (
+      !callback ||
+      (typeof context.isMounted === 'function' && !context.isMounted())
+    ) {
       return undefined;
     }
     return callback.apply(context, arguments);
   };
 }
 
-function throwOnStylesProp(component : any, props : any) {
+function throwOnStylesProp(component: any, props: any) {
   if (props.styles !== undefined) {
     var owner = component._owner || null;
     var name = component.constructor.displayName;
-    var msg = '`styles` is not a supported property of `' + name + '`, did ' +
+    var msg = '`styles` is not a supported property of `' +
+      name +
+      '`, did ' +
       'you mean `style` (singular)?';
     if (owner && owner.constructor && owner.constructor.displayName) {
-      msg += '\n\nCheck the `' + owner.constructor.displayName + '` parent ' +
+      msg += '\n\nCheck the `' +
+        owner.constructor.displayName +
+        '` parent ' +
         ' component.';
     }
     throw new Error(msg);
   }
 }
 
-function warnForStyleProps(props : any, validAttributes : any) {
+function warnForStyleProps(props: any, validAttributes: any) {
   for (var key in validAttributes.style) {
     if (!(validAttributes[key] || props[key] === undefined)) {
       console.error(
-        'You are setting the style `{ ' + key + ': ... }` as a prop. You ' +
-        'should nest it in a style object. ' +
-        'E.g. `{ style: { ' + key + ': ... } }`'
+        'You are setting the style `{ ' +
+          key +
+          ': ... }` as a prop. You ' +
+          'should nest it in a style object. ' +
+          'E.g. `{ style: { ' +
+          key +
+          ': ... } }`',
       );
     }
   }
diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeAttributePayload.js b/Libraries/Renderer/src/renderers/native/ReactNativeAttributePayload.js
index c84d7284ab9344..ccd98c6fef0a6e 100644
--- a/Libraries/Renderer/src/renderers/native/ReactNativeAttributePayload.js
+++ b/Libraries/Renderer/src/renderers/native/ReactNativeAttributePayload.js
@@ -31,14 +31,15 @@ type AttributeDiffer = (prevProp: mixed, nextProp: mixed) => boolean;
 type AttributePreprocessor = (nextProp: mixed) => mixed;
 
 type CustomAttributeConfiguration =
-  { diff: AttributeDiffer, process: AttributePreprocessor } |
-  { diff: AttributeDiffer } |
-  { process: AttributePreprocessor };
-
-type AttributeConfiguration =
-  { [key: string]: (
-    CustomAttributeConfiguration | AttributeConfiguration /*| boolean*/
-  ) };
+  | {diff: AttributeDiffer, process: AttributePreprocessor}
+  | {diff: AttributeDiffer}
+  | {process: AttributePreprocessor};
+
+type AttributeConfiguration = {
+  [key: string]:
+    | CustomAttributeConfiguration
+    | AttributeConfiguration /*| boolean*/,
+};
 
 type NestedNode = Array<NestedNode> | Object | number;
 
@@ -46,7 +47,7 @@ type NestedNode = Array<NestedNode> | Object | number;
 var removedKeys = null;
 var removedKeyCount = 0;
 
-function defaultDiffer(prevProp: mixed, nextProp: mixed) : boolean {
+function defaultDiffer(prevProp: mixed, nextProp: mixed): boolean {
   if (typeof nextProp !== 'object' || nextProp === null) {
     // Scalars have already been checked for equality
     return true;
@@ -56,7 +57,7 @@ function defaultDiffer(prevProp: mixed, nextProp: mixed) : boolean {
   }
 }
 
-function resolveObject(idOrObject: number | Object) : Object {
+function resolveObject(idOrObject: number | Object): Object {
   if (typeof idOrObject === 'number') {
     return ReactNativePropRegistry.getByID(idOrObject);
   }
@@ -66,7 +67,7 @@ function resolveObject(idOrObject: number | Object) : Object {
 function restoreDeletedValuesInNestedArray(
   updatePayload: Object,
   node: NestedNode,
-  validAttributes: AttributeConfiguration
+  validAttributes: AttributeConfiguration,
 ) {
   if (Array.isArray(node)) {
     var i = node.length;
@@ -74,7 +75,7 @@ function restoreDeletedValuesInNestedArray(
       restoreDeletedValuesInNestedArray(
         updatePayload,
         node[i],
-        validAttributes
+        validAttributes,
       );
     }
   } else if (node && removedKeyCount > 0) {
@@ -103,12 +104,14 @@ function restoreDeletedValuesInNestedArray(
       if (typeof attributeConfig !== 'object') {
         // case: !Object is the default case
         updatePayload[propKey] = nextProp;
-      } else if (typeof attributeConfig.diff === 'function' ||
-                 typeof attributeConfig.process === 'function') {
+      } else if (
+        typeof attributeConfig.diff === 'function' ||
+        typeof attributeConfig.process === 'function'
+      ) {
         // case: CustomAttributeConfiguration
-        var nextValue = typeof attributeConfig.process === 'function' ?
-                        attributeConfig.process(nextProp) :
-                        nextProp;
+        var nextValue = typeof attributeConfig.process === 'function'
+          ? attributeConfig.process(nextProp)
+          : nextProp;
         updatePayload[propKey] = nextValue;
       }
       removedKeys[propKey] = false;
@@ -118,14 +121,14 @@ function restoreDeletedValuesInNestedArray(
 }
 
 function diffNestedArrayProperty(
-  updatePayload:? Object,
+  updatePayload: ?Object,
   prevArray: Array<NestedNode>,
   nextArray: Array<NestedNode>,
-  validAttributes: AttributeConfiguration
-) : ?Object {
-  var minLength = prevArray.length < nextArray.length ?
-                  prevArray.length :
-                  nextArray.length;
+  validAttributes: AttributeConfiguration,
+): ?Object {
+  var minLength = prevArray.length < nextArray.length
+    ? prevArray.length
+    : nextArray.length;
   var i;
   for (i = 0; i < minLength; i++) {
     // Diff any items in the array in the forward direction. Repeated keys
@@ -134,7 +137,7 @@ function diffNestedArrayProperty(
       updatePayload,
       prevArray[i],
       nextArray[i],
-      validAttributes
+      validAttributes,
     );
   }
   for (; i < prevArray.length; i++) {
@@ -142,7 +145,7 @@ function diffNestedArrayProperty(
     updatePayload = clearNestedProperty(
       updatePayload,
       prevArray[i],
-      validAttributes
+      validAttributes,
     );
   }
   for (; i < nextArray.length; i++) {
@@ -150,19 +153,18 @@ function diffNestedArrayProperty(
     updatePayload = addNestedProperty(
       updatePayload,
       nextArray[i],
-      validAttributes
+      validAttributes,
     );
   }
   return updatePayload;
 }
 
 function diffNestedProperty(
-  updatePayload:? Object,
+  updatePayload: ?Object,
   prevProp: NestedNode,
   nextProp: NestedNode,
-  validAttributes: AttributeConfiguration
-) : ?Object {
-
+  validAttributes: AttributeConfiguration,
+): ?Object {
   if (!updatePayload && prevProp === nextProp) {
     // If no properties have been added, then we can bail out quickly on object
     // equality.
@@ -171,18 +173,10 @@ function diffNestedProperty(
 
   if (!prevProp || !nextProp) {
     if (nextProp) {
-      return addNestedProperty(
-        updatePayload,
-        nextProp,
-        validAttributes
-      );
+      return addNestedProperty(updatePayload, nextProp, validAttributes);
     }
     if (prevProp) {
-      return clearNestedProperty(
-        updatePayload,
-        prevProp,
-        validAttributes
-      );
+      return clearNestedProperty(updatePayload, prevProp, validAttributes);
     }
     return updatePayload;
   }
@@ -193,7 +187,7 @@ function diffNestedProperty(
       updatePayload,
       resolveObject(prevProp),
       resolveObject(nextProp),
-      validAttributes
+      validAttributes,
     );
   }
 
@@ -203,7 +197,7 @@ function diffNestedProperty(
       updatePayload,
       prevProp,
       nextProp,
-      validAttributes
+      validAttributes,
     );
   }
 
@@ -214,16 +208,16 @@ function diffNestedProperty(
       flattenStyle(prevProp),
       // $FlowFixMe - We know that this isn't an array because of above flow.
       resolveObject(nextProp),
-      validAttributes
+      validAttributes,
     );
   }
 
   return diffProperties(
     updatePayload,
     resolveObject(prevProp),
-      // $FlowFixMe - We know that this is always an object when the input is.
+    // $FlowFixMe - We know that this is always an object when the input is.
     flattenStyle(nextProp),
-    validAttributes
+    validAttributes,
   );
 }
 
@@ -233,9 +227,9 @@ function diffNestedProperty(
  * updatePayload.
  */
 function addNestedProperty(
-  updatePayload:? Object,
+  updatePayload: ?Object,
   nextProp: NestedNode,
-  validAttributes: AttributeConfiguration
+  validAttributes: AttributeConfiguration,
 ) {
   if (!nextProp) {
     return updatePayload;
@@ -246,7 +240,7 @@ function addNestedProperty(
     return addProperties(
       updatePayload,
       resolveObject(nextProp),
-      validAttributes
+      validAttributes,
     );
   }
 
@@ -255,7 +249,7 @@ function addNestedProperty(
     updatePayload = addNestedProperty(
       updatePayload,
       nextProp[i],
-      validAttributes
+      validAttributes,
     );
   }
 
@@ -267,10 +261,10 @@ function addNestedProperty(
  * adds a null sentinel to the updatePayload, for each prop key.
  */
 function clearNestedProperty(
-  updatePayload:? Object,
+  updatePayload: ?Object,
   prevProp: NestedNode,
-  validAttributes: AttributeConfiguration
-) : ?Object {
+  validAttributes: AttributeConfiguration,
+): ?Object {
   if (!prevProp) {
     return updatePayload;
   }
@@ -280,7 +274,7 @@ function clearNestedProperty(
     return clearProperties(
       updatePayload,
       resolveObject(prevProp),
-      validAttributes
+      validAttributes,
     );
   }
 
@@ -289,7 +283,7 @@ function clearNestedProperty(
     updatePayload = clearNestedProperty(
       updatePayload,
       prevProp[i],
-      validAttributes
+      validAttributes,
     );
   }
   return updatePayload;
@@ -305,9 +299,9 @@ function diffProperties(
   updatePayload: ?Object,
   prevProps: Object,
   nextProps: Object,
-  validAttributes: AttributeConfiguration
+  validAttributes: AttributeConfiguration,
 ): ?Object {
-  var attributeConfig : ?(CustomAttributeConfiguration | AttributeConfiguration);
+  var attributeConfig: ?(CustomAttributeConfiguration | AttributeConfiguration);
   var nextProp;
   var prevProp;
 
@@ -323,20 +317,20 @@ function diffProperties(
     // functions are converted to booleans as markers that the associated
     // events should be sent from native.
     if (typeof nextProp === 'function') {
-      nextProp = (true : any);
+      nextProp = (true: any);
       // If nextProp is not a function, then don't bother changing prevProp
       // since nextProp will win and go into the updatePayload regardless.
       if (typeof prevProp === 'function') {
-        prevProp = (true : any);
+        prevProp = (true: any);
       }
     }
 
     // An explicit value of undefined is treated as a null because it overrides
     // any other preceding value.
     if (typeof nextProp === 'undefined') {
-      nextProp = (null : any);
+      nextProp = (null: any);
       if (typeof prevProp === 'undefined') {
-        prevProp = (null : any);
+        prevProp = (null: any);
       }
     }
 
@@ -354,12 +348,14 @@ function diffProperties(
       if (typeof attributeConfig !== 'object') {
         // case: !Object is the default case
         updatePayload[propKey] = nextProp;
-      } else if (typeof attributeConfig.diff === 'function' ||
-                 typeof attributeConfig.process === 'function') {
+      } else if (
+        typeof attributeConfig.diff === 'function' ||
+        typeof attributeConfig.process === 'function'
+      ) {
         // case: CustomAttributeConfiguration
-        var nextValue = typeof attributeConfig.process === 'function' ?
-                        attributeConfig.process(nextProp) :
-                        nextProp;
+        var nextValue = typeof attributeConfig.process === 'function'
+          ? attributeConfig.process(nextProp)
+          : nextProp;
         updatePayload[propKey] = nextValue;
       }
       continue;
@@ -376,18 +372,19 @@ function diffProperties(
         // a normal leaf has changed
         (updatePayload || (updatePayload = {}))[propKey] = nextProp;
       }
-    } else if (typeof attributeConfig.diff === 'function' ||
-               typeof attributeConfig.process === 'function') {
+    } else if (
+      typeof attributeConfig.diff === 'function' ||
+      typeof attributeConfig.process === 'function'
+    ) {
       // case: CustomAttributeConfiguration
-      var shouldUpdate = prevProp === undefined || (
-        typeof attributeConfig.diff === 'function' ?
-        attributeConfig.diff(prevProp, nextProp) :
-        defaultDiffer(prevProp, nextProp)
-      );
+      var shouldUpdate = prevProp === undefined ||
+        (typeof attributeConfig.diff === 'function'
+          ? attributeConfig.diff(prevProp, nextProp)
+          : defaultDiffer(prevProp, nextProp));
       if (shouldUpdate) {
-        nextValue = typeof attributeConfig.process === 'function' ?
-                    attributeConfig.process(nextProp) :
-                    nextProp;
+        nextValue = typeof attributeConfig.process === 'function'
+          ? attributeConfig.process(nextProp)
+          : nextProp;
         (updatePayload || (updatePayload = {}))[propKey] = nextValue;
       }
     } else {
@@ -400,13 +397,13 @@ function diffProperties(
         updatePayload,
         prevProp,
         nextProp,
-        ((attributeConfig : any) : AttributeConfiguration)
+        ((attributeConfig: any): AttributeConfiguration),
       );
       if (removedKeyCount > 0 && updatePayload) {
         restoreDeletedValuesInNestedArray(
           updatePayload,
           nextProp,
-          ((attributeConfig : any) : AttributeConfiguration)
+          ((attributeConfig: any): AttributeConfiguration),
         );
         removedKeys = null;
       }
@@ -435,10 +432,11 @@ function diffProperties(
       continue; // was already empty anyway
     }
     // Pattern match on: attributeConfig
-    if (typeof attributeConfig !== 'object' ||
-        typeof attributeConfig.diff === 'function' ||
-        typeof attributeConfig.process === 'function') {
-
+    if (
+      typeof attributeConfig !== 'object' ||
+      typeof attributeConfig.diff === 'function' ||
+      typeof attributeConfig.process === 'function'
+    ) {
       // case: CustomAttributeConfiguration | !Object
       // Flag the leaf property for removal by sending a sentinel.
       (updatePayload || (updatePayload = {}))[propKey] = null;
@@ -456,7 +454,7 @@ function diffProperties(
       updatePayload = clearNestedProperty(
         updatePayload,
         prevProp,
-        ((attributeConfig : any) : AttributeConfiguration)
+        ((attributeConfig: any): AttributeConfiguration),
       );
     }
   }
@@ -469,8 +467,8 @@ function diffProperties(
 function addProperties(
   updatePayload: ?Object,
   props: Object,
-  validAttributes: AttributeConfiguration
-) : ?Object {
+  validAttributes: AttributeConfiguration,
+): ?Object {
   // TODO: Fast path
   return diffProperties(updatePayload, emptyObject, props, validAttributes);
 }
@@ -482,38 +480,36 @@ function addProperties(
 function clearProperties(
   updatePayload: ?Object,
   prevProps: Object,
-  validAttributes: AttributeConfiguration
-) :? Object {
+  validAttributes: AttributeConfiguration,
+): ?Object {
   // TODO: Fast path
   return diffProperties(updatePayload, prevProps, emptyObject, validAttributes);
 }
 
 var ReactNativeAttributePayload = {
-
   create: function(
     props: Object,
-    validAttributes: AttributeConfiguration
-  ) : ?Object {
+    validAttributes: AttributeConfiguration,
+  ): ?Object {
     return addProperties(
       null, // updatePayload
       props,
-      validAttributes
+      validAttributes,
     );
   },
 
   diff: function(
     prevProps: Object,
     nextProps: Object,
-    validAttributes: AttributeConfiguration
-  ) : ?Object {
+    validAttributes: AttributeConfiguration,
+  ): ?Object {
     return diffProperties(
       null, // updatePayload
       prevProps,
       nextProps,
-      validAttributes
+      validAttributes,
     );
   },
-
 };
 
 module.exports = ReactNativeAttributePayload;
diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeBaseComponent.js b/Libraries/Renderer/src/renderers/native/ReactNativeBaseComponent.js
index a254257714f197..ef133414201ca4 100644
--- a/Libraries/Renderer/src/renderers/native/ReactNativeBaseComponent.js
+++ b/Libraries/Renderer/src/renderers/native/ReactNativeBaseComponent.js
@@ -23,7 +23,7 @@ var deepFreezeAndThrowOnMutationInDev = require('deepFreezeAndThrowOnMutationInD
 type ReactNativeBaseComponentViewConfig = {
   validAttributes: Object,
   uiViewClassName: string,
-}
+};
 
 // require('UIManagerStatTracker').install(); // uncomment to enable
 
@@ -34,7 +34,7 @@ type ReactNativeBaseComponentViewConfig = {
  * @param {!object} UIKit View Configuration.
  */
 var ReactNativeBaseComponent = function(
-  viewConfig: ReactNativeBaseComponentViewConfig
+  viewConfig: ReactNativeBaseComponentViewConfig,
 ) {
   this.viewConfig = viewConfig;
 };
@@ -69,7 +69,6 @@ ReactNativeBaseComponent.Mixin = {
     // no children - let's avoid calling out to the native bridge for a large
     // portion of the children.
     if (mountImages.length) {
-
       // TODO: Pool these per platform view class. Reusing the `mountImages`
       // array would likely be a jit deopt.
       var createdTags = [];
@@ -105,14 +104,14 @@ ReactNativeBaseComponent.Mixin = {
     var updatePayload = ReactNativeAttributePayload.diff(
       prevElement.props,
       nextElement.props,
-      this.viewConfig.validAttributes
+      this.viewConfig.validAttributes,
     );
 
     if (updatePayload) {
       UIManager.updateView(
         this._rootNodeID,
         this.viewConfig.uiViewClassName,
-        updatePayload
+        updatePayload,
       );
     }
 
@@ -135,7 +134,12 @@ ReactNativeBaseComponent.Mixin = {
    * @param {object} context
    * @return {string} Unique iOS view tag.
    */
-  mountComponent: function(transaction, hostParent, hostContainerInfo, context) {
+  mountComponent: function(
+    transaction,
+    hostParent,
+    hostContainerInfo,
+    context,
+  ) {
     var tag = ReactNativeTagHandles.allocateTag();
 
     this._rootNodeID = tag;
@@ -152,7 +156,7 @@ ReactNativeBaseComponent.Mixin = {
 
     var updatePayload = ReactNativeAttributePayload.create(
       this._currentElement.props,
-      this.viewConfig.validAttributes
+      this.viewConfig.validAttributes,
     );
 
     var nativeTopRootTag = hostContainerInfo._tag;
@@ -160,7 +164,7 @@ ReactNativeBaseComponent.Mixin = {
       tag,
       this.viewConfig.uiViewClassName,
       nativeTopRootTag,
-      updatePayload
+      updatePayload,
     );
 
     ReactNativeComponentTree.precacheNode(this, tag);
@@ -169,7 +173,7 @@ ReactNativeBaseComponent.Mixin = {
       this._currentElement.props.children,
       tag,
       transaction,
-      context
+      context,
     );
     return tag;
   },
@@ -183,7 +187,7 @@ Object.assign(
   ReactNativeBaseComponent.prototype,
   ReactMultiChild,
   ReactNativeBaseComponent.Mixin,
-  NativeMethodsMixin
+  NativeMethodsMixin,
 );
 
 module.exports = ReactNativeBaseComponent;
diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeBridgeEventPlugin.js b/Libraries/Renderer/src/renderers/native/ReactNativeBridgeEventPlugin.js
index e0be0f1cbcfb18..df1f4392376bc3 100644
--- a/Libraries/Renderer/src/renderers/native/ReactNativeBridgeEventPlugin.js
+++ b/Libraries/Renderer/src/renderers/native/ReactNativeBridgeEventPlugin.js
@@ -23,21 +23,22 @@ var customDirectEventTypes = UIManager.customDirectEventTypes;
 var allTypesByEventName = {};
 
 for (var bubblingTypeName in customBubblingEventTypes) {
-  allTypesByEventName[bubblingTypeName] = customBubblingEventTypes[bubblingTypeName];
+  allTypesByEventName[bubblingTypeName] = customBubblingEventTypes[
+    bubblingTypeName
+  ];
 }
 
 for (var directTypeName in customDirectEventTypes) {
   warning(
     !customBubblingEventTypes[directTypeName],
     'Event cannot be both direct and bubbling: %s',
-    directTypeName
+    directTypeName,
   );
   allTypesByEventName[directTypeName] = customDirectEventTypes[directTypeName];
 }
 
 var ReactNativeBridgeEventPlugin = {
-
-  eventTypes: { ...customBubblingEventTypes, ...customDirectEventTypes },
+  eventTypes: {...customBubblingEventTypes, ...customDirectEventTypes},
 
   /**
    * @see {EventPluginHub.extractEvents}
@@ -46,7 +47,7 @@ var ReactNativeBridgeEventPlugin = {
     topLevelType: string,
     targetInst: Object,
     nativeEvent: Event,
-    nativeEventTarget: Object
+    nativeEventTarget: Object,
   ): ?Object {
     var bubbleDispatchConfig = customBubblingEventTypes[topLevelType];
     var directDispatchConfig = customDirectEventTypes[topLevelType];
@@ -54,7 +55,7 @@ var ReactNativeBridgeEventPlugin = {
       bubbleDispatchConfig || directDispatchConfig,
       targetInst,
       nativeEvent,
-      nativeEventTarget
+      nativeEventTarget,
     );
     if (bubbleDispatchConfig) {
       EventPropagators.accumulateTwoPhaseDispatches(event);
diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeComponentEnvironment.js b/Libraries/Renderer/src/renderers/native/ReactNativeComponentEnvironment.js
index 64e0c937168043..0e1a3f5826774c 100644
--- a/Libraries/Renderer/src/renderers/native/ReactNativeComponentEnvironment.js
+++ b/Libraries/Renderer/src/renderers/native/ReactNativeComponentEnvironment.js
@@ -15,7 +15,6 @@ var ReactNativeDOMIDOperations = require('ReactNativeDOMIDOperations');
 var ReactNativeReconcileTransaction = require('ReactNativeReconcileTransaction');
 
 var ReactNativeComponentEnvironment = {
-
   processChildrenUpdates: ReactNativeDOMIDOperations.dangerouslyProcessChildrenUpdates,
 
   replaceNodeWithMarkup: ReactNativeDOMIDOperations.dangerouslyReplaceNodeWithMarkupByID,
@@ -23,9 +22,7 @@ var ReactNativeComponentEnvironment = {
   /**
    * @param {DOMElement} Element to clear.
    */
-  clearNode: function(/*containerView*/) {
-
-  },
+  clearNode: function(/*containerView*/) {},
 
   ReactReconcileTransaction: ReactNativeReconcileTransaction,
 };
diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeDOMIDOperations.js b/Libraries/Renderer/src/renderers/native/ReactNativeDOMIDOperations.js
index 4c38f3c57601e3..c008373f66c017 100644
--- a/Libraries/Renderer/src/renderers/native/ReactNativeDOMIDOperations.js
+++ b/Libraries/Renderer/src/renderers/native/ReactNativeDOMIDOperations.js
@@ -59,7 +59,7 @@ var dangerouslyProcessChildrenUpdates = function(inst, childrenUpdates) {
     moveToIndices,
     addChildTags,
     addAtIndices,
-    removeAtIndices
+    removeAtIndices,
   );
 };
 
diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeEventEmitter.js b/Libraries/Renderer/src/renderers/native/ReactNativeEventEmitter.js
index b7b18f9ff0177b..6cea86f9d6ae65 100644
--- a/Libraries/Renderer/src/renderers/native/ReactNativeEventEmitter.js
+++ b/Libraries/Renderer/src/renderers/native/ReactNativeEventEmitter.js
@@ -56,7 +56,7 @@ var touchSubsequence = function(touches, indices) {
  */
 var removeTouchesAtIndices = function(
   touches: Array<Object>,
-  indices: Array<number>
+  indices: Array<number>,
 ): Array<Object> {
   var rippedOut = [];
   // use an unsafe downcast to alias to nullable elements,
@@ -79,7 +79,6 @@ var removeTouchesAtIndices = function(
 };
 
 var ReactNativeEventEmitter = {
-
   ...ReactEventEmitterMixin,
 
   registrationNames: EventPluginRegistry.registrationNameModules,
@@ -99,16 +98,21 @@ var ReactNativeEventEmitter = {
   _receiveRootNodeIDEvent: function(
     rootNodeID: number,
     topLevelType: string,
-    nativeEventParam: Object
+    nativeEventParam: Object,
   ) {
     var nativeEvent = nativeEventParam || EMPTY_NATIVE_EVENT;
     var inst = ReactNativeComponentTree.getInstanceFromNode(rootNodeID);
+    if (!inst) {
+      // If the original instance is already gone, we don't have to dispatch
+      // any events.
+      return;
+    }
     ReactGenericBatching.batchedUpdates(function() {
       ReactNativeEventEmitter.handleTopLevel(
         topLevelType,
         inst,
         nativeEvent,
-        nativeEvent.target
+        nativeEvent.target,
       );
     });
     // React Native doesn't use ReactControlledComponent but if it did, here's
@@ -125,13 +129,13 @@ var ReactNativeEventEmitter = {
   receiveEvent: function(
     tag: number,
     topLevelType: string,
-    nativeEventParam: Object
+    nativeEventParam: Object,
   ) {
     var rootNodeID = tag;
     ReactNativeEventEmitter._receiveRootNodeIDEvent(
       rootNodeID,
       topLevelType,
-      nativeEventParam
+      nativeEventParam,
     );
   },
 
@@ -162,13 +166,12 @@ var ReactNativeEventEmitter = {
   receiveTouches: function(
     eventTopLevelType: string,
     touches: Array<Object>,
-    changedIndices: Array<number>
+    changedIndices: Array<number>,
   ) {
-    var changedTouches =
-      eventTopLevelType === 'topTouchEnd' ||
-      eventTopLevelType === 'topTouchCancel' ?
-      removeTouchesAtIndices(touches, changedIndices) :
-      touchSubsequence(touches, changedIndices);
+    var changedTouches = eventTopLevelType === 'topTouchEnd' ||
+      eventTopLevelType === 'topTouchCancel'
+      ? removeTouchesAtIndices(touches, changedIndices)
+      : touchSubsequence(touches, changedIndices);
 
     for (var jj = 0; jj < changedTouches.length; jj++) {
       var touch = changedTouches[jj];
@@ -184,7 +187,7 @@ var ReactNativeEventEmitter = {
           if (__DEV__) {
             warning(
               false,
-              'A view is reporting that a touch occurred on tag zero.'
+              'A view is reporting that a touch occurred on tag zero.',
             );
           }
         } else {
@@ -194,7 +197,7 @@ var ReactNativeEventEmitter = {
       ReactNativeEventEmitter._receiveRootNodeIDEvent(
         rootNodeID,
         eventTopLevelType,
-        nativeEvent
+        nativeEvent,
       );
     }
   },
diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeFiber.js b/Libraries/Renderer/src/renderers/native/ReactNativeFiber.js
index e2ad6701a4c0aa..783ae91397dfa0 100644
--- a/Libraries/Renderer/src/renderers/native/ReactNativeFiber.js
+++ b/Libraries/Renderer/src/renderers/native/ReactNativeFiber.js
@@ -28,12 +28,14 @@ const emptyObject = require('fbjs/lib/emptyObject');
 const findNodeHandle = require('findNodeHandle');
 const invariant = require('fbjs/lib/invariant');
 
-const { injectInternals } = require('ReactFiberDevToolsHook');
-
-import type { Element } from 'React';
-import type { Fiber } from 'ReactFiber';
-import type { ReactNativeBaseComponentViewConfig } from 'ReactNativeViewConfigRegistry';
-import type { ReactNodeList } from 'ReactTypes';
+const {injectInternals} = require('ReactFiberDevToolsHook');
+
+import type {Element} from 'React';
+import type {Fiber} from 'ReactFiber';
+import type {
+  ReactNativeBaseComponentViewConfig,
+} from 'ReactNativeViewConfigRegistry';
+import type {ReactNodeList} from 'ReactTypes';
 const {
   precacheFiberNode,
   uncacheFiberNode,
@@ -51,26 +53,27 @@ export type Instance = {
 type Props = Object;
 type TextInstance = number;
 
-function recursivelyUncacheFiberNode(node : Instance | TextInstance) {
-  if (typeof node === 'number') { // Leaf node (eg text)
+function recursivelyUncacheFiberNode(node: Instance | TextInstance) {
+  if (typeof node === 'number') {
+    // Leaf node (eg text)
     uncacheFiberNode(node);
   } else {
-    uncacheFiberNode((node : any)._nativeTag);
+    uncacheFiberNode((node: any)._nativeTag);
 
-    (node : any)._children.forEach(recursivelyUncacheFiberNode);
+    (node: any)._children.forEach(recursivelyUncacheFiberNode);
   }
 }
 
 const NativeRenderer = ReactFiberReconciler({
   appendChild(
-    parentInstance : Instance | Container,
-    child : Instance | TextInstance
-  ) : void {
+    parentInstance: Instance | Container,
+    child: Instance | TextInstance,
+  ): void {
     if (typeof parentInstance === 'number') {
       // Root container
       UIManager.setChildren(
         parentInstance, // containerTag
-        [(child : any)._nativeTag] // reactTags
+        [(child: any)._nativeTag], // reactTags
       );
     } else {
       const children = parentInstance._children;
@@ -81,22 +84,25 @@ const NativeRenderer = ReactFiberReconciler({
         parentInstance._nativeTag, // containerTag
         [], // moveFromIndices
         [], // moveToIndices
-        [(child : any)._nativeTag], // addChildReactTags
+        [(child: any)._nativeTag], // addChildReactTags
         [children.length - 1], // addAtIndices
         [], // removeAtIndices
       );
     }
   },
 
-  appendInitialChild(parentInstance : Instance, child : Instance | TextInstance) : void {
+  appendInitialChild(
+    parentInstance: Instance,
+    child: Instance | TextInstance,
+  ): void {
     parentInstance._children.push(child);
   },
 
   commitTextUpdate(
-    textInstance : TextInstance,
-    oldText : string,
-    newText : string
-  ) : void {
+    textInstance: TextInstance,
+    oldText: string,
+    newText: string,
+  ): void {
     UIManager.updateView(
       textInstance, // reactTag
       'RCTRawText', // viewName
@@ -105,22 +111,22 @@ const NativeRenderer = ReactFiberReconciler({
   },
 
   commitMount(
-    instance : Instance,
-    type : string,
-    newProps : Props,
-    internalInstanceHandle : Object
-  ) : void {
+    instance: Instance,
+    type: string,
+    newProps: Props,
+    internalInstanceHandle: Object,
+  ): void {
     // Noop
   },
 
   commitUpdate(
-    instance : Instance,
-    updatePayloadTODO : Object,
-    type : string,
-    oldProps : Props,
-    newProps : Props,
-    internalInstanceHandle : Object
-  ) : void {
+    instance: Instance,
+    updatePayloadTODO: Object,
+    type: string,
+    oldProps: Props,
+    newProps: Props,
+    internalInstanceHandle: Object,
+  ): void {
     const viewConfig = instance.viewConfig;
 
     updateFiberProps(instance._nativeTag, newProps);
@@ -128,23 +134,23 @@ const NativeRenderer = ReactFiberReconciler({
     const updatePayload = ReactNativeAttributePayload.diff(
       oldProps,
       newProps,
-      viewConfig.validAttributes
+      viewConfig.validAttributes,
     );
 
     UIManager.updateView(
-      (instance : any)._nativeTag, // reactTag
+      (instance: any)._nativeTag, // reactTag
       viewConfig.uiViewClassName, // viewName
       updatePayload, // props
     );
   },
 
   createInstance(
-    type : string,
-    props : Props,
-    rootContainerInstance : Container,
-    hostContext : {||},
-    internalInstanceHandle : Object
-  ) : Instance {
+    type: string,
+    props: Props,
+    rootContainerInstance: Container,
+    hostContext: {},
+    internalInstanceHandle: Object,
+  ): Instance {
     const tag = ReactNativeTagHandles.allocateTag();
     const viewConfig = ReactNativeViewConfigRegistry.get(type);
 
@@ -158,7 +164,7 @@ const NativeRenderer = ReactFiberReconciler({
 
     const updatePayload = ReactNativeAttributePayload.create(
       props,
-      viewConfig.validAttributes
+      viewConfig.validAttributes,
     );
 
     UIManager.createView(
@@ -175,22 +181,22 @@ const NativeRenderer = ReactFiberReconciler({
 
     // Not sure how to avoid this cast. Flow is okay if the component is defined
     // in the same file but if it's external it can't see the types.
-    return ((component : any) : Instance);
+    return ((component: any): Instance);
   },
 
   createTextInstance(
-    text : string,
-    rootContainerInstance : Container,
-    hostContext : {||},
-    internalInstanceHandle : Object,
-  ) : TextInstance {
+    text: string,
+    rootContainerInstance: Container,
+    hostContext: {},
+    internalInstanceHandle: Object,
+  ): TextInstance {
     const tag = ReactNativeTagHandles.allocateTag();
 
     UIManager.createView(
       tag, // reactTag
       'RCTRawText', // viewName
       rootContainerInstance, // rootTag
-      {text: text} // props
+      {text: text}, // props
     );
 
     precacheFiberNode(internalInstanceHandle, tag);
@@ -199,11 +205,11 @@ const NativeRenderer = ReactFiberReconciler({
   },
 
   finalizeInitialChildren(
-    parentInstance : Instance,
-    type : string,
-    props : Props,
-    rootContainerInstance : Container,
-  ) : boolean {
+    parentInstance: Instance,
+    type: string,
+    props: Props,
+    rootContainerInstance: Container,
+  ): boolean {
     // Don't send a no-op message over the bridge.
     if (parentInstance._children.length === 0) {
       return false;
@@ -212,24 +218,25 @@ const NativeRenderer = ReactFiberReconciler({
     // Map from child objects to native tags.
     // Either way we need to pass a copy of the Array to prevent it from being frozen.
     const nativeTags = parentInstance._children.map(
-      (child) => typeof child === 'number'
-        ? child // Leaf node (eg text)
-        : child._nativeTag
+      child =>
+        typeof child === 'number'
+          ? child // Leaf node (eg text)
+          : child._nativeTag,
     );
 
     UIManager.setChildren(
       parentInstance._nativeTag, // containerTag
-      nativeTags // reactTags
+      nativeTags, // reactTags
     );
 
     return false;
   },
 
-  getRootHostContext() : {||} {
+  getRootHostContext(): {} {
     return emptyObject;
   },
 
-  getChildHostContext() : {||} {
+  getChildHostContext(): {} {
     return emptyObject;
   },
 
@@ -238,10 +245,10 @@ const NativeRenderer = ReactFiberReconciler({
   },
 
   insertBefore(
-    parentInstance : Instance | Container,
-    child : Instance | TextInstance,
-    beforeChild : Instance | TextInstance
-  ) : void {
+    parentInstance: Instance | Container,
+    child: Instance | TextInstance,
+    beforeChild: Instance | TextInstance,
+  ): void {
     // TODO (bvaughn): Remove this check when...
     // We create a wrapper object for the container in ReactNative render()
     // Or we refactor to remove wrapper objects entirely.
@@ -251,7 +258,7 @@ const NativeRenderer = ReactFiberReconciler({
       'Container does not support insertBefore operation',
     );
 
-    const children = (parentInstance : any)._children;
+    const children = (parentInstance: any)._children;
 
     const beforeChildIndex = children.indexOf(beforeChild);
     const index = children.indexOf(child);
@@ -262,7 +269,7 @@ const NativeRenderer = ReactFiberReconciler({
       children.splice(beforeChildIndex, 0, child);
 
       UIManager.manageChildren(
-        (parentInstance : any)._nativeTag, // containerID
+        (parentInstance: any)._nativeTag, // containerID
         [index], // moveFromIndices
         [beforeChildIndex], // moveToIndices
         [], // addChildReactTags
@@ -273,35 +280,35 @@ const NativeRenderer = ReactFiberReconciler({
       children.splice(beforeChildIndex, 0, child);
 
       UIManager.manageChildren(
-        (parentInstance : any)._nativeTag, // containerID
+        (parentInstance: any)._nativeTag, // containerID
         [], // moveFromIndices
         [], // moveToIndices
-        [(child : any)._nativeTag], // addChildReactTags
+        [(child: any)._nativeTag], // addChildReactTags
         [beforeChildIndex], // addAtIndices
         [], // removeAtIndices
       );
     }
   },
 
-  prepareForCommit() : void {
+  prepareForCommit(): void {
     // Noop
   },
 
   prepareUpdate(
-    instance : Instance,
-    type : string,
-    oldProps : Props,
-    newProps : Props,
-    rootContainerInstance : Container,
-    hostContext : {||}
-  ) : null | Object {
+    instance: Instance,
+    type: string,
+    oldProps: Props,
+    newProps: Props,
+    rootContainerInstance: Container,
+    hostContext: {},
+  ): null | Object {
     return emptyObject;
   },
 
   removeChild(
-    parentInstance : Instance | Container,
-    child : Instance | TextInstance
-  ) : void {
+    parentInstance: Instance | Container,
+    child: Instance | TextInstance,
+  ): void {
     recursivelyUncacheFiberNode(child);
 
     if (typeof parentInstance === 'number') {
@@ -330,19 +337,23 @@ const NativeRenderer = ReactFiberReconciler({
     }
   },
 
-  resetAfterCommit() : void {
+  resetAfterCommit(): void {
     // Noop
   },
 
-  resetTextContent(instance : Instance) : void {
+  resetTextContent(instance: Instance): void {
     // Noop
   },
 
+  shouldDeprioritizeSubtree(type: string, props: Props): boolean {
+    return false;
+  },
+
   scheduleAnimationCallback: global.requestAnimationFrame,
 
   scheduleDeferredCallback: global.requestIdleCallback,
 
-  shouldSetTextContent(props : Props) : boolean {
+  shouldSetTextContent(props: Props): boolean {
     // TODO (bvaughn) Revisit this decision.
     // Always returning false simplifies the createInstance() implementation,
     // But creates an additional child Fiber for raw text children.
@@ -356,28 +367,25 @@ const NativeRenderer = ReactFiberReconciler({
 });
 
 ReactGenericBatching.injection.injectFiberBatchedUpdates(
-  NativeRenderer.batchedUpdates
+  NativeRenderer.batchedUpdates,
 );
 
 const roots = new Map();
 
-findNodeHandle.injection.injectFindNode(
-  (fiber: Fiber) => NativeRenderer.findHostInstance(fiber)
-);
-findNodeHandle.injection.injectFindRootNodeID(
-  (instance) => instance
-);
+findNodeHandle.injection.injectFindNode((fiber: Fiber) =>
+  NativeRenderer.findHostInstance(fiber));
+findNodeHandle.injection.injectFindRootNodeID(instance => instance);
 
 const ReactNative = {
   // External users of findNodeHandle() expect the host tag number return type.
   // The injected findNodeHandle() strategy returns the instance wrapper though.
   // See NativeMethodsMixin#setNativeProps for more info on why this is done.
-  findNodeHandle(componentOrHandle : any) : ?number {
+  findNodeHandle(componentOrHandle: any): ?number {
     const instance: any = findNodeHandle(componentOrHandle);
     return instance ? instance._nativeTag : null;
   },
 
-  render(element : Element<any>, containerTag : any, callback: ?Function) {
+  render(element: Element<any>, containerTag: any, callback: ?Function) {
     let root = roots.get(containerTag);
 
     if (!root) {
@@ -391,7 +399,7 @@ const ReactNative = {
     return NativeRenderer.getPublicRootInstance(root);
   },
 
-  unmountComponentAtNode(containerTag : number) {
+  unmountComponentAtNode(containerTag: number) {
     const root = roots.get(containerTag);
     if (root) {
       // TODO: Is it safe to reset this now or should I wait since this unmount could be deferred?
@@ -408,12 +416,15 @@ const ReactNative = {
     UIManager.removeRootView(containerTag);
   },
 
-  unstable_createPortal(children: ReactNodeList, containerTag : number, key : ?string = null) {
+  unstable_createPortal(
+    children: ReactNodeList,
+    containerTag: number,
+    key: ?string = null,
+  ) {
     return ReactPortal.createPortal(children, containerTag, null, key);
   },
 
   unstable_batchedUpdates: ReactGenericBatching.batchedUpdates,
-
 };
 
 if (typeof injectInternals === 'function') {
diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeFiberHostComponent.js b/Libraries/Renderer/src/renderers/native/ReactNativeFiberHostComponent.js
index 2935b199d15f0b..0c0c69a65dfebe 100644
--- a/Libraries/Renderer/src/renderers/native/ReactNativeFiberHostComponent.js
+++ b/Libraries/Renderer/src/renderers/native/ReactNativeFiberHostComponent.js
@@ -28,8 +28,10 @@ import type {
   MeasureOnSuccessCallback,
   NativeMethodsInterface,
 } from 'NativeMethodsMixinUtils';
-import type { Instance } from 'ReactNativeFiber';
-import type { ReactNativeBaseComponentViewConfig } from 'ReactNativeViewConfigRegistry';
+import type {Instance} from 'ReactNativeFiber';
+import type {
+  ReactNativeBaseComponentViewConfig,
+} from 'ReactNativeViewConfigRegistry';
 
 /**
  * This component defines the same methods as NativeMethodsMixin but without the
@@ -39,14 +41,11 @@ import type { ReactNativeBaseComponentViewConfig } from 'ReactNativeViewConfigRe
  * ReactNativeFiber).
  */
 class ReactNativeFiberHostComponent implements NativeMethodsInterface {
-  _children: Array<Instance | number>
-  _nativeTag: number
-  viewConfig: ReactNativeBaseComponentViewConfig
+  _children: Array<Instance | number>;
+  _nativeTag: number;
+  viewConfig: ReactNativeBaseComponentViewConfig;
 
-  constructor(
-    tag : number,
-    viewConfig : ReactNativeBaseComponentViewConfig
-  ) {
+  constructor(tag: number, viewConfig: ReactNativeBaseComponentViewConfig) {
     this._nativeTag = tag;
     this._children = [];
     this.viewConfig = viewConfig;
@@ -61,29 +60,26 @@ class ReactNativeFiberHostComponent implements NativeMethodsInterface {
   }
 
   measure(callback: MeasureOnSuccessCallback) {
-    UIManager.measure(
-      this._nativeTag,
-      mountSafeCallback(this, callback)
-    );
+    UIManager.measure(this._nativeTag, mountSafeCallback(this, callback));
   }
 
   measureInWindow(callback: MeasureInWindowOnSuccessCallback) {
     UIManager.measureInWindow(
       this._nativeTag,
-      mountSafeCallback(this, callback)
+      mountSafeCallback(this, callback),
     );
   }
 
   measureLayout(
     relativeToNativeNode: number,
     onSuccess: MeasureLayoutOnSuccessCallback,
-    onFail: () => void /* currently unused */
+    onFail: () => void /* currently unused */,
   ) {
     UIManager.measureLayout(
       this._nativeTag,
       relativeToNativeNode,
       mountSafeCallback(this, onFail),
-      mountSafeCallback(this, onSuccess)
+      mountSafeCallback(this, onSuccess),
     );
   }
 
@@ -94,13 +90,13 @@ class ReactNativeFiberHostComponent implements NativeMethodsInterface {
 
     var updatePayload = ReactNativeAttributePayload.create(
       nativeProps,
-      this.viewConfig.validAttributes
+      this.viewConfig.validAttributes,
     );
 
     UIManager.updateView(
       this._nativeTag,
       this.viewConfig.uiViewClassName,
-      updatePayload
+      updatePayload,
     );
   }
 }
diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeInjection.js b/Libraries/Renderer/src/renderers/native/ReactNativeInjection.js
index d3000c8d0a439b..116948d7bd9b1f 100644
--- a/Libraries/Renderer/src/renderers/native/ReactNativeInjection.js
+++ b/Libraries/Renderer/src/renderers/native/ReactNativeInjection.js
@@ -42,7 +42,7 @@ function inject() {
   EventPluginUtils.injection.injectComponentTree(ReactNativeComponentTree);
 
   ResponderEventPlugin.injection.injectGlobalResponderHandler(
-    ReactNativeGlobalResponderHandler
+    ReactNativeGlobalResponderHandler,
   );
 
   /**
@@ -50,8 +50,8 @@ function inject() {
    * them).
    */
   EventPluginHub.injection.injectEventPluginsByName({
-    'ResponderEventPlugin': ResponderEventPlugin,
-    'ReactNativeBridgeEventPlugin': ReactNativeBridgeEventPlugin,
+    ResponderEventPlugin: ResponderEventPlugin,
+    ReactNativeBridgeEventPlugin: ReactNativeBridgeEventPlugin,
   });
 }
 
diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeMount.js b/Libraries/Renderer/src/renderers/native/ReactNativeMount.js
index 69bc291e0a9c64..ee4a28f45a057d 100644
--- a/Libraries/Renderer/src/renderers/native/ReactNativeMount.js
+++ b/Libraries/Renderer/src/renderers/native/ReactNativeMount.js
@@ -11,7 +11,7 @@
  */
 'use strict';
 
-var React = require('React');
+var React = require('react');
 var ReactInstrumentation = require('ReactInstrumentation');
 var ReactNativeContainerInfo = require('ReactNativeContainerInfo');
 var ReactNativeTagHandles = require('ReactNativeTagHandles');
@@ -47,17 +47,14 @@ TopLevelWrapper.isReactTopLevelWrapper = true;
  * @param {number} containerTag container element to mount into.
  * @param {ReactReconcileTransaction} transaction
  */
-function mountComponentIntoNode(
-    componentInstance,
-    containerTag,
-    transaction) {
+function mountComponentIntoNode(componentInstance, containerTag, transaction) {
   var markup = ReactReconciler.mountComponent(
     componentInstance,
     transaction,
     null,
     ReactNativeContainerInfo(containerTag),
     emptyObject,
-    0 /* parentDebugID */
+    0 /* parentDebugID */,
   );
   componentInstance._renderedComponent._topLevelWrapper = componentInstance;
   ReactNativeMount._mountImageIntoNode(markup, containerTag);
@@ -70,16 +67,14 @@ function mountComponentIntoNode(
  * @param {number} rootID ID of the root node.
  * @param {number} containerTag container element to mount into.
  */
-function batchedMountComponentIntoNode(
-    componentInstance,
-    containerTag) {
+function batchedMountComponentIntoNode(componentInstance, containerTag) {
   var transaction = ReactUpdates.ReactReconcileTransaction.getPooled();
   transaction.perform(
     mountComponentIntoNode,
     null,
     componentInstance,
     containerTag,
-    transaction
+    transaction,
   );
   ReactUpdates.ReactReconcileTransaction.release(transaction);
 }
@@ -101,12 +96,11 @@ var ReactNativeMount = {
   renderComponent: function(
     nextElement: ReactElement<*>,
     containerTag: number,
-    callback?: ?(() => void)
+    callback?: ?() => void,
   ): ?ReactComponent<any, any, any> {
-    var nextWrappedElement = React.createElement(
-      TopLevelWrapper,
-      { child: nextElement }
-    );
+    var nextWrappedElement = React.createElement(TopLevelWrapper, {
+      child: nextElement,
+    });
 
     var topRootNodeID = containerTag;
     var prevComponent = ReactNativeMount._instancesByContainerID[topRootNodeID];
@@ -114,7 +108,11 @@ var ReactNativeMount = {
       var prevWrappedElement = prevComponent._currentElement;
       var prevElement = prevWrappedElement.props.child;
       if (shouldUpdateReactComponent(prevElement, nextElement)) {
-        ReactUpdateQueue.enqueueElementInternal(prevComponent, nextWrappedElement, emptyObject);
+        ReactUpdateQueue.enqueueElementInternal(
+          prevComponent,
+          nextWrappedElement,
+          emptyObject,
+        );
         if (callback) {
           ReactUpdateQueue.enqueueCallbackInternal(prevComponent, callback);
         }
@@ -136,9 +134,11 @@ var ReactNativeMount = {
 
     if (callback) {
       var nonNullCallback = callback;
-      instance._pendingCallbacks = [function() {
-        nonNullCallback.call(instance._renderedComponent.getPublicInstance());
-      }];
+      instance._pendingCallbacks = [
+        function() {
+          nonNullCallback.call(instance._renderedComponent.getPublicInstance());
+        },
+      ];
     }
 
     // The initial render is synchronous but any updates that happen during
@@ -148,7 +148,7 @@ var ReactNativeMount = {
     ReactUpdates.batchedUpdates(
       batchedMountComponentIntoNode,
       instance,
-      containerTag
+      containerTag,
     );
     var component = instance._renderedComponent.getPublicInstance();
     return component;
@@ -158,14 +158,11 @@ var ReactNativeMount = {
    * @param {View} view View tree image.
    * @param {number} containerViewID View to insert sub-view into.
    */
-  _mountImageIntoNode: function(mountImage : number, containerID : number) {
+  _mountImageIntoNode: function(mountImage: number, containerID: number) {
     // Since we now know that the `mountImage` has been mounted, we can
     // mark it as such.
     var childTag = mountImage;
-    UIManager.setChildren(
-      containerID,
-      [childTag]
-    );
+    UIManager.setChildren(containerID, [childTag]);
   },
 
   /**
@@ -176,9 +173,7 @@ var ReactNativeMount = {
    * asynchronously, it's easier to just have this method be the one that calls
    * for removal of the view.
    */
-  unmountComponentAtNodeAndRemoveContainer: function(
-    containerTag: number
-  ) {
+  unmountComponentAtNodeAndRemoveContainer: function(containerTag: number) {
     ReactNativeMount.unmountComponentAtNode(containerTag);
     // call back into native to remove all of the subviews from this container
     UIManager.removeRootView(containerTag);
@@ -221,13 +216,12 @@ var ReactNativeMount = {
    */
   unmountComponentFromNode: function(
     instance: ReactComponent<any, any, any>,
-    containerID: number
+    containerID: number,
   ) {
     // Call back into native to remove all of the subviews from this container
     ReactReconciler.unmountComponent(instance);
     UIManager.removeSubviewsFromContainerWithID(containerID);
   },
-
 };
 
 module.exports = ReactNativeMount;
diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeReconcileTransaction.js b/Libraries/Renderer/src/renderers/native/ReactNativeReconcileTransaction.js
index de34a657b5dbf2..9ee4fc9815ac00 100644
--- a/Libraries/Renderer/src/renderers/native/ReactNativeReconcileTransaction.js
+++ b/Libraries/Renderer/src/renderers/native/ReactNativeReconcileTransaction.js
@@ -124,7 +124,7 @@ Object.assign(
   ReactNativeReconcileTransaction.prototype,
   Transaction,
   ReactNativeReconcileTransaction,
-  Mixin
+  Mixin,
 );
 
 PooledClass.addPoolingTo(ReactNativeReconcileTransaction);
diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeStack.js b/Libraries/Renderer/src/renderers/native/ReactNativeStack.js
index ef1d68fcb447ce..2a5b8f509b7079 100644
--- a/Libraries/Renderer/src/renderers/native/ReactNativeStack.js
+++ b/Libraries/Renderer/src/renderers/native/ReactNativeStack.js
@@ -25,7 +25,7 @@ ReactNativeStackInjection.inject();
 var render = function(
   element: ReactElement<any>,
   mountInto: number,
-  callback?: ?(() => void)
+  callback?: ?() => void,
 ): ?ReactComponent<any, any, any> {
   return ReactNativeMount.renderComponent(element, mountInto, callback);
 };
@@ -36,7 +36,7 @@ var ReactNative = {
   // External users of findNodeHandle() expect the host tag number return type.
   // The injected findNodeHandle() strategy returns the instance wrapper though.
   // See NativeMethodsMixin#setNativeProps for more info on why this is done.
-  findNodeHandle(componentOrHandle : any) : ?number {
+  findNodeHandle(componentOrHandle: any): ?number {
     const nodeHandle = findNodeHandle(componentOrHandle);
     if (nodeHandle == null || typeof nodeHandle === 'number') {
       return nodeHandle;
@@ -59,7 +59,8 @@ var ReactNative = {
 /* globals __REACT_DEVTOOLS_GLOBAL_HOOK__ */
 if (
   typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ !== 'undefined' &&
-  typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.inject === 'function') {
+  typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.inject === 'function'
+) {
   __REACT_DEVTOOLS_GLOBAL_HOOK__.inject({
     ComponentTree: {
       getClosestInstanceFromNode: function(node) {
diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeStackInjection.js b/Libraries/Renderer/src/renderers/native/ReactNativeStackInjection.js
index cc1f812a65cf21..5aa3d3d879c4bb 100644
--- a/Libraries/Renderer/src/renderers/native/ReactNativeStackInjection.js
+++ b/Libraries/Renderer/src/renderers/native/ReactNativeStackInjection.js
@@ -19,7 +19,7 @@
  */
 require('InitializeCore');
 
-var React = require('React');
+var React = require('react');
 var ReactComponentEnvironment = require('ReactComponentEnvironment');
 var ReactDefaultBatchingStrategy = require('ReactDefaultBatchingStrategy');
 var ReactEmptyComponent = require('ReactEmptyComponent');
@@ -35,44 +35,38 @@ var invariant = require('fbjs/lib/invariant');
 
 function inject() {
   ReactGenericBatching.injection.injectStackBatchedUpdates(
-    ReactUpdates.batchedUpdates
+    ReactUpdates.batchedUpdates,
   );
 
   ReactUpdates.injection.injectReconcileTransaction(
-    ReactNativeComponentEnvironment.ReactReconcileTransaction
+    ReactNativeComponentEnvironment.ReactReconcileTransaction,
   );
 
-  ReactUpdates.injection.injectBatchingStrategy(
-    ReactDefaultBatchingStrategy
-  );
+  ReactUpdates.injection.injectBatchingStrategy(ReactDefaultBatchingStrategy);
 
   ReactComponentEnvironment.injection.injectEnvironment(
-    ReactNativeComponentEnvironment
+    ReactNativeComponentEnvironment,
   );
 
-  var EmptyComponent = (instantiate) => {
+  var EmptyComponent = instantiate => {
     // Can't import View at the top because it depends on React to make its composite
     var View = require('View');
     return new ReactSimpleEmptyComponent(
       React.createElement(View, {
         collapsable: true,
-        style: { position: 'absolute' },
+        style: {position: 'absolute'},
       }),
-      instantiate
+      instantiate,
     );
   };
 
-  findNodeHandle.injection.injectFindNode(
-    (instance) => instance
-  );
-  findNodeHandle.injection.injectFindRootNodeID(
-    (instance) => instance
-  );
+  findNodeHandle.injection.injectFindNode(instance => instance);
+  findNodeHandle.injection.injectFindRootNodeID(instance => instance);
 
   ReactEmptyComponent.injection.injectEmptyComponentFactory(EmptyComponent);
 
   ReactHostComponent.injection.injectTextComponentClass(
-    ReactNativeTextComponent
+    ReactNativeTextComponent,
   );
   ReactHostComponent.injection.injectGenericComponentClass(function(tag) {
     // Show a nicer error message for non-function tags
diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeTagHandles.js b/Libraries/Renderer/src/renderers/native/ReactNativeTagHandles.js
index 17e7e5d8e688bc..51e54d4033bf84 100644
--- a/Libraries/Renderer/src/renderers/native/ReactNativeTagHandles.js
+++ b/Libraries/Renderer/src/renderers/native/ReactNativeTagHandles.js
@@ -44,7 +44,8 @@ var ReactNativeTagHandles = {
   assertRootTag: function(tag: number): void {
     invariant(
       this.reactTagIsNativeTopRootID(tag),
-      'Expect a native root tag, instead got %s', tag
+      'Expect a native root tag, instead got %s',
+      tag,
     );
   },
 
diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeTextComponent.js b/Libraries/Renderer/src/renderers/native/ReactNativeTextComponent.js
index eb8525a49e057b..6f7988403aa9d8 100644
--- a/Libraries/Renderer/src/renderers/native/ReactNativeTextComponent.js
+++ b/Libraries/Renderer/src/renderers/native/ReactNativeTextComponent.js
@@ -26,24 +26,25 @@ var ReactNativeTextComponent = function(text) {
 };
 
 Object.assign(ReactNativeTextComponent.prototype, {
-
-  mountComponent: function(transaction, hostParent, hostContainerInfo, context) {
+  mountComponent: function(
+    transaction,
+    hostParent,
+    hostContainerInfo,
+    context,
+  ) {
     // TODO: hostParent should have this context already. Stop abusing context.
     invariant(
       context.isInAParentText,
       'RawText "%s" must be wrapped in an explicit <Text> component.',
-      this._stringText
+      this._stringText,
     );
     this._hostParent = hostParent;
     var tag = ReactNativeTagHandles.allocateTag();
     this._rootNodeID = tag;
     var nativeTopRootTag = hostContainerInfo._tag;
-    UIManager.createView(
-      tag,
-      'RCTRawText',
-      nativeTopRootTag,
-      {text: this._stringText}
-    );
+    UIManager.createView(tag, 'RCTRawText', nativeTopRootTag, {
+      text: this._stringText,
+    });
 
     ReactNativeComponentTree.precacheNode(this, tag);
 
@@ -60,11 +61,9 @@ Object.assign(ReactNativeTextComponent.prototype, {
       var nextStringText = '' + nextText;
       if (nextStringText !== this._stringText) {
         this._stringText = nextStringText;
-        UIManager.updateView(
-          this._rootNodeID,
-          'RCTRawText',
-          {text: this._stringText}
-        );
+        UIManager.updateView(this._rootNodeID, 'RCTRawText', {
+          text: this._stringText,
+        });
       }
     }
   },
@@ -75,7 +74,6 @@ Object.assign(ReactNativeTextComponent.prototype, {
     this._stringText = null;
     this._rootNodeID = 0;
   },
-
 });
 
 module.exports = ReactNativeTextComponent;
diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeViewConfigRegistry.js b/Libraries/Renderer/src/renderers/native/ReactNativeViewConfigRegistry.js
index 39f95046e611a0..23a783cb3108d3 100644
--- a/Libraries/Renderer/src/renderers/native/ReactNativeViewConfigRegistry.js
+++ b/Libraries/Renderer/src/renderers/native/ReactNativeViewConfigRegistry.js
@@ -25,12 +25,12 @@ const viewConfigs = new Map();
 const prefix = 'topsecret-';
 
 const ReactNativeViewConfigRegistry = {
-  register(viewConfig : ReactNativeBaseComponentViewConfig) {
+  register(viewConfig: ReactNativeBaseComponentViewConfig) {
     const name = viewConfig.uiViewClassName;
     invariant(
       !viewConfigs.has(name),
       'Tried to register two views with the same name %s',
-      name
+      name,
     );
     const secretName = prefix + name;
     viewConfigs.set(secretName, viewConfig);
@@ -38,11 +38,7 @@ const ReactNativeViewConfigRegistry = {
   },
   get(secretName: string) {
     const config = viewConfigs.get(secretName);
-    invariant(
-      config,
-      'View config not found for name %s',
-      secretName
-    );
+    invariant(config, 'View config not found for name %s', secretName);
     return config;
   },
 };
diff --git a/Libraries/Renderer/src/renderers/native/__tests__/ReactNativeAttributePayload-test.js b/Libraries/Renderer/src/renderers/native/__tests__/ReactNativeAttributePayload-test.js
index 568764dc0a5902..77c8ae799ccdeb 100644
--- a/Libraries/Renderer/src/renderers/native/__tests__/ReactNativeAttributePayload-test.js
+++ b/Libraries/Renderer/src/renderers/native/__tests__/ReactNativeAttributePayload-test.js
@@ -15,55 +15,45 @@ var ReactNativePropRegistry = require('ReactNativePropRegistry');
 var diff = ReactNativeAttributePayload.diff;
 
 describe('ReactNativeAttributePayload', () => {
-
   it('should work with simple example', () => {
-    expect(diff(
-      {a: 1, c: 3},
-      {b: 2, c: 3},
-      {a: true, b: true}
-    )).toEqual({a: null, b: 2});
+    expect(diff({a: 1, c: 3}, {b: 2, c: 3}, {a: true, b: true})).toEqual({
+      a: null,
+      b: 2,
+    });
   });
 
   it('should skip fields that are equal', () => {
-    expect(diff(
-      {a: 1, b: 'two', c: true, d: false, e: undefined, f: 0},
-      {a: 1, b: 'two', c: true, d: false, e: undefined, f: 0},
-      {a: true, b: true, c: true, d: true, e: true, f: true}
-    )).toEqual(null);
+    expect(
+      diff(
+        {a: 1, b: 'two', c: true, d: false, e: undefined, f: 0},
+        {a: 1, b: 'two', c: true, d: false, e: undefined, f: 0},
+        {a: true, b: true, c: true, d: true, e: true, f: true},
+      ),
+    ).toEqual(null);
   });
 
   it('should remove fields', () => {
-    expect(diff(
-      {a: 1},
-      {},
-      {a: true}
-    )).toEqual({a: null});
+    expect(diff({a: 1}, {}, {a: true})).toEqual({a: null});
   });
 
   it('should remove fields that are set to undefined', () => {
-    expect(diff(
-      {a: 1},
-      {a: undefined},
-      {a: true}
-    )).toEqual({a: null});
+    expect(diff({a: 1}, {a: undefined}, {a: true})).toEqual({a: null});
   });
 
   it('should ignore invalid fields', () => {
-    expect(diff(
-      {a: 1},
-      {b: 2},
-      {}
-    )).toEqual(null);
+    expect(diff({a: 1}, {b: 2}, {})).toEqual(null);
   });
 
   it('should use the diff attribute', () => {
     var diffA = jest.fn((a, b) => true);
     var diffB = jest.fn((a, b) => false);
-    expect(diff(
-      {a: [1], b: [3]},
-      {a: [2], b: [4]},
-      {a: {diff: diffA}, b: {diff: diffB}}
-    )).toEqual({a: [2]});
+    expect(
+      diff(
+        {a: [1], b: [3]},
+        {a: [2], b: [4]},
+        {a: {diff: diffA}, b: {diff: diffB}},
+      ),
+    ).toEqual({a: [2]});
     expect(diffA).toBeCalledWith([1], [2]);
     expect(diffB).toBeCalledWith([3], [4]);
   });
@@ -71,171 +61,176 @@ describe('ReactNativeAttributePayload', () => {
   it('should not use the diff attribute on addition/removal', () => {
     var diffA = jest.fn();
     var diffB = jest.fn();
-    expect(diff(
-      {a: [1]},
-      {b: [2]},
-      {a: {diff: diffA}, b: {diff: diffB}}
-    )).toEqual({a: null, b: [2]});
+    expect(
+      diff({a: [1]}, {b: [2]}, {a: {diff: diffA}, b: {diff: diffB}}),
+    ).toEqual({a: null, b: [2]});
     expect(diffA).not.toBeCalled();
     expect(diffB).not.toBeCalled();
   });
 
   it('should do deep diffs of Objects by default', () => {
-    expect(diff(
-      {a: [1], b: {k: [3, 4]}, c: {k: [4, 4]} },
-      {a: [2], b: {k: [3, 4]}, c: {k: [4, 5]} },
-      {a: true, b: true, c: true}
-    )).toEqual({a: [2], c: {k: [4, 5]}});
+    expect(
+      diff(
+        {a: [1], b: {k: [3, 4]}, c: {k: [4, 4]}},
+        {a: [2], b: {k: [3, 4]}, c: {k: [4, 5]}},
+        {a: true, b: true, c: true},
+      ),
+    ).toEqual({a: [2], c: {k: [4, 5]}});
   });
 
   it('should work with undefined styles', () => {
-    expect(diff(
-      { style: { a: '#ffffff', b: 1 } },
-      { style: undefined },
-      { style: { b: true } }
-    )).toEqual({ b: null });
-    expect(diff(
-      { style: undefined },
-      { style: { a: '#ffffff', b: 1 } },
-      { style: { b: true } }
-    )).toEqual({ b: 1 });
-    expect(diff(
-      { style: undefined },
-      { style: undefined },
-      { style: { b: true } }
-    )).toEqual(null);
+    expect(
+      diff(
+        {style: {a: '#ffffff', b: 1}},
+        {style: undefined},
+        {style: {b: true}},
+      ),
+    ).toEqual({b: null});
+    expect(
+      diff(
+        {style: undefined},
+        {style: {a: '#ffffff', b: 1}},
+        {style: {b: true}},
+      ),
+    ).toEqual({b: 1});
+    expect(
+      diff({style: undefined}, {style: undefined}, {style: {b: true}}),
+    ).toEqual(null);
   });
 
   it('should work with empty styles', () => {
-    expect(diff(
-      {a: 1, c: 3},
-      {},
-      {a: true, b: true}
-    )).toEqual({a: null});
-    expect(diff(
-      {},
-      {a: 1, c: 3},
-      {a: true, b: true}
-    )).toEqual({a: 1});
-    expect(diff(
-      {},
-      {},
-      {a: true, b: true}
-    )).toEqual(null);
+    expect(diff({a: 1, c: 3}, {}, {a: true, b: true})).toEqual({a: null});
+    expect(diff({}, {a: 1, c: 3}, {a: true, b: true})).toEqual({a: 1});
+    expect(diff({}, {}, {a: true, b: true})).toEqual(null);
   });
 
   it('should flatten nested styles and predefined styles', () => {
-    var validStyleAttribute = { someStyle: { foo: true, bar: true } };
+    var validStyleAttribute = {someStyle: {foo: true, bar: true}};
 
-    expect(diff(
-      {},
-      { someStyle: [{ foo: 1 }, { bar: 2 }]},
-      validStyleAttribute
-    )).toEqual({ foo: 1, bar: 2 });
+    expect(
+      diff({}, {someStyle: [{foo: 1}, {bar: 2}]}, validStyleAttribute),
+    ).toEqual({foo: 1, bar: 2});
 
-    expect(diff(
-      { someStyle: [{ foo: 1 }, { bar: 2 }]},
-      {},
-      validStyleAttribute
-    )).toEqual({ foo: null, bar: null });
+    expect(
+      diff({someStyle: [{foo: 1}, {bar: 2}]}, {}, validStyleAttribute),
+    ).toEqual({foo: null, bar: null});
 
     var barStyle = ReactNativePropRegistry.register({
       bar: 3,
     });
 
-    expect(diff(
-      {},
-      { someStyle: [[{ foo: 1 }, { foo: 2 }], barStyle]},
-      validStyleAttribute
-    )).toEqual({ foo: 2, bar: 3 });
+    expect(
+      diff(
+        {},
+        {someStyle: [[{foo: 1}, {foo: 2}], barStyle]},
+        validStyleAttribute,
+      ),
+    ).toEqual({foo: 2, bar: 3});
   });
 
   it('should reset a value to a previous if it is removed', () => {
-    var validStyleAttribute = { someStyle: { foo: true, bar: true } };
-
-    expect(diff(
-      { someStyle: [{ foo: 1 }, { foo: 3 }]},
-      { someStyle: [{ foo: 1 }, { bar: 2 }]},
-      validStyleAttribute
-    )).toEqual({ foo: 1, bar: 2 });
+    var validStyleAttribute = {someStyle: {foo: true, bar: true}};
+
+    expect(
+      diff(
+        {someStyle: [{foo: 1}, {foo: 3}]},
+        {someStyle: [{foo: 1}, {bar: 2}]},
+        validStyleAttribute,
+      ),
+    ).toEqual({foo: 1, bar: 2});
   });
 
   it('should not clear removed props if they are still in another slot', () => {
-    var validStyleAttribute = { someStyle: { foo: true, bar: true } };
-
-    expect(diff(
-      { someStyle: [{}, { foo: 3, bar: 2 }]},
-      { someStyle: [{ foo: 3 }, { bar: 2 }]},
-      validStyleAttribute
-    )).toEqual({ foo: 3 }); // this should ideally be null. heuristic tradeoff.
-
-    expect(diff(
-      { someStyle: [{}, { foo: 3, bar: 2 }]},
-      { someStyle: [{ foo: 1, bar: 1 }, { bar: 2 }]},
-      validStyleAttribute
-    )).toEqual({ bar: 2, foo: 1 });
+    var validStyleAttribute = {someStyle: {foo: true, bar: true}};
+
+    expect(
+      diff(
+        {someStyle: [{}, {foo: 3, bar: 2}]},
+        {someStyle: [{foo: 3}, {bar: 2}]},
+        validStyleAttribute,
+      ),
+    ).toEqual({foo: 3}); // this should ideally be null. heuristic tradeoff.
+
+    expect(
+      diff(
+        {someStyle: [{}, {foo: 3, bar: 2}]},
+        {someStyle: [{foo: 1, bar: 1}, {bar: 2}]},
+        validStyleAttribute,
+      ),
+    ).toEqual({bar: 2, foo: 1});
   });
 
   it('should clear a prop if a later style is explicit null/undefined', () => {
-    var validStyleAttribute = { someStyle: { foo: true, bar: true } };
-    expect(diff(
-      { someStyle: [{}, { foo: 3, bar: 2 }]},
-      { someStyle: [{ foo: 1 }, { bar: 2, foo: null }]},
-      validStyleAttribute
-    )).toEqual({ foo: null });
-
-    expect(diff(
-      { someStyle: [{ foo: 3 }, { foo: null, bar: 2 }]},
-      { someStyle: [{ foo: null }, { bar: 2 }]},
-      validStyleAttribute
-    )).toEqual({ foo: null });
-
-    expect(diff(
-      { someStyle: [{ foo: 1 }, { foo: null }]},
-      { someStyle: [{ foo: 2 }, { foo: null }]},
-      validStyleAttribute
-    )).toEqual({ foo: null }); // this should ideally be null. heuristic.
+    var validStyleAttribute = {someStyle: {foo: true, bar: true}};
+    expect(
+      diff(
+        {someStyle: [{}, {foo: 3, bar: 2}]},
+        {someStyle: [{foo: 1}, {bar: 2, foo: null}]},
+        validStyleAttribute,
+      ),
+    ).toEqual({foo: null});
+
+    expect(
+      diff(
+        {someStyle: [{foo: 3}, {foo: null, bar: 2}]},
+        {someStyle: [{foo: null}, {bar: 2}]},
+        validStyleAttribute,
+      ),
+    ).toEqual({foo: null});
+
+    expect(
+      diff(
+        {someStyle: [{foo: 1}, {foo: null}]},
+        {someStyle: [{foo: 2}, {foo: null}]},
+        validStyleAttribute,
+      ),
+    ).toEqual({foo: null}); // this should ideally be null. heuristic.
 
     // Test the same case with object equality because an early bailout doesn't
     // work in this case.
-    var fooObj = { foo: 3 };
-    expect(diff(
-      { someStyle: [{ foo: 1 }, fooObj]},
-      { someStyle: [{ foo: 2 }, fooObj]},
-      validStyleAttribute
-    )).toEqual({ foo: 3 }); // this should ideally be null. heuristic.
-
-    expect(diff(
-      { someStyle: [{ foo: 1 }, { foo: 3 }]},
-      { someStyle: [{ foo: 2 }, { foo: undefined }]},
-      validStyleAttribute
-    )).toEqual({ foo: null }); // this should ideally be null. heuristic.
+    var fooObj = {foo: 3};
+    expect(
+      diff(
+        {someStyle: [{foo: 1}, fooObj]},
+        {someStyle: [{foo: 2}, fooObj]},
+        validStyleAttribute,
+      ),
+    ).toEqual({foo: 3}); // this should ideally be null. heuristic.
+
+    expect(
+      diff(
+        {someStyle: [{foo: 1}, {foo: 3}]},
+        {someStyle: [{foo: 2}, {foo: undefined}]},
+        validStyleAttribute,
+      ),
+    ).toEqual({foo: null}); // this should ideally be null. heuristic.
   });
 
   // Function properties are just markers to native that events should be sent.
   it('should convert functions to booleans', () => {
     // Note that if the property changes from one function to another, we don't
     // need to send an update.
-    expect(diff(
-      {
-        a: function() {
-          return 1;
+    expect(
+      diff(
+        {
+          a: function() {
+            return 1;
+          },
+          b: function() {
+            return 2;
+          },
+          c: 3,
         },
-        b: function() {
-          return 2;
+        {
+          b: function() {
+            return 9;
+          },
+          c: function() {
+            return 3;
+          },
         },
-        c: 3,
-      },
-      {
-        b: function() {
-          return 9;
-        },
-        c: function() {
-          return 3;
-        },
-      },
-      {a: true, b: true, c: true}
-    )).toEqual({a: null, c: true});
+        {a: true, b: true, c: true},
+      ),
+    ).toEqual({a: null, c: true});
   });
-
 });
diff --git a/Libraries/Renderer/src/renderers/native/__tests__/ReactNativeEvents-test.js b/Libraries/Renderer/src/renderers/native/__tests__/ReactNativeEvents-test.js
index 5204b5ab8e701a..783f4bab164c57 100644
--- a/Libraries/Renderer/src/renderers/native/__tests__/ReactNativeEvents-test.js
+++ b/Libraries/Renderer/src/renderers/native/__tests__/ReactNativeEvents-test.js
@@ -13,7 +13,6 @@
 
 var RCTEventEmitter;
 var React;
-var ReactErrorUtils;
 var ReactNative;
 var ResponderEventPlugin;
 var UIManager;
@@ -23,24 +22,18 @@ beforeEach(() => {
   jest.resetModules();
 
   RCTEventEmitter = require('RCTEventEmitter');
-  React = require('React');
-  ReactErrorUtils = require('ReactErrorUtils');
+  React = require('react');
   ReactNative = require('ReactNative');
   ResponderEventPlugin = require('ResponderEventPlugin');
   UIManager = require('UIManager');
   createReactNativeComponentClass = require('createReactNativeComponentClass');
-
-  // Ensure errors from event callbacks are properly surfaced (otherwise,
-  // jest/jsdom swallows them when we do the .dispatchEvent call)
-  ReactErrorUtils.invokeGuardedCallback =
-    ReactErrorUtils.invokeGuardedCallbackWithCatch;
 });
 
 it('handles events', () => {
   expect(RCTEventEmitter.register.mock.calls.length).toBe(1);
   var EventEmitter = RCTEventEmitter.register.mock.calls[0][0];
   var View = createReactNativeComponentClass({
-    validAttributes: { foo: true },
+    validAttributes: {foo: true},
     uiViewClassName: 'View',
   });
 
@@ -60,7 +53,7 @@ it('handles events', () => {
         onTouchStart={() => log.push('inner touchstart')}
       />
     </View>,
-    1
+    1,
   );
 
   expect(UIManager.createView.mock.calls.length).toBe(2);
@@ -68,18 +61,18 @@ it('handles events', () => {
   // Don't depend on the order of createView() calls.
   // Stack creates views outside-in; fiber creates them inside-out.
   var innerTag = UIManager.createView.mock.calls.find(
-    args => args[3].foo === 'inner'
+    args => args[3].foo === 'inner',
   )[0];
 
   EventEmitter.receiveTouches(
     'topTouchStart',
     [{target: innerTag, identifier: 17}],
-    [0]
+    [0],
   );
   EventEmitter.receiveTouches(
     'topTouchEnd',
     [{target: innerTag, identifier: 17}],
-    [0]
+    [0],
   );
 
   expect(log).toEqual([
@@ -94,16 +87,103 @@ it('handles events', () => {
   ]);
 });
 
+it('handles events on text nodes', () => {
+  expect(RCTEventEmitter.register.mock.calls.length).toBe(1);
+  var EventEmitter = RCTEventEmitter.register.mock.calls[0][0];
+
+  var Text = createReactNativeComponentClass({
+    validAttributes: {foo: true},
+    uiViewClassName: 'Text',
+  });
+
+  class ContextHack extends React.Component {
+    static childContextTypes = {isInAParentText: React.PropTypes.bool};
+    getChildContext() {
+      return {isInAParentText: true};
+    }
+    render() {
+      return this.props.children;
+    }
+  }
+
+  var log = [];
+  ReactNative.render(
+    <ContextHack>
+      <Text>
+        <Text
+          onTouchEnd={() => log.push('string touchend')}
+          onTouchEndCapture={() => log.push('string touchend capture')}
+          onTouchStart={() => log.push('string touchstart')}
+          onTouchStartCapture={() => log.push('string touchstart capture')}>
+          Text Content
+        </Text>
+        <Text
+          onTouchEnd={() => log.push('number touchend')}
+          onTouchEndCapture={() => log.push('number touchend capture')}
+          onTouchStart={() => log.push('number touchstart')}
+          onTouchStartCapture={() => log.push('number touchstart capture')}>
+          {123}
+        </Text>
+      </Text>
+    </ContextHack>,
+    1,
+  );
+
+  expect(UIManager.createView.mock.calls.length).toBe(5);
+
+  // Don't depend on the order of createView() calls.
+  // Stack creates views outside-in; fiber creates them inside-out.
+  var innerTagString = UIManager.createView.mock.calls.find(
+    args => args[3] && args[3].text === 'Text Content',
+  )[0];
+  var innerTagNumber = UIManager.createView.mock.calls.find(
+    args => args[3] && args[3].text === '123',
+  )[0];
+
+  EventEmitter.receiveTouches(
+    'topTouchStart',
+    [{target: innerTagString, identifier: 17}],
+    [0],
+  );
+  EventEmitter.receiveTouches(
+    'topTouchEnd',
+    [{target: innerTagString, identifier: 17}],
+    [0],
+  );
+
+  EventEmitter.receiveTouches(
+    'topTouchStart',
+    [{target: innerTagNumber, identifier: 18}],
+    [0],
+  );
+  EventEmitter.receiveTouches(
+    'topTouchEnd',
+    [{target: innerTagNumber, identifier: 18}],
+    [0],
+  );
+
+  expect(log).toEqual([
+    'string touchstart capture',
+    'string touchstart',
+    'string touchend capture',
+    'string touchend',
+    'number touchstart capture',
+    'number touchstart',
+    'number touchend capture',
+    'number touchend',
+  ]);
+});
+
 it('handles when a responder is unmounted while a touch sequence is in progress', () => {
   var EventEmitter = RCTEventEmitter.register.mock.calls[0][0];
   var View = createReactNativeComponentClass({
-    validAttributes: { id: true },
+    validAttributes: {id: true},
     uiViewClassName: 'View',
   });
 
   function getViewById(id) {
     return UIManager.createView.mock.calls.find(
-      args => args[3] && args[3].id === id
+      args => args[3] && args[3].id === id,
     )[0];
   }
 
@@ -138,13 +218,13 @@ it('handles when a responder is unmounted while a touch sequence is in progress'
         />
       </View>
     </View>,
-    1
+    1,
   );
 
   EventEmitter.receiveTouches(
     'topTouchStart',
     [{target: getViewById('one'), identifier: 17}],
-    [0]
+    [0],
   );
 
   expect(getResponderId()).toBe('one');
@@ -162,7 +242,7 @@ it('handles when a responder is unmounted while a touch sequence is in progress'
         />
       </View>
     </View>,
-    1
+    1,
   );
 
   // TODO Verify the onResponderEnd listener has been called (before the unmount)
@@ -172,7 +252,7 @@ it('handles when a responder is unmounted while a touch sequence is in progress'
   EventEmitter.receiveTouches(
     'topTouchEnd',
     [{target: getViewById('two'), identifier: 17}],
-    [0]
+    [0],
   );
 
   expect(getResponderId()).toBeNull();
@@ -181,7 +261,7 @@ it('handles when a responder is unmounted while a touch sequence is in progress'
   EventEmitter.receiveTouches(
     'topTouchStart',
     [{target: getViewById('two'), identifier: 17}],
-    [0]
+    [0],
   );
 
   expect(getResponderId()).toBe('two');
diff --git a/Libraries/Renderer/src/renderers/native/__tests__/ReactNativeMount-test.js b/Libraries/Renderer/src/renderers/native/__tests__/ReactNativeMount-test.js
index c5e3ebecabbfec..9c9bf936f88325 100644
--- a/Libraries/Renderer/src/renderers/native/__tests__/ReactNativeMount-test.js
+++ b/Libraries/Renderer/src/renderers/native/__tests__/ReactNativeMount-test.js
@@ -20,7 +20,7 @@ describe('ReactNative', () => {
   beforeEach(() => {
     jest.resetModules();
 
-    React = require('React');
+    React = require('react');
     ReactNative = require('ReactNative');
     UIManager = require('UIManager');
     createReactNativeComponentClass = require('createReactNativeComponentClass');
@@ -28,7 +28,7 @@ describe('ReactNative', () => {
 
   it('should be able to create and render a native component', () => {
     var View = createReactNativeComponentClass({
-      validAttributes: { foo: true },
+      validAttributes: {foo: true},
       uiViewClassName: 'View',
     });
 
@@ -41,7 +41,7 @@ describe('ReactNative', () => {
 
   it('should be able to create and update a native component', () => {
     var View = createReactNativeComponentClass({
-      validAttributes: { foo: true },
+      validAttributes: {foo: true},
       uiViewClassName: 'View',
     });
 
@@ -57,28 +57,27 @@ describe('ReactNative', () => {
     expect(UIManager.createView.mock.calls.length).toBe(1);
     expect(UIManager.setChildren.mock.calls.length).toBe(1);
     expect(UIManager.manageChildren).not.toBeCalled();
-    expect(UIManager.updateView).toBeCalledWith(2, 'View', { foo: 'bar' });
+    expect(UIManager.updateView).toBeCalledWith(2, 'View', {foo: 'bar'});
   });
 
   it('returns the correct instance and calls it in the callback', () => {
     var View = createReactNativeComponentClass({
-      validAttributes: { foo: true },
+      validAttributes: {foo: true},
       uiViewClassName: 'View',
     });
 
     var a;
     var b;
     var c = ReactNative.render(
-      <View foo="foo" ref={(v) => a = v} />,
+      <View foo="foo" ref={v => a = v} />,
       11,
       function() {
         b = this;
-      }
+      },
     );
 
     expect(a).toBeTruthy();
     expect(a).toBe(b);
     expect(a).toBe(c);
   });
-
 });
diff --git a/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass.js b/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass.js
index 3549c750fbeebe..f21632582854c1 100644
--- a/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass.js
+++ b/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass.js
@@ -28,7 +28,7 @@ type ReactNativeBaseComponentViewConfig = {
  * @private
  */
 const createReactNativeFiberComponentClass = function(
-  viewConfig: ReactNativeBaseComponentViewConfig
+  viewConfig: ReactNativeBaseComponentViewConfig,
 ): string {
   return ReactNativeViewConfigRegistry.register(viewConfig);
 };
@@ -38,7 +38,7 @@ const createReactNativeFiberComponentClass = function(
  * @private
  */
 const createReactNativeComponentClass = function(
-  viewConfig: ReactNativeBaseComponentViewConfig
+  viewConfig: ReactNativeBaseComponentViewConfig,
 ): ReactClass<any> {
   const Constructor = function(element) {
     this._currentElement = element;
diff --git a/Libraries/Renderer/src/renderers/native/findNodeHandle.js b/Libraries/Renderer/src/renderers/native/findNodeHandle.js
index 2230ee37b45ac0..68ec7e503da84b 100644
--- a/Libraries/Renderer/src/renderers/native/findNodeHandle.js
+++ b/Libraries/Renderer/src/renderers/native/findNodeHandle.js
@@ -18,7 +18,7 @@ var ReactInstanceMap = require('ReactInstanceMap');
 var invariant = require('fbjs/lib/invariant');
 var warning = require('fbjs/lib/warning');
 
-import type { ReactInstance } from 'ReactInstanceType';
+import type {ReactInstance} from 'ReactInstanceType';
 
 /**
  * ReactNative vs ReactWeb
@@ -64,11 +64,11 @@ function findNodeHandle(componentOrHandle: any): any {
       warning(
         owner._warnedAboutRefsInRender,
         '%s is accessing findNodeHandle inside its render(). ' +
-        'render() should be a pure function of props and state. It should ' +
-        'never access something that requires stale data from the previous ' +
-        'render, such as refs. Move this logic to componentDidMount and ' +
-        'componentDidUpdate instead.',
-        owner.getName() || 'A component'
+          'render() should be a pure function of props and state. It should ' +
+          'never access something that requires stale data from the previous ' +
+          'render, such as refs. Move this logic to componentDidMount and ' +
+          'componentDidUpdate instead.',
+        owner.getName() || 'A component',
       );
 
       owner._warnedAboutRefsInRender = true;
@@ -95,27 +95,21 @@ function findNodeHandle(componentOrHandle: any): any {
       return rootNodeID;
     } else {
       invariant(
-        (
-          // Native
-          typeof component === 'object' &&
-          (
-            '_rootNodeID' in component || // TODO (bvaughn) Clean up once Stack is deprecated
-            '_nativeTag' in component
-          )
-        ) || (
+        // Native
+        (typeof component === 'object' &&
+          ('_rootNodeID' in component || // TODO (bvaughn) Clean up once Stack is deprecated
+            '_nativeTag' in component)) ||
           // Composite
-          component.render != null &&
-          typeof component.render === 'function'
-        ),
+          (component.render != null && typeof component.render === 'function'),
         'findNodeHandle(...): Argument is not a component ' +
-        '(type: %s, keys: %s)',
+          '(type: %s, keys: %s)',
         typeof component,
-        Object.keys(component)
+        Object.keys(component),
       );
       invariant(
         false,
         'findNodeHandle(...): Unable to find node handle for unmounted ' +
-        'component.'
+          'component.',
       );
     }
   }
diff --git a/Libraries/Renderer/src/renderers/noop/ReactNoop.js b/Libraries/Renderer/src/renderers/noop/ReactNoop.js
index efb616651e772f..b0f990548b05b0 100644
--- a/Libraries/Renderer/src/renderers/noop/ReactNoop.js
+++ b/Libraries/Renderer/src/renderers/noop/ReactNoop.js
@@ -149,6 +149,10 @@ var NoopRenderer = ReactFiberReconciler({
     parentInstance.children.splice(index, 1);
   },
 
+  shouldDeprioritizeSubtree(type: string, props: Props): boolean {
+    return false;
+  },
+
   scheduleAnimationCallback(callback) {
     if (scheduledAnimationCallback) {
       throw new Error(
diff --git a/Libraries/Renderer/src/renderers/shared/ReactDebugTool.js b/Libraries/Renderer/src/renderers/shared/ReactDebugTool.js
index 6a3781f947ed63..b5ad9efeb9e1b7 100644
--- a/Libraries/Renderer/src/renderers/shared/ReactDebugTool.js
+++ b/Libraries/Renderer/src/renderers/shared/ReactDebugTool.js
@@ -20,22 +20,22 @@ var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');
 var performanceNow = require('fbjs/lib/performanceNow');
 var warning = require('fbjs/lib/warning');
 
-import type { ReactElement } from 'ReactElementType';
-import type { DebugID } from 'ReactInstanceType';
-import type { Operation } from 'ReactHostOperationHistoryHook';
+import type {ReactElement} from 'ReactElementType';
+import type {DebugID} from 'ReactInstanceType';
+import type {Operation} from 'ReactHostOperationHistoryHook';
 
 type Hook = any;
 
 type TimerType =
-  'ctor' |
-  'render' |
-  'componentWillMount' |
-  'componentWillUnmount' |
-  'componentWillReceiveProps' |
-  'shouldComponentUpdate' |
-  'componentWillUpdate' |
-  'componentDidUpdate' |
-  'componentDidMount';
+  | 'ctor'
+  | 'render'
+  | 'componentWillMount'
+  | 'componentWillUnmount'
+  | 'componentWillReceiveProps'
+  | 'shouldComponentUpdate'
+  | 'componentWillUpdate'
+  | 'componentDidUpdate'
+  | 'componentDidMount';
 
 type Measurement = {
   timerType: TimerType,
@@ -51,7 +51,7 @@ type TreeSnapshot = {
     childIDs: Array<DebugID>,
     ownerID: DebugID,
     parentID: DebugID,
-  }
+  },
 };
 
 type HistoryItem = {
@@ -78,7 +78,7 @@ if (__DEV__) {
         didHookThrowForEvent[event],
         'Exception thrown by hook while handling %s: %s',
         event,
-        e + '\n' + e.stack
+        e + '\n' + e.stack,
       );
       didHookThrowForEvent[event] = true;
     }
@@ -113,22 +113,25 @@ if (__DEV__) {
   };
 
   const getTreeSnapshot = function(registeredIDs) {
-    return registeredIDs.reduce((tree, id) => {
-      var ownerID = ReactComponentTreeHook.getOwnerID(id);
-      var parentID = ReactComponentTreeHook.getParentID(id);
-      tree[id] = {
-        displayName: ReactComponentTreeHook.getDisplayName(id),
-        text: ReactComponentTreeHook.getText(id),
-        updateCount: ReactComponentTreeHook.getUpdateCount(id),
-        childIDs: ReactComponentTreeHook.getChildIDs(id),
-        // Text nodes don't have owners but this is close enough.
-        ownerID: ownerID ||
-          parentID && ReactComponentTreeHook.getOwnerID(parentID) ||
-          0,
-        parentID,
-      };
-      return tree;
-    }, {});
+    return registeredIDs.reduce(
+      (tree, id) => {
+        var ownerID = ReactComponentTreeHook.getOwnerID(id);
+        var parentID = ReactComponentTreeHook.getParentID(id);
+        tree[id] = {
+          displayName: ReactComponentTreeHook.getDisplayName(id),
+          text: ReactComponentTreeHook.getText(id),
+          updateCount: ReactComponentTreeHook.getUpdateCount(id),
+          childIDs: ReactComponentTreeHook.getChildIDs(id),
+          // Text nodes don't have owners but this is close enough.
+          ownerID: ownerID ||
+            (parentID && ReactComponentTreeHook.getOwnerID(parentID)) ||
+            0,
+          parentID,
+        };
+        return tree;
+      },
+      {},
+    );
   };
 
   const resetMeasurements = function() {
@@ -175,11 +178,11 @@ if (__DEV__) {
       warning(
         false,
         'There is an internal error in the React performance measurement code.' +
-        '\n\nDid not expect %s timer to start while %s timer is still in ' +
-        'progress for %s instance.',
+          '\n\nDid not expect %s timer to start while %s timer is still in ' +
+          'progress for %s instance.',
         timerType,
         currentTimerType || 'no',
-        (debugID === currentTimerDebugID) ? 'the same' : 'another'
+        debugID === currentTimerDebugID ? 'the same' : 'another',
       );
       lifeCycleTimerHasWarned = true;
     }
@@ -197,11 +200,11 @@ if (__DEV__) {
       warning(
         false,
         'There is an internal error in the React performance measurement code. ' +
-        'We did not expect %s timer to stop while %s timer is still in ' +
-        'progress for %s instance. Please report this as a bug in React.',
+          'We did not expect %s timer to stop while %s timer is still in ' +
+          'progress for %s instance. Please report this as a bug in React.',
         timerType,
         currentTimerType || 'no',
-        (debugID === currentTimerDebugID) ? 'the same' : 'another'
+        debugID === currentTimerDebugID ? 'the same' : 'another',
       );
       lifeCycleTimerHasWarned = true;
     }
@@ -209,7 +212,9 @@ if (__DEV__) {
       currentFlushMeasurements.push({
         timerType,
         instanceID: debugID,
-        duration: performanceNow() - currentTimerStartTime - currentTimerNestedFlushDuration,
+        duration: performanceNow() -
+          currentTimerStartTime -
+          currentTimerNestedFlushDuration,
       });
     }
     currentTimerStartTime = 0;
@@ -233,7 +238,12 @@ if (__DEV__) {
   };
 
   const resumeCurrentLifeCycleTimer = function() {
-    var {startTime, nestedFlushStartTime, debugID, timerType} = lifeCycleTimerStack.pop();
+    var {
+      startTime,
+      nestedFlushStartTime,
+      debugID,
+      timerType,
+    } = lifeCycleTimerStack.pop();
     var nestedFlushDuration = performanceNow() - nestedFlushStartTime;
     currentTimerStartTime = startTime;
     currentTimerNestedFlushDuration += nestedFlushDuration;
@@ -242,8 +252,7 @@ if (__DEV__) {
   };
 
   var lastMarkTimeStamp = 0;
-  var canUsePerformanceMeasure: boolean =
-    typeof performance !== 'undefined' &&
+  var canUsePerformanceMeasure: boolean = typeof performance !== 'undefined' &&
     typeof performance.mark === 'function' &&
     typeof performance.clearMarks === 'function' &&
     typeof performance.measure === 'function' &&
@@ -280,7 +289,8 @@ if (__DEV__) {
     }
 
     var markName = `${debugID}::${markType}`;
-    var displayName = ReactComponentTreeHook.getDisplayName(debugID) || 'Unknown';
+    var displayName = ReactComponentTreeHook.getDisplayName(debugID) ||
+      'Unknown';
 
     // Chrome has an issue of dropping markers recorded too fast:
     // https://bugs.chromium.org/p/chromium/issues/detail?id=640652
@@ -377,7 +387,11 @@ if (__DEV__) {
       childDebugIDs.forEach(checkDebugID);
       emitEvent('onSetChildren', debugID, childDebugIDs);
     },
-    onBeforeMountComponent(debugID: DebugID, element: ReactElement, parentDebugID: DebugID): void {
+    onBeforeMountComponent(
+      debugID: DebugID,
+      element: ReactElement,
+      parentDebugID: DebugID,
+    ): void {
       checkDebugID(debugID);
       checkDebugID(parentDebugID, true);
       emitEvent('onBeforeMountComponent', debugID, element, parentDebugID);
@@ -416,7 +430,7 @@ if (__DEV__) {
   ReactDebugTool.addHook(ReactInvalidSetStateWarningHook);
   ReactDebugTool.addHook(ReactComponentTreeHook);
   var url = (ExecutionEnvironment.canUseDOM && window.location.href) || '';
-  if ((/[?&]react_perf\b/).test(url)) {
+  if (/[?&]react_perf\b/.test(url)) {
     ReactDebugTool.beginProfiling();
   }
 }
diff --git a/Libraries/Renderer/src/renderers/shared/ReactPerf.js b/Libraries/Renderer/src/renderers/shared/ReactPerf.js
index 17620aee1ce551..f7f8984c0b5801 100644
--- a/Libraries/Renderer/src/renderers/shared/ReactPerf.js
+++ b/Libraries/Renderer/src/renderers/shared/ReactPerf.js
@@ -16,7 +16,7 @@ var ReactDebugTool = require('ReactDebugTool');
 var warning = require('fbjs/lib/warning');
 var alreadyWarned = false;
 
-import type { FlushHistory } from 'ReactDebugTool';
+import type {FlushHistory} from 'ReactDebugTool';
 
 function roundFloat(val, base = 2) {
   var n = Math.pow(10, base);
@@ -37,7 +37,7 @@ function warnInProduction() {
   if (typeof console !== 'undefined') {
     console.error(
       'ReactPerf is not supported in the production builds of React. ' +
-      'To collect measurements, please use the development build of React instead.'
+        'To collect measurements, please use the development build of React instead.',
     );
   }
 }
@@ -60,19 +60,24 @@ function getExclusive(flushHistory = getLastMeasurements()) {
   var aggregatedStats = {};
   var affectedIDs = {};
 
-  function updateAggregatedStats(treeSnapshot, instanceID, timerType, applyUpdate) {
+  function updateAggregatedStats(
+    treeSnapshot,
+    instanceID,
+    timerType,
+    applyUpdate,
+  ) {
     var {displayName} = treeSnapshot[instanceID];
     var key = displayName;
     var stats = aggregatedStats[key];
     if (!stats) {
       affectedIDs[key] = {};
-      stats = aggregatedStats[key] = {
+      stats = (aggregatedStats[key] = {
         key,
         instanceCount: 0,
         counts: {},
         durations: {},
         totalDuration: 0,
-      };
+      });
     }
     if (!stats.durations[timerType]) {
       stats.durations[timerType] = 0;
@@ -101,9 +106,7 @@ function getExclusive(flushHistory = getLastMeasurements()) {
       ...aggregatedStats[key],
       instanceCount: Object.keys(affectedIDs[key]).length,
     }))
-    .sort((a, b) =>
-      b.totalDuration - a.totalDuration
-    );
+    .sort((a, b) => b.totalDuration - a.totalDuration);
 }
 
 function getInclusive(flushHistory = getLastMeasurements()) {
@@ -122,12 +125,12 @@ function getInclusive(flushHistory = getLastMeasurements()) {
     var stats = aggregatedStats[key];
     if (!stats) {
       affectedIDs[key] = {};
-      stats = aggregatedStats[key] = {
+      stats = (aggregatedStats[key] = {
         key,
         instanceCount: 0,
         inclusiveRenderDuration: 0,
         renderCount: 0,
-      };
+      });
     }
     affectedIDs[key][instanceID] = true;
     applyUpdate(stats);
@@ -174,9 +177,7 @@ function getInclusive(flushHistory = getLastMeasurements()) {
       ...aggregatedStats[key],
       instanceCount: Object.keys(affectedIDs[key]).length,
     }))
-    .sort((a, b) =>
-      b.inclusiveRenderDuration - a.inclusiveRenderDuration
-    );
+    .sort((a, b) => b.inclusiveRenderDuration - a.inclusiveRenderDuration);
 }
 
 function getWasted(flushHistory = getLastMeasurements()) {
@@ -195,12 +196,12 @@ function getWasted(flushHistory = getLastMeasurements()) {
     var stats = aggregatedStats[key];
     if (!stats) {
       affectedIDs[key] = {};
-      stats = aggregatedStats[key] = {
+      stats = (aggregatedStats[key] = {
         key,
         instanceCount: 0,
         inclusiveRenderDuration: 0,
         renderCount: 0,
-      };
+      });
     }
     affectedIDs[key][instanceID] = true;
     applyUpdate(stats);
@@ -240,7 +241,7 @@ function getWasted(flushHistory = getLastMeasurements()) {
 
       // If there was a DOM update below this component, or it has just been
       // mounted, its render() is not considered wasted.
-      var { updateCount } = treeSnapshot[instanceID];
+      var {updateCount} = treeSnapshot[instanceID];
       if (isDefinitelyNotWastedByID[instanceID] || updateCount === 0) {
         return;
       }
@@ -254,8 +255,7 @@ function getWasted(flushHistory = getLastMeasurements()) {
       while (nextParentID) {
         // Any parents rendered during this batch are considered wasted
         // unless we previously marked them as dirty.
-        var isWasted =
-          renderedCompositeIDs[nextParentID] &&
+        var isWasted = renderedCompositeIDs[nextParentID] &&
           !isDefinitelyNotWastedByID[nextParentID];
         if (isWasted) {
           updateAggregatedStats(treeSnapshot, nextParentID, stats => {
@@ -272,9 +272,7 @@ function getWasted(flushHistory = getLastMeasurements()) {
       ...aggregatedStats[key],
       instanceCount: Object.keys(affectedIDs[key]).length,
     }))
-    .sort((a, b) =>
-      b.inclusiveRenderDuration - a.inclusiveRenderDuration
-    );
+    .sort((a, b) => b.inclusiveRenderDuration - a.inclusiveRenderDuration);
 }
 
 function getOperations(flushHistory = getLastMeasurements()) {
@@ -317,13 +315,13 @@ function printExclusive(flushHistory?: FlushHistory) {
     var renderCount = item.counts.render || 0;
     var renderDuration = item.durations.render || 0;
     return {
-      'Component': key,
+      Component: key,
       'Total time (ms)': roundFloat(totalDuration),
       'Instance count': instanceCount,
       'Total render time (ms)': roundFloat(renderDuration),
-      'Average render time (ms)': renderCount ?
-        roundFloat(renderDuration / renderCount) :
-        undefined,
+      'Average render time (ms)': renderCount
+        ? roundFloat(renderDuration / renderCount)
+        : undefined,
       'Render count': renderCount,
       'Total lifecycle time (ms)': roundFloat(totalDuration - renderDuration),
     };
@@ -378,10 +376,10 @@ function printOperations(flushHistory?: FlushHistory) {
   var stats = getOperations(flushHistory);
   var table = stats.map(stat => ({
     'Owner > Node': stat.key,
-    'Operation': stat.type,
-    'Payload': typeof stat.payload === 'object' ?
-      JSON.stringify(stat.payload) :
-      stat.payload,
+    Operation: stat.type,
+    Payload: typeof stat.payload === 'object'
+      ? JSON.stringify(stat.payload)
+      : stat.payload,
     'Flush index': stat.flushIndex,
     'Owner Component ID': stat.ownerID,
     'DOM Component ID': stat.instanceID,
@@ -394,7 +392,7 @@ function printDOM(measurements: FlushHistory) {
   warning(
     warnedAboutPrintDOM,
     '`ReactPerf.printDOM(...)` is deprecated. Use ' +
-    '`ReactPerf.printOperations(...)` instead.'
+      '`ReactPerf.printOperations(...)` instead.',
   );
   warnedAboutPrintDOM = true;
   return printOperations(measurements);
@@ -405,7 +403,7 @@ function getMeasurementsSummaryMap(measurements: FlushHistory) {
   warning(
     warnedAboutGetMeasurementsSummaryMap,
     '`ReactPerf.getMeasurementsSummaryMap(...)` is deprecated. Use ' +
-    '`ReactPerf.getWasted(...)` instead.'
+      '`ReactPerf.getWasted(...)` instead.',
   );
   warnedAboutGetMeasurementsSummaryMap = true;
   return getWasted(measurements);
diff --git a/Libraries/Renderer/src/renderers/shared/__tests__/ReactDebugTool-test.js b/Libraries/Renderer/src/renderers/shared/__tests__/ReactDebugTool-test.js
index f356127c841eaf..3082b9eab9e699 100644
--- a/Libraries/Renderer/src/renderers/shared/__tests__/ReactDebugTool-test.js
+++ b/Libraries/Renderer/src/renderers/shared/__tests__/ReactDebugTool-test.js
@@ -65,8 +65,7 @@ describe('ReactDebugTool', () => {
     ReactDebugTool.onTestEvent();
     expectDev(console.error.calls.count()).toBe(1);
     expectDev(console.error.calls.argsFor(0)[0]).toContain(
-      'Exception thrown by hook while handling ' +
-      'onTestEvent: Error: Hi.'
+      'Exception thrown by hook while handling ' + 'onTestEvent: Error: Hi.',
     );
 
     ReactDebugTool.onTestEvent();
diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactChildFiber.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactChildFiber.js
index 8fd3d22a1ba4ce..f56c80e1b9e7b4 100644
--- a/Libraries/Renderer/src/renderers/shared/fiber/ReactChildFiber.js
+++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactChildFiber.js
@@ -12,12 +12,12 @@
 
 'use strict';
 
-import type { ReactElement } from 'ReactElementType';
-import type { ReactCoroutine, ReactYield } from 'ReactCoroutine';
-import type { ReactPortal } from 'ReactPortal';
-import type { Fiber } from 'ReactFiber';
-import type { ReactInstance } from 'ReactInstanceType';
-import type { PriorityLevel } from 'ReactPriorityLevel';
+import type {ReactElement} from 'ReactElementType';
+import type {ReactCoroutine, ReactYield} from 'ReactCoroutine';
+import type {ReactPortal} from 'ReactPortal';
+import type {Fiber} from 'ReactFiber';
+import type {ReactInstance} from 'ReactInstanceType';
+import type {PriorityLevel} from 'ReactPriorityLevel';
 
 var REACT_ELEMENT_TYPE = require('ReactElementSymbol');
 var {
@@ -39,8 +39,8 @@ var ReactFeatureFlags = require('ReactFeatureFlags');
 var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');
 
 if (__DEV__) {
-  var { getCurrentFiberStackAddendum } = require('ReactDebugCurrentFiber');
-  var { getComponentName } = require('ReactFiberTreeReflection');
+  var {getCurrentFiberStackAddendum} = require('ReactDebugCurrentFiber');
+  var getComponentName = require('getComponentName');
   var warning = require('fbjs/lib/warning');
   var didWarnAboutMaps = false;
 }
@@ -77,27 +77,34 @@ function coerceRef(current: Fiber | null, element: ReactElement) {
   let mixedRef = element.ref;
   if (mixedRef !== null && typeof mixedRef !== 'function') {
     if (element._owner) {
-      const owner : ?(Fiber | ReactInstance) = (element._owner : any);
+      const owner: ?(Fiber | ReactInstance) = (element._owner: any);
       let inst;
       if (owner) {
         if (typeof owner.tag === 'number') {
-          const ownerFiber = ((owner : any) : Fiber);
-          invariant(ownerFiber.tag === ClassComponent, 'Stateless function components cannot have refs.');
+          const ownerFiber = ((owner: any): Fiber);
+          invariant(
+            ownerFiber.tag === ClassComponent,
+            'Stateless function components cannot have refs.',
+          );
           inst = ownerFiber.stateNode;
         } else {
           // Stack
-          inst = (owner : any).getPublicInstance();
+          inst = (owner: any).getPublicInstance();
         }
       }
       invariant(
         inst,
         'Missing owner for string ref %s. This error is likely caused by a ' +
-        'bug in React. Please file an issue.',
-        mixedRef
+          'bug in React. Please file an issue.',
+        mixedRef,
       );
-      const stringRef = String(mixedRef);
+      const stringRef = '' + mixedRef;
       // Check if previous string ref matches new string ref
-      if (current !== null && current.ref !== null && current.ref._stringRef === stringRef) {
+      if (
+        current !== null &&
+        current.ref !== null &&
+        current.ref._stringRef === stringRef
+      ) {
         return current.ref;
       }
       const ref = function(value) {
@@ -115,18 +122,15 @@ function coerceRef(current: Fiber | null, element: ReactElement) {
   return mixedRef;
 }
 
-function throwOnInvalidObjectType(returnFiber : Fiber, newChild : Object) {
+function throwOnInvalidObjectType(returnFiber: Fiber, newChild: Object) {
   if (returnFiber.type !== 'textarea') {
-    const childrenString = String(newChild);
     let addendum = '';
     if (__DEV__) {
-      addendum =
-        ' If you meant to render a collection of children, use an array ' +
-        'instead or wrap the object using createFragment(object) from the ' +
-        'React add-ons.';
+      addendum = ' If you meant to render a collection of children, use an array ' +
+        'instead.';
       const owner = ReactCurrentOwner.owner || returnFiber._debugOwner;
       if (owner && typeof owner.tag === 'number') {
-        const name = getComponentName((owner : any));
+        const name = getComponentName((owner: any));
         if (name) {
           addendum += '\n\nCheck the render method of `' + name + '`.';
         }
@@ -135,10 +139,10 @@ function throwOnInvalidObjectType(returnFiber : Fiber, newChild : Object) {
     invariant(
       false,
       'Objects are not valid as a React child (found: %s).%s',
-      childrenString === '[object Object]' ?
-        'object with keys {' + Object.keys(newChild).join(', ') + '}' :
-        childrenString,
-      addendum
+      Object.prototype.toString.call(newChild) === '[object Object]'
+        ? 'object with keys {' + Object.keys(newChild).join(', ') + '}'
+        : newChild,
+      addendum,
     );
   }
 }
@@ -148,11 +152,7 @@ function throwOnInvalidObjectType(returnFiber : Fiber, newChild : Object) {
 // a compiler or we can do it manually. Helpers that don't need this branching
 // live outside of this function.
 function ChildReconciler(shouldClone, shouldTrackSideEffects) {
-
-  function deleteChild(
-    returnFiber : Fiber,
-    childToDelete : Fiber
-  ) : void {
+  function deleteChild(returnFiber: Fiber, childToDelete: Fiber): void {
     if (!shouldTrackSideEffects) {
       // Noop.
       return;
@@ -172,18 +172,16 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
       last.nextEffect = childToDelete;
       returnFiber.progressedLastDeletion = childToDelete;
     } else {
-      returnFiber.progressedFirstDeletion =
-        returnFiber.progressedLastDeletion =
-          childToDelete;
+      returnFiber.progressedFirstDeletion = (returnFiber.progressedLastDeletion = childToDelete);
     }
     childToDelete.nextEffect = null;
     childToDelete.effectTag = Deletion;
   }
 
   function deleteRemainingChildren(
-    returnFiber : Fiber,
-    currentFirstChild : Fiber | null
-  ) : null {
+    returnFiber: Fiber,
+    currentFirstChild: Fiber | null,
+  ): null {
     if (!shouldTrackSideEffects) {
       // Noop.
       return null;
@@ -200,13 +198,13 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
   }
 
   function mapRemainingChildren(
-    returnFiber : Fiber,
-    currentFirstChild : Fiber
-  ) : Map<string | number, Fiber> {
+    returnFiber: Fiber,
+    currentFirstChild: Fiber,
+  ): Map<string | number, Fiber> {
     // Add the remaining children to a temporary map so that we can find them by
     // keys quickly. Implicit (null) keys get added to this set with their index
     // instead.
-    const existingChildren : Map<string | number, Fiber> = new Map();
+    const existingChildren: Map<string | number, Fiber> = new Map();
 
     let existingChild = currentFirstChild;
     while (existingChild !== null) {
@@ -220,7 +218,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
     return existingChildren;
   }
 
-  function useFiber(fiber : Fiber, priority : PriorityLevel) : Fiber {
+  function useFiber(fiber: Fiber, priority: PriorityLevel): Fiber {
     // We currently set sibling to null and index to 0 here because it is easy
     // to forget to do before returning it. E.g. for the single child case.
     if (shouldClone) {
@@ -240,7 +238,11 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
     }
   }
 
-  function placeChild(newFiber : Fiber, lastPlacedIndex : number, newIndex : number) : number {
+  function placeChild(
+    newFiber: Fiber,
+    lastPlacedIndex: number,
+    newIndex: number,
+  ): number {
     newFiber.index = newIndex;
     if (!shouldTrackSideEffects) {
       // Noop.
@@ -264,7 +266,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
     }
   }
 
-  function placeSingleChild(newFiber : Fiber) : Fiber {
+  function placeSingleChild(newFiber: Fiber): Fiber {
     // This is simpler for the single child case. We only need to do a
     // placement for inserting new children.
     if (shouldTrackSideEffects && newFiber.alternate === null) {
@@ -274,10 +276,10 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
   }
 
   function updateTextNode(
-    returnFiber : Fiber,
-    current : Fiber | null,
-    textContent : string,
-    priority : PriorityLevel
+    returnFiber: Fiber,
+    current: Fiber | null,
+    textContent: string,
+    priority: PriorityLevel,
   ) {
     if (current === null || current.tag !== HostText) {
       // Insert
@@ -294,11 +296,11 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
   }
 
   function updateElement(
-    returnFiber : Fiber,
-    current : Fiber | null,
-    element : ReactElement,
-    priority : PriorityLevel
-  ) : Fiber {
+    returnFiber: Fiber,
+    current: Fiber | null,
+    element: ReactElement,
+    priority: PriorityLevel,
+  ): Fiber {
     if (current === null || current.type !== element.type) {
       // Insert
       const created = createFiberFromElement(element, priority);
@@ -320,11 +322,11 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
   }
 
   function updateCoroutine(
-    returnFiber : Fiber,
-    current : Fiber | null,
-    coroutine : ReactCoroutine,
-    priority : PriorityLevel
-  ) : Fiber {
+    returnFiber: Fiber,
+    current: Fiber | null,
+    coroutine: ReactCoroutine,
+    priority: PriorityLevel,
+  ): Fiber {
     // TODO: Should this also compare handler to determine whether to reuse?
     if (current === null || current.tag !== CoroutineComponent) {
       // Insert
@@ -341,11 +343,11 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
   }
 
   function updateYield(
-    returnFiber : Fiber,
-    current : Fiber | null,
-    yieldNode : ReactYield,
-    priority : PriorityLevel
-  ) : Fiber {
+    returnFiber: Fiber,
+    current: Fiber | null,
+    yieldNode: ReactYield,
+    priority: PriorityLevel,
+  ): Fiber {
     if (current === null || current.tag !== YieldComponent) {
       // Insert
       const created = createFiberFromYield(yieldNode, priority);
@@ -362,11 +364,11 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
   }
 
   function updatePortal(
-    returnFiber : Fiber,
-    current : Fiber | null,
-    portal : ReactPortal,
-    priority : PriorityLevel
-  ) : Fiber {
+    returnFiber: Fiber,
+    current: Fiber | null,
+    portal: ReactPortal,
+    priority: PriorityLevel,
+  ): Fiber {
     if (
       current === null ||
       current.tag !== HostPortal ||
@@ -387,11 +389,11 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
   }
 
   function updateFragment(
-    returnFiber : Fiber,
-    current : Fiber | null,
-    fragment : Iterable<*>,
-    priority : PriorityLevel
-  ) : Fiber {
+    returnFiber: Fiber,
+    current: Fiber | null,
+    fragment: Iterable<*>,
+    priority: PriorityLevel,
+  ): Fiber {
     if (current === null || current.tag !== Fragment) {
       // Insert
       const created = createFiberFromFragment(fragment, priority);
@@ -407,10 +409,10 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
   }
 
   function createChild(
-    returnFiber : Fiber,
-    newChild : any,
-    priority : PriorityLevel
-  ) : Fiber | null {
+    returnFiber: Fiber,
+    newChild: any,
+    priority: PriorityLevel,
+  ): Fiber | null {
     if (typeof newChild === 'string' || typeof newChild === 'number') {
       // Text nodes doesn't have keys. If the previous node is implicitly keyed
       // we can continue to replace it without aborting even if it is not a text
@@ -462,11 +464,11 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
   }
 
   function updateSlot(
-    returnFiber : Fiber,
-    oldFiber : Fiber | null,
-    newChild : any,
-    priority : PriorityLevel
-  ) : Fiber | null {
+    returnFiber: Fiber,
+    oldFiber: Fiber | null,
+    newChild: any,
+    priority: PriorityLevel,
+  ): Fiber | null {
     // Update the fiber if the keys match, otherwise return null.
 
     const key = oldFiber !== null ? oldFiber.key : null;
@@ -535,13 +537,12 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
   }
 
   function updateFromMap(
-    existingChildren : Map<string | number, Fiber>,
-    returnFiber : Fiber,
-    newIdx : number,
-    newChild : any,
-    priority : PriorityLevel
-  ) : Fiber | null {
-
+    existingChildren: Map<string | number, Fiber>,
+    returnFiber: Fiber,
+    newIdx: number,
+    newChild: any,
+    priority: PriorityLevel,
+  ): Fiber | null {
     if (typeof newChild === 'string' || typeof newChild === 'number') {
       // Text nodes doesn't have keys, so we neither have to check the old nor
       // new node for the key. If both are text nodes, they match.
@@ -553,14 +554,14 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
       switch (newChild.$$typeof) {
         case REACT_ELEMENT_TYPE: {
           const matchedFiber = existingChildren.get(
-            newChild.key === null ? newIdx : newChild.key
+            newChild.key === null ? newIdx : newChild.key,
           ) || null;
           return updateElement(returnFiber, matchedFiber, newChild, priority);
         }
 
         case REACT_COROUTINE_TYPE: {
           const matchedFiber = existingChildren.get(
-            newChild.key === null ? newIdx : newChild.key
+            newChild.key === null ? newIdx : newChild.key,
           ) || null;
           return updateCoroutine(returnFiber, matchedFiber, newChild, priority);
         }
@@ -574,7 +575,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
 
         case REACT_PORTAL_TYPE: {
           const matchedFiber = existingChildren.get(
-            newChild.key === null ? newIdx : newChild.key
+            newChild.key === null ? newIdx : newChild.key,
           ) || null;
           return updatePortal(returnFiber, matchedFiber, newChild, priority);
         }
@@ -592,9 +593,9 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
   }
 
   function warnOnDuplicateKey(
-    child : mixed,
-    knownKeys : Set<string> | null
-  ) : Set<string> | null {
+    child: mixed,
+    knownKeys: Set<string> | null,
+  ): Set<string> | null {
     if (__DEV__) {
       if (typeof child !== 'object' || child === null) {
         return knownKeys;
@@ -619,10 +620,10 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
           warning(
             false,
             'Encountered two children with the same key, ' +
-            '`%s`. Child keys must be unique; when two children share a key, ' +
-            'only the first child will be used.%s',
+              '`%s`. Child keys must be unique; when two children share a key, ' +
+              'only the first child will be used.%s',
             key,
-            getCurrentFiberStackAddendum()
+            getCurrentFiberStackAddendum(),
           );
           break;
         default:
@@ -633,11 +634,11 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
   }
 
   function reconcileChildrenArray(
-    returnFiber : Fiber,
-    currentFirstChild : Fiber | null,
-    newChildren : Array<*>,
-    priority : PriorityLevel) : Fiber | null {
-
+    returnFiber: Fiber,
+    currentFirstChild: Fiber | null,
+    newChildren: Array<*>,
+    priority: PriorityLevel,
+  ): Fiber | null {
     // This algorithm can't optimize by searching from boths ends since we
     // don't have backpointers on fibers. I'm trying to see how far we can get
     // with that model. If it ends up not being worth the tradeoffs, we can
@@ -666,8 +667,8 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
       }
     }
 
-    let resultingFirstChild : Fiber | null = null;
-    let previousNewFiber : Fiber | null = null;
+    let resultingFirstChild: Fiber | null = null;
+    let previousNewFiber: Fiber | null = null;
 
     let oldFiber = currentFirstChild;
     let lastPlacedIndex = 0;
@@ -684,7 +685,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
         returnFiber,
         oldFiber,
         newChildren[newIdx],
-        priority
+        priority,
       );
       if (newFiber === null) {
         // TODO: This breaks on empty slots like null children. That's
@@ -731,7 +732,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
         const newFiber = createChild(
           returnFiber,
           newChildren[newIdx],
-          priority
+          priority,
         );
         if (!newFiber) {
           continue;
@@ -758,7 +759,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
         returnFiber,
         newIdx,
         newChildren[newIdx],
-        priority
+        priority,
       );
       if (newFiber) {
         if (shouldTrackSideEffects) {
@@ -768,7 +769,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
             // it from the child list so that we don't add it to the deletion
             // list.
             existingChildren.delete(
-              newFiber.key === null ? newIdx : newFiber.key
+              newFiber.key === null ? newIdx : newFiber.key,
             );
           }
         }
@@ -792,11 +793,11 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
   }
 
   function reconcileChildrenIterator(
-    returnFiber : Fiber,
-    currentFirstChild : Fiber | null,
-    newChildrenIterable : Iterable<*>,
-    priority : PriorityLevel) : Fiber | null {
-
+    returnFiber: Fiber,
+    currentFirstChild: Fiber | null,
+    newChildrenIterable: Iterable<*>,
+    priority: PriorityLevel,
+  ): Fiber | null {
     // This is the same implementation as reconcileChildrenArray(),
     // but using the iterator instead.
 
@@ -804,28 +805,30 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
     invariant(
       typeof iteratorFn === 'function',
       'An object is not an iterable. This error is likely caused by a bug in ' +
-      'React. Please file an issue.'
+        'React. Please file an issue.',
     );
 
     if (__DEV__) {
       // Warn about using Maps as children
       if (typeof newChildrenIterable.entries === 'function') {
-        const possibleMap = (newChildrenIterable : any);
+        const possibleMap = (newChildrenIterable: any);
         if (possibleMap.entries === iteratorFn) {
           let mapsAsChildrenAddendum = '';
           const owner = ReactCurrentOwner.owner || returnFiber._debugOwner;
           if (owner && typeof owner.tag === 'number') {
-            const mapsAsChildrenOwnerName = getComponentName((owner : any));
+            const mapsAsChildrenOwnerName = getComponentName((owner: any));
             if (mapsAsChildrenOwnerName) {
-              mapsAsChildrenAddendum = '\n\nCheck the render method of `' + mapsAsChildrenOwnerName + '`.';
+              mapsAsChildrenAddendum = '\n\nCheck the render method of `' +
+                mapsAsChildrenOwnerName +
+                '`.';
             }
           }
           warning(
             didWarnAboutMaps,
             'Using Maps as children is unsupported and will likely yield ' +
-            'unexpected results. Convert it to a sequence/iterable of keyed ' +
-            'ReactElements instead.%s',
-            mapsAsChildrenAddendum
+              'unexpected results. Convert it to a sequence/iterable of keyed ' +
+              'ReactElements instead.%s',
+            mapsAsChildrenAddendum,
           );
           didWarnAboutMaps = true;
         }
@@ -845,13 +848,10 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
     }
 
     const newChildren = iteratorFn.call(newChildrenIterable);
-    invariant(
-      newChildren != null,
-      'An iterable object provided no iterator.',
-    );
+    invariant(newChildren != null, 'An iterable object provided no iterator.');
 
-    let resultingFirstChild : Fiber | null = null;
-    let previousNewFiber : Fiber | null = null;
+    let resultingFirstChild: Fiber | null = null;
+    let previousNewFiber: Fiber | null = null;
 
     let oldFiber = currentFirstChild;
     let lastPlacedIndex = 0;
@@ -859,19 +859,18 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
     let nextOldFiber = null;
 
     let step = newChildren.next();
-    for (; oldFiber !== null && !step.done; newIdx++, step = newChildren.next()) {
+    for (
+      ;
+      oldFiber !== null && !step.done;
+      newIdx++, (step = newChildren.next())
+    ) {
       if (oldFiber.index > newIdx) {
         nextOldFiber = oldFiber;
         oldFiber = null;
       } else {
         nextOldFiber = oldFiber.sibling;
       }
-      const newFiber = updateSlot(
-        returnFiber,
-        oldFiber,
-        step.value,
-        priority
-      );
+      const newFiber = updateSlot(returnFiber, oldFiber, step.value, priority);
       if (newFiber === null) {
         // TODO: This breaks on empty slots like null children. That's
         // unfortunate because it triggers the slow path all the time. We need
@@ -913,12 +912,8 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
     if (oldFiber === null) {
       // If we don't have any more existing children we can choose a fast path
       // since the rest will all be insertions.
-      for (; !step.done; newIdx++, step = newChildren.next()) {
-        const newFiber = createChild(
-          returnFiber,
-          step.value,
-          priority
-        );
+      for (; !step.done; newIdx++, (step = newChildren.next())) {
+        const newFiber = createChild(returnFiber, step.value, priority);
         if (newFiber === null) {
           continue;
         }
@@ -938,13 +933,13 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
     const existingChildren = mapRemainingChildren(returnFiber, oldFiber);
 
     // Keep scanning and use the map to restore deleted items as moves.
-    for (; !step.done; newIdx++, step = newChildren.next()) {
+    for (; !step.done; newIdx++, (step = newChildren.next())) {
       const newFiber = updateFromMap(
         existingChildren,
         returnFiber,
         newIdx,
         step.value,
-        priority
+        priority,
       );
       if (newFiber !== null) {
         if (shouldTrackSideEffects) {
@@ -954,7 +949,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
             // it from the child list so that we don't add it to the deletion
             // list.
             existingChildren.delete(
-              newFiber.key === null ? newIdx : newFiber.key
+              newFiber.key === null ? newIdx : newFiber.key,
             );
           }
         }
@@ -978,11 +973,11 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
   }
 
   function reconcileSingleTextNode(
-    returnFiber : Fiber,
-    currentFirstChild : Fiber | null,
-    textContent : string,
-    priority : PriorityLevel
-  ) : Fiber {
+    returnFiber: Fiber,
+    currentFirstChild: Fiber | null,
+    textContent: string,
+    priority: PriorityLevel,
+  ): Fiber {
     // There's no need to check for keys on text nodes since we don't have a
     // way to define them.
     if (currentFirstChild !== null && currentFirstChild.tag === HostText) {
@@ -1003,11 +998,11 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
   }
 
   function reconcileSingleElement(
-    returnFiber : Fiber,
-    currentFirstChild : Fiber | null,
-    element : ReactElement,
-    priority : PriorityLevel
-  ) : Fiber {
+    returnFiber: Fiber,
+    currentFirstChild: Fiber | null,
+    element: ReactElement,
+    priority: PriorityLevel,
+  ): Fiber {
     const key = element.key;
     let child = currentFirstChild;
     while (child !== null) {
@@ -1042,11 +1037,11 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
   }
 
   function reconcileSingleCoroutine(
-    returnFiber : Fiber,
-    currentFirstChild : Fiber | null,
-    coroutine : ReactCoroutine,
-    priority : PriorityLevel
-  ) : Fiber {
+    returnFiber: Fiber,
+    currentFirstChild: Fiber | null,
+    coroutine: ReactCoroutine,
+    priority: PriorityLevel,
+  ): Fiber {
     const key = coroutine.key;
     let child = currentFirstChild;
     while (child !== null) {
@@ -1075,11 +1070,11 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
   }
 
   function reconcileSingleYield(
-    returnFiber : Fiber,
-    currentFirstChild : Fiber | null,
-    yieldNode : ReactYield,
-    priority : PriorityLevel
-  ) : Fiber {
+    returnFiber: Fiber,
+    currentFirstChild: Fiber | null,
+    yieldNode: ReactYield,
+    priority: PriorityLevel,
+  ): Fiber {
     // There's no need to check for keys on yields since they're stateless.
     let child = currentFirstChild;
     if (child !== null) {
@@ -1101,11 +1096,11 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
   }
 
   function reconcileSinglePortal(
-    returnFiber : Fiber,
-    currentFirstChild : Fiber | null,
-    portal : ReactPortal,
-    priority : PriorityLevel
-  ) : Fiber {
+    returnFiber: Fiber,
+    currentFirstChild: Fiber | null,
+    portal: ReactPortal,
+    priority: PriorityLevel,
+  ): Fiber {
     const key = portal.key;
     let child = currentFirstChild;
     while (child !== null) {
@@ -1141,11 +1136,11 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
   // itself. They will be added to the side-effect list as we pass through the
   // children and the parent.
   function reconcileChildFibers(
-    returnFiber : Fiber,
-    currentFirstChild : Fiber | null,
-    newChild : any,
-    priority : PriorityLevel
-  ) : Fiber | null {
+    returnFiber: Fiber,
+    currentFirstChild: Fiber | null,
+    newChild: any,
+    priority: PriorityLevel,
+  ): Fiber | null {
     // This function is not recursive.
     // If the top level item is an array, we treat it as a set of children,
     // not as a fragment. Nested arrays on the other hand will be treated as
@@ -1161,54 +1156,66 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
       if (disableNewFiberFeatures) {
         switch (newChild.$$typeof) {
           case REACT_ELEMENT_TYPE:
-            return placeSingleChild(reconcileSingleElement(
-              returnFiber,
-              currentFirstChild,
-              newChild,
-              priority
-            ));
+            return placeSingleChild(
+              reconcileSingleElement(
+                returnFiber,
+                currentFirstChild,
+                newChild,
+                priority,
+              ),
+            );
 
           case REACT_PORTAL_TYPE:
-            return placeSingleChild(reconcileSinglePortal(
-              returnFiber,
-              currentFirstChild,
-              newChild,
-              priority
-            ));
+            return placeSingleChild(
+              reconcileSinglePortal(
+                returnFiber,
+                currentFirstChild,
+                newChild,
+                priority,
+              ),
+            );
         }
       } else {
         switch (newChild.$$typeof) {
           case REACT_ELEMENT_TYPE:
-            return placeSingleChild(reconcileSingleElement(
-              returnFiber,
-              currentFirstChild,
-              newChild,
-              priority
-            ));
+            return placeSingleChild(
+              reconcileSingleElement(
+                returnFiber,
+                currentFirstChild,
+                newChild,
+                priority,
+              ),
+            );
 
           case REACT_COROUTINE_TYPE:
-            return placeSingleChild(reconcileSingleCoroutine(
-              returnFiber,
-              currentFirstChild,
-              newChild,
-              priority
-            ));
+            return placeSingleChild(
+              reconcileSingleCoroutine(
+                returnFiber,
+                currentFirstChild,
+                newChild,
+                priority,
+              ),
+            );
 
           case REACT_YIELD_TYPE:
-            return placeSingleChild(reconcileSingleYield(
-              returnFiber,
-              currentFirstChild,
-              newChild,
-              priority
-            ));
+            return placeSingleChild(
+              reconcileSingleYield(
+                returnFiber,
+                currentFirstChild,
+                newChild,
+                priority,
+              ),
+            );
 
           case REACT_PORTAL_TYPE:
-            return placeSingleChild(reconcileSinglePortal(
-              returnFiber,
-              currentFirstChild,
-              newChild,
-              priority
-            ));
+            return placeSingleChild(
+              reconcileSinglePortal(
+                returnFiber,
+                currentFirstChild,
+                newChild,
+                priority,
+              ),
+            );
         }
       }
     }
@@ -1220,7 +1227,9 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
         case ClassComponent: {
           if (__DEV__) {
             const instance = returnFiber.stateNode;
-            if (instance.render._isMockFunction && typeof newChild === 'undefined') {
+            if (
+              instance.render._isMockFunction && typeof newChild === 'undefined'
+            ) {
               // We allow auto-mocks to proceed as if they're
               // returning null.
               break;
@@ -1230,8 +1239,8 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
           invariant(
             newChild === null || newChild === false,
             '%s.render(): A valid React element (or null) must be returned. ' +
-            'You may have returned undefined, an array or some other ' +
-            'invalid object.',
+              'You may have returned undefined, an array or some other ' +
+              'invalid object.',
             Component.displayName || Component.name || 'Component',
           );
           break;
@@ -1242,8 +1251,8 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
           invariant(
             newChild === null || newChild === false,
             '%s(...): A valid React element (or null) must be returned. ' +
-            'You may have returned undefined, an array or some other ' +
-            'invalid object.',
+              'You may have returned undefined, an array or some other ' +
+              'invalid object.',
             Component.displayName || Component.name || 'Component',
           );
           break;
@@ -1252,12 +1261,14 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
     }
 
     if (typeof newChild === 'string' || typeof newChild === 'number') {
-      return placeSingleChild(reconcileSingleTextNode(
-        returnFiber,
-        currentFirstChild,
-        '' + newChild,
-        priority
-      ));
+      return placeSingleChild(
+        reconcileSingleTextNode(
+          returnFiber,
+          currentFirstChild,
+          '' + newChild,
+          priority,
+        ),
+      );
     }
 
     if (isArray(newChild)) {
@@ -1265,7 +1276,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
         returnFiber,
         currentFirstChild,
         newChild,
-        priority
+        priority,
       );
     }
 
@@ -1274,7 +1285,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
         returnFiber,
         currentFirstChild,
         newChild,
-        priority
+        priority,
       );
     }
 
@@ -1304,9 +1315,9 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
           invariant(
             false,
             '%s(...): Nothing was returned from render. This usually means a ' +
-            'return statement is missing. Or, to render nothing, ' +
-            'return null.',
-            Component.displayName || Component.name || 'Component'
+              'return statement is missing. Or, to render nothing, ' +
+              'return null.',
+            Component.displayName || Component.name || 'Component',
           );
         }
       }
@@ -1325,7 +1336,10 @@ exports.reconcileChildFibersInPlace = ChildReconciler(false, true);
 
 exports.mountChildFibersInPlace = ChildReconciler(false, false);
 
-exports.cloneChildFibers = function(current : Fiber | null, workInProgress : Fiber) : void {
+exports.cloneChildFibers = function(
+  current: Fiber | null,
+  workInProgress: Fiber,
+): void {
   if (!workInProgress.child) {
     return;
   }
@@ -1347,22 +1361,22 @@ exports.cloneChildFibers = function(current : Fiber | null, workInProgress : Fib
     newChild.return = workInProgress;
     while (currentChild.sibling !== null) {
       currentChild = currentChild.sibling;
-      newChild = newChild.sibling = cloneFiber(
+      newChild = (newChild.sibling = cloneFiber(
         currentChild,
-        currentChild.pendingWorkPriority
-      );
+        currentChild.pendingWorkPriority,
+      ));
       newChild.return = workInProgress;
     }
     newChild.sibling = null;
-  }
-
-  // If there is no alternate, then we don't need to clone the children.
-  // If the children of the alternate fiber is a different set, then we don't
-  // need to clone. We need to reset the return fiber though since we'll
-  // traverse down into them.
-  let child = workInProgress.child;
-  while (child !== null) {
-    child.return = workInProgress;
-    child = child.sibling;
+  } else {
+    // If there is no alternate, then we don't need to clone the children.
+    // If the children of the alternate fiber is a different set, then we don't
+    // need to clone. We need to reset the return fiber though since we'll
+    // traverse down into them.
+    let child = workInProgress.child;
+    while (child !== null) {
+      child.return = workInProgress;
+      child = child.sibling;
+    }
   }
 };
diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactDebugCurrentFiber.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactDebugCurrentFiber.js
index 538d830687bf71..8e6f9c727c66be 100644
--- a/Libraries/Renderer/src/renderers/shared/fiber/ReactDebugCurrentFiber.js
+++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactDebugCurrentFiber.js
@@ -12,14 +12,18 @@
 
 'use strict';
 
-import type { Fiber } from 'ReactFiber';
+import type {Fiber} from 'ReactFiber';
+
+type LifeCyclePhase = 'render' | 'getChildContext';
 
 if (__DEV__) {
   var getComponentName = require('getComponentName');
-  var { getStackAddendumByWorkInProgressFiber } = require('react/lib/ReactComponentTreeHook');
+  var {
+    getStackAddendumByWorkInProgressFiber,
+  } = require('ReactFiberComponentTreeHook');
 }
 
-function getCurrentFiberOwnerName() : string | null {
+function getCurrentFiberOwnerName(): string | null {
   if (__DEV__) {
     const fiber = ReactDebugCurrentFiber.current;
     if (fiber === null) {
@@ -32,7 +36,7 @@ function getCurrentFiberOwnerName() : string | null {
   return null;
 }
 
-function getCurrentFiberStackAddendum() : string | null {
+function getCurrentFiberStackAddendum(): string | null {
   if (__DEV__) {
     const fiber = ReactDebugCurrentFiber.current;
     if (fiber === null) {
@@ -46,7 +50,9 @@ function getCurrentFiberStackAddendum() : string | null {
 }
 
 var ReactDebugCurrentFiber = {
-  current: (null : Fiber | null),
+  current: (null: Fiber | null),
+  phase: (null: LifeCyclePhase | null),
+
   getCurrentFiberOwnerName,
   getCurrentFiberStackAddendum,
 };
diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactDebugFiberPerf.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactDebugFiberPerf.js
new file mode 100644
index 00000000000000..331430cf3a500e
--- /dev/null
+++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactDebugFiberPerf.js
@@ -0,0 +1,400 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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 ReactDebugFiberPerf
+ * @flow
+ */
+
+import type {Fiber} from 'ReactFiber';
+
+type MeasurementPhase =
+  | 'componentWillMount'
+  | 'componentWillUnmount'
+  | 'componentWillReceiveProps'
+  | 'shouldComponentUpdate'
+  | 'componentWillUpdate'
+  | 'componentDidUpdate'
+  | 'componentDidMount'
+  | 'getChildContext';
+
+// Trust the developer to only use this with a __DEV__ check
+let ReactDebugFiberPerf = ((null: any): typeof ReactDebugFiberPerf);
+
+if (__DEV__) {
+  const {
+    HostRoot,
+    HostComponent,
+    HostText,
+    HostPortal,
+    YieldComponent,
+    Fragment,
+  } = require('ReactTypeOfWork');
+
+  const getComponentName = require('getComponentName');
+
+  // Prefix measurements so that it's possible to filter them.
+  // Longer prefixes are hard to read in DevTools.
+  const reactEmoji = '\u269B';
+  const warningEmoji = '\u26D4';
+  const supportsUserTiming = typeof performance !== 'undefined' &&
+    typeof performance.mark === 'function' &&
+    typeof performance.clearMarks === 'function' &&
+    typeof performance.measure === 'function' &&
+    typeof performance.clearMeasures === 'function';
+
+  // Keep track of current fiber so that we know the path to unwind on pause.
+  // TODO: this looks the same as nextUnitOfWork in scheduler. Can we unify them?
+  let currentFiber: Fiber | null = null;
+  // If we're in the middle of user code, which fiber and method is it?
+  // Reusing `currentFiber` would be confusing for this because user code fiber
+  // can change during commit phase too, but we don't need to unwind it (since
+  // lifecycles in the commit phase don't resemble a tree).
+  let currentPhase: MeasurementPhase | null = null;
+  let currentPhaseFiber: Fiber | null = null;
+  // Did lifecycle hook schedule an update? This is often a performance problem,
+  // so we will keep track of it, and include it in the report.
+  // Track commits caused by cascading updates.
+  let isCommitting: boolean = false;
+  let hasScheduledUpdateInCurrentCommit: boolean = false;
+  let hasScheduledUpdateInCurrentPhase: boolean = false;
+  let commitCountInCurrentWorkLoop: number = 0;
+  let effectCountInCurrentCommit: number = 0;
+  // During commits, we only show a measurement once per method name
+  // to avoid stretch the commit phase with measurement overhead.
+  const labelsInCurrentCommit: Set<string> = new Set();
+
+  const formatMarkName = (markName: string) => {
+    return `${reactEmoji} ${markName}`;
+  };
+
+  const formatLabel = (label: string, warning: string | null) => {
+    const prefix = warning ? `${warningEmoji} ` : `${reactEmoji} `;
+    const suffix = warning ? ` Warning: ${warning}` : '';
+    return `${prefix}${label}${suffix}`;
+  };
+
+  const beginMark = (markName: string) => {
+    performance.mark(formatMarkName(markName));
+  };
+
+  const clearMark = (markName: string) => {
+    performance.clearMarks(formatMarkName(markName));
+  };
+
+  const endMark = (label: string, markName: string, warning: string | null) => {
+    const formattedMarkName = formatMarkName(markName);
+    const formattedLabel = formatLabel(label, warning);
+    try {
+      performance.measure(formattedLabel, formattedMarkName);
+    } catch (err) {
+      // If previous mark was missing for some reason, this will throw.
+      // This could only happen if React crashed in an unexpected place earlier.
+      // Don't pile on with more errors.
+    }
+    // Clear marks immediately to avoid growing buffer.
+    performance.clearMarks(formattedMarkName);
+    performance.clearMeasures(formattedLabel);
+  };
+
+  const getFiberMarkName = (label: string, debugID: number) => {
+    return `${label} (#${debugID})`;
+  };
+
+  const getFiberLabel = (
+    componentName: string,
+    isMounted: boolean,
+    phase: MeasurementPhase | null,
+  ) => {
+    if (phase === null) {
+      // These are composite component total time measurements.
+      return `${componentName} [${isMounted ? 'update' : 'mount'}]`;
+    } else {
+      // Composite component methods.
+      return `${componentName}.${phase}`;
+    }
+  };
+
+  const beginFiberMark = (
+    fiber: Fiber,
+    phase: MeasurementPhase | null,
+  ): boolean => {
+    const componentName = getComponentName(fiber) || 'Unknown';
+    const debugID = ((fiber._debugID: any): number);
+    const isMounted = fiber.alternate !== null;
+    const label = getFiberLabel(componentName, isMounted, phase);
+
+    if (isCommitting && labelsInCurrentCommit.has(label)) {
+      // During the commit phase, we don't show duplicate labels because
+      // there is a fixed overhead for every measurement, and we don't
+      // want to stretch the commit phase beyond necessary.
+      return false;
+    }
+    labelsInCurrentCommit.add(label);
+
+    const markName = getFiberMarkName(label, debugID);
+    beginMark(markName);
+    return true;
+  };
+
+  const clearFiberMark = (fiber: Fiber, phase: MeasurementPhase | null) => {
+    const componentName = getComponentName(fiber) || 'Unknown';
+    const debugID = ((fiber._debugID: any): number);
+    const isMounted = fiber.alternate !== null;
+    const label = getFiberLabel(componentName, isMounted, phase);
+    const markName = getFiberMarkName(label, debugID);
+    clearMark(markName);
+  };
+
+  const endFiberMark = (
+    fiber: Fiber,
+    phase: MeasurementPhase | null,
+    warning: string | null,
+  ) => {
+    const componentName = getComponentName(fiber) || 'Unknown';
+    const debugID = ((fiber._debugID: any): number);
+    const isMounted = fiber.alternate !== null;
+    const label = getFiberLabel(componentName, isMounted, phase);
+    const markName = getFiberMarkName(label, debugID);
+    endMark(label, markName, warning);
+  };
+
+  const shouldIgnoreFiber = (fiber: Fiber): boolean => {
+    // Host components should be skipped in the timeline.
+    // We could check typeof fiber.type, but does this work with RN?
+    switch (fiber.tag) {
+      case HostRoot:
+      case HostComponent:
+      case HostText:
+      case HostPortal:
+      case YieldComponent:
+      case Fragment:
+        return true;
+      default:
+        return false;
+    }
+  };
+
+  const clearPendingPhaseMeasurement = () => {
+    if (currentPhase !== null && currentPhaseFiber !== null) {
+      clearFiberMark(currentPhaseFiber, currentPhase);
+    }
+    currentPhaseFiber = null;
+    currentPhase = null;
+    hasScheduledUpdateInCurrentPhase = false;
+  };
+
+  const pauseTimers = () => {
+    // Stops all currently active measurements so that they can be resumed
+    // if we continue in a later deferred loop from the same unit of work.
+    let fiber = currentFiber;
+    while (fiber) {
+      if (fiber._debugIsCurrentlyTiming) {
+        endFiberMark(fiber, null, null);
+      }
+      fiber = fiber.return;
+    }
+  };
+
+  const resumeTimersRecursively = (fiber: Fiber) => {
+    if (fiber.return !== null) {
+      resumeTimersRecursively(fiber.return);
+    }
+    if (fiber._debugIsCurrentlyTiming) {
+      beginFiberMark(fiber, null);
+    }
+  };
+
+  const resumeTimers = () => {
+    // Resumes all measurements that were active during the last deferred loop.
+    if (currentFiber !== null) {
+      resumeTimersRecursively(currentFiber);
+    }
+  };
+
+  ReactDebugFiberPerf = {
+    recordEffect(): void {
+      effectCountInCurrentCommit++;
+    },
+
+    recordScheduleUpdate(): void {
+      if (isCommitting) {
+        hasScheduledUpdateInCurrentCommit = true;
+      }
+      if (
+        currentPhase !== null &&
+        currentPhase !== 'componentWillMount' &&
+        currentPhase !== 'componentWillReceiveProps'
+      ) {
+        hasScheduledUpdateInCurrentPhase = true;
+      }
+    },
+
+    startWorkTimer(fiber: Fiber): void {
+      if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
+        return;
+      }
+      // If we pause, this is the fiber to unwind from.
+      currentFiber = fiber;
+      if (!beginFiberMark(fiber, null)) {
+        return;
+      }
+      fiber._debugIsCurrentlyTiming = true;
+    },
+
+    cancelWorkTimer(fiber: Fiber): void {
+      if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
+        return;
+      }
+      // Remember we shouldn't complete measurement for this fiber.
+      // Otherwise flamechart will be deep even for small updates.
+      fiber._debugIsCurrentlyTiming = false;
+      clearFiberMark(fiber, null);
+    },
+
+    stopWorkTimer(fiber: Fiber): void {
+      if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
+        return;
+      }
+      // If we pause, its parent is the fiber to unwind from.
+      currentFiber = fiber.return;
+      if (!fiber._debugIsCurrentlyTiming) {
+        return;
+      }
+      fiber._debugIsCurrentlyTiming = false;
+      endFiberMark(fiber, null, null);
+    },
+
+    startPhaseTimer(fiber: Fiber, phase: MeasurementPhase): void {
+      if (!supportsUserTiming) {
+        return;
+      }
+      clearPendingPhaseMeasurement();
+      if (!beginFiberMark(fiber, phase)) {
+        return;
+      }
+      currentPhaseFiber = fiber;
+      currentPhase = phase;
+    },
+
+    stopPhaseTimer(): void {
+      if (!supportsUserTiming) {
+        return;
+      }
+      if (currentPhase !== null && currentPhaseFiber !== null) {
+        const warning = hasScheduledUpdateInCurrentPhase
+          ? 'Scheduled a cascading update'
+          : null;
+        endFiberMark(currentPhaseFiber, currentPhase, warning);
+      }
+      currentPhase = null;
+      currentPhaseFiber = null;
+    },
+
+    startWorkLoopTimer(): void {
+      if (!supportsUserTiming) {
+        return;
+      }
+      commitCountInCurrentWorkLoop = 0;
+      // This is top level call.
+      // Any other measurements are performed within.
+      beginMark('(React Tree Reconciliation)');
+      // Resume any measurements that were in progress during the last loop.
+      resumeTimers();
+    },
+
+    stopWorkLoopTimer(): void {
+      if (!supportsUserTiming) {
+        return;
+      }
+      const warning = commitCountInCurrentWorkLoop > 1
+        ? 'There were cascading updates'
+        : null;
+      commitCountInCurrentWorkLoop = 0;
+      // Pause any measurements until the next loop.
+      pauseTimers();
+      endMark(
+        '(React Tree Reconciliation)',
+        '(React Tree Reconciliation)',
+        warning,
+      );
+    },
+
+    startCommitTimer(): void {
+      if (!supportsUserTiming) {
+        return;
+      }
+      isCommitting = true;
+      hasScheduledUpdateInCurrentCommit = false;
+      labelsInCurrentCommit.clear();
+      beginMark('(Committing Changes)');
+    },
+
+    stopCommitTimer(): void {
+      if (!supportsUserTiming) {
+        return;
+      }
+
+      let warning = null;
+      if (hasScheduledUpdateInCurrentCommit) {
+        warning = 'Lifecycle hook scheduled a cascading update';
+      } else if (commitCountInCurrentWorkLoop > 0) {
+        warning = 'Caused by a cascading update in earlier commit';
+      }
+      hasScheduledUpdateInCurrentCommit = false;
+      commitCountInCurrentWorkLoop++;
+      isCommitting = false;
+      labelsInCurrentCommit.clear();
+
+      endMark('(Committing Changes)', '(Committing Changes)', warning);
+    },
+
+    startCommitHostEffectsTimer(): void {
+      if (!supportsUserTiming) {
+        return;
+      }
+      effectCountInCurrentCommit = 0;
+      beginMark('(Committing Host Effects)');
+    },
+
+    stopCommitHostEffectsTimer(): void {
+      if (!supportsUserTiming) {
+        return;
+      }
+      const count = effectCountInCurrentCommit;
+      effectCountInCurrentCommit = 0;
+      endMark(
+        `(Committing Host Effects: ${count} Total)`,
+        '(Committing Host Effects)',
+        null,
+      );
+    },
+
+    startCommitLifeCyclesTimer(): void {
+      if (!supportsUserTiming) {
+        return;
+      }
+      effectCountInCurrentCommit = 0;
+      beginMark('(Calling Lifecycle Methods)');
+    },
+
+    stopCommitLifeCyclesTimer(): void {
+      if (!supportsUserTiming) {
+        return;
+      }
+      const count = effectCountInCurrentCommit;
+      effectCountInCurrentCommit = 0;
+      endMark(
+        `(Calling Lifecycle Methods: ${count} Total)`,
+        '(Calling Lifecycle Methods)',
+        null,
+      );
+    },
+  };
+}
+
+module.exports = ReactDebugFiberPerf;
diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiber.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiber.js
index bd89a93f82c37f..faf8f95d37047a 100644
--- a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiber.js
+++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiber.js
@@ -12,15 +12,15 @@
 
 'use strict';
 
-import type { ReactElement, Source } from 'ReactElementType';
-import type { ReactInstance, DebugID } from 'ReactInstanceType';
-import type { ReactFragment } from 'ReactTypes';
-import type { ReactCoroutine, ReactYield } from 'ReactCoroutine';
-import type { ReactPortal } from 'ReactPortal';
-import type { TypeOfWork } from 'ReactTypeOfWork';
-import type { TypeOfSideEffect } from 'ReactTypeOfSideEffect';
-import type { PriorityLevel } from 'ReactPriorityLevel';
-import type { UpdateQueue } from 'ReactFiberUpdateQueue';
+import type {ReactElement, Source} from 'ReactElementType';
+import type {ReactInstance, DebugID} from 'ReactInstanceType';
+import type {ReactFragment} from 'ReactTypes';
+import type {ReactCoroutine, ReactYield} from 'ReactCoroutine';
+import type {ReactPortal} from 'ReactPortal';
+import type {TypeOfWork} from 'ReactTypeOfWork';
+import type {TypeOfSideEffect} from 'ReactTypeOfSideEffect';
+import type {PriorityLevel} from 'ReactPriorityLevel';
+import type {UpdateQueue} from 'ReactFiberUpdateQueue';
 
 var ReactTypeOfWork = require('ReactTypeOfWork');
 var {
@@ -57,9 +57,10 @@ if (__DEV__) {
 // be more than one per component.
 export type Fiber = {
   // __DEV__ only
-  _debugID ?: DebugID,
-  _debugSource ?: Source | null,
-  _debugOwner ?: Fiber | ReactInstance | null, // Stack compatible
+  _debugID?: DebugID,
+  _debugSource?: Source | null,
+  _debugOwner?: Fiber | ReactInstance | null, // Stack compatible
+  _debugIsCurrentlyTiming?: boolean,
 
   // These first fields are conceptually members of an Instance. This used to
   // be split into a separate type and intersected with the other Fiber fields,
@@ -102,7 +103,7 @@ export type Fiber = {
 
   // The ref last used to attach this node.
   // I'll avoid adding an owner field for prod and model that as functions.
-  ref: null | (((handle : mixed) => void) & { _stringRef: ?string }),
+  ref: null | (((handle: mixed) => void) & {_stringRef: ?string}),
 
   // Input is the data coming into process this fiber. Arguments. Props.
   pendingProps: any, // This type will be more specific once we overload the tag.
@@ -156,7 +157,6 @@ export type Fiber = {
   // Conceptual aliases
   // workInProgress : Fiber ->  alternate The alternate used for reuse happens
   // to be the same as work in progress.
-
 };
 
 if (__DEV__) {
@@ -176,9 +176,8 @@ if (__DEV__) {
 //    to optimize in a non-JIT environment.
 // 5) It should be easy to port this to a C struct and keep a C implementation
 //    compatible.
-var createFiber = function(tag : TypeOfWork, key : null | string) : Fiber {
-  var fiber : Fiber = {
-
+var createFiber = function(tag: TypeOfWork, key: null | string): Fiber {
+  var fiber: Fiber = {
     // Instance
 
     tag: tag,
@@ -216,19 +215,18 @@ var createFiber = function(tag : TypeOfWork, key : null | string) : Fiber {
     progressedLastDeletion: null,
 
     alternate: null,
-
   };
 
   if (__DEV__) {
     fiber._debugID = debugCounter++;
     fiber._debugSource = null;
     fiber._debugOwner = null;
+    fiber._debugIsCurrentlyTiming = false;
     if (typeof Object.preventExtensions === 'function') {
       Object.preventExtensions(fiber);
     }
   }
 
-
   return fiber;
 };
 
@@ -238,7 +236,10 @@ function shouldConstruct(Component) {
 
 // This is used to create an alternate fiber to do work on.
 // TODO: Rename to createWorkInProgressFiber or something like that.
-exports.cloneFiber = function(fiber : Fiber, priorityLevel : PriorityLevel) : Fiber {
+exports.cloneFiber = function(
+  fiber: Fiber,
+  priorityLevel: PriorityLevel,
+): Fiber {
   // We clone to get a work in progress. That means that this fiber is the
   // current. To make it safe to reuse that fiber later on as work in progress
   // we need to reset its work in progress flag now. We don't have an
@@ -296,12 +297,15 @@ exports.cloneFiber = function(fiber : Fiber, priorityLevel : PriorityLevel) : Fi
   return alt;
 };
 
-exports.createHostRootFiber = function() : Fiber {
+exports.createHostRootFiber = function(): Fiber {
   const fiber = createFiber(HostRoot, null);
   return fiber;
 };
 
-exports.createFiberFromElement = function(element : ReactElement, priorityLevel : PriorityLevel) : Fiber {
+exports.createFiberFromElement = function(
+  element: ReactElement,
+  priorityLevel: PriorityLevel,
+): Fiber {
   let owner = null;
   if (__DEV__) {
     owner = element._owner;
@@ -319,7 +323,10 @@ exports.createFiberFromElement = function(element : ReactElement, priorityLevel
   return fiber;
 };
 
-exports.createFiberFromFragment = function(elements : ReactFragment, priorityLevel : PriorityLevel) : Fiber {
+exports.createFiberFromFragment = function(
+  elements: ReactFragment,
+  priorityLevel: PriorityLevel,
+): Fiber {
   // TODO: Consider supporting keyed fragments. Technically, we accidentally
   // support that in the existing React.
   const fiber = createFiber(Fragment, null);
@@ -328,7 +335,10 @@ exports.createFiberFromFragment = function(elements : ReactFragment, priorityLev
   return fiber;
 };
 
-exports.createFiberFromText = function(content : string, priorityLevel : PriorityLevel) : Fiber {
+exports.createFiberFromText = function(
+  content: string,
+  priorityLevel: PriorityLevel,
+): Fiber {
   const fiber = createFiber(HostText, null);
   fiber.pendingProps = content;
   fiber.pendingWorkPriority = priorityLevel;
@@ -336,23 +346,21 @@ exports.createFiberFromText = function(content : string, priorityLevel : Priorit
 };
 
 function createFiberFromElementType(
-  type : mixed,
-  key : null | string,
-  debugOwner : null | Fiber | ReactInstance
-) : Fiber {
+  type: mixed,
+  key: null | string,
+  debugOwner: null | Fiber | ReactInstance,
+): Fiber {
   let fiber;
   if (typeof type === 'function') {
-    fiber = shouldConstruct(type) ?
-      createFiber(ClassComponent, key) :
-      createFiber(IndeterminateComponent, key);
+    fiber = shouldConstruct(type)
+      ? createFiber(ClassComponent, key)
+      : createFiber(IndeterminateComponent, key);
     fiber.type = type;
   } else if (typeof type === 'string') {
     fiber = createFiber(HostComponent, key);
     fiber.type = type;
   } else if (
-    typeof type === 'object' &&
-    type !== null &&
-    typeof type.tag === 'number'
+    typeof type === 'object' && type !== null && typeof type.tag === 'number'
   ) {
     // Currently assumed to be a continuation and therefore is a fiber already.
     // TODO: The yield system is currently broken for updates in some cases.
@@ -360,19 +368,18 @@ function createFiberFromElementType(
     // the current or a workInProgress? When the continuation gets rendered here
     // we don't know if we can reuse that fiber or if we need to clone it.
     // There is probably a clever way to restructure this.
-    fiber = ((type : any) : Fiber);
+    fiber = ((type: any): Fiber);
   } else {
     let info = '';
     if (__DEV__) {
       if (
         type === undefined ||
-        typeof type === 'object' &&
-        type !== null &&
-        Object.keys(type).length === 0
+        (typeof type === 'object' &&
+          type !== null &&
+          Object.keys(type).length === 0)
       ) {
-        info +=
-          ' You likely forgot to export your component from the file ' +
-          'it\'s defined in.';
+        info += ' You likely forgot to export your component from the file ' +
+          "it's defined in.";
       }
       const ownerName = debugOwner ? getComponentName(debugOwner) : null;
       if (ownerName) {
@@ -382,7 +389,7 @@ function createFiberFromElementType(
     invariant(
       false,
       'Element type is invalid: expected a string (for built-in components) ' +
-      'or a class/function (for composite components) but got: %s.%s',
+        'or a class/function (for composite components) but got: %s.%s',
       type == null ? type : typeof type,
       info,
     );
@@ -392,7 +399,10 @@ function createFiberFromElementType(
 
 exports.createFiberFromElementType = createFiberFromElementType;
 
-exports.createFiberFromCoroutine = function(coroutine : ReactCoroutine, priorityLevel : PriorityLevel) : Fiber {
+exports.createFiberFromCoroutine = function(
+  coroutine: ReactCoroutine,
+  priorityLevel: PriorityLevel,
+): Fiber {
   const fiber = createFiber(CoroutineComponent, coroutine.key);
   fiber.type = coroutine.handler;
   fiber.pendingProps = coroutine;
@@ -400,12 +410,18 @@ exports.createFiberFromCoroutine = function(coroutine : ReactCoroutine, priority
   return fiber;
 };
 
-exports.createFiberFromYield = function(yieldNode : ReactYield, priorityLevel : PriorityLevel) : Fiber {
+exports.createFiberFromYield = function(
+  yieldNode: ReactYield,
+  priorityLevel: PriorityLevel,
+): Fiber {
   const fiber = createFiber(YieldComponent, null);
   return fiber;
 };
 
-exports.createFiberFromPortal = function(portal : ReactPortal, priorityLevel : PriorityLevel) : Fiber {
+exports.createFiberFromPortal = function(
+  portal: ReactPortal,
+  priorityLevel: PriorityLevel,
+): Fiber {
   const fiber = createFiber(HostPortal, portal.key);
   fiber.pendingProps = portal.children || [];
   fiber.pendingWorkPriority = priorityLevel;
diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberBeginWork.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberBeginWork.js
index b9db783ae855a0..ad58d044613f23 100644
--- a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberBeginWork.js
+++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberBeginWork.js
@@ -12,12 +12,12 @@
 
 'use strict';
 
-import type { ReactCoroutine } from 'ReactCoroutine';
-import type { Fiber } from 'ReactFiber';
-import type { HostContext } from 'ReactFiberHostContext';
-import type { FiberRoot } from 'ReactFiberRoot';
-import type { HostConfig } from 'ReactFiberReconciler';
-import type { PriorityLevel } from 'ReactPriorityLevel';
+import type {ReactCoroutine} from 'ReactCoroutine';
+import type {Fiber} from 'ReactFiber';
+import type {HostContext} from 'ReactFiberHostContext';
+import type {FiberRoot} from 'ReactFiberRoot';
+import type {HostConfig} from 'ReactFiberReconciler';
+import type {PriorityLevel} from 'ReactPriorityLevel';
 
 var {
   mountChildFibersInPlace,
@@ -66,18 +66,23 @@ var invariant = require('fbjs/lib/invariant');
 
 if (__DEV__) {
   var ReactDebugCurrentFiber = require('ReactDebugCurrentFiber');
+  var {cancelWorkTimer} = require('ReactDebugFiberPerf');
   var warning = require('fbjs/lib/warning');
+
   var warnedAboutStatelessRefs = {};
 }
 
 module.exports = function<T, P, I, TI, PI, C, CX, PL>(
-  config : HostConfig<T, P, I, TI, PI, C, CX, PL>,
-  hostContext : HostContext<C, CX>,
-  scheduleUpdate : (fiber : Fiber, priorityLevel : PriorityLevel) => void,
-  getPriorityContext : () => PriorityLevel,
+  config: HostConfig<T, P, I, TI, PI, C, CX, PL>,
+  hostContext: HostContext<C, CX>,
+  scheduleUpdate: (fiber: Fiber, priorityLevel: PriorityLevel) => void,
+  getPriorityContext: () => PriorityLevel,
 ) {
-
-  const { shouldSetTextContent } = config;
+  const {
+    shouldSetTextContent,
+    useSyncScheduling,
+    shouldDeprioritizeSubtree,
+  } = config;
 
   const {
     pushHostContext,
@@ -110,9 +115,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
   }
 
   function clearDeletions(workInProgress) {
-    workInProgress.progressedFirstDeletion =
-      workInProgress.progressedLastDeletion =
-        null;
+    workInProgress.progressedFirstDeletion = (workInProgress.progressedLastDeletion = null);
   }
 
   function transferDeletions(workInProgress) {
@@ -123,10 +126,20 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
 
   function reconcileChildren(current, workInProgress, nextChildren) {
     const priorityLevel = workInProgress.pendingWorkPriority;
-    reconcileChildrenAtPriority(current, workInProgress, nextChildren, priorityLevel);
+    reconcileChildrenAtPriority(
+      current,
+      workInProgress,
+      nextChildren,
+      priorityLevel,
+    );
   }
 
-  function reconcileChildrenAtPriority(current, workInProgress, nextChildren, priorityLevel) {
+  function reconcileChildrenAtPriority(
+    current,
+    workInProgress,
+    nextChildren,
+    priorityLevel,
+  ) {
     // At this point any memoization is no longer valid since we'll have changed
     // the children.
     workInProgress.memoizedProps = null;
@@ -139,7 +152,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
         workInProgress,
         workInProgress.child,
         nextChildren,
-        priorityLevel
+        priorityLevel,
       );
     } else if (current.child === workInProgress.child) {
       // If the current child is the same as the work in progress, it means that
@@ -154,7 +167,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
         workInProgress,
         workInProgress.child,
         nextChildren,
-        priorityLevel
+        priorityLevel,
       );
 
       transferDeletions(workInProgress);
@@ -166,7 +179,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
         workInProgress,
         workInProgress.child,
         nextChildren,
-        priorityLevel
+        priorityLevel,
       );
 
       transferDeletions(workInProgress);
@@ -182,7 +195,9 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
       if (nextChildren === null) {
         nextChildren = workInProgress.memoizedProps;
       }
-    } else if (nextChildren === null || workInProgress.memoizedProps === nextChildren) {
+    } else if (
+      nextChildren === null || workInProgress.memoizedProps === nextChildren
+    ) {
       return bailoutOnAlreadyFinishedWork(current, workInProgress);
     }
     reconcileChildren(current, workInProgress, nextChildren);
@@ -190,7 +205,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     return workInProgress.child;
   }
 
-  function markRef(current : Fiber | null, workInProgress : Fiber) {
+  function markRef(current: Fiber | null, workInProgress: Fiber) {
     const ref = workInProgress.ref;
     if (ref !== null && (!current || current.ref !== ref)) {
       // Schedule a Ref effect
@@ -215,8 +230,10 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
       }
       // TODO: Disable this before release, since it is not part of the public API
       // I use this for testing to compare the relative overhead of classes.
-      if (typeof fn.shouldComponentUpdate === 'function' &&
-          !fn.shouldComponentUpdate(memoizedProps, nextProps)) {
+      if (
+        typeof fn.shouldComponentUpdate === 'function' &&
+        !fn.shouldComponentUpdate(memoizedProps, nextProps)
+      ) {
         // Memoize props even if shouldComponentUpdate returns false
         memoizeProps(workInProgress, nextProps);
         return bailoutOnAlreadyFinishedWork(current, workInProgress);
@@ -230,7 +247,9 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
 
     if (__DEV__) {
       ReactCurrentOwner.current = workInProgress;
+      ReactDebugCurrentFiber.phase = 'render';
       nextChildren = fn(nextProps, context);
+      ReactDebugCurrentFiber.phase = null;
     } else {
       nextChildren = fn(nextProps, context);
     }
@@ -239,7 +258,11 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     return workInProgress.child;
   }
 
-  function updateClassComponent(current : Fiber | null, workInProgress : Fiber, priorityLevel : PriorityLevel) {
+  function updateClassComponent(
+    current: Fiber | null,
+    workInProgress: Fiber,
+    priorityLevel: PriorityLevel,
+  ) {
     // Push context providers early to prevent context stack mismatches.
     // During mounting we don't know the child context yet as the instance doesn't exist.
     // We will invalidate the child context in finishClassComponent() right after rendering.
@@ -257,16 +280,25 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
         shouldUpdate = resumeMountClassInstance(workInProgress, priorityLevel);
       }
     } else {
-      shouldUpdate = updateClassInstance(current, workInProgress, priorityLevel);
+      shouldUpdate = updateClassInstance(
+        current,
+        workInProgress,
+        priorityLevel,
+      );
     }
-    return finishClassComponent(current, workInProgress, shouldUpdate, hasContext);
+    return finishClassComponent(
+      current,
+      workInProgress,
+      shouldUpdate,
+      hasContext,
+    );
   }
 
   function finishClassComponent(
-    current : Fiber | null,
-    workInProgress : Fiber,
-    shouldUpdate : boolean,
-    hasContext : boolean,
+    current: Fiber | null,
+    workInProgress: Fiber,
+    shouldUpdate: boolean,
+    hasContext: boolean,
   ) {
     // Refs should update even if shouldComponentUpdate returns false
     markRef(current, workInProgress);
@@ -279,7 +311,14 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
 
     // Rerender
     ReactCurrentOwner.current = workInProgress;
-    const nextChildren = instance.render();
+    let nextChildren;
+    if (__DEV__) {
+      ReactDebugCurrentFiber.phase = 'render';
+      nextChildren = instance.render();
+      ReactDebugCurrentFiber.phase = null;
+    } else {
+      nextChildren = instance.render();
+    }
     reconcileChildren(current, workInProgress, nextChildren);
     // Memoize props and state using the values we just used to render.
     // TODO: Restructure so we never read values from the instance.
@@ -294,20 +333,16 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
   }
 
   function updateHostRoot(current, workInProgress, priorityLevel) {
-    const root = (workInProgress.stateNode : FiberRoot);
+    const root = (workInProgress.stateNode: FiberRoot);
     if (root.pendingContext) {
       pushTopLevelContextObject(
         workInProgress,
         root.pendingContext,
-        root.pendingContext !== root.context
+        root.pendingContext !== root.context,
       );
     } else if (root.context) {
       // Should always be set
-      pushTopLevelContextObject(
-        workInProgress,
-        root.context,
-        false
-      );
+      pushTopLevelContextObject(workInProgress, root.context, false);
     }
 
     pushHostContainer(workInProgress, root.containerInfo);
@@ -315,7 +350,14 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     const updateQueue = workInProgress.updateQueue;
     if (updateQueue !== null) {
       const prevState = workInProgress.memoizedState;
-      const state = beginUpdateQueue(workInProgress, updateQueue, null, prevState, null, priorityLevel);
+      const state = beginUpdateQueue(
+        workInProgress,
+        updateQueue,
+        null,
+        prevState,
+        null,
+        priorityLevel,
+      );
       if (prevState === state) {
         // If the state is the same as before, that's a bailout because we had
         // no work matching this priority.
@@ -344,12 +386,15 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
         invariant(
           nextProps !== null,
           'We should always have pending or current props. This error is ' +
-          'likely caused by a bug in React. Please file an issue.'
+            'likely caused by a bug in React. Please file an issue.',
         );
       }
     } else if (nextProps === null || memoizedProps === nextProps) {
-      if (memoizedProps.hidden &&
-          workInProgress.pendingWorkPriority !== OffscreenPriority) {
+      if (
+        !useSyncScheduling &&
+        shouldDeprioritizeSubtree(workInProgress.type, memoizedProps) &&
+        workInProgress.pendingWorkPriority !== OffscreenPriority
+      ) {
         // This subtree still has work, but it should be deprioritized so we need
         // to bail out and not do any work yet.
         // TODO: It would be better if this tree got its correct priority set
@@ -378,10 +423,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
       // this in the host environment that also have access to this prop. That
       // avoids allocating another HostText fiber and traversing it.
       nextChildren = null;
-    } else if (
-      prevProps &&
-      shouldSetTextContent(prevProps)
-    ) {
+    } else if (prevProps && shouldSetTextContent(prevProps)) {
       // If we're switching from a direct text child to a normal child, or to
       // empty, we need to schedule the text content to be reset.
       workInProgress.effectTag |= ContentReset;
@@ -389,8 +431,11 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
 
     markRef(current, workInProgress);
 
-    if (nextProps.hidden &&
-        workInProgress.pendingWorkPriority !== OffscreenPriority) {
+    if (
+      !useSyncScheduling &&
+      shouldDeprioritizeSubtree(workInProgress.type, nextProps) &&
+      workInProgress.pendingWorkPriority !== OffscreenPriority
+    ) {
       // If this host component is hidden, we can bail out on the children.
       // We'll rerender the children later at the lower priority.
 
@@ -406,7 +451,12 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
       }
 
       // Reconcile the children and stash them for later work.
-      reconcileChildrenAtPriority(current, workInProgress, nextChildren, OffscreenPriority);
+      reconcileChildrenAtPriority(
+        current,
+        workInProgress,
+        nextChildren,
+        OffscreenPriority,
+      );
       memoizeProps(workInProgress, nextProps);
       workInProgress.child = current !== null ? current.child : null;
 
@@ -447,7 +497,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     invariant(
       current === null,
       'An indeterminate component should never have mounted. This error is ' +
-      'likely caused by a bug in React. Please file an issue.'
+        'likely caused by a bug in React. Please file an issue.',
     );
     var fn = workInProgress.type;
     var props = workInProgress.pendingProps;
@@ -463,7 +513,11 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
       value = fn(props, context);
     }
 
-    if (typeof value === 'object' && value !== null && typeof value.render === 'function') {
+    if (
+      typeof value === 'object' &&
+      value !== null &&
+      typeof value.render === 'function'
+    ) {
       // Proceed under the assumption that this is a class instance
       workInProgress.tag = ClassComponent;
 
@@ -484,7 +538,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
           warning(
             !Component.childContextTypes,
             '%s(...): childContextTypes cannot be defined on a functional component.',
-            Component.displayName || Component.name || 'Component'
+            Component.displayName || Component.name || 'Component',
           );
         }
         if (workInProgress.ref !== null) {
@@ -504,9 +558,9 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
             warning(
               false,
               'Stateless function components cannot be given refs. ' +
-              'Attempts to access this ref will fail.%s%s',
+                'Attempts to access this ref will fail.%s%s',
               info,
-              ReactDebugCurrentFiber.getCurrentFiberStackAddendum()
+              ReactDebugCurrentFiber.getCurrentFiberStackAddendum(),
             );
           }
         }
@@ -518,7 +572,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
   }
 
   function updateCoroutineComponent(current, workInProgress) {
-    var nextCoroutine = (workInProgress.pendingProps : null | ReactCoroutine);
+    var nextCoroutine = (workInProgress.pendingProps: null | ReactCoroutine);
     if (hasContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
@@ -527,10 +581,12 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
         invariant(
           nextCoroutine !== null,
           'We should always have pending or current props. This error is ' +
-          'likely caused by a bug in React. Please file an issue.'
+            'likely caused by a bug in React. Please file an issue.',
         );
       }
-    } else if (nextCoroutine === null || workInProgress.memoizedProps === nextCoroutine) {
+    } else if (
+      nextCoroutine === null || workInProgress.memoizedProps === nextCoroutine
+    ) {
       nextCoroutine = workInProgress.memoizedProps;
       // TODO: When bailing out, we might need to return the stateNode instead
       // of the child. To check it for work.
@@ -551,7 +607,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
         workInProgress,
         workInProgress.stateNode,
         nextChildren,
-        priorityLevel
+        priorityLevel,
       );
     } else if (current.child === workInProgress.child) {
       clearDeletions(workInProgress);
@@ -560,7 +616,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
         workInProgress,
         workInProgress.stateNode,
         nextChildren,
-        priorityLevel
+        priorityLevel,
       );
 
       transferDeletions(workInProgress);
@@ -569,7 +625,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
         workInProgress,
         workInProgress.stateNode,
         nextChildren,
-        priorityLevel
+        priorityLevel,
       );
 
       transferDeletions(workInProgress);
@@ -593,10 +649,12 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
         invariant(
           nextChildren != null,
           'We should always have pending or current props. This error is ' +
-          'likely caused by a bug in React. Please file an issue.'
+            'likely caused by a bug in React. Please file an issue.',
         );
       }
-    } else if (nextChildren === null || workInProgress.memoizedProps === nextChildren) {
+    } else if (
+      nextChildren === null || workInProgress.memoizedProps === nextChildren
+    ) {
       return bailoutOnAlreadyFinishedWork(current, workInProgress);
     }
 
@@ -610,7 +668,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
         workInProgress,
         workInProgress.child,
         nextChildren,
-        priorityLevel
+        priorityLevel,
       );
       memoizeProps(workInProgress, nextChildren);
       markChildAsProgressed(current, workInProgress, priorityLevel);
@@ -640,7 +698,14 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
   }
   */
 
-  function bailoutOnAlreadyFinishedWork(current, workInProgress : Fiber) : Fiber | null {
+  function bailoutOnAlreadyFinishedWork(
+    current,
+    workInProgress: Fiber,
+  ): Fiber | null {
+    if (__DEV__) {
+      cancelWorkTimer(workInProgress);
+    }
+
     const priorityLevel = workInProgress.pendingWorkPriority;
     // TODO: We should ideally be able to bail out early if the children have no
     // more work to do. However, since we don't have a separation of this
@@ -668,6 +733,10 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
   }
 
   function bailoutOnLowPriority(current, workInProgress) {
+    if (__DEV__) {
+      cancelWorkTimer(workInProgress);
+    }
+
     // TODO: Handle HostComponent tags here as well and call pushHostContext()?
     // See PR 8590 discussion for context
     switch (workInProgress.tag) {
@@ -675,7 +744,10 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
         pushContextProvider(workInProgress);
         break;
       case HostPortal:
-        pushHostContainer(workInProgress, workInProgress.stateNode.containerInfo);
+        pushHostContainer(
+          workInProgress,
+          workInProgress.stateNode.containerInfo,
+        );
         break;
     }
     // TODO: What if this is currently in progress?
@@ -683,21 +755,27 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     return null;
   }
 
-  function memoizeProps(workInProgress : Fiber, nextProps : any) {
+  function memoizeProps(workInProgress: Fiber, nextProps: any) {
     workInProgress.memoizedProps = nextProps;
     // Reset the pending props
     workInProgress.pendingProps = null;
   }
 
-  function memoizeState(workInProgress : Fiber, nextState : any) {
+  function memoizeState(workInProgress: Fiber, nextState: any) {
     workInProgress.memoizedState = nextState;
     // Don't reset the updateQueue, in case there are pending updates. Resetting
     // is handled by beginUpdateQueue.
   }
 
-  function beginWork(current : Fiber | null, workInProgress : Fiber, priorityLevel : PriorityLevel) : Fiber | null {
-    if (workInProgress.pendingWorkPriority === NoWork ||
-        workInProgress.pendingWorkPriority > priorityLevel) {
+  function beginWork(
+    current: Fiber | null,
+    workInProgress: Fiber,
+    priorityLevel: PriorityLevel,
+  ): Fiber | null {
+    if (
+      workInProgress.pendingWorkPriority === NoWork ||
+      workInProgress.pendingWorkPriority > priorityLevel
+    ) {
       return bailoutOnLowPriority(current, workInProgress);
     }
 
@@ -718,7 +796,11 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
 
     switch (workInProgress.tag) {
       case IndeterminateComponent:
-        return mountIndeterminateComponent(current, workInProgress, priorityLevel);
+        return mountIndeterminateComponent(
+          current,
+          workInProgress,
+          priorityLevel,
+        );
       case FunctionalComponent:
         return updateFunctionalComponent(current, workInProgress);
       case ClassComponent:
@@ -732,7 +814,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
       case CoroutineHandlerPhase:
         // This is a restart. Reset the tag to the initial phase.
         workInProgress.tag = CoroutineComponent;
-        // Intentionally fall through since this is now the same.
+      // Intentionally fall through since this is now the same.
       case CoroutineComponent:
         return updateCoroutineComponent(current, workInProgress);
       case YieldComponent:
@@ -747,24 +829,29 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
         invariant(
           false,
           'Unknown unit of work tag. This error is likely caused by a bug in ' +
-          'React. Please file an issue.'
+            'React. Please file an issue.',
         );
     }
   }
 
-  function beginFailedWork(current : Fiber | null, workInProgress : Fiber, priorityLevel : PriorityLevel) {
+  function beginFailedWork(
+    current: Fiber | null,
+    workInProgress: Fiber,
+    priorityLevel: PriorityLevel,
+  ) {
     invariant(
-      workInProgress.tag === ClassComponent ||
-      workInProgress.tag === HostRoot,
+      workInProgress.tag === ClassComponent || workInProgress.tag === HostRoot,
       'Invalid type of work. This error is likely caused by a bug in React. ' +
-      'Please file an issue.'
+        'Please file an issue.',
     );
 
     // Add an error effect so we can handle the error during the commit phase
     workInProgress.effectTag |= Err;
 
-    if (workInProgress.pendingWorkPriority === NoWork ||
-        workInProgress.pendingWorkPriority > priorityLevel) {
+    if (
+      workInProgress.pendingWorkPriority === NoWork ||
+      workInProgress.pendingWorkPriority > priorityLevel
+    ) {
       return bailoutOnLowPriority(current, workInProgress);
     }
 
@@ -791,5 +878,4 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     beginWork,
     beginFailedWork,
   };
-
 };
diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberClassComponent.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberClassComponent.js
index bdb377b54bbb82..c417f2f42ecde6 100644
--- a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberClassComponent.js
+++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberClassComponent.js
@@ -12,8 +12,8 @@
 
 'use strict';
 
-import type { Fiber } from 'ReactFiber';
-import type { PriorityLevel } from 'ReactPriorityLevel';
+import type {Fiber} from 'ReactFiber';
+import type {PriorityLevel} from 'ReactPriorityLevel';
 
 var {
   Update,
@@ -30,35 +30,39 @@ var {
   addForceUpdate,
   beginUpdateQueue,
 } = require('ReactFiberUpdateQueue');
-var { hasContextChanged } = require('ReactFiberContext');
-var { getComponentName, isMounted } = require('ReactFiberTreeReflection');
+var {hasContextChanged} = require('ReactFiberContext');
+var {isMounted} = require('ReactFiberTreeReflection');
 var ReactInstanceMap = require('ReactInstanceMap');
 var emptyObject = require('fbjs/lib/emptyObject');
+var getComponentName = require('getComponentName');
 var shallowEqual = require('fbjs/lib/shallowEqual');
 var invariant = require('fbjs/lib/invariant');
 
 const isArray = Array.isArray;
 
 if (__DEV__) {
+  var {
+    startPhaseTimer,
+    stopPhaseTimer,
+  } = require('ReactDebugFiberPerf');
   var warning = require('fbjs/lib/warning');
-  var warnOnInvalidCallback = function(callback : mixed, callerName : string) {
+  var warnOnInvalidCallback = function(callback: mixed, callerName: string) {
     warning(
       callback === null || typeof callback === 'function',
       '%s(...): Expected the last optional `callback` argument to be a ' +
-      'function. Instead received: %s.',
+        'function. Instead received: %s.',
       callerName,
-      String(callback)
+      callback,
     );
   };
 }
 
 module.exports = function(
-  scheduleUpdate : (fiber : Fiber, priorityLevel : PriorityLevel) => void,
-  getPriorityContext : () => PriorityLevel,
-  memoizeProps: (workInProgress : Fiber, props : any) => void,
-  memoizeState: (workInProgress : Fiber, state : any) => void,
+  scheduleUpdate: (fiber: Fiber, priorityLevel: PriorityLevel) => void,
+  getPriorityContext: () => PriorityLevel,
+  memoizeProps: (workInProgress: Fiber, props: any) => void,
+  memoizeState: (workInProgress: Fiber, state: any) => void,
 ) {
-
   // Class component state updater
   const updater = {
     isMounted,
@@ -94,22 +98,43 @@ module.exports = function(
     },
   };
 
-  function checkShouldComponentUpdate(workInProgress, oldProps, newProps, oldState, newState, newContext) {
-    if (oldProps === null || (workInProgress.updateQueue !== null && workInProgress.updateQueue.hasForceUpdate)) {
+  function checkShouldComponentUpdate(
+    workInProgress,
+    oldProps,
+    newProps,
+    oldState,
+    newState,
+    newContext,
+  ) {
+    if (
+      oldProps === null ||
+      (workInProgress.updateQueue !== null &&
+        workInProgress.updateQueue.hasForceUpdate)
+    ) {
       // If the workInProgress already has an Update effect, return true
       return true;
     }
 
     const instance = workInProgress.stateNode;
     if (typeof instance.shouldComponentUpdate === 'function') {
-      const shouldUpdate = instance.shouldComponentUpdate(newProps, newState, newContext);
+      if (__DEV__) {
+        startPhaseTimer(workInProgress, 'shouldComponentUpdate');
+      }
+      const shouldUpdate = instance.shouldComponentUpdate(
+        newProps,
+        newState,
+        newContext,
+      );
+      if (__DEV__) {
+        stopPhaseTimer();
+      }
 
       if (__DEV__) {
         warning(
           shouldUpdate !== undefined,
           '%s.shouldComponentUpdate(): Returned undefined instead of a ' +
-          'boolean value. Make sure to return true or false.',
-          getComponentName(workInProgress)
+            'boolean value. Make sure to return true or false.',
+          getComponentName(workInProgress) || 'Unknown',
         );
       }
 
@@ -118,10 +143,8 @@ module.exports = function(
 
     const type = workInProgress.type;
     if (type.prototype && type.prototype.isPureReactComponent) {
-      return (
-        !shallowEqual(oldProps, newProps) ||
-        !shallowEqual(oldState, newState)
-      );
+      return !shallowEqual(oldProps, newProps) ||
+        !shallowEqual(oldState, newState);
     }
 
     return true;
@@ -135,77 +158,76 @@ module.exports = function(
       warning(
         renderPresent,
         '%s(...): No `render` method found on the returned component ' +
-        'instance: you may have forgotten to define `render`.',
-        name
+          'instance: you may have forgotten to define `render`.',
+        name,
       );
-      const noGetInitialStateOnES6 = (
-        !instance.getInitialState ||
+      const noGetInitialStateOnES6 = !instance.getInitialState ||
         instance.getInitialState.isReactClassApproved ||
-        instance.state
-      );
+        instance.state;
       warning(
         noGetInitialStateOnES6,
         'getInitialState was defined on %s, a plain JavaScript class. ' +
-        'This is only supported for classes created using React.createClass. ' +
-        'Did you mean to define a state property instead?',
-        name
-      );
-      const noGetDefaultPropsOnES6 = (
-        !instance.getDefaultProps ||
-        instance.getDefaultProps.isReactClassApproved
+          'This is only supported for classes created using React.createClass. ' +
+          'Did you mean to define a state property instead?',
+        name,
       );
+      const noGetDefaultPropsOnES6 = !instance.getDefaultProps ||
+        instance.getDefaultProps.isReactClassApproved;
       warning(
         noGetDefaultPropsOnES6,
         'getDefaultProps was defined on %s, a plain JavaScript class. ' +
-        'This is only supported for classes created using React.createClass. ' +
-        'Use a static property to define defaultProps instead.',
-        name
+          'This is only supported for classes created using React.createClass. ' +
+          'Use a static property to define defaultProps instead.',
+        name,
       );
       const noInstancePropTypes = !instance.propTypes;
       warning(
         noInstancePropTypes,
         'propTypes was defined as an instance property on %s. Use a static ' +
-        'property to define propTypes instead.',
+          'property to define propTypes instead.',
         name,
       );
       const noInstanceContextTypes = !instance.contextTypes;
       warning(
         noInstanceContextTypes,
         'contextTypes was defined as an instance property on %s. Use a static ' +
-        'property to define contextTypes instead.',
+          'property to define contextTypes instead.',
         name,
       );
-      const noComponentShouldUpdate = typeof instance.componentShouldUpdate !== 'function';
+      const noComponentShouldUpdate = typeof instance.componentShouldUpdate !==
+        'function';
       warning(
         noComponentShouldUpdate,
         '%s has a method called ' +
-        'componentShouldUpdate(). Did you mean shouldComponentUpdate()? ' +
-        'The name is phrased as a question because the function is ' +
-        'expected to return a value.',
-        name
+          'componentShouldUpdate(). Did you mean shouldComponentUpdate()? ' +
+          'The name is phrased as a question because the function is ' +
+          'expected to return a value.',
+        name,
       );
-      const noComponentDidUnmount = typeof instance.componentDidUnmount !== 'function';
+      const noComponentDidUnmount = typeof instance.componentDidUnmount !==
+        'function';
       warning(
         noComponentDidUnmount,
         '%s has a method called ' +
-        'componentDidUnmount(). But there is no such lifecycle method. ' +
-        'Did you mean componentWillUnmount()?',
-        name
+          'componentDidUnmount(). But there is no such lifecycle method. ' +
+          'Did you mean componentWillUnmount()?',
+        name,
       );
-      const noComponentWillRecieveProps = typeof instance.componentWillRecieveProps !== 'function';
+      const noComponentWillRecieveProps = typeof instance.componentWillRecieveProps !==
+        'function';
       warning(
         noComponentWillRecieveProps,
         '%s has a method called ' +
-        'componentWillRecieveProps(). Did you mean componentWillReceiveProps()?',
-        name
+          'componentWillRecieveProps(). Did you mean componentWillReceiveProps()?',
+        name,
       );
       const hasMutatedProps = instance.props !== workInProgress.pendingProps;
       warning(
         instance.props === undefined || !hasMutatedProps,
         '%s(...): When calling super() in `%s`, make sure to pass ' +
-        'up the same props that your component\'s constructor was passed.',
+          "up the same props that your component's constructor was passed.",
+        name,
         name,
-        name
       );
     }
 
@@ -214,53 +236,39 @@ module.exports = function(
       invariant(
         false,
         '%s.state: must be set to an object or null',
-        getComponentName(workInProgress)
+        getComponentName(workInProgress),
       );
     }
     if (typeof instance.getChildContext === 'function') {
       invariant(
         typeof workInProgress.type.childContextTypes === 'object',
         '%s.getChildContext(): childContextTypes must be defined in order to ' +
-        'use getChildContext().',
-        getComponentName(workInProgress)
+          'use getChildContext().',
+        getComponentName(workInProgress),
       );
     }
   }
 
-
-  function markUpdate(workInProgress) {
-    workInProgress.effectTag |= Update;
-  }
-
-  function markUpdateIfAlreadyInProgress(current: Fiber | null, workInProgress : Fiber) {
-    // If an update was already in progress, we should schedule an Update
-    // effect even though we're bailing out, so that cWU/cDU are called.
-    if (current !== null) {
-      if (workInProgress.memoizedProps !== current.memoizedProps ||
-          workInProgress.memoizedState !== current.memoizedState) {
-        markUpdate(workInProgress);
-      }
-    }
-  }
-
-  function resetInputPointers(workInProgress : Fiber, instance : any) {
+  function resetInputPointers(workInProgress: Fiber, instance: any) {
     instance.props = workInProgress.memoizedProps;
     instance.state = workInProgress.memoizedState;
   }
 
-  function adoptClassInstance(workInProgress : Fiber, instance : any) : void {
+  function adoptClassInstance(workInProgress: Fiber, instance: any): void {
     instance.updater = updater;
     workInProgress.stateNode = instance;
     // The instance needs access to the fiber so that it can schedule updates
     ReactInstanceMap.set(instance, workInProgress);
   }
 
-  function constructClassInstance(workInProgress : Fiber) : any {
+  function constructClassInstance(workInProgress: Fiber): any {
     const ctor = workInProgress.type;
     const props = workInProgress.pendingProps;
     const unmaskedContext = getUnmaskedContext(workInProgress);
     const needsContext = isContextConsumer(workInProgress);
-    const context = needsContext ? getMaskedContext(workInProgress, unmaskedContext) : emptyObject;
+    const context = needsContext
+      ? getMaskedContext(workInProgress, unmaskedContext)
+      : emptyObject;
     const instance = new ctor(props, context);
     adoptClassInstance(workInProgress, instance);
     checkClassInstance(workInProgress);
@@ -275,8 +283,10 @@ module.exports = function(
   }
 
   // Invokes the mount life-cycles on a previously never rendered instance.
-  function mountClassInstance(workInProgress : Fiber, priorityLevel : PriorityLevel) : void {
-    markUpdate(workInProgress);
+  function mountClassInstance(
+    workInProgress: Fiber,
+    priorityLevel: PriorityLevel,
+  ): void {
     const instance = workInProgress.stateNode;
     const state = instance.state || null;
 
@@ -284,7 +294,7 @@ module.exports = function(
     invariant(
       props,
       'There must be pending props for an initial mount. This error is ' +
-      'likely caused by a bug in React. Please file an issue.'
+        'likely caused by a bug in React. Please file an issue.',
     );
 
     const unmaskedContext = getUnmaskedContext(workInProgress);
@@ -295,7 +305,13 @@ module.exports = function(
     instance.context = getMaskedContext(workInProgress, unmaskedContext);
 
     if (typeof instance.componentWillMount === 'function') {
+      if (__DEV__) {
+        startPhaseTimer(workInProgress, 'componentWillMount');
+      }
       instance.componentWillMount();
+      if (__DEV__) {
+        stopPhaseTimer();
+      }
       // If we had additional state updates during this life-cycle, let's
       // process them now.
       const updateQueue = workInProgress.updateQueue;
@@ -306,16 +322,21 @@ module.exports = function(
           instance,
           state,
           props,
-          priorityLevel
+          priorityLevel,
         );
       }
     }
+    if (typeof instance.componentDidMount === 'function') {
+      workInProgress.effectTag |= Update;
+    }
   }
 
   // Called on a preexisting class instance. Returns false if a resumed render
   // could be reused.
-  function resumeMountClassInstance(workInProgress : Fiber, priorityLevel : PriorityLevel) : boolean {
-    markUpdate(workInProgress);
+  function resumeMountClassInstance(
+    workInProgress: Fiber,
+    priorityLevel: PriorityLevel,
+  ): boolean {
     const instance = workInProgress.stateNode;
     resetInputPointers(workInProgress, instance);
 
@@ -328,7 +349,7 @@ module.exports = function(
       invariant(
         newProps != null,
         'There should always be pending or memoized props. This error is ' +
-        'likely caused by a bug in React. Please file an issue.'
+          'likely caused by a bug in React. Please file an issue.',
       );
     }
     const newUnmaskedContext = getUnmaskedContext(workInProgress);
@@ -338,14 +359,16 @@ module.exports = function(
     // componentWillMount and before this componentWillMount? Probably
     // unsupported anyway.
 
-    if (!checkShouldComponentUpdate(
-      workInProgress,
-      workInProgress.memoizedProps,
-      newProps,
-      workInProgress.memoizedState,
-      newState,
-      newContext
-    )) {
+    if (
+      !checkShouldComponentUpdate(
+        workInProgress,
+        workInProgress.memoizedProps,
+        newProps,
+        workInProgress.memoizedState,
+        newState,
+        newContext,
+      )
+    ) {
       // Update the existing instance's state, props, and context pointers even
       // though we're bailing out.
       instance.props = newProps;
@@ -358,11 +381,17 @@ module.exports = function(
     // want to reuse one that failed to fully mount.
     const newInstance = constructClassInstance(workInProgress);
     newInstance.props = newProps;
-    newInstance.state = newState = newInstance.state || null;
+    newInstance.state = (newState = newInstance.state || null);
     newInstance.context = newContext;
 
     if (typeof newInstance.componentWillMount === 'function') {
+      if (__DEV__) {
+        startPhaseTimer(workInProgress, 'componentWillMount');
+      }
       newInstance.componentWillMount();
+      if (__DEV__) {
+        stopPhaseTimer();
+      }
     }
     // If we had additional state updates, process them now.
     // They may be from componentWillMount() or from error boundary's setState()
@@ -375,14 +404,21 @@ module.exports = function(
         newInstance,
         newState,
         newProps,
-        priorityLevel
+        priorityLevel,
       );
     }
+    if (typeof instance.componentDidMount === 'function') {
+      workInProgress.effectTag |= Update;
+    }
     return true;
   }
 
   // Invokes the update life-cycles and returns false if it shouldn't rerender.
-  function updateClassInstance(current : Fiber, workInProgress : Fiber, priorityLevel : PriorityLevel) : boolean {
+  function updateClassInstance(
+    current: Fiber,
+    workInProgress: Fiber,
+    priorityLevel: PriorityLevel,
+  ): boolean {
     const instance = workInProgress.stateNode;
     resetInputPointers(workInProgress, instance);
 
@@ -395,7 +431,7 @@ module.exports = function(
       invariant(
         newProps != null,
         'There should always be pending or memoized props. This error is ' +
-        'likely caused by a bug in React. Please file an issue.'
+          'likely caused by a bug in React. Please file an issue.',
       );
     }
     const oldContext = instance.context;
@@ -408,16 +444,22 @@ module.exports = function(
 
     if (oldProps !== newProps || oldContext !== newContext) {
       if (typeof instance.componentWillReceiveProps === 'function') {
+        if (__DEV__) {
+          startPhaseTimer(workInProgress, 'componentWillReceiveProps');
+        }
         instance.componentWillReceiveProps(newProps, newContext);
+        if (__DEV__) {
+          stopPhaseTimer();
+        }
 
         if (instance.state !== workInProgress.memoizedState) {
           if (__DEV__) {
             warning(
               false,
               '%s.componentWillReceiveProps(): Assigning directly to ' +
-              'this.state is deprecated (except inside a component\'s ' +
-              'constructor). Use setState instead.',
-              getComponentName(workInProgress)
+                "this.state is deprecated (except inside a component's " +
+                'constructor). Use setState instead.',
+              getComponentName(workInProgress),
             );
           }
           updater.enqueueReplaceState(instance, instance.state, null);
@@ -437,17 +479,28 @@ module.exports = function(
         instance,
         oldState,
         newProps,
-        priorityLevel
+        priorityLevel,
       );
     } else {
       newState = oldState;
     }
 
-    if (oldProps === newProps &&
-        oldState === newState &&
-        !hasContextChanged() &&
-        !(updateQueue !== null && updateQueue.hasForceUpdate)) {
-      markUpdateIfAlreadyInProgress(current, workInProgress);
+    if (
+      oldProps === newProps &&
+      oldState === newState &&
+      !hasContextChanged() &&
+      !(updateQueue !== null && updateQueue.hasForceUpdate)
+    ) {
+      // If an update was already in progress, we should schedule an Update
+      // effect even though we're bailing out, so that cWU/cDU are called.
+      if (typeof instance.componentDidUpdate === 'function') {
+        if (
+          oldProps !== current.memoizedProps ||
+          oldState !== current.memoizedState
+        ) {
+          workInProgress.effectTag |= Update;
+        }
+      }
       return false;
     }
 
@@ -457,16 +510,33 @@ module.exports = function(
       newProps,
       oldState,
       newState,
-      newContext
+      newContext,
     );
 
     if (shouldUpdate) {
-      markUpdate(workInProgress);
       if (typeof instance.componentWillUpdate === 'function') {
+        if (__DEV__) {
+          startPhaseTimer(workInProgress, 'componentWillUpdate');
+        }
         instance.componentWillUpdate(newProps, newState, newContext);
+        if (__DEV__) {
+          stopPhaseTimer();
+        }
+      }
+      if (typeof instance.componentDidUpdate === 'function') {
+        workInProgress.effectTag |= Update;
       }
     } else {
-      markUpdateIfAlreadyInProgress(current, workInProgress);
+      // If an update was already in progress, we should schedule an Update
+      // effect even though we're bailing out, so that cWU/cDU are called.
+      if (typeof instance.componentDidUpdate === 'function') {
+        if (
+          oldProps !== current.memoizedProps ||
+          oldState !== current.memoizedState
+        ) {
+          workInProgress.effectTag |= Update;
+        }
+      }
 
       // If shouldComponentUpdate returned false, we should still update the
       // memoized props/state to indicate that this work can be reused.
@@ -490,5 +560,4 @@ module.exports = function(
     resumeMountClassInstance,
     updateClassInstance,
   };
-
 };
diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberCommitWork.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberCommitWork.js
index 82ce022e06fc8b..17000dc6903065 100644
--- a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberCommitWork.js
+++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberCommitWork.js
@@ -12,8 +12,8 @@
 
 'use strict';
 
-import type { Fiber } from 'ReactFiber';
-import type { HostConfig } from 'ReactFiberReconciler';
+import type {Fiber} from 'ReactFiber';
+import type {HostConfig} from 'ReactFiberReconciler';
 
 var ReactTypeOfWork = require('ReactTypeOfWork');
 var {
@@ -24,8 +24,9 @@ var {
   HostPortal,
   CoroutineComponent,
 } = ReactTypeOfWork;
-var { commitCallbacks } = require('ReactFiberUpdateQueue');
-var { onCommitUnmount } = require('ReactFiberDevToolsHook');
+var {commitCallbacks} = require('ReactFiberUpdateQueue');
+var {onCommitUnmount} = require('ReactFiberDevToolsHook');
+var {invokeGuardedCallback} = require('ReactErrorUtils');
 
 var {
   Placement,
@@ -36,11 +37,17 @@ var {
 
 var invariant = require('fbjs/lib/invariant');
 
+if (__DEV__) {
+  var {
+    startPhaseTimer,
+    stopPhaseTimer,
+  } = require('ReactDebugFiberPerf');
+}
+
 module.exports = function<T, P, I, TI, PI, C, CX, PL>(
-  config : HostConfig<T, P, I, TI, PI, C, CX, PL>,
-  captureError : (failedFiber : Fiber, error: Error) => Fiber | null
+  config: HostConfig<T, P, I, TI, PI, C, CX, PL>,
+  captureError: (failedFiber: Fiber, error: Error) => Fiber | null,
 ) {
-
   const {
     commitMount,
     commitUpdate,
@@ -52,38 +59,55 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     getPublicInstance,
   } = config;
 
-  // Capture errors so they don't interrupt unmounting.
-  function safelyCallComponentWillUnmount(current, instance) {
-    try {
+  if (__DEV__) {
+    var callComponentWillUnmountWithTimerInDev = function(current, instance) {
+      startPhaseTimer(current, 'componentWillUnmount');
       instance.componentWillUnmount();
-    } catch (error) {
-      captureError(current, error);
-    }
+      stopPhaseTimer();
+    };
   }
 
   // Capture errors so they don't interrupt unmounting.
-  function safelyDetachRef(current : Fiber) {
-    try {
-      const ref = current.ref;
-      if (ref !== null) {
-        ref(null);
-      }
-    } catch (error) {
-      captureError(current, error);
+  function safelyCallComponentWillUnmount(current, instance) {
+    if (__DEV__) {
+      const unmountError = invokeGuardedCallback(
+        null,
+        callComponentWillUnmountWithTimerInDev,
+        null,
+        current,
+        instance,
+      );
+      if (unmountError) {
+        captureError(current, unmountError);
+      }
+    } else {
+      try {
+        instance.componentWillUnmount();
+      } catch (unmountError) {
+        captureError(current, unmountError);
+      }
     }
   }
 
-  // Only called during update. It's ok to throw.
-  function detachRefIfNeeded(current : Fiber | null, finishedWork : Fiber) {
-    if (current) {
-      const currentRef = current.ref;
-      if (currentRef !== null && currentRef !== finishedWork.ref) {
-        currentRef(null);
+  function safelyDetachRef(current: Fiber) {
+    const ref = current.ref;
+    if (ref !== null) {
+      if (__DEV__) {
+        const refError = invokeGuardedCallback(null, ref, null, null);
+        if (refError !== null) {
+          captureError(current, refError);
+        }
+      } else {
+        try {
+          ref(null);
+        } catch (refError) {
+          captureError(current, refError);
+        }
       }
     }
   }
 
-  function getHostParent(fiber : Fiber) : I | C {
+  function getHostParent(fiber: Fiber): I | C {
     let parent = fiber.return;
     while (parent !== null) {
       switch (parent.tag) {
@@ -99,11 +123,11 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     invariant(
       false,
       'Expected to find a host parent. This error is likely caused by a bug ' +
-      'in React. Please file an issue.'
+        'in React. Please file an issue.',
     );
   }
 
-  function getHostParentFiber(fiber : Fiber) : Fiber {
+  function getHostParentFiber(fiber: Fiber): Fiber {
     let parent = fiber.return;
     while (parent !== null) {
       if (isHostParent(parent)) {
@@ -114,24 +138,22 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     invariant(
       false,
       'Expected to find a host parent. This error is likely caused by a bug ' +
-      'in React. Please file an issue.'
+        'in React. Please file an issue.',
     );
   }
 
-  function isHostParent(fiber : Fiber) : boolean {
-    return (
-      fiber.tag === HostComponent ||
+  function isHostParent(fiber: Fiber): boolean {
+    return fiber.tag === HostComponent ||
       fiber.tag === HostRoot ||
-      fiber.tag === HostPortal
-    );
+      fiber.tag === HostPortal;
   }
 
-  function getHostSibling(fiber : Fiber) : ?I {
+  function getHostSibling(fiber: Fiber): ?I {
     // We're going to search forward into the tree until we find a sibling host
     // node. Unfortunately, if multiple insertions are done in a row we have to
     // search past them. This leads to exponential search for the next sibling.
     // TODO: Find a more efficient way to do this.
-    let node : Fiber = fiber;
+    let node: Fiber = fiber;
     siblings: while (true) {
       // If we didn't find anything, let's try the next sibling.
       while (node.sibling === null) {
@@ -168,7 +190,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     }
   }
 
-  function commitPlacement(finishedWork : Fiber) : void {
+  function commitPlacement(finishedWork: Fiber): void {
     // Recursively insert all host nodes into the parent.
     const parentFiber = getHostParentFiber(finishedWork);
     let parent;
@@ -186,7 +208,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
         invariant(
           false,
           'Invalid host parent fiber. This error is likely caused by a bug ' +
-          'in React. Please file an issue.'
+            'in React. Please file an issue.',
         );
     }
     if (parentFiber.effectTag & ContentReset) {
@@ -199,7 +221,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     const before = getHostSibling(finishedWork);
     // We only have the top Fiber that was inserted but we need recurse down its
     // children to find all the terminal nodes.
-    let node : Fiber = finishedWork;
+    let node: Fiber = finishedWork;
     while (true) {
       if (node.tag === HostComponent || node.tag === HostText) {
         if (before) {
@@ -230,13 +252,13 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     }
   }
 
-  function commitNestedUnmounts(root : Fiber): void {
+  function commitNestedUnmounts(root: Fiber): void {
     // While we're inside a removed host node we don't want to call
     // removeChild on the inner nodes because they're removed by the top
     // call anyway. We also want to call componentWillUnmount on all
     // composites before this host node is removed from the tree. Therefore
     // we do an inner loop while we're still inside the host node.
-    let node : Fiber = root;
+    let node: Fiber = root;
     while (true) {
       commitUnmount(node);
       // Visit children because they may contain more composite or host nodes.
@@ -263,7 +285,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
   function unmountHostComponents(parent, current): void {
     // We only have the top Fiber that was inserted but we need recurse down its
     // children to find all the terminal nodes.
-    let node : Fiber = current;
+    let node: Fiber = current;
     while (true) {
       if (node.tag === HostComponent || node.tag === HostText) {
         commitNestedUnmounts(node);
@@ -309,7 +331,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     }
   }
 
-  function commitDeletion(current : Fiber) : void {
+  function commitDeletion(current: Fiber): void {
     // Recursively delete all host nodes from the parent.
     const parent = getHostParent(current);
     // Detach refs and call componentWillUnmount() on the whole subtree.
@@ -331,7 +353,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
   // User-originating errors (lifecycles and refs) should not interrupt
   // deletion, so don't let them throw. Host-originating errors should
   // interrupt deletion, so it's okay
-  function commitUnmount(current : Fiber) : void {
+  function commitUnmount(current: Fiber): void {
     if (typeof onCommitUnmount === 'function') {
       onCommitUnmount(current);
     }
@@ -364,38 +386,43 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     }
   }
 
-  function commitWork(current : Fiber | null, finishedWork : Fiber) : void {
+  function commitWork(current: Fiber | null, finishedWork: Fiber): void {
     switch (finishedWork.tag) {
       case ClassComponent: {
-        detachRefIfNeeded(current, finishedWork);
         return;
       }
       case HostComponent: {
-        const instance : I = finishedWork.stateNode;
+        const instance: I = finishedWork.stateNode;
         if (instance != null && current !== null) {
           // Commit the work prepared earlier.
           const newProps = finishedWork.memoizedProps;
           const oldProps = current.memoizedProps;
           const type = finishedWork.type;
           // TODO: Type the updateQueue to be specific to host components.
-          const updatePayload : null | PL = (finishedWork.updateQueue : any);
+          const updatePayload: null | PL = (finishedWork.updateQueue: any);
           finishedWork.updateQueue = null;
           if (updatePayload !== null) {
-            commitUpdate(instance, updatePayload, type, oldProps, newProps, finishedWork);
+            commitUpdate(
+              instance,
+              updatePayload,
+              type,
+              oldProps,
+              newProps,
+              finishedWork,
+            );
           }
         }
-        detachRefIfNeeded(current, finishedWork);
         return;
       }
       case HostText: {
         invariant(
           finishedWork.stateNode !== null && current !== null,
           'This should only be done during updates. This error is likely ' +
-          'caused by a bug in React. Please file an issue.'
+            'caused by a bug in React. Please file an issue.',
         );
-        const textInstance : TI = finishedWork.stateNode;
-        const newText : string = finishedWork.memoizedProps;
-        const oldText : string = current.memoizedProps;
+        const textInstance: TI = finishedWork.stateNode;
+        const newText: string = finishedWork.memoizedProps;
+        const oldText: string = current.memoizedProps;
         commitTextUpdate(textInstance, oldText, newText);
         return;
       }
@@ -409,30 +436,40 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
         invariant(
           false,
           'This unit of work tag should not have side-effects. This error is ' +
-          'likely caused by a bug in React. Please file an issue.'
+            'likely caused by a bug in React. Please file an issue.',
         );
       }
     }
   }
 
-  function commitLifeCycles(current : Fiber | null, finishedWork : Fiber) : void {
+  function commitLifeCycles(current: Fiber | null, finishedWork: Fiber): void {
     switch (finishedWork.tag) {
       case ClassComponent: {
         const instance = finishedWork.stateNode;
         if (finishedWork.effectTag & Update) {
           if (current === null) {
-            if (typeof instance.componentDidMount === 'function') {
-              instance.componentDidMount();
+            if (__DEV__) {
+              startPhaseTimer(finishedWork, 'componentDidMount');
+            }
+            instance.componentDidMount();
+            if (__DEV__) {
+              stopPhaseTimer();
             }
           } else {
-            if (typeof instance.componentDidUpdate === 'function') {
-              const prevProps = current.memoizedProps;
-              const prevState = current.memoizedState;
-              instance.componentDidUpdate(prevProps, prevState);
+            const prevProps = current.memoizedProps;
+            const prevState = current.memoizedState;
+            if (__DEV__) {
+              startPhaseTimer(finishedWork, 'componentDidUpdate');
+            }
+            instance.componentDidUpdate(prevProps, prevState);
+            if (__DEV__) {
+              stopPhaseTimer();
             }
           }
         }
-        if ((finishedWork.effectTag & Callback) && finishedWork.updateQueue !== null) {
+        if (
+          finishedWork.effectTag & Callback && finishedWork.updateQueue !== null
+        ) {
           commitCallbacks(finishedWork, finishedWork.updateQueue, instance);
         }
         return;
@@ -446,16 +483,13 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
         return;
       }
       case HostComponent: {
-        const instance : I = finishedWork.stateNode;
+        const instance: I = finishedWork.stateNode;
 
         // Renderers may schedule work to be done after host components are mounted
         // (eg DOM renderer may schedule auto-focus for inputs and form controls).
         // These effects should only be committed when components are first mounted,
         // aka when there is no current/alternate.
-        if (
-          current === null &&
-          finishedWork.effectTag & Update
-        ) {
+        if (current === null && finishedWork.effectTag & Update) {
           const type = finishedWork.type;
           const props = finishedWork.memoizedProps;
           commitMount(instance, type, props, finishedWork);
@@ -475,16 +509,13 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
         invariant(
           false,
           'This unit of work tag should not have side-effects. This error is ' +
-          'likely caused by a bug in React. Please file an issue.'
+            'likely caused by a bug in React. Please file an issue.',
         );
       }
     }
   }
 
-  function commitRef(finishedWork : Fiber) {
-    if (finishedWork.tag !== ClassComponent && finishedWork.tag !== HostComponent) {
-      return;
-    }
+  function commitAttachRef(finishedWork: Fiber) {
     const ref = finishedWork.ref;
     if (ref !== null) {
       const instance = getPublicInstance(finishedWork.stateNode);
@@ -492,12 +523,19 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     }
   }
 
+  function commitDetachRef(current: Fiber) {
+    const currentRef = current.ref;
+    if (currentRef !== null) {
+      currentRef(null);
+    }
+  }
+
   return {
     commitPlacement,
     commitDeletion,
     commitWork,
     commitLifeCycles,
-    commitRef,
+    commitAttachRef,
+    commitDetachRef,
   };
-
 };
diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberCompleteWork.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberCompleteWork.js
index 8a0493618321d0..a65b0d3d713531 100644
--- a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberCompleteWork.js
+++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberCompleteWork.js
@@ -12,13 +12,13 @@
 
 'use strict';
 
-import type { ReactCoroutine } from 'ReactCoroutine';
-import type { Fiber } from 'ReactFiber';
-import type { HostContext } from 'ReactFiberHostContext';
-import type { FiberRoot } from 'ReactFiberRoot';
-import type { HostConfig } from 'ReactFiberReconciler';
+import type {ReactCoroutine} from 'ReactCoroutine';
+import type {Fiber} from 'ReactFiber';
+import type {HostContext} from 'ReactFiberHostContext';
+import type {FiberRoot} from 'ReactFiberRoot';
+import type {HostConfig} from 'ReactFiberReconciler';
 
-var { reconcileChildFibers } = require('ReactChildFiber');
+var {reconcileChildFibers} = require('ReactChildFiber');
 var {
   popContextProvider,
 } = require('ReactFiberContext');
@@ -49,8 +49,8 @@ if (__DEV__) {
 var invariant = require('fbjs/lib/invariant');
 
 module.exports = function<T, P, I, TI, PI, C, CX, PL>(
-  config : HostConfig<T, P, I, TI, PI, C, CX, PL>,
-  hostContext : HostContext<C, CX>,
+  config: HostConfig<T, P, I, TI, PI, C, CX, PL>,
+  hostContext: HostContext<C, CX>,
 ) {
   const {
     createInstance,
@@ -79,24 +79,28 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     }
   }
 
-  function markUpdate(workInProgress : Fiber) {
+  function markUpdate(workInProgress: Fiber) {
     // Tag the fiber with an update effect. This turns a Placement into
     // an UpdateAndPlacement.
     workInProgress.effectTag |= Update;
   }
 
-  function appendAllYields(yields : Array<mixed>, workInProgress : Fiber) {
+  function markRef(workInProgress: Fiber) {
+    workInProgress.effectTag |= Ref;
+  }
+
+  function appendAllYields(yields: Array<mixed>, workInProgress: Fiber) {
     let node = workInProgress.stateNode;
     if (node) {
       node.return = workInProgress;
     }
     while (node !== null) {
-      if (node.tag === HostComponent || node.tag === HostText ||
-          node.tag === HostPortal) {
-        invariant(
-          false,
-          'A coroutine cannot have host component children.'
-        );
+      if (
+        node.tag === HostComponent ||
+        node.tag === HostText ||
+        node.tag === HostPortal
+      ) {
+        invariant(false, 'A coroutine cannot have host component children.');
       } else if (node.tag === YieldComponent) {
         yields.push(node.type);
       } else if (node.child !== null) {
@@ -115,12 +119,15 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     }
   }
 
-  function moveCoroutineToHandlerPhase(current : Fiber | null, workInProgress : Fiber) {
-    var coroutine = (workInProgress.memoizedProps : ?ReactCoroutine);
+  function moveCoroutineToHandlerPhase(
+    current: Fiber | null,
+    workInProgress: Fiber,
+  ) {
+    var coroutine = (workInProgress.memoizedProps: ?ReactCoroutine);
     invariant(
       coroutine,
       'Should be resolved by now. This error is likely caused by a bug in ' +
-      'React. Please file an issue.',
+        'React. Please file an issue.',
     );
 
     // First step of the coroutine has completed. Now we need to do the second.
@@ -134,7 +141,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
 
     // Build up the yields.
     // TODO: Compare this to a generator or opaque helpers like Children.
-    var yields : Array<mixed> = [];
+    var yields: Array<mixed> = [];
     appendAllYields(yields, workInProgress);
     var fn = coroutine.handler;
     var props = coroutine.props;
@@ -147,13 +154,13 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
       workInProgress,
       currentFirstChild,
       nextChildren,
-      priority
+      priority,
     );
     markChildAsProgressed(current, workInProgress, priority);
     return workInProgress.child;
   }
 
-  function appendAllChildren(parent : I, workInProgress : Fiber) {
+  function appendAllChildren(parent: I, workInProgress: Fiber) {
     // We only have the top Fiber that was created but we need recurse down its
     // children to find all the terminal nodes.
     let node = workInProgress.child;
@@ -181,7 +188,10 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     }
   }
 
-  function completeWork(current : Fiber | null, workInProgress : Fiber) : Fiber | null {
+  function completeWork(
+    current: Fiber | null,
+    workInProgress: Fiber,
+  ): Fiber | null {
     if (__DEV__) {
       ReactDebugCurrentFiber.current = workInProgress;
     }
@@ -196,7 +206,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
       }
       case HostRoot: {
         // TODO: Pop the host container after #8607 lands.
-        const fiberRoot = (workInProgress.stateNode : FiberRoot);
+        const fiberRoot = (workInProgress.stateNode: FiberRoot);
         if (fiberRoot.pendingContext) {
           fiberRoot.context = fiberRoot.pendingContext;
           fiberRoot.pendingContext = null;
@@ -216,7 +226,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
           // have newProps so we'll have to reuse them.
           // TODO: Split the update API as separate for the props vs. children.
           // Even better would be if children weren't special cased at all tho.
-          const instance : I = workInProgress.stateNode;
+          const instance: I = workInProgress.stateNode;
           const currentHostContext = getHostContext();
           const updatePayload = prepareUpdate(
             instance,
@@ -224,22 +234,25 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
             oldProps,
             newProps,
             rootContainerInstance,
-            currentHostContext
+            currentHostContext,
           );
 
           // TODO: Type this specific to this type of component.
-          workInProgress.updateQueue = (updatePayload : any);
+          workInProgress.updateQueue = (updatePayload: any);
           // If the update payload indicates that there is a change or if there
           // is a new ref we mark this as an update.
-          if (updatePayload || current.ref !== workInProgress.ref) {
+          if (updatePayload) {
             markUpdate(workInProgress);
           }
+          if (current.ref !== workInProgress.ref) {
+            markRef(workInProgress);
+          }
         } else {
           if (!newProps) {
             invariant(
               workInProgress.stateNode !== null,
               'We must have new props for new mounts. This error is likely ' +
-              'caused by a bug in React. Please file an issue.'
+                'caused by a bug in React. Please file an issue.',
             );
             // This can happen when we abort work.
             return null;
@@ -255,7 +268,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
             newProps,
             rootContainerInstance,
             currentHostContext,
-            workInProgress
+            workInProgress,
           );
 
           appendAllChildren(instance, workInProgress);
@@ -263,14 +276,21 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
           // Certain renderers require commit-time effects for initial mount.
           // (eg DOM renderer supports auto-focus for certain elements).
           // Make sure such renderers get scheduled for later work.
-          if (finalizeInitialChildren(instance, type, newProps, rootContainerInstance)) {
+          if (
+            finalizeInitialChildren(
+              instance,
+              type,
+              newProps,
+              rootContainerInstance,
+            )
+          ) {
             markUpdate(workInProgress);
           }
 
           workInProgress.stateNode = instance;
           if (workInProgress.ref !== null) {
             // If there is a ref on a host node we need to schedule a callback
-            workInProgress.effectTag |= Ref;
+            markRef(workInProgress);
           }
         }
         return null;
@@ -289,14 +309,19 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
             invariant(
               workInProgress.stateNode !== null,
               'We must have new props for new mounts. This error is likely ' +
-              'caused by a bug in React. Please file an issue.'
+                'caused by a bug in React. Please file an issue.',
             );
             // This can happen when we abort work.
             return null;
           }
           const rootContainerInstance = getRootHostContainer();
           const currentHostContext = getHostContext();
-          const textInstance = createTextInstance(newText, rootContainerInstance, currentHostContext, workInProgress);
+          const textInstance = createTextInstance(
+            newText,
+            rootContainerInstance,
+            currentHostContext,
+            workInProgress,
+          );
           workInProgress.stateNode = textInstance;
         }
         return null;
@@ -323,15 +348,15 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
         invariant(
           false,
           'An indeterminate component should have become determinate before ' +
-          'completing. This error is likely caused by a bug in React. Please ' +
-          'file an issue.'
+            'completing. This error is likely caused by a bug in React. Please ' +
+            'file an issue.',
         );
-        // eslint-disable-next-line no-fallthrough
+      // eslint-disable-next-line no-fallthrough
       default:
         invariant(
           false,
           'Unknown unit of work tag. This error is likely caused by a bug in ' +
-          'React. Please file an issue.'
+            'React. Please file an issue.',
         );
     }
   }
@@ -339,5 +364,4 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
   return {
     completeWork,
   };
-
 };
diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberContext.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberContext.js
index a40dd997107aa1..0f45d75323ff94 100644
--- a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberContext.js
+++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberContext.js
@@ -12,14 +12,14 @@
 
 'use strict';
 
-import type { Fiber } from 'ReactFiber';
-import type { StackCursor } from 'ReactFiberStack';
+import type {Fiber} from 'ReactFiber';
+import type {StackCursor} from 'ReactFiberStack';
 
 var emptyObject = require('fbjs/lib/emptyObject');
+var getComponentName = require('getComponentName');
 var invariant = require('fbjs/lib/invariant');
 var warning = require('fbjs/lib/warning');
 var {
-  getComponentName,
   isFiberMounted,
 } = require('ReactFiberTreeReflection');
 var {
@@ -35,19 +35,24 @@ const {
 if (__DEV__) {
   var checkReactTypeSpec = require('checkReactTypeSpec');
   var ReactDebugCurrentFrame = require('react/lib/ReactDebugCurrentFrame');
+  var ReactDebugCurrentFiber = require('ReactDebugCurrentFiber');
+  var {
+    startPhaseTimer,
+    stopPhaseTimer,
+  } = require('ReactDebugFiberPerf');
   var warnedAboutMissingGetChildContext = {};
 }
 
 // A cursor to the current merged context object on the stack.
-let contextStackCursor : StackCursor<Object> = createCursor(emptyObject);
+let contextStackCursor: StackCursor<Object> = createCursor(emptyObject);
 // A cursor to a boolean indicating whether the context has changed.
-let didPerformWorkStackCursor : StackCursor<boolean> = createCursor(false);
+let didPerformWorkStackCursor: StackCursor<boolean> = createCursor(false);
 // Keep track of the previous context object that was on the stack.
 // We use this to get access to the parent context after we have already
 // pushed the next context provider, and now need to merge their contexts.
-let previousContext : Object = emptyObject;
+let previousContext: Object = emptyObject;
 
-function getUnmaskedContext(workInProgress : Fiber) : Object {
+function getUnmaskedContext(workInProgress: Fiber): Object {
   const hasOwnContext = isContextProvider(workInProgress);
   if (hasOwnContext) {
     // If the fiber is a context provider itself, when we read its context
@@ -60,14 +65,21 @@ function getUnmaskedContext(workInProgress : Fiber) : Object {
 }
 exports.getUnmaskedContext = getUnmaskedContext;
 
-function cacheContext(workInProgress : Fiber, unmaskedContext : Object, maskedContext : Object) {
+function cacheContext(
+  workInProgress: Fiber,
+  unmaskedContext: Object,
+  maskedContext: Object,
+) {
   const instance = workInProgress.stateNode;
   instance.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext;
   instance.__reactInternalMemoizedMaskedChildContext = maskedContext;
 }
 exports.cacheContext = cacheContext;
 
-exports.getMaskedContext = function(workInProgress : Fiber, unmaskedContext : Object) {
+exports.getMaskedContext = function(
+  workInProgress: Fiber,
+  unmaskedContext: Object,
+) {
   const type = workInProgress.type;
   const contextTypes = type.contextTypes;
   if (!contextTypes) {
@@ -91,7 +103,7 @@ exports.getMaskedContext = function(workInProgress : Fiber, unmaskedContext : Ob
   }
 
   if (__DEV__) {
-    const name = getComponentName(workInProgress);
+    const name = getComponentName(workInProgress) || 'Unknown';
     ReactDebugCurrentFrame.current = workInProgress;
     checkReactTypeSpec(contextTypes, context, 'context', name);
     ReactDebugCurrentFrame.current = null;
@@ -106,27 +118,21 @@ exports.getMaskedContext = function(workInProgress : Fiber, unmaskedContext : Ob
   return context;
 };
 
-exports.hasContextChanged = function() : boolean {
+exports.hasContextChanged = function(): boolean {
   return didPerformWorkStackCursor.current;
 };
 
-function isContextConsumer(fiber : Fiber) : boolean {
-  return (
-    fiber.tag === ClassComponent &&
-    fiber.type.contextTypes != null
-  );
+function isContextConsumer(fiber: Fiber): boolean {
+  return fiber.tag === ClassComponent && fiber.type.contextTypes != null;
 }
 exports.isContextConsumer = isContextConsumer;
 
-function isContextProvider(fiber : Fiber) : boolean {
-  return (
-    fiber.tag === ClassComponent &&
-    fiber.type.childContextTypes != null
-  );
+function isContextProvider(fiber: Fiber): boolean {
+  return fiber.tag === ClassComponent && fiber.type.childContextTypes != null;
 }
 exports.isContextProvider = isContextProvider;
 
-function popContextProvider(fiber : Fiber) : void {
+function popContextProvider(fiber: Fiber): void {
   if (!isContextProvider(fiber)) {
     return;
   }
@@ -136,14 +142,25 @@ function popContextProvider(fiber : Fiber) : void {
 }
 exports.popContextProvider = popContextProvider;
 
-exports.pushTopLevelContextObject = function(fiber : Fiber, context : Object, didChange : boolean) : void {
-  invariant(contextStackCursor.cursor == null, 'Unexpected context found on stack');
+exports.pushTopLevelContextObject = function(
+  fiber: Fiber,
+  context: Object,
+  didChange: boolean,
+): void {
+  invariant(
+    contextStackCursor.cursor == null,
+    'Unexpected context found on stack',
+  );
 
   push(contextStackCursor, context, fiber);
   push(didPerformWorkStackCursor, didChange, fiber);
 };
 
-function processChildContext(fiber : Fiber, parentContext : Object, isReconciling : boolean): Object {
+function processChildContext(
+  fiber: Fiber,
+  parentContext: Object,
+  isReconciling: boolean,
+): Object {
   const instance = fiber.stateNode;
   const childContextTypes = fiber.type.childContextTypes;
 
@@ -151,15 +168,15 @@ function processChildContext(fiber : Fiber, parentContext : Object, isReconcilin
   // It has only been added in Fiber to match the (unintentional) behavior in Stack.
   if (typeof instance.getChildContext !== 'function') {
     if (__DEV__) {
-      const componentName = getComponentName(fiber);
+      const componentName = getComponentName(fiber) || 'Unknown';
 
       if (!warnedAboutMissingGetChildContext[componentName]) {
         warnedAboutMissingGetChildContext[componentName] = true;
         warning(
           false,
           '%s.childContextTypes is specified but there is no getChildContext() method ' +
-          'on the instance. You can either define getChildContext() on %s or remove ' +
-          'childContextTypes from it.',
+            'on the instance. You can either define getChildContext() on %s or remove ' +
+            'childContextTypes from it.',
           componentName,
           componentName,
         );
@@ -168,17 +185,26 @@ function processChildContext(fiber : Fiber, parentContext : Object, isReconcilin
     return parentContext;
   }
 
-  const childContext = instance.getChildContext();
+  let childContext;
+  if (__DEV__) {
+    ReactDebugCurrentFiber.phase = 'getChildContext';
+    startPhaseTimer(fiber, 'getChildContext');
+    childContext = instance.getChildContext();
+    stopPhaseTimer();
+    ReactDebugCurrentFiber.phase = null;
+  } else {
+    childContext = instance.getChildContext();
+  }
   for (let contextKey in childContext) {
     invariant(
       contextKey in childContextTypes,
       '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
-      getComponentName(fiber),
-      contextKey
+      getComponentName(fiber) || 'Unknown',
+      contextKey,
     );
   }
   if (__DEV__) {
-    const name = getComponentName(fiber);
+    const name = getComponentName(fiber) || 'Unknown';
     // We can only provide accurate element stacks if we pass work-in-progress tree
     // during the begin or complete phase. However currently this function is also
     // called from unstable_renderSubtree legacy implementation. In this case it unsafe to
@@ -189,11 +215,12 @@ function processChildContext(fiber : Fiber, parentContext : Object, isReconcilin
     checkReactTypeSpec(childContextTypes, childContext, 'child context', name);
     ReactDebugCurrentFrame.current = null;
   }
+
   return {...parentContext, ...childContext};
 }
 exports.processChildContext = processChildContext;
 
-exports.pushContextProvider = function(workInProgress : Fiber) : boolean {
+exports.pushContextProvider = function(workInProgress: Fiber): boolean {
   if (!isContextProvider(workInProgress)) {
     return false;
   }
@@ -202,10 +229,9 @@ exports.pushContextProvider = function(workInProgress : Fiber) : boolean {
   // We push the context as early as possible to ensure stack integrity.
   // If the instance does not exist yet, we will push null at first,
   // and replace it on the stack later when invalidating the context.
-  const memoizedMergedChildContext = (
-    instance &&
-    instance.__reactInternalMemoizedMergedChildContext
-  ) || emptyObject;
+  const memoizedMergedChildContext = (instance &&
+    instance.__reactInternalMemoizedMergedChildContext) ||
+    emptyObject;
 
   // Remember the parent context so we can merge with it later.
   previousContext = contextStackCursor.current;
@@ -215,12 +241,16 @@ exports.pushContextProvider = function(workInProgress : Fiber) : boolean {
   return true;
 };
 
-exports.invalidateContextProvider = function(workInProgress : Fiber) : void {
+exports.invalidateContextProvider = function(workInProgress: Fiber): void {
   const instance = workInProgress.stateNode;
   invariant(instance, 'Expected to have an instance by this point.');
 
   // Merge parent and own context.
-  const mergedContext = processChildContext(workInProgress, previousContext, true);
+  const mergedContext = processChildContext(
+    workInProgress,
+    previousContext,
+    true,
+  );
   instance.__reactInternalMemoizedMergedChildContext = mergedContext;
 
   // Replace the old (or empty) context with the new one.
@@ -232,21 +262,21 @@ exports.invalidateContextProvider = function(workInProgress : Fiber) : void {
   push(didPerformWorkStackCursor, true, workInProgress);
 };
 
-exports.resetContext = function() : void {
+exports.resetContext = function(): void {
   previousContext = emptyObject;
   contextStackCursor.current = emptyObject;
   didPerformWorkStackCursor.current = false;
 };
 
-exports.findCurrentUnmaskedContext = function(fiber: Fiber) : Object {
+exports.findCurrentUnmaskedContext = function(fiber: Fiber): Object {
   // Currently this is only used with renderSubtreeIntoContainer; not sure if it
   // makes sense elsewhere
   invariant(
     isFiberMounted(fiber) && fiber.tag === ClassComponent,
-    'Expected subtree parent to be a mounted class component'
+    'Expected subtree parent to be a mounted class component',
   );
 
-  let node : Fiber = fiber;
+  let node: Fiber = fiber;
   while (node.tag !== HostRoot) {
     if (isContextProvider(node)) {
       return node.stateNode.__reactInternalMemoizedMergedChildContext;
diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberDevToolsHook.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberDevToolsHook.js
index 6fc5666845ab33..dbf88b834921d7 100644
--- a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberDevToolsHook.js
+++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberDevToolsHook.js
@@ -14,10 +14,10 @@
 
 var warning = require('fbjs/lib/warning');
 
-import type { Fiber } from 'ReactFiber';
-import type { FiberRoot } from 'ReactFiberRoot';
+import type {Fiber} from 'ReactFiber';
+import type {FiberRoot} from 'ReactFiberRoot';
 
-declare var __REACT_DEVTOOLS_GLOBAL_HOOK__ : Object | void;
+declare var __REACT_DEVTOOLS_GLOBAL_HOOK__: Object | void;
 
 let rendererID = null;
 let injectInternals = null;
@@ -33,12 +33,12 @@ if (
     onCommitFiberUnmount,
   } = __REACT_DEVTOOLS_GLOBAL_HOOK__;
 
-  injectInternals = function(internals : Object) {
+  injectInternals = function(internals: Object) {
     warning(rendererID == null, 'Cannot inject into DevTools twice.');
     rendererID = inject(internals);
   };
 
-  onCommitRoot = function(root : FiberRoot) {
+  onCommitRoot = function(root: FiberRoot) {
     if (rendererID == null) {
       return;
     }
@@ -52,7 +52,7 @@ if (
     }
   };
 
-  onCommitUnmount = function(fiber : Fiber) {
+  onCommitUnmount = function(fiber: Fiber) {
     if (rendererID == null) {
       return;
     }
diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberErrorLogger.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberErrorLogger.js
index 0a8a055911a28b..30678fc0826c78 100644
--- a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberErrorLogger.js
+++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberErrorLogger.js
@@ -12,9 +12,9 @@
 
 'use strict';
 
-import type { CapturedError } from 'ReactFiberScheduler';
+import type {CapturedError} from 'ReactFiberScheduler';
 
-function logCapturedError(capturedError : CapturedError) : void {
+function logCapturedError(capturedError: CapturedError): void {
   if (__DEV__) {
     const {
       componentName,
@@ -31,9 +31,7 @@ function logCapturedError(capturedError : CapturedError) : void {
       stack,
     } = error;
 
-    const errorSummary = message
-      ? `${name}: ${message}`
-      : name;
+    const errorSummary = message ? `${name}: ${message}` : name;
 
     const componentNameMessage = componentName
       ? `React caught an error thrown by ${componentName}.`
@@ -43,48 +41,45 @@ function logCapturedError(capturedError : CapturedError) : void {
     // Chrome prepends the Error name and type.
     // Firefox, Safari, and IE don't indent the stack lines.
     // Format it in a consistent way for error logging.
-    let formattedCallStack = stack.slice(0, errorSummary.length) === errorSummary
+    let formattedCallStack = stack.slice(0, errorSummary.length) ===
+      errorSummary
       ? stack.slice(errorSummary.length)
       : stack;
     formattedCallStack = formattedCallStack
       .trim()
       .split('\n')
-      .map((line) => `\n    ${line.trim()}`)
+      .map(line => `\n    ${line.trim()}`)
       .join();
 
     let errorBoundaryMessage;
     // errorBoundaryFound check is sufficient; errorBoundaryName check is to satisfy Flow.
     if (errorBoundaryFound && errorBoundaryName) {
       if (willRetry) {
-        errorBoundaryMessage =
-          `React will try to recreate this component tree from scratch ` +
+        errorBoundaryMessage = `React will try to recreate this component tree from scratch ` +
           `using the error boundary you provided, ${errorBoundaryName}.`;
       } else {
-        errorBoundaryMessage =
-          `This error was initially handled by the error boundary ${errorBoundaryName}. ` +
+        errorBoundaryMessage = `This error was initially handled by the error boundary ${errorBoundaryName}. ` +
           `Recreating the tree from scratch failed so React will unmount the tree.`;
       }
     } else {
       // TODO Link to unstable_handleError() documentation once it exists.
-      errorBoundaryMessage =
-        'Consider adding an error boundary to your tree to customize error handling behavior.';
+      errorBoundaryMessage = 'Consider adding an error boundary to your tree to customize error handling behavior.';
     }
 
     console.error(
       `${componentNameMessage} You should fix this error in your code. ${errorBoundaryMessage}\n\n` +
-      `${errorSummary}\n\n` +
-      `The error is located at: ${componentStack}\n\n` +
-      `The error was thrown at: ${formattedCallStack}`
+        `${errorSummary}\n\n` +
+        `The error is located at: ${componentStack}\n\n` +
+        `The error was thrown at: ${formattedCallStack}`,
     );
   }
 
   if (!__DEV__) {
-    const { error } = capturedError;
+    const {error} = capturedError;
     console.error(
-      `React caught an error thrown by one of your components.\n\n${error.stack}`
+      `React caught an error thrown by one of your components.\n\n${error.stack}`,
     );
   }
 }
 
 exports.logCapturedError = logCapturedError;
-
diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberHostContext.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberHostContext.js
index 8962a482ac0975..b6252bbc0fa909 100644
--- a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberHostContext.js
+++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberHostContext.js
@@ -12,9 +12,9 @@
 
 'use strict';
 
-import type { Fiber } from 'ReactFiber';
-import type { HostConfig } from 'ReactFiberReconciler';
-import type { StackCursor } from 'ReactFiberStack';
+import type {Fiber} from 'ReactFiber';
+import type {HostConfig} from 'ReactFiberReconciler';
+import type {StackCursor} from 'ReactFiberStack';
 
 const emptyObject = require('fbjs/lib/emptyObject');
 
@@ -27,38 +27,40 @@ const {
 const invariant = require('fbjs/lib/invariant');
 
 export type HostContext<C, CX> = {
-  getHostContext() : CX,
-  getRootHostContainer() : C,
-  popHostContainer(fiber : Fiber) : void,
-  popHostContext(fiber : Fiber) : void,
-  pushHostContainer(fiber : Fiber, container : C) : void,
-  pushHostContext(fiber : Fiber) : void,
-  resetHostContainer() : void,
+  getHostContext(): CX,
+  getRootHostContainer(): C,
+  popHostContainer(fiber: Fiber): void,
+  popHostContext(fiber: Fiber): void,
+  pushHostContainer(fiber: Fiber, container: C): void,
+  pushHostContext(fiber: Fiber): void,
+  resetHostContainer(): void,
 };
 
 module.exports = function<T, P, I, TI, PI, C, CX, PL>(
-  config : HostConfig<T, P, I, TI, PI, C, CX, PL>
-) : HostContext<C, CX> {
+  config: HostConfig<T, P, I, TI, PI, C, CX, PL>,
+): HostContext<C, CX> {
   const {
     getChildHostContext,
     getRootHostContext,
   } = config;
 
-  let contextStackCursor : StackCursor<CX | null> = createCursor((null: ?CX));
-  let contextFiberStackCursor : StackCursor<Fiber | null> = createCursor((null: Fiber | null));
-  let rootInstanceStackCursor : StackCursor<C | null> = createCursor((null: ?C));
+  let contextStackCursor: StackCursor<CX | null> = createCursor((null: ?CX));
+  let contextFiberStackCursor: StackCursor<Fiber | null> = createCursor(
+    (null: Fiber | null),
+  );
+  let rootInstanceStackCursor: StackCursor<C | null> = createCursor((null: ?C));
 
-  function getRootHostContainer() : C {
+  function getRootHostContainer(): C {
     const rootInstance = rootInstanceStackCursor.current;
     invariant(
       rootInstance !== null,
       'Expected root container to exist. This error is likely caused by a ' +
-      'bug in React. Please file an issue.'
+        'bug in React. Please file an issue.',
     );
     return rootInstance;
   }
 
-  function pushHostContainer(fiber : Fiber, nextRootInstance : C) {
+  function pushHostContainer(fiber: Fiber, nextRootInstance: C) {
     // Push current root instance onto the stack;
     // This allows us to reset root when portals are popped.
     push(rootInstanceStackCursor, nextRootInstance, fiber);
@@ -71,33 +73,33 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     push(contextStackCursor, nextRootContext, fiber);
   }
 
-  function popHostContainer(fiber : Fiber) {
+  function popHostContainer(fiber: Fiber) {
     pop(contextStackCursor, fiber);
     pop(contextFiberStackCursor, fiber);
     pop(rootInstanceStackCursor, fiber);
   }
 
-  function getHostContext() : CX {
+  function getHostContext(): CX {
     const context = contextStackCursor.current;
     invariant(
       context != null,
       'Expected host context to exist. This error is likely caused by a bug ' +
-      'in React. Please file an issue.'
+        'in React. Please file an issue.',
     );
     return context;
   }
 
-  function pushHostContext(fiber : Fiber) : void {
+  function pushHostContext(fiber: Fiber): void {
     const rootInstance = rootInstanceStackCursor.current;
     invariant(
       rootInstance != null,
       'Expected root host context to exist. This error is likely caused by ' +
-      'a bug in React. Please file an issue.'
+        'a bug in React. Please file an issue.',
     );
 
-    const context = contextStackCursor.current !== null ?
-      contextStackCursor.current :
-      emptyObject;
+    const context = contextStackCursor.current !== null
+      ? contextStackCursor.current
+      : emptyObject;
     const nextContext = getChildHostContext(context, fiber.type, rootInstance);
 
     // Don't push this Fiber's context unless it's unique.
@@ -111,7 +113,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     push(contextStackCursor, nextContext, fiber);
   }
 
-  function popHostContext(fiber : Fiber) : void {
+  function popHostContext(fiber: Fiber): void {
     // Do not pop unless this Fiber provided the current context.
     // pushHostContext() only pushes Fibers that provide unique contexts.
     if (contextFiberStackCursor.current !== fiber) {
diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberReconciler.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberReconciler.js
index 50aa0223785717..75e96aa274dfef 100644
--- a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberReconciler.js
+++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberReconciler.js
@@ -12,10 +12,10 @@
 
 'use strict';
 
-import type { Fiber } from 'ReactFiber';
-import type { FiberRoot } from 'ReactFiberRoot';
-import type { PriorityLevel } from 'ReactPriorityLevel';
-import type { ReactNodeList } from 'ReactTypes';
+import type {Fiber} from 'ReactFiber';
+import type {FiberRoot} from 'ReactFiberRoot';
+import type {PriorityLevel} from 'ReactPriorityLevel';
+import type {ReactNodeList} from 'ReactTypes';
 
 var {
   addTopLevelUpdate,
@@ -26,113 +26,131 @@ var {
   isContextProvider,
   processChildContext,
 } = require('ReactFiberContext');
-var { createFiberRoot } = require('ReactFiberRoot');
+var {createFiberRoot} = require('ReactFiberRoot');
 var ReactFiberScheduler = require('ReactFiberScheduler');
 
 if (__DEV__) {
   var warning = require('fbjs/lib/warning');
   var ReactFiberInstrumentation = require('ReactFiberInstrumentation');
+  var ReactDebugCurrentFiber = require('ReactDebugCurrentFiber');
+  var getComponentName = require('getComponentName');
 }
 
-var { findCurrentHostFiber } = require('ReactFiberTreeReflection');
+var {findCurrentHostFiber} = require('ReactFiberTreeReflection');
 
 var getContextForSubtree = require('getContextForSubtree');
 
 export type Deadline = {
-  timeRemaining : () => number
+  timeRemaining: () => number,
 };
 
 type OpaqueHandle = Fiber;
 type OpaqueRoot = FiberRoot;
 
 export type HostConfig<T, P, I, TI, PI, C, CX, PL> = {
-
-  getRootHostContext(rootContainerInstance : C) : CX,
-  getChildHostContext(parentHostContext : CX, type : T) : CX,
-  getPublicInstance(instance : I | TI) : PI,
+  getRootHostContext(rootContainerInstance: C): CX,
+  getChildHostContext(parentHostContext: CX, type: T): CX,
+  getPublicInstance(instance: I | TI): PI,
 
   createInstance(
-    type : T,
-    props : P,
-    rootContainerInstance : C,
-    hostContext : CX,
-    internalInstanceHandle : OpaqueHandle
-  ) : I,
-  appendInitialChild(parentInstance : I, child : I | TI) : void,
-  finalizeInitialChildren(parentInstance : I, type : T, props : P, rootContainerInstance : C) : boolean,
+    type: T,
+    props: P,
+    rootContainerInstance: C,
+    hostContext: CX,
+    internalInstanceHandle: OpaqueHandle,
+  ): I,
+  appendInitialChild(parentInstance: I, child: I | TI): void,
+  finalizeInitialChildren(
+    parentInstance: I,
+    type: T,
+    props: P,
+    rootContainerInstance: C,
+  ): boolean,
 
   prepareUpdate(
-    instance : I,
-    type : T,
-    oldProps : P,
-    newProps : P,
-    rootContainerInstance : C,
-    hostContext : CX
-  ) : null | PL,
+    instance: I,
+    type: T,
+    oldProps: P,
+    newProps: P,
+    rootContainerInstance: C,
+    hostContext: CX,
+  ): null | PL,
   commitUpdate(
-    instance : I,
-    updatePayload : PL,
-    type : T,
-    oldProps : P,
-    newProps : P,
-    internalInstanceHandle : OpaqueHandle
-  ) : void,
-  commitMount(instance : I, type : T, newProps : P, internalInstanceHandle : OpaqueHandle) : void,
-
-  shouldSetTextContent(props : P) : boolean,
-  resetTextContent(instance : I) : void,
+    instance: I,
+    updatePayload: PL,
+    type: T,
+    oldProps: P,
+    newProps: P,
+    internalInstanceHandle: OpaqueHandle,
+  ): void,
+  commitMount(
+    instance: I,
+    type: T,
+    newProps: P,
+    internalInstanceHandle: OpaqueHandle,
+  ): void,
+
+  shouldSetTextContent(props: P): boolean,
+  resetTextContent(instance: I): void,
+  shouldDeprioritizeSubtree(type: T, props: P): boolean,
 
   createTextInstance(
-    text : string,
-    rootContainerInstance : C,
-    hostContext : CX,
-    internalInstanceHandle : OpaqueHandle
-  ) : TI,
-  commitTextUpdate(textInstance : TI, oldText : string, newText : string) : void,
-
-  appendChild(parentInstance : I | C, child : I | TI) : void,
-  insertBefore(parentInstance : I | C, child : I | TI, beforeChild : I | TI) : void,
-  removeChild(parentInstance : I | C, child : I | TI) : void,
-
-  scheduleAnimationCallback(callback : () => void) : number | void,
-  scheduleDeferredCallback(callback : (deadline : Deadline) => void) : number | void,
-
-  prepareForCommit() : void,
-  resetAfterCommit() : void,
-
-  useSyncScheduling ?: boolean,
+    text: string,
+    rootContainerInstance: C,
+    hostContext: CX,
+    internalInstanceHandle: OpaqueHandle,
+  ): TI,
+  commitTextUpdate(textInstance: TI, oldText: string, newText: string): void,
+
+  appendChild(parentInstance: I | C, child: I | TI): void,
+  insertBefore(parentInstance: I | C, child: I | TI, beforeChild: I | TI): void,
+  removeChild(parentInstance: I | C, child: I | TI): void,
+
+  scheduleAnimationCallback(callback: () => void): number | void,
+  scheduleDeferredCallback(callback: (deadline: Deadline) => void):
+    | number
+    | void,
+
+  prepareForCommit(): void,
+  resetAfterCommit(): void,
+
+  useSyncScheduling?: boolean,
 };
 
 export type Reconciler<C, I, TI> = {
-  createContainer(containerInfo : C) : OpaqueRoot,
+  createContainer(containerInfo: C): OpaqueRoot,
   updateContainer(
-    element : ReactNodeList,
-    container : OpaqueRoot,
-    parentComponent : ?ReactComponent<any, any, any>
-  ) : void,
-  performWithPriority(priorityLevel : PriorityLevel, fn : Function) : void,
-  batchedUpdates<A>(fn : () => A) : A,
-  unbatchedUpdates<A>(fn : () => A) : A,
-  syncUpdates<A>(fn : () => A) : A,
-  deferredUpdates<A>(fn : () => A) : A,
+    element: ReactNodeList,
+    container: OpaqueRoot,
+    parentComponent: ?ReactComponent<any, any, any>,
+  ): void,
+  performWithPriority(priorityLevel: PriorityLevel, fn: Function): void,
+  batchedUpdates<A>(fn: () => A): A,
+  unbatchedUpdates<A>(fn: () => A): A,
+  syncUpdates<A>(fn: () => A): A,
+  deferredUpdates<A>(fn: () => A): A,
 
   // Used to extract the return value from the initial render. Legacy API.
-  getPublicRootInstance(container : OpaqueRoot) : (ReactComponent<any, any, any> | TI | I | null),
+  getPublicRootInstance(container: OpaqueRoot):
+    | ReactComponent<any, any, any>
+    | TI
+    | I
+    | null,
 
   // Use for findDOMNode/findHostNode. Legacy API.
-  findHostInstance(component : Fiber) : I | TI | null,
+  findHostInstance(component: Fiber): I | TI | null,
 };
 
-getContextForSubtree._injectFiber(function(fiber : Fiber) {
+getContextForSubtree._injectFiber(function(fiber: Fiber) {
   const parentContext = findCurrentUnmaskedContext(fiber);
-  return isContextProvider(fiber) ?
-    processChildContext(fiber, parentContext, false) :
-    parentContext;
+  return isContextProvider(fiber)
+    ? processChildContext(fiber, parentContext, false)
+    : parentContext;
 });
 
 module.exports = function<T, P, I, TI, PI, C, CX, PL>(
-  config : HostConfig<T, P, I, TI, PI, C, CX, PL>
-) : Reconciler<C, I, TI> {
+  config: HostConfig<T, P, I, TI, PI, C, CX, PL>,
+): Reconciler<C, I, TI> {
   var {
     scheduleUpdate,
     getPriorityContext,
@@ -143,16 +161,36 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     deferredUpdates,
   } = ReactFiberScheduler(config);
 
-  function scheduleTopLevelUpdate(current : Fiber, element : ReactNodeList, callback : ?Function) {
+  function scheduleTopLevelUpdate(
+    current: Fiber,
+    element: ReactNodeList,
+    callback: ?Function,
+  ) {
+    if (__DEV__) {
+      if (
+        ReactDebugCurrentFiber.phase === 'render' &&
+        ReactDebugCurrentFiber.current !== null
+      ) {
+        warning(
+          false,
+          'Render methods should be a pure function of props and state; ' +
+            'triggering nested component updates from render is not allowed. ' +
+            'If necessary, trigger nested updates in componentDidUpdate.\n\n' +
+            'Check the render method of %s.',
+          getComponentName(ReactDebugCurrentFiber.current) || 'Unknown',
+        );
+      }
+    }
+
     const priorityLevel = getPriorityContext();
-    const nextState = { element };
+    const nextState = {element};
     callback = callback === undefined ? null : callback;
     if (__DEV__) {
       warning(
         callback === null || typeof callback === 'function',
         'render(...): Expected the last optional `callback` argument to be a ' +
-        'function. Instead received: %s.',
-        String(callback)
+          'function. Instead received: %s.',
+        callback,
       );
     }
     addTopLevelUpdate(current, nextState, callback, priorityLevel);
@@ -160,17 +198,16 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
   }
 
   return {
-
-    createContainer(containerInfo : C) : OpaqueRoot {
+    createContainer(containerInfo: C): OpaqueRoot {
       return createFiberRoot(containerInfo);
     },
 
     updateContainer(
-      element : ReactNodeList,
-      container : OpaqueRoot,
-      parentComponent : ?ReactComponent<any, any, any>,
-      callback: ?Function
-    ) : void {
+      element: ReactNodeList,
+      container: OpaqueRoot,
+      parentComponent: ?ReactComponent<any, any, any>,
+      callback: ?Function,
+    ): void {
       // TODO: If this is a nested container, this won't be the root.
       const current = container.current;
 
@@ -206,7 +243,9 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
 
     deferredUpdates,
 
-    getPublicRootInstance(container : OpaqueRoot) : (ReactComponent<any, any, any> | I | TI | null) {
+    getPublicRootInstance(
+      container: OpaqueRoot,
+    ): ReactComponent<any, any, any> | I | TI | null {
       const containerFiber = container.current;
       if (!containerFiber.child) {
         return null;
@@ -214,14 +253,12 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
       return containerFiber.child.stateNode;
     },
 
-    findHostInstance(fiber : Fiber) : I | TI | null {
+    findHostInstance(fiber: Fiber): I | TI | null {
       const hostFiber = findCurrentHostFiber(fiber);
       if (hostFiber === null) {
         return null;
       }
       return hostFiber.stateNode;
     },
-
   };
-
 };
diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberRoot.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberRoot.js
index f93dff9ba3d9a4..409b7065544576 100644
--- a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberRoot.js
+++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberRoot.js
@@ -12,9 +12,9 @@
 
 'use strict';
 
-import type { Fiber } from 'ReactFiber';
+import type {Fiber} from 'ReactFiber';
 
-const { createHostRootFiber } = require('ReactFiber');
+const {createHostRootFiber} = require('ReactFiber');
 
 export type FiberRoot = {
   // Any additional information from the host associated with this root.
@@ -30,7 +30,7 @@ export type FiberRoot = {
   pendingContext: Object | null,
 };
 
-exports.createFiberRoot = function(containerInfo : any) : FiberRoot {
+exports.createFiberRoot = function(containerInfo: any): FiberRoot {
   // Cyclic construction. This cheats the type system right now because
   // stateNode is any.
   const uninitializedFiber = createHostRootFiber();
diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberScheduler.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberScheduler.js
index 0da191418380eb..29b74134ec3831 100644
--- a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberScheduler.js
+++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberScheduler.js
@@ -12,29 +12,34 @@
 
 'use strict';
 
-import type { Fiber } from 'ReactFiber';
-import type { FiberRoot } from 'ReactFiberRoot';
-import type { HostConfig, Deadline } from 'ReactFiberReconciler';
-import type { PriorityLevel } from 'ReactPriorityLevel';
+import type {Fiber} from 'ReactFiber';
+import type {FiberRoot} from 'ReactFiberRoot';
+import type {HostConfig, Deadline} from 'ReactFiberReconciler';
+import type {PriorityLevel} from 'ReactPriorityLevel';
 
 export type CapturedError = {
-  componentName : ?string,
-  componentStack : string,
-  error : Error,
-  errorBoundary : ?Object,
-  errorBoundaryFound : boolean,
-  errorBoundaryName : string | null,
-  willRetry : boolean,
+  componentName: ?string,
+  componentStack: string,
+  error: Error,
+  errorBoundary: ?Object,
+  errorBoundaryFound: boolean,
+  errorBoundaryName: string | null,
+  willRetry: boolean,
+};
+
+export type HandleErrorInfo = {
+  componentStack: string,
 };
 
 var {
   popContextProvider,
 } = require('ReactFiberContext');
-const { reset } = require('ReactFiberStack');
+const {reset} = require('ReactFiberStack');
 var {
   getStackAddendumByWorkInProgressFiber,
-} = require('react/lib/ReactComponentTreeHook');
-var { logCapturedError } = require('ReactFiberErrorLogger');
+} = require('ReactFiberComponentTreeHook');
+var {logCapturedError} = require('ReactFiberErrorLogger');
+var {invokeGuardedCallback} = require('ReactErrorUtils');
 
 var ReactFiberBeginWork = require('ReactFiberBeginWork');
 var ReactFiberCompleteWork = require('ReactFiberCompleteWork');
@@ -44,8 +49,8 @@ var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');
 var ReactFeatureFlags = require('ReactFeatureFlags');
 var getComponentName = require('getComponentName');
 
-var { cloneFiber } = require('ReactFiber');
-var { onCommitRoot } = require('ReactFiberDevToolsHook');
+var {cloneFiber} = require('ReactFiber');
+var {onCommitRoot} = require('ReactFiberDevToolsHook');
 
 var {
   NoWork,
@@ -90,38 +95,75 @@ if (__DEV__) {
   var warning = require('fbjs/lib/warning');
   var ReactFiberInstrumentation = require('ReactFiberInstrumentation');
   var ReactDebugCurrentFiber = require('ReactDebugCurrentFiber');
-
-  var warnAboutUpdateOnUnmounted = function(instance : ReactClass<any>) {
+  var {
+    recordEffect,
+    recordScheduleUpdate,
+    startWorkTimer,
+    stopWorkTimer,
+    startWorkLoopTimer,
+    stopWorkLoopTimer,
+    startCommitTimer,
+    stopCommitTimer,
+    startCommitHostEffectsTimer,
+    stopCommitHostEffectsTimer,
+    startCommitLifeCyclesTimer,
+    stopCommitLifeCyclesTimer,
+  } = require('ReactDebugFiberPerf');
+
+  var warnAboutUpdateOnUnmounted = function(instance: ReactClass<any>) {
     const ctor = instance.constructor;
     warning(
       false,
       'Can only update a mounted or mounting component. This usually means ' +
-      'you called setState, replaceState, or forceUpdate on an unmounted ' +
-      'component. This is a no-op.\n\nPlease check the code for the ' +
-      '%s component.',
-      ctor && (ctor.displayName || ctor.name) || 'ReactClass'
+        'you called setState, replaceState, or forceUpdate on an unmounted ' +
+        'component. This is a no-op.\n\nPlease check the code for the ' +
+        '%s component.',
+      (ctor && (ctor.displayName || ctor.name)) || 'ReactClass',
     );
   };
+
+  var warnAboutInvalidUpdates = function(instance: ReactClass<any>) {
+    switch (ReactDebugCurrentFiber.phase) {
+      case 'getChildContext':
+        warning(
+          false,
+          'setState(...): Cannot call setState() inside getChildContext()',
+        );
+        break;
+      case 'render':
+        warning(
+          false,
+          'Cannot update during an existing state transition (such as within ' +
+            "`render` or another component's constructor). Render methods should " +
+            'be a pure function of props and state; constructor side-effects are ' +
+            'an anti-pattern, but can be moved to `componentWillMount`.',
+        );
+        break;
+    }
+  };
 }
 
 var timeHeuristicForUnitOfWork = 1;
 
-module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P, I, TI, PI, C, CX, PL>) {
+module.exports = function<T, P, I, TI, PI, C, CX, PL>(
+  config: HostConfig<T, P, I, TI, PI, C, CX, PL>,
+) {
   const hostContext = ReactFiberHostContext(config);
-  const { popHostContainer, popHostContext, resetHostContainer } = hostContext;
-  const { beginWork, beginFailedWork } = ReactFiberBeginWork(
+  const {popHostContainer, popHostContext, resetHostContainer} = hostContext;
+  const {beginWork, beginFailedWork} = ReactFiberBeginWork(
     config,
     hostContext,
     scheduleUpdate,
     getPriorityContext,
   );
-  const { completeWork } = ReactFiberCompleteWork(config, hostContext);
+  const {completeWork} = ReactFiberCompleteWork(config, hostContext);
   const {
     commitPlacement,
     commitDeletion,
     commitWork,
     commitLifeCycles,
-    commitRef,
+    commitAttachRef,
+    commitDetachRef,
   } = ReactFiberCommitWork(config, captureError);
   const {
     scheduleAnimationCallback: hostScheduleAnimationCallback,
@@ -133,52 +175,55 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
 
   // The priority level to use when scheduling an update.
   // TODO: Should we change this to an array? Might be less confusing.
-  let priorityContext : PriorityLevel = useSyncScheduling ?
-    SynchronousPriority :
-    LowPriority;
+  let priorityContext: PriorityLevel = useSyncScheduling
+    ? SynchronousPriority
+    : LowPriority;
 
   // Keep track of this so we can reset the priority context if an error
   // is thrown during reconciliation.
-  let priorityContextBeforeReconciliation : PriorityLevel = NoWork;
+  let priorityContextBeforeReconciliation: PriorityLevel = NoWork;
 
   // Keeps track of whether we're currently in a work loop.
-  let isPerformingWork : boolean = false;
+  let isPerformingWork: boolean = false;
+
+  // Keeps track of whether the current deadline has expired.
+  let deadlineHasExpired: boolean = false;
 
   // Keeps track of whether we should should batch sync updates.
-  let isBatchingUpdates : boolean = false;
+  let isBatchingUpdates: boolean = false;
 
   // The next work in progress fiber that we're currently working on.
-  let nextUnitOfWork : Fiber | null = null;
-  let nextPriorityLevel : PriorityLevel = NoWork;
+  let nextUnitOfWork: Fiber | null = null;
+  let nextPriorityLevel: PriorityLevel = NoWork;
 
   // The next fiber with an effect that we're currently committing.
-  let nextEffect : Fiber | null = null;
+  let nextEffect: Fiber | null = null;
 
-  let pendingCommit : Fiber | null = null;
+  let pendingCommit: Fiber | null = null;
 
   // Linked list of roots with scheduled work on them.
-  let nextScheduledRoot : FiberRoot | null = null;
-  let lastScheduledRoot : FiberRoot | null = null;
+  let nextScheduledRoot: FiberRoot | null = null;
+  let lastScheduledRoot: FiberRoot | null = null;
 
   // Keep track of which host environment callbacks are scheduled.
-  let isAnimationCallbackScheduled : boolean = false;
-  let isDeferredCallbackScheduled : boolean = false;
+  let isAnimationCallbackScheduled: boolean = false;
+  let isDeferredCallbackScheduled: boolean = false;
 
   // Keep track of which fibers have captured an error that need to be handled.
   // Work is removed from this collection after unstable_handleError is called.
-  let capturedErrors : Map<Fiber, CapturedError> | null = null;
+  let capturedErrors: Map<Fiber, CapturedError> | null = null;
   // Keep track of which fibers have failed during the current batch of work.
   // This is a different set than capturedErrors, because it is not reset until
   // the end of the batch. This is needed to propagate errors correctly if a
   // subtree fails more than once.
-  let failedBoundaries : Set<Fiber> | null = null;
+  let failedBoundaries: Set<Fiber> | null = null;
   // Error boundaries that captured an error during the current commit.
-  let commitPhaseBoundaries : Set<Fiber> | null = null;
-  let firstUncaughtError : Error | null = null;
-  let fatalError : Error | null = null;
+  let commitPhaseBoundaries: Set<Fiber> | null = null;
+  let firstUncaughtError: Error | null = null;
+  let fatalError: Error | null = null;
 
-  let isCommitting : boolean = false;
-  let isUnmounting : boolean = false;
+  let isCommitting: boolean = false;
+  let isUnmounting: boolean = false;
 
   function scheduleAnimationCallback(callback) {
     if (!isAnimationCallbackScheduled) {
@@ -207,7 +252,10 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
   // the work loop.
   function findNextUnitOfWork() {
     // Clear out roots with no more work on them, or if they have uncaught errors
-    while (nextScheduledRoot !== null && nextScheduledRoot.current.pendingWorkPriority === NoWork) {
+    while (
+      nextScheduledRoot !== null &&
+      nextScheduledRoot.current.pendingWorkPriority === NoWork
+    ) {
       // Unschedule this root.
       nextScheduledRoot.isScheduled = false;
       // Read the next pointer now.
@@ -230,9 +278,11 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
     let highestPriorityRoot = null;
     let highestPriorityLevel = NoWork;
     while (root !== null) {
-      if (root.current.pendingWorkPriority !== NoWork && (
-          highestPriorityLevel === NoWork ||
-          highestPriorityLevel > root.current.pendingWorkPriority)) {
+      if (
+        root.current.pendingWorkPriority !== NoWork &&
+        (highestPriorityLevel === NoWork ||
+          highestPriorityLevel > root.current.pendingWorkPriority)
+      ) {
         highestPriorityLevel = root.current.pendingWorkPriority;
         highestPriorityRoot = root;
       }
@@ -250,10 +300,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
       // unfortunately this is it.
       resetContextStack();
 
-      return cloneFiber(
-        highestPriorityRoot.current,
-        highestPriorityLevel
-      );
+      return cloneFiber(highestPriorityRoot.current, highestPriorityLevel);
     }
 
     nextPriorityLevel = NoWork;
@@ -264,18 +311,26 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
     while (nextEffect !== null) {
       if (__DEV__) {
         ReactDebugCurrentFiber.current = nextEffect;
+        recordEffect();
       }
 
-      if (nextEffect.effectTag & ContentReset) {
+      const effectTag = nextEffect.effectTag;
+      if (effectTag & ContentReset) {
         config.resetTextContent(nextEffect.stateNode);
       }
 
+      if (effectTag & Ref) {
+        const current = nextEffect.alternate;
+        if (current !== null) {
+          commitDetachRef(current);
+        }
+      }
+
       // The following switch statement is only concerned about placement,
       // updates, and deletions. To avoid needing to add a case for every
       // possible bitmap value, we remove the secondary effects from the
       // effect tag and switch on that value.
-      let primaryEffectTag =
-        nextEffect.effectTag & ~(Callback | Err | ContentReset | Ref);
+      let primaryEffectTag = effectTag & ~(Callback | Err | ContentReset | Ref);
       switch (primaryEffectTag) {
         case Placement: {
           commitPlacement(nextEffect);
@@ -321,17 +376,28 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
 
   function commitAllLifeCycles() {
     while (nextEffect !== null) {
-      const current = nextEffect.alternate;
+      const effectTag = nextEffect.effectTag;
+
       // Use Task priority for lifecycle updates
-      if (nextEffect.effectTag & (Update | Callback)) {
+      if (effectTag & (Update | Callback)) {
+        if (__DEV__) {
+          recordEffect();
+        }
+        const current = nextEffect.alternate;
         commitLifeCycles(current, nextEffect);
       }
 
-      if (nextEffect.effectTag & Ref) {
-        commitRef(nextEffect);
+      if (effectTag & Ref) {
+        if (__DEV__) {
+          recordEffect();
+        }
+        commitAttachRef(nextEffect);
       }
 
-      if (nextEffect.effectTag & Err) {
+      if (effectTag & Err) {
+        if (__DEV__) {
+          recordEffect();
+        }
         commitErrorHandling(nextEffect);
       }
 
@@ -347,20 +413,23 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
     }
   }
 
-  function commitAllWork(finishedWork : Fiber) {
+  function commitAllWork(finishedWork: Fiber) {
     // We keep track of this so that captureError can collect any boundaries
     // that capture an error during the commit phase. The reason these aren't
     // local to this function is because errors that occur during cWU are
     // captured elsewhere, to prevent the unmount from being interrupted.
     isCommitting = true;
+    if (__DEV__) {
+      startCommitTimer();
+    }
 
     pendingCommit = null;
-    const root : FiberRoot = (finishedWork.stateNode : any);
+    const root: FiberRoot = (finishedWork.stateNode: any);
     invariant(
       root.current !== finishedWork,
       'Cannot commit the same tree as before. This is probably a bug ' +
-      'related to the return field. This error is likely caused by a bug ' +
-      'in React. Please file an issue.'
+        'related to the return field. This error is likely caused by a bug ' +
+        'in React. Please file an issue.',
     );
 
     // Reset this to null before calling lifecycles
@@ -393,14 +462,30 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
     // The first pass performs all the host insertions, updates, deletions and
     // ref unmounts.
     nextEffect = firstEffect;
+    if (__DEV__) {
+      startCommitHostEffectsTimer();
+    }
     while (nextEffect !== null) {
-      try {
-        commitAllHostEffects(finishedWork);
-      } catch (error) {
+      let error = null;
+      if (__DEV__) {
+        error = invokeGuardedCallback(
+          null,
+          commitAllHostEffects,
+          null,
+          finishedWork,
+        );
+      } else {
+        try {
+          commitAllHostEffects(finishedWork);
+        } catch (e) {
+          error = e;
+        }
+      }
+      if (error !== null) {
         invariant(
           nextEffect !== null,
           'Should have next effect. This error is likely caused by a bug ' +
-          'in React. Please file an issue.'
+            'in React. Please file an issue.',
         );
         captureError(nextEffect, error);
         // Clean-up
@@ -409,6 +494,9 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
         }
       }
     }
+    if (__DEV__) {
+      stopCommitHostEffectsTimer();
+    }
 
     resetAfterCommit(commitInfo);
 
@@ -423,14 +511,30 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
     // and deletions in the entire tree have already been invoked.
     // This pass also triggers any renderer-specific initial effects.
     nextEffect = firstEffect;
+    if (__DEV__) {
+      startCommitLifeCyclesTimer();
+    }
     while (nextEffect !== null) {
-      try {
-        commitAllLifeCycles(finishedWork, nextEffect);
-      } catch (error) {
+      let error = null;
+      if (__DEV__) {
+        error = invokeGuardedCallback(
+          null,
+          commitAllLifeCycles,
+          null,
+          finishedWork,
+        );
+      } else {
+        try {
+          commitAllLifeCycles(finishedWork);
+        } catch (e) {
+          error = e;
+        }
+      }
+      if (error !== null) {
         invariant(
           nextEffect !== null,
           'Should have next effect. This error is likely caused by a bug ' +
-          'in React. Please file an issue.'
+            'in React. Please file an issue.',
         );
         captureError(nextEffect, error);
         if (nextEffect !== null) {
@@ -440,6 +544,10 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
     }
 
     isCommitting = false;
+    if (__DEV__) {
+      stopCommitLifeCyclesTimer();
+      stopCommitTimer();
+    }
     if (typeof onCommitRoot === 'function') {
       onCommitRoot(finishedWork.stateNode);
     }
@@ -457,13 +565,19 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
     priorityContext = previousPriorityContext;
   }
 
-  function resetWorkPriority(workInProgress : Fiber) {
+  function resetWorkPriority(workInProgress: Fiber) {
     let newPriority = NoWork;
 
     // Check for pending update priority. This is usually null so it shouldn't
     // be a perf issue.
     const queue = workInProgress.updateQueue;
-    if (queue !== null) {
+    const tag = workInProgress.tag;
+    if (
+      queue !== null &&
+      // TODO: Revisit once updateQueue is typed properly to distinguish between
+      // update payloads for host components and update queues for composites
+      (tag === ClassComponent || tag === HostRoot)
+    ) {
       newPriority = getPendingPriority(queue);
     }
 
@@ -475,9 +589,10 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
     let child = workInProgress.progressedChild;
     while (child !== null) {
       // Ensure that remaining work priority bubbles up.
-      if (child.pendingWorkPriority !== NoWork &&
-          (newPriority === NoWork ||
-          newPriority > child.pendingWorkPriority)) {
+      if (
+        child.pendingWorkPriority !== NoWork &&
+        (newPriority === NoWork || newPriority > child.pendingWorkPriority)
+      ) {
         newPriority = child.pendingWorkPriority;
       }
       child = child.sibling;
@@ -485,7 +600,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
     workInProgress.pendingWorkPriority = newPriority;
   }
 
-  function completeUnitOfWork(workInProgress : Fiber) : Fiber | null {
+  function completeUnitOfWork(workInProgress: Fiber): Fiber | null {
     while (true) {
       // The current, flushed, state of this fiber is the alternate.
       // Ideally nothing should rely on this, but relying on it here
@@ -500,6 +615,9 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
       resetWorkPriority(workInProgress);
 
       if (next !== null) {
+        if (__DEV__) {
+          stopWorkTimer(workInProgress);
+        }
         if (__DEV__ && ReactFiberInstrumentation.debugTool) {
           ReactFiberInstrumentation.debugTool.onCompleteWork(workInProgress);
         }
@@ -538,6 +656,9 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
         }
       }
 
+      if (__DEV__) {
+        stopWorkTimer(workInProgress);
+      }
       if (__DEV__ && ReactFiberInstrumentation.debugTool) {
         ReactFiberInstrumentation.debugTool.onCompleteWork(workInProgress);
       }
@@ -565,7 +686,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
     }
   }
 
-  function performUnitOfWork(workInProgress : Fiber) : Fiber | null {
+  function performUnitOfWork(workInProgress: Fiber): Fiber | null {
     // The current, flushed, state of this fiber is the alternate.
     // Ideally nothing should rely on this, but relying on it here
     // means that we don't need an additional field on the work in
@@ -573,6 +694,9 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
     const current = workInProgress.alternate;
 
     // See if beginning this work spawns more work.
+    if (__DEV__) {
+      startWorkTimer(workInProgress);
+    }
     let next = beginWork(current, workInProgress, nextPriorityLevel);
     if (__DEV__ && ReactFiberInstrumentation.debugTool) {
       ReactFiberInstrumentation.debugTool.onBeginWork(workInProgress);
@@ -591,8 +715,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
     return next;
   }
 
-  function performFailedUnitOfWork(workInProgress : Fiber) : Fiber | null {
-
+  function performFailedUnitOfWork(workInProgress: Fiber): Fiber | null {
     // The current, flushed, state of this fiber is the alternate.
     // Ideally nothing should rely on this, but relying on it here
     // means that we don't need an additional field on the work in
@@ -600,6 +723,9 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
     const current = workInProgress.alternate;
 
     // See if beginning this work spawns more work.
+    if (__DEV__) {
+      startWorkTimer(workInProgress);
+    }
     let next = beginFailedWork(current, workInProgress, nextPriorityLevel);
     if (__DEV__ && ReactFiberInstrumentation.debugTool) {
       ReactFiberInstrumentation.debugTool.onBeginWork(workInProgress);
@@ -635,10 +761,13 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
       nextUnitOfWork = findNextUnitOfWork();
     }
     // Keep performing work until there are no more errors
-    while (capturedErrors !== null && capturedErrors.size &&
-           nextUnitOfWork !== null &&
-           nextPriorityLevel !== NoWork &&
-           nextPriorityLevel <= TaskPriority) {
+    while (
+      capturedErrors !== null &&
+      capturedErrors.size &&
+      nextUnitOfWork !== null &&
+      nextPriorityLevel !== NoWork &&
+      nextPriorityLevel <= TaskPriority
+    ) {
       if (hasCapturedError(nextUnitOfWork)) {
         // Use a forked version of performUnitOfWork
         nextUnitOfWork = performFailedUnitOfWork(nextUnitOfWork);
@@ -655,7 +784,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
     }
   }
 
-  function workLoop(priorityLevel, deadline : Deadline | null, deadlineHasExpired : boolean) : boolean {
+  function workLoop(priorityLevel, deadline: Deadline | null) {
     // Clear any errors.
     clearErrors();
 
@@ -707,9 +836,11 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
       // If there's no deadline, or if we're performing Task work, use this loop
       // that doesn't check how much time is remaining. It will keep running
       // until we run out of work at this priority level.
-      while (nextUnitOfWork !== null &&
-             nextPriorityLevel !== NoWork &&
-             nextPriorityLevel <= priorityLevel) {
+      while (
+        nextUnitOfWork !== null &&
+        nextPriorityLevel !== NoWork &&
+        nextPriorityLevel <= priorityLevel
+      ) {
         nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
         if (nextUnitOfWork === null) {
           nextUnitOfWork = findNextUnitOfWork();
@@ -723,28 +854,32 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
     if (hostRootTimeMarker) {
       console.timeEnd(hostRootTimeMarker);
     }
-
-    return deadlineHasExpired;
   }
 
-  function performWork(priorityLevel : PriorityLevel, deadline : Deadline | null) {
+  function performWork(
+    priorityLevel: PriorityLevel,
+    deadline: Deadline | null,
+  ) {
+    if (__DEV__) {
+      startWorkLoopTimer();
+    }
+
     invariant(
       !isPerformingWork,
       'performWork was called recursively. This error is likely caused ' +
-      'by a bug in React. Please file an issue.'
+        'by a bug in React. Please file an issue.',
     );
     isPerformingWork = true;
-    const isPerformingDeferredWork = Boolean(deadline);
-    let deadlineHasExpired = false;
+    const isPerformingDeferredWork = !!deadline;
 
     // This outer loop exists so that we can restart the work loop after
     // catching an error. It also lets us flush Task work at the end of a
     // deferred batch.
     while (priorityLevel !== NoWork && !fatalError) {
       invariant(
-        deadline !== null || (priorityLevel < HighPriority),
+        deadline !== null || priorityLevel < HighPriority,
         'Cannot perform deferred work without a deadline. This error is ' +
-        'likely caused by a bug in React. Please file an issue.'
+          'likely caused by a bug in React. Please file an issue.',
       );
 
       // Before starting any work, check to see if there are any pending
@@ -756,18 +891,31 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
       // Nothing in performWork should be allowed to throw. All unsafe
       // operations must happen within workLoop, which is extracted to a
       // separate function so that it can be optimized by the JS engine.
-      try {
-        priorityContextBeforeReconciliation = priorityContext;
-        priorityContext = nextPriorityLevel;
-        deadlineHasExpired = workLoop(priorityLevel, deadline, deadlineHasExpired);
-      } catch (error) {
+      priorityContextBeforeReconciliation = priorityContext;
+      let error = null;
+      if (__DEV__) {
+        error = invokeGuardedCallback(
+          null,
+          workLoop,
+          null,
+          priorityLevel,
+          deadline,
+        );
+      } else {
+        try {
+          workLoop(priorityLevel, deadline);
+        } catch (e) {
+          error = e;
+        }
+      }
+      // Reset the priority context to its value before reconcilation.
+      priorityContext = priorityContextBeforeReconciliation;
+
+      if (error !== null) {
         // We caught an error during either the begin or complete phases.
         const failedWork = nextUnitOfWork;
 
         if (failedWork !== null) {
-          // Reset the priority context to its value before reconciliation.
-          priorityContext = priorityContextBeforeReconciliation;
-
           // "Capture" the error by finding the nearest boundary. If there is no
           // error boundary, the nearest host container acts as one. If
           // captureError returns null, the error was intentionally ignored.
@@ -798,8 +946,6 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
           // inside resetAfterCommit.
           fatalError = error;
         }
-      } finally {
-        priorityContext = priorityContextBeforeReconciliation;
       }
 
       // Stop performing work
@@ -807,7 +953,11 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
 
       // If have we more work, and we're in a deferred batch, check to see
       // if the deadline has expired.
-      if (nextPriorityLevel !== NoWork && isPerformingDeferredWork && !deadlineHasExpired) {
+      if (
+        nextPriorityLevel !== NoWork &&
+        isPerformingDeferredWork &&
+        !deadlineHasExpired
+      ) {
         // We have more time to do work.
         priorityLevel = nextPriorityLevel;
         continue;
@@ -842,10 +992,14 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
 
     // We're done performing work. Time to clean up.
     isPerformingWork = false;
+    deadlineHasExpired = false;
     fatalError = null;
     firstUncaughtError = null;
     capturedErrors = null;
     failedBoundaries = null;
+    if (__DEV__) {
+      stopWorkLoopTimer();
+    }
 
     // It's safe to throw any unhandled errors.
     if (errorToThrow !== null) {
@@ -854,22 +1008,23 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
   }
 
   // Returns the boundary that captured the error, or null if the error is ignored
-  function captureError(failedWork : Fiber, error : Error) : Fiber | null {
+  function captureError(failedWork: Fiber, error: Error): Fiber | null {
     // It is no longer valid because we exited the user code.
     ReactCurrentOwner.current = null;
     if (__DEV__) {
       ReactDebugCurrentFiber.current = null;
+      ReactDebugCurrentFiber.phase = null;
     }
     // It is no longer valid because this unit of work failed.
     nextUnitOfWork = null;
 
     // Search for the nearest error boundary.
-    let boundary : Fiber | null = null;
+    let boundary: Fiber | null = null;
 
     // Passed to logCapturedError()
-    let errorBoundaryFound : boolean = false;
-    let willRetry : boolean = false;
-    let errorBoundaryName : string | null = null;
+    let errorBoundaryFound: boolean = false;
+    let willRetry: boolean = false;
+    let errorBoundaryName: string | null = null;
 
     // Host containers are a special case. If the failed work itself is a host
     // container, then it acts as its own boundary. In all other cases, we
@@ -915,10 +1070,12 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
           // this boundary already captured an error during this commit.
           // This case exists because multiple errors can be thrown during
           // a single commit without interruption.
-          if (commitPhaseBoundaries !== null && (
-            commitPhaseBoundaries.has(node) ||
-            (node.alternate !== null && commitPhaseBoundaries.has(node.alternate))
-          )) {
+          if (
+            commitPhaseBoundaries !== null &&
+            (commitPhaseBoundaries.has(node) ||
+              (node.alternate !== null &&
+                commitPhaseBoundaries.has(node.alternate)))
+          ) {
             // If so, we should ignore this error.
             return null;
           }
@@ -983,25 +1140,23 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
     return null;
   }
 
-  function hasCapturedError(fiber : Fiber) : boolean {
+  function hasCapturedError(fiber: Fiber): boolean {
     // TODO: capturedErrors should store the boundary instance, to avoid needing
     // to check the alternate.
-    return Boolean(
-      capturedErrors !== null &&
-      (capturedErrors.has(fiber) || (fiber.alternate !== null && capturedErrors.has(fiber.alternate)))
-    );
+    return capturedErrors !== null &&
+      (capturedErrors.has(fiber) ||
+        (fiber.alternate !== null && capturedErrors.has(fiber.alternate)));
   }
 
-  function isFailedBoundary(fiber : Fiber) : boolean {
+  function isFailedBoundary(fiber: Fiber): boolean {
     // TODO: failedBoundaries should store the boundary instance, to avoid
     // needing to check the alternate.
-    return Boolean(
-      failedBoundaries !== null &&
-      (failedBoundaries.has(fiber) || (fiber.alternate !== null && failedBoundaries.has(fiber.alternate)))
-    );
+    return failedBoundaries !== null &&
+      (failedBoundaries.has(fiber) ||
+        (fiber.alternate !== null && failedBoundaries.has(fiber.alternate)));
   }
 
-  function commitErrorHandling(effectfulFiber : Fiber) {
+  function commitErrorHandling(effectfulFiber: Fiber) {
     let capturedError;
     if (capturedErrors !== null) {
       capturedError = capturedErrors.get(effectfulFiber);
@@ -1018,7 +1173,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
     invariant(
       capturedError != null,
       'No error for given unit of work. This error is likely caused by a ' +
-      'bug in React. Please file an issue.'
+        'bug in React. Please file an issue.',
     );
 
     const error = capturedError.error;
@@ -1033,9 +1188,14 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
     switch (effectfulFiber.tag) {
       case ClassComponent:
         const instance = effectfulFiber.stateNode;
+
+        const info: HandleErrorInfo = {
+          componentStack: capturedError.componentStack,
+        };
+
         // Allow the boundary to handle the error, usually by scheduling
         // an update to itself
-        instance.unstable_handleError(error);
+        instance.unstable_handleError(error, info);
         return;
       case HostRoot:
         if (firstUncaughtError === null) {
@@ -1049,14 +1209,14 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
         invariant(
           false,
           'Invalid type of work. This error is likely caused by a bug in ' +
-          'React. Please file an issue.'
+            'React. Please file an issue.',
         );
     }
   }
 
-  function unwindContexts(from : Fiber, to: Fiber) {
+  function unwindContexts(from: Fiber, to: Fiber) {
     let node = from;
-    while (node !== null && (node !== to) && (node.alternate !== to)) {
+    while (node !== null && node !== to && node.alternate !== to) {
       switch (node.tag) {
         case ClassComponent:
           popContextProvider(node);
@@ -1071,11 +1231,14 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
           popHostContainer(node);
           break;
       }
+      if (__DEV__) {
+        stopWorkTimer(node);
+      }
       node = node.return;
     }
   }
 
-  function scheduleRoot(root : FiberRoot, priorityLevel : PriorityLevel) {
+  function scheduleRoot(root: FiberRoot, priorityLevel: PriorityLevel) {
     if (priorityLevel === NoWork) {
       return;
     }
@@ -1094,7 +1257,11 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
     }
   }
 
-  function scheduleUpdate(fiber : Fiber, priorityLevel : PriorityLevel) {
+  function scheduleUpdate(fiber: Fiber, priorityLevel: PriorityLevel) {
+    if (__DEV__) {
+      recordScheduleUpdate();
+    }
+
     if (priorityLevel <= nextPriorityLevel) {
       // We must reset the current unit of work pointer so that we restart the
       // search from the root during the next tick, in case there is now higher
@@ -1102,6 +1269,13 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
       nextUnitOfWork = null;
     }
 
+    if (__DEV__) {
+      if (fiber.tag === ClassComponent) {
+        const instance = fiber.stateNode;
+        warnAboutInvalidUpdates(instance);
+      }
+    }
+
     let node = fiber;
     let shouldContinue = true;
     while (node !== null && shouldContinue) {
@@ -1109,15 +1283,19 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
       // we reach a node whose priority matches (and whose alternate's priority
       // matches) we can exit safely knowing that the rest of the path is correct.
       shouldContinue = false;
-      if (node.pendingWorkPriority === NoWork ||
-          node.pendingWorkPriority > priorityLevel) {
+      if (
+        node.pendingWorkPriority === NoWork ||
+        node.pendingWorkPriority > priorityLevel
+      ) {
         // Priority did not match. Update and keep going.
         shouldContinue = true;
         node.pendingWorkPriority = priorityLevel;
       }
       if (node.alternate !== null) {
-        if (node.alternate.pendingWorkPriority === NoWork ||
-            node.alternate.pendingWorkPriority > priorityLevel) {
+        if (
+          node.alternate.pendingWorkPriority === NoWork ||
+          node.alternate.pendingWorkPriority > priorityLevel
+        ) {
           // Priority did not match. Update and keep going.
           shouldContinue = true;
           node.alternate.pendingWorkPriority = priorityLevel;
@@ -1125,7 +1303,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
       }
       if (node.return === null) {
         if (node.tag === HostRoot) {
-          const root : FiberRoot = (node.stateNode : any);
+          const root: FiberRoot = (node.stateNode: any);
           scheduleRoot(root, priorityLevel);
           // Depending on the priority level, either perform work now or
           // schedule a callback to perform work later.
@@ -1159,20 +1337,23 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
     }
   }
 
-  function getPriorityContext() : PriorityLevel {
+  function getPriorityContext(): PriorityLevel {
     // If we're in a batch, or if we're already performing work, downgrade sync
     // priority to task priority
-    if (priorityContext === SynchronousPriority && (isPerformingWork || isBatchingUpdates)) {
+    if (
+      priorityContext === SynchronousPriority &&
+      (isPerformingWork || isBatchingUpdates)
+    ) {
       return TaskPriority;
     }
     return priorityContext;
   }
 
-  function scheduleErrorRecovery(fiber : Fiber) {
+  function scheduleErrorRecovery(fiber: Fiber) {
     scheduleUpdate(fiber, TaskPriority);
   }
 
-  function performWithPriority(priorityLevel : PriorityLevel, fn : Function) {
+  function performWithPriority(priorityLevel: PriorityLevel, fn: Function) {
     const previousPriorityContext = priorityContext;
     priorityContext = priorityLevel;
     try {
@@ -1182,7 +1363,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
     }
   }
 
-  function batchedUpdates<A, R>(fn : (a: A) => R, a : A) : R {
+  function batchedUpdates<A, R>(fn: (a: A) => R, a: A): R {
     const previousIsBatchingUpdates = isBatchingUpdates;
     isBatchingUpdates = true;
     try {
@@ -1197,7 +1378,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
     }
   }
 
-  function unbatchedUpdates<A>(fn : () => A) : A {
+  function unbatchedUpdates<A>(fn: () => A): A {
     const previousIsBatchingUpdates = isBatchingUpdates;
     isBatchingUpdates = false;
     try {
@@ -1207,7 +1388,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
     }
   }
 
-  function syncUpdates<A>(fn : () => A) : A {
+  function syncUpdates<A>(fn: () => A): A {
     const previousPriorityContext = priorityContext;
     priorityContext = SynchronousPriority;
     try {
@@ -1217,7 +1398,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(config : HostConfig<T, P,
     }
   }
 
-  function deferredUpdates<A>(fn : () => A) : A {
+  function deferredUpdates<A>(fn: () => A): A {
     const previousPriorityContext = priorityContext;
     priorityContext = LowPriority;
     try {
diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberStack.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberStack.js
index 9ba17342746607..697271eaee9460 100644
--- a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberStack.js
+++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberStack.js
@@ -12,36 +12,33 @@
 
 'use strict';
 
-import type { Fiber } from 'ReactFiber';
+import type {Fiber} from 'ReactFiber';
 
 export type StackCursor<T> = {
-  current: T
+  current: T,
 };
 
 const warning = require('fbjs/lib/warning');
 
-const valueStack : Array<any> = [];
+const valueStack: Array<any> = [];
 
 if (__DEV__) {
-  var fiberStack : Array<Fiber | null> = [];
+  var fiberStack: Array<Fiber | null> = [];
 }
 
 let index = -1;
 
-exports.createCursor = function<T>(defaultValue : T) : StackCursor<T> {
+exports.createCursor = function<T>(defaultValue: T): StackCursor<T> {
   return {
     current: defaultValue,
   };
 };
 
-exports.isEmpty = function() : boolean {
+exports.isEmpty = function(): boolean {
   return index === -1;
 };
 
-exports.pop = function<T>(
-  cursor : StackCursor<T>,
-  fiber: Fiber,
-) : void {
+exports.pop = function<T>(cursor: StackCursor<T>, fiber: Fiber): void {
   if (index < 0) {
     if (__DEV__) {
       warning(false, 'Unexpected pop.');
@@ -67,10 +64,10 @@ exports.pop = function<T>(
 };
 
 exports.push = function<T>(
-  cursor : StackCursor<T>,
-  value : T,
+  cursor: StackCursor<T>,
+  value: T,
   fiber: Fiber,
-) : void {
+): void {
   index++;
 
   valueStack[index] = cursor.current;
@@ -82,7 +79,7 @@ exports.push = function<T>(
   cursor.current = value;
 };
 
-exports.reset = function() : void {
+exports.reset = function(): void {
   while (index > -1) {
     valueStack[index] = null;
 
diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberTreeReflection.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberTreeReflection.js
index 491156dbf7ea5f..1cd0dea6ed7439 100644
--- a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberTreeReflection.js
+++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberTreeReflection.js
@@ -12,11 +12,12 @@
 
 'use strict';
 
-import type { Fiber } from 'ReactFiber';
+import type {Fiber} from 'ReactFiber';
 
 var ReactInstanceMap = require('ReactInstanceMap');
 var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');
 
+var getComponentName = require('getComponentName');
 var invariant = require('fbjs/lib/invariant');
 
 if (__DEV__) {
@@ -39,7 +40,7 @@ var MOUNTING = 1;
 var MOUNTED = 2;
 var UNMOUNTED = 3;
 
-function isFiberMountedImpl(fiber : Fiber) : number {
+function isFiberMountedImpl(fiber: Fiber): number {
   let node = fiber;
   if (!fiber.alternate) {
     // If there is no alternate, this might be a new tree that isn't inserted
@@ -67,30 +68,32 @@ function isFiberMountedImpl(fiber : Fiber) : number {
   // that has been unmounted.
   return UNMOUNTED;
 }
-exports.isFiberMounted = function(fiber : Fiber) : boolean {
+exports.isFiberMounted = function(fiber: Fiber): boolean {
   return isFiberMountedImpl(fiber) === MOUNTED;
 };
 
-exports.isMounted = function(component : ReactComponent<any, any, any>) : boolean {
+exports.isMounted = function(
+  component: ReactComponent<any, any, any>,
+): boolean {
   if (__DEV__) {
-    const owner = (ReactCurrentOwner.current : any);
+    const owner = (ReactCurrentOwner.current: any);
     if (owner !== null && owner.tag === ClassComponent) {
-      const ownerFiber : Fiber = owner;
+      const ownerFiber: Fiber = owner;
       const instance = ownerFiber.stateNode;
       warning(
         instance._warnedAboutRefsInRender,
         '%s is accessing isMounted inside its render() function. ' +
-        'render() should be a pure function of props and state. It should ' +
-        'never access something that requires stale data from the previous ' +
-        'render, such as refs. Move this logic to componentDidMount and ' +
-        'componentDidUpdate instead.',
-        getComponentName(ownerFiber)
+          'render() should be a pure function of props and state. It should ' +
+          'never access something that requires stale data from the previous ' +
+          'render, such as refs. Move this logic to componentDidMount and ' +
+          'componentDidUpdate instead.',
+        getComponentName(ownerFiber) || 'A component',
       );
       instance._warnedAboutRefsInRender = true;
     }
   }
 
-  var fiber : ?Fiber = ReactInstanceMap.get(component);
+  var fiber: ?Fiber = ReactInstanceMap.get(component);
   if (!fiber) {
     return false;
   }
@@ -100,18 +103,18 @@ exports.isMounted = function(component : ReactComponent<any, any, any>) : boolea
 function assertIsMounted(fiber) {
   invariant(
     isFiberMountedImpl(fiber) === MOUNTED,
-    'Unable to find node on an unmounted component.'
+    'Unable to find node on an unmounted component.',
   );
 }
 
-function findCurrentFiberUsingSlowPath(fiber : Fiber) : Fiber | null {
+function findCurrentFiberUsingSlowPath(fiber: Fiber): Fiber | null {
   let alternate = fiber.alternate;
   if (!alternate) {
     // If there is no alternate, then we only need to check if it is mounted.
     const state = isFiberMountedImpl(fiber);
     invariant(
       state !== UNMOUNTED,
-      'Unable to find node on an unmounted component.'
+      'Unable to find node on an unmounted component.',
     );
     if (state === MOUNTING) {
       return null;
@@ -151,10 +154,7 @@ function findCurrentFiberUsingSlowPath(fiber : Fiber) : Fiber | null {
       }
       // We should never have an alternate for any mounting node. So the only
       // way this could possibly happen is if this was unmounted, if at all.
-      invariant(
-        false,
-        'Unable to find node on an unmounted component.'
-      );
+      invariant(false, 'Unable to find node on an unmounted component.');
     }
 
     if (a.return !== b.return) {
@@ -208,21 +208,21 @@ function findCurrentFiberUsingSlowPath(fiber : Fiber) : Fiber | null {
         invariant(
           didFindChild,
           'Child was not found in either parent set. This indicates a bug ' +
-          'related to the return pointer.'
+            'related to the return pointer.',
         );
       }
     }
 
     invariant(
       a.alternate === b,
-      'Return fibers should always be each others\' alternates.'
+      "Return fibers should always be each others' alternates.",
     );
   }
   // If the root is not a host container, we're in a disconnected tree. I.e.
   // unmounted.
   invariant(
     a.tag === HostRoot,
-    'Unable to find node on an unmounted component.'
+    'Unable to find node on an unmounted component.',
   );
   if (a.stateNode.current === a) {
     // We've determined that A is the current branch.
@@ -233,14 +233,14 @@ function findCurrentFiberUsingSlowPath(fiber : Fiber) : Fiber | null {
 }
 exports.findCurrentFiberUsingSlowPath = findCurrentFiberUsingSlowPath;
 
-exports.findCurrentHostFiber = function(parent : Fiber) : Fiber | null {
+exports.findCurrentHostFiber = function(parent: Fiber): Fiber | null {
   const currentParent = findCurrentFiberUsingSlowPath(parent);
   if (!currentParent) {
     return null;
   }
 
   // Next we'll drill down this component to find the first HostComponent/Text.
-  let node : Fiber = currentParent;
+  let node: Fiber = currentParent;
   while (true) {
     if (node.tag === HostComponent || node.tag === HostText) {
       return node;
@@ -266,15 +266,3 @@ exports.findCurrentHostFiber = function(parent : Fiber) : Fiber | null {
   // eslint-disable-next-line no-unreachable
   return null;
 };
-
-function getComponentName(fiber: Fiber): string {
-  const type = fiber.type;
-  const instance = fiber.stateNode;
-  const constructor = instance && instance.constructor;
-  return (
-    type.displayName || (constructor && constructor.displayName) ||
-    type.name || (constructor && constructor.name) ||
-    'A Component'
-  );
-}
-exports.getComponentName = getComponentName;
diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberUpdateQueue.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberUpdateQueue.js
index 45813e95583182..03e6c5e5cedcaa 100644
--- a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberUpdateQueue.js
+++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberUpdateQueue.js
@@ -12,8 +12,8 @@
 
 'use strict';
 
-import type { Fiber } from 'ReactFiber';
-import type { PriorityLevel } from 'ReactPriorityLevel';
+import type {Fiber} from 'ReactFiber';
+import type {PriorityLevel} from 'ReactPriorityLevel';
 
 const {
   Callback: CallbackEffect,
@@ -31,8 +31,8 @@ if (__DEV__) {
 }
 
 type PartialState<State, Props> =
-  $Subtype<State> |
-  (prevState: State, props: Props) => $Subtype<State>;
+  | $Subtype<State>
+  | ((prevState: State, props: Props) => $Subtype<State>);
 
 // Callbacks are not validated until invocation
 type Callback = mixed;
@@ -68,12 +68,14 @@ export type UpdateQueue = {
   isProcessing?: boolean,
 };
 
-function comparePriority(a : PriorityLevel, b : PriorityLevel) : number {
+function comparePriority(a: PriorityLevel, b: PriorityLevel): number {
   // When comparing update priorities, treat sync and Task work as equal.
   // TODO: Could we avoid the need for this by always coercing sync priority
   // to Task when scheduling an update?
-  if ((a === TaskPriority || a === SynchronousPriority) &&
-      (b === TaskPriority || b === SynchronousPriority)) {
+  if (
+    (a === TaskPriority || a === SynchronousPriority) &&
+    (b === TaskPriority || b === SynchronousPriority)
+  ) {
     return 0;
   }
   if (a === NoWork && b !== NoWork) {
@@ -87,8 +89,8 @@ function comparePriority(a : PriorityLevel, b : PriorityLevel) : number {
 
 // Ensures that a fiber has an update queue, creating a new one if needed.
 // Returns the new or existing queue.
-function ensureUpdateQueue(fiber : Fiber) : UpdateQueue {
-  if (fiber.updateQueue) {
+function ensureUpdateQueue(fiber: Fiber): UpdateQueue {
+  if (fiber.updateQueue !== null) {
     // We already have an update queue.
     return fiber.updateQueue;
   }
@@ -116,15 +118,20 @@ function ensureUpdateQueue(fiber : Fiber) : UpdateQueue {
 }
 
 // Clones an update queue from a source fiber onto its alternate.
-function cloneUpdateQueue(current : Fiber, workInProgress : Fiber) : UpdateQueue | null {
+function cloneUpdateQueue(
+  current: Fiber,
+  workInProgress: Fiber,
+): UpdateQueue | null {
   const currentQueue = current.updateQueue;
-  if (!currentQueue) {
+  if (currentQueue === null) {
     // The source fiber does not have an update queue.
     workInProgress.updateQueue = null;
     return null;
   }
   // If the alternate already has a queue, reuse the previous object.
-  const altQueue = workInProgress.updateQueue || {};
+  const altQueue = workInProgress.updateQueue !== null
+    ? workInProgress.updateQueue
+    : {};
   altQueue.first = currentQueue.first;
   altQueue.last = currentQueue.last;
 
@@ -139,7 +146,7 @@ function cloneUpdateQueue(current : Fiber, workInProgress : Fiber) : UpdateQueue
 }
 exports.cloneUpdateQueue = cloneUpdateQueue;
 
-function cloneUpdate(update : Update) : Update {
+function cloneUpdate(update: Update): Update {
   return {
     priorityLevel: update.priorityLevel,
     partialState: update.partialState,
@@ -151,8 +158,13 @@ function cloneUpdate(update : Update) : Update {
   };
 }
 
-function insertUpdateIntoQueue(queue, update, insertAfter, insertBefore) {
-  if (insertAfter) {
+function insertUpdateIntoQueue(
+  queue: UpdateQueue,
+  update: Update,
+  insertAfter: Update | null,
+  insertBefore: Update | null,
+) {
+  if (insertAfter !== null) {
     insertAfter.next = update;
   } else {
     // This is the first item in the queue.
@@ -160,7 +172,7 @@ function insertUpdateIntoQueue(queue, update, insertAfter, insertBefore) {
     queue.first = update;
   }
 
-  if (insertBefore) {
+  if (insertBefore !== null) {
     update.next = insertBefore;
   } else {
     // This is the last item in the queue.
@@ -170,17 +182,23 @@ function insertUpdateIntoQueue(queue, update, insertAfter, insertBefore) {
 
 // Returns the update after which the incoming update should be inserted into
 // the queue, or null if it should be inserted at beginning.
-function findInsertionPosition(queue, update) : Update | null {
+function findInsertionPosition(queue, update): Update | null {
   const priorityLevel = update.priorityLevel;
   let insertAfter = null;
   let insertBefore = null;
-  if (queue.last && comparePriority(queue.last.priorityLevel, priorityLevel) <= 0) {
+  if (
+    queue.last !== null &&
+    comparePriority(queue.last.priorityLevel, priorityLevel) <= 0
+  ) {
     // Fast path for the common case where the update should be inserted at
     // the end of the queue.
     insertAfter = queue.last;
   } else {
     insertBefore = queue.first;
-    while (insertBefore && comparePriority(insertBefore.priorityLevel, priorityLevel) <= 0) {
+    while (
+      insertBefore !== null &&
+      comparePriority(insertBefore.priorityLevel, priorityLevel) <= 0
+    ) {
       insertAfter = insertBefore;
       insertBefore = insertBefore.next;
     }
@@ -217,28 +235,32 @@ function findInsertionPosition(queue, update) : Update | null {
 // we shouldn't make a copy.
 //
 // If the update is cloned, it returns the cloned update.
-function insertUpdate(fiber : Fiber, update : Update) : Update | null {
+function insertUpdate(fiber: Fiber, update: Update): Update | null {
   const queue1 = ensureUpdateQueue(fiber);
-  const queue2 = fiber.alternate ? ensureUpdateQueue(fiber.alternate) : null;
+  const queue2 = fiber.alternate !== null
+    ? ensureUpdateQueue(fiber.alternate)
+    : null;
 
   // Warn if an update is scheduled from inside an updater function.
   if (__DEV__) {
-    if (queue1.isProcessing || (queue2 && queue2.isProcessing)) {
+    if (queue1.isProcessing || (queue2 !== null && queue2.isProcessing)) {
       warning(
         false,
         'An update (setState, replaceState, or forceUpdate) was scheduled ' +
-        'from inside an update function. Update functions should be pure, ' +
-        'with zero side-effects. Consider using componentDidUpdate or a ' +
-        'callback.'
+          'from inside an update function. Update functions should be pure, ' +
+          'with zero side-effects. Consider using componentDidUpdate or a ' +
+          'callback.',
       );
     }
   }
 
   // Find the insertion position in the first queue.
   const insertAfter1 = findInsertionPosition(queue1, update);
-  const insertBefore1 = insertAfter1 ? insertAfter1.next : queue1.first;
+  const insertBefore1 = insertAfter1 !== null
+    ? insertAfter1.next
+    : queue1.first;
 
-  if (!queue2) {
+  if (queue2 === null) {
     // If there's no alternate queue, there's nothing else to do but insert.
     insertUpdateIntoQueue(queue1, update, insertAfter1, insertBefore1);
     return null;
@@ -246,7 +268,9 @@ function insertUpdate(fiber : Fiber, update : Update) : Update | null {
 
   // If there is an alternate queue, find the insertion position.
   const insertAfter2 = findInsertionPosition(queue2, update);
-  const insertBefore2 = insertAfter2 ? insertAfter2.next : queue2.first;
+  const insertBefore2 = insertAfter2 !== null
+    ? insertAfter2.next
+    : queue2.first;
 
   // Now we can insert into the first queue. This must come after finding both
   // insertion positions because it mutates the list.
@@ -263,10 +287,10 @@ function insertUpdate(fiber : Fiber, update : Update) : Update | null {
     // queue, it also inserted into the alternate. All we need to do is update
     // the alternate queue's `first` and `last` pointers, in case they
     // have changed.
-    if (!insertAfter2) {
+    if (insertAfter2 === null) {
       queue2.first = update;
     }
-    if (!insertBefore2) {
+    if (insertBefore2 === null) {
       queue2.last = null;
     }
   }
@@ -275,11 +299,11 @@ function insertUpdate(fiber : Fiber, update : Update) : Update | null {
 }
 
 function addUpdate(
-  fiber : Fiber,
-  partialState : PartialState<any, any> | null,
-  callback : mixed,
-  priorityLevel : PriorityLevel
-) : void {
+  fiber: Fiber,
+  partialState: PartialState<any, any> | null,
+  callback: mixed,
+  priorityLevel: PriorityLevel,
+): void {
   const update = {
     priorityLevel,
     partialState,
@@ -294,11 +318,11 @@ function addUpdate(
 exports.addUpdate = addUpdate;
 
 function addReplaceUpdate(
-  fiber : Fiber,
-  state : any | null,
-  callback : Callback | null,
-  priorityLevel : PriorityLevel
-) : void {
+  fiber: Fiber,
+  state: any | null,
+  callback: Callback | null,
+  priorityLevel: PriorityLevel,
+): void {
   const update = {
     priorityLevel,
     partialState: state,
@@ -313,10 +337,10 @@ function addReplaceUpdate(
 exports.addReplaceUpdate = addReplaceUpdate;
 
 function addForceUpdate(
-  fiber : Fiber,
-  callback : Callback | null,
-  priorityLevel : PriorityLevel
-) : void {
+  fiber: Fiber,
+  callback: Callback | null,
+  priorityLevel: PriorityLevel,
+): void {
   const update = {
     priorityLevel,
     partialState: null,
@@ -330,21 +354,18 @@ function addForceUpdate(
 }
 exports.addForceUpdate = addForceUpdate;
 
-function getPendingPriority(queue : UpdateQueue) : PriorityLevel {
-  return queue.first ? queue.first.priorityLevel : NoWork;
+function getPendingPriority(queue: UpdateQueue): PriorityLevel {
+  return queue.first !== null ? queue.first.priorityLevel : NoWork;
 }
 exports.getPendingPriority = getPendingPriority;
 
 function addTopLevelUpdate(
-  fiber : Fiber,
-  partialState : PartialState<any, any>,
-  callback : Callback | null,
-  priorityLevel : PriorityLevel
-) : void {
-  const isTopLevelUnmount = Boolean(
-    partialState &&
-    partialState.element === null
-  );
+  fiber: Fiber,
+  partialState: PartialState<any, any>,
+  callback: Callback | null,
+  priorityLevel: PriorityLevel,
+): void {
+  const isTopLevelUnmount = partialState.element === null;
 
   const update = {
     priorityLevel,
@@ -361,13 +382,15 @@ function addTopLevelUpdate(
     // Drop all updates that are lower-priority, so that the tree is not
     // remounted. We need to do this for both queues.
     const queue1 = fiber.updateQueue;
-    const queue2 = fiber.alternate && fiber.alternate.updateQueue;
+    const queue2 = fiber.alternate !== null
+      ? fiber.alternate.updateQueue
+      : null;
 
-    if (queue1 && update.next) {
+    if (queue1 !== null && update.next !== null) {
       update.next = null;
       queue1.last = update;
     }
-    if (queue2 && update2 && update2.next) {
+    if (queue2 !== null && update2 !== null && update2.next !== null) {
       update2.next = null;
       queue2.last = update;
     }
@@ -386,13 +409,13 @@ function getStateFromUpdate(update, instance, prevState, props) {
 }
 
 function beginUpdateQueue(
-  workInProgress : Fiber,
-  queue : UpdateQueue,
-  instance : any,
-  prevState : any,
-  props : any,
-  priorityLevel : PriorityLevel
-) : any {
+  workInProgress: Fiber,
+  queue: UpdateQueue,
+  instance: any,
+  prevState: any,
+  props: any,
+  priorityLevel: PriorityLevel,
+): any {
   if (__DEV__) {
     // Set this flag so we can warn if setState is called inside the update
     // function of another setState.
@@ -407,12 +430,14 @@ function beginUpdateQueue(
   let dontMutatePrevState = true;
   let callbackList = null;
   let update = queue.first;
-  while (update && comparePriority(update.priorityLevel, priorityLevel) <= 0) {
+  while (
+    update !== null && comparePriority(update.priorityLevel, priorityLevel) <= 0
+  ) {
     // Remove each update from the queue right before it is processed. That way
     // if setState is called from inside an updater function, the new update
     // will be inserted in the correct position.
     queue.first = update.next;
-    if (!queue.first) {
+    if (queue.first === null) {
       queue.last = null;
     }
 
@@ -436,7 +461,10 @@ function beginUpdateQueue(
     }
     // Second condition ignores top-level unmount callbacks if they are not the
     // last update in the queue, since a subsequent update will cause a remount.
-    if (update.callback !== null && !(update.isTopLevelUnmount && update.next !== null)) {
+    if (
+      update.callback !== null &&
+      !(update.isTopLevelUnmount && update.next !== null)
+    ) {
       callbackList = callbackList || [];
       callbackList.push(update.callback);
       workInProgress.effectTag |= CallbackEffect;
@@ -446,7 +474,7 @@ function beginUpdateQueue(
 
   queue.callbackList = callbackList;
 
-  if (!queue.first && !callbackList && !queue.hasForceUpdate) {
+  if (queue.first === null && callbackList === null && !queue.hasForceUpdate) {
     // The queue is empty and there are no callbacks. We can reset it.
     workInProgress.updateQueue = null;
   }
@@ -459,9 +487,13 @@ function beginUpdateQueue(
 }
 exports.beginUpdateQueue = beginUpdateQueue;
 
-function commitCallbacks(finishedWork : Fiber, queue : UpdateQueue, context : mixed) {
+function commitCallbacks(
+  finishedWork: Fiber,
+  queue: UpdateQueue,
+  context: mixed,
+) {
   const callbackList = queue.callbackList;
-  if (!callbackList) {
+  if (callbackList === null) {
     return;
   }
   for (let i = 0; i < callbackList.length; i++) {
@@ -469,8 +501,8 @@ function commitCallbacks(finishedWork : Fiber, queue : UpdateQueue, context : mi
     invariant(
       typeof callback === 'function',
       'Invalid argument passed as callback. Expected a function. Instead ' +
-      'received: %s',
-      String(callback)
+        'received: %s',
+      callback,
     );
     callback.call(context);
   }
diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactTypeOfSideEffect.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactTypeOfSideEffect.js
index 4420f39e0b852d..087cf7394d9392 100644
--- a/Libraries/Renderer/src/renderers/shared/fiber/ReactTypeOfSideEffect.js
+++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactTypeOfSideEffect.js
@@ -15,13 +15,13 @@
 export type TypeOfSideEffect = 0 | 1 | 2 | 3 | 4 | 8 | 16 | 32 | 64;
 
 module.exports = {
-  NoEffect: 0,                                // 0b0000000
-  Placement: 1,                               // 0b0000001
-  Update: 2,                                  // 0b0000010
-  PlacementAndUpdate: 3,                      // 0b0000011
-  Deletion: 4,                                // 0b0000100
-  ContentReset: 8,                            // 0b0001000
-  Callback: 16,                               // 0b0010000
-  Err: 32,                                    // 0b0100000
-  Ref: 64,                                    // 0b1000000
+  NoEffect: 0, // 0b0000000
+  Placement: 1, // 0b0000001
+  Update: 2, // 0b0000010
+  PlacementAndUpdate: 3, // 0b0000011
+  Deletion: 4, // 0b0000100
+  ContentReset: 8, // 0b0001000
+  Callback: 16, // 0b0010000
+  Err: 32, // 0b0100000
+  Ref: 64, // 0b1000000
 };
diff --git a/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactCoroutine-test.js b/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactCoroutine-test.js
index 9de98abb1c5004..88d35fff2fb887 100644
--- a/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactCoroutine-test.js
+++ b/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactCoroutine-test.js
@@ -19,7 +19,7 @@ var ReactFeatureFlags;
 describe('ReactCoroutine', () => {
   beforeEach(() => {
     jest.resetModules();
-    React = require('React');
+    React = require('react');
     ReactNoop = require('ReactNoop');
     ReactCoroutine = require('ReactCoroutine');
     ReactFeatureFlags = require('ReactFeatureFlags');
@@ -27,25 +27,25 @@ describe('ReactCoroutine', () => {
   });
 
   function div(...children) {
-    children = children.map(c => typeof c === 'string' ? { text: c } : c);
-    return { type: 'div', children, prop: undefined };
+    children = children.map(c => typeof c === 'string' ? {text: c} : c);
+    return {type: 'div', children, prop: undefined};
   }
 
   function span(prop) {
-    return { type: 'span', children: [], prop };
+    return {type: 'span', children: [], prop};
   }
 
   it('should render a coroutine', () => {
     var ops = [];
 
-    function Continuation({ isSame }) {
+    function Continuation({isSame}) {
       ops.push(['Continuation', isSame]);
       return <span prop={isSame ? 'foo==bar' : 'foo!=bar'} />;
     }
 
     // An alternative API could mark Continuation as something that needs
     // yielding. E.g. Continuation.yieldType = 123;
-    function Child({ bar }) {
+    function Child({bar}) {
       ops.push(['Child', bar]);
       return ReactCoroutine.createYield({
         props: {
@@ -62,9 +62,9 @@ describe('ReactCoroutine', () => {
 
     function HandleYields(props, yields) {
       ops.push('HandleYields');
-      return yields.map(y =>
+      return yields.map(y => (
         <y.continuation isSame={props.foo === y.props.bar} />
-      );
+      ));
     }
 
     // An alternative API could mark Parent as something that needs
@@ -74,7 +74,7 @@ describe('ReactCoroutine', () => {
       return ReactCoroutine.createCoroutine(
         props.children,
         HandleYields,
-        props
+        props,
       );
     }
 
@@ -98,19 +98,16 @@ describe('ReactCoroutine', () => {
       ['Continuation', false],
     ]);
     expect(ReactNoop.getChildren()).toEqual([
-      div(
-        span('foo==bar'),
-        span('foo!=bar'),
-      ),
+      div(span('foo==bar'), span('foo!=bar')),
     ]);
   });
 
   it('should update a coroutine', () => {
-    function Continuation({ isSame }) {
+    function Continuation({isSame}) {
       return <span prop={isSame ? 'foo==bar' : 'foo!=bar'} />;
     }
 
-    function Child({ bar }) {
+    function Child({bar}) {
       return ReactCoroutine.createYield({
         props: {
           bar: bar,
@@ -124,16 +121,16 @@ describe('ReactCoroutine', () => {
     }
 
     function HandleYields(props, yields) {
-      return yields.map(y =>
+      return yields.map(y => (
         <y.continuation isSame={props.foo === y.props.bar} />
-      );
+      ));
     }
 
     function Parent(props) {
       return ReactCoroutine.createCoroutine(
         props.children,
         HandleYields,
-        props
+        props,
       );
     }
 
@@ -144,19 +141,13 @@ describe('ReactCoroutine', () => {
     ReactNoop.render(<App foo={true} />);
     ReactNoop.flush();
     expect(ReactNoop.getChildren()).toEqual([
-      div(
-        span('foo==bar'),
-        span('foo!=bar'),
-      ),
+      div(span('foo==bar'), span('foo!=bar')),
     ]);
 
     ReactNoop.render(<App foo={false} />);
     ReactNoop.flush();
     expect(ReactNoop.getChildren()).toEqual([
-      div(
-        span('foo!=bar'),
-        span('foo==bar'),
-      ),
+      div(span('foo!=bar'), span('foo==bar')),
     ]);
   });
 
@@ -194,7 +185,7 @@ describe('ReactCoroutine', () => {
         return ReactCoroutine.createCoroutine(
           this.props.children,
           HandleYields,
-          this.props
+          this.props,
         );
       }
       componentWillUnmount() {
@@ -205,12 +196,7 @@ describe('ReactCoroutine', () => {
     ReactNoop.render(<Parent><Child /></Parent>);
     ReactNoop.flush();
 
-    expect(ops).toEqual([
-      'Parent',
-      'Child',
-      'HandleYields',
-      'Continuation',
-    ]);
+    expect(ops).toEqual(['Parent', 'Child', 'HandleYields', 'Continuation']);
 
     ops = [];
 
@@ -222,7 +208,6 @@ describe('ReactCoroutine', () => {
       'Unmount Child',
       'Unmount Continuation',
     ]);
-
   });
 
   it('should handle deep updates in coroutine', () => {
@@ -238,31 +223,19 @@ describe('ReactCoroutine', () => {
 
     function App(props) {
       return ReactCoroutine.createCoroutine(
-        [
-          <Counter id="a" />,
-          <Counter id="b" />,
-          <Counter id="c" />,
-        ],
+        [<Counter id="a" />, <Counter id="b" />, <Counter id="c" />],
         (p, yields) => yields.map(y => <span prop={y * 100} />),
-        {}
+        {},
       );
     }
 
     ReactNoop.render(<App />);
     ReactNoop.flush();
-    expect(ReactNoop.getChildren()).toEqual([
-      span(500),
-      span(500),
-      span(500),
-    ]);
+    expect(ReactNoop.getChildren()).toEqual([span(500), span(500), span(500)]);
 
     instances.a.setState({value: 1});
     instances.b.setState({value: 2});
     ReactNoop.flush();
-    expect(ReactNoop.getChildren()).toEqual([
-      span(100),
-      span(200),
-      span(500),
-    ]);
+    expect(ReactNoop.getChildren()).toEqual([span(100), span(200), span(500)]);
   });
 });
diff --git a/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js b/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js
index 96407cf2891f8e..96a3f032e5f9d8 100644
--- a/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js
+++ b/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js
@@ -18,7 +18,7 @@ var ReactFeatureFlags;
 describe('ReactIncremental', () => {
   beforeEach(() => {
     jest.resetModules();
-    React = require('React');
+    React = require('react');
     ReactNoop = require('ReactNoop');
 
     ReactFeatureFlags = require('ReactFeatureFlags');
@@ -26,7 +26,6 @@ describe('ReactIncremental', () => {
   });
 
   it('should render a simple component', () => {
-
     function Bar() {
       return <div>Hello World</div>;
     }
@@ -37,11 +36,9 @@ describe('ReactIncremental', () => {
 
     ReactNoop.render(<Foo />);
     ReactNoop.flush();
-
   });
 
   it('should render a simple component, in steps if needed', () => {
-
     var renderCallbackCalled = false;
     var barCalled = false;
     function Bar() {
@@ -52,10 +49,7 @@ describe('ReactIncremental', () => {
     var fooCalled = false;
     function Foo() {
       fooCalled = true;
-      return [
-        <Bar isBar={true} />,
-        <Bar isBar={true} />,
-      ];
+      return [<Bar isBar={true} />, <Bar isBar={true} />];
     }
 
     ReactNoop.render(<Foo />, () => renderCallbackCalled = true);
@@ -75,7 +69,6 @@ describe('ReactIncremental', () => {
   });
 
   it('updates a previous render', () => {
-
     var ops = [];
 
     function Header() {
@@ -107,27 +100,39 @@ describe('ReactIncremental', () => {
       );
     }
 
-    ReactNoop.render(<Foo text="foo" />, () => ops.push('renderCallbackCalled'));
+    ReactNoop.render(<Foo text="foo" />, () =>
+      ops.push('renderCallbackCalled'));
     ReactNoop.flush();
 
-    expect(ops).toEqual(['Foo', 'Header', 'Content', 'Footer', 'renderCallbackCalled']);
+    expect(ops).toEqual([
+      'Foo',
+      'Header',
+      'Content',
+      'Footer',
+      'renderCallbackCalled',
+    ]);
 
     ops = [];
 
-    ReactNoop.render(<Foo text="bar" />, () => ops.push('firstRenderCallbackCalled'));
-    ReactNoop.render(<Foo text="bar" />, () => ops.push('secondRenderCallbackCalled'));
+    ReactNoop.render(<Foo text="bar" />, () =>
+      ops.push('firstRenderCallbackCalled'));
+    ReactNoop.render(<Foo text="bar" />, () =>
+      ops.push('secondRenderCallbackCalled'));
     ReactNoop.flush();
 
     // TODO: Test bail out of host components. This is currently unobservable.
 
     // Since this is an update, it should bail out and reuse the work from
     // Header and Content.
-    expect(ops).toEqual(['Foo', 'Content', 'firstRenderCallbackCalled', 'secondRenderCallbackCalled']);
-
+    expect(ops).toEqual([
+      'Foo',
+      'Content',
+      'firstRenderCallbackCalled',
+      'secondRenderCallbackCalled',
+    ]);
   });
 
   it('can cancel partially rendered work and restart', () => {
-
     var ops = [];
 
     function Bar(props) {
@@ -171,11 +176,9 @@ describe('ReactIncremental', () => {
     ReactNoop.flush(20);
 
     expect(ops).toEqual(['Foo', 'Bar', 'Bar']);
-
   });
 
   it('can deprioritize unfinished work and resume it later', () => {
-
     var ops = [];
 
     function Bar(props) {
@@ -225,7 +228,6 @@ describe('ReactIncremental', () => {
     ReactNoop.flush();
 
     expect(ops).toEqual(['Middle', 'Middle']);
-
   });
 
   it('can deprioritize a tree from without dropping work', () => {
@@ -285,7 +287,6 @@ describe('ReactIncremental', () => {
   });
 
   it('can resume work in a subtree even when a parent bails out', () => {
-
     var ops = [];
 
     function Bar(props) {
@@ -447,7 +448,6 @@ describe('ReactIncremental', () => {
   });
 
   it('can reuse work done after being preempted', () => {
-
     var ops = [];
 
     function Bar(props) {
@@ -482,11 +482,7 @@ describe('ReactIncremental', () => {
         <div>
           <Bar>{props.text2}</Bar>
           <div hidden={true}>
-            {
-              props.step === 0 ?
-                step0
-                : middleContent
-            }
+            {props.step === 0 ? step0 : middleContent}
           </div>
         </div>
       );
@@ -542,7 +538,6 @@ describe('ReactIncremental', () => {
     // without restarting.
     ReactNoop.flush();
     expect(ops).toEqual(['Middle']);
-
   });
 
   it('can reuse work that began but did not complete, after being preempted', () => {
@@ -561,7 +556,7 @@ describe('ReactIncremental', () => {
     }
 
     class Child extends React.Component {
-      state = { step: 0 };
+      state = {step: 0};
       render() {
         child = this;
         ops.push('Child');
@@ -597,12 +592,9 @@ describe('ReactIncremental', () => {
 
     // Begin working on a low priority update to Child, but stop before
     // GreatGrandchild. Child and Grandchild begin but don't complete.
-    child.setState({ step: 1 });
+    child.setState({step: 1});
     ReactNoop.flushDeferredPri(30);
-    expect(ops).toEqual([
-      'Child',
-      'Grandchild',
-    ]);
+    expect(ops).toEqual(['Child', 'Grandchild']);
 
     // Interrupt the current low pri work with a high pri update elsewhere in
     // the tree.
@@ -625,7 +617,6 @@ describe('ReactIncremental', () => {
   });
 
   it('can reuse work if shouldComponentUpdate is false, after being preempted', () => {
-
     var ops = [];
 
     function Bar(props) {
@@ -708,7 +699,6 @@ describe('ReactIncremental', () => {
     // without restarting.
     ReactNoop.flush();
     expect(ops).toEqual(['Middle']);
-
   });
 
   it('memoizes work even if shouldComponentUpdate returns false', () => {
@@ -733,9 +723,7 @@ describe('ReactIncremental', () => {
     ops = [];
     ReactNoop.render(<Foo step={2} />);
     ReactNoop.flush();
-    expect(ops).toEqual([
-      'shouldComponentUpdate: false',
-    ]);
+    expect(ops).toEqual(['shouldComponentUpdate: false']);
 
     ops = [];
     ReactNoop.render(<Foo step={3} />);
@@ -753,7 +741,7 @@ describe('ReactIncremental', () => {
     class Bar extends React.Component {
       constructor() {
         super();
-        this.state = { a: 'a' };
+        this.state = {a: 'a'};
         instance = this;
       }
       render() {
@@ -771,10 +759,10 @@ describe('ReactIncremental', () => {
 
     ReactNoop.render(<Foo />);
     ReactNoop.flush();
-    expect(instance.state).toEqual({ a: 'a' });
-    instance.setState({ b: 'b' });
+    expect(instance.state).toEqual({a: 'a'});
+    instance.setState({b: 'b'});
     ReactNoop.flush();
-    expect(instance.state).toEqual({ a: 'a', b: 'b' });
+    expect(instance.state).toEqual({a: 'a', b: 'b'});
   });
 
   it('can queue multiple state updates', () => {
@@ -782,7 +770,7 @@ describe('ReactIncremental', () => {
     class Bar extends React.Component {
       constructor() {
         super();
-        this.state = { a: 'a' };
+        this.state = {a: 'a'};
         instance = this;
       }
       render() {
@@ -801,11 +789,11 @@ describe('ReactIncremental', () => {
     ReactNoop.render(<Foo />);
     ReactNoop.flush();
     // Call setState multiple times before flushing
-    instance.setState({ b: 'b' });
-    instance.setState({ c: 'c' });
-    instance.setState({ d: 'd' });
+    instance.setState({b: 'b'});
+    instance.setState({c: 'c'});
+    instance.setState({d: 'd'});
     ReactNoop.flush();
-    expect(instance.state).toEqual({ a: 'a', b: 'b', c: 'c', d: 'd' });
+    expect(instance.state).toEqual({a: 'a', b: 'b', c: 'c', d: 'd'});
   });
 
   it('can use updater form of setState', () => {
@@ -813,7 +801,7 @@ describe('ReactIncremental', () => {
     class Bar extends React.Component {
       constructor() {
         super();
-        this.state = { num: 1 };
+        this.state = {num: 1};
         instance = this;
       }
       render() {
@@ -821,7 +809,7 @@ describe('ReactIncremental', () => {
       }
     }
 
-    function Foo({ multiplier }) {
+    function Foo({multiplier}) {
       return (
         <div>
           <Bar multiplier={multiplier} />
@@ -830,7 +818,7 @@ describe('ReactIncremental', () => {
     }
 
     function updater(state, props) {
-      return { num: state.num * props.multiplier };
+      return {num: state.num * props.multiplier};
     }
 
     ReactNoop.render(<Foo multiplier={2} />);
@@ -850,7 +838,7 @@ describe('ReactIncremental', () => {
     class Bar extends React.Component {
       constructor() {
         super();
-        this.state = { num: 1 };
+        this.state = {num: 1};
         instance = this;
       }
       render() {
@@ -858,7 +846,7 @@ describe('ReactIncremental', () => {
       }
     }
 
-    function Foo({ multiplier }) {
+    function Foo({multiplier}) {
       return (
         <div>
           <Bar multiplier={multiplier} />
@@ -867,11 +855,11 @@ describe('ReactIncremental', () => {
     }
 
     function updater(state, props) {
-      return { num: state.num * props.multiplier };
+      return {num: state.num * props.multiplier};
     }
 
     function callback() {
-      this.setState({ called: true });
+      this.setState({called: true});
     }
 
     ReactNoop.render(<Foo multiplier={2} />);
@@ -888,7 +876,7 @@ describe('ReactIncremental', () => {
     const Bar = React.createClass({
       getInitialState() {
         instance = this;
-        return { a: 'a' };
+        return {a: 'a'};
       },
       render() {
         return <div>{this.props.children}</div>;
@@ -905,11 +893,11 @@ describe('ReactIncremental', () => {
 
     ReactNoop.render(<Foo />);
     ReactNoop.flush();
-    instance.setState({ b: 'b' });
-    instance.setState({ c: 'c' });
-    instance.replaceState({ d: 'd' });
+    instance.setState({b: 'b'});
+    instance.setState({c: 'c'});
+    instance.replaceState({d: 'd'});
     ReactNoop.flush();
-    expect(instance.state).toEqual({ d: 'd' });
+    expect(instance.state).toEqual({d: 'd'});
   });
 
   it('can forceUpdate', () => {
@@ -958,14 +946,13 @@ describe('ReactIncremental', () => {
     var instances = new Set();
 
     class Bar extends React.Component {
-      state = { y: 'A' };
+      state = {y: 'A'};
       constructor() {
         super();
         instances.add(this);
       }
       shouldComponentUpdate(newProps, newState) {
-        return this.props.x !== newProps.x ||
-               this.state.y !== newState.y;
+        return this.props.x !== newProps.x || this.state.y !== newState.y;
       }
       render() {
         ops.push('Bar:' + this.props.x);
@@ -1007,7 +994,7 @@ describe('ReactIncremental', () => {
     var instances = [];
 
     class Bar extends React.Component {
-      state = { y: 'A' };
+      state = {y: 'A'};
       constructor() {
         super();
         instances.push(this);
@@ -1062,7 +1049,7 @@ describe('ReactIncremental', () => {
     var ops = [];
 
     class LifeCycle extends React.Component {
-      state = { x: this.props.x };
+      state = {x: this.props.x};
       componentWillMount() {
         ops.push('componentWillMount:' + this.state.x + '-' + this.props.x);
       }
@@ -1092,10 +1079,7 @@ describe('ReactIncremental', () => {
     ReactNoop.render(<App x={0} />);
     ReactNoop.flushDeferredPri(30);
 
-    expect(ops).toEqual([
-      'App',
-      'componentWillMount:0-0',
-    ]);
+    expect(ops).toEqual(['App', 'componentWillMount:0-0']);
 
     ops = [];
 
@@ -1168,7 +1152,9 @@ describe('ReactIncremental', () => {
         ops.push('componentDidMount:' + this.props.x);
       }
       componentWillReceiveProps(nextProps) {
-        ops.push('componentWillReceiveProps:' + this.props.x + '-' + nextProps.x);
+        ops.push(
+          'componentWillReceiveProps:' + this.props.x + '-' + nextProps.x,
+        );
       }
       shouldComponentUpdate(nextProps) {
         ops.push('shouldComponentUpdate:' + this.props.x + '-' + nextProps.x);
@@ -1196,10 +1182,7 @@ describe('ReactIncremental', () => {
     function App(props) {
       ops.push('App');
 
-      return [
-        <LifeCycle key="a" x={props.x} />,
-        <Sibling key="b" />,
-      ];
+      return [<LifeCycle key="a" x={props.x} />, <Sibling key="b" />];
     }
 
     ReactNoop.render(<App x={0} />);
@@ -1251,7 +1234,7 @@ describe('ReactIncremental', () => {
     var instances = [];
 
     class LifeCycle extends React.Component {
-      state = { x: 0 };
+      state = {x: 0};
       tick() {
         this.setState({
           x: this.state.x + 1,
@@ -1287,7 +1270,7 @@ describe('ReactIncremental', () => {
     // there is currently an issue where a component can't reuse its render
     // output unless it fully completed.
     class Wrap extends React.Component {
-      state = { y: 0 };
+      state = {y: 0};
       componentWillMount() {
         instances.push(this);
       }
@@ -1311,10 +1294,7 @@ describe('ReactIncremental', () => {
 
     function App(props) {
       ops.push('App');
-      return [
-        <Wrap key="a" />,
-        <Sibling key="b" />,
-      ];
+      return [<Wrap key="a" />, <Sibling key="b" />];
     }
 
     ReactNoop.render(<App y={0} />);
@@ -1395,7 +1375,6 @@ describe('ReactIncremental', () => {
 
     // TODO: Test that we get the expected values for the same scenario with
     // incomplete parents.
-
   });
 
   it('skips will/DidUpdate when bailing unless an update was already in progress', () => {
@@ -1434,10 +1413,7 @@ describe('ReactIncremental', () => {
     }
 
     function App(props) {
-      return [
-        <LifeCycle x={props.x} />,
-        <Sibling />,
-      ];
+      return [<LifeCycle x={props.x} />, <Sibling />];
     }
 
     ReactNoop.render(<App x={0} />);
@@ -1502,7 +1478,7 @@ describe('ReactIncremental', () => {
     var instance;
 
     class Foo extends React.Component {
-      state = { n: 0 };
+      state = {n: 0};
       render() {
         instance = this;
         return <div />;
@@ -1515,8 +1491,8 @@ describe('ReactIncremental', () => {
 
     ReactNoop.syncUpdates(() => {
       ReactNoop.batchedUpdates(() => {
-        instance.setState({ n: 1 }, () => ops.push('setState 1'));
-        instance.setState({ n: 2 }, () => ops.push('setState 2'));
+        instance.setState({n: 1}, () => ops.push('setState 1'));
+        instance.setState({n: 2}, () => ops.push('setState 2'));
         ops.push('end batchedUpdates');
       });
       ops.push('end syncUpdates');
@@ -1538,7 +1514,7 @@ describe('ReactIncremental', () => {
     var instance;
 
     class Foo extends React.Component {
-      state = { n: 0 };
+      state = {n: 0};
       render() {
         instance = this;
         return <div />;
@@ -1551,11 +1527,11 @@ describe('ReactIncremental', () => {
 
     ReactNoop.syncUpdates(() => {
       ReactNoop.batchedUpdates(() => {
-        instance.setState({ n: 1 }, () => ops.push('setState 1'));
-        instance.setState({ n: 2 }, () => ops.push('setState 2'));
+        instance.setState({n: 1}, () => ops.push('setState 1'));
+        instance.setState({n: 2}, () => ops.push('setState 2'));
         ReactNoop.batchedUpdates(() => {
-          instance.setState({ n: 3 }, () => ops.push('setState 3'));
-          instance.setState({ n: 4 }, () => ops.push('setState 4'));
+          instance.setState({n: 3}, () => ops.push('setState 3'));
+          instance.setState({n: 4}, () => ops.push('setState 4'));
           ops.push('end inner batchedUpdates');
         });
         ops.push('end outer batchedUpdates');
@@ -1582,7 +1558,7 @@ describe('ReactIncremental', () => {
     var instance;
 
     class Foo extends React.Component {
-      state = { n: 0 };
+      state = {n: 0};
       render() {
         instance = this;
         return <div />;
@@ -1593,8 +1569,8 @@ describe('ReactIncremental', () => {
     ReactNoop.flush();
     ops = [];
 
-    function updater({ n }) {
-      return { n: n + 1 };
+    function updater({n}) {
+      return {n: n + 1};
     }
 
     instance.setState(updater, () => ops.push('first callback'));
@@ -1609,10 +1585,7 @@ describe('ReactIncremental', () => {
     }).toThrow('callback error');
 
     // The third callback isn't called because the second one throws
-    expect(ops).toEqual([
-      'first callback',
-      'second callback',
-    ]);
+    expect(ops).toEqual(['first callback', 'second callback']);
     expect(instance.state.n).toEqual(3);
   });
 
@@ -1707,7 +1680,7 @@ describe('ReactIncremental', () => {
         <div>
           <ShowBoth />
         </div>
-      </Intl>
+      </Intl>,
     );
     ReactNoop.flush();
     expect(ops).toEqual([
@@ -1723,7 +1696,7 @@ describe('ReactIncremental', () => {
         <div>
           <ShowBoth />
         </div>
-      </Intl>
+      </Intl>,
     );
     ReactNoop.flush();
     expect(ops).toEqual([
@@ -1739,12 +1712,10 @@ describe('ReactIncremental', () => {
         <div>
           <ShowBoth />
         </div>
-      </Intl>
+      </Intl>,
     );
     ReactNoop.flushDeferredPri(15);
-    expect(ops).toEqual([
-      'Intl {}',
-    ]);
+    expect(ops).toEqual(['Intl {}']);
 
     ops.length = 0;
     ReactNoop.render(
@@ -1754,7 +1725,7 @@ describe('ReactIncremental', () => {
           <Indirection />
         </Router>
         <ShowBoth />
-      </Intl>
+      </Intl>,
     );
     ReactNoop.flush();
     expect(ops).toEqual([
@@ -1842,7 +1813,7 @@ describe('ReactIncremental', () => {
           </Intl>
         </div>
         <ShowLocale />
-      </Intl>
+      </Intl>,
     );
     ReactNoop.flushDeferredPri(40);
     expect(ops).toEqual([
@@ -1930,7 +1901,7 @@ describe('ReactIncremental', () => {
             </Stateful>
           </IndirectionClass>
         </IndirectionFn>
-      </Intl>
+      </Intl>,
     );
     ReactNoop.flush();
     expect(ops).toEqual([
@@ -2022,7 +1993,7 @@ describe('ReactIncremental', () => {
             <ShowLocaleFn />
           </IndirectionClass>
         </IndirectionFn>
-      </Stateful>
+      </Stateful>,
     );
     ReactNoop.flush();
     expect(ops).toEqual([
@@ -2047,7 +2018,7 @@ describe('ReactIncremental', () => {
       // these components even though they don't depend on context.
       'IndirectionFn {}',
       'IndirectionClass {}',
-       // These components depend on context:
+      // These components depend on context:
       'ShowLocaleClass:read {"locale":"gr"}',
       'ShowLocaleFn:read {"locale":"gr"}',
     ]);
@@ -2152,17 +2123,17 @@ describe('ReactIncremental', () => {
       static contextTypes = {};
       componentDidMount(prevProps, prevState) {
         ops.push('componentDidMount');
-        this.setState({ setStateInCDU: true });
+        this.setState({setStateInCDU: true});
       }
       componentDidUpdate(prevProps, prevState) {
         ops.push('componentDidUpdate');
         if (this.state.setStateInCDU) {
-          this.setState({ setStateInCDU: false });
+          this.setState({setStateInCDU: false});
         }
       }
       componentWillReceiveProps(nextProps) {
         ops.push('componentWillReceiveProps');
-        this.setState({ setStateInCDU: true });
+        this.setState({setStateInCDU: true});
       }
       render() {
         ops.push('render');
@@ -2251,8 +2222,8 @@ describe('ReactIncremental', () => {
     // At this point our FirstChild component has rendered a second time,
     // But since the render is not completed cDU should not be called yet.
     expect(renderCounter).toBe(2);
-    expect(scuPrevProps).toEqual([{ children: 'A' }]);
-    expect(scuNextProps).toEqual([{ children: 'B' }]);
+    expect(scuPrevProps).toEqual([{children: 'A'}]);
+    expect(scuNextProps).toEqual([{children: 'B'}]);
     expect(cduPrevProps).toEqual([]);
     expect(cduNextProps).toEqual([]);
 
@@ -2266,9 +2237,9 @@ describe('ReactIncremental', () => {
     // Since FirstChild props didn't change, sCU returned false.
     // The previous memoized copy should be used.
     expect(renderCounter).toBe(2);
-    expect(scuPrevProps).toEqual([{ children: 'A' }, { children: 'B' }]);
-    expect(scuNextProps).toEqual([{ children: 'B' }, { children: 'B' }]);
-    expect(cduPrevProps).toEqual([{ children: 'A' }]);
-    expect(cduNextProps).toEqual([{ children: 'B' }]);
+    expect(scuPrevProps).toEqual([{children: 'A'}, {children: 'B'}]);
+    expect(scuNextProps).toEqual([{children: 'B'}, {children: 'B'}]);
+    expect(cduPrevProps).toEqual([{children: 'A'}]);
+    expect(cduNextProps).toEqual([{children: 'B'}]);
   });
 });
diff --git a/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactIncrementalErrorHandling-test.js b/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactIncrementalErrorHandling-test.js
index 1fac05e87f6de9..4b4b415cc71732 100644
--- a/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactIncrementalErrorHandling-test.js
+++ b/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactIncrementalErrorHandling-test.js
@@ -18,19 +18,19 @@ var ReactFeatureFlags;
 describe('ReactIncrementalErrorHandling', () => {
   beforeEach(() => {
     jest.resetModules();
-    React = require('React');
+    React = require('react');
     ReactNoop = require('ReactNoop');
     ReactFeatureFlags = require('ReactFeatureFlags');
     ReactFeatureFlags.disableNewFiberFeatures = false;
   });
 
   function div(...children) {
-    children = children.map(c => typeof c === 'string' ? { text: c } : c);
-    return { type: 'div', children, prop: undefined };
+    children = children.map(c => typeof c === 'string' ? {text: c} : c);
+    return {type: 'div', children, prop: undefined};
   }
 
   function span(prop) {
-    return { type: 'span', children: [], prop };
+    return {type: 'span', children: [], prop};
   }
 
   it('catches render error in a boundary during full deferred mounting', () => {
@@ -41,7 +41,9 @@ describe('ReactIncrementalErrorHandling', () => {
       }
       render() {
         if (this.state.error) {
-          return <span prop={`Caught an error: ${this.state.error.message}.`} />;
+          return (
+            <span prop={`Caught an error: ${this.state.error.message}.`} />
+          );
         }
         return this.props.children;
       }
@@ -54,7 +56,7 @@ describe('ReactIncrementalErrorHandling', () => {
     ReactNoop.render(
       <ErrorBoundary>
         <BrokenRender />
-      </ErrorBoundary>
+      </ErrorBoundary>,
     );
     ReactNoop.flushDeferredPri();
     expect(ReactNoop.getChildren()).toEqual([span('Caught an error: Hello.')]);
@@ -71,7 +73,9 @@ describe('ReactIncrementalErrorHandling', () => {
       render() {
         if (this.state.error) {
           ops.push('ErrorBoundary render error');
-          return <span prop={`Caught an error: ${this.state.error.message}.`} />;
+          return (
+            <span prop={`Caught an error: ${this.state.error.message}.`} />
+          );
         }
         ops.push('ErrorBoundary render success');
         return this.props.children;
@@ -86,13 +90,11 @@ describe('ReactIncrementalErrorHandling', () => {
     ReactNoop.render(
       <ErrorBoundary>
         <BrokenRender />
-      </ErrorBoundary>
+      </ErrorBoundary>,
     );
 
     ReactNoop.flushDeferredPri(15);
-    expect(ops).toEqual([
-      'ErrorBoundary render success',
-    ]);
+    expect(ops).toEqual(['ErrorBoundary render success']);
     expect(ReactNoop.getChildren()).toEqual([]);
 
     ops.length = 0;
@@ -116,7 +118,9 @@ describe('ReactIncrementalErrorHandling', () => {
       render() {
         if (this.state.error) {
           ops.push('ErrorBoundary render error');
-          return <span prop={`Caught an error: ${this.state.error.message}.`} />;
+          return (
+            <span prop={`Caught an error: ${this.state.error.message}.`} />
+          );
         }
         ops.push('ErrorBoundary render success');
         return this.props.children;
@@ -132,7 +136,7 @@ describe('ReactIncrementalErrorHandling', () => {
       ReactNoop.render(
         <ErrorBoundary>
           <BrokenRender />
-        </ErrorBoundary>
+        </ErrorBoundary>,
       );
     });
 
@@ -157,7 +161,9 @@ describe('ReactIncrementalErrorHandling', () => {
       render() {
         if (this.state.error) {
           ops.push('ErrorBoundary render error');
-          return <span prop={`Caught an error: ${this.state.error.message}.`} />;
+          return (
+            <span prop={`Caught an error: ${this.state.error.message}.`} />
+          );
         }
         ops.push('ErrorBoundary render success');
         return this.props.children;
@@ -173,7 +179,7 @@ describe('ReactIncrementalErrorHandling', () => {
       ReactNoop.render(
         <ErrorBoundary>
           <BrokenRender />
-        </ErrorBoundary>
+        </ErrorBoundary>,
       );
     });
 
@@ -197,7 +203,9 @@ describe('ReactIncrementalErrorHandling', () => {
       render() {
         if (this.state.error) {
           ops.push('ErrorBoundary render error');
-          return <span prop={`Caught an error: ${this.state.error.message}.`} />;
+          return (
+            <span prop={`Caught an error: ${this.state.error.message}.`} />
+          );
         }
         ops.push('ErrorBoundary render success');
         return this.props.children;
@@ -214,12 +222,12 @@ describe('ReactIncrementalErrorHandling', () => {
         ReactNoop.render(
           <ErrorBoundary>
             Before the storm.
-          </ErrorBoundary>
+          </ErrorBoundary>,
         );
         ReactNoop.render(
           <ErrorBoundary>
             <BrokenRender />
-          </ErrorBoundary>
+          </ErrorBoundary>,
         );
       });
     });
@@ -254,7 +262,7 @@ describe('ReactIncrementalErrorHandling', () => {
     ReactNoop.render(
       <RethrowErrorBoundary>
         <BrokenRender />
-      </RethrowErrorBoundary>
+      </RethrowErrorBoundary>,
     );
 
     expect(() => {
@@ -289,13 +297,11 @@ describe('ReactIncrementalErrorHandling', () => {
     ReactNoop.render(
       <RethrowErrorBoundary>
         <BrokenRender />
-      </RethrowErrorBoundary>
+      </RethrowErrorBoundary>,
     );
 
     ReactNoop.flushDeferredPri(15);
-    expect(ops).toEqual([
-      'RethrowErrorBoundary render',
-    ]);
+    expect(ops).toEqual(['RethrowErrorBoundary render']);
 
     ops.length = 0;
     expect(() => {
@@ -330,7 +336,7 @@ describe('ReactIncrementalErrorHandling', () => {
       ReactNoop.render(
         <RethrowErrorBoundary>
           <BrokenRender />
-        </RethrowErrorBoundary>
+        </RethrowErrorBoundary>,
       );
     });
 
@@ -368,7 +374,7 @@ describe('ReactIncrementalErrorHandling', () => {
         ReactNoop.render(
           <RethrowErrorBoundary>
             <BrokenRender />
-          </RethrowErrorBoundary>
+          </RethrowErrorBoundary>,
         );
       });
     }).toThrow('Hello');
@@ -404,12 +410,12 @@ describe('ReactIncrementalErrorHandling', () => {
           ReactNoop.render(
             <RethrowErrorBoundary>
               Before the storm.
-            </RethrowErrorBoundary>
+            </RethrowErrorBoundary>,
           );
           ReactNoop.render(
             <RethrowErrorBoundary>
               <BrokenRender />
-            </RethrowErrorBoundary>
+            </RethrowErrorBoundary>,
           );
         });
       });
@@ -562,7 +568,9 @@ describe('ReactIncrementalErrorHandling', () => {
       }
       render() {
         if (this.state.error) {
-          return <span prop={`Caught an error: ${this.state.error.message}.`} />;
+          return (
+            <span prop={`Caught an error: ${this.state.error.message}.`} />
+          );
         }
         return this.props.children;
       }
@@ -576,11 +584,13 @@ describe('ReactIncrementalErrorHandling', () => {
       <ErrorBoundary>
         <BrokenRender />
       </ErrorBoundary>,
-      'a'
+      'a',
     );
     ReactNoop.renderToRootWithID(<span prop="b:1" />, 'b');
     ReactNoop.flush();
-    expect(ReactNoop.getChildren('a')).toEqual([span('Caught an error: Hello.')]);
+    expect(ReactNoop.getChildren('a')).toEqual([
+      span('Caught an error: Hello.'),
+    ]);
     expect(ReactNoop.getChildren('b')).toEqual([span('b:1')]);
   });
 
@@ -669,8 +679,8 @@ describe('ReactIncrementalErrorHandling', () => {
 
   it('unwinds the context stack correctly on error', () => {
     class Provider extends React.Component {
-      static childContextTypes = { message: React.PropTypes.string };
-      static contextTypes = { message: React.PropTypes.string };
+      static childContextTypes = {message: React.PropTypes.string};
+      static contextTypes = {message: React.PropTypes.string};
       getChildContext() {
         return {
           message: (this.context.message || '') + this.props.message,
@@ -694,9 +704,9 @@ describe('ReactIncrementalErrorHandling', () => {
     }
 
     class Boundary extends React.Component {
-      state = { error: null };
+      state = {error: null};
       unstable_handleError(error) {
-        this.setState({ error });
+        this.setState({error});
       }
       render() {
         return (
@@ -717,14 +727,12 @@ describe('ReactIncrementalErrorHandling', () => {
       <Provider message="a">
         <Boundary />
         <Connector />
-      </Provider>
+      </Provider>,
     );
     ReactNoop.flush();
 
     // If the context stack does not unwind, span will get 'abcde'
-    expect(ReactNoop.getChildren()).toEqual([
-      span('a'),
-    ]);
+    expect(ReactNoop.getChildren()).toEqual([span('a')]);
   });
 
   it('catches reconciler errors in a boundary during mounting', () => {
@@ -750,15 +758,17 @@ describe('ReactIncrementalErrorHandling', () => {
     ReactNoop.render(
       <ErrorBoundary>
         <BrokenRender />
-      </ErrorBoundary>
+      </ErrorBoundary>,
     );
     ReactNoop.flush();
-    expect(ReactNoop.getChildren()).toEqual([span(
-      'Element type is invalid: expected a string (for built-in components) or ' +
-      'a class/function (for composite components) but got: undefined. ' +
-      'You likely forgot to export your component from the file it\'s ' +
-      'defined in.\n\nCheck the render method of `BrokenRender`.'
-    )]);
+    expect(ReactNoop.getChildren()).toEqual([
+      span(
+        'Element type is invalid: expected a string (for built-in components) or ' +
+          'a class/function (for composite components) but got: undefined. ' +
+          "You likely forgot to export your component from the file it's " +
+          'defined in.\n\nCheck the render method of `BrokenRender`.',
+      ),
+    ]);
     expect(console.error.calls.count()).toBe(1);
   });
 
@@ -786,22 +796,24 @@ describe('ReactIncrementalErrorHandling', () => {
     ReactNoop.render(
       <ErrorBoundary>
         <BrokenRender fail={false} />
-      </ErrorBoundary>
+      </ErrorBoundary>,
     );
     ReactNoop.flush();
 
     ReactNoop.render(
       <ErrorBoundary>
         <BrokenRender fail={true} />
-      </ErrorBoundary>
+      </ErrorBoundary>,
     );
     ReactNoop.flush();
-    expect(ReactNoop.getChildren()).toEqual([span(
-      'Element type is invalid: expected a string (for built-in components) or ' +
-      'a class/function (for composite components) but got: undefined. ' +
-      'You likely forgot to export your component from the file it\'s ' +
-      'defined in.\n\nCheck the render method of `BrokenRender`.'
-    )]);
+    expect(ReactNoop.getChildren()).toEqual([
+      span(
+        'Element type is invalid: expected a string (for built-in components) or ' +
+          'a class/function (for composite components) but got: undefined. ' +
+          "You likely forgot to export your component from the file it's " +
+          'defined in.\n\nCheck the render method of `BrokenRender`.',
+      ),
+    ]);
     expect(console.error.calls.count()).toBe(1);
   });
 
@@ -813,9 +825,9 @@ describe('ReactIncrementalErrorHandling', () => {
       ReactNoop.flush();
     }).toThrowError(
       'Element type is invalid: expected a string (for built-in components) or ' +
-      'a class/function (for composite components) but got: undefined. ' +
-      'You likely forgot to export your component from the file it\'s ' +
-      'defined in.'
+        'a class/function (for composite components) but got: undefined. ' +
+        "You likely forgot to export your component from the file it's " +
+        'defined in.',
     );
 
     ReactNoop.render(<span prop="hi" />);
@@ -856,7 +868,7 @@ describe('ReactIncrementalErrorHandling', () => {
         <Parent>
           <BrokenRenderAndUnmount />
         </Parent>
-      </Parent>
+      </Parent>,
     );
     ReactNoop.flush();
 
@@ -906,11 +918,7 @@ describe('ReactIncrementalErrorHandling', () => {
     ReactNoop.render(<Foo />);
     ReactNoop.flush();
     expect(ops).toEqual(['barRef attach']);
-    expect(ReactNoop.getChildren()).toEqual([
-      div(
-        span('Bar'),
-      ),
-    ]);
+    expect(ReactNoop.getChildren()).toEqual([div(span('Bar'))]);
 
     ops = [];
 
@@ -948,7 +956,7 @@ describe('ReactIncrementalErrorHandling', () => {
       } else {
         jest.unmock('ReactFiberErrorLogger');
       }
-      React = require('React');
+      React = require('react');
       ReactNoop = require('ReactNoop');
     }
 
@@ -965,12 +973,12 @@ describe('ReactIncrementalErrorHandling', () => {
           throw Error('componentWillMount error');
         }
         render() {
-          return <div/>;
+          return <div />;
         }
       }
 
       try {
-        ReactNoop.render(<div><span><ErrorThrowingComponent/></span></div>);
+        ReactNoop.render(<div><span><ErrorThrowingComponent /></span></div>);
         ReactNoop.flushDeferredPri();
       } catch (error) {}
 
@@ -978,15 +986,15 @@ describe('ReactIncrementalErrorHandling', () => {
       const errorMessage = console.error.calls.argsFor(0)[0];
       expect(errorMessage).toContain(
         'React caught an error thrown by ErrorThrowingComponent. ' +
-        'You should fix this error in your code. ' +
-        'Consider adding an error boundary to your tree to customize error handling behavior.'
+          'You should fix this error in your code. ' +
+          'Consider adding an error boundary to your tree to customize error handling behavior.',
       );
       expect(errorMessage).toContain('Error: componentWillMount error');
       expect(normalizeCodeLocInfo(errorMessage)).toContain(
         'The error is located at: \n' +
-        '    in ErrorThrowingComponent (at **)\n' +
-        '    in span (at **)\n' +
-        '    in div (at **)'
+          '    in ErrorThrowingComponent (at **)\n' +
+          '    in span (at **)\n' +
+          '    in div (at **)',
       );
     });
 
@@ -999,12 +1007,12 @@ describe('ReactIncrementalErrorHandling', () => {
           throw Error('componentDidMount error');
         }
         render() {
-          return <div/>;
+          return <div />;
         }
       }
 
       try {
-        ReactNoop.render(<div><span><ErrorThrowingComponent/></span></div>);
+        ReactNoop.render(<div><span><ErrorThrowingComponent /></span></div>);
         ReactNoop.flushDeferredPri();
       } catch (error) {}
 
@@ -1012,15 +1020,15 @@ describe('ReactIncrementalErrorHandling', () => {
       const errorMessage = console.error.calls.argsFor(0)[0];
       expect(errorMessage).toContain(
         'React caught an error thrown by ErrorThrowingComponent. ' +
-        'You should fix this error in your code. ' +
-        'Consider adding an error boundary to your tree to customize error handling behavior.'
+          'You should fix this error in your code. ' +
+          'Consider adding an error boundary to your tree to customize error handling behavior.',
       );
       expect(errorMessage).toContain('Error: componentDidMount error');
       expect(normalizeCodeLocInfo(errorMessage)).toContain(
         'The error is located at: \n' +
-        '    in ErrorThrowingComponent (at **)\n' +
-        '    in span (at **)\n' +
-        '    in div (at **)'
+          '    in ErrorThrowingComponent (at **)\n' +
+          '    in span (at **)\n' +
+          '    in div (at **)',
       );
     });
 
@@ -1038,14 +1046,14 @@ describe('ReactIncrementalErrorHandling', () => {
 
       const ReactFiberErrorLogger = require('ReactFiberErrorLogger');
       ReactFiberErrorLogger.logCapturedError.mockImplementation(
-        (capturedError) => {
+        capturedError => {
           logCapturedErrorCalls.push(capturedError);
           throw Error('logCapturedError error');
-        }
+        },
       );
 
       try {
-        ReactNoop.render(<div><span><ErrorThrowingComponent/></span></div>);
+        ReactNoop.render(<div><span><ErrorThrowingComponent /></span></div>);
         ReactNoop.flushDeferredPri();
       } catch (error) {}
 
@@ -1053,7 +1061,9 @@ describe('ReactIncrementalErrorHandling', () => {
 
       // The error thrown in logCapturedError should also be logged
       expect(console.error.calls.count()).toBe(1);
-      expect(console.error.calls.argsFor(0)[0].message).toContain('logCapturedError error');
+      expect(console.error.calls.argsFor(0)[0].message).toContain(
+        'logCapturedError error',
+      );
     });
 
     it('should relay info about error boundary and retry attempts if applicable', () => {
@@ -1062,7 +1072,7 @@ describe('ReactIncrementalErrorHandling', () => {
 
       class ParentComponent extends React.Component {
         render() {
-          return <ErrorBoundaryComponent/>;
+          return <ErrorBoundaryComponent />;
         }
       }
 
@@ -1075,7 +1085,7 @@ describe('ReactIncrementalErrorHandling', () => {
           this.setState({}); // Render again
         }
         render() {
-          return <ErrorThrowingComponent/>;
+          return <ErrorThrowingComponent />;
         }
       }
 
@@ -1085,12 +1095,12 @@ describe('ReactIncrementalErrorHandling', () => {
         }
         render() {
           renderAttempts++;
-          return <div/>;
+          return <div />;
         }
       }
 
       try {
-        ReactNoop.render(<ParentComponent/>);
+        ReactNoop.render(<ParentComponent />);
         ReactNoop.flush();
       } catch (error) {}
 
@@ -1099,15 +1109,15 @@ describe('ReactIncrementalErrorHandling', () => {
       expect(console.error.calls.count()).toBe(2);
       expect(console.error.calls.argsFor(0)[0]).toContain(
         'React caught an error thrown by ErrorThrowingComponent. ' +
-        'You should fix this error in your code. ' +
-        'React will try to recreate this component tree from scratch ' +
-        'using the error boundary you provided, ErrorBoundaryComponent.'
+          'You should fix this error in your code. ' +
+          'React will try to recreate this component tree from scratch ' +
+          'using the error boundary you provided, ErrorBoundaryComponent.',
       );
       expect(console.error.calls.argsFor(1)[0]).toContain(
         'React caught an error thrown by ErrorThrowingComponent. ' +
-        'You should fix this error in your code. ' +
-        'This error was initially handled by the error boundary ErrorBoundaryComponent. ' +
-        'Recreating the tree from scratch failed so React will unmount the tree.'
+          'You should fix this error in your code. ' +
+          'This error was initially handled by the error boundary ErrorBoundaryComponent. ' +
+          'Recreating the tree from scratch failed so React will unmount the tree.',
       );
     });
   });
diff --git a/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactIncrementalPerf-test.js b/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactIncrementalPerf-test.js
new file mode 100644
index 00000000000000..b4a47480039fd3
--- /dev/null
+++ b/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactIncrementalPerf-test.js
@@ -0,0 +1,486 @@
+/**
+ * Copyright 2016-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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.
+ *
+ * @emails react-core
+ */
+
+'use strict';
+
+describe('ReactDebugFiberPerf', () => {
+  let React;
+  let ReactCoroutine;
+  let ReactFeatureFlags;
+  let ReactNoop;
+  let ReactPortal;
+
+  let root;
+  let activeMeasure;
+  let knownMarks;
+  let knownMeasures;
+
+  function resetFlamechart() {
+    root = {
+      children: [],
+      indent: -1,
+      markName: null,
+      label: null,
+      parent: null,
+      toString() {
+        return this.children.map(c => c.toString()).join('\n');
+      },
+    };
+    activeMeasure = root;
+    knownMarks = new Set();
+    knownMeasures = new Set();
+  }
+
+  function addComment(comment) {
+    activeMeasure.children.push(
+      `${'  '.repeat(activeMeasure.indent + 1)}// ${comment}`,
+    );
+  }
+
+  function getFlameChart() {
+    // Make sure we unwind the measurement stack every time.
+    expect(activeMeasure.indent).toBe(-1);
+    expect(activeMeasure).toBe(root);
+    // We should always clean them up because browsers
+    // buffer user timing measurements forever.
+    expect(knownMarks.size).toBe(0);
+    expect(knownMeasures.size).toBe(0);
+    return root.toString();
+  }
+
+  function createUserTimingPolyfill() {
+    // This is not a true polyfill, but it gives us enough
+    // to capture measurements in a readable tree-like output.
+    // Reference: https://developer.mozilla.org/en-US/docs/Web/API/User_Timing_API
+    return {
+      mark(markName) {
+        const measure = {
+          children: [],
+          indent: activeMeasure.indent + 1,
+          markName: markName,
+          // Will be assigned on measure() call:
+          label: null,
+          parent: activeMeasure,
+          toString() {
+            return [
+              '  '.repeat(this.indent) + this.label,
+              ...this.children.map(c => c.toString()),
+            ].join('\n') +
+              // Extra newline after each root reconciliation
+              (this.indent === 0 ? '\n' : '');
+          },
+        };
+        // Step one level deeper
+        activeMeasure.children.push(measure);
+        activeMeasure = measure;
+        knownMarks.add(markName);
+      },
+      // We don't use the overload with three arguments.
+      measure(label, markName) {
+        if (markName !== activeMeasure.markName) {
+          throw new Error('Unexpected measure() call.');
+        }
+        // Step one level up
+        activeMeasure.label = label;
+        activeMeasure = activeMeasure.parent;
+        knownMeasures.add(label);
+      },
+      clearMarks(markName) {
+        if (markName === activeMeasure.markName) {
+          // Step one level up if we're in this measure
+          activeMeasure = activeMeasure.parent;
+          activeMeasure.children.length--;
+        }
+        knownMarks.delete(markName);
+      },
+      clearMeasures(label) {
+        knownMeasures.delete(label);
+      },
+    };
+  }
+
+  beforeEach(() => {
+    jest.resetModules();
+    resetFlamechart();
+    global.performance = createUserTimingPolyfill();
+
+    // Import after the polyfill is set up:
+    React = require('React');
+    ReactCoroutine = require('ReactCoroutine');
+    ReactFeatureFlags = require('ReactFeatureFlags');
+    ReactNoop = require('ReactNoop');
+    ReactPortal = require('ReactPortal');
+    ReactFeatureFlags.disableNewFiberFeatures = false;
+  });
+
+  afterEach(() => {
+    delete global.performance;
+  });
+
+  function Parent(props) {
+    return <div>{props.children}</div>;
+  }
+
+  function Child(props) {
+    return <div>{props.children}</div>;
+  }
+
+  it('measures a simple reconciliation', () => {
+    ReactNoop.render(<Parent><Child /></Parent>);
+    addComment('Mount');
+    ReactNoop.flush();
+
+    ReactNoop.render(<Parent><Child /></Parent>);
+    addComment('Update');
+    ReactNoop.flush();
+
+    ReactNoop.render(null);
+    addComment('Unmount');
+    ReactNoop.flush();
+
+    expect(getFlameChart()).toMatchSnapshot();
+  });
+
+  it('skips parents during setState', () => {
+    class A extends React.Component {
+      render() {
+        return <div>{this.props.children}</div>;
+      }
+    }
+
+    class B extends React.Component {
+      render() {
+        return <div>{this.props.children}</div>;
+      }
+    }
+
+    let a;
+    let b;
+    ReactNoop.render(
+      <Parent>
+        <Parent>
+          <Parent>
+            <A ref={inst => a = inst} />
+          </Parent>
+        </Parent>
+        <Parent>
+          <B ref={inst => b = inst} />
+        </Parent>
+      </Parent>,
+    );
+    ReactNoop.flush();
+    resetFlamechart();
+
+    a.setState({});
+    b.setState({});
+    addComment('Should include just A and B, no Parents');
+    ReactNoop.flush();
+    expect(getFlameChart()).toMatchSnapshot();
+  });
+
+  it('warns on cascading renders from setState', () => {
+    class Cascading extends React.Component {
+      componentDidMount() {
+        this.setState({});
+      }
+      render() {
+        return <div>{this.props.children}</div>;
+      }
+    }
+
+    ReactNoop.render(<Parent><Cascading /></Parent>);
+    addComment('Should print a warning');
+    ReactNoop.flush();
+    expect(getFlameChart()).toMatchSnapshot();
+  });
+
+  it('warns on cascading renders from top-level render', () => {
+    class Cascading extends React.Component {
+      componentDidMount() {
+        ReactNoop.renderToRootWithID(<Child />, 'b');
+        addComment('Scheduling another root from componentDidMount');
+        ReactNoop.flush();
+      }
+      render() {
+        return <div>{this.props.children}</div>;
+      }
+    }
+
+    ReactNoop.renderToRootWithID(<Cascading />, 'a');
+    addComment('Rendering the first root');
+    ReactNoop.flush();
+    expect(getFlameChart()).toMatchSnapshot();
+  });
+
+  it('does not treat setState from cWM or cWRP as cascading', () => {
+    class NotCascading extends React.Component {
+      componentWillMount() {
+        this.setState({});
+      }
+      componentWillReceiveProps() {
+        this.setState({});
+      }
+      render() {
+        return <div>{this.props.children}</div>;
+      }
+    }
+
+    ReactNoop.render(<Parent><NotCascading /></Parent>);
+    addComment('Should not print a warning');
+    ReactNoop.flush();
+    ReactNoop.render(<Parent><NotCascading /></Parent>);
+    addComment('Should not print a warning');
+    ReactNoop.flush();
+    expect(getFlameChart()).toMatchSnapshot();
+  });
+
+  it('captures all lifecycles', () => {
+    class AllLifecycles extends React.Component {
+      static childContextTypes = {
+        foo: React.PropTypes.any,
+      };
+      shouldComponentUpdate() {
+        return true;
+      }
+      getChildContext() {
+        return {foo: 42};
+      }
+      componentWillMount() {}
+      componentDidMount() {}
+      componentWillReceiveProps() {}
+      componentWillUpdate() {}
+      componentDidUpdate() {}
+      componentWillUnmount() {}
+      render() {
+        return <div />;
+      }
+    }
+    ReactNoop.render(<AllLifecycles />);
+    addComment('Mount');
+    ReactNoop.flush();
+    ReactNoop.render(<AllLifecycles />);
+    addComment('Update');
+    ReactNoop.flush();
+    ReactNoop.render(null);
+    addComment('Unmount');
+    ReactNoop.flush();
+    expect(getFlameChart()).toMatchSnapshot();
+  });
+
+  it('measures deprioritized work', () => {
+    ReactNoop.performAnimationWork(() => {
+      ReactNoop.render(
+        <Parent>
+          <div hidden={true}>
+            <Child />
+          </div>
+        </Parent>,
+      );
+    });
+    addComment('Flush the parent');
+    ReactNoop.flushAnimationPri();
+    addComment('Flush the child');
+    ReactNoop.flushDeferredPri();
+    expect(getFlameChart()).toMatchSnapshot();
+  });
+
+  it('measures deferred work in chunks', () => {
+    class A extends React.Component {
+      render() {
+        return <div>{this.props.children}</div>;
+      }
+    }
+
+    class B extends React.Component {
+      render() {
+        return <div>{this.props.children}</div>;
+      }
+    }
+
+    ReactNoop.render(
+      <Parent>
+        <A>
+          <Child />
+        </A>
+        <B>
+          <Child />
+        </B>
+      </Parent>,
+    );
+    addComment('Start mounting Parent and A');
+    ReactNoop.flushDeferredPri(40);
+    addComment('Mount B just a little (but not enough to memoize)');
+    ReactNoop.flushDeferredPri(10);
+    addComment('Complete B and Parent');
+    ReactNoop.flushDeferredPri();
+    expect(getFlameChart()).toMatchSnapshot();
+  });
+
+  it('recovers from fatal errors', () => {
+    function Baddie() {
+      throw new Error('Game over');
+    }
+
+    ReactNoop.render(<Parent><Baddie /></Parent>);
+    try {
+      addComment('Will fatal');
+      ReactNoop.flush();
+    } catch (err) {
+      expect(err.message).toBe('Game over');
+    }
+    ReactNoop.render(<Parent><Child /></Parent>);
+    addComment('Will reconcile from a clean state');
+    ReactNoop.flush();
+    expect(getFlameChart()).toMatchSnapshot();
+  });
+
+  it('recovers from caught errors', () => {
+    function Baddie() {
+      throw new Error('Game over');
+    }
+
+    function ErrorReport() {
+      return <div />;
+    }
+
+    class Boundary extends React.Component {
+      state = {error: null};
+      unstable_handleError(error) {
+        this.setState({error});
+      }
+      render() {
+        if (this.state.error) {
+          return <ErrorReport />;
+        }
+        return this.props.children;
+      }
+    }
+
+    ReactNoop.render(
+      <Parent>
+        <Boundary>
+          <Parent>
+            <Baddie />
+          </Parent>
+        </Boundary>
+      </Parent>,
+    );
+    addComment('Stop on Baddie and restart from Boundary');
+    ReactNoop.flush();
+    expect(getFlameChart()).toMatchSnapshot();
+  });
+
+  it('deduplicates lifecycle names during commit to reduce overhead', () => {
+    class A extends React.Component {
+      componentDidUpdate() {}
+      render() {
+        return <div />;
+      }
+    }
+
+    class B extends React.Component {
+      componentDidUpdate(prevProps) {
+        if (this.props.cascade && !prevProps.cascade) {
+          this.setState({});
+        }
+      }
+      render() {
+        return <div />;
+      }
+    }
+
+    ReactNoop.render(
+      <Parent>
+        <A />
+        <B />
+        <A />
+        <B />
+      </Parent>,
+    );
+    ReactNoop.flush();
+    resetFlamechart();
+
+    ReactNoop.render(
+      <Parent>
+        <A />
+        <B />
+        <A />
+        <B />
+      </Parent>,
+    );
+    addComment('The commit phase should mention A and B just once');
+    ReactNoop.flush();
+    ReactNoop.render(
+      <Parent>
+        <A />
+        <B />
+        <A />
+        <B cascade={true} />
+      </Parent>,
+    );
+    addComment("Because of deduplication, we don't know B was cascading,");
+    addComment('but we should still see the warning for the commit phase.');
+    ReactNoop.flush();
+    expect(getFlameChart()).toMatchSnapshot();
+  });
+
+  it('supports coroutines', () => {
+    function Continuation({isSame}) {
+      return <span prop={isSame ? 'foo==bar' : 'foo!=bar'} />;
+    }
+
+    function CoChild({bar}) {
+      return ReactCoroutine.createYield({
+        props: {
+          bar: bar,
+        },
+        continuation: Continuation,
+      });
+    }
+
+    function Indirection() {
+      return [<CoChild bar={true} />, <CoChild bar={false} />];
+    }
+
+    function HandleYields(props, yields) {
+      return yields.map(y => (
+        <y.continuation isSame={props.foo === y.props.bar} />
+      ));
+    }
+
+    function CoParent(props) {
+      return ReactCoroutine.createCoroutine(
+        props.children,
+        HandleYields,
+        props,
+      );
+    }
+
+    function App() {
+      return <div><CoParent foo={true}><Indirection /></CoParent></div>;
+    }
+
+    ReactNoop.render(<App />);
+    ReactNoop.flush();
+    expect(getFlameChart()).toMatchSnapshot();
+  });
+
+  it('supports portals', () => {
+    const noopContainer = {children: []};
+    ReactNoop.render(
+      <Parent>
+        {ReactPortal.createPortal(<Child />, noopContainer, null)}
+      </Parent>,
+    );
+    ReactNoop.flush();
+    expect(getFlameChart()).toMatchSnapshot();
+  });
+});
diff --git a/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactIncrementalReflection-test.js b/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactIncrementalReflection-test.js
index 80ff14643d2bd0..bae5b1e35fdb6f 100644
--- a/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactIncrementalReflection-test.js
+++ b/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactIncrementalReflection-test.js
@@ -18,14 +18,13 @@ var ReactFeatureFlags;
 describe('ReactIncrementalReflection', () => {
   beforeEach(() => {
     jest.resetModules();
-    React = require('React');
+    React = require('react');
     ReactNoop = require('ReactNoop');
     ReactFeatureFlags = require('ReactFeatureFlags');
     ReactFeatureFlags.disableNewFiberFeatures = false;
   });
 
   it('handles isMounted even when the initial render is deferred', () => {
-
     let ops = [];
 
     const instances = [];
@@ -52,9 +51,7 @@ describe('ReactIncrementalReflection', () => {
     // Render part way through but don't yet commit the updates.
     ReactNoop.flushDeferredPri(20);
 
-    expect(ops).toEqual([
-      'componentWillMount', false,
-    ]);
+    expect(ops).toEqual(['componentWillMount', false]);
 
     expect(instances[0].isMounted()).toBe(false);
 
@@ -63,16 +60,12 @@ describe('ReactIncrementalReflection', () => {
     // Render the rest and commit the updates.
     ReactNoop.flush();
 
-    expect(ops).toEqual([
-      'componentDidMount', true,
-    ]);
+    expect(ops).toEqual(['componentDidMount', true]);
 
     expect(instances[0].isMounted()).toBe(true);
-
   });
 
   it('handles isMounted when an unmount is deferred', () => {
-
     let ops = [];
 
     const instances = [];
@@ -120,16 +113,12 @@ describe('ReactIncrementalReflection', () => {
     // Finish flushing the unmount.
     ReactNoop.flush();
 
-    expect(ops).toEqual([
-      'componentWillUnmount', true,
-    ]);
+    expect(ops).toEqual(['componentWillUnmount', true]);
 
     expect(instances[0].isMounted()).toBe(false);
-
   });
 
   it('finds no node before insertion and correct node before deletion', () => {
-
     let ops = [];
 
     let classInstance = null;
@@ -153,15 +142,15 @@ describe('ReactIncrementalReflection', () => {
       }
       render() {
         ops.push('render');
-        return this.props.step < 2 ?
-          <span ref={ref => this.span = ref} /> :
-          this.props.step === 2 ?
-          <div ref={ref => this.div = ref} /> :
-          this.props.step === 3 ?
-          null :
-          this.props.step === 4 ?
-          <div ref={ref => this.span = ref} /> :
-          null;
+        return this.props.step < 2
+          ? <span ref={ref => this.span = ref} />
+          : this.props.step === 2
+              ? <div ref={ref => this.div = ref} />
+              : this.props.step === 3
+                  ? null
+                  : this.props.step === 4
+                      ? <div ref={ref => this.span = ref} />
+                      : null;
       }
     }
 
@@ -172,10 +161,7 @@ describe('ReactIncrementalReflection', () => {
     }
 
     function Foo(props) {
-      return [
-        <Component step={props.step} />,
-        <Sibling />,
-      ];
+      return [<Component step={props.step} />, <Sibling />];
     }
 
     ReactNoop.render(<Foo step={0} />);
@@ -183,7 +169,8 @@ describe('ReactIncrementalReflection', () => {
     ReactNoop.flushDeferredPri(30);
 
     expect(ops).toEqual([
-      'componentWillMount', null,
+      'componentWillMount',
+      null,
       'render',
       'render sibling',
     ]);
@@ -202,9 +189,7 @@ describe('ReactIncrementalReflection', () => {
 
     expect(ReactNoop.findInstance(classInstance)).toBe(hostSpan);
 
-    expect(ops).toEqual([
-      'componentDidMount', hostSpan,
-    ]);
+    expect(ops).toEqual(['componentDidMount', hostSpan]);
 
     ops = [];
 
@@ -214,10 +199,12 @@ describe('ReactIncrementalReflection', () => {
     ReactNoop.flush();
 
     expect(ops).toEqual([
-      'componentWillUpdate', hostSpan,
+      'componentWillUpdate',
+      hostSpan,
       'render',
       'render sibling',
-      'componentDidUpdate', hostSpan,
+      'componentDidUpdate',
+      hostSpan,
     ]);
 
     expect(ReactNoop.findInstance(classInstance)).toBe(hostSpan);
@@ -230,7 +217,8 @@ describe('ReactIncrementalReflection', () => {
     ReactNoop.flushDeferredPri(30);
 
     expect(ops).toEqual([
-      'componentWillUpdate', hostSpan,
+      'componentWillUpdate',
+      hostSpan,
       'render',
       'render sibling',
     ]);
@@ -248,9 +236,7 @@ describe('ReactIncrementalReflection', () => {
     expect(hostDiv).toBeDefined();
     expect(hostSpan).not.toBe(hostDiv);
 
-    expect(ops).toEqual([
-      'componentDidUpdate', hostDiv,
-    ]);
+    expect(ops).toEqual(['componentDidUpdate', hostDiv]);
 
     ops = [];
 
@@ -262,7 +248,8 @@ describe('ReactIncrementalReflection', () => {
     ReactNoop.flushDeferredPri(25);
 
     expect(ops).toEqual([
-      'componentWillUpdate', hostDiv,
+      'componentWillUpdate',
+      hostDiv,
       'render',
       'render sibling',
     ]);
@@ -274,9 +261,7 @@ describe('ReactIncrementalReflection', () => {
 
     ReactNoop.flush();
 
-    expect(ops).toEqual([
-      'componentDidUpdate', null,
-    ]);
+    expect(ops).toEqual(['componentDidUpdate', null]);
 
     // This should still be the host div since the deletion is not committed.
     expect(ReactNoop.findInstance(classInstance)).toBe(null);
@@ -290,8 +275,6 @@ describe('ReactIncrementalReflection', () => {
     // Unmount the component.
     ReactNoop.render([]);
     ReactNoop.flush();
-    expect(ops).toEqual([
-      'componentWillUnmount', hostDiv,
-    ]);
+    expect(ops).toEqual(['componentWillUnmount', hostDiv]);
   });
 });
diff --git a/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactIncrementalScheduling-test.js b/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactIncrementalScheduling-test.js
index c856f263805711..8bc9176ef3e8fa 100644
--- a/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactIncrementalScheduling-test.js
+++ b/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactIncrementalScheduling-test.js
@@ -18,14 +18,14 @@ var ReactFeatureFlags;
 describe('ReactIncrementalScheduling', () => {
   beforeEach(() => {
     jest.resetModules();
-    React = require('React');
+    React = require('react');
     ReactNoop = require('ReactNoop');
     ReactFeatureFlags = require('ReactFeatureFlags');
     ReactFeatureFlags.disableNewFiberFeatures = false;
   });
 
   function span(prop) {
-    return { type: 'span', children: [], prop };
+    return {type: 'span', children: [], prop};
   }
 
   it('schedules and flushes deferred work', () => {
@@ -60,12 +60,12 @@ describe('ReactIncrementalScheduling', () => {
 
   it('schedules an animation callback when there`\s leftover animation work', () => {
     class Foo extends React.Component {
-      state = { step: 0 };
+      state = {step: 0};
       componentDidMount() {
         ReactNoop.performAnimationWork(() => {
-          this.setState({ step: 2 });
+          this.setState({step: 2});
         });
-        this.setState({ step: 1 });
+        this.setState({step: 1});
       }
       render() {
         return <span prop={this.state.step} />;
@@ -152,11 +152,11 @@ describe('ReactIncrementalScheduling', () => {
     var ops = [];
 
     class Foo extends React.Component {
-      state = { tick: 0 };
+      state = {tick: 0};
 
       componentDidMount() {
         ops.push('componentDidMount (before setState): ' + this.state.tick);
-        this.setState({ tick: 1 });
+        this.setState({tick: 1});
         // We're in a batch. Update hasn't flushed yet.
         ops.push('componentDidMount (after setState): ' + this.state.tick);
       }
@@ -165,7 +165,7 @@ describe('ReactIncrementalScheduling', () => {
         ops.push('componentDidUpdate: ' + this.state.tick);
         if (this.state.tick === 2) {
           ops.push('componentDidUpdate (before setState): ' + this.state.tick);
-          this.setState({ tick: 3 });
+          this.setState({tick: 3});
           ops.push('componentDidUpdate (after setState): ' + this.state.tick);
           // We're in a batch. Update hasn't flushed yet.
         }
@@ -192,7 +192,7 @@ describe('ReactIncrementalScheduling', () => {
     ]);
 
     ops = [];
-    instance.setState({ tick: 2 });
+    instance.setState({tick: 2});
     ReactNoop.flushDeferredPri(20 + 5);
 
     expect(ops).toEqual([
@@ -212,12 +212,12 @@ describe('ReactIncrementalScheduling', () => {
     var ops = [];
 
     class Foo extends React.Component {
-      state = { tick: 0 };
+      state = {tick: 0};
 
       componentDidMount() {
         ReactNoop.performAnimationWork(() => {
           ops.push('componentDidMount (before setState): ' + this.state.tick);
-          this.setState({ tick: 1 });
+          this.setState({tick: 1});
           ops.push('componentDidMount (after setState): ' + this.state.tick);
         });
       }
@@ -226,8 +226,10 @@ describe('ReactIncrementalScheduling', () => {
         ReactNoop.performAnimationWork(() => {
           ops.push('componentDidUpdate: ' + this.state.tick);
           if (this.state.tick === 2) {
-            ops.push('componentDidUpdate (before setState): ' + this.state.tick);
-            this.setState({ tick: 3 });
+            ops.push(
+              'componentDidUpdate (before setState): ' + this.state.tick,
+            );
+            this.setState({tick: 3});
             ops.push('componentDidUpdate (after setState): ' + this.state.tick);
           }
         });
@@ -256,13 +258,10 @@ describe('ReactIncrementalScheduling', () => {
     ops = [];
 
     ReactNoop.flushAnimationPri();
-    expect(ops).toEqual([
-      'render: 1',
-      'componentDidUpdate: 1',
-    ]);
+    expect(ops).toEqual(['render: 1', 'componentDidUpdate: 1']);
 
     ops = [];
-    instance.setState({ tick: 2 });
+    instance.setState({tick: 2});
     ReactNoop.flushDeferredPri(20 + 5);
 
     expect(ops).toEqual([
@@ -279,20 +278,17 @@ describe('ReactIncrementalScheduling', () => {
     ops = [];
 
     ReactNoop.flushAnimationPri();
-    expect(ops).toEqual([
-      'render: 3',
-      'componentDidUpdate: 3',
-    ]);
+    expect(ops).toEqual(['render: 3', 'componentDidUpdate: 3']);
   });
 
   it('performs Task work even after time runs out', () => {
     class Foo extends React.Component {
-      state = { step: 1 };
+      state = {step: 1};
       componentDidMount() {
-        this.setState({ step: 2 }, () => {
-          this.setState({ step: 3 }, () => {
-            this.setState({ step: 4 }, () => {
-              this.setState({ step: 5 });
+        this.setState({step: 2}, () => {
+          this.setState({step: 3}, () => {
+            this.setState({step: 4}, () => {
+              this.setState({step: 5});
             });
           });
         });
@@ -315,13 +311,13 @@ describe('ReactIncrementalScheduling', () => {
 
   it('does not perform animation work after time runs out', () => {
     class Foo extends React.Component {
-      state = { step: 1 };
+      state = {step: 1};
       componentDidMount() {
         ReactNoop.performAnimationWork(() => {
-          this.setState({ step: 2 }, () => {
-            this.setState({ step: 3 }, () => {
-              this.setState({ step: 4 }, () => {
-                this.setState({ step: 5 });
+          this.setState({step: 2}, () => {
+            this.setState({step: 3}, () => {
+              this.setState({step: 4}, () => {
+                this.setState({step: 5});
               });
             });
           });
@@ -374,7 +370,7 @@ describe('ReactIncrementalScheduling', () => {
     let instance;
     let ops = [];
     class Foo extends React.Component {
-      state = { step: 0 };
+      state = {step: 0};
       componentDidUpdate() {
         ops.push('componentDidUpdate: ' + this.state.step);
         if (this.state.step === 1) {
@@ -382,7 +378,7 @@ describe('ReactIncrementalScheduling', () => {
             // This is a nested state update, so it should not be
             // flushed synchronously, even though we wrapped it
             // in unbatchedUpdates.
-            this.setState({ step: 2 });
+            this.setState({step: 2});
           });
           expect(ReactNoop.getChildren()).toEqual([span(1)]);
         }
@@ -398,7 +394,7 @@ describe('ReactIncrementalScheduling', () => {
     expect(ReactNoop.getChildren()).toEqual([span(0)]);
 
     ReactNoop.syncUpdates(() => {
-      instance.setState({ step: 1 });
+      instance.setState({step: 1});
       expect(ReactNoop.getChildren()).toEqual([span(2)]);
     });
 
diff --git a/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js b/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js
index b6c24ccbe6b3db..97106fbc96a4e3 100644
--- a/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js
+++ b/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js
@@ -18,7 +18,7 @@ var ReactFeatureFlags;
 describe('ReactIncrementalSideEffects', () => {
   beforeEach(() => {
     jest.resetModules();
-    React = require('React');
+    React = require('react');
     ReactNoop = require('ReactNoop');
     ReactFeatureFlags = require('ReactFeatureFlags');
     ReactFeatureFlags.disableNewFiberFeatures = false;
@@ -29,16 +29,15 @@ describe('ReactIncrementalSideEffects', () => {
   }
 
   function div(...children) {
-    children = children.map(c => typeof c === 'string' ? { text: c } : c);
-    return { type: 'div', children, prop: undefined };
+    children = children.map(c => typeof c === 'string' ? {text: c} : c);
+    return {type: 'div', children, prop: undefined};
   }
 
   function span(prop) {
-    return { type: 'span', children: [], prop };
+    return {type: 'span', children: [], prop};
   }
 
   it('can update child nodes of a host instance', () => {
-
     function Bar(props) {
       return <span>{props.text}</span>;
     }
@@ -54,20 +53,14 @@ describe('ReactIncrementalSideEffects', () => {
 
     ReactNoop.render(<Foo text="Hello" />);
     ReactNoop.flush();
-    expect(ReactNoop.getChildren()).toEqual([
-      div(span()),
-    ]);
+    expect(ReactNoop.getChildren()).toEqual([div(span())]);
 
     ReactNoop.render(<Foo text="World" />);
     ReactNoop.flush();
-    expect(ReactNoop.getChildren()).toEqual([
-      div(span(), span()),
-    ]);
-
+    expect(ReactNoop.getChildren()).toEqual([div(span(), span())]);
   });
 
   it('can update child nodes of a fragment', function() {
-
     function Bar(props) {
       return <span>{props.text}</span>;
     }
@@ -76,13 +69,11 @@ describe('ReactIncrementalSideEffects', () => {
       return (
         <div>
           <Bar text={props.text} />
-          {props.text === 'World' ? [
-            <Bar key="a" text={props.text} />,
-            <div key="b" />,
-          ] : props.text === 'Hi' ? [
-            <div key="b" />,
-            <Bar key="a" text={props.text} />,
-          ] : null}
+          {props.text === 'World'
+            ? [<Bar key="a" text={props.text} />, <div key="b" />]
+            : props.text === 'Hi'
+                ? [<div key="b" />, <Bar key="a" text={props.text} />]
+                : null}
           <span prop="test" />
         </div>
       );
@@ -90,9 +81,7 @@ describe('ReactIncrementalSideEffects', () => {
 
     ReactNoop.render(<Foo text="Hello" />);
     ReactNoop.flush();
-    expect(ReactNoop.getChildren()).toEqual([
-      div(span(), span('test')),
-    ]);
+    expect(ReactNoop.getChildren()).toEqual([div(span(), span('test'))]);
 
     ReactNoop.render(<Foo text="World" />);
     ReactNoop.flush();
@@ -105,11 +94,9 @@ describe('ReactIncrementalSideEffects', () => {
     expect(ReactNoop.getChildren()).toEqual([
       div(span(), div(), span(), span('test')),
     ]);
-
   });
 
   it('can update child nodes rendering into text nodes', function() {
-
     function Bar(props) {
       return props.text;
     }
@@ -118,30 +105,23 @@ describe('ReactIncrementalSideEffects', () => {
       return (
         <div>
           <Bar text={props.text} />
-          {props.text === 'World' ? [
-            <Bar key="a" text={props.text} />,
-            '!',
-          ] : null}
+          {props.text === 'World'
+            ? [<Bar key="a" text={props.text} />, '!']
+            : null}
         </div>
       );
     }
 
     ReactNoop.render(<Foo text="Hello" />);
     ReactNoop.flush();
-    expect(ReactNoop.getChildren()).toEqual([
-      div('Hello'),
-    ]);
+    expect(ReactNoop.getChildren()).toEqual([div('Hello')]);
 
     ReactNoop.render(<Foo text="World" />);
     ReactNoop.flush();
-    expect(ReactNoop.getChildren()).toEqual([
-      div('World', 'World', '!'),
-    ]);
-
+    expect(ReactNoop.getChildren()).toEqual([div('World', 'World', '!')]);
   });
 
   it('can deletes children either components, host or text', function() {
-
     function Bar(props) {
       return <span prop={props.children} />;
     }
@@ -149,11 +129,9 @@ describe('ReactIncrementalSideEffects', () => {
     function Foo(props) {
       return (
         <div>
-          {props.show ? [
-            <div key="a" />,
-            <Bar key="b">Hello</Bar>,
-            'World',
-          ] : []}
+          {props.show
+            ? [<div key="a" />, <Bar key="b">Hello</Bar>, 'World']
+            : []}
         </div>
       );
     }
@@ -166,14 +144,10 @@ describe('ReactIncrementalSideEffects', () => {
 
     ReactNoop.render(<Foo show={false} />);
     ReactNoop.flush();
-    expect(ReactNoop.getChildren()).toEqual([
-      div(),
-    ]);
-
+    expect(ReactNoop.getChildren()).toEqual([div()]);
   });
 
   it('can delete a child that changes type - implicit keys', function() {
-
     let unmounted = false;
 
     class ClassComponent extends React.Component {
@@ -192,14 +166,11 @@ describe('ReactIncrementalSideEffects', () => {
     function Foo(props) {
       return (
         <div>
-          {props.useClass ?
-            <ClassComponent /> :
-            props.useFunction ?
-            <FunctionalComponent /> :
-            props.useText ?
-            'Text' :
-            null
-          }
+          {props.useClass
+            ? <ClassComponent />
+            : props.useFunction
+                ? <FunctionalComponent />
+                : props.useText ? 'Text' : null}
           Trail
         </div>
       );
@@ -207,36 +178,26 @@ describe('ReactIncrementalSideEffects', () => {
 
     ReactNoop.render(<Foo useClass={true} />);
     ReactNoop.flush();
-    expect(ReactNoop.getChildren()).toEqual([
-      div(span('Class'), 'Trail'),
-    ]);
+    expect(ReactNoop.getChildren()).toEqual([div(span('Class'), 'Trail')]);
 
     expect(unmounted).toBe(false);
 
     ReactNoop.render(<Foo useFunction={true} />);
     ReactNoop.flush();
-    expect(ReactNoop.getChildren()).toEqual([
-      div(span('Function'), 'Trail'),
-    ]);
+    expect(ReactNoop.getChildren()).toEqual([div(span('Function'), 'Trail')]);
 
     expect(unmounted).toBe(true);
 
     ReactNoop.render(<Foo useText={true} />);
     ReactNoop.flush();
-    expect(ReactNoop.getChildren()).toEqual([
-      div('Text', 'Trail'),
-    ]);
+    expect(ReactNoop.getChildren()).toEqual([div('Text', 'Trail')]);
 
     ReactNoop.render(<Foo />);
     ReactNoop.flush();
-    expect(ReactNoop.getChildren()).toEqual([
-      div('Trail'),
-    ]);
-
+    expect(ReactNoop.getChildren()).toEqual([div('Trail')]);
   });
 
   it('can delete a child that changes type - explicit keys', function() {
-
     let unmounted = false;
 
     class ClassComponent extends React.Component {
@@ -255,12 +216,9 @@ describe('ReactIncrementalSideEffects', () => {
     function Foo(props) {
       return (
         <div>
-          {props.useClass ?
-            <ClassComponent key="a" /> :
-            props.useFunction ?
-            <FunctionalComponent key="a" /> :
-            null
-          }
+          {props.useClass
+            ? <ClassComponent key="a" />
+            : props.useFunction ? <FunctionalComponent key="a" /> : null}
           Trail
         </div>
       );
@@ -268,30 +226,22 @@ describe('ReactIncrementalSideEffects', () => {
 
     ReactNoop.render(<Foo useClass={true} />);
     ReactNoop.flush();
-    expect(ReactNoop.getChildren()).toEqual([
-      div(span('Class'), 'Trail'),
-    ]);
+    expect(ReactNoop.getChildren()).toEqual([div(span('Class'), 'Trail')]);
 
     expect(unmounted).toBe(false);
 
     ReactNoop.render(<Foo useFunction={true} />);
     ReactNoop.flush();
-    expect(ReactNoop.getChildren()).toEqual([
-      div(span('Function'), 'Trail'),
-    ]);
+    expect(ReactNoop.getChildren()).toEqual([div(span('Function'), 'Trail')]);
 
     expect(unmounted).toBe(true);
 
     ReactNoop.render(<Foo />);
     ReactNoop.flush();
-    expect(ReactNoop.getChildren()).toEqual([
-      div('Trail'),
-    ]);
-
+    expect(ReactNoop.getChildren()).toEqual([div('Trail')]);
   });
 
   it('does not update child nodes if a flush is aborted', () => {
-
     function Bar(props) {
       return <span prop={props.text} />;
     }
@@ -319,11 +269,9 @@ describe('ReactIncrementalSideEffects', () => {
     expect(ReactNoop.getChildren()).toEqual([
       div(div(span('Hello'), span('Hello')), span('Yo')),
     ]);
-
   });
 
   it('preserves a previously rendered node when deprioritized', () => {
-
     function Middle(props) {
       return <span prop={props.children} />;
     }
@@ -341,27 +289,19 @@ describe('ReactIncrementalSideEffects', () => {
     ReactNoop.render(<Foo text="foo" />);
     ReactNoop.flush();
 
-    expect(ReactNoop.getChildren()).toEqual([
-      div(div(span('foo'))),
-    ]);
+    expect(ReactNoop.getChildren()).toEqual([div(div(span('foo')))]);
 
     ReactNoop.render(<Foo text="bar" />);
     ReactNoop.flushDeferredPri(20);
 
-    expect(ReactNoop.getChildren()).toEqual([
-      div(div(span('foo'))),
-    ]);
+    expect(ReactNoop.getChildren()).toEqual([div(div(span('foo')))]);
 
     ReactNoop.flush();
 
-    expect(ReactNoop.getChildren()).toEqual([
-      div(div(span('bar'))),
-    ]);
-
+    expect(ReactNoop.getChildren()).toEqual([div(div(span('bar')))]);
   });
 
   it('can reuse side-effects after being preempted', () => {
-
     function Bar(props) {
       return <span prop={props.children} />;
     }
@@ -376,14 +316,12 @@ describe('ReactIncrementalSideEffects', () => {
     function Foo(props) {
       return (
         <div hidden={true}>
-          {
-            props.step === 0 ?
-              <div>
+          {props.step === 0
+            ? <div>
                 <Bar>Hi</Bar>
                 <Bar>{props.text}</Bar>
               </div>
-              : middleContent
-          }
+            : middleContent}
         </div>
       );
     }
@@ -422,7 +360,6 @@ describe('ReactIncrementalSideEffects', () => {
   });
 
   it('can reuse side-effects after being preempted, if shouldComponentUpdate is false', () => {
-
     class Bar extends React.Component {
       shouldComponentUpdate(nextProps) {
         return this.props.children !== nextProps.children;
@@ -489,7 +426,7 @@ describe('ReactIncrementalSideEffects', () => {
 
   it('can update a completed tree before it has a chance to commit', () => {
     function Foo(props) {
-      return <span prop={props.step}/>;
+      return <span prop={props.step} />;
     }
     ReactNoop.render(<Foo step={1} />);
     // This should be just enough to complete the tree without committing it
@@ -530,9 +467,7 @@ describe('ReactIncrementalSideEffects', () => {
 
     ReactNoop.render(<Foo />);
     ReactNoop.flush();
-    expect(ReactNoop.getChildren()).toEqual([
-      div(span(1)),
-    ]);
+    expect(ReactNoop.getChildren()).toEqual([div(span(1))]);
   });
 
   it('can defer side-effects and resume them later on', function() {
@@ -560,16 +495,13 @@ describe('ReactIncrementalSideEffects', () => {
     expect(ReactNoop.getChildren()).toEqual([
       div(
         span(0),
-        div(/*the spans are down-prioritized and not rendered yet*/)
+        div(/*the spans are down-prioritized and not rendered yet*/),
       ),
     ]);
     ReactNoop.render(<Foo tick={1} idx={0} />);
     ReactNoop.flushDeferredPri(35 + 25);
     expect(ReactNoop.getChildren()).toEqual([
-      div(
-        span(1),
-        div(/*still not rendered yet*/)
-      ),
+      div(span(1), div(/*still not rendered yet*/)),
     ]);
     ReactNoop.flushDeferredPri(30 + 25);
     expect(ReactNoop.getChildren()).toEqual([
@@ -578,8 +510,8 @@ describe('ReactIncrementalSideEffects', () => {
         div(
           // Now we had enough time to finish the spans.
           span(0),
-          span(1)
-        )
+          span(1),
+        ),
       ),
     ]);
     var innerSpanA = ReactNoop.getChildren()[0].children[1].children[1];
@@ -591,8 +523,8 @@ describe('ReactIncrementalSideEffects', () => {
         div(
           // Still same old numbers.
           span(0),
-          span(1)
-        )
+          span(1),
+        ),
       ),
     ]);
     ReactNoop.render(<Foo tick={3} idx={1} />);
@@ -603,8 +535,8 @@ describe('ReactIncrementalSideEffects', () => {
         div(
           // New numbers.
           span(1),
-          span(2)
-        )
+          span(2),
+        ),
       ),
     ]);
 
@@ -654,7 +586,7 @@ describe('ReactIncrementalSideEffects', () => {
     expect(ReactNoop.getChildren()).toEqual([
       div(
         span(0),
-        div(/*the spans are down-prioritized and not rendered yet*/)
+        div(/*the spans are down-prioritized and not rendered yet*/),
       ),
     ]);
 
@@ -664,10 +596,7 @@ describe('ReactIncrementalSideEffects', () => {
     ReactNoop.render(<Foo tick={1} idx={0} />);
     ReactNoop.flushDeferredPri(70);
     expect(ReactNoop.getChildren()).toEqual([
-      div(
-        span(1),
-        div(/*still not rendered yet*/)
-      ),
+      div(span(1), div(/*still not rendered yet*/)),
     ]);
 
     expect(ops).toEqual(['Foo']);
@@ -684,8 +613,8 @@ describe('ReactIncrementalSideEffects', () => {
           span(0),
           span(0),
           span(0),
-          span(0)
-        )
+          span(0),
+        ),
       ),
     ]);
 
@@ -706,8 +635,8 @@ describe('ReactIncrementalSideEffects', () => {
           span(0),
           span(0),
           span(0),
-          span(0)
-        )
+          span(0),
+        ),
       ),
     ]);
 
@@ -730,8 +659,8 @@ describe('ReactIncrementalSideEffects', () => {
           span(0),
           span(0),
           span(0),
-          span(0)
-        )
+          span(0),
+        ),
       ),
     ]);
 
@@ -751,8 +680,8 @@ describe('ReactIncrementalSideEffects', () => {
           span(1),
           span(1),
           span(1),
-          span(1)
-        )
+          span(1),
+        ),
       ),
     ]);
 
@@ -767,11 +696,11 @@ describe('ReactIncrementalSideEffects', () => {
     class Bar extends React.Component {
       constructor() {
         super();
-        this.state = { active: false };
+        this.state = {active: false};
         barInstances.push(this);
       }
       activate() {
-        this.setState({ active: true });
+        this.setState({active: true});
       }
       render() {
         ops.push('Bar');
@@ -794,14 +723,7 @@ describe('ReactIncrementalSideEffects', () => {
     ReactNoop.render(<Foo tick={0} idx={0} />);
     ReactNoop.flush();
     expect(ReactNoop.getChildren()).toEqual([
-      div(
-        span(0),
-        div(
-          span(0),
-          span(0),
-          span(0)
-        )
-      ),
+      div(span(0), div(span(0), span(0), span(0))),
     ]);
 
     expect(ops).toEqual(['Foo', 'Bar', 'Bar', 'Bar']);
@@ -818,8 +740,8 @@ describe('ReactIncrementalSideEffects', () => {
           // Still not updated.
           span(0),
           span(0),
-          span(0)
-        )
+          span(0),
+        ),
       ),
     ]);
 
@@ -841,8 +763,8 @@ describe('ReactIncrementalSideEffects', () => {
           // Still not updated.
           span(0),
           span(0),
-          span(0)
-        )
+          span(0),
+        ),
       ),
     ]);
 
@@ -860,7 +782,7 @@ describe('ReactIncrementalSideEffects', () => {
           span('X'),
           span(1),
           span(1),
-        )
+        ),
       ),
     ]);
 
@@ -876,7 +798,7 @@ describe('ReactIncrementalSideEffects', () => {
       constructor() {
         super();
         instance = this;
-        this.state = { text: 'foo' };
+        this.state = {text: 'foo'};
       }
       render() {
         return <span prop={this.state.text} />;
@@ -885,14 +807,10 @@ describe('ReactIncrementalSideEffects', () => {
 
     ReactNoop.render(<Foo />);
     ReactNoop.flush();
-    expect(ReactNoop.getChildren()).toEqual([
-      span('foo'),
-    ]);
+    expect(ReactNoop.getChildren()).toEqual([span('foo')]);
     let called = false;
-    instance.setState({ text: 'bar' }, () => {
-      expect(ReactNoop.getChildren()).toEqual([
-        span('bar'),
-      ]);
+    instance.setState({text: 'bar'}, () => {
+      expect(ReactNoop.getChildren()).toEqual([span('bar')]);
       called = true;
     });
     ReactNoop.flush();
@@ -905,7 +823,7 @@ describe('ReactIncrementalSideEffects', () => {
       constructor() {
         super();
         instance = this;
-        this.state = { text: 'foo' };
+        this.state = {text: 'foo'};
       }
       shouldComponentUpdate(nextProps, nextState) {
         return this.state.text !== nextState.text;
@@ -917,9 +835,7 @@ describe('ReactIncrementalSideEffects', () => {
 
     ReactNoop.render(<Foo />);
     ReactNoop.flush();
-    expect(ReactNoop.getChildren()).toEqual([
-      span('foo'),
-    ]);
+    expect(ReactNoop.getChildren()).toEqual([span('foo')]);
     let called = false;
     instance.setState({}, () => {
       called = true;
@@ -931,7 +847,6 @@ describe('ReactIncrementalSideEffects', () => {
   // TODO: Test that callbacks are not lost if an update is preempted.
 
   it('calls componentWillUnmount after a deletion, even if nested', () => {
-
     var ops = [];
 
     class Bar extends React.Component {
@@ -955,18 +870,17 @@ describe('ReactIncrementalSideEffects', () => {
     function Foo(props) {
       return (
         <div>
-          {props.show ? [
-            <Bar key="a" name="A" />,
-            <Wrapper key="b" name="B" />,
-            <div key="cd">
-              <Bar name="C" />
-              <Wrapper name="D" />,
-            </div>,
-            [
-              <Bar key="e" name="E" />,
-              <Bar key="f" name="F" />,
-            ],
-          ] : []}
+          {props.show
+            ? [
+                <Bar key="a" name="A" />,
+                <Wrapper key="b" name="B" />,
+                <div key="cd">
+                  <Bar name="C" />
+                  <Wrapper name="D" />,
+                </div>,
+                [<Bar key="e" name="E" />, <Bar key="f" name="F" />],
+              ]
+            : []}
           <div>
             {props.show ? <Bar key="g" name="G" /> : null}
           </div>
@@ -992,11 +906,9 @@ describe('ReactIncrementalSideEffects', () => {
       'F',
       'G',
     ]);
-
   });
 
   it('calls componentDidMount/Update after insertion/update', () => {
-
     var ops = [];
 
     class Bar extends React.Component {
@@ -1032,10 +944,7 @@ describe('ReactIncrementalSideEffects', () => {
             <Bar name="C" />
             <Wrapper name="D" />
           </div>
-          {[
-            <Bar key="e" name="E" />,
-            <Bar key="f" name="F" />,
-          ]}
+          {[<Bar key="e" name="E" />, <Bar key="f" name="F" />]}
           <div>
             <Bar key="g" name="G" />
           </div>
@@ -1072,7 +981,6 @@ describe('ReactIncrementalSideEffects', () => {
       'update:F',
       'update:G',
     ]);
-
   });
 
   it('invokes ref callbacks after insertion/update/unmount', () => {
@@ -1093,15 +1001,13 @@ describe('ReactIncrementalSideEffects', () => {
     }
 
     function Foo(props) {
-      return (
-        props.show ?
-        <div>
-          <ClassComponent ref={n => ops.push(n)} />
-          <FunctionalComponent ref={n => ops.push(n)} />
-          <div ref={n => ops.push(n)} />
-        </div> :
-        null
-      );
+      return props.show
+        ? <div>
+            <ClassComponent ref={n => ops.push(n)} />
+            <FunctionalComponent ref={n => ops.push(n)} />
+            <div ref={n => ops.push(n)} />
+          </div>
+        : null;
     }
 
     ReactNoop.render(<Foo show={true} />);
@@ -1138,11 +1044,11 @@ describe('ReactIncrementalSideEffects', () => {
 
     expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])).toBe(
       'Warning: Stateless function components cannot be given refs. ' +
-      'Attempts to access this ref will fail.\n\nCheck the render method ' +
-      'of `Foo`.\n' +
-      '    in FunctionalComponent (at **)\n' +
-      '    in div (at **)\n' +
-      '    in Foo (at **)'
+        'Attempts to access this ref will fail.\n\nCheck the render method ' +
+        'of `Foo`.\n' +
+        '    in FunctionalComponent (at **)\n' +
+        '    in div (at **)\n' +
+        '    in Foo (at **)',
     );
   });
 
diff --git a/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactIncrementalUpdates-test.js b/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactIncrementalUpdates-test.js
index 9953c8db81cc83..b55d7a31962670 100644
--- a/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactIncrementalUpdates-test.js
+++ b/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactIncrementalUpdates-test.js
@@ -18,7 +18,7 @@ var ReactFeatureFlags;
 describe('ReactIncrementalUpdates', () => {
   beforeEach(() => {
     jest.resetModuleRegistry();
-    React = require('React');
+    React = require('react');
     ReactNoop = require('ReactNoop');
     ReactFeatureFlags = require('ReactFeatureFlags');
     ReactFeatureFlags.disableNewFiberFeatures = false;
@@ -31,11 +31,11 @@ describe('ReactIncrementalUpdates', () => {
       componentDidMount() {
         ReactNoop.performAnimationWork(() => {
           //  Has Animation priority
-          this.setState({ b: 'b' });
-          this.setState({ c: 'c' });
+          this.setState({b: 'b'});
+          this.setState({c: 'c'});
         });
         // Has Task priority
-        this.setState({ a: 'a' });
+        this.setState({a: 'a'});
       }
       render() {
         state = this.state;
@@ -45,9 +45,9 @@ describe('ReactIncrementalUpdates', () => {
 
     ReactNoop.render(<Foo />);
     ReactNoop.flushDeferredPri(25);
-    expect(state).toEqual({ a: 'a' });
+    expect(state).toEqual({a: 'a'});
     ReactNoop.flush();
-    expect(state).toEqual({ a: 'a', b: 'b', c: 'c' });
+    expect(state).toEqual({a: 'a', b: 'b', c: 'c'});
   });
 
   it('applies updates with equal priority in insertion order', () => {
@@ -56,9 +56,9 @@ describe('ReactIncrementalUpdates', () => {
       state = {};
       componentDidMount() {
         // All have Task priority
-        this.setState({ a: 'a' });
-        this.setState({ b: 'b' });
-        this.setState({ c: 'c' });
+        this.setState({a: 'a'});
+        this.setState({b: 'b'});
+        this.setState({c: 'c'});
       }
       render() {
         state = this.state;
@@ -68,7 +68,7 @@ describe('ReactIncrementalUpdates', () => {
 
     ReactNoop.render(<Foo />);
     ReactNoop.flush();
-    expect(state).toEqual({ a: 'a', b: 'b', c: 'c' });
+    expect(state).toEqual({a: 'a', b: 'b', c: 'c'});
   });
 
   it('only drops updates with equal or lesser priority when replaceState is called', () => {
@@ -94,19 +94,19 @@ describe('ReactIncrementalUpdates', () => {
     ReactNoop.render(<Foo />);
     ReactNoop.flush();
 
-    instance.setState({ x: 'x' });
-    instance.setState({ y: 'y' });
+    instance.setState({x: 'x'});
+    instance.setState({y: 'y'});
     ReactNoop.performAnimationWork(() => {
-      instance.setState({ a: 'a' });
-      instance.setState({ b: 'b' });
+      instance.setState({a: 'a'});
+      instance.setState({b: 'b'});
     });
-    instance.replaceState({ c: 'c' });
-    instance.setState({ d: 'd' });
+    instance.replaceState({c: 'c'});
+    instance.setState({d: 'd'});
 
     ReactNoop.flushAnimationPri();
     // Even though a replaceState has been already scheduled, it hasn't been
     // flushed yet because it has low priority.
-    expect(instance.state).toEqual({ a: 'a', b: 'b' });
+    expect(instance.state).toEqual({a: 'a', b: 'b'});
     expect(ops).toEqual([
       'render',
       'componentDidMount',
@@ -118,11 +118,8 @@ describe('ReactIncrementalUpdates', () => {
 
     ReactNoop.flush();
     // Now the rest of the updates are flushed.
-    expect(instance.state).toEqual({ c: 'c', d: 'd' });
-    expect(ops).toEqual([
-      'render',
-      'componentDidUpdate',
-    ]);
+    expect(instance.state).toEqual({c: 'c', d: 'd'});
+    expect(ops).toEqual(['render', 'componentDidUpdate']);
   });
 
   it('can abort an update, schedule additional updates, and resume', () => {
@@ -164,7 +161,7 @@ describe('ReactIncrementalUpdates', () => {
     // expect(ReactNoop.getChildren()).toEqual([span('')]);
     expect(ops).toEqual(['render']);
     expect(progressedUpdates).toEqual(['a', 'b', 'c']);
-    expect(instance.state).toEqual({ a: 'a', b: 'b', c: 'c' });
+    expect(instance.state).toEqual({a: 'a', b: 'b', c: 'c'});
 
     ops = [];
     progressedUpdates = [];
@@ -190,7 +187,15 @@ describe('ReactIncrementalUpdates', () => {
       'componentDidUpdate',
     ]);
     expect(progressedUpdates).toEqual(['d', 'e', 'a', 'b', 'c', 'f', 'g']);
-    expect(instance.state).toEqual({ a: 'a', b: 'b', c: 'c', d: 'd', e: 'e', f: 'f', g: 'g' });
+    expect(instance.state).toEqual({
+      a: 'a',
+      b: 'b',
+      c: 'c',
+      d: 'd',
+      e: 'e',
+      f: 'f',
+      g: 'g',
+    });
   });
 
   it('can abort an update, schedule a replaceState, and resume', () => {
@@ -232,7 +237,7 @@ describe('ReactIncrementalUpdates', () => {
     ReactNoop.flushDeferredPri(20);
     expect(ops).toEqual(['render']);
     expect(progressedUpdates).toEqual(['a', 'b', 'c']);
-    expect(instance.state).toEqual({ a: 'a', b: 'b', c: 'c' });
+    expect(instance.state).toEqual({a: 'a', b: 'b', c: 'c'});
 
     ops = [];
     progressedUpdates = [];
@@ -246,7 +251,7 @@ describe('ReactIncrementalUpdates', () => {
 
     ReactNoop.flush();
     expect(progressedUpdates).toEqual(['d', 'e', 'f', 'g']);
-    expect(instance.state).toEqual({ e: 'e', f: 'f', g: 'g' });
+    expect(instance.state).toEqual({e: 'e', f: 'f', g: 'g'});
   });
 
   it('passes accumulation of previous updates to replaceState updater function', () => {
@@ -263,11 +268,11 @@ describe('ReactIncrementalUpdates', () => {
     ReactNoop.render(<Foo />);
     ReactNoop.flush();
 
-    instance.setState({ a: 'a' });
-    instance.setState({ b: 'b' });
-    instance.replaceState(previousState => ({ previousState }));
+    instance.setState({a: 'a'});
+    instance.setState({b: 'b'});
+    instance.replaceState(previousState => ({previousState}));
     ReactNoop.flush();
-    expect(instance.state).toEqual({ previousState: { a: 'a', b : 'b' } });
+    expect(instance.state).toEqual({previousState: {a: 'a', b: 'b'}});
   });
 
   it('does not call callbacks that are scheduled by another callback until a later commit', () => {
@@ -276,9 +281,9 @@ describe('ReactIncrementalUpdates', () => {
       state = {};
       componentDidMount() {
         ops.push('did mount');
-        this.setState({ a: 'a' }, () => {
+        this.setState({a: 'a'}, () => {
           ops.push('callback a');
-          this.setState({ b: 'b' }, () => {
+          this.setState({b: 'b'}, () => {
             ops.push('callback b');
           });
         });
@@ -309,7 +314,7 @@ describe('ReactIncrementalUpdates', () => {
       state = {};
       componentWillReceiveProps() {
         ops.push('componentWillReceiveProps');
-        this.setState({ b: 'b' });
+        this.setState({b: 'b'});
       }
       render() {
         ops.push('render');
@@ -323,19 +328,15 @@ describe('ReactIncrementalUpdates', () => {
     ops = [];
 
     ReactNoop.performAnimationWork(() => {
-      instance.setState({ a: 'a' });
+      instance.setState({a: 'a'});
       ReactNoop.render(<Foo />); // Trigger componentWillReceiveProps
     });
     ReactNoop.flush();
 
-    expect(instance.state).toEqual({ a: 'a', b: 'b' });
-    expect(ops).toEqual([
-      'componentWillReceiveProps',
-      'render',
-    ]);
+    expect(instance.state).toEqual({a: 'a', b: 'b'});
+    expect(ops).toEqual(['componentWillReceiveProps', 'render']);
   });
 
-
   it('enqueues setState inside an updater function as if the in-progress update is progressed (and warns)', () => {
     spyOn(console, 'error');
     let instance;
@@ -354,8 +355,8 @@ describe('ReactIncrementalUpdates', () => {
 
     instance.setState(function a() {
       ops.push('setState updater');
-      this.setState({ b: 'b' });
-      return { a: 'a' };
+      this.setState({b: 'b'});
+      return {a: 'a'};
     });
 
     ReactNoop.flush();
@@ -367,7 +368,7 @@ describe('ReactIncrementalUpdates', () => {
       // be flushed in the same commit.
       'render',
     ]);
-    expect(instance.state).toEqual({ a: 'a', b: 'b' });
+    expect(instance.state).toEqual({a: 'a', b: 'b'});
 
     expectDev(console.error.calls.count()).toBe(1);
     console.error.calls.reset();
diff --git a/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactTopLevelFragment-test.js b/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactTopLevelFragment-test.js
index 04004e46a21ef2..fb0771fcb2da33 100644
--- a/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactTopLevelFragment-test.js
+++ b/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactTopLevelFragment-test.js
@@ -20,24 +20,21 @@ var ReactFeatureFlags;
 describe('ReactTopLevelFragment', function() {
   beforeEach(function() {
     jest.resetModules();
-    React = require('React');
+    React = require('react');
     ReactNoop = require('ReactNoop');
     ReactFeatureFlags = require('ReactFeatureFlags');
     ReactFeatureFlags.disableNewFiberFeatures = false;
   });
 
   it('should render a simple fragment at the top of a component', function() {
-
     function Fragment() {
       return [<div key="a">Hello</div>, <div key="b">World</div>];
     }
     ReactNoop.render(<Fragment />);
     ReactNoop.flush();
-
   });
 
   it('should preserve state when switching from a single child', function() {
-
     var instance = null;
 
     class Stateful extends React.Component {
@@ -47,9 +44,10 @@ describe('ReactTopLevelFragment', function() {
       }
     }
 
-    function Fragment({ condition }) {
-      return condition ? <Stateful key="a" /> :
-        [<Stateful key="a" />, <div key="b">World</div>];
+    function Fragment({condition}) {
+      return condition
+        ? <Stateful key="a" />
+        : [<Stateful key="a" />, <div key="b">World</div>];
     }
     ReactNoop.render(<Fragment />);
     ReactNoop.flush();
@@ -64,11 +62,9 @@ describe('ReactTopLevelFragment', function() {
     var instanceB = instance;
 
     expect(instanceB).toBe(instanceA);
-
   });
 
   it('should not preserve state when switching to a nested array', function() {
-
     var instance = null;
 
     class Stateful extends React.Component {
@@ -78,9 +74,10 @@ describe('ReactTopLevelFragment', function() {
       }
     }
 
-    function Fragment({ condition }) {
-      return condition ? <Stateful key="a" /> :
-        [[<Stateful key="a" />, <div key="b">World</div>], <div />];
+    function Fragment({condition}) {
+      return condition
+        ? <Stateful key="a" />
+        : [[<Stateful key="a" />, <div key="b">World</div>], <div />];
     }
     ReactNoop.render(<Fragment />);
     ReactNoop.flush();
@@ -95,11 +92,9 @@ describe('ReactTopLevelFragment', function() {
     var instanceB = instance;
 
     expect(instanceB).not.toBe(instanceA);
-
   });
 
   it('preserves state if an implicit key slot switches from/to null', function() {
-
     var instance = null;
 
     class Stateful extends React.Component {
@@ -109,9 +104,10 @@ describe('ReactTopLevelFragment', function() {
       }
     }
 
-    function Fragment({ condition }) {
-      return condition ? [null, <Stateful />] :
-        [<div>Hello</div>, <Stateful />];
+    function Fragment({condition}) {
+      return condition
+        ? [null, <Stateful />]
+        : [<div>Hello</div>, <Stateful />];
     }
     ReactNoop.render(<Fragment />);
     ReactNoop.flush();
@@ -133,11 +129,9 @@ describe('ReactTopLevelFragment', function() {
     var instanceC = instance;
 
     expect(instanceC === instanceA).toBe(true);
-
   });
 
   it('should preserve state in a reorder', function() {
-
     var instance = null;
 
     class Stateful extends React.Component {
@@ -147,9 +141,10 @@ describe('ReactTopLevelFragment', function() {
       }
     }
 
-    function Fragment({ condition }) {
-      return condition ? [[<div key="b">World</div>, <Stateful key="a" />]] :
-        [[<Stateful key="a" />, <div key="b">World</div>], <div />];
+    function Fragment({condition}) {
+      return condition
+        ? [[<div key="b">World</div>, <Stateful key="a" />]]
+        : [[<Stateful key="a" />, <div key="b">World</div>], <div />];
     }
     ReactNoop.render(<Fragment />);
     ReactNoop.flush();
@@ -164,7 +159,5 @@ describe('ReactTopLevelFragment', function() {
     var instanceB = instance;
 
     expect(instanceB).toBe(instanceA);
-
   });
-
 });
diff --git a/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactTopLevelText-test.js b/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactTopLevelText-test.js
index 84a98da73017d8..99e5c59b3730a5 100644
--- a/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactTopLevelText-test.js
+++ b/Libraries/Renderer/src/renderers/shared/fiber/__tests__/ReactTopLevelText-test.js
@@ -20,7 +20,7 @@ var ReactFeatureFlags;
 describe('ReactTopLevelText', () => {
   beforeEach(() => {
     jest.resetModules();
-    React = require('React');
+    React = require('react');
     ReactNoop = require('ReactNoop');
     ReactFeatureFlags = require('ReactFeatureFlags');
     ReactFeatureFlags.disableNewFiberFeatures = false;
@@ -39,5 +39,4 @@ describe('ReactTopLevelText', () => {
     ReactNoop.flush();
     expect(ReactNoop.getChildren()).toEqual([{text: '10'}]);
   });
-
 });
diff --git a/Libraries/Renderer/src/renderers/shared/fiber/__tests__/__snapshots__/ReactIncrementalPerf-test.js.snap b/Libraries/Renderer/src/renderers/shared/fiber/__tests__/__snapshots__/ReactIncrementalPerf-test.js.snap
new file mode 100644
index 00000000000000..760598a4ce5c75
--- /dev/null
+++ b/Libraries/Renderer/src/renderers/shared/fiber/__tests__/__snapshots__/ReactIncrementalPerf-test.js.snap
@@ -0,0 +1,260 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ReactDebugFiberPerf captures all lifecycles 1`] = `
+"// Mount
+⚛ (React Tree Reconciliation)
+  ⚛ AllLifecycles [mount]
+    ⚛ AllLifecycles.componentWillMount
+    ⚛ AllLifecycles.getChildContext
+  ⚛ (Committing Changes)
+    ⚛ (Committing Host Effects: 1 Total)
+    ⚛ (Calling Lifecycle Methods: 1 Total)
+      ⚛ AllLifecycles.componentDidMount
+
+// Update
+⚛ (React Tree Reconciliation)
+  ⚛ AllLifecycles [update]
+    ⚛ AllLifecycles.componentWillReceiveProps
+    ⚛ AllLifecycles.shouldComponentUpdate
+    ⚛ AllLifecycles.componentWillUpdate
+    ⚛ AllLifecycles.getChildContext
+  ⚛ (Committing Changes)
+    ⚛ (Committing Host Effects: 2 Total)
+    ⚛ (Calling Lifecycle Methods: 2 Total)
+      ⚛ AllLifecycles.componentDidUpdate
+
+// Unmount
+⚛ (React Tree Reconciliation)
+  ⚛ (Committing Changes)
+    ⚛ (Committing Host Effects: 1 Total)
+      ⚛ AllLifecycles.componentWillUnmount
+    ⚛ (Calling Lifecycle Methods: 0 Total)
+"
+`;
+
+exports[`ReactDebugFiberPerf deduplicates lifecycle names during commit to reduce overhead 1`] = `
+"// The commit phase should mention A and B just once
+⚛ (React Tree Reconciliation)
+  ⚛ Parent [update]
+    ⚛ A [update]
+    ⚛ B [update]
+    ⚛ A [update]
+    ⚛ B [update]
+  ⚛ (Committing Changes)
+    ⚛ (Committing Host Effects: 9 Total)
+    ⚛ (Calling Lifecycle Methods: 9 Total)
+      ⚛ A.componentDidUpdate
+      ⚛ B.componentDidUpdate
+
+// Because of deduplication, we don't know B was cascading,
+// but we should still see the warning for the commit phase.
+⛔ (React Tree Reconciliation) Warning: There were cascading updates
+  ⚛ Parent [update]
+    ⚛ A [update]
+    ⚛ B [update]
+    ⚛ A [update]
+    ⚛ B [update]
+  ⛔ (Committing Changes) Warning: Lifecycle hook scheduled a cascading update
+    ⚛ (Committing Host Effects: 9 Total)
+    ⚛ (Calling Lifecycle Methods: 9 Total)
+      ⚛ A.componentDidUpdate
+      ⚛ B.componentDidUpdate
+  ⚛ B [update]
+  ⛔ (Committing Changes) Warning: Caused by a cascading update in earlier commit
+    ⚛ (Committing Host Effects: 3 Total)
+    ⚛ (Calling Lifecycle Methods: 3 Total)
+      ⚛ B.componentDidUpdate
+"
+`;
+
+exports[`ReactDebugFiberPerf does not treat setState from cWM or cWRP as cascading 1`] = `
+"// Should not print a warning
+⚛ (React Tree Reconciliation)
+  ⚛ Parent [mount]
+    ⚛ NotCascading [mount]
+      ⚛ NotCascading.componentWillMount
+  ⚛ (Committing Changes)
+    ⚛ (Committing Host Effects: 1 Total)
+    ⚛ (Calling Lifecycle Methods: 0 Total)
+
+// Should not print a warning
+⚛ (React Tree Reconciliation)
+  ⚛ Parent [update]
+    ⚛ NotCascading [update]
+      ⚛ NotCascading.componentWillReceiveProps
+  ⚛ (Committing Changes)
+    ⚛ (Committing Host Effects: 2 Total)
+    ⚛ (Calling Lifecycle Methods: 2 Total)
+"
+`;
+
+exports[`ReactDebugFiberPerf measures a simple reconciliation 1`] = `
+"// Mount
+⚛ (React Tree Reconciliation)
+  ⚛ Parent [mount]
+    ⚛ Child [mount]
+  ⚛ (Committing Changes)
+    ⚛ (Committing Host Effects: 1 Total)
+    ⚛ (Calling Lifecycle Methods: 0 Total)
+
+// Update
+⚛ (React Tree Reconciliation)
+  ⚛ Parent [update]
+    ⚛ Child [update]
+  ⚛ (Committing Changes)
+    ⚛ (Committing Host Effects: 2 Total)
+    ⚛ (Calling Lifecycle Methods: 2 Total)
+
+// Unmount
+⚛ (React Tree Reconciliation)
+  ⚛ (Committing Changes)
+    ⚛ (Committing Host Effects: 1 Total)
+    ⚛ (Calling Lifecycle Methods: 0 Total)
+"
+`;
+
+exports[`ReactDebugFiberPerf measures deferred work in chunks 1`] = `
+"// Start mounting Parent and A
+⚛ (React Tree Reconciliation)
+  ⚛ Parent [mount]
+    ⚛ A [mount]
+      ⚛ Child [mount]
+
+// Mount B just a little (but not enough to memoize)
+⚛ (React Tree Reconciliation)
+  ⚛ Parent [mount]
+    ⚛ B [mount]
+
+// Complete B and Parent
+⚛ (React Tree Reconciliation)
+  ⚛ Parent [mount]
+    ⚛ B [mount]
+      ⚛ Child [mount]
+  ⚛ (Committing Changes)
+    ⚛ (Committing Host Effects: 1 Total)
+    ⚛ (Calling Lifecycle Methods: 0 Total)
+"
+`;
+
+exports[`ReactDebugFiberPerf measures deprioritized work 1`] = `
+"// Flush the parent
+⚛ (React Tree Reconciliation)
+  ⚛ Parent [mount]
+  ⚛ (Committing Changes)
+    ⚛ (Committing Host Effects: 1 Total)
+    ⚛ (Calling Lifecycle Methods: 0 Total)
+
+// Flush the child
+⚛ (React Tree Reconciliation)
+  ⚛ Child [mount]
+  ⚛ (Committing Changes)
+    ⚛ (Committing Host Effects: 3 Total)
+    ⚛ (Calling Lifecycle Methods: 2 Total)
+"
+`;
+
+exports[`ReactDebugFiberPerf recovers from caught errors 1`] = `
+"// Stop on Baddie and restart from Boundary
+⛔ (React Tree Reconciliation) Warning: There were cascading updates
+  ⚛ Parent [mount]
+    ⚛ Boundary [mount]
+      ⚛ Parent [mount]
+        ⚛ Baddie [mount]
+  ⛔ (Committing Changes) Warning: Lifecycle hook scheduled a cascading update
+    ⚛ (Committing Host Effects: 2 Total)
+    ⚛ (Calling Lifecycle Methods: 1 Total)
+  ⚛ Boundary [update]
+    ⚛ ErrorReport [mount]
+  ⛔ (Committing Changes) Warning: Caused by a cascading update in earlier commit
+    ⚛ (Committing Host Effects: 2 Total)
+    ⚛ (Calling Lifecycle Methods: 1 Total)
+"
+`;
+
+exports[`ReactDebugFiberPerf recovers from fatal errors 1`] = `
+"// Will fatal
+⚛ (React Tree Reconciliation)
+  ⚛ Parent [mount]
+    ⚛ Baddie [mount]
+  ⚛ (Committing Changes)
+    ⚛ (Committing Host Effects: 1 Total)
+    ⚛ (Calling Lifecycle Methods: 1 Total)
+
+// Will reconcile from a clean state
+⚛ (React Tree Reconciliation)
+  ⚛ Parent [mount]
+    ⚛ Child [mount]
+  ⚛ (Committing Changes)
+    ⚛ (Committing Host Effects: 1 Total)
+    ⚛ (Calling Lifecycle Methods: 0 Total)
+"
+`;
+
+exports[`ReactDebugFiberPerf skips parents during setState 1`] = `
+"// Should include just A and B, no Parents
+⚛ (React Tree Reconciliation)
+  ⚛ A [update]
+  ⚛ B [update]
+  ⚛ (Committing Changes)
+    ⚛ (Committing Host Effects: 6 Total)
+    ⚛ (Calling Lifecycle Methods: 6 Total)
+"
+`;
+
+exports[`ReactDebugFiberPerf supports coroutines 1`] = `
+"⚛ (React Tree Reconciliation)
+  ⚛ App [mount]
+    ⚛ CoParent [mount]
+      ⚛ HandleYields [mount]
+        ⚛ Indirection [mount]
+          ⚛ CoChild [mount]
+          ⚛ CoChild [mount]
+      ⚛ Continuation [mount]
+      ⚛ Continuation [mount]
+  ⚛ (Committing Changes)
+    ⚛ (Committing Host Effects: 3 Total)
+    ⚛ (Calling Lifecycle Methods: 0 Total)
+"
+`;
+
+exports[`ReactDebugFiberPerf supports portals 1`] = `
+"⚛ (React Tree Reconciliation)
+  ⚛ Parent [mount]
+    ⚛ Child [mount]
+  ⚛ (Committing Changes)
+    ⚛ (Committing Host Effects: 3 Total)
+    ⚛ (Calling Lifecycle Methods: 1 Total)
+"
+`;
+
+exports[`ReactDebugFiberPerf warns on cascading renders from setState 1`] = `
+"// Should print a warning
+⛔ (React Tree Reconciliation) Warning: There were cascading updates
+  ⚛ Parent [mount]
+    ⚛ Cascading [mount]
+  ⛔ (Committing Changes) Warning: Lifecycle hook scheduled a cascading update
+    ⚛ (Committing Host Effects: 2 Total)
+    ⚛ (Calling Lifecycle Methods: 1 Total)
+      ⛔ Cascading.componentDidMount Warning: Scheduled a cascading update
+  ⚛ Cascading [update]
+  ⛔ (Committing Changes) Warning: Caused by a cascading update in earlier commit
+    ⚛ (Committing Host Effects: 2 Total)
+    ⚛ (Calling Lifecycle Methods: 2 Total)
+"
+`;
+
+exports[`ReactDebugFiberPerf warns on cascading renders from top-level render 1`] = `
+"// Rendering the first root
+⛔ (React Tree Reconciliation) Warning: There were cascading updates
+  ⚛ Cascading [mount]
+  ⛔ (Committing Changes) Warning: Lifecycle hook scheduled a cascading update
+    ⚛ (Committing Host Effects: 1 Total)
+    ⚛ (Calling Lifecycle Methods: 1 Total)
+      ⛔ Cascading.componentDidMount Warning: Scheduled a cascading update
+        // Scheduling another root from componentDidMount
+  ⚛ Child [mount]
+  ⛔ (Committing Changes) Warning: Caused by a cascading update in earlier commit
+    ⚛ (Committing Host Effects: 1 Total)
+    ⚛ (Calling Lifecycle Methods: 0 Total)
+"
+`;
diff --git a/Libraries/Renderer/src/renderers/shared/fiber/isomorphic/ReactCoroutine.js b/Libraries/Renderer/src/renderers/shared/fiber/isomorphic/ReactCoroutine.js
index 68f3a99b5d8e55..605b15e8832df7 100644
--- a/Libraries/Renderer/src/renderers/shared/fiber/isomorphic/ReactCoroutine.js
+++ b/Libraries/Renderer/src/renderers/shared/fiber/isomorphic/ReactCoroutine.js
@@ -12,7 +12,7 @@
 
 'use strict';
 
-import type { ReactNodeList } from 'ReactTypes';
+import type {ReactNodeList} from 'ReactTypes';
 
 // The Symbol used to tag the special React types. If there is no native Symbol
 // nor polyfill, then a plain number is used for performance.
@@ -42,11 +42,11 @@ export type ReactYield = {
 };
 
 exports.createCoroutine = function<T>(
-  children : mixed,
-  handler : CoroutineHandler<T>,
-  props : T,
-  key : ?string = null
-) : ReactCoroutine {
+  children: mixed,
+  handler: CoroutineHandler<T>,
+  props: T,
+  key: ?string = null,
+): ReactCoroutine {
   var coroutine = {
     // This tag allow us to uniquely identify this as a React Coroutine
     $$typeof: REACT_COROUTINE_TYPE,
@@ -67,7 +67,7 @@ exports.createCoroutine = function<T>(
   return coroutine;
 };
 
-exports.createYield = function(value : mixed) : ReactYield {
+exports.createYield = function(value: mixed): ReactYield {
   var yieldNode = {
     // This tag allow us to uniquely identify this as a React Yield
     $$typeof: REACT_YIELD_TYPE,
@@ -87,23 +87,19 @@ exports.createYield = function(value : mixed) : ReactYield {
 /**
  * Verifies the object is a coroutine object.
  */
-exports.isCoroutine = function(object : mixed) : boolean {
-  return (
-    typeof object === 'object' &&
+exports.isCoroutine = function(object: mixed): boolean {
+  return typeof object === 'object' &&
     object !== null &&
-    object.$$typeof === REACT_COROUTINE_TYPE
-  );
+    object.$$typeof === REACT_COROUTINE_TYPE;
 };
 
 /**
  * Verifies the object is a yield object.
  */
-exports.isYield = function(object : mixed) : boolean {
-  return (
-    typeof object === 'object' &&
+exports.isYield = function(object: mixed): boolean {
+  return typeof object === 'object' &&
     object !== null &&
-    object.$$typeof === REACT_YIELD_TYPE
-  );
+    object.$$typeof === REACT_YIELD_TYPE;
 };
 
 exports.REACT_YIELD_TYPE = REACT_YIELD_TYPE;
diff --git a/Libraries/Renderer/src/renderers/shared/fiber/isomorphic/ReactPortal.js b/Libraries/Renderer/src/renderers/shared/fiber/isomorphic/ReactPortal.js
index 5cb03f96b785f6..13d99c7116af5d 100644
--- a/Libraries/Renderer/src/renderers/shared/fiber/isomorphic/ReactPortal.js
+++ b/Libraries/Renderer/src/renderers/shared/fiber/isomorphic/ReactPortal.js
@@ -12,30 +12,31 @@
 
 'use strict';
 
-import type { ReactNodeList } from 'ReactTypes';
+import type {ReactNodeList} from 'ReactTypes';
 
 // The Symbol used to tag the special React types. If there is no native Symbol
 // nor polyfill, then a plain number is used for performance.
-var REACT_PORTAL_TYPE =
-  (typeof Symbol === 'function' && Symbol.for && Symbol.for('react.portal')) ||
+var REACT_PORTAL_TYPE = (typeof Symbol === 'function' &&
+  Symbol.for &&
+  Symbol.for('react.portal')) ||
   0xeaca;
 
 export type ReactPortal = {
   $$typeof: Symbol | number,
   key: null | string,
   containerInfo: any,
-  children : ReactNodeList,
+  children: ReactNodeList,
   // TODO: figure out the API for cross-renderer implementation.
   implementation: any,
 };
 
 exports.createPortal = function(
-  children : ReactNodeList,
-  containerInfo : any,
+  children: ReactNodeList,
+  containerInfo: any,
   // TODO: figure out the API for cross-renderer implementation.
   implementation: any,
-  key : ?string = null
-) : ReactPortal {
+  key: ?string = null,
+): ReactPortal {
   return {
     // This tag allow us to uniquely identify this as a React Portal
     $$typeof: REACT_PORTAL_TYPE,
@@ -49,12 +50,10 @@ exports.createPortal = function(
 /**
  * Verifies the object is a portal object.
  */
-exports.isPortal = function(object : mixed) : boolean {
-  return (
-    typeof object === 'object' &&
+exports.isPortal = function(object: mixed): boolean {
+  return typeof object === 'object' &&
     object !== null &&
-    object.$$typeof === REACT_PORTAL_TYPE
-  );
+    object.$$typeof === REACT_PORTAL_TYPE;
 };
 
 exports.REACT_PORTAL_TYPE = REACT_PORTAL_TYPE;
diff --git a/Libraries/Renderer/src/renderers/shared/fiber/isomorphic/ReactTypes.js b/Libraries/Renderer/src/renderers/shared/fiber/isomorphic/ReactTypes.js
index 4b90269000c12c..2a3c05a1f50696 100644
--- a/Libraries/Renderer/src/renderers/shared/fiber/isomorphic/ReactTypes.js
+++ b/Libraries/Renderer/src/renderers/shared/fiber/isomorphic/ReactTypes.js
@@ -12,10 +12,16 @@
 
 'use strict';
 
-import type { ReactCoroutine, ReactYield } from 'ReactCoroutine';
-import type { ReactPortal } from 'ReactPortal';
+import type {ReactCoroutine, ReactYield} from 'ReactCoroutine';
+import type {ReactPortal} from 'ReactPortal';
 
-export type ReactNode = ReactElement<any> | ReactCoroutine | ReactYield | ReactPortal | ReactText | ReactFragment;
+export type ReactNode =
+  | ReactElement<any>
+  | ReactCoroutine
+  | ReactYield
+  | ReactPortal
+  | ReactText
+  | ReactFragment;
 
 export type ReactFragment = ReactEmpty | Iterable<ReactNode>;
 
diff --git a/Libraries/Renderer/src/renderers/shared/hooks/ReactHostOperationHistoryHook.js b/Libraries/Renderer/src/renderers/shared/hooks/ReactHostOperationHistoryHook.js
index 8827275b082116..ef3ec1ae8d1d11 100644
--- a/Libraries/Renderer/src/renderers/shared/hooks/ReactHostOperationHistoryHook.js
+++ b/Libraries/Renderer/src/renderers/shared/hooks/ReactHostOperationHistoryHook.js
@@ -12,19 +12,20 @@
 
 'use strict';
 
-import type { DebugID } from 'ReactInstanceType';
-
-export type Operation = {instanceID: DebugID} & (
-  {type: 'mount', payload: string} |
-  {type: 'insert child', payload: {toIndex: number, content: string}} |
-  {type: 'move child', payload: {fromIndex: number, toIndex: number}} |
-  {type: 'replace children', payload: string} |
-  {type: 'replace text', payload: string} |
-  {type: 'replace with', payload: string} |
-  {type: 'update styles', payload: mixed /* Style Object */} |
-  {type: 'update attribute', payload: {[name: string]: string}} |
-  {type: 'remove attribute', payload: string}
-);
+import type {DebugID} from 'ReactInstanceType';
+
+export type Operation =
+  & {instanceID: DebugID}
+  & (
+    | {type: 'mount', payload: string}
+    | {type: 'insert child', payload: {toIndex: number, content: string}}
+    | {type: 'move child', payload: {fromIndex: number, toIndex: number}}
+    | {type: 'replace children', payload: string}
+    | {type: 'replace text', payload: string}
+    | {type: 'replace with', payload: string}
+    | {type: 'update styles', payload: mixed /* Style Object */}
+    | {type: 'update attribute', payload: {[name: string]: string}}
+    | {type: 'remove attribute', payload: string});
 
 // Trust the developer to only use this with a __DEV__ check
 var ReactHostOperationHistoryHook = ((null: any): typeof ReactHostOperationHistoryHook);
diff --git a/Libraries/Renderer/src/renderers/shared/hooks/ReactInvalidSetStateWarningHook.js b/Libraries/Renderer/src/renderers/shared/hooks/ReactInvalidSetStateWarningHook.js
index b121f765ffb5df..6819cd80b0866b 100644
--- a/Libraries/Renderer/src/renderers/shared/hooks/ReactInvalidSetStateWarningHook.js
+++ b/Libraries/Renderer/src/renderers/shared/hooks/ReactInvalidSetStateWarningHook.js
@@ -22,7 +22,7 @@ if (__DEV__) {
   var warnInvalidSetState = function() {
     warning(
       !processingChildContext,
-      'setState(...): Cannot call setState() inside getChildContext()'
+      'setState(...): Cannot call setState() inside getChildContext()',
     );
   };
 
diff --git a/Libraries/Renderer/src/renderers/shared/shared/ReactInstanceMap.js b/Libraries/Renderer/src/renderers/shared/shared/ReactInstanceMap.js
index 24eeb2d74037a9..495c82c311b6ec 100644
--- a/Libraries/Renderer/src/renderers/shared/shared/ReactInstanceMap.js
+++ b/Libraries/Renderer/src/renderers/shared/shared/ReactInstanceMap.js
@@ -20,7 +20,6 @@
 
 // TODO: Replace this with ES6: var ReactInstanceMap = new Map();
 var ReactInstanceMap = {
-
   /**
    * This API should be called `delete` but we'd have to make sure to always
    * transform these to strings for IE support. When this transform is fully
@@ -41,7 +40,6 @@ var ReactInstanceMap = {
   set: function(key, value) {
     key._reactInternalInstance = value;
   },
-
 };
 
 module.exports = ReactInstanceMap;
diff --git a/Libraries/Renderer/src/renderers/shared/shared/ReactTreeTraversal.js b/Libraries/Renderer/src/renderers/shared/shared/ReactTreeTraversal.js
index 07969dc4a68d0c..c6c8aa265610b1 100644
--- a/Libraries/Renderer/src/renderers/shared/shared/ReactTreeTraversal.js
+++ b/Libraries/Renderer/src/renderers/shared/shared/ReactTreeTraversal.js
@@ -11,7 +11,7 @@
 
 'use strict';
 
-var { HostComponent } = require('ReactTypeOfWork');
+var {HostComponent} = require('ReactTypeOfWork');
 
 function getParent(inst) {
   if (inst._hostParent !== undefined) {
@@ -101,7 +101,7 @@ function traverseTwoPhase(inst, fn, arg) {
     inst = getParent(inst);
   }
   var i;
-  for (i = path.length; i-- > 0;) {
+  for (i = path.length; i-- > 0; ) {
     fn(path[i], 'captured', arg);
   }
   for (i = 0; i < path.length; i++) {
@@ -132,7 +132,7 @@ function traverseEnterLeave(from, to, fn, argFrom, argTo) {
   for (i = 0; i < pathFrom.length; i++) {
     fn(pathFrom[i], 'bubbled', argFrom);
   }
-  for (i = pathTo.length; i-- > 0;) {
+  for (i = pathTo.length; i-- > 0; ) {
     fn(pathTo[i], 'captured', argTo);
   }
 }
diff --git a/Libraries/Renderer/src/renderers/shared/shared/event/EventPluginHub.js b/Libraries/Renderer/src/renderers/shared/shared/event/EventPluginHub.js
index bdd958571531f3..ac723ff890052d 100644
--- a/Libraries/Renderer/src/renderers/shared/shared/event/EventPluginHub.js
+++ b/Libraries/Renderer/src/renderers/shared/shared/event/EventPluginHub.js
@@ -49,10 +49,10 @@ var executeDispatchesAndReleaseTopLevel = function(e) {
 };
 
 function isInteractive(tag) {
-  return (
-    tag === 'button' || tag === 'input' ||
-    tag === 'select' || tag === 'textarea'
-  );
+  return tag === 'button' ||
+    tag === 'input' ||
+    tag === 'select' ||
+    tag === 'textarea';
 }
 
 function shouldPreventMouseEvent(name, type, props) {
@@ -96,12 +96,10 @@ function shouldPreventMouseEvent(name, type, props) {
  * @public
  */
 var EventPluginHub = {
-
   /**
    * Methods for injecting dependencies.
    */
   injection: {
-
     /**
      * @param {array} InjectedEventPluginOrder
      * @public
@@ -112,7 +110,6 @@ var EventPluginHub = {
      * @param {object} injectedNamesToPlugins Map from names to plugin modules.
      */
     injectEventPluginsByName: EventPluginRegistry.injectEventPluginsByName,
-
   },
 
   /**
@@ -126,9 +123,12 @@ var EventPluginHub = {
     // TODO: shouldPreventMouseEvent is DOM-specific and definitely should not
     // live here; needs to be moved to a better place soon
     if (typeof inst.tag === 'number') {
-      const props = EventPluginUtils.getFiberCurrentPropsFromNode(
-        inst.stateNode
-      );
+      const stateNode = inst.stateNode;
+      if (!stateNode) {
+        // Work in progress (ex: onload events in incremental mode).
+        return null;
+      }
+      const props = EventPluginUtils.getFiberCurrentPropsFromNode(stateNode);
       if (!props) {
         // Work in progress.
         return null;
@@ -162,7 +162,7 @@ var EventPluginHub = {
       !listener || typeof listener === 'function',
       'Expected %s listener to be a function, instead got type %s',
       registrationName,
-      typeof listener
+      typeof listener,
     );
     return listener;
   },
@@ -175,10 +175,11 @@ var EventPluginHub = {
    * @internal
    */
   extractEvents: function(
-      topLevelType,
-      targetInst,
-      nativeEvent,
-      nativeEventTarget) {
+    topLevelType,
+    targetInst,
+    nativeEvent,
+    nativeEventTarget,
+  ) {
     var events;
     var plugins = EventPluginRegistry.plugins;
     for (var i = 0; i < plugins.length; i++) {
@@ -189,7 +190,7 @@ var EventPluginHub = {
           topLevelType,
           targetInst,
           nativeEvent,
-          nativeEventTarget
+          nativeEventTarget,
         );
         if (extractedEvents) {
           events = accumulateInto(events, extractedEvents);
@@ -225,23 +226,22 @@ var EventPluginHub = {
     if (simulated) {
       forEachAccumulated(
         processingEventQueue,
-        executeDispatchesAndReleaseSimulated
+        executeDispatchesAndReleaseSimulated,
       );
     } else {
       forEachAccumulated(
         processingEventQueue,
-        executeDispatchesAndReleaseTopLevel
+        executeDispatchesAndReleaseTopLevel,
       );
     }
     invariant(
       !eventQueue,
       'processEventQueue(): Additional events were enqueued while processing ' +
-      'an event queue. Support for this has not yet been implemented.'
+        'an event queue. Support for this has not yet been implemented.',
     );
     // This would be a good time to rethrow if any of the event handlers threw.
     ReactErrorUtils.rethrowCaughtError();
   },
-
 };
 
 module.exports = EventPluginHub;
diff --git a/Libraries/Renderer/src/renderers/shared/shared/event/EventPluginRegistry.js b/Libraries/Renderer/src/renderers/shared/shared/event/EventPluginRegistry.js
index fa868dca10cba6..e60ba5d829cf54 100644
--- a/Libraries/Renderer/src/renderers/shared/shared/event/EventPluginRegistry.js
+++ b/Libraries/Renderer/src/renderers/shared/shared/event/EventPluginRegistry.js
@@ -12,16 +12,9 @@
 
 'use strict';
 
-import type {
-  DispatchConfig,
-  ReactSyntheticEvent,
-} from 'ReactSyntheticEventType';
+import type {DispatchConfig} from 'ReactSyntheticEventType';
 
-import type {
-  AnyNativeEvent,
-  PluginName,
-  PluginModule,
-} from 'PluginModuleType';
+import type {AnyNativeEvent, PluginName, PluginModule} from 'PluginModuleType';
 
 type NamesToPlugins = {[key: PluginName]: PluginModule<AnyNativeEvent>};
 
@@ -55,7 +48,7 @@ function recomputePluginOrdering(): void {
     invariant(
       pluginIndex > -1,
       'EventPluginRegistry: Cannot inject event plugins that do not exist in ' +
-      'the plugin ordering, `%s`.',
+        'the plugin ordering, `%s`.',
       pluginName,
     );
     if (EventPluginRegistry.plugins[pluginIndex]) {
@@ -64,7 +57,7 @@ function recomputePluginOrdering(): void {
     invariant(
       pluginModule.extractEvents,
       'EventPluginRegistry: Event plugins must implement an `extractEvents` ' +
-      'method, but `%s` does not.',
+        'method, but `%s` does not.',
       pluginName,
     );
     EventPluginRegistry.plugins[pluginIndex] = pluginModule;
@@ -100,7 +93,7 @@ function publishEventForPlugin(
   invariant(
     !EventPluginRegistry.eventNameDispatchConfigs.hasOwnProperty(eventName),
     'EventPluginHub: More than one plugin attempted to publish the same ' +
-    'event name, `%s`.',
+      'event name, `%s`.',
     eventName,
   );
   EventPluginRegistry.eventNameDispatchConfigs[eventName] = dispatchConfig;
@@ -144,18 +137,19 @@ function publishRegistrationName(
   invariant(
     !EventPluginRegistry.registrationNameModules[registrationName],
     'EventPluginHub: More than one plugin attempted to publish the same ' +
-    'registration name, `%s`.',
+      'registration name, `%s`.',
     registrationName,
   );
   EventPluginRegistry.registrationNameModules[registrationName] = pluginModule;
-  EventPluginRegistry.registrationNameDependencies[registrationName] =
-    pluginModule.eventTypes[eventName].dependencies;
+  EventPluginRegistry.registrationNameDependencies[
+    registrationName
+  ] = pluginModule.eventTypes[eventName].dependencies;
 
   if (__DEV__) {
     var lowerCasedName = registrationName.toLowerCase();
-    EventPluginRegistry.possibleRegistrationNames[lowerCasedName] =
-      registrationName;
-
+    EventPluginRegistry.possibleRegistrationNames[
+      lowerCasedName
+    ] = registrationName;
 
     if (registrationName === 'onDoubleClick') {
       EventPluginRegistry.possibleRegistrationNames.ondblclick = registrationName;
@@ -169,7 +163,6 @@ function publishRegistrationName(
  * @see {EventPluginHub}
  */
 var EventPluginRegistry = {
-
   /**
    * Ordered list of injected plugins.
    */
@@ -214,7 +207,7 @@ var EventPluginRegistry = {
     invariant(
       !eventPluginOrder,
       'EventPluginRegistry: Cannot inject event plugin ordering more than ' +
-      'once. You are likely trying to load more than one copy of React.',
+        'once. You are likely trying to load more than one copy of React.',
     );
     // Clone the ordering so it cannot be dynamically mutated.
     eventPluginOrder = Array.prototype.slice.call(injectedEventPluginOrder);
@@ -232,7 +225,7 @@ var EventPluginRegistry = {
    * @see {EventPluginHub.injection.injectEventPluginsByName}
    */
   injectEventPluginsByName: function(
-    injectedNamesToPlugins: NamesToPlugins
+    injectedNamesToPlugins: NamesToPlugins,
   ): void {
     var isOrderingDirty = false;
     for (var pluginName in injectedNamesToPlugins) {
@@ -240,12 +233,14 @@ var EventPluginRegistry = {
         continue;
       }
       var pluginModule = injectedNamesToPlugins[pluginName];
-      if (!namesToPlugins.hasOwnProperty(pluginName) ||
-          namesToPlugins[pluginName] !== pluginModule) {
+      if (
+        !namesToPlugins.hasOwnProperty(pluginName) ||
+        namesToPlugins[pluginName] !== pluginModule
+      ) {
         invariant(
           !namesToPlugins[pluginName],
           'EventPluginRegistry: Cannot inject two different event plugins ' +
-          'using the same name, `%s`.',
+            'using the same name, `%s`.',
           pluginName,
         );
         namesToPlugins[pluginName] = pluginModule;
@@ -256,80 +251,6 @@ var EventPluginRegistry = {
       recomputePluginOrdering();
     }
   },
-
-  /**
-   * Looks up the plugin for the supplied event.
-   *
-   * @param {object} event A synthetic event.
-   * @return {?object} The plugin that created the supplied event.
-   * @internal
-   */
-  getPluginModuleForEvent: function(
-    event: ReactSyntheticEvent,
-  ): null | PluginModule<AnyNativeEvent> {
-    var dispatchConfig = event.dispatchConfig;
-    if (dispatchConfig.registrationName) {
-      return EventPluginRegistry.registrationNameModules[
-        dispatchConfig.registrationName
-      ] || null;
-    }
-    if (dispatchConfig.phasedRegistrationNames !== undefined) {
-      // pulling phasedRegistrationNames out of dispatchConfig helps Flow see
-      // that it is not undefined.
-      var {phasedRegistrationNames} = dispatchConfig;
-      for (var phase in phasedRegistrationNames) {
-        if (!phasedRegistrationNames.hasOwnProperty(phase)) {
-          continue;
-        }
-        var pluginModule = EventPluginRegistry.registrationNameModules[
-          phasedRegistrationNames[phase]
-        ];
-        if (pluginModule) {
-          return pluginModule;
-        }
-      }
-    }
-    return null;
-  },
-
-  /**
-   * Exposed for unit testing.
-   * @private
-   */
-  _resetEventPlugins: function(): void {
-    eventPluginOrder = null;
-    for (var pluginName in namesToPlugins) {
-      if (namesToPlugins.hasOwnProperty(pluginName)) {
-        delete namesToPlugins[pluginName];
-      }
-    }
-    EventPluginRegistry.plugins.length = 0;
-
-    var eventNameDispatchConfigs = EventPluginRegistry.eventNameDispatchConfigs;
-    for (var eventName in eventNameDispatchConfigs) {
-      if (eventNameDispatchConfigs.hasOwnProperty(eventName)) {
-        delete eventNameDispatchConfigs[eventName];
-      }
-    }
-
-    var registrationNameModules = EventPluginRegistry.registrationNameModules;
-    for (var registrationName in registrationNameModules) {
-      if (registrationNameModules.hasOwnProperty(registrationName)) {
-        delete registrationNameModules[registrationName];
-      }
-    }
-
-    if (__DEV__) {
-      var possibleRegistrationNames =
-        EventPluginRegistry.possibleRegistrationNames;
-      for (var lowerCasedName in possibleRegistrationNames) {
-        if (possibleRegistrationNames.hasOwnProperty(lowerCasedName)) {
-          delete possibleRegistrationNames[lowerCasedName];
-        }
-      }
-    }
-  },
-
 };
 
 module.exports = EventPluginRegistry;
diff --git a/Libraries/Renderer/src/renderers/shared/shared/event/EventPluginUtils.js b/Libraries/Renderer/src/renderers/shared/shared/event/EventPluginUtils.js
index 5788d39afc7093..38952088b24707 100644
--- a/Libraries/Renderer/src/renderers/shared/shared/event/EventPluginUtils.js
+++ b/Libraries/Renderer/src/renderers/shared/shared/event/EventPluginUtils.js
@@ -31,10 +31,10 @@ var injection = {
     if (__DEV__) {
       warning(
         Injected &&
-        Injected.getNodeFromInstance &&
-        Injected.getInstanceFromNode,
+          Injected.getNodeFromInstance &&
+          Injected.getInstanceFromNode,
         'EventPluginUtils.injection.injectComponentTree(...): Injected ' +
-        'module is missing getNodeFromInstance or getInstanceFromNode.'
+          'module is missing getNodeFromInstance or getInstanceFromNode.',
       );
     }
   },
@@ -42,20 +42,17 @@ var injection = {
 
 function isEndish(topLevelType) {
   return topLevelType === 'topMouseUp' ||
-         topLevelType === 'topTouchEnd' ||
-         topLevelType === 'topTouchCancel';
+    topLevelType === 'topTouchEnd' ||
+    topLevelType === 'topTouchCancel';
 }
 
 function isMoveish(topLevelType) {
-  return topLevelType === 'topMouseMove' ||
-         topLevelType === 'topTouchMove';
+  return topLevelType === 'topMouseMove' || topLevelType === 'topTouchMove';
 }
 function isStartish(topLevelType) {
-  return topLevelType === 'topMouseDown' ||
-         topLevelType === 'topTouchStart';
+  return topLevelType === 'topMouseDown' || topLevelType === 'topTouchStart';
 }
 
-
 var validateEventDispatches;
 if (__DEV__) {
   validateEventDispatches = function(event) {
@@ -63,18 +60,18 @@ if (__DEV__) {
     var dispatchInstances = event._dispatchInstances;
 
     var listenersIsArr = Array.isArray(dispatchListeners);
-    var listenersLen = listenersIsArr ?
-      dispatchListeners.length :
-      dispatchListeners ? 1 : 0;
+    var listenersLen = listenersIsArr
+      ? dispatchListeners.length
+      : dispatchListeners ? 1 : 0;
 
     var instancesIsArr = Array.isArray(dispatchInstances);
-    var instancesLen = instancesIsArr ?
-      dispatchInstances.length :
-      dispatchInstances ? 1 : 0;
+    var instancesLen = instancesIsArr
+      ? dispatchInstances.length
+      : dispatchInstances ? 1 : 0;
 
     warning(
       instancesIsArr === listenersIsArr && instancesLen === listenersLen,
-      'EventPluginUtils: Invalid `event`.'
+      'EventPluginUtils: Invalid `event`.',
     );
   };
 }
@@ -89,15 +86,12 @@ if (__DEV__) {
 function executeDispatch(event, simulated, listener, inst) {
   var type = event.type || 'unknown-event';
   event.currentTarget = EventPluginUtils.getNodeFromInstance(inst);
-  if (simulated) {
-    ReactErrorUtils.invokeGuardedCallbackWithCatch(
-      type,
-      listener,
-      event
-    );
-  } else {
-    ReactErrorUtils.invokeGuardedCallback(type, listener, event);
-  }
+  ReactErrorUtils.invokeGuardedCallbackAndCatchFirstError(
+    type,
+    listener,
+    undefined,
+    event,
+  );
   event.currentTarget = null;
 }
 
@@ -120,7 +114,7 @@ function executeDispatchesInOrder(event, simulated) {
         event,
         simulated,
         dispatchListeners[i],
-        dispatchInstances[i]
+        dispatchInstances[i],
       );
     }
   } else if (dispatchListeners) {
@@ -188,9 +182,11 @@ function executeDirectDispatch(event) {
   var dispatchInstance = event._dispatchInstances;
   invariant(
     !Array.isArray(dispatchListener),
-    'executeDirectDispatch(...): Invalid `event`.'
+    'executeDirectDispatch(...): Invalid `event`.',
   );
-  event.currentTarget = dispatchListener ? EventPluginUtils.getNodeFromInstance(dispatchInstance) : null;
+  event.currentTarget = dispatchListener
+    ? EventPluginUtils.getNodeFromInstance(dispatchInstance)
+    : null;
   var res = dispatchListener ? dispatchListener(event) : null;
   event.currentTarget = null;
   event._dispatchListeners = null;
diff --git a/Libraries/Renderer/src/renderers/shared/shared/event/EventPropagators.js b/Libraries/Renderer/src/renderers/shared/shared/event/EventPropagators.js
index c97f880939d16d..db9537b8338e76 100644
--- a/Libraries/Renderer/src/renderers/shared/shared/event/EventPropagators.js
+++ b/Libraries/Renderer/src/renderers/shared/shared/event/EventPropagators.js
@@ -18,7 +18,7 @@ var accumulateInto = require('accumulateInto');
 var forEachAccumulated = require('forEachAccumulated');
 var warning = require('fbjs/lib/warning');
 
-import type { PropagationPhases } from 'EventConstants';
+import type {PropagationPhases} from 'EventConstants';
 
 var getListener = EventPluginHub.getListener;
 
@@ -27,8 +27,9 @@ var getListener = EventPluginHub.getListener;
  * "phases" of propagation. This finds listeners by a given phase.
  */
 function listenerAtPhase(inst, event, propagationPhase: PropagationPhases) {
-  var registrationName =
-    event.dispatchConfig.phasedRegistrationNames[propagationPhase];
+  var registrationName = event.dispatchConfig.phasedRegistrationNames[
+    propagationPhase
+  ];
   return getListener(inst, registrationName);
 }
 
@@ -40,15 +41,14 @@ function listenerAtPhase(inst, event, propagationPhase: PropagationPhases) {
  */
 function accumulateDirectionalDispatches(inst, phase, event) {
   if (__DEV__) {
-    warning(
-      inst,
-      'Dispatching inst must not be null'
-    );
+    warning(inst, 'Dispatching inst must not be null');
   }
   var listener = listenerAtPhase(inst, event, phase);
   if (listener) {
-    event._dispatchListeners =
-      accumulateInto(event._dispatchListeners, listener);
+    event._dispatchListeners = accumulateInto(
+      event._dispatchListeners,
+      listener,
+    );
     event._dispatchInstances = accumulateInto(event._dispatchInstances, inst);
   }
 }
@@ -65,7 +65,7 @@ function accumulateTwoPhaseDispatchesSingle(event) {
     ReactTreeTraversal.traverseTwoPhase(
       event._targetInst,
       accumulateDirectionalDispatches,
-      event
+      event,
     );
   }
 }
@@ -76,29 +76,31 @@ function accumulateTwoPhaseDispatchesSingle(event) {
 function accumulateTwoPhaseDispatchesSingleSkipTarget(event) {
   if (event && event.dispatchConfig.phasedRegistrationNames) {
     var targetInst = event._targetInst;
-    var parentInst =
-      targetInst ? ReactTreeTraversal.getParentInstance(targetInst) : null;
+    var parentInst = targetInst
+      ? ReactTreeTraversal.getParentInstance(targetInst)
+      : null;
     ReactTreeTraversal.traverseTwoPhase(
       parentInst,
       accumulateDirectionalDispatches,
-      event
+      event,
     );
   }
 }
 
-
 /**
  * Accumulates without regard to direction, does not look for phased
  * registration names. Same as `accumulateDirectDispatchesSingle` but without
  * requiring that the `dispatchMarker` be the same as the dispatched ID.
  */
 function accumulateDispatches(inst, ignoredDirection, event) {
-  if (inst && event && event.dispatchConfig.registrationName) {
+  if (event && event.dispatchConfig.registrationName) {
     var registrationName = event.dispatchConfig.registrationName;
     var listener = getListener(inst, registrationName);
     if (listener) {
-      event._dispatchListeners =
-        accumulateInto(event._dispatchListeners, listener);
+      event._dispatchListeners = accumulateInto(
+        event._dispatchListeners,
+        listener,
+      );
       event._dispatchInstances = accumulateInto(event._dispatchInstances, inst);
     }
   }
@@ -129,17 +131,14 @@ function accumulateEnterLeaveDispatches(leave, enter, from, to) {
     to,
     accumulateDispatches,
     leave,
-    enter
+    enter,
   );
 }
 
-
 function accumulateDirectDispatches(events) {
   forEachAccumulated(events, accumulateDirectDispatchesSingle);
 }
 
-
-
 /**
  * A small set of propagation patterns, each of which will accept a small amount
  * of information, and generate a set of "dispatch ready event objects" - which
diff --git a/Libraries/Renderer/src/renderers/shared/shared/event/PluginModuleType.js b/Libraries/Renderer/src/renderers/shared/shared/event/PluginModuleType.js
index 1d9044d6bd3d84..5b51f9f7a22332 100644
--- a/Libraries/Renderer/src/renderers/shared/shared/event/PluginModuleType.js
+++ b/Libraries/Renderer/src/renderers/shared/shared/event/PluginModuleType.js
@@ -20,11 +20,7 @@ import type {
 
 export type EventTypes = {[key: string]: DispatchConfig};
 
-export type AnyNativeEvent =
-  Event |
-  KeyboardEvent |
-  MouseEvent |
-  Touch;
+export type AnyNativeEvent = Event | KeyboardEvent | MouseEvent | Touch;
 
 export type PluginName = string;
 
diff --git a/Libraries/Renderer/src/renderers/shared/shared/event/ReactControlledComponent.js b/Libraries/Renderer/src/renderers/shared/shared/event/ReactControlledComponent.js
index b2e0f5b8b222bd..08819e991d04ed 100644
--- a/Libraries/Renderer/src/renderers/shared/shared/event/ReactControlledComponent.js
+++ b/Libraries/Renderer/src/renderers/shared/shared/event/ReactControlledComponent.js
@@ -41,23 +41,23 @@ function restoreStateOfTarget(target) {
   if (typeof internalInstance.tag === 'number') {
     invariant(
       fiberHostComponent &&
-      typeof fiberHostComponent.restoreControlledState === 'function',
+        typeof fiberHostComponent.restoreControlledState === 'function',
       'Fiber needs to be injected to handle a fiber target for controlled ' +
-      'events.'
+        'events.',
     );
     const props = EventPluginUtils.getFiberCurrentPropsFromNode(
-      internalInstance.stateNode
+      internalInstance.stateNode,
     );
     fiberHostComponent.restoreControlledState(
       internalInstance.stateNode,
       internalInstance.type,
-      props
+      props,
     );
     return;
   }
   invariant(
     typeof internalInstance.restoreControlledState === 'function',
-    'The internal instance must be a React host component.'
+    'The internal instance must be a React host component.',
   );
   // If it is not a Fiber, we can just use dynamic dispatch.
   internalInstance.restoreControlledState();
diff --git a/Libraries/Renderer/src/renderers/shared/shared/event/ReactEventEmitterMixin.js b/Libraries/Renderer/src/renderers/shared/shared/event/ReactEventEmitterMixin.js
index 94461f88024e36..63134a57e1be5d 100644
--- a/Libraries/Renderer/src/renderers/shared/shared/event/ReactEventEmitterMixin.js
+++ b/Libraries/Renderer/src/renderers/shared/shared/event/ReactEventEmitterMixin.js
@@ -19,21 +19,21 @@ function runEventQueueInBatch(events) {
 }
 
 var ReactEventEmitterMixin = {
-
   /**
    * Streams a fired top-level event to `EventPluginHub` where plugins have the
    * opportunity to create `ReactEvent`s to be dispatched.
    */
   handleTopLevel: function(
-      topLevelType,
-      targetInst,
-      nativeEvent,
-      nativeEventTarget) {
+    topLevelType,
+    targetInst,
+    nativeEvent,
+    nativeEventTarget,
+  ) {
     var events = EventPluginHub.extractEvents(
       topLevelType,
       targetInst,
       nativeEvent,
-      nativeEventTarget
+      nativeEventTarget,
     );
     runEventQueueInBatch(events);
   },
diff --git a/Libraries/Renderer/src/renderers/shared/shared/event/ReactSyntheticEventType.js b/Libraries/Renderer/src/renderers/shared/shared/event/ReactSyntheticEventType.js
index 3496d633c9e6de..a9e453bcb26d4c 100644
--- a/Libraries/Renderer/src/renderers/shared/shared/event/ReactSyntheticEventType.js
+++ b/Libraries/Renderer/src/renderers/shared/shared/event/ReactSyntheticEventType.js
@@ -25,12 +25,14 @@ export type DispatchConfig = {
   registrationName?: string,
 };
 
-export type ReactSyntheticEvent = {
-  dispatchConfig: DispatchConfig,
-  getPooled: (
+export type ReactSyntheticEvent =
+  & {
     dispatchConfig: DispatchConfig,
-    targetInst: ReactInstance,
-    nativeTarget: Event,
-    nativeEventTarget: EventTarget,
-  ) => ReactSyntheticEvent,
-} & SyntheticEvent;
+    getPooled: (
+      dispatchConfig: DispatchConfig,
+      targetInst: ReactInstance,
+      nativeTarget: Event,
+      nativeEventTarget: EventTarget,
+    ) => ReactSyntheticEvent,
+  }
+  & SyntheticEvent;
diff --git a/Libraries/Renderer/src/renderers/shared/shared/event/SyntheticEvent.js b/Libraries/Renderer/src/renderers/shared/shared/event/SyntheticEvent.js
index 6972c672337608..81bb3d784c8fb3 100644
--- a/Libraries/Renderer/src/renderers/shared/shared/event/SyntheticEvent.js
+++ b/Libraries/Renderer/src/renderers/shared/shared/event/SyntheticEvent.js
@@ -9,6 +9,8 @@
  * @providesModule SyntheticEvent
  */
 
+/* eslint valid-typeof: 0 */
+
 'use strict';
 
 var PooledClass = require('PooledClass');
@@ -66,7 +68,12 @@ var EventInterface = {
  * @param {object} nativeEvent Native browser event.
  * @param {DOMEventTarget} nativeEventTarget Target node.
  */
-function SyntheticEvent(dispatchConfig, targetInst, nativeEvent, nativeEventTarget) {
+function SyntheticEvent(
+  dispatchConfig,
+  targetInst,
+  nativeEvent,
+  nativeEventTarget,
+) {
   if (__DEV__) {
     // these have a getter/setter for warnings
     delete this.nativeEvent;
@@ -98,9 +105,9 @@ function SyntheticEvent(dispatchConfig, targetInst, nativeEvent, nativeEventTarg
     }
   }
 
-  var defaultPrevented = nativeEvent.defaultPrevented != null ?
-    nativeEvent.defaultPrevented :
-    nativeEvent.returnValue === false;
+  var defaultPrevented = nativeEvent.defaultPrevented != null
+    ? nativeEvent.defaultPrevented
+    : nativeEvent.returnValue === false;
   if (defaultPrevented) {
     this.isDefaultPrevented = emptyFunction.thatReturnsTrue;
   } else {
@@ -111,7 +118,6 @@ function SyntheticEvent(dispatchConfig, targetInst, nativeEvent, nativeEventTarg
 }
 
 Object.assign(SyntheticEvent.prototype, {
-
   preventDefault: function() {
     this.defaultPrevented = true;
     var event = this.nativeEvent;
@@ -121,7 +127,7 @@ Object.assign(SyntheticEvent.prototype, {
 
     if (event.preventDefault) {
       event.preventDefault();
-    } else if (typeof event.returnValue !== 'unknown') { // eslint-disable-line valid-typeof
+    } else if (typeof event.returnValue !== 'unknown') {
       event.returnValue = false;
     }
     this.isDefaultPrevented = emptyFunction.thatReturnsTrue;
@@ -135,7 +141,7 @@ Object.assign(SyntheticEvent.prototype, {
 
     if (event.stopPropagation) {
       event.stopPropagation();
-    } else if (typeof event.cancelBubble !== 'unknown') { // eslint-disable-line valid-typeof
+    } else if (typeof event.cancelBubble !== 'unknown') {
       // The ChangeEventPlugin registers a "propertychange" event for
       // IE. This event does not support bubbling or cancelling, and
       // any references to cancelBubble throw "Member not found".  A
@@ -170,7 +176,11 @@ Object.assign(SyntheticEvent.prototype, {
     var Interface = this.constructor.Interface;
     for (var propName in Interface) {
       if (__DEV__) {
-        Object.defineProperty(this, propName, getPooledWarningPropertyDefinition(propName, Interface[propName]));
+        Object.defineProperty(
+          this,
+          propName,
+          getPooledWarningPropertyDefinition(propName, Interface[propName]),
+        );
       } else {
         this[propName] = null;
       }
@@ -182,21 +192,20 @@ Object.assign(SyntheticEvent.prototype, {
       Object.defineProperty(
         this,
         'nativeEvent',
-        getPooledWarningPropertyDefinition('nativeEvent', null)
+        getPooledWarningPropertyDefinition('nativeEvent', null),
       );
       Object.defineProperty(
         this,
         'preventDefault',
-        getPooledWarningPropertyDefinition('preventDefault', emptyFunction)
+        getPooledWarningPropertyDefinition('preventDefault', emptyFunction),
       );
       Object.defineProperty(
         this,
         'stopPropagation',
-        getPooledWarningPropertyDefinition('stopPropagation', emptyFunction)
+        getPooledWarningPropertyDefinition('stopPropagation', emptyFunction),
       );
     }
   },
-
 });
 
 SyntheticEvent.Interface = EventInterface;
@@ -211,15 +220,17 @@ if (__DEV__) {
       apply: function(constructor, that, args) {
         return new Proxy(constructor.apply(that, args), {
           set: function(target, prop, value) {
-            if (prop !== 'isPersistent' &&
-                !target.constructor.Interface.hasOwnProperty(prop) &&
-                shouldBeReleasedProperties.indexOf(prop) === -1) {
+            if (
+              prop !== 'isPersistent' &&
+              !target.constructor.Interface.hasOwnProperty(prop) &&
+              shouldBeReleasedProperties.indexOf(prop) === -1
+            ) {
               warning(
                 didWarnForAddedNewProperty || target.isPersistent(),
-                'This synthetic event is reused for performance reasons. If you\'re ' +
-                'seeing this, you\'re adding a new property in the synthetic event object. ' +
-                'The property is never released. See ' +
-                'https://fb.me/react-event-pooling for more information.'
+                "This synthetic event is reused for performance reasons. If you're " +
+                  "seeing this, you're adding a new property in the synthetic event object. " +
+                  'The property is never released. See ' +
+                  'https://fb.me/react-event-pooling for more information.',
               );
               didWarnForAddedNewProperty = true;
             }
@@ -282,7 +293,9 @@ function getPooledWarningPropertyDefinition(propName, getVal) {
 
   function get() {
     var action = isFunction ? 'accessing the method' : 'accessing the property';
-    var result = isFunction ? 'This is a no-op function' : 'This is set to null';
+    var result = isFunction
+      ? 'This is a no-op function'
+      : 'This is set to null';
     warn(action, result);
     return getVal;
   }
@@ -291,13 +304,13 @@ function getPooledWarningPropertyDefinition(propName, getVal) {
     var warningCondition = false;
     warning(
       warningCondition,
-      'This synthetic event is reused for performance reasons. If you\'re seeing this, ' +
-      'you\'re %s `%s` on a released/nullified synthetic event. %s. ' +
-      'If you must keep the original synthetic event around, use event.persist(). ' +
-      'See https://fb.me/react-event-pooling for more information.',
+      "This synthetic event is reused for performance reasons. If you're seeing this, " +
+        "you're %s `%s` on a released/nullified synthetic event. %s. " +
+        'If you must keep the original synthetic event around, use event.persist(). ' +
+        'See https://fb.me/react-event-pooling for more information.',
       action,
       propName,
-      result
+      result,
     );
   }
 }
diff --git a/Libraries/Renderer/src/renderers/shared/shared/event/__tests__/EventPluginRegistry-test.js b/Libraries/Renderer/src/renderers/shared/shared/event/__tests__/EventPluginRegistry-test.js
index 245e7bcc492524..cc8f6c45b65fe8 100644
--- a/Libraries/Renderer/src/renderers/shared/shared/event/__tests__/EventPluginRegistry-test.js
+++ b/Libraries/Renderer/src/renderers/shared/shared/event/__tests__/EventPluginRegistry-test.js
@@ -11,14 +11,13 @@
 
 'use strict';
 
-
 describe('EventPluginRegistry', () => {
   var EventPluginRegistry;
   var createPlugin;
 
   beforeEach(() => {
+    jest.resetModuleRegistry();
     EventPluginRegistry = require('EventPluginRegistry');
-    EventPluginRegistry._resetEventPlugins();
 
     createPlugin = function(properties) {
       return Object.assign({extractEvents: function() {}}, properties);
@@ -97,7 +96,7 @@ describe('EventPluginRegistry', () => {
       });
     }).toThrowError(
       'EventPluginRegistry: Event plugins must implement an `extractEvents` ' +
-      'method, but `bad` does not.'
+        'method, but `bad` does not.',
     );
   });
 
@@ -114,7 +113,7 @@ describe('EventPluginRegistry', () => {
       });
     }).toThrowError(
       'EventPluginRegistry: Cannot inject event plugins that do not exist ' +
-      'in the plugin ordering, `random`.'
+        'in the plugin ordering, `random`.',
     );
   });
 
@@ -127,7 +126,7 @@ describe('EventPluginRegistry', () => {
       EventPluginRegistry.injectEventPluginOrder(pluginOrdering);
     }).toThrowError(
       'EventPluginRegistry: Cannot inject event plugin ordering more than ' +
-      'once. You are likely trying to load more than one copy of React.'
+        'once. You are likely trying to load more than one copy of React.',
     );
   });
 
@@ -141,7 +140,7 @@ describe('EventPluginRegistry', () => {
       EventPluginRegistry.injectEventPluginsByName({same: TwoPlugin});
     }).toThrowError(
       'EventPluginRegistry: Cannot inject two different event plugins using ' +
-      'the same name, `same`.'
+        'the same name, `same`.',
     );
   });
 
@@ -166,17 +165,23 @@ describe('EventPluginRegistry', () => {
     EventPluginRegistry.injectEventPluginsByName({one: OnePlugin});
     EventPluginRegistry.injectEventPluginOrder(['one', 'two']);
 
-    expect(Object.keys(EventPluginRegistry.registrationNameModules).length).toBe(2);
+    expect(
+      Object.keys(EventPluginRegistry.registrationNameModules).length,
+    ).toBe(2);
     expect(EventPluginRegistry.registrationNameModules.onClick).toBe(OnePlugin);
     expect(EventPluginRegistry.registrationNameModules.onFocus).toBe(OnePlugin);
 
     EventPluginRegistry.injectEventPluginsByName({two: TwoPlugin});
 
-    expect(Object.keys(EventPluginRegistry.registrationNameModules).length).toBe(4);
-    expect(EventPluginRegistry.registrationNameModules.onMagicBubble).toBe(TwoPlugin);
     expect(
-      EventPluginRegistry.registrationNameModules.onMagicCapture
-    ).toBe(TwoPlugin);
+      Object.keys(EventPluginRegistry.registrationNameModules).length,
+    ).toBe(4);
+    expect(EventPluginRegistry.registrationNameModules.onMagicBubble).toBe(
+      TwoPlugin,
+    );
+    expect(EventPluginRegistry.registrationNameModules.onMagicCapture).toBe(
+      TwoPlugin,
+    );
   });
 
   it('should throw if multiple registration names collide', () => {
@@ -205,14 +210,16 @@ describe('EventPluginRegistry', () => {
       EventPluginRegistry.injectEventPluginOrder(['one', 'two']);
     }).toThrowError(
       'EventPluginHub: More than one plugin attempted to publish the same ' +
-      'registration name, `onPhotoCapture`.'
+        'registration name, `onPhotoCapture`.',
     );
   });
 
   it('should throw if an invalid event is published', () => {
     var OnePlugin = createPlugin({
       eventTypes: {
-        badEvent: {/* missing configuration */},
+        badEvent: {
+          /* missing configuration */
+        },
       },
     });
 
@@ -222,43 +229,7 @@ describe('EventPluginRegistry', () => {
       EventPluginRegistry.injectEventPluginOrder(['one']);
     }).toThrowError(
       'EventPluginRegistry: Failed to publish event `badEvent` for plugin ' +
-      '`one`.'
+        '`one`.',
     );
   });
-
-  it('should be able to get the plugin from synthetic events', () => {
-    var clickDispatchConfig = {
-      registrationName: 'onClick',
-    };
-    var magicDispatchConfig = {
-      phasedRegistrationNames: {
-        bubbled: 'onMagicBubble',
-        captured: 'onMagicCapture',
-      },
-    };
-
-    var OnePlugin = createPlugin({
-      eventTypes: {
-        click: clickDispatchConfig,
-        magic: magicDispatchConfig,
-      },
-    });
-
-    var clickEvent = {dispatchConfig: clickDispatchConfig};
-    var magicEvent = {dispatchConfig: magicDispatchConfig};
-
-    expect(EventPluginRegistry.getPluginModuleForEvent(clickEvent)).toBe(null);
-    expect(EventPluginRegistry.getPluginModuleForEvent(magicEvent)).toBe(null);
-
-    EventPluginRegistry.injectEventPluginsByName({one: OnePlugin});
-    EventPluginRegistry.injectEventPluginOrder(['one']);
-
-    expect(
-      EventPluginRegistry.getPluginModuleForEvent(clickEvent)
-    ).toBe(OnePlugin);
-    expect(
-      EventPluginRegistry.getPluginModuleForEvent(magicEvent)
-    ).toBe(OnePlugin);
-  });
-
 });
diff --git a/Libraries/Renderer/src/renderers/shared/shared/event/eventPlugins/ResponderEventPlugin.js b/Libraries/Renderer/src/renderers/shared/shared/event/eventPlugins/ResponderEventPlugin.js
index d4057833c26ac9..8f853afe08beb6 100644
--- a/Libraries/Renderer/src/renderers/shared/shared/event/eventPlugins/ResponderEventPlugin.js
+++ b/Libraries/Renderer/src/renderers/shared/shared/event/eventPlugins/ResponderEventPlugin.js
@@ -24,8 +24,7 @@ var isMoveish = EventPluginUtils.isMoveish;
 var isEndish = EventPluginUtils.isEndish;
 var executeDirectDispatch = EventPluginUtils.executeDirectDispatch;
 var hasDispatches = EventPluginUtils.hasDispatches;
-var executeDispatchesInOrderStopAtTrue =
-  EventPluginUtils.executeDispatchesInOrderStopAtTrue;
+var executeDispatchesInOrderStopAtTrue = EventPluginUtils.executeDispatchesInOrderStopAtTrue;
 
 /**
  * Instance of element that should respond to touch/move types of interactions,
@@ -51,7 +50,7 @@ var changeResponder = function(nextResponderInst, blockHostResponder) {
     ResponderEventPlugin.GlobalResponderHandler.onChange(
       oldResponderInst,
       nextResponderInst,
-      blockHostResponder
+      blockHostResponder,
     );
   }
 };
@@ -254,8 +253,6 @@ to return true:wantsResponderID|                            |
                                |                            |
                                +                            + */
 
-
-
 /**
  * A note about event ordering in the `EventPluginHub`.
  *
@@ -320,19 +317,20 @@ function setResponderAndExtractTransfer(
   topLevelType,
   targetInst,
   nativeEvent,
-  nativeEventTarget
+  nativeEventTarget,
 ) {
-  var shouldSetEventType =
-    isStartish(topLevelType) ? eventTypes.startShouldSetResponder :
-    isMoveish(topLevelType) ? eventTypes.moveShouldSetResponder :
-    topLevelType === 'topSelectionChange' ?
-      eventTypes.selectionChangeShouldSetResponder :
-    eventTypes.scrollShouldSetResponder;
+  var shouldSetEventType = isStartish(topLevelType)
+    ? eventTypes.startShouldSetResponder
+    : isMoveish(topLevelType)
+        ? eventTypes.moveShouldSetResponder
+        : topLevelType === 'topSelectionChange'
+            ? eventTypes.selectionChangeShouldSetResponder
+            : eventTypes.scrollShouldSetResponder;
 
   // TODO: stop one short of the current responder.
-  var bubbleShouldSetFrom = !responderInst ?
-    targetInst :
-    ReactTreeTraversal.getLowestCommonAncestor(responderInst, targetInst);
+  var bubbleShouldSetFrom = !responderInst
+    ? targetInst
+    : ReactTreeTraversal.getLowestCommonAncestor(responderInst, targetInst);
 
   // When capturing/bubbling the "shouldSet" event, we want to skip the target
   // (deepest ID) if it happens to be the current responder. The reasoning:
@@ -343,7 +341,7 @@ function setResponderAndExtractTransfer(
     shouldSetEventType,
     bubbleShouldSetFrom,
     nativeEvent,
-    nativeEventTarget
+    nativeEventTarget,
   );
   shouldSetEvent.touchHistory = ResponderTouchHistoryStore.touchHistory;
   if (skipOverBubbleShouldSetFrom) {
@@ -364,19 +362,18 @@ function setResponderAndExtractTransfer(
     eventTypes.responderGrant,
     wantsResponderInst,
     nativeEvent,
-    nativeEventTarget
+    nativeEventTarget,
   );
   grantEvent.touchHistory = ResponderTouchHistoryStore.touchHistory;
 
   EventPropagators.accumulateDirectDispatches(grantEvent);
   var blockHostResponder = executeDirectDispatch(grantEvent) === true;
   if (responderInst) {
-
     var terminationRequestEvent = ResponderSyntheticEvent.getPooled(
       eventTypes.responderTerminationRequest,
       responderInst,
       nativeEvent,
-      nativeEventTarget
+      nativeEventTarget,
     );
     terminationRequestEvent.touchHistory = ResponderTouchHistoryStore.touchHistory;
     EventPropagators.accumulateDirectDispatches(terminationRequestEvent);
@@ -391,7 +388,7 @@ function setResponderAndExtractTransfer(
         eventTypes.responderTerminate,
         responderInst,
         nativeEvent,
-        nativeEventTarget
+        nativeEventTarget,
       );
       terminateEvent.touchHistory = ResponderTouchHistoryStore.touchHistory;
       EventPropagators.accumulateDirectDispatches(terminateEvent);
@@ -402,7 +399,7 @@ function setResponderAndExtractTransfer(
         eventTypes.responderReject,
         wantsResponderInst,
         nativeEvent,
-        nativeEventTarget
+        nativeEventTarget,
       );
       rejectEvent.touchHistory = ResponderTouchHistoryStore.touchHistory;
       EventPropagators.accumulateDirectDispatches(rejectEvent);
@@ -424,17 +421,14 @@ function setResponderAndExtractTransfer(
  * @return {boolean} True if a transfer of responder could possibly occur.
  */
 function canTriggerTransfer(topLevelType, topLevelInst, nativeEvent) {
-  return topLevelInst && (
+  return topLevelInst &&
     // responderIgnoreScroll: We are trying to migrate away from specifically
     // tracking native scroll events here and responderIgnoreScroll indicates we
     // will send topTouchCancel to handle canceling touch events instead
-    (topLevelType === 'topScroll' &&
-      !nativeEvent.responderIgnoreScroll) ||
-    (trackedTouchCount > 0 &&
-      topLevelType === 'topSelectionChange') ||
-    isStartish(topLevelType) ||
-    isMoveish(topLevelType)
-  );
+    ((topLevelType === 'topScroll' && !nativeEvent.responderIgnoreScroll) ||
+      (trackedTouchCount > 0 && topLevelType === 'topSelectionChange') ||
+      isStartish(topLevelType) ||
+      isMoveish(topLevelType));
 }
 
 /**
@@ -463,9 +457,7 @@ function noResponderTouches(nativeEvent) {
   return true;
 }
 
-
 var ResponderEventPlugin = {
-
   /* For unit testing only */
   _getResponder: function() {
     return responderInst;
@@ -482,7 +474,7 @@ var ResponderEventPlugin = {
     topLevelType,
     targetInst,
     nativeEvent,
-    nativeEventTarget
+    nativeEventTarget,
   ) {
     if (isStartish(topLevelType)) {
       trackedTouchCount += 1;
@@ -491,7 +483,7 @@ var ResponderEventPlugin = {
         trackedTouchCount -= 1;
       } else {
         console.error(
-          'Ended a touch event which was not counted in `trackedTouchCount`.'
+          'Ended a touch event which was not counted in `trackedTouchCount`.',
         );
         return null;
       }
@@ -499,13 +491,14 @@ var ResponderEventPlugin = {
 
     ResponderTouchHistoryStore.recordTouchTrack(topLevelType, nativeEvent);
 
-    var extracted = canTriggerTransfer(topLevelType, targetInst, nativeEvent) ?
-      setResponderAndExtractTransfer(
-        topLevelType,
-        targetInst,
-        nativeEvent,
-        nativeEventTarget) :
-      null;
+    var extracted = canTriggerTransfer(topLevelType, targetInst, nativeEvent)
+      ? setResponderAndExtractTransfer(
+          topLevelType,
+          targetInst,
+          nativeEvent,
+          nativeEventTarget,
+        )
+      : null;
     // Responder may or may not have transferred on a new touch start/move.
     // Regardless, whoever is the responder after any potential transfer, we
     // direct all touch start/move/ends to them in the form of
@@ -519,40 +512,39 @@ var ResponderEventPlugin = {
     var isResponderTouchStart = responderInst && isStartish(topLevelType);
     var isResponderTouchMove = responderInst && isMoveish(topLevelType);
     var isResponderTouchEnd = responderInst && isEndish(topLevelType);
-    var incrementalTouch =
-      isResponderTouchStart ? eventTypes.responderStart :
-      isResponderTouchMove ? eventTypes.responderMove :
-      isResponderTouchEnd ? eventTypes.responderEnd :
-      null;
+    var incrementalTouch = isResponderTouchStart
+      ? eventTypes.responderStart
+      : isResponderTouchMove
+          ? eventTypes.responderMove
+          : isResponderTouchEnd ? eventTypes.responderEnd : null;
 
     if (incrementalTouch) {
-      var gesture =
-        ResponderSyntheticEvent.getPooled(
-          incrementalTouch,
-          responderInst,
-          nativeEvent,
-          nativeEventTarget
-        );
+      var gesture = ResponderSyntheticEvent.getPooled(
+        incrementalTouch,
+        responderInst,
+        nativeEvent,
+        nativeEventTarget,
+      );
       gesture.touchHistory = ResponderTouchHistoryStore.touchHistory;
       EventPropagators.accumulateDirectDispatches(gesture);
       extracted = accumulate(extracted, gesture);
     }
 
-    var isResponderTerminate =
-      responderInst &&
+    var isResponderTerminate = responderInst &&
       topLevelType === 'topTouchCancel';
-    var isResponderRelease =
-      responderInst &&
+    var isResponderRelease = responderInst &&
       !isResponderTerminate &&
       isEndish(topLevelType) &&
       noResponderTouches(nativeEvent);
-    var finalTouch =
-      isResponderTerminate ? eventTypes.responderTerminate :
-      isResponderRelease ? eventTypes.responderRelease :
-      null;
+    var finalTouch = isResponderTerminate
+      ? eventTypes.responderTerminate
+      : isResponderRelease ? eventTypes.responderRelease : null;
     if (finalTouch) {
       var finalEvent = ResponderSyntheticEvent.getPooled(
-        finalTouch, responderInst, nativeEvent, nativeEventTarget
+        finalTouch,
+        responderInst,
+        nativeEvent,
+        nativeEventTarget,
       );
       finalEvent.touchHistory = ResponderTouchHistoryStore.touchHistory;
       EventPropagators.accumulateDirectDispatches(finalEvent);
@@ -560,12 +552,13 @@ var ResponderEventPlugin = {
       changeResponder(null);
     }
 
-    var numberActiveTouches =
-      ResponderTouchHistoryStore.touchHistory.numberActiveTouches;
-    if (ResponderEventPlugin.GlobalInteractionHandler &&
-      numberActiveTouches !== previousActiveTouches) {
+    var numberActiveTouches = ResponderTouchHistoryStore.touchHistory.numberActiveTouches;
+    if (
+      ResponderEventPlugin.GlobalInteractionHandler &&
+      numberActiveTouches !== previousActiveTouches
+    ) {
       ResponderEventPlugin.GlobalInteractionHandler.onChange(
-        numberActiveTouches
+        numberActiveTouches,
       );
     }
     previousActiveTouches = numberActiveTouches;
diff --git a/Libraries/Renderer/src/renderers/shared/shared/event/eventPlugins/ResponderSyntheticEvent.js b/Libraries/Renderer/src/renderers/shared/shared/event/eventPlugins/ResponderSyntheticEvent.js
index f1cf77feacfcc2..f8e2132d56aff8 100644
--- a/Libraries/Renderer/src/renderers/shared/shared/event/eventPlugins/ResponderSyntheticEvent.js
+++ b/Libraries/Renderer/src/renderers/shared/shared/event/eventPlugins/ResponderSyntheticEvent.js
@@ -30,8 +30,19 @@ var ResponderEventInterface = {
  * @param {object} nativeEvent Native event.
  * @extends {SyntheticEvent}
  */
-function ResponderSyntheticEvent(dispatchConfig, dispatchMarker, nativeEvent, nativeEventTarget) {
-  return SyntheticEvent.call(this, dispatchConfig, dispatchMarker, nativeEvent, nativeEventTarget);
+function ResponderSyntheticEvent(
+  dispatchConfig,
+  dispatchMarker,
+  nativeEvent,
+  nativeEventTarget,
+) {
+  return SyntheticEvent.call(
+    this,
+    dispatchConfig,
+    dispatchMarker,
+    nativeEvent,
+    nativeEventTarget,
+  );
 }
 
 SyntheticEvent.augmentClass(ResponderSyntheticEvent, ResponderEventInterface);
diff --git a/Libraries/Renderer/src/renderers/shared/shared/event/eventPlugins/ResponderTouchHistoryStore.js b/Libraries/Renderer/src/renderers/shared/shared/event/eventPlugins/ResponderTouchHistoryStore.js
index 78b7b31a8058b9..b3831ce143670c 100644
--- a/Libraries/Renderer/src/renderers/shared/shared/event/eventPlugins/ResponderTouchHistoryStore.js
+++ b/Libraries/Renderer/src/renderers/shared/shared/event/eventPlugins/ResponderTouchHistoryStore.js
@@ -108,9 +108,9 @@ function getTouchIdentifier({identifier}: Touch): number {
   warning(
     identifier <= MAX_TOUCH_BANK,
     'Touch identifier %s is greater than maximum supported %s which causes ' +
-    'performance issues backfilling array locations for all of the indices.',
+      'performance issues backfilling array locations for all of the indices.',
     identifier,
-    MAX_TOUCH_BANK
+    MAX_TOUCH_BANK,
   );
   return identifier;
 }
@@ -139,11 +139,10 @@ function recordTouchMove(touch: Touch): void {
     touchHistory.mostRecentTimeStamp = timestampForTouch(touch);
   } else {
     console.error(
-      'Cannot record touch move without a touch start.\n' +
-      'Touch Move: %s\n',
+      'Cannot record touch move without a touch start.\n' + 'Touch Move: %s\n',
       'Touch Bank: %s',
       printTouch(touch),
-      printTouchBank()
+      printTouchBank(),
     );
   }
 }
@@ -161,11 +160,10 @@ function recordTouchEnd(touch: Touch): void {
     touchHistory.mostRecentTimeStamp = timestampForTouch(touch);
   } else {
     console.error(
-      'Cannot record touch end without a touch start.\n' +
-      'Touch End: %s\n',
+      'Cannot record touch end without a touch start.\n' + 'Touch End: %s\n',
       'Touch Bank: %s',
       printTouch(touch),
-      printTouchBank()
+      printTouchBank(),
     );
   }
 }
@@ -195,8 +193,9 @@ const ResponderTouchHistoryStore = {
       nativeEvent.changedTouches.forEach(recordTouchStart);
       touchHistory.numberActiveTouches = nativeEvent.touches.length;
       if (touchHistory.numberActiveTouches === 1) {
-        touchHistory.indexOfSingleActiveTouch =
-          nativeEvent.touches[0].identifier;
+        touchHistory.indexOfSingleActiveTouch = nativeEvent.touches[
+          0
+        ].identifier;
       }
     } else if (isEndish(topLevelType)) {
       nativeEvent.changedTouches.forEach(recordTouchEnd);
@@ -212,9 +211,8 @@ const ResponderTouchHistoryStore = {
         if (__DEV__) {
           const activeRecord = touchBank[touchHistory.indexOfSingleActiveTouch];
           warning(
-            activeRecord != null &&
-            activeRecord.touchActive,
-            'Cannot find single active touch.'
+            activeRecord != null && activeRecord.touchActive,
+            'Cannot find single active touch.',
           );
         }
       }
@@ -224,5 +222,4 @@ const ResponderTouchHistoryStore = {
   touchHistory,
 };
 
-
 module.exports = ResponderTouchHistoryStore;
diff --git a/Libraries/Renderer/src/renderers/shared/shared/event/eventPlugins/TouchHistoryMath.js b/Libraries/Renderer/src/renderers/shared/shared/event/eventPlugins/TouchHistoryMath.js
index a2a725bd2fa626..50006f7e72819b 100644
--- a/Libraries/Renderer/src/renderers/shared/shared/event/eventPlugins/TouchHistoryMath.js
+++ b/Libraries/Renderer/src/renderers/shared/shared/event/eventPlugins/TouchHistoryMath.js
@@ -21,30 +21,44 @@ var TouchHistoryMath = {
    * touches vs. previous centroid of now actively moving touches.
    * @return {number} value of centroid in specified dimension.
    */
-  centroidDimension: function(touchHistory, touchesChangedAfter, isXAxis, ofCurrent) {
+  centroidDimension: function(
+    touchHistory,
+    touchesChangedAfter,
+    isXAxis,
+    ofCurrent,
+  ) {
     var touchBank = touchHistory.touchBank;
     var total = 0;
     var count = 0;
 
-    var oneTouchData = touchHistory.numberActiveTouches === 1 ?
-      touchHistory.touchBank[touchHistory.indexOfSingleActiveTouch] : null;
+    var oneTouchData = touchHistory.numberActiveTouches === 1
+      ? touchHistory.touchBank[touchHistory.indexOfSingleActiveTouch]
+      : null;
 
     if (oneTouchData !== null) {
-      if (oneTouchData.touchActive && oneTouchData.currentTimeStamp > touchesChangedAfter) {
-        total += ofCurrent && isXAxis ? oneTouchData.currentPageX :
-          ofCurrent && !isXAxis ? oneTouchData.currentPageY :
-          !ofCurrent && isXAxis ? oneTouchData.previousPageX :
-          oneTouchData.previousPageY;
+      if (
+        oneTouchData.touchActive &&
+        oneTouchData.currentTimeStamp > touchesChangedAfter
+      ) {
+        total += ofCurrent && isXAxis
+          ? oneTouchData.currentPageX
+          : ofCurrent && !isXAxis
+              ? oneTouchData.currentPageY
+              : !ofCurrent && isXAxis
+                  ? oneTouchData.previousPageX
+                  : oneTouchData.previousPageY;
         count = 1;
       }
     } else {
       for (var i = 0; i < touchBank.length; i++) {
         var touchTrack = touchBank[i];
-        if (touchTrack !== null &&
-            touchTrack !== undefined &&
-            touchTrack.touchActive &&
-            touchTrack.currentTimeStamp >= touchesChangedAfter) {
-          var toAdd;  // Yuck, program temporarily in invalid state.
+        if (
+          touchTrack !== null &&
+          touchTrack !== undefined &&
+          touchTrack.touchActive &&
+          touchTrack.currentTimeStamp >= touchesChangedAfter
+        ) {
+          var toAdd; // Yuck, program temporarily in invalid state.
           if (ofCurrent && isXAxis) {
             toAdd = touchTrack.currentPageX;
           } else if (ofCurrent && !isXAxis) {
@@ -62,57 +76,69 @@ var TouchHistoryMath = {
     return count > 0 ? total / count : TouchHistoryMath.noCentroid;
   },
 
-  currentCentroidXOfTouchesChangedAfter: function(touchHistory, touchesChangedAfter) {
+  currentCentroidXOfTouchesChangedAfter: function(
+    touchHistory,
+    touchesChangedAfter,
+  ) {
     return TouchHistoryMath.centroidDimension(
       touchHistory,
       touchesChangedAfter,
-      true,  // isXAxis
-      true   // ofCurrent
+      true, // isXAxis
+      true, // ofCurrent
     );
   },
 
-  currentCentroidYOfTouchesChangedAfter: function(touchHistory, touchesChangedAfter) {
+  currentCentroidYOfTouchesChangedAfter: function(
+    touchHistory,
+    touchesChangedAfter,
+  ) {
     return TouchHistoryMath.centroidDimension(
       touchHistory,
       touchesChangedAfter,
-      false,  // isXAxis
-      true    // ofCurrent
+      false, // isXAxis
+      true, // ofCurrent
     );
   },
 
-  previousCentroidXOfTouchesChangedAfter: function(touchHistory, touchesChangedAfter) {
+  previousCentroidXOfTouchesChangedAfter: function(
+    touchHistory,
+    touchesChangedAfter,
+  ) {
     return TouchHistoryMath.centroidDimension(
       touchHistory,
       touchesChangedAfter,
-      true,  // isXAxis
-      false  // ofCurrent
+      true, // isXAxis
+      false, // ofCurrent
     );
   },
 
-  previousCentroidYOfTouchesChangedAfter: function(touchHistory, touchesChangedAfter) {
+  previousCentroidYOfTouchesChangedAfter: function(
+    touchHistory,
+    touchesChangedAfter,
+  ) {
     return TouchHistoryMath.centroidDimension(
       touchHistory,
       touchesChangedAfter,
-      false,  // isXAxis
-      false   // ofCurrent
+      false, // isXAxis
+      false, // ofCurrent
     );
   },
 
   currentCentroidX: function(touchHistory) {
     return TouchHistoryMath.centroidDimension(
       touchHistory,
-      0,     // touchesChangedAfter
-      true,  // isXAxis
-      true   // ofCurrent
+      0, // touchesChangedAfter
+      true, // isXAxis
+      true, // ofCurrent
     );
   },
 
   currentCentroidY: function(touchHistory) {
     return TouchHistoryMath.centroidDimension(
       touchHistory,
-      0,     // touchesChangedAfter
-      false,  // isXAxis
-      true    // ofCurrent
+      0, // touchesChangedAfter
+      false, // isXAxis
+      true, // ofCurrent
     );
   },
 
diff --git a/Libraries/Renderer/src/renderers/shared/shared/event/eventPlugins/__tests__/ResponderEventPlugin-test.js b/Libraries/Renderer/src/renderers/shared/shared/event/eventPlugins/__tests__/ResponderEventPlugin-test.js
index b831e97e646662..ed62c2fb8384b4 100644
--- a/Libraries/Renderer/src/renderers/shared/shared/event/eventPlugins/__tests__/ResponderEventPlugin-test.js
+++ b/Libraries/Renderer/src/renderers/shared/shared/event/eventPlugins/__tests__/ResponderEventPlugin-test.js
@@ -62,22 +62,25 @@ var _touchConfig = function(
   targetNodeHandle,
   allTouchHandles,
   changedIndices,
-  eventTarget
+  eventTarget,
 ) {
   var allTouchObjects = allTouchHandles.map(touch);
   var changedTouchObjects = subsequence(allTouchObjects, changedIndices);
-  var activeTouchObjects =
-    topType === 'topTouchStart' ? allTouchObjects :
-    topType === 'topTouchMove' ? allTouchObjects :
-    topType === 'topTouchEnd' ? antiSubsequence(allTouchObjects, changedIndices) :
-    topType === 'topTouchCancel' ? antiSubsequence(allTouchObjects, changedIndices) :
-    null;
+  var activeTouchObjects = topType === 'topTouchStart'
+    ? allTouchObjects
+    : topType === 'topTouchMove'
+        ? allTouchObjects
+        : topType === 'topTouchEnd'
+            ? antiSubsequence(allTouchObjects, changedIndices)
+            : topType === 'topTouchCancel'
+                ? antiSubsequence(allTouchObjects, changedIndices)
+                : null;
 
   return {
     nativeEvent: touchEvent(
       targetNodeHandle,
       activeTouchObjects,
-      changedTouchObjects
+      changedTouchObjects,
     ),
     topLevelType: topType,
     targetInst: getInstanceFromNode(targetNodeHandle),
@@ -108,7 +111,7 @@ var startConfig = function(nodeHandle, allTouchHandles, changedIndices) {
     nodeHandle,
     allTouchHandles,
     changedIndices,
-    nodeHandle
+    nodeHandle,
   );
 };
 
@@ -121,7 +124,7 @@ var moveConfig = function(nodeHandle, allTouchHandles, changedIndices) {
     nodeHandle,
     allTouchHandles,
     changedIndices,
-    nodeHandle
+    nodeHandle,
   );
 };
 
@@ -134,7 +137,7 @@ var endConfig = function(nodeHandle, allTouchHandles, changedIndices) {
     nodeHandle,
     allTouchHandles,
     changedIndices,
-    nodeHandle
+    nodeHandle,
   );
 };
 
@@ -169,31 +172,40 @@ var NA = -1;
 var oneEventLoopTestConfig = function(readableIDToID) {
   var ret = {
     // Negotiation
-    scrollShouldSetResponder: {bubbled:  {}, captured: {}},
-    startShouldSetResponder: {bubbled:  {}, captured: {}},
-    moveShouldSetResponder: {bubbled:  {}, captured: {}},
+    scrollShouldSetResponder: {bubbled: {}, captured: {}},
+    startShouldSetResponder: {bubbled: {}, captured: {}},
+    moveShouldSetResponder: {bubbled: {}, captured: {}},
     responderTerminationRequest: {},
 
     // Non-negotiation
-    responderReject:    {}, // These do not bubble capture.
-    responderGrant:     {},
-    responderStart:     {},
-    responderMove:      {},
+    responderReject: {}, // These do not bubble capture.
+    responderGrant: {},
+    responderStart: {},
+    responderMove: {},
     responderTerminate: {},
-    responderEnd:       {},
-    responderRelease:   {},
+    responderEnd: {},
+    responderRelease: {},
   };
   for (var eventName in ret) {
     for (var readableNodeName in readableIDToID) {
       if (ret[eventName].bubbled) {
         // Two phase
-        ret[eventName].bubbled[readableNodeName] =
-          {order: NA, assertEvent: null, returnVal: undefined};
-        ret[eventName].captured[readableNodeName] =
-          {order: NA, assertEvent: null, returnVal: undefined};
+        ret[eventName].bubbled[readableNodeName] = {
+          order: NA,
+          assertEvent: null,
+          returnVal: undefined,
+        };
+        ret[eventName].captured[readableNodeName] = {
+          order: NA,
+          assertEvent: null,
+          returnVal: undefined,
+        };
       } else {
-        ret[eventName][readableNodeName] =
-          {order: NA, assertEvent: null, returnVal: undefined};
+        ret[eventName][readableNodeName] = {
+          order: NA,
+          assertEvent: null,
+          returnVal: undefined,
+        };
       }
     }
   }
@@ -209,9 +221,13 @@ var registerTestHandlers = function(eventTestConfig, readableIDToID) {
   var neverFire = function(readableID, registrationName) {
     runs.dispatchCount++;
     expect('').toBe(
-      'Event type: ' + registrationName +
-      '\nShould never occur on:' + readableID +
-      '\nFor event test config:\n' + JSON.stringify(eventTestConfig) + '\n'
+      'Event type: ' +
+        registrationName +
+        '\nShould never occur on:' +
+        readableID +
+        '\nFor event test config:\n' +
+        JSON.stringify(eventTestConfig) +
+        '\n',
     );
   };
 
@@ -219,20 +235,19 @@ var registerTestHandlers = function(eventTestConfig, readableIDToID) {
     for (var readableID in eventTypeTestConfig) {
       var nodeConfig = eventTypeTestConfig[readableID];
       var id = readableIDToID[readableID];
-      var handler = nodeConfig.order === NA ? neverFire.bind(null, readableID, registrationName) :
-        // We partially apply readableID and nodeConfig, as they change in the
-        // parent closure across iterations.
-        function(rID, config, e) {
-          expect(
-            rID + '->' + registrationName + ' index:' + runs.dispatchCount++
-          ).toBe(
-            rID + '->' + registrationName + ' index:' + config.order
-          );
-          if (config.assertEvent) {
-            config.assertEvent(e);
-          }
-          return config.returnVal;
-        }.bind(null, readableID, nodeConfig);
+      var handler = nodeConfig.order === NA
+        ? neverFire.bind(null, readableID, registrationName)
+        : // We partially apply readableID and nodeConfig, as they change in the
+          // parent closure across iterations.
+          function(rID, config, e) {
+            expect(
+              rID + '->' + registrationName + ' index:' + runs.dispatchCount++,
+            ).toBe(rID + '->' + registrationName + ' index:' + config.order);
+            if (config.assertEvent) {
+              config.assertEvent(e);
+            }
+            return config.returnVal;
+          }.bind(null, readableID, nodeConfig);
       putListener(getInstanceFromNode(id), registrationName, handler);
     }
   };
@@ -241,17 +256,21 @@ var registerTestHandlers = function(eventTestConfig, readableIDToID) {
     var hasTwoPhase = !!oneEventTypeTestConfig.bubbled;
     if (hasTwoPhase) {
       registerOneEventType(
-        ResponderEventPlugin.eventTypes[eventName].phasedRegistrationNames.bubbled,
-        oneEventTypeTestConfig.bubbled
+        ResponderEventPlugin.eventTypes[
+          eventName
+        ].phasedRegistrationNames.bubbled,
+        oneEventTypeTestConfig.bubbled,
       );
       registerOneEventType(
-        ResponderEventPlugin.eventTypes[eventName].phasedRegistrationNames.captured,
-        oneEventTypeTestConfig.captured
+        ResponderEventPlugin.eventTypes[
+          eventName
+        ].phasedRegistrationNames.captured,
+        oneEventTypeTestConfig.captured,
       );
     } else {
       registerOneEventType(
         ResponderEventPlugin.eventTypes[eventName].registrationName,
-        oneEventTypeTestConfig
+        oneEventTypeTestConfig,
       );
     }
   }
@@ -284,7 +303,7 @@ var run = function(config, hierarchyConfig, nativeEventConfig) {
     nativeEventConfig.topLevelType,
     nativeEventConfig.targetInst,
     nativeEventConfig.nativeEvent,
-    nativeEventConfig.target
+    nativeEventConfig.target,
   );
 
   // At this point the negotiation events have been dispatched as part of the
@@ -294,41 +313,39 @@ var run = function(config, hierarchyConfig, nativeEventConfig) {
   EventPluginHub.processEventQueue(true);
 
   // Ensure that every event that declared an `order`, was actually dispatched.
-  expect(
-    'number of events dispatched:' + runData.dispatchCount
-  ).toBe(
-    'number of events dispatched:' + (max + 1)
+  expect('number of events dispatched:' + runData.dispatchCount).toBe(
+    'number of events dispatched:' + (max + 1),
   ); // +1 for extra ++
 };
 
-var GRANDPARENT_HOST_NODE = { };
-var PARENT_HOST_NODE = { };
-var CHILD_HOST_NODE = { };
-var CHILD_HOST_NODE2 = { };
+var GRANDPARENT_HOST_NODE = {};
+var PARENT_HOST_NODE = {};
+var CHILD_HOST_NODE = {};
+var CHILD_HOST_NODE2 = {};
 
 var GRANDPARENT_INST = {
   _hostParent: null,
   _rootNodeID: '1',
   _hostNode: GRANDPARENT_HOST_NODE,
-  _currentElement: { props: {} },
+  _currentElement: {props: {}},
 };
 var PARENT_INST = {
   _hostParent: GRANDPARENT_INST,
   _rootNodeID: '2',
   _hostNode: PARENT_HOST_NODE,
-  _currentElement: { props: {} },
+  _currentElement: {props: {}},
 };
 var CHILD_INST = {
   _hostParent: PARENT_INST,
   _rootNodeID: '3',
   _hostNode: CHILD_HOST_NODE,
-  _currentElement: { props: {} },
+  _currentElement: {props: {}},
 };
 var CHILD_INST2 = {
   _hostParent: PARENT_INST,
   _rootNodeID: '4',
   _hostNode: CHILD_HOST_NODE2,
-  _currentElement: { props: {} },
+  _currentElement: {props: {}},
 };
 
 GRANDPARENT_HOST_NODE._reactInstance = GRANDPARENT_INST;
@@ -365,7 +382,6 @@ function deleteAllListeners(node) {
 }
 
 describe('ResponderEventPlugin', () => {
-
   beforeEach(() => {
     jest.resetModules();
 
@@ -386,12 +402,27 @@ describe('ResponderEventPlugin', () => {
 
   it('should do nothing when no one wants to respond', () => {
     var config = oneEventLoopTestConfig(three);
-    config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
-    config.startShouldSetResponder.captured.parent = {order: 1, returnVal: false};
-    config.startShouldSetResponder.captured.child = {order: 2, returnVal: false};
+    config.startShouldSetResponder.captured.grandParent = {
+      order: 0,
+      returnVal: false,
+    };
+    config.startShouldSetResponder.captured.parent = {
+      order: 1,
+      returnVal: false,
+    };
+    config.startShouldSetResponder.captured.child = {
+      order: 2,
+      returnVal: false,
+    };
     config.startShouldSetResponder.bubbled.child = {order: 3, returnVal: false};
-    config.startShouldSetResponder.bubbled.parent = {order: 4, returnVal: false};
-    config.startShouldSetResponder.bubbled.grandParent = {order: 5, returnVal: false};
+    config.startShouldSetResponder.bubbled.parent = {
+      order: 4,
+      returnVal: false,
+    };
+    config.startShouldSetResponder.bubbled.grandParent = {
+      order: 5,
+      returnVal: false,
+    };
     run(config, three, startConfig(three.child, [three.child], [0]));
     expect(ResponderEventPlugin._getResponder()).toBe(null);
 
@@ -401,20 +432,23 @@ describe('ResponderEventPlugin', () => {
     expect(ResponderEventPlugin._getResponder()).toBe(null);
   });
 
-
   /**
    * Simple Start Granting
    * --------------------
    */
 
-
   it('should grant responder grandParent while capturing', () => {
     var config = oneEventLoopTestConfig(three);
-    config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: true};
+    config.startShouldSetResponder.captured.grandParent = {
+      order: 0,
+      returnVal: true,
+    };
     config.responderGrant.grandParent = {order: 1};
     config.responderStart.grandParent = {order: 2};
     run(config, three, startConfig(three.child, [three.child], [0]));
-    expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.grandParent));
+    expect(ResponderEventPlugin._getResponder()).toBe(
+      getInstanceFromNode(three.grandParent),
+    );
 
     config = oneEventLoopTestConfig(three);
     config.responderEnd.grandParent = {order: 0};
@@ -425,12 +459,20 @@ describe('ResponderEventPlugin', () => {
 
   it('should grant responder parent while capturing', () => {
     var config = oneEventLoopTestConfig(three);
-    config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
-    config.startShouldSetResponder.captured.parent = {order: 1, returnVal: true};
+    config.startShouldSetResponder.captured.grandParent = {
+      order: 0,
+      returnVal: false,
+    };
+    config.startShouldSetResponder.captured.parent = {
+      order: 1,
+      returnVal: true,
+    };
     config.responderGrant.parent = {order: 2};
     config.responderStart.parent = {order: 3};
     run(config, three, startConfig(three.child, [three.child], [0]));
-    expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.parent));
+    expect(ResponderEventPlugin._getResponder()).toBe(
+      getInstanceFromNode(three.parent),
+    );
 
     config = oneEventLoopTestConfig(three);
     config.responderEnd.parent = {order: 0};
@@ -441,13 +483,21 @@ describe('ResponderEventPlugin', () => {
 
   it('should grant responder child while capturing', () => {
     var config = oneEventLoopTestConfig(three);
-    config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
-    config.startShouldSetResponder.captured.parent = {order: 1, returnVal: false};
+    config.startShouldSetResponder.captured.grandParent = {
+      order: 0,
+      returnVal: false,
+    };
+    config.startShouldSetResponder.captured.parent = {
+      order: 1,
+      returnVal: false,
+    };
     config.startShouldSetResponder.captured.child = {order: 2, returnVal: true};
     config.responderGrant.child = {order: 3};
     config.responderStart.child = {order: 4};
     run(config, three, startConfig(three.child, [three.child], [0]));
-    expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.child));
+    expect(ResponderEventPlugin._getResponder()).toBe(
+      getInstanceFromNode(three.child),
+    );
 
     config = oneEventLoopTestConfig(three);
     config.responderEnd.child = {order: 0};
@@ -458,14 +508,25 @@ describe('ResponderEventPlugin', () => {
 
   it('should grant responder child while bubbling', () => {
     var config = oneEventLoopTestConfig(three);
-    config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
-    config.startShouldSetResponder.captured.parent = {order: 1, returnVal: false};
-    config.startShouldSetResponder.captured.child = {order: 2, returnVal: false};
+    config.startShouldSetResponder.captured.grandParent = {
+      order: 0,
+      returnVal: false,
+    };
+    config.startShouldSetResponder.captured.parent = {
+      order: 1,
+      returnVal: false,
+    };
+    config.startShouldSetResponder.captured.child = {
+      order: 2,
+      returnVal: false,
+    };
     config.startShouldSetResponder.bubbled.child = {order: 3, returnVal: true};
     config.responderGrant.child = {order: 4};
     config.responderStart.child = {order: 5};
     run(config, three, startConfig(three.child, [three.child], [0]));
-    expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.child));
+    expect(ResponderEventPlugin._getResponder()).toBe(
+      getInstanceFromNode(three.child),
+    );
 
     config = oneEventLoopTestConfig(three);
     config.responderEnd.child = {order: 0};
@@ -476,15 +537,26 @@ describe('ResponderEventPlugin', () => {
 
   it('should grant responder parent while bubbling', () => {
     var config = oneEventLoopTestConfig(three);
-    config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
-    config.startShouldSetResponder.captured.parent = {order: 1, returnVal: false};
-    config.startShouldSetResponder.captured.child = {order: 2, returnVal: false};
+    config.startShouldSetResponder.captured.grandParent = {
+      order: 0,
+      returnVal: false,
+    };
+    config.startShouldSetResponder.captured.parent = {
+      order: 1,
+      returnVal: false,
+    };
+    config.startShouldSetResponder.captured.child = {
+      order: 2,
+      returnVal: false,
+    };
     config.startShouldSetResponder.bubbled.child = {order: 3, returnVal: false};
     config.startShouldSetResponder.bubbled.parent = {order: 4, returnVal: true};
     config.responderGrant.parent = {order: 5};
     config.responderStart.parent = {order: 6};
     run(config, three, startConfig(three.child, [three.child], [0]));
-    expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.parent));
+    expect(ResponderEventPlugin._getResponder()).toBe(
+      getInstanceFromNode(three.parent),
+    );
 
     config = oneEventLoopTestConfig(three);
     config.responderEnd.parent = {order: 0};
@@ -495,16 +567,33 @@ describe('ResponderEventPlugin', () => {
 
   it('should grant responder grandParent while bubbling', () => {
     var config = oneEventLoopTestConfig(three);
-    config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
-    config.startShouldSetResponder.captured.parent = {order: 1, returnVal: false};
-    config.startShouldSetResponder.captured.child = {order: 2, returnVal: false};
+    config.startShouldSetResponder.captured.grandParent = {
+      order: 0,
+      returnVal: false,
+    };
+    config.startShouldSetResponder.captured.parent = {
+      order: 1,
+      returnVal: false,
+    };
+    config.startShouldSetResponder.captured.child = {
+      order: 2,
+      returnVal: false,
+    };
     config.startShouldSetResponder.bubbled.child = {order: 3, returnVal: false};
-    config.startShouldSetResponder.bubbled.parent = {order: 4, returnVal: false};
-    config.startShouldSetResponder.bubbled.grandParent = {order: 5, returnVal: true};
+    config.startShouldSetResponder.bubbled.parent = {
+      order: 4,
+      returnVal: false,
+    };
+    config.startShouldSetResponder.bubbled.grandParent = {
+      order: 5,
+      returnVal: true,
+    };
     config.responderGrant.grandParent = {order: 6};
     config.responderStart.grandParent = {order: 7};
     run(config, three, startConfig(three.child, [three.child], [0]));
-    expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.grandParent));
+    expect(ResponderEventPlugin._getResponder()).toBe(
+      getInstanceFromNode(three.grandParent),
+    );
 
     config = oneEventLoopTestConfig(three);
     config.responderEnd.grandParent = {order: 0};
@@ -513,8 +602,6 @@ describe('ResponderEventPlugin', () => {
     expect(ResponderEventPlugin._getResponder()).toBe(null);
   });
 
-
-
   /**
    * Simple Move Granting
    * --------------------
@@ -532,11 +619,16 @@ describe('ResponderEventPlugin', () => {
     run(config, three, startConfig(three.child, [three.child], [0]));
 
     config = oneEventLoopTestConfig(three);
-    config.moveShouldSetResponder.captured.grandParent = {order: 0, returnVal: true};
+    config.moveShouldSetResponder.captured.grandParent = {
+      order: 0,
+      returnVal: true,
+    };
     config.responderGrant.grandParent = {order: 1};
     config.responderMove.grandParent = {order: 2};
     run(config, three, moveConfig(three.child, [three.child], [0]));
-    expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.grandParent));
+    expect(ResponderEventPlugin._getResponder()).toBe(
+      getInstanceFromNode(three.grandParent),
+    );
 
     config = oneEventLoopTestConfig(three);
     config.responderEnd.grandParent = {order: 0};
@@ -557,12 +649,17 @@ describe('ResponderEventPlugin', () => {
     run(config, three, startConfig(three.child, [three.child], [0]));
 
     config = oneEventLoopTestConfig(three);
-    config.moveShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
+    config.moveShouldSetResponder.captured.grandParent = {
+      order: 0,
+      returnVal: false,
+    };
     config.moveShouldSetResponder.captured.parent = {order: 1, returnVal: true};
     config.responderGrant.parent = {order: 2};
     config.responderMove.parent = {order: 3};
     run(config, three, moveConfig(three.child, [three.child], [0]));
-    expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.parent));
+    expect(ResponderEventPlugin._getResponder()).toBe(
+      getInstanceFromNode(three.parent),
+    );
 
     config = oneEventLoopTestConfig(three);
     config.responderEnd.parent = {order: 0};
@@ -583,13 +680,21 @@ describe('ResponderEventPlugin', () => {
     run(config, three, startConfig(three.child, [three.child], [0]));
 
     config = oneEventLoopTestConfig(three);
-    config.moveShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
-    config.moveShouldSetResponder.captured.parent = {order: 1, returnVal: false};
+    config.moveShouldSetResponder.captured.grandParent = {
+      order: 0,
+      returnVal: false,
+    };
+    config.moveShouldSetResponder.captured.parent = {
+      order: 1,
+      returnVal: false,
+    };
     config.moveShouldSetResponder.captured.child = {order: 2, returnVal: true};
     config.responderGrant.child = {order: 3};
     config.responderMove.child = {order: 4};
     run(config, three, moveConfig(three.child, [three.child], [0]));
-    expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.child));
+    expect(ResponderEventPlugin._getResponder()).toBe(
+      getInstanceFromNode(three.child),
+    );
 
     config = oneEventLoopTestConfig(three);
     config.responderEnd.child = {order: 0};
@@ -610,14 +715,22 @@ describe('ResponderEventPlugin', () => {
     run(config, three, startConfig(three.child, [three.child], [0]));
 
     config = oneEventLoopTestConfig(three);
-    config.moveShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
-    config.moveShouldSetResponder.captured.parent = {order: 1, returnVal: false};
+    config.moveShouldSetResponder.captured.grandParent = {
+      order: 0,
+      returnVal: false,
+    };
+    config.moveShouldSetResponder.captured.parent = {
+      order: 1,
+      returnVal: false,
+    };
     config.moveShouldSetResponder.captured.child = {order: 2, returnVal: false};
     config.moveShouldSetResponder.bubbled.child = {order: 3, returnVal: true};
     config.responderGrant.child = {order: 4};
     config.responderMove.child = {order: 5};
     run(config, three, moveConfig(three.child, [three.child], [0]));
-    expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.child));
+    expect(ResponderEventPlugin._getResponder()).toBe(
+      getInstanceFromNode(three.child),
+    );
 
     config = oneEventLoopTestConfig(three);
     config.responderEnd.child = {order: 0};
@@ -638,15 +751,23 @@ describe('ResponderEventPlugin', () => {
     run(config, three, startConfig(three.child, [three.child], [0]));
 
     config = oneEventLoopTestConfig(three);
-    config.moveShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
-    config.moveShouldSetResponder.captured.parent = {order: 1, returnVal: false};
+    config.moveShouldSetResponder.captured.grandParent = {
+      order: 0,
+      returnVal: false,
+    };
+    config.moveShouldSetResponder.captured.parent = {
+      order: 1,
+      returnVal: false,
+    };
     config.moveShouldSetResponder.captured.child = {order: 2, returnVal: false};
     config.moveShouldSetResponder.bubbled.child = {order: 3, returnVal: false};
     config.moveShouldSetResponder.bubbled.parent = {order: 4, returnVal: true};
     config.responderGrant.parent = {order: 5};
     config.responderMove.parent = {order: 6};
     run(config, three, moveConfig(three.child, [three.child], [0]));
-    expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.parent));
+    expect(ResponderEventPlugin._getResponder()).toBe(
+      getInstanceFromNode(three.parent),
+    );
 
     config = oneEventLoopTestConfig(three);
     config.responderEnd.parent = {order: 0};
@@ -667,16 +788,27 @@ describe('ResponderEventPlugin', () => {
     run(config, three, startConfig(three.child, [three.child], [0]));
 
     config = oneEventLoopTestConfig(three);
-    config.moveShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
-    config.moveShouldSetResponder.captured.parent = {order: 1, returnVal: false};
+    config.moveShouldSetResponder.captured.grandParent = {
+      order: 0,
+      returnVal: false,
+    };
+    config.moveShouldSetResponder.captured.parent = {
+      order: 1,
+      returnVal: false,
+    };
     config.moveShouldSetResponder.captured.child = {order: 2, returnVal: false};
     config.moveShouldSetResponder.bubbled.child = {order: 3, returnVal: false};
     config.moveShouldSetResponder.bubbled.parent = {order: 4, returnVal: false};
-    config.moveShouldSetResponder.bubbled.grandParent = {order: 5, returnVal: true};
+    config.moveShouldSetResponder.bubbled.grandParent = {
+      order: 5,
+      returnVal: true,
+    };
     config.responderGrant.grandParent = {order: 6};
     config.responderMove.grandParent = {order: 7};
     run(config, three, moveConfig(three.child, [three.child], [0]));
-    expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.grandParent));
+    expect(ResponderEventPlugin._getResponder()).toBe(
+      getInstanceFromNode(three.grandParent),
+    );
 
     config = oneEventLoopTestConfig(three);
     config.responderEnd.grandParent = {order: 0};
@@ -685,7 +817,6 @@ describe('ResponderEventPlugin', () => {
     expect(ResponderEventPlugin._getResponder()).toBe(null);
   });
 
-
   /**
    * Common ancestor tests
    * ---------------------
@@ -693,22 +824,38 @@ describe('ResponderEventPlugin', () => {
 
   it('should bubble negotiation to first common ancestor of responder', () => {
     var config = oneEventLoopTestConfig(three);
-    config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
-    config.startShouldSetResponder.captured.parent = {order: 1, returnVal: true};
+    config.startShouldSetResponder.captured.grandParent = {
+      order: 0,
+      returnVal: false,
+    };
+    config.startShouldSetResponder.captured.parent = {
+      order: 1,
+      returnVal: true,
+    };
     config.responderGrant.parent = {order: 2};
     config.responderStart.parent = {order: 3};
     run(config, three, startConfig(three.child, [three.child], [0]));
-    expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.parent));
+    expect(ResponderEventPlugin._getResponder()).toBe(
+      getInstanceFromNode(three.parent),
+    );
 
     // While `parent` is still responder, we create new handlers that verify
     // the ordering of propagation, restarting the count at `0`.
     config = oneEventLoopTestConfig(three);
-    config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
-
-    config.startShouldSetResponder.bubbled.grandParent = {order: 1, returnVal: false};
+    config.startShouldSetResponder.captured.grandParent = {
+      order: 0,
+      returnVal: false,
+    };
+
+    config.startShouldSetResponder.bubbled.grandParent = {
+      order: 1,
+      returnVal: false,
+    };
     config.responderStart.parent = {order: 2};
     run(config, three, startConfig(three.child, [three.child], [0]));
-    expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.parent));
+    expect(ResponderEventPlugin._getResponder()).toBe(
+      getInstanceFromNode(three.parent),
+    );
 
     config = oneEventLoopTestConfig(three);
     config.responderEnd.parent = {order: 0};
@@ -719,29 +866,48 @@ describe('ResponderEventPlugin', () => {
 
   it('should bubble negotiation to first common ancestor of responder then transfer', () => {
     var config = oneEventLoopTestConfig(three);
-    config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
-    config.startShouldSetResponder.captured.parent = {order: 1, returnVal: true};
+    config.startShouldSetResponder.captured.grandParent = {
+      order: 0,
+      returnVal: false,
+    };
+    config.startShouldSetResponder.captured.parent = {
+      order: 1,
+      returnVal: true,
+    };
     config.responderGrant.parent = {order: 2};
     config.responderStart.parent = {order: 3};
     run(config, three, startConfig(three.child, [three.child], [0]));
-    expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.parent));
+    expect(ResponderEventPlugin._getResponder()).toBe(
+      getInstanceFromNode(three.parent),
+    );
 
     config = oneEventLoopTestConfig(three);
 
     // Parent is responder, and responder is transferred by a second touch start
-    config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: true};
+    config.startShouldSetResponder.captured.grandParent = {
+      order: 0,
+      returnVal: true,
+    };
     config.responderGrant.grandParent = {order: 1};
     config.responderTerminationRequest.parent = {order: 2, returnVal: true};
     config.responderTerminate.parent = {order: 3};
     config.responderStart.grandParent = {order: 4};
-    run(config, three, startConfig(three.child, [three.child, three.child], [1]));
-    expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.grandParent));
+    run(
+      config,
+      three,
+      startConfig(three.child, [three.child, three.child], [1]),
+    );
+    expect(ResponderEventPlugin._getResponder()).toBe(
+      getInstanceFromNode(three.grandParent),
+    );
 
     config = oneEventLoopTestConfig(three);
     config.responderEnd.grandParent = {order: 0};
-                                      // one remains\ /one ended \
+    // one remains\ /one ended \
     run(config, three, endConfig(three.child, [three.child, three.child], [1]));
-    expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.grandParent));
+    expect(ResponderEventPlugin._getResponder()).toBe(
+      getInstanceFromNode(three.grandParent),
+    );
 
     config = oneEventLoopTestConfig(three);
     config.responderEnd.grandParent = {order: 0};
@@ -757,10 +923,22 @@ describe('ResponderEventPlugin', () => {
   it('should negotiate with deepest target on second touch if nothing is responder', () => {
     // Initially nothing wants to become the responder
     var config = oneEventLoopTestConfig(three);
-    config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
-    config.startShouldSetResponder.captured.parent = {order: 1, returnVal: false};
-    config.startShouldSetResponder.bubbled.parent = {order: 2, returnVal: false};
-    config.startShouldSetResponder.bubbled.grandParent = {order: 3, returnVal: false};
+    config.startShouldSetResponder.captured.grandParent = {
+      order: 0,
+      returnVal: false,
+    };
+    config.startShouldSetResponder.captured.parent = {
+      order: 1,
+      returnVal: false,
+    };
+    config.startShouldSetResponder.bubbled.parent = {
+      order: 2,
+      returnVal: false,
+    };
+    config.startShouldSetResponder.bubbled.grandParent = {
+      order: 3,
+      returnVal: false,
+    };
 
     run(config, three, startConfig(three.parent, [three.parent], [0]));
     expect(ResponderEventPlugin._getResponder()).toBe(null);
@@ -771,16 +949,30 @@ describe('ResponderEventPlugin', () => {
     // as the target is because we don't find first common ancestor (with
     // current responder) because there is no current responder.
     // (Even if this is the second active touch).
-    config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
-    config.startShouldSetResponder.captured.parent = {order: 1, returnVal: false};
-    config.startShouldSetResponder.captured.child = {order: 2, returnVal: false};
+    config.startShouldSetResponder.captured.grandParent = {
+      order: 0,
+      returnVal: false,
+    };
+    config.startShouldSetResponder.captured.parent = {
+      order: 1,
+      returnVal: false,
+    };
+    config.startShouldSetResponder.captured.child = {
+      order: 2,
+      returnVal: false,
+    };
     config.startShouldSetResponder.bubbled.child = {order: 3, returnVal: true};
     config.responderGrant.child = {order: 4};
     config.responderStart.child = {order: 5};
     //                                     /  Two active touches  \  /one of them new\
-    run(config, three, startConfig(three.child, [three.parent, three.child], [1]));
-    expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.child));
-
+    run(
+      config,
+      three,
+      startConfig(three.child, [three.parent, three.child], [1]),
+    );
+    expect(ResponderEventPlugin._getResponder()).toBe(
+      getInstanceFromNode(three.child),
+    );
 
     // Now we remove the original first touch, keeping the second touch that
     // started within the current responder (child). Nothing changes because
@@ -788,50 +980,90 @@ describe('ResponderEventPlugin', () => {
     config = oneEventLoopTestConfig(three);
     config.responderEnd.child = {order: 0};
     //                                      / one ended\  /one remains \
-    run(config, three, endConfig(three.child, [three.parent, three.child], [0]));
-    expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.child));
+    run(
+      config,
+      three,
+      endConfig(three.child, [three.parent, three.child], [0]),
+    );
+    expect(ResponderEventPlugin._getResponder()).toBe(
+      getInstanceFromNode(three.child),
+    );
 
     // Okay, now let's add back that first touch (nothing should change) and
     // then we'll try peeling back the touches in the opposite order to make
     // sure that first removing the second touch instantly causes responder to
     // be released.
     config = oneEventLoopTestConfig(three);
-    config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
-    config.startShouldSetResponder.captured.parent = {order: 1, returnVal: false};
-    config.startShouldSetResponder.bubbled.parent = {order: 2, returnVal: false};
-    config.startShouldSetResponder.bubbled.grandParent = {order: 3, returnVal: false};
+    config.startShouldSetResponder.captured.grandParent = {
+      order: 0,
+      returnVal: false,
+    };
+    config.startShouldSetResponder.captured.parent = {
+      order: 1,
+      returnVal: false,
+    };
+    config.startShouldSetResponder.bubbled.parent = {
+      order: 2,
+      returnVal: false,
+    };
+    config.startShouldSetResponder.bubbled.grandParent = {
+      order: 3,
+      returnVal: false,
+    };
     // Interesting: child still gets moves even though touch target is parent!
     // Current responder gets a `responderStart` for any touch while responder.
     config.responderStart.child = {order: 4};
     //                                           /  Two active touches  \  /one of them new\
-    run(config, three, startConfig(three.parent, [three.child, three.parent], [1]));
-    expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.child));
-
+    run(
+      config,
+      three,
+      startConfig(three.parent, [three.child, three.parent], [1]),
+    );
+    expect(ResponderEventPlugin._getResponder()).toBe(
+      getInstanceFromNode(three.child),
+    );
 
     // Now, move that new touch that had no effect, and did not start within
     // the current responder.
     config = oneEventLoopTestConfig(three);
-    config.moveShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
-    config.moveShouldSetResponder.captured.parent = {order: 1, returnVal: false};
+    config.moveShouldSetResponder.captured.grandParent = {
+      order: 0,
+      returnVal: false,
+    };
+    config.moveShouldSetResponder.captured.parent = {
+      order: 1,
+      returnVal: false,
+    };
     config.moveShouldSetResponder.bubbled.parent = {order: 2, returnVal: false};
-    config.moveShouldSetResponder.bubbled.grandParent = {order: 3, returnVal: false};
+    config.moveShouldSetResponder.bubbled.grandParent = {
+      order: 3,
+      returnVal: false,
+    };
     // Interesting: child still gets moves even though touch target is parent!
     // Current responder gets a `responderMove` for any touch while responder.
     config.responderMove.child = {order: 4};
     //                                     /  Two active touches  \  /one of them moved\
-    run(config, three, moveConfig(three.parent, [three.child, three.parent], [1]));
-    expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.child));
-
+    run(
+      config,
+      three,
+      moveConfig(three.parent, [three.child, three.parent], [1]),
+    );
+    expect(ResponderEventPlugin._getResponder()).toBe(
+      getInstanceFromNode(three.child),
+    );
 
     config = oneEventLoopTestConfig(three);
     config.responderEnd.child = {order: 0};
     config.responderRelease.child = {order: 1};
     //                                        /child end \ /parent remain\
-    run(config, three, endConfig(three.child, [three.child, three.parent], [0]));
+    run(
+      config,
+      three,
+      endConfig(three.child, [three.child, three.parent], [0]),
+    );
     expect(ResponderEventPlugin._getResponder()).toBe(null);
   });
 
-
   /**
    * If nothing is responder, then the negotiation should propagate directly to
    * the deepest target in the second touch.
@@ -839,65 +1071,131 @@ describe('ResponderEventPlugin', () => {
   it('should negotiate until first common ancestor when there are siblings', () => {
     // Initially nothing wants to become the responder
     var config = oneEventLoopTestConfig(siblings);
-    config.startShouldSetResponder.captured.parent = {order: 0, returnVal: false};
-    config.startShouldSetResponder.captured.childOne = {order: 1, returnVal: false};
-    config.startShouldSetResponder.bubbled.childOne = {order: 2, returnVal: true};
+    config.startShouldSetResponder.captured.parent = {
+      order: 0,
+      returnVal: false,
+    };
+    config.startShouldSetResponder.captured.childOne = {
+      order: 1,
+      returnVal: false,
+    };
+    config.startShouldSetResponder.bubbled.childOne = {
+      order: 2,
+      returnVal: true,
+    };
     config.responderGrant.childOne = {order: 3};
     config.responderStart.childOne = {order: 4};
 
-    run(config, siblings, startConfig(siblings.childOne, [siblings.childOne], [0]));
-    expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(siblings.childOne));
+    run(
+      config,
+      siblings,
+      startConfig(siblings.childOne, [siblings.childOne], [0]),
+    );
+    expect(ResponderEventPlugin._getResponder()).toBe(
+      getInstanceFromNode(siblings.childOne),
+    );
 
     // If the touch target is the sibling item, the negotiation should only
     // propagate to first common ancestor of current responder and sibling (so
     // the parent).
     config = oneEventLoopTestConfig(siblings);
-    config.startShouldSetResponder.captured.parent = {order: 0, returnVal: false};
-    config.startShouldSetResponder.bubbled.parent = {order: 1, returnVal: false};
+    config.startShouldSetResponder.captured.parent = {
+      order: 0,
+      returnVal: false,
+    };
+    config.startShouldSetResponder.bubbled.parent = {
+      order: 1,
+      returnVal: false,
+    };
     config.responderStart.childOne = {order: 2};
 
-    var touchConfig =
-      startConfig(siblings.childTwo, [siblings.childOne, siblings.childTwo], [1]);
+    var touchConfig = startConfig(
+      siblings.childTwo,
+      [siblings.childOne, siblings.childTwo],
+      [1],
+    );
     run(config, siblings, touchConfig);
-    expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(siblings.childOne));
-
+    expect(ResponderEventPlugin._getResponder()).toBe(
+      getInstanceFromNode(siblings.childOne),
+    );
 
     // move childOne
     config = oneEventLoopTestConfig(siblings);
-    config.moveShouldSetResponder.captured.parent = {order: 0, returnVal: false};
+    config.moveShouldSetResponder.captured.parent = {
+      order: 0,
+      returnVal: false,
+    };
     config.moveShouldSetResponder.bubbled.parent = {order: 1, returnVal: false};
     config.responderMove.childOne = {order: 2};
-    run(config, siblings, moveConfig(siblings.childOne, [siblings.childOne, siblings.childTwo], [0]));
-    expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(siblings.childOne));
+    run(
+      config,
+      siblings,
+      moveConfig(
+        siblings.childOne,
+        [siblings.childOne, siblings.childTwo],
+        [0],
+      ),
+    );
+    expect(ResponderEventPlugin._getResponder()).toBe(
+      getInstanceFromNode(siblings.childOne),
+    );
 
     // move childTwo: Only negotiates to `parent`.
     config = oneEventLoopTestConfig(siblings);
-    config.moveShouldSetResponder.captured.parent = {order: 0, returnVal: false};
+    config.moveShouldSetResponder.captured.parent = {
+      order: 0,
+      returnVal: false,
+    };
     config.moveShouldSetResponder.bubbled.parent = {order: 1, returnVal: false};
     config.responderMove.childOne = {order: 2};
-    run(config, siblings, moveConfig(siblings.childTwo, [siblings.childOne, siblings.childTwo], [1]));
-    expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(siblings.childOne));
-
+    run(
+      config,
+      siblings,
+      moveConfig(
+        siblings.childTwo,
+        [siblings.childOne, siblings.childTwo],
+        [1],
+      ),
+    );
+    expect(ResponderEventPlugin._getResponder()).toBe(
+      getInstanceFromNode(siblings.childOne),
+    );
   });
 
-
   it('should notify of being rejected. responderStart/Move happens on current responder', () => {
     // Initially nothing wants to become the responder
     var config = oneEventLoopTestConfig(three);
-    config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
-    config.startShouldSetResponder.captured.parent = {order: 1, returnVal: false};
-    config.startShouldSetResponder.captured.child = {order: 2, returnVal: false};
+    config.startShouldSetResponder.captured.grandParent = {
+      order: 0,
+      returnVal: false,
+    };
+    config.startShouldSetResponder.captured.parent = {
+      order: 1,
+      returnVal: false,
+    };
+    config.startShouldSetResponder.captured.child = {
+      order: 2,
+      returnVal: false,
+    };
     config.startShouldSetResponder.bubbled.child = {order: 3, returnVal: true};
     config.responderGrant.child = {order: 4};
     config.responderStart.child = {order: 5};
 
     run(config, three, startConfig(three.child, [three.child], [0]));
-    expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.child));
+    expect(ResponderEventPlugin._getResponder()).toBe(
+      getInstanceFromNode(three.child),
+    );
 
     // Suppose parent wants to become responder on move, and is rejected
     config = oneEventLoopTestConfig(three);
-    config.moveShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
-    config.moveShouldSetResponder.captured.parent = {order: 1, returnVal: false};
+    config.moveShouldSetResponder.captured.grandParent = {
+      order: 0,
+      returnVal: false,
+    };
+    config.moveShouldSetResponder.captured.parent = {
+      order: 1,
+      returnVal: false,
+    };
     config.moveShouldSetResponder.bubbled.parent = {order: 2, returnVal: true};
     config.responderGrant.parent = {order: 3};
     config.responderTerminationRequest.child = {order: 4, returnVal: false};
@@ -905,14 +1203,21 @@ describe('ResponderEventPlugin', () => {
     // The start/move should occur on the original responder if new one is rejected
     config.responderMove.child = {order: 6};
 
-    var touchConfig =
-      moveConfig(three.child, [three.child], [0]);
+    var touchConfig = moveConfig(three.child, [three.child], [0]);
     run(config, three, touchConfig);
-    expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.child));
+    expect(ResponderEventPlugin._getResponder()).toBe(
+      getInstanceFromNode(three.child),
+    );
 
     config = oneEventLoopTestConfig(three);
-    config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
-    config.startShouldSetResponder.captured.parent = {order: 1, returnVal: false};
+    config.startShouldSetResponder.captured.grandParent = {
+      order: 0,
+      returnVal: false,
+    };
+    config.startShouldSetResponder.captured.parent = {
+      order: 1,
+      returnVal: false,
+    };
     config.startShouldSetResponder.bubbled.parent = {order: 2, returnVal: true};
     config.responderGrant.parent = {order: 3};
     config.responderTerminationRequest.child = {order: 4, returnVal: false};
@@ -920,34 +1225,53 @@ describe('ResponderEventPlugin', () => {
     // The start/move should occur on the original responder if new one is rejected
     config.responderStart.child = {order: 6};
 
-    touchConfig =
-      startConfig(three.child, [three.child, three.child], [1]);
+    touchConfig = startConfig(three.child, [three.child, three.child], [1]);
     run(config, three, touchConfig);
-    expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.child));
-
+    expect(ResponderEventPlugin._getResponder()).toBe(
+      getInstanceFromNode(three.child),
+    );
   });
 
-
   it('should negotiate scroll', () => {
     // Initially nothing wants to become the responder
     var config = oneEventLoopTestConfig(three);
-    config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
-    config.startShouldSetResponder.captured.parent = {order: 1, returnVal: false};
-    config.startShouldSetResponder.captured.child = {order: 2, returnVal: false};
+    config.startShouldSetResponder.captured.grandParent = {
+      order: 0,
+      returnVal: false,
+    };
+    config.startShouldSetResponder.captured.parent = {
+      order: 1,
+      returnVal: false,
+    };
+    config.startShouldSetResponder.captured.child = {
+      order: 2,
+      returnVal: false,
+    };
     config.startShouldSetResponder.bubbled.child = {order: 3, returnVal: true};
     config.responderGrant.child = {order: 4};
     config.responderStart.child = {order: 5};
 
     run(config, three, startConfig(three.child, [three.child], [0]));
-    expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.child));
+    expect(ResponderEventPlugin._getResponder()).toBe(
+      getInstanceFromNode(three.child),
+    );
 
     // If the touch target is the sibling item, the negotiation should only
     // propagate to first common ancestor of current responder and sibling (so
     // the parent).
     config = oneEventLoopTestConfig(three);
-    config.scrollShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
-    config.scrollShouldSetResponder.captured.parent = {order: 1, returnVal: false};
-    config.scrollShouldSetResponder.bubbled.parent = {order: 2, returnVal: true};
+    config.scrollShouldSetResponder.captured.grandParent = {
+      order: 0,
+      returnVal: false,
+    };
+    config.scrollShouldSetResponder.captured.parent = {
+      order: 1,
+      returnVal: false,
+    };
+    config.scrollShouldSetResponder.bubbled.parent = {
+      order: 2,
+      returnVal: true,
+    };
     config.responderGrant.parent = {order: 3};
     config.responderTerminationRequest.child = {order: 4, returnVal: false};
     config.responderReject.parent = {order: 5};
@@ -957,14 +1281,24 @@ describe('ResponderEventPlugin', () => {
       targetInst: getInstanceFromNode(three.parent),
       nativeEvent: {},
     });
-    expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.child));
-
+    expect(ResponderEventPlugin._getResponder()).toBe(
+      getInstanceFromNode(three.child),
+    );
 
     // Now lets let the scroll take control this time.
     config = oneEventLoopTestConfig(three);
-    config.scrollShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
-    config.scrollShouldSetResponder.captured.parent = {order: 1, returnVal: false};
-    config.scrollShouldSetResponder.bubbled.parent = {order: 2, returnVal: true};
+    config.scrollShouldSetResponder.captured.grandParent = {
+      order: 0,
+      returnVal: false,
+    };
+    config.scrollShouldSetResponder.captured.parent = {
+      order: 1,
+      returnVal: false,
+    };
+    config.scrollShouldSetResponder.bubbled.parent = {
+      order: 2,
+      returnVal: true,
+    };
     config.responderGrant.parent = {order: 3};
     config.responderTerminationRequest.child = {order: 4, returnVal: true};
     config.responderTerminate.child = {order: 5};
@@ -974,23 +1308,34 @@ describe('ResponderEventPlugin', () => {
       targetInst: getInstanceFromNode(three.parent),
       nativeEvent: {},
     });
-    expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.parent));
-
-
+    expect(ResponderEventPlugin._getResponder()).toBe(
+      getInstanceFromNode(three.parent),
+    );
   });
 
   it('should cancel correctly', () => {
     // Initially our child becomes responder
     var config = oneEventLoopTestConfig(three);
-    config.startShouldSetResponder.captured.grandParent = {order: 0, returnVal: false};
-    config.startShouldSetResponder.captured.parent = {order: 1, returnVal: false};
-    config.startShouldSetResponder.captured.child = {order: 2, returnVal: false};
+    config.startShouldSetResponder.captured.grandParent = {
+      order: 0,
+      returnVal: false,
+    };
+    config.startShouldSetResponder.captured.parent = {
+      order: 1,
+      returnVal: false,
+    };
+    config.startShouldSetResponder.captured.child = {
+      order: 2,
+      returnVal: false,
+    };
     config.startShouldSetResponder.bubbled.child = {order: 3, returnVal: true};
     config.responderGrant.child = {order: 4};
     config.responderStart.child = {order: 5};
 
     run(config, three, startConfig(three.child, [three.child], [0]));
-    expect(ResponderEventPlugin._getResponder()).toBe(getInstanceFromNode(three.child));
+    expect(ResponderEventPlugin._getResponder()).toBe(
+      getInstanceFromNode(three.child),
+    );
 
     config = oneEventLoopTestConfig(three);
     config.responderEnd.child = {order: 0};
@@ -1000,7 +1345,7 @@ describe('ResponderEventPlugin', () => {
       'topTouchCancel',
       three.child,
       [three.child],
-      [0]
+      [0],
     );
     run(config, three, nativeEvent);
     expect(ResponderEventPlugin._getResponder()).toBe(null);
diff --git a/Libraries/Renderer/src/renderers/shared/shared/getContextForSubtree.js b/Libraries/Renderer/src/renderers/shared/shared/getContextForSubtree.js
index 84f7e6a8112289..2883e36834d98b 100644
--- a/Libraries/Renderer/src/renderers/shared/shared/getContextForSubtree.js
+++ b/Libraries/Renderer/src/renderers/shared/shared/getContextForSubtree.js
@@ -19,7 +19,9 @@ let getContextFiber = function(arg) {
   invariant(false, 'Missing injection for fiber getContextForSubtree');
 };
 
-function getContextForSubtree(parentComponent : ?ReactComponent<any, any, any>) : Object {
+function getContextForSubtree(
+  parentComponent: ?ReactComponent<any, any, any>,
+): Object {
   if (!parentComponent) {
     return emptyObject;
   }
diff --git a/Libraries/Renderer/src/renderers/shared/shared/shouldUpdateReactComponent.js b/Libraries/Renderer/src/renderers/shared/shared/shouldUpdateReactComponent.js
index 2c4a155429923c..9a723b884d2cce 100644
--- a/Libraries/Renderer/src/renderers/shared/shared/shouldUpdateReactComponent.js
+++ b/Libraries/Renderer/src/renderers/shared/shared/shouldUpdateReactComponent.js
@@ -32,13 +32,11 @@ function shouldUpdateReactComponent(prevElement, nextElement) {
   var prevType = typeof prevElement;
   var nextType = typeof nextElement;
   if (prevType === 'string' || prevType === 'number') {
-    return (nextType === 'string' || nextType === 'number');
+    return nextType === 'string' || nextType === 'number';
   } else {
-    return (
-      nextType === 'object' &&
+    return nextType === 'object' &&
       prevElement.type === nextElement.type &&
-      prevElement.key === nextElement.key
-    );
+      prevElement.key === nextElement.key;
   }
 }
 
diff --git a/Libraries/Renderer/src/renderers/shared/stack/reconciler/CallbackQueue.js b/Libraries/Renderer/src/renderers/shared/stack/reconciler/CallbackQueue.js
index 58169384487238..c82dbfccd974fc 100644
--- a/Libraries/Renderer/src/renderers/shared/stack/reconciler/CallbackQueue.js
+++ b/Libraries/Renderer/src/renderers/shared/stack/reconciler/CallbackQueue.js
@@ -66,7 +66,7 @@ class CallbackQueue<T> {
     if (callbacks && contexts) {
       invariant(
         callbacks.length === contexts.length,
-        'Mismatched list of contexts in callback queue'
+        'Mismatched list of contexts in callback queue',
       );
       this._callbacks = null;
       this._contexts = null;
diff --git a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactChildReconciler.js b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactChildReconciler.js
index d858ed07ee5d58..7c9a13bfd064a1 100644
--- a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactChildReconciler.js
+++ b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactChildReconciler.js
@@ -37,7 +37,7 @@ if (
 
 function instantiateChild(childInstances, child, name, selfDebugID) {
   // We found a component instance.
-  var keyUnique = (childInstances[name] === undefined);
+  var keyUnique = childInstances[name] === undefined;
   if (__DEV__) {
     if (!ReactComponentTreeHook) {
       ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');
@@ -46,10 +46,10 @@ function instantiateChild(childInstances, child, name, selfDebugID) {
       warning(
         false,
         'flattenChildren(...): Encountered two children with the same key, ' +
-        '`%s`. Child keys must be unique; when two children share a key, only ' +
-        'the first child will be used.%s',
+          '`%s`. Child keys must be unique; when two children share a key, only ' +
+          'the first child will be used.%s',
         KeyEscapeUtils.unescape(name),
-        ReactComponentTreeHook.getStackAddendumByID(selfDebugID)
+        ReactComponentTreeHook.getStackAddendumByID(selfDebugID),
       );
     }
   }
@@ -76,7 +76,7 @@ var ReactChildReconciler = {
     nestedChildNodes,
     transaction,
     context,
-    selfDebugID // 0 in production and for roots
+    selfDebugID, // 0 in production and for roots
   ) {
     if (nestedChildNodes == null) {
       return null;
@@ -86,13 +86,9 @@ var ReactChildReconciler = {
     if (__DEV__) {
       traverseAllChildren(
         nestedChildNodes,
-        (childInsts, child, name) => instantiateChild(
-          childInsts,
-          child,
-          name,
-          selfDebugID
-        ),
-        childInstances
+        (childInsts, child, name) =>
+          instantiateChild(childInsts, child, name, selfDebugID),
+        childInstances,
       );
     } else {
       traverseAllChildren(nestedChildNodes, instantiateChild, childInstances);
@@ -119,7 +115,7 @@ var ReactChildReconciler = {
     hostParent,
     hostContainerInfo,
     context,
-    selfDebugID // 0 in production and for roots
+    selfDebugID, // 0 in production and for roots
   ) {
     // We currently don't have a way to track moves here but if we use iterators
     // instead of for..in we can zip the iterators and check if an item has
@@ -138,22 +134,26 @@ var ReactChildReconciler = {
       prevChild = prevChildren && prevChildren[name];
       var prevElement = prevChild && prevChild._currentElement;
       var nextElement = nextChildren[name];
-      if (prevChild != null &&
-          shouldUpdateReactComponent(prevElement, nextElement)) {
+      if (
+        prevChild != null &&
+        shouldUpdateReactComponent(prevElement, nextElement)
+      ) {
         ReactReconciler.receiveComponent(
-          prevChild, nextElement, transaction, context
+          prevChild,
+          nextElement,
+          transaction,
+          context,
         );
         nextChildren[name] = prevChild;
       } else {
         if (
-          !ReactFeatureFlags.prepareNewChildrenBeforeUnmountInStack &&
-          prevChild
+          !ReactFeatureFlags.prepareNewChildrenBeforeUnmountInStack && prevChild
         ) {
           removedNodes[name] = ReactReconciler.getHostNode(prevChild);
           ReactReconciler.unmountComponent(
             prevChild,
-            false, /* safely */
-            false /* skipLifecycle */
+            false /* safely */,
+            false /* skipLifecycle */,
           );
         }
         // The child must be instantiated before it's mounted.
@@ -167,32 +167,33 @@ var ReactChildReconciler = {
           hostParent,
           hostContainerInfo,
           context,
-          selfDebugID
+          selfDebugID,
         );
         mountImages.push(nextChildMountImage);
         if (
-          ReactFeatureFlags.prepareNewChildrenBeforeUnmountInStack &&
-          prevChild
+          ReactFeatureFlags.prepareNewChildrenBeforeUnmountInStack && prevChild
         ) {
           removedNodes[name] = ReactReconciler.getHostNode(prevChild);
           ReactReconciler.unmountComponent(
             prevChild,
-            false, /* safely */
-            false /* skipLifecycle */
+            false /* safely */,
+            false /* skipLifecycle */,
           );
         }
       }
     }
     // Unmount children that are no longer present.
     for (name in prevChildren) {
-      if (prevChildren.hasOwnProperty(name) &&
-          !(nextChildren && nextChildren.hasOwnProperty(name))) {
+      if (
+        prevChildren.hasOwnProperty(name) &&
+        !(nextChildren && nextChildren.hasOwnProperty(name))
+      ) {
         prevChild = prevChildren[name];
         removedNodes[name] = ReactReconciler.getHostNode(prevChild);
         ReactReconciler.unmountComponent(
           prevChild,
-          false, /* safely */
-          false /* skipLifecycle */
+          false /* safely */,
+          false /* skipLifecycle */,
         );
       }
     }
@@ -213,7 +214,6 @@ var ReactChildReconciler = {
       }
     }
   },
-
 };
 
 module.exports = ReactChildReconciler;
diff --git a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactComponentEnvironment.js b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactComponentEnvironment.js
index e35cb498c701cd..dae8811e7e15fe 100644
--- a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactComponentEnvironment.js
+++ b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactComponentEnvironment.js
@@ -25,7 +25,6 @@ type Environment = {
 var injected = false;
 
 var ReactComponentEnvironment = {
-
   /**
    * Optionally injectable hook for swapping out mount images in the middle of
    * the tree.
@@ -42,16 +41,13 @@ var ReactComponentEnvironment = {
     injectEnvironment: function(environment: Environment) {
       invariant(
         !injected,
-        'ReactCompositeComponent: injectEnvironment() can only be called once.'
+        'ReactCompositeComponent: injectEnvironment() can only be called once.',
       );
-      ReactComponentEnvironment.replaceNodeWithMarkup =
-        environment.replaceNodeWithMarkup;
-      ReactComponentEnvironment.processChildrenUpdates =
-        environment.processChildrenUpdates;
+      ReactComponentEnvironment.replaceNodeWithMarkup = environment.replaceNodeWithMarkup;
+      ReactComponentEnvironment.processChildrenUpdates = environment.processChildrenUpdates;
       injected = true;
     },
   },
-
 };
 
 module.exports = ReactComponentEnvironment;
diff --git a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js
index 3180844024fc63..5dfcc45d440c3e 100644
--- a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js
+++ b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js
@@ -11,7 +11,7 @@
 
 'use strict';
 
-var React = require('React');
+var React = require('react');
 var ReactComponentEnvironment = require('ReactComponentEnvironment');
 var ReactCompositeComponentTypes = require('ReactCompositeComponentTypes');
 var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');
@@ -34,8 +34,7 @@ var shallowEqual = require('fbjs/lib/shallowEqual');
 var shouldUpdateReactComponent = require('shouldUpdateReactComponent');
 var warning = require('fbjs/lib/warning');
 
-function StatelessComponent(Component) {
-}
+function StatelessComponent(Component) {}
 StatelessComponent.prototype.render = function() {
   var Component = ReactInstanceMap.get(this)._currentElement.type;
   var element = Component(this.props, this.context, this.updater);
@@ -106,7 +105,6 @@ var nextMountID = 1;
  * @lends {ReactCompositeComponent.prototype}
  */
 var ReactCompositeComponent = {
-
   /**
    * Base constructor for all composite component.
    *
@@ -161,7 +159,7 @@ var ReactCompositeComponent = {
     transaction,
     hostParent,
     hostContainerInfo,
-    context
+    context,
   ) {
     this._context = context;
     this._mountOrder = nextMountID++;
@@ -181,7 +179,7 @@ var ReactCompositeComponent = {
       doConstruct,
       publicProps,
       publicContext,
-      updateQueue
+      updateQueue,
     );
     var renderedElement;
 
@@ -192,16 +190,14 @@ var ReactCompositeComponent = {
         warning(
           !Component.childContextTypes,
           '%s(...): childContextTypes cannot be defined on a functional component.',
-          Component.displayName || Component.name || 'Component'
+          Component.displayName || Component.name || 'Component',
         );
       }
       invariant(
-        inst === null ||
-        inst === false ||
-        React.isValidElement(inst),
+        inst === null || inst === false || React.isValidElement(inst),
         '%s(...): A valid React element (or null) must be returned. You may have ' +
-        'returned undefined, an array or some other invalid object.',
-        Component.displayName || Component.name || 'Component'
+          'returned undefined, an array or some other invalid object.',
+        Component.displayName || Component.name || 'Component',
       );
       inst = new StatelessComponent(Component);
       this._compositeType = ReactCompositeComponentTypes.StatelessFunctional;
@@ -220,20 +216,22 @@ var ReactCompositeComponent = {
         warning(
           false,
           '%s(...): No `render` method found on the returned component ' +
-          'instance: you may have forgotten to define `render`.',
-          Component.displayName || Component.name || 'Component'
+            'instance: you may have forgotten to define `render`.',
+          Component.displayName || Component.name || 'Component',
         );
       }
 
       var propsMutated = inst.props !== publicProps;
-      var componentName =
-        Component.displayName || Component.name || 'Component';
+      var componentName = Component.displayName ||
+        Component.name ||
+        'Component';
 
       warning(
         inst.props === undefined || !propsMutated,
         '%s(...): When calling super() in `%s`, make sure to pass ' +
-        'up the same props that your component\'s constructor was passed.',
-        componentName, componentName
+          "up the same props that your component's constructor was passed.",
+        componentName,
+        componentName,
       );
     }
 
@@ -255,64 +253,63 @@ var ReactCompositeComponent = {
       // catch them here, at initialization time, instead.
       warning(
         !inst.getInitialState ||
-        inst.getInitialState.isReactClassApproved ||
-        inst.state,
+          inst.getInitialState.isReactClassApproved ||
+          inst.state,
         'getInitialState was defined on %s, a plain JavaScript class. ' +
-        'This is only supported for classes created using React.createClass. ' +
-        'Did you mean to define a state property instead?',
-        this.getName() || 'a component'
+          'This is only supported for classes created using React.createClass. ' +
+          'Did you mean to define a state property instead?',
+        this.getName() || 'a component',
       );
       warning(
-        !inst.getDefaultProps ||
-        inst.getDefaultProps.isReactClassApproved,
+        !inst.getDefaultProps || inst.getDefaultProps.isReactClassApproved,
         'getDefaultProps was defined on %s, a plain JavaScript class. ' +
-        'This is only supported for classes created using React.createClass. ' +
-        'Use a static property to define defaultProps instead.',
-        this.getName() || 'a component'
+          'This is only supported for classes created using React.createClass. ' +
+          'Use a static property to define defaultProps instead.',
+        this.getName() || 'a component',
       );
       warning(
         !inst.propTypes,
         'propTypes was defined as an instance property on %s. Use a static ' +
-        'property to define propTypes instead.',
-        this.getName() || 'a component'
+          'property to define propTypes instead.',
+        this.getName() || 'a component',
       );
       warning(
         !inst.contextTypes,
         'contextTypes was defined as an instance property on %s. Use a ' +
-        'static property to define contextTypes instead.',
-        this.getName() || 'a component'
+          'static property to define contextTypes instead.',
+        this.getName() || 'a component',
       );
       warning(
         typeof inst.componentShouldUpdate !== 'function',
         '%s has a method called ' +
-        'componentShouldUpdate(). Did you mean shouldComponentUpdate()? ' +
-        'The name is phrased as a question because the function is ' +
-        'expected to return a value.',
-        (this.getName() || 'A component')
+          'componentShouldUpdate(). Did you mean shouldComponentUpdate()? ' +
+          'The name is phrased as a question because the function is ' +
+          'expected to return a value.',
+        this.getName() || 'A component',
       );
       warning(
         typeof inst.componentDidUnmount !== 'function',
         '%s has a method called ' +
-        'componentDidUnmount(). But there is no such lifecycle method. ' +
-        'Did you mean componentWillUnmount()?',
-        this.getName() || 'A component'
+          'componentDidUnmount(). But there is no such lifecycle method. ' +
+          'Did you mean componentWillUnmount()?',
+        this.getName() || 'A component',
       );
       warning(
         typeof inst.componentWillRecieveProps !== 'function',
         '%s has a method called ' +
-        'componentWillRecieveProps(). Did you mean componentWillReceiveProps()?',
-        (this.getName() || 'A component')
+          'componentWillRecieveProps(). Did you mean componentWillReceiveProps()?',
+        this.getName() || 'A component',
       );
     }
 
     var initialState = inst.state;
     if (initialState === undefined) {
-      inst.state = initialState = null;
+      inst.state = (initialState = null);
     }
     invariant(
       typeof initialState === 'object' && !Array.isArray(initialState),
       '%s.state: must be set to an object or null',
-      this.getName() || 'ReactCompositeComponent'
+      this.getName() || 'ReactCompositeComponent',
     );
 
     this._pendingStateQueue = null;
@@ -324,7 +321,7 @@ var ReactCompositeComponent = {
         measureLifeCyclePerf(
           () => inst.componentWillMount(),
           this._debugID,
-          'componentWillMount'
+          'componentWillMount',
         );
       } else {
         inst.componentWillMount();
@@ -343,7 +340,7 @@ var ReactCompositeComponent = {
         hostParent,
         hostContainerInfo,
         transaction,
-        context
+        context,
       );
     } else {
       markup = this.performInitialMount(
@@ -351,7 +348,7 @@ var ReactCompositeComponent = {
         hostParent,
         hostContainerInfo,
         transaction,
-        context
+        context,
       );
     }
 
@@ -361,7 +358,7 @@ var ReactCompositeComponent = {
           measureLifeCyclePerf(
             () => inst.componentDidMount(),
             this._debugID,
-            'componentDidMount'
+            'componentDidMount',
           );
         });
       } else {
@@ -374,10 +371,7 @@ var ReactCompositeComponent = {
     if (callbacks) {
       this._pendingCallbacks = null;
       for (let i = 0; i < callbacks.length; i++) {
-        transaction.getReactMountReady().enqueue(
-          callbacks[i],
-          inst
-        );
+        transaction.getReactMountReady().enqueue(callbacks[i], inst);
       }
     }
 
@@ -388,7 +382,7 @@ var ReactCompositeComponent = {
     doConstruct,
     publicProps,
     publicContext,
-    updateQueue
+    updateQueue,
   ) {
     if (__DEV__) {
       ReactCurrentOwner.current = this;
@@ -397,7 +391,7 @@ var ReactCompositeComponent = {
           doConstruct,
           publicProps,
           publicContext,
-          updateQueue
+          updateQueue,
         );
       } finally {
         ReactCurrentOwner.current = null;
@@ -407,7 +401,7 @@ var ReactCompositeComponent = {
         doConstruct,
         publicProps,
         publicContext,
-        updateQueue
+        updateQueue,
       );
     }
   },
@@ -416,7 +410,7 @@ var ReactCompositeComponent = {
     doConstruct,
     publicProps,
     publicContext,
-    updateQueue
+    updateQueue,
   ) {
     var Component = this._currentElement.type;
 
@@ -425,7 +419,7 @@ var ReactCompositeComponent = {
         return measureLifeCyclePerf(
           () => new Component(publicProps, publicContext, updateQueue),
           this._debugID,
-          'ctor'
+          'ctor',
         );
       } else {
         return new Component(publicProps, publicContext, updateQueue);
@@ -438,7 +432,7 @@ var ReactCompositeComponent = {
       return measureLifeCyclePerf(
         () => Component(publicProps, publicContext, updateQueue),
         this._debugID,
-        'render'
+        'render',
       );
     } else {
       return Component(publicProps, publicContext, updateQueue);
@@ -450,7 +444,7 @@ var ReactCompositeComponent = {
     hostParent,
     hostContainerInfo,
     transaction,
-    context
+    context,
   ) {
     var markup;
     var checkpoint = transaction.checkpoint();
@@ -460,20 +454,23 @@ var ReactCompositeComponent = {
         hostParent,
         hostContainerInfo,
         transaction,
-        context
+        context,
       );
     } catch (e) {
       // Roll back to checkpoint, handle error (which may add items to the transaction), and take a new checkpoint
       transaction.rollback(checkpoint);
       this._instance.unstable_handleError(e);
       if (this._pendingStateQueue) {
-        this._instance.state = this._processPendingState(this._instance.props, this._instance.context);
+        this._instance.state = this._processPendingState(
+          this._instance.props,
+          this._instance.context,
+        );
       }
       checkpoint = transaction.checkpoint();
       this._renderedComponent.unmountComponent(
-        true, /* safely */
+        true /* safely */,
         // Don't call componentWillUnmount() because they never fully mounted:
-        true /* skipLifecyle */
+        true /* skipLifecyle */,
       );
       transaction.rollback(checkpoint);
 
@@ -484,7 +481,7 @@ var ReactCompositeComponent = {
         hostParent,
         hostContainerInfo,
         transaction,
-        context
+        context,
       );
     }
     return markup;
@@ -495,7 +492,7 @@ var ReactCompositeComponent = {
     hostParent,
     hostContainerInfo,
     transaction,
-    context
+    context,
   ) {
     // If not a stateless component, we now render
     if (renderedElement === undefined) {
@@ -506,7 +503,7 @@ var ReactCompositeComponent = {
     this._renderedNodeType = nodeType;
     var child = this._instantiateReactComponent(
       renderedElement,
-      nodeType !== ReactNodeTypes.EMPTY /* shouldHaveDebugID */
+      nodeType !== ReactNodeTypes.EMPTY /* shouldHaveDebugID */,
     );
     this._renderedComponent = child;
 
@@ -521,7 +518,7 @@ var ReactCompositeComponent = {
       hostParent,
       hostContainerInfo,
       this._processChildContext(context),
-      debugID
+      debugID,
     );
 
     if (__DEV__) {
@@ -557,14 +554,18 @@ var ReactCompositeComponent = {
       if (safely) {
         if (!skipLifecycle) {
           var name = this.getName() + '.componentWillUnmount()';
-          ReactErrorUtils.invokeGuardedCallback(name, inst.componentWillUnmount.bind(inst));
+          ReactErrorUtils.invokeGuardedCallbackAndCatchFirstError(
+            name,
+            inst.componentWillUnmount,
+            inst,
+          );
         }
       } else {
         if (__DEV__) {
           measureLifeCyclePerf(
             () => inst.componentWillUnmount(),
             this._debugID,
-            'componentWillUnmount'
+            'componentWillUnmount',
           );
         } else {
           inst.componentWillUnmount();
@@ -576,7 +577,7 @@ var ReactCompositeComponent = {
       ReactReconciler.unmountComponent(
         this._renderedComponent,
         safely,
-        skipLifecycle
+        skipLifecycle,
       );
       this._renderedNodeType = null;
       this._renderedComponent = null;
@@ -647,7 +648,7 @@ var ReactCompositeComponent = {
         this._checkContextTypes(
           Component.contextTypes,
           maskedContext,
-          'context'
+          'context',
         );
       }
     }
@@ -679,14 +680,14 @@ var ReactCompositeComponent = {
       invariant(
         typeof Component.childContextTypes === 'object',
         '%s.getChildContext(): childContextTypes must be defined in order to ' +
-        'use getChildContext().',
-        this.getName() || 'ReactCompositeComponent'
+          'use getChildContext().',
+        this.getName() || 'ReactCompositeComponent',
       );
       if (__DEV__) {
         this._checkContextTypes(
           Component.childContextTypes,
           childContext,
-          'child context'
+          'child context',
         );
       }
       for (var name in childContext) {
@@ -694,7 +695,7 @@ var ReactCompositeComponent = {
           name in Component.childContextTypes,
           '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
           this.getName() || 'ReactCompositeComponent',
-          name
+          name,
         );
       }
       return Object.assign({}, currentContext, childContext);
@@ -707,8 +708,8 @@ var ReactCompositeComponent = {
           warning(
             !Component.childContextTypes,
             '%s.childContextTypes is specified but there is no getChildContext() method ' +
-            'on the instance. You can either define getChildContext() on %s or remove ' +
-            'childContextTypes from it.',
+              'on the instance. You can either define getChildContext() on %s or remove ' +
+              'childContextTypes from it.',
             componentName,
             componentName,
           );
@@ -726,19 +727,10 @@ var ReactCompositeComponent = {
    * @param {string} location e.g. "prop", "context", "child context"
    * @private
    */
-  _checkContextTypes: function(
-    typeSpecs,
-    values,
-    location: string,
-  ) {
+  _checkContextTypes: function(typeSpecs, values, location: string) {
     if (__DEV__) {
       ReactDebugCurrentFrame.current = this._debugID;
-      checkReactTypeSpec(
-        typeSpecs,
-        values,
-        location,
-        this.getName()
-      );
+      checkReactTypeSpec(typeSpecs, values, location, this.getName());
       ReactDebugCurrentFrame.current = null;
     }
   },
@@ -754,7 +746,7 @@ var ReactCompositeComponent = {
       prevElement,
       nextElement,
       prevContext,
-      nextContext
+      nextContext,
     );
   },
 
@@ -771,7 +763,7 @@ var ReactCompositeComponent = {
         this,
         this._pendingElement,
         transaction,
-        this._context
+        this._context,
       );
     } else if (this._pendingStateQueue !== null || this._pendingForceUpdate) {
       this.updateComponent(
@@ -779,17 +771,16 @@ var ReactCompositeComponent = {
         this._currentElement,
         this._currentElement,
         this._context,
-        this._context
+        this._context,
       );
     } else {
       var callbacks = this._pendingCallbacks;
       this._pendingCallbacks = null;
       if (callbacks) {
         for (var j = 0; j < callbacks.length; j++) {
-          transaction.getReactMountReady().enqueue(
-            callbacks[j],
-            this.getPublicInstance()
-          );
+          transaction
+            .getReactMountReady()
+            .enqueue(callbacks[j], this.getPublicInstance());
         }
       }
       this._updateBatchNumber = null;
@@ -816,14 +807,14 @@ var ReactCompositeComponent = {
     prevParentElement,
     nextParentElement,
     prevUnmaskedContext,
-    nextUnmaskedContext
+    nextUnmaskedContext,
   ) {
     var inst = this._instance;
     invariant(
       inst != null,
       'Attempted to update component `%s` that has already been unmounted ' +
-      '(or failed to mount).',
-      this.getName() || 'ReactCompositeComponent'
+        '(or failed to mount).',
+      this.getName() || 'ReactCompositeComponent',
     );
 
     var willReceive = false;
@@ -867,9 +858,9 @@ var ReactCompositeComponent = {
           warning(
             false,
             '%s.componentWillReceiveProps(): Assigning directly to ' +
-            'this.state is deprecated (except inside a component\'s ' +
-            'constructor). Use setState instead.',
-            this.getName() || 'ReactCompositeComponent'
+              "this.state is deprecated (except inside a component's " +
+              'constructor). Use setState instead.',
+            this.getName() || 'ReactCompositeComponent',
           );
         }
       }
@@ -890,15 +881,18 @@ var ReactCompositeComponent = {
           shouldUpdate = measureLifeCyclePerf(
             () => inst.shouldComponentUpdate(nextProps, nextState, nextContext),
             this._debugID,
-            'shouldComponentUpdate'
+            'shouldComponentUpdate',
           );
         } else {
-          shouldUpdate = inst.shouldComponentUpdate(nextProps, nextState, nextContext);
+          shouldUpdate = inst.shouldComponentUpdate(
+            nextProps,
+            nextState,
+            nextContext,
+          );
         }
       } else {
         if (this._compositeType === ReactCompositeComponentTypes.PureClass) {
-          shouldUpdate =
-            !shallowEqual(prevProps, nextProps) ||
+          shouldUpdate = !shallowEqual(prevProps, nextProps) ||
             !shallowEqual(inst.state, nextState);
         }
       }
@@ -908,8 +902,8 @@ var ReactCompositeComponent = {
       warning(
         shouldUpdate !== undefined,
         '%s.shouldComponentUpdate(): Returned undefined instead of a ' +
-        'boolean value. Make sure to return true or false.',
-        this.getName() || 'ReactCompositeComponent'
+          'boolean value. Make sure to return true or false.',
+        this.getName() || 'ReactCompositeComponent',
       );
     }
 
@@ -923,7 +917,7 @@ var ReactCompositeComponent = {
         nextState,
         nextContext,
         transaction,
-        nextUnmaskedContext
+        nextUnmaskedContext,
       );
     } else {
       // If it's determined that a component should not update, we still want
@@ -937,10 +931,9 @@ var ReactCompositeComponent = {
 
     if (callbacks) {
       for (var j = 0; j < callbacks.length; j++) {
-        transaction.getReactMountReady().enqueue(
-          callbacks[j],
-          this.getPublicInstance()
-        );
+        transaction
+          .getReactMountReady()
+          .enqueue(callbacks[j], this.getPublicInstance());
       }
     }
   },
@@ -964,9 +957,9 @@ var ReactCompositeComponent = {
     var dontMutate = true;
     for (var i = replace ? 1 : 0; i < queue.length; i++) {
       var partial = queue[i];
-      let partialState = typeof partial === 'function' ?
-        partial.call(inst, nextState, props, context) :
-        partial;
+      let partialState = typeof partial === 'function'
+        ? partial.call(inst, nextState, props, context)
+        : partial;
       if (partialState) {
         if (dontMutate) {
           dontMutate = false;
@@ -998,11 +991,11 @@ var ReactCompositeComponent = {
     nextState,
     nextContext,
     transaction,
-    unmaskedContext
+    unmaskedContext,
   ) {
     var inst = this._instance;
 
-    var hasComponentDidUpdate = Boolean(inst.componentDidUpdate);
+    var hasComponentDidUpdate = !!inst.componentDidUpdate;
     var prevProps;
     var prevState;
     var prevContext;
@@ -1017,7 +1010,7 @@ var ReactCompositeComponent = {
         measureLifeCyclePerf(
           () => inst.componentWillUpdate(nextProps, nextState, nextContext),
           this._debugID,
-          'componentWillUpdate'
+          'componentWillUpdate',
         );
       } else {
         inst.componentWillUpdate(nextProps, nextState, nextContext);
@@ -1031,7 +1024,10 @@ var ReactCompositeComponent = {
     inst.context = nextContext;
 
     if (inst.unstable_handleError) {
-      this._updateRenderedComponentWithErrorHandling(transaction, unmaskedContext);
+      this._updateRenderedComponentWithErrorHandling(
+        transaction,
+        unmaskedContext,
+      );
     } else {
       this._updateRenderedComponent(transaction, unmaskedContext);
     }
@@ -1040,16 +1036,28 @@ var ReactCompositeComponent = {
       if (__DEV__) {
         transaction.getReactMountReady().enqueue(() => {
           measureLifeCyclePerf(
-            inst.componentDidUpdate.bind(inst, prevProps, prevState, prevContext),
+            inst.componentDidUpdate.bind(
+              inst,
+              prevProps,
+              prevState,
+              prevContext,
+            ),
             this._debugID,
-            'componentDidUpdate'
+            'componentDidUpdate',
           );
         });
       } else {
-        transaction.getReactMountReady().enqueue(
-          inst.componentDidUpdate.bind(inst, prevProps, prevState, prevContext),
-          inst
-        );
+        transaction
+          .getReactMountReady()
+          .enqueue(
+            inst.componentDidUpdate.bind(
+              inst,
+              prevProps,
+              prevState,
+              prevContext,
+            ),
+            inst,
+          );
       }
     }
   },
@@ -1070,7 +1078,10 @@ var ReactCompositeComponent = {
       transaction.rollback(checkpoint);
       this._instance.unstable_handleError(e);
       if (this._pendingStateQueue) {
-        this._instance.state = this._processPendingState(this._instance.props, this._instance.context);
+        this._instance.state = this._processPendingState(
+          this._instance.props,
+          this._instance.context,
+        );
       }
       checkpoint = transaction.checkpoint();
 
@@ -1079,7 +1090,7 @@ var ReactCompositeComponent = {
         transaction,
         context,
         null,
-        true /* safely */
+        true /* safely */,
       );
 
       // Try again - we've informed the component about the error, so they can render an error message this time.
@@ -1100,7 +1111,7 @@ var ReactCompositeComponent = {
       transaction,
       context,
       nextRenderedElement,
-      false /* safely */
+      false /* safely */,
     );
   },
 
@@ -1114,7 +1125,7 @@ var ReactCompositeComponent = {
     transaction,
     context,
     nextRenderedElement,
-    safely
+    safely,
   ) {
     var prevComponentInstance = this._renderedComponent;
     var prevRenderedElement = prevComponentInstance._currentElement;
@@ -1129,7 +1140,7 @@ var ReactCompositeComponent = {
         prevComponentInstance,
         nextRenderedElement,
         transaction,
-        this._processChildContext(context)
+        this._processChildContext(context),
       );
     } else {
       var oldHostNode = ReactReconciler.getHostNode(prevComponentInstance);
@@ -1138,7 +1149,7 @@ var ReactCompositeComponent = {
         ReactReconciler.unmountComponent(
           prevComponentInstance,
           safely,
-          false /* skipLifecycle */
+          false /* skipLifecycle */,
         );
       }
 
@@ -1146,7 +1157,7 @@ var ReactCompositeComponent = {
       this._renderedNodeType = nodeType;
       var child = this._instantiateReactComponent(
         nextRenderedElement,
-        nodeType !== ReactNodeTypes.EMPTY /* shouldHaveDebugID */
+        nodeType !== ReactNodeTypes.EMPTY /* shouldHaveDebugID */,
       );
       this._renderedComponent = child;
 
@@ -1156,14 +1167,14 @@ var ReactCompositeComponent = {
         this._hostParent,
         this._hostContainerInfo,
         this._processChildContext(context),
-        debugID
+        debugID,
       );
 
       if (ReactFeatureFlags.prepareNewChildrenBeforeUnmountInStack) {
         ReactReconciler.unmountComponent(
           prevComponentInstance,
           safely,
-          false /* skipLifecycle */
+          false /* skipLifecycle */,
         );
       }
 
@@ -1177,7 +1188,7 @@ var ReactCompositeComponent = {
       this._replaceNodeWithMarkup(
         oldHostNode,
         nextMarkup,
-        prevComponentInstance
+        prevComponentInstance,
       );
     }
   },
@@ -1191,7 +1202,7 @@ var ReactCompositeComponent = {
     ReactComponentEnvironment.replaceNodeWithMarkup(
       oldHostNode,
       nextMarkup,
-      prevInstance
+      prevInstance,
     );
   },
 
@@ -1206,7 +1217,7 @@ var ReactCompositeComponent = {
       renderedElement = measureLifeCyclePerf(
         () => inst.render(),
         this._debugID,
-        'render'
+        'render',
       );
     } else {
       renderedElement = inst.render();
@@ -1214,8 +1225,7 @@ var ReactCompositeComponent = {
 
     if (__DEV__) {
       // We allow auto-mocks to proceed as if they're returning null.
-      if (renderedElement === undefined &&
-          inst.render._isMockFunction) {
+      if (renderedElement === undefined && inst.render._isMockFunction) {
         // This is probably bad practice. Consider warning here and
         // deprecating this convenience.
         renderedElement = null;
@@ -1230,25 +1240,27 @@ var ReactCompositeComponent = {
    */
   _renderValidatedComponent: function() {
     var renderedElement;
-    if (__DEV__ || this._compositeType !== ReactCompositeComponentTypes.StatelessFunctional) {
+    if (
+      __DEV__ ||
+      this._compositeType !== ReactCompositeComponentTypes.StatelessFunctional
+    ) {
       ReactCurrentOwner.current = this;
       try {
-        renderedElement =
-          this._renderValidatedComponentWithoutOwnerOrContext();
+        renderedElement = this._renderValidatedComponentWithoutOwnerOrContext();
       } finally {
         ReactCurrentOwner.current = null;
       }
     } else {
-      renderedElement =
-        this._renderValidatedComponentWithoutOwnerOrContext();
+      renderedElement = this._renderValidatedComponentWithoutOwnerOrContext();
     }
     invariant(
       // TODO: An `isValidNode` function would probably be more appropriate
-      renderedElement === null || renderedElement === false ||
-      React.isValidElement(renderedElement),
+      renderedElement === null ||
+        renderedElement === false ||
+        React.isValidElement(renderedElement),
       '%s.render(): A valid React element (or null) must be returned. You may have ' +
         'returned undefined, an array or some other invalid object.',
-      this.getName() || 'ReactCompositeComponent'
+      this.getName() || 'ReactCompositeComponent',
     );
 
     return renderedElement;
@@ -1291,11 +1303,11 @@ var ReactCompositeComponent = {
   getName: function() {
     var type = this._currentElement.type;
     var constructor = this._instance && this._instance.constructor;
-    return (
-      type.displayName || (constructor && constructor.displayName) ||
-      type.name || (constructor && constructor.name) ||
-      null
-    );
+    return type.displayName ||
+      (constructor && constructor.displayName) ||
+      type.name ||
+      (constructor && constructor.name) ||
+      null;
   },
 
   /**
@@ -1308,7 +1320,9 @@ var ReactCompositeComponent = {
    */
   getPublicInstance: function() {
     var inst = this._instance;
-    if (this._compositeType === ReactCompositeComponentTypes.StatelessFunctional) {
+    if (
+      this._compositeType === ReactCompositeComponentTypes.StatelessFunctional
+    ) {
       return null;
     }
     return inst;
@@ -1316,7 +1330,6 @@ var ReactCompositeComponent = {
 
   // Stub
   _instantiateReactComponent: null,
-
 };
 
 module.exports = ReactCompositeComponent;
diff --git a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactDefaultBatchingStrategy.js b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactDefaultBatchingStrategy.js
index 9f131fe32361b1..f787eff30097e9 100644
--- a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactDefaultBatchingStrategy.js
+++ b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactDefaultBatchingStrategy.js
@@ -34,15 +34,11 @@ function ReactDefaultBatchingStrategyTransaction() {
   this.reinitializeTransaction();
 }
 
-Object.assign(
-  ReactDefaultBatchingStrategyTransaction.prototype,
-  Transaction,
-  {
-    getTransactionWrappers: function() {
-      return TRANSACTION_WRAPPERS;
-    },
-  }
-);
+Object.assign(ReactDefaultBatchingStrategyTransaction.prototype, Transaction, {
+  getTransactionWrappers: function() {
+    return TRANSACTION_WRAPPERS;
+  },
+});
 
 var transaction = new ReactDefaultBatchingStrategyTransaction();
 
diff --git a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactHostComponent.js b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactHostComponent.js
index 75db824f6bbd8e..5391ec289f3a0c 100644
--- a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactHostComponent.js
+++ b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactHostComponent.js
@@ -39,7 +39,7 @@ function createInternalComponent(element) {
   invariant(
     genericComponentClass,
     'There is no registered component for the tag %s',
-    element.type
+    element.type,
   );
   return new genericComponentClass(element);
 }
diff --git a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactMultiChild.js b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactMultiChild.js
index 296ece9ab2fa87..19fd366a38e61b 100644
--- a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactMultiChild.js
+++ b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactMultiChild.js
@@ -133,10 +133,7 @@ function enqueue(queue, update) {
  * @private
  */
 function processQueue(inst, updateQueue) {
-  ReactComponentEnvironment.processChildrenUpdates(
-    inst,
-    updateQueue,
-  );
+  ReactComponentEnvironment.processChildrenUpdates(inst, updateQueue);
 }
 
 var setChildrenForInstrumentation = emptyFunction;
@@ -158,7 +155,9 @@ if (__DEV__) {
     if (debugID !== 0) {
       ReactInstrumentation.debugTool.onSetChildren(
         debugID,
-        children ? Object.keys(children).map(key => children[key]._debugID) : []
+        children
+          ? Object.keys(children).map(key => children[key]._debugID)
+          : [],
       );
     }
   };
@@ -170,14 +169,21 @@ if (__DEV__) {
  * unmount child components.
  */
 var ReactMultiChild = {
-  _reconcilerInstantiateChildren: function(nestedChildren, transaction, context) {
+  _reconcilerInstantiateChildren: function(
+    nestedChildren,
+    transaction,
+    context,
+  ) {
     if (__DEV__) {
       var selfDebugID = getDebugID(this);
       if (this._currentElement) {
         try {
           ReactCurrentOwner.current = this._currentElement._owner;
           return ReactChildReconciler.instantiateChildren(
-            nestedChildren, transaction, context, selfDebugID
+            nestedChildren,
+            transaction,
+            context,
+            selfDebugID,
           );
         } finally {
           ReactCurrentOwner.current = null;
@@ -185,7 +191,9 @@ var ReactMultiChild = {
       }
     }
     return ReactChildReconciler.instantiateChildren(
-      nestedChildren, transaction, context
+      nestedChildren,
+      transaction,
+      context,
     );
   },
 
@@ -195,7 +203,7 @@ var ReactMultiChild = {
     mountImages,
     removedNodes,
     transaction,
-    context
+    context,
   ) {
     var nextChildren;
     var selfDebugID = 0;
@@ -204,7 +212,10 @@ var ReactMultiChild = {
       if (this._currentElement) {
         try {
           ReactCurrentOwner.current = this._currentElement._owner;
-          nextChildren = flattenChildren(nextNestedChildrenElements, selfDebugID);
+          nextChildren = flattenChildren(
+            nextNestedChildrenElements,
+            selfDebugID,
+          );
         } finally {
           ReactCurrentOwner.current = null;
         }
@@ -217,7 +228,7 @@ var ReactMultiChild = {
           this,
           this._hostContainerInfo,
           context,
-          selfDebugID
+          selfDebugID,
         );
         return nextChildren;
       }
@@ -232,7 +243,7 @@ var ReactMultiChild = {
       this,
       this._hostContainerInfo,
       context,
-      selfDebugID
+      selfDebugID,
     );
     return nextChildren;
   },
@@ -247,7 +258,9 @@ var ReactMultiChild = {
    */
   mountChildren: function(nestedChildren, transaction, context) {
     var children = this._reconcilerInstantiateChildren(
-      nestedChildren, transaction, context
+      nestedChildren,
+      transaction,
+      context,
     );
     this._renderedChildren = children;
 
@@ -266,7 +279,7 @@ var ReactMultiChild = {
           this,
           this._hostContainerInfo,
           context,
-          selfDebugID
+          selfDebugID,
         );
         child._mountIndex = index++;
         mountImages.push(mountImage);
@@ -291,8 +304,8 @@ var ReactMultiChild = {
     // Remove any rendered children.
     ReactChildReconciler.unmountChildren(
       prevChildren,
-      false, /* safely */
-      false /* skipLifecycle */
+      false /* safely */,
+      false /* skipLifecycle */,
     );
     for (var name in prevChildren) {
       if (prevChildren.hasOwnProperty(name)) {
@@ -315,8 +328,8 @@ var ReactMultiChild = {
     // Remove any rendered children.
     ReactChildReconciler.unmountChildren(
       prevChildren,
-      false, /* safely */
-      false /* skipLifecycle */
+      false /* safely */,
+      false /* skipLifecycle */,
     );
     for (var name in prevChildren) {
       if (prevChildren.hasOwnProperty(name)) {
@@ -355,7 +368,7 @@ var ReactMultiChild = {
       mountImages,
       removedNodes,
       transaction,
-      context
+      context,
     );
     if (!nextChildren && !prevChildren) {
       return;
@@ -378,7 +391,7 @@ var ReactMultiChild = {
       if (prevChild === nextChild) {
         updates = enqueue(
           updates,
-          this.moveChild(prevChild, lastPlacedNode, nextIndex, lastIndex)
+          this.moveChild(prevChild, lastPlacedNode, nextIndex, lastIndex),
         );
         lastIndex = Math.max(prevChild._mountIndex, lastIndex);
         prevChild._mountIndex = nextIndex;
@@ -397,8 +410,8 @@ var ReactMultiChild = {
             lastPlacedNode,
             nextIndex,
             transaction,
-            context
-          )
+            context,
+          ),
         );
         nextMountIndex++;
       }
@@ -410,7 +423,7 @@ var ReactMultiChild = {
       if (removedNodes.hasOwnProperty(name)) {
         updates = enqueue(
           updates,
-          this._unmountChild(prevChildren[name], removedNodes[name])
+          this._unmountChild(prevChildren[name], removedNodes[name]),
         );
       }
     }
@@ -436,7 +449,7 @@ var ReactMultiChild = {
     ReactChildReconciler.unmountChildren(
       renderedChildren,
       safely,
-      skipLifecycle
+      skipLifecycle,
     );
     this._renderedChildren = null;
   },
@@ -496,7 +509,8 @@ var ReactMultiChild = {
     afterNode,
     index,
     transaction,
-    context) {
+    context,
+  ) {
     child._mountIndex = index;
     return this.createChild(child, afterNode, mountImage);
   },
diff --git a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactMultiChildUpdateTypes.js b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactMultiChildUpdateTypes.js
index acccdc4972c236..1319db50fae56f 100644
--- a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactMultiChildUpdateTypes.js
+++ b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactMultiChildUpdateTypes.js
@@ -18,8 +18,8 @@
  * Enumerates all the possible types of update configurations.
  */
 export type ReactMultiChildUpdateTypes =
-  'INSERT_MARKUP' |
-  'MOVE_EXISTING' |
-  'REMOVE_NODE' |
-  'SET_MARKUP' |
-  'TEXT_CONTENT';
+  | 'INSERT_MARKUP'
+  | 'MOVE_EXISTING'
+  | 'REMOVE_NODE'
+  | 'SET_MARKUP'
+  | 'TEXT_CONTENT';
diff --git a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactNodeTypes.js b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactNodeTypes.js
index cda1c867476afa..2e24a6ba10d181 100644
--- a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactNodeTypes.js
+++ b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactNodeTypes.js
@@ -14,7 +14,7 @@
 
 type ReactNodeType = 0 | 1 | 2;
 
-var React = require('React');
+var React = require('react');
 
 var invariant = require('fbjs/lib/invariant');
 
diff --git a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactOwner.js b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactOwner.js
index 21165f8f1b394c..7d3a4c6032361e 100644
--- a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactOwner.js
+++ b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactOwner.js
@@ -12,13 +12,13 @@
 
 'use strict';
 
-var { ClassComponent } = require('ReactTypeOfWork');
+var {ClassComponent} = require('ReactTypeOfWork');
 
 var emptyObject = require('fbjs/lib/emptyObject');
 var invariant = require('fbjs/lib/invariant');
 
-import type { Fiber } from 'ReactFiber';
-import type { ReactInstance } from 'ReactInstanceType';
+import type {Fiber} from 'ReactFiber';
+import type {ReactInstance} from 'ReactInstanceType';
 
 /**
  * @param {?object} object
@@ -26,11 +26,9 @@ import type { ReactInstance } from 'ReactInstanceType';
  * @final
  */
 function isValidOwner(object: any): boolean {
-  return !!(
-    object &&
+  return !!(object &&
     typeof object.attachRef === 'function' &&
-    typeof object.detachRef === 'function'
-  );
+    typeof object.detachRef === 'function');
 }
 
 /**
@@ -78,19 +76,19 @@ var ReactOwner = {
     ref: string,
     owner: ReactInstance | Fiber,
   ): void {
-    if (owner && (owner : any).tag === ClassComponent) {
-      const inst = (owner : any).stateNode;
+    if (owner && (owner: any).tag === ClassComponent) {
+      const inst = (owner: any).stateNode;
       const refs = inst.refs === emptyObject ? (inst.refs = {}) : inst.refs;
       refs[ref] = component.getPublicInstance();
     } else {
       invariant(
         isValidOwner(owner),
         'addComponentAsRefTo(...): Only a ReactOwner can have refs. You might ' +
-        'be adding a ref to a component that was not created inside a component\'s ' +
-        '`render` method, or you have multiple copies of React loaded ' +
-        '(details: https://fb.me/react-refs-must-have-owner).'
+          "be adding a ref to a component that was not created inside a component's " +
+          '`render` method, or you have multiple copies of React loaded ' +
+          '(details: https://fb.me/react-refs-must-have-owner).',
       );
-      (owner : any).attachRef(ref, component);
+      (owner: any).attachRef(ref, component);
     }
   },
 
@@ -108,8 +106,8 @@ var ReactOwner = {
     ref: string,
     owner: ReactInstance | Fiber,
   ): void {
-    if (owner && (owner : any).tag === ClassComponent) {
-      const inst = (owner : any).stateNode;
+    if (owner && (owner: any).tag === ClassComponent) {
+      const inst = (owner: any).stateNode;
       if (inst && inst.refs[ref] === component.getPublicInstance()) {
         delete inst.refs[ref];
       }
@@ -117,19 +115,21 @@ var ReactOwner = {
       invariant(
         isValidOwner(owner),
         'removeComponentAsRefFrom(...): Only a ReactOwner can have refs. You might ' +
-        'be removing a ref to a component that was not created inside a component\'s ' +
-        '`render` method, or you have multiple copies of React loaded ' +
-        '(details: https://fb.me/react-refs-must-have-owner).'
+          "be removing a ref to a component that was not created inside a component's " +
+          '`render` method, or you have multiple copies of React loaded ' +
+          '(details: https://fb.me/react-refs-must-have-owner).',
       );
-      var ownerPublicInstance = (owner : any).getPublicInstance();
+      var ownerPublicInstance = (owner: any).getPublicInstance();
       // Check that `component`'s owner is still alive and that `component` is still the current ref
       // because we do not want to detach the ref if another component stole it.
-      if (ownerPublicInstance && ownerPublicInstance.refs[ref] === component.getPublicInstance()) {
-        (owner : any).detachRef(ref);
+      if (
+        ownerPublicInstance &&
+        ownerPublicInstance.refs[ref] === component.getPublicInstance()
+      ) {
+        (owner: any).detachRef(ref);
       }
     }
   },
-
 };
 
 module.exports = ReactOwner;
diff --git a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactReconciler.js b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactReconciler.js
index aafe0fbb7df120..221ebd584afe10 100644
--- a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactReconciler.js
+++ b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactReconciler.js
@@ -25,7 +25,6 @@ function attachRefs() {
 }
 
 var ReactReconciler = {
-
   /**
    * Initializes the component, renders markup, and registers event listeners.
    *
@@ -43,14 +42,14 @@ var ReactReconciler = {
     hostParent,
     hostContainerInfo,
     context,
-    parentDebugID // 0 in production and for roots
+    parentDebugID, // 0 in production and for roots
   ) {
     if (__DEV__) {
       if (internalInstance._debugID !== 0) {
         ReactInstrumentation.debugTool.onBeforeMountComponent(
           internalInstance._debugID,
           internalInstance._currentElement,
-          parentDebugID
+          parentDebugID,
         );
       }
     }
@@ -59,16 +58,18 @@ var ReactReconciler = {
       hostParent,
       hostContainerInfo,
       context,
-      parentDebugID
+      parentDebugID,
     );
-    if (internalInstance._currentElement &&
-        internalInstance._currentElement.ref != null) {
+    if (
+      internalInstance._currentElement &&
+      internalInstance._currentElement.ref != null
+    ) {
       transaction.getReactMountReady().enqueue(attachRefs, internalInstance);
     }
     if (__DEV__) {
       if (internalInstance._debugID !== 0) {
         ReactInstrumentation.debugTool.onMountComponent(
-          internalInstance._debugID
+          internalInstance._debugID,
         );
       }
     }
@@ -93,7 +94,7 @@ var ReactReconciler = {
     if (__DEV__) {
       if (internalInstance._debugID !== 0) {
         ReactInstrumentation.debugTool.onBeforeUnmountComponent(
-          internalInstance._debugID
+          internalInstance._debugID,
         );
       }
     }
@@ -102,7 +103,7 @@ var ReactReconciler = {
     if (__DEV__) {
       if (internalInstance._debugID !== 0) {
         ReactInstrumentation.debugTool.onUnmountComponent(
-          internalInstance._debugID
+          internalInstance._debugID,
         );
       }
     }
@@ -118,13 +119,14 @@ var ReactReconciler = {
    * @internal
    */
   receiveComponent: function(
-    internalInstance, nextElement, transaction, context
+    internalInstance,
+    nextElement,
+    transaction,
+    context,
   ) {
     var prevElement = internalInstance._currentElement;
 
-    if (nextElement === prevElement &&
-        context === internalInstance._context
-      ) {
+    if (nextElement === prevElement && context === internalInstance._context) {
       // Since elements are immutable after the owner is rendered,
       // we can do a cheap identity compare here to determine if this is a
       // superfluous reconcile. It's possible for state to be mutable but such
@@ -142,15 +144,12 @@ var ReactReconciler = {
       if (internalInstance._debugID !== 0) {
         ReactInstrumentation.debugTool.onBeforeUpdateComponent(
           internalInstance._debugID,
-          nextElement
+          nextElement,
         );
       }
     }
 
-    var refsChanged = ReactRef.shouldUpdateRefs(
-      prevElement,
-      nextElement
-    );
+    var refsChanged = ReactRef.shouldUpdateRefs(prevElement, nextElement);
 
     if (refsChanged) {
       ReactRef.detachRefs(internalInstance, prevElement);
@@ -158,16 +157,18 @@ var ReactReconciler = {
 
     internalInstance.receiveComponent(nextElement, transaction, context);
 
-    if (refsChanged &&
-        internalInstance._currentElement &&
-        internalInstance._currentElement.ref != null) {
+    if (
+      refsChanged &&
+      internalInstance._currentElement &&
+      internalInstance._currentElement.ref != null
+    ) {
       transaction.getReactMountReady().enqueue(attachRefs, internalInstance);
     }
 
     if (__DEV__) {
       if (internalInstance._debugID !== 0) {
         ReactInstrumentation.debugTool.onUpdateComponent(
-          internalInstance._debugID
+          internalInstance._debugID,
         );
       }
     }
@@ -183,18 +184,18 @@ var ReactReconciler = {
   performUpdateIfNecessary: function(
     internalInstance,
     transaction,
-    updateBatchNumber
+    updateBatchNumber,
   ) {
     if (internalInstance._updateBatchNumber !== updateBatchNumber) {
       // The component's enqueued batch number should always be the current
       // batch or the following one.
       warning(
         internalInstance._updateBatchNumber == null ||
-        internalInstance._updateBatchNumber === updateBatchNumber + 1,
+          internalInstance._updateBatchNumber === updateBatchNumber + 1,
         'performUpdateIfNecessary: Unexpected batch number (current %s, ' +
-        'pending %s)',
+          'pending %s)',
         updateBatchNumber,
-        internalInstance._updateBatchNumber
+        internalInstance._updateBatchNumber,
       );
       return;
     }
@@ -202,7 +203,7 @@ var ReactReconciler = {
       if (internalInstance._debugID !== 0) {
         ReactInstrumentation.debugTool.onBeforeUpdateComponent(
           internalInstance._debugID,
-          internalInstance._currentElement
+          internalInstance._currentElement,
         );
       }
     }
@@ -210,12 +211,11 @@ var ReactReconciler = {
     if (__DEV__) {
       if (internalInstance._debugID !== 0) {
         ReactInstrumentation.debugTool.onUpdateComponent(
-          internalInstance._debugID
+          internalInstance._debugID,
         );
       }
     }
   },
-
 };
 
 module.exports = ReactReconciler;
diff --git a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactRef.js b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactRef.js
index 120c6dddbd2554..cae62c717b26f3 100644
--- a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactRef.js
+++ b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactRef.js
@@ -14,8 +14,8 @@
 
 var ReactOwner = require('ReactOwner');
 
-import type { ReactInstance } from 'ReactInstanceType';
-import type { ReactElement } from 'ReactElementType';
+import type {ReactInstance} from 'ReactInstanceType';
+import type {ReactElement} from 'ReactElementType';
 
 var ReactRef = {};
 
@@ -29,7 +29,10 @@ if (__DEV__) {
 
 function attachRef(ref, component, owner) {
   if (__DEV__) {
-    if (component._compositeType === ReactCompositeComponentTypes.StatelessFunctional) {
+    if (
+      component._compositeType ===
+      ReactCompositeComponentTypes.StatelessFunctional
+    ) {
       let info = '';
       let ownerName;
       if (owner) {
@@ -44,16 +47,18 @@ function attachRef(ref, component, owner) {
       let warningKey = ownerName || component._debugID;
       let element = component._currentElement;
       if (element && element._source) {
-        warningKey = element._source.fileName + ':' + element._source.lineNumber;
+        warningKey = element._source.fileName +
+          ':' +
+          element._source.lineNumber;
       }
       if (!warnedAboutStatelessRefs[warningKey]) {
         warnedAboutStatelessRefs[warningKey] = true;
         warning(
           false,
           'Stateless function components cannot be given refs. ' +
-          'Attempts to access this ref will fail.%s%s',
+            'Attempts to access this ref will fail.%s%s',
           info,
-          ReactComponentTreeHook.getStackAddendumByID(component._debugID)
+          ReactComponentTreeHook.getStackAddendumByID(component._debugID),
         );
       }
     }
@@ -63,11 +68,7 @@ function attachRef(ref, component, owner) {
     ref(component.getPublicInstance());
   } else {
     // Legacy ref
-    ReactOwner.addComponentAsRefTo(
-      component,
-      ref,
-      owner,
-    );
+    ReactOwner.addComponentAsRefTo(component, ref, owner);
   }
 }
 
@@ -123,11 +124,9 @@ ReactRef.shouldUpdateRefs = function(
     nextOwner = nextElement._owner;
   }
 
-  return (
-    prevRef !== nextRef ||
+  return prevRef !== nextRef ||
     // If owner changes but we have an unchanged function ref, don't update refs
-    (typeof nextRef === 'string' && nextOwner !== prevOwner)
-  );
+    (typeof nextRef === 'string' && nextOwner !== prevOwner);
 };
 
 ReactRef.detachRefs = function(
diff --git a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactSimpleEmptyComponent.js b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactSimpleEmptyComponent.js
index dc3c82077f4fff..f7159ef736c0ba 100644
--- a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactSimpleEmptyComponent.js
+++ b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactSimpleEmptyComponent.js
@@ -13,7 +13,6 @@
 
 var ReactReconciler = require('ReactReconciler');
 
-
 var ReactSimpleEmptyComponent = function(placeholderElement, instantiate) {
   this._currentElement = null;
   this._renderedComponent = instantiate(placeholderElement);
@@ -24,7 +23,7 @@ Object.assign(ReactSimpleEmptyComponent.prototype, {
     hostParent,
     hostContainerInfo,
     context,
-    parentDebugID // 0 in production and for roots
+    parentDebugID, // 0 in production and for roots
   ) {
     return ReactReconciler.mountComponent(
       this._renderedComponent,
@@ -32,11 +31,10 @@ Object.assign(ReactSimpleEmptyComponent.prototype, {
       hostParent,
       hostContainerInfo,
       context,
-      parentDebugID
+      parentDebugID,
     );
   },
-  receiveComponent: function() {
-  },
+  receiveComponent: function() {},
   getHostNode: function() {
     return ReactReconciler.getHostNode(this._renderedComponent);
   },
@@ -44,7 +42,7 @@ Object.assign(ReactSimpleEmptyComponent.prototype, {
     ReactReconciler.unmountComponent(
       this._renderedComponent,
       safely,
-      skipLifecycle
+      skipLifecycle,
     );
     this._renderedComponent = null;
   },
diff --git a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactUpdateQueue.js b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactUpdateQueue.js
index 0058f06df53b1c..20cbb87fbbe404 100644
--- a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactUpdateQueue.js
+++ b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactUpdateQueue.js
@@ -18,13 +18,13 @@ var ReactUpdates = require('ReactUpdates');
 
 if (__DEV__) {
   var warning = require('fbjs/lib/warning');
-  var warnOnInvalidCallback = function(callback : mixed, callerName : string) {
+  var warnOnInvalidCallback = function(callback: mixed, callerName: string) {
     warning(
       callback === null || typeof callback === 'function',
       '%s(...): Expected the last optional `callback` argument to be a ' +
-      'function. Instead received: %s.',
+        'function. Instead received: %s.',
       callerName,
-      String(callback)
+      '' + callback,
     );
   };
 }
@@ -41,10 +41,10 @@ function getInternalInstanceReadyForUpdate(publicInstance, callerName) {
       warning(
         false,
         'Can only update a mounted or mounting component. This usually means ' +
-        'you called setState, replaceState, or forceUpdate on an unmounted ' +
-        'component. This is a no-op.\n\nPlease check the code for the ' +
-        '%s component.',
-        ctor && (ctor.displayName || ctor.name) || 'ReactClass'
+          'you called setState, replaceState, or forceUpdate on an unmounted ' +
+          'component. This is a no-op.\n\nPlease check the code for the ' +
+          '%s component.',
+        (ctor && (ctor.displayName || ctor.name)) || 'ReactClass',
       );
     }
     return null;
@@ -54,9 +54,9 @@ function getInternalInstanceReadyForUpdate(publicInstance, callerName) {
     warning(
       ReactCurrentOwner.current == null,
       'Cannot update during an existing state transition (such as within ' +
-      '`render` or another component\'s constructor). Render methods should ' +
-      'be a pure function of props and state; constructor side-effects are ' +
-      'an anti-pattern, but can be moved to `componentWillMount`.',
+        "`render` or another component's constructor). Render methods should " +
+        'be a pure function of props and state; constructor side-effects are ' +
+        'an anti-pattern, but can be moved to `componentWillMount`.',
     );
   }
 
@@ -68,7 +68,6 @@ function getInternalInstanceReadyForUpdate(publicInstance, callerName) {
  * reconciliation step.
  */
 var ReactUpdateQueue = {
-
   /**
    * Checks whether or not this composite component is mounted.
    * @param {ReactClass} publicInstance The instance we want to test.
@@ -83,11 +82,11 @@ var ReactUpdateQueue = {
         warning(
           owner._warnedAboutRefsInRender,
           '%s is accessing isMounted inside its render() function. ' +
-          'render() should be a pure function of props and state. It should ' +
-          'never access something that requires stale data from the previous ' +
-          'render, such as refs. Move this logic to componentDidMount and ' +
-          'componentDidUpdate instead.',
-          owner.getName() || 'A component'
+            'render() should be a pure function of props and state. It should ' +
+            'never access something that requires stale data from the previous ' +
+            'render, such as refs. Move this logic to componentDidMount and ' +
+            'componentDidUpdate instead.',
+          owner.getName() || 'A component',
         );
         owner._warnedAboutRefsInRender = true;
       }
@@ -134,8 +133,8 @@ var ReactUpdateQueue = {
       return;
     }
 
-    if (callback) {
-      callback = callback === undefined ? null : callback;
+    callback = callback === undefined ? null : callback;
+    if (callback !== null) {
       if (__DEV__) {
         warnOnInvalidCallback(callback, callerName);
       }
@@ -164,7 +163,12 @@ var ReactUpdateQueue = {
    * @param {?string} Name of the calling function in the public API.
    * @internal
    */
-  enqueueReplaceState: function(publicInstance, completeState, callback, callerName) {
+  enqueueReplaceState: function(
+    publicInstance,
+    completeState,
+    callback,
+    callerName,
+  ) {
     var internalInstance = getInternalInstanceReadyForUpdate(publicInstance);
 
     if (!internalInstance) {
@@ -174,8 +178,8 @@ var ReactUpdateQueue = {
     internalInstance._pendingStateQueue = [completeState];
     internalInstance._pendingReplaceState = true;
 
-    if (callback) {
-      callback = callback === undefined ? null : callback;
+    callback = callback === undefined ? null : callback;
+    if (callback !== null) {
       if (__DEV__) {
         warnOnInvalidCallback(callback, callerName);
       }
@@ -201,13 +205,18 @@ var ReactUpdateQueue = {
    * @param {?string} Name of the calling function in the public API.
    * @internal
    */
-  enqueueSetState: function(publicInstance, partialState, callback, callerName) {
+  enqueueSetState: function(
+    publicInstance,
+    partialState,
+    callback,
+    callerName,
+  ) {
     if (__DEV__) {
       ReactInstrumentation.debugTool.onSetState();
       warning(
         partialState != null,
         'setState(...): You passed an undefined or null state object; ' +
-        'instead, use forceUpdate().'
+          'instead, use forceUpdate().',
       );
     }
 
@@ -217,13 +226,12 @@ var ReactUpdateQueue = {
       return;
     }
 
-    var queue =
-      internalInstance._pendingStateQueue ||
+    var queue = internalInstance._pendingStateQueue ||
       (internalInstance._pendingStateQueue = []);
     queue.push(partialState);
 
-    if (callback) {
-      callback = callback === undefined ? null : callback;
+    callback = callback === undefined ? null : callback;
+    if (callback !== null) {
       if (__DEV__) {
         warnOnInvalidCallback(callback, callerName);
       }
@@ -243,7 +251,6 @@ var ReactUpdateQueue = {
     internalInstance._context = nextContext;
     enqueueUpdate(internalInstance);
   },
-
 };
 
 module.exports = ReactUpdateQueue;
diff --git a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactUpdates.js b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactUpdates.js
index acf78af5f42754..239b0637e1b91e 100644
--- a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactUpdates.js
+++ b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactUpdates.js
@@ -27,7 +27,7 @@ function ensureInjected() {
   invariant(
     ReactUpdates.ReactReconcileTransaction && batchingStrategy,
     'ReactUpdates: must inject a reconcile transaction class and batching ' +
-    'strategy'
+      'strategy',
   );
 }
 
@@ -56,38 +56,34 @@ function ReactUpdatesFlushTransaction() {
   this.reinitializeTransaction();
   this.dirtyComponentsLength = null;
   this.reconcileTransaction = ReactUpdates.ReactReconcileTransaction.getPooled(
-    /* useCreateElement */ true
+    /* useCreateElement */ true,
   );
 }
 
-Object.assign(
-  ReactUpdatesFlushTransaction.prototype,
-  Transaction,
-  {
-    getTransactionWrappers: function() {
-      return TRANSACTION_WRAPPERS;
-    },
-
-    destructor: function() {
-      this.dirtyComponentsLength = null;
-      ReactUpdates.ReactReconcileTransaction.release(this.reconcileTransaction);
-      this.reconcileTransaction = null;
-    },
-
-    perform: function(method, scope, a) {
-      // Essentially calls `this.reconcileTransaction.perform(method, scope, a)`
-      // with this transaction's wrappers around it.
-      return Transaction.perform.call(
-        this,
-        this.reconcileTransaction.perform,
-        this.reconcileTransaction,
-        method,
-        scope,
-        a
-      );
-    },
-  }
-);
+Object.assign(ReactUpdatesFlushTransaction.prototype, Transaction, {
+  getTransactionWrappers: function() {
+    return TRANSACTION_WRAPPERS;
+  },
+
+  destructor: function() {
+    this.dirtyComponentsLength = null;
+    ReactUpdates.ReactReconcileTransaction.release(this.reconcileTransaction);
+    this.reconcileTransaction = null;
+  },
+
+  perform: function(method, scope, a) {
+    // Essentially calls `this.reconcileTransaction.perform(method, scope, a)`
+    // with this transaction's wrappers around it.
+    return Transaction.perform.call(
+      this,
+      this.reconcileTransaction.perform,
+      this.reconcileTransaction,
+      method,
+      scope,
+      a,
+    );
+  },
+});
 
 PooledClass.addPoolingTo(ReactUpdatesFlushTransaction);
 
@@ -111,10 +107,10 @@ function runBatchedUpdates(transaction) {
   var len = transaction.dirtyComponentsLength;
   invariant(
     len === dirtyComponents.length,
-    'Expected flush transaction\'s stored dirty-components length (%s) to ' +
-    'match dirty-components array length (%s).',
+    "Expected flush transaction's stored dirty-components length (%s) to " +
+      'match dirty-components array length (%s).',
     len,
-    dirtyComponents.length
+    dirtyComponents.length,
   );
 
   // Since reconciling a component higher in the owner hierarchy usually (not
@@ -149,7 +145,7 @@ function runBatchedUpdates(transaction) {
     ReactReconciler.performUpdateIfNecessary(
       component,
       transaction.reconcileTransaction,
-      updateBatchNumber
+      updateBatchNumber,
     );
 
     if (markerName) {
@@ -198,7 +194,7 @@ var ReactUpdatesInjection = {
   injectReconcileTransaction: function(ReconcileTransaction) {
     invariant(
       ReconcileTransaction,
-      'ReactUpdates: must provide a reconcile transaction class'
+      'ReactUpdates: must provide a reconcile transaction class',
     );
     ReactUpdates.ReactReconcileTransaction = ReconcileTransaction;
   },
@@ -206,15 +202,15 @@ var ReactUpdatesInjection = {
   injectBatchingStrategy: function(_batchingStrategy) {
     invariant(
       _batchingStrategy,
-      'ReactUpdates: must provide a batching strategy'
+      'ReactUpdates: must provide a batching strategy',
     );
     invariant(
       typeof _batchingStrategy.batchedUpdates === 'function',
-      'ReactUpdates: must provide a batchedUpdates() function'
+      'ReactUpdates: must provide a batchedUpdates() function',
     );
     invariant(
       typeof _batchingStrategy.isBatchingUpdates === 'boolean',
-      'ReactUpdates: must provide an isBatchingUpdates boolean attribute'
+      'ReactUpdates: must provide an isBatchingUpdates boolean attribute',
     );
     batchingStrategy = _batchingStrategy;
   },
diff --git a/Libraries/Renderer/src/renderers/shared/stack/reconciler/Transaction.js b/Libraries/Renderer/src/renderers/shared/stack/reconciler/Transaction.js
index 36d9634b3ce789..e08f2bbd4e1016 100644
--- a/Libraries/Renderer/src/renderers/shared/stack/reconciler/Transaction.js
+++ b/Libraries/Renderer/src/renderers/shared/stack/reconciler/Transaction.js
@@ -124,17 +124,18 @@ var TransactionImpl = {
    *
    * @return {*} Return value from `method`.
    */
-  perform: function<
-    A, B, C, D, E, F, G,
-    T: (a: A, b: B, c: C, d: D, e: E, f: F) => G // eslint-disable-line space-before-function-paren
-  >(
-    method: T, scope: any,
-    a: A, b: B, c: C, d: D, e: E, f: F,
-  ): G {
+  perform: function<A, B, C, D, E, F, G, T: (
+    a: A,
+    b: B,
+    c: C,
+    d: D,
+    e: E,
+    f: F,
+  ) => G>(method: T, scope: any, a: A, b: B, c: C, d: D, e: E, f: F): G {
     invariant(
       !this.isInTransaction(),
       'Transaction.perform(...): Cannot initialize a transaction when there ' +
-      'is already an outstanding transaction.'
+        'is already an outstanding transaction.',
     );
     var errorThrown;
     var ret;
@@ -155,8 +156,7 @@ var TransactionImpl = {
           // by invoking `closeAll`.
           try {
             this.closeAll(0);
-          } catch (err) {
-          }
+          } catch (err) {}
         } else {
           // Since `method` didn't throw, we don't want to silence the exception
           // here.
@@ -179,9 +179,9 @@ var TransactionImpl = {
         // of initialize -- if it's still set to OBSERVED_ERROR in the finally
         // block, it means wrapper.initialize threw.
         this.wrapperInitData[i] = OBSERVED_ERROR;
-        this.wrapperInitData[i] = wrapper.initialize ?
-          wrapper.initialize.call(this) :
-          null;
+        this.wrapperInitData[i] = wrapper.initialize
+          ? wrapper.initialize.call(this)
+          : null;
       } finally {
         if (this.wrapperInitData[i] === OBSERVED_ERROR) {
           // The initializer for wrapper i threw an error; initialize the
@@ -189,8 +189,7 @@ var TransactionImpl = {
           // that the first error is the one to bubble up.
           try {
             this.initializeAll(i + 1);
-          } catch (err) {
-          }
+          } catch (err) {}
         }
       }
     }
@@ -205,7 +204,7 @@ var TransactionImpl = {
   closeAll: function(startIndex: number): void {
     invariant(
       this.isInTransaction(),
-      'Transaction.closeAll(): Cannot close transaction when none are open.'
+      'Transaction.closeAll(): Cannot close transaction when none are open.',
     );
     var transactionWrappers = this.transactionWrappers;
     for (var i = startIndex; i < transactionWrappers.length; i++) {
@@ -229,8 +228,7 @@ var TransactionImpl = {
           // first error is the one to bubble up.
           try {
             this.closeAll(i + 1);
-          } catch (e) {
-          }
+          } catch (e) {}
         }
       }
     }
diff --git a/Libraries/Renderer/src/renderers/shared/stack/reconciler/__tests__/Transaction-test.js b/Libraries/Renderer/src/renderers/shared/stack/reconciler/__tests__/Transaction-test.js
index 504ea7aafd00ca..00d0c2d29b17c6 100644
--- a/Libraries/Renderer/src/renderers/shared/stack/reconciler/__tests__/Transaction-test.js
+++ b/Libraries/Renderer/src/renderers/shared/stack/reconciler/__tests__/Transaction-test.js
@@ -11,10 +11,9 @@
 
 'use strict';
 
-
 var Transaction;
 
-var INIT_ERRORED = 'initErrored';     // Just a dummy value to check for.
+var INIT_ERRORED = 'initErrored'; // Just a dummy value to check for.
 describe('Transaction', () => {
   beforeEach(() => {
     jest.resetModules();
@@ -41,9 +40,9 @@ describe('Transaction', () => {
      */
     var TestTransaction = function() {
       this.reinitializeTransaction();
-      this.firstCloseParam = INIT_ERRORED;   // WON'T be set to something else
-      this.secondCloseParam = INIT_ERRORED;  // WILL be set to something else
-      this.lastCloseParam = INIT_ERRORED;    // WON'T be set to something else
+      this.firstCloseParam = INIT_ERRORED; // WON'T be set to something else
+      this.secondCloseParam = INIT_ERRORED; // WILL be set to something else
+      this.lastCloseParam = INIT_ERRORED; // WON'T be set to something else
     };
     Object.assign(TestTransaction.prototype, Transaction);
     TestTransaction.prototype.getTransactionWrappers = function() {
@@ -85,16 +84,15 @@ describe('Transaction', () => {
   });
 
   it('should invoke closers and wrapped method when inits success', () => {
-
     var performSideEffect;
     /**
      * New test Transaction subclass.
      */
     var TestTransaction = function() {
       this.reinitializeTransaction();
-      this.firstCloseParam = INIT_ERRORED;   // WILL be set to something else
-      this.secondCloseParam = INIT_ERRORED;  // WILL be set to something else
-      this.lastCloseParam = INIT_ERRORED;    // WILL be set to something else
+      this.firstCloseParam = INIT_ERRORED; // WILL be set to something else
+      this.secondCloseParam = INIT_ERRORED; // WILL be set to something else
+      this.lastCloseParam = INIT_ERRORED; // WILL be set to something else
     };
     Object.assign(TestTransaction.prototype, Transaction);
     TestTransaction.prototype.getTransactionWrappers = function() {
@@ -146,16 +144,15 @@ describe('Transaction', () => {
    * encountered earlier in the operation.
    */
   it('should throw when wrapped operation throws', () => {
-
     var performSideEffect;
     /**
      * New test Transaction subclass.
      */
     var TestTransaction = function() {
       this.reinitializeTransaction();
-      this.firstCloseParam = INIT_ERRORED;   // WILL be set to something else
-      this.secondCloseParam = INIT_ERRORED;  // WILL be set to something else
-      this.lastCloseParam = INIT_ERRORED;    // WILL be set to something else
+      this.firstCloseParam = INIT_ERRORED; // WILL be set to something else
+      this.secondCloseParam = INIT_ERRORED; // WILL be set to something else
+      this.lastCloseParam = INIT_ERRORED; // WILL be set to something else
     };
     Object.assign(TestTransaction.prototype, Transaction);
     // Now, none of the close/inits throw, but the operation we wrap will throw.
@@ -198,17 +195,19 @@ describe('Transaction', () => {
 
     var transaction = new TestTransaction();
 
-    expect(function() {
-      var isTypeError = false;
-      try {
-        transaction.perform(function() {
-          throw new TypeError('Thrown in main wrapped operation');
-        });
-      } catch (err) {
-        isTypeError = (err instanceof TypeError);
-      }
-      return isTypeError;
-    }()).toBe(true);
+    expect(
+      (function() {
+        var isTypeError = false;
+        try {
+          transaction.perform(function() {
+            throw new TypeError('Thrown in main wrapped operation');
+          });
+        } catch (err) {
+          isTypeError = err instanceof TypeError;
+        }
+        return isTypeError;
+      })(),
+    ).toBe(true);
 
     expect(performSideEffect).toBe(undefined);
     expect(transaction.firstCloseParam).toBe('firstResult');
diff --git a/Libraries/Renderer/src/renderers/shared/stack/reconciler/instantiateReactComponent.js b/Libraries/Renderer/src/renderers/shared/stack/reconciler/instantiateReactComponent.js
index 4fab1a3b200f33..76b4343d675516 100644
--- a/Libraries/Renderer/src/renderers/shared/stack/reconciler/instantiateReactComponent.js
+++ b/Libraries/Renderer/src/renderers/shared/stack/reconciler/instantiateReactComponent.js
@@ -42,12 +42,10 @@ function getDeclarationErrorAddendum(owner) {
  * @return {boolean} Returns true if this is a valid internal type.
  */
 function isInternalComponentType(type) {
-  return (
-    typeof type === 'function' &&
+  return typeof type === 'function' &&
     typeof type.prototype !== 'undefined' &&
     typeof type.prototype.mountComponent === 'function' &&
-    typeof type.prototype.receiveComponent === 'function'
-  );
+    typeof type.prototype.receiveComponent === 'function';
 }
 
 /**
@@ -66,28 +64,24 @@ function instantiateReactComponent(node, shouldHaveDebugID) {
   } else if (typeof node === 'object') {
     var element = node;
     var type = element.type;
-    if (
-      typeof type !== 'function' &&
-      typeof type !== 'string'
-    ) {
+    if (typeof type !== 'function' && typeof type !== 'string') {
       var info = '';
       if (__DEV__) {
         if (
           type === undefined ||
-          typeof type === 'object' &&
-          type !== null &&
-          Object.keys(type).length === 0
+          (typeof type === 'object' &&
+            type !== null &&
+            Object.keys(type).length === 0)
         ) {
-          info +=
-            ' You likely forgot to export your component from the file ' +
-            'it\'s defined in.';
+          info += ' You likely forgot to export your component from the file ' +
+            "it's defined in.";
         }
       }
       info += getDeclarationErrorAddendum(element._owner);
       invariant(
         false,
         'Element type is invalid: expected a string (for built-in components) ' +
-        'or a class/function (for composite components) but got: %s.%s',
+          'or a class/function (for composite components) but got: %s.%s',
         type == null ? type : typeof type,
         info,
       );
@@ -112,20 +106,16 @@ function instantiateReactComponent(node, shouldHaveDebugID) {
   } else if (typeof node === 'string' || typeof node === 'number') {
     instance = ReactHostComponent.createInstanceForText(node);
   } else {
-    invariant(
-      false,
-      'Encountered invalid React node of type %s',
-      typeof node
-    );
+    invariant(false, 'Encountered invalid React node of type %s', typeof node);
   }
 
   if (__DEV__) {
     warning(
       typeof instance.mountComponent === 'function' &&
-      typeof instance.receiveComponent === 'function' &&
-      typeof instance.getHostNode === 'function' &&
-      typeof instance.unmountComponent === 'function',
-      'Only React Components can be mounted.'
+        typeof instance.receiveComponent === 'function' &&
+        typeof instance.getHostNode === 'function' &&
+        typeof instance.unmountComponent === 'function',
+      'Only React Components can be mounted.',
     );
   }
 
@@ -155,7 +145,7 @@ Object.assign(
   ReactCompositeComponent,
   {
     _instantiateReactComponent: instantiateReactComponent,
-  }
+  },
 );
 
 module.exports = instantiateReactComponent;
diff --git a/Libraries/Renderer/src/renderers/shared/utils/ReactErrorUtils.js b/Libraries/Renderer/src/renderers/shared/utils/ReactErrorUtils.js
index 6e48a49a4fa54e..b3910a0dd8953d 100644
--- a/Libraries/Renderer/src/renderers/shared/utils/ReactErrorUtils.js
+++ b/Libraries/Renderer/src/renderers/shared/utils/ReactErrorUtils.js
@@ -12,37 +12,63 @@
 
 'use strict';
 
-var caughtError = null;
+let caughtError = null;
 
 /**
  * Call a function while guarding against errors that happens within it.
+ * Returns an error if it throws, otherwise null.
  *
  * @param {String} name of the guard to use for logging or debugging
  * @param {Function} func The function to invoke
- * @param {*} a Argument
+ * @param {*} context The context to use when calling the function
+ * @param {...*} args Arguments for function
  */
-function invokeGuardedCallback<A>(
-  name: string,
-  func: (a: A) => void,
-  a: A,
-): void {
-  try {
-    func(a);
-  } catch (x) {
-    if (caughtError === null) {
-      caughtError = x;
+const ReactErrorUtils = {
+  invokeGuardedCallback: function<A, B, C, D, E, F, Context>(
+    name: string | null,
+    func: (a: A, b: B, c: C, d: D, e: E, f: F) => void,
+    context: Context,
+    a: A,
+    b: B,
+    c: C,
+    d: D,
+    e: E,
+    f: F,
+  ): Error | null {
+    const funcArgs = Array.prototype.slice.call(arguments, 3);
+    try {
+      func.apply(context, funcArgs);
+    } catch (error) {
+      return error;
     }
-  }
-}
-
-var ReactErrorUtils = {
-  invokeGuardedCallback: invokeGuardedCallback,
+    return null;
+  },
 
   /**
-   * Invoked by ReactTestUtils.Simulate so that any errors thrown by the event
-   * handler are sure to be rethrown by rethrowCaughtError.
+   * Same as invokeGuardedCallback, but instead of returning an error, it stores
+   * it in a global so it can be rethrown by `rethrowCaughtError` later.
+   *
+   * @param {String} name of the guard to use for logging or debugging
+   * @param {Function} func The function to invoke
+   * @param {*} context The context to use when calling the function
+   * @param {...*} args Arguments for function
    */
-  invokeGuardedCallbackWithCatch: invokeGuardedCallback,
+  invokeGuardedCallbackAndCatchFirstError: function<A, B, C, D, E, F, Context>(
+    name: string | null,
+    func: (a: A, b: B, c: C, d: D, e: E, f: F) => void,
+    context: Context,
+    a: A,
+    b: B,
+    c: C,
+    d: D,
+    e: E,
+    f: F,
+  ): void {
+    const error = ReactErrorUtils.invokeGuardedCallback.apply(this, arguments);
+    if (error !== null && caughtError === null) {
+      caughtError = error;
+    }
+  },
 
   /**
    * During execution of guarded functions we will capture the first error which
@@ -50,7 +76,7 @@ var ReactErrorUtils = {
    */
   rethrowCaughtError: function() {
     if (caughtError) {
-      var error = caughtError;
+      const error = caughtError;
       caughtError = null;
       throw error;
     }
@@ -62,25 +88,49 @@ if (__DEV__) {
    * To help development we can get better devtools integration by simulating a
    * real browser event.
    */
-  if (typeof window !== 'undefined' &&
-      typeof window.dispatchEvent === 'function' &&
-      typeof document !== 'undefined' &&
-      typeof document.createEvent === 'function') {
-    var fakeNode = document.createElement('react');
-    ReactErrorUtils.invokeGuardedCallback = function<A>(
-      name: string,
-      func: (a: A) => void,
-      a: A,
-    ): void {
-      var boundFunc = function() {
-        func(a);
+  if (
+    typeof window !== 'undefined' &&
+    typeof window.dispatchEvent === 'function' &&
+    typeof document !== 'undefined' &&
+    typeof document.createEvent === 'function'
+  ) {
+    const fakeNode = document.createElement('react');
+    let depth = 0;
+
+    ReactErrorUtils.invokeGuardedCallback = function(
+      name,
+      func,
+      context,
+      a,
+      b,
+      c,
+      d,
+      e,
+      f,
+    ) {
+      depth++;
+      const thisDepth = depth;
+      const funcArgs = Array.prototype.slice.call(arguments, 3);
+      const boundFunc = function() {
+        func.apply(context, funcArgs);
+      };
+      let fakeEventError = null;
+      const onFakeEventError = function(event) {
+        // Don't capture nested errors
+        if (depth === thisDepth) {
+          fakeEventError = event.error;
+        }
       };
-      var evtType = `react-${name}`;
+      const evtType = `react-${name ? name : 'invokeguardedcallback'}-${depth}`;
+      window.addEventListener('error', onFakeEventError);
       fakeNode.addEventListener(evtType, boundFunc, false);
-      var evt = document.createEvent('Event');
+      const evt = document.createEvent('Event');
       evt.initEvent(evtType, false, false);
       fakeNode.dispatchEvent(evt);
       fakeNode.removeEventListener(evtType, boundFunc, false);
+      window.removeEventListener('error', onFakeEventError);
+      depth--;
+      return fakeEventError;
     };
   }
 }
diff --git a/Libraries/Renderer/src/renderers/shared/utils/__tests__/ReactErrorUtils-test.js b/Libraries/Renderer/src/renderers/shared/utils/__tests__/ReactErrorUtils-test.js
index 51d1840506467e..ceb8c98be58064 100644
--- a/Libraries/Renderer/src/renderers/shared/utils/__tests__/ReactErrorUtils-test.js
+++ b/Libraries/Renderer/src/renderers/shared/utils/__tests__/ReactErrorUtils-test.js
@@ -14,62 +14,169 @@
 var ReactErrorUtils;
 
 describe('ReactErrorUtils', () => {
-
   beforeEach(() => {
     ReactErrorUtils = require('ReactErrorUtils');
   });
 
-  describe('invokeGuardedCallbackWithCatch', () => {
-    it('should call the callback with only the passed argument', () => {
-      var callback = jest.fn();
-      ReactErrorUtils.invokeGuardedCallbackWithCatch('foo', callback, 'arg');
-      expect(callback).toBeCalledWith('arg');
+  // Run tests in both DEV and production
+  describe(
+    'invokeGuardedCallback (development)',
+    invokeGuardedCallbackTests.bind(null, 'development'),
+  );
+  describe('invokeGuardedCallback (production)', () => {
+    let oldProcess;
+    beforeEach(() => {
+      __DEV__ = false;
+      oldProcess = process;
+      global.process = {
+        env: Object.assign({}, process.env, {NODE_ENV: 'production'}),
+      };
+      jest.resetModules();
+      ReactErrorUtils = require('ReactErrorUtils');
     });
 
-    it('should catch errors', () => {
-      var callback = function() {
-        throw new Error('foo');
-      };
-      expect(
-        () => ReactErrorUtils.invokeGuardedCallbackWithCatch('foo', callback)
-      ).not.toThrow();
+    afterEach(() => {
+      __DEV__ = true;
+      global.process = oldProcess;
     });
+
+    invokeGuardedCallbackTests('production');
   });
 
-  describe('rethrowCaughtError', () => {
-    it('should rethrow caught errors', () => {
+  function invokeGuardedCallbackTests(environment) {
+    it(`it should rethrow errors caught by invokeGuardedCallbackAndCatchFirstError (${environment})`, () => {
       var err = new Error('foo');
       var callback = function() {
         throw err;
       };
-      ReactErrorUtils.invokeGuardedCallbackWithCatch('foo', callback);
+      ReactErrorUtils.invokeGuardedCallbackAndCatchFirstError(
+        'foo',
+        callback,
+        null,
+      );
       expect(() => ReactErrorUtils.rethrowCaughtError()).toThrow(err);
     });
-  });
 
-  describe('invokeGuardedCallback', () => {
-    it('should call the callback with only the passed argument', () => {
+    it(`should call the callback the passed arguments (${environment})`, () => {
       var callback = jest.fn();
-      ReactErrorUtils.invokeGuardedCallback('foo', callback, 'arg');
-      expect(callback).toBeCalledWith('arg');
+      ReactErrorUtils.invokeGuardedCallback(
+        'foo',
+        callback,
+        null,
+        'arg1',
+        'arg2',
+      );
+      expect(callback).toBeCalledWith('arg1', 'arg2');
     });
 
-    it('should use invokeGuardedCallbackWithCatch in production', () => {
-      expect(ReactErrorUtils.invokeGuardedCallback).not.toEqual(
-        ReactErrorUtils.invokeGuardedCallbackWithCatch
+    it(`should call the callback with the provided context (${environment})`, () => {
+      var context = {didCall: false};
+      ReactErrorUtils.invokeGuardedCallback(
+        'foo',
+        function() {
+          this.didCall = true;
+        },
+        context,
       );
-      __DEV__ = false;
-      var oldProcess = process;
-      global.process = {
-        env: Object.assign({}, process.env, {NODE_ENV: 'production'}),
+      expect(context.didCall).toBe(true);
+    });
+
+    it(`should return a caught error (${environment})`, () => {
+      const error = new Error();
+      const returnValue = ReactErrorUtils.invokeGuardedCallback(
+        'foo',
+        function() {
+          throw error;
+        },
+        null,
+        'arg1',
+        'arg2',
+      );
+      expect(returnValue).toBe(error);
+    });
+
+    it(`should return null if no error is thrown (${environment})`, () => {
+      var callback = jest.fn();
+      const returnValue = ReactErrorUtils.invokeGuardedCallback(
+        'foo',
+        callback,
+        null,
+      );
+      expect(returnValue).toBe(null);
+    });
+
+    it(`can nest with same debug name (${environment})`, () => {
+      const err1 = new Error();
+      let err2;
+      const err3 = new Error();
+      const err4 = ReactErrorUtils.invokeGuardedCallback(
+        'foo',
+        function() {
+          err2 = ReactErrorUtils.invokeGuardedCallback(
+            'foo',
+            function() {
+              throw err1;
+            },
+            null,
+          );
+          throw err3;
+        },
+        null,
+      );
+
+      expect(err2).toBe(err1);
+      expect(err4).toBe(err3);
+    });
+
+    it(`does not return nested errors (${environment})`, () => {
+      const err1 = new Error();
+      let err2;
+      const err3 = ReactErrorUtils.invokeGuardedCallback(
+        'foo',
+        function() {
+          err2 = ReactErrorUtils.invokeGuardedCallback(
+            'foo',
+            function() {
+              throw err1;
+            },
+            null,
+          );
+        },
+        null,
+      );
+
+      expect(err3).toBe(null); // Returns null because inner error was already captured
+      expect(err2).toBe(err1);
+    });
+
+    it(`can be shimmed (${environment})`, () => {
+      const ops = [];
+      // Override the original invokeGuardedCallback
+      ReactErrorUtils.invokeGuardedCallback = function(name, func, context, a) {
+        ops.push(a);
+        try {
+          func.call(context, a);
+        } catch (error) {
+          return error;
+        }
+        return null;
       };
-      jest.resetModules();
-      ReactErrorUtils = require('ReactErrorUtils');
-      expect(ReactErrorUtils.invokeGuardedCallback).toEqual(
-        ReactErrorUtils.invokeGuardedCallbackWithCatch
+
+      var err = new Error('foo');
+      var callback = function() {
+        throw err;
+      };
+      ReactErrorUtils.invokeGuardedCallbackAndCatchFirstError(
+        'foo',
+        callback,
+        null,
+        'somearg',
       );
-      __DEV__ = true;
-      global.process = oldProcess;
+      expect(() => ReactErrorUtils.rethrowCaughtError()).toThrow(err);
+      // invokeGuardedCallbackAndCatchFirstError and rethrowCaughtError close
+      // over ReactErrorUtils.invokeGuardedCallback so should use the
+      // shimmed version.
+      expect(ops).toEqual(['somearg']);
     });
-  });
+  }
 });
diff --git a/Libraries/Renderer/src/renderers/shared/utils/__tests__/accumulateInto-test.js b/Libraries/Renderer/src/renderers/shared/utils/__tests__/accumulateInto-test.js
index d400eb9a02002e..ab6ebbee59b11e 100644
--- a/Libraries/Renderer/src/renderers/shared/utils/__tests__/accumulateInto-test.js
+++ b/Libraries/Renderer/src/renderers/shared/utils/__tests__/accumulateInto-test.js
@@ -14,7 +14,6 @@
 var accumulateInto;
 
 describe('accumulateInto', () => {
-
   beforeEach(() => {
     accumulateInto = require('accumulateInto');
   });
@@ -23,7 +22,7 @@ describe('accumulateInto', () => {
     expect(function() {
       accumulateInto([], null);
     }).toThrowError(
-      'accumulateInto(...): Accumulated items must not be null or undefined.'
+      'accumulateInto(...): Accumulated items must not be null or undefined.',
     );
   });
 
diff --git a/Libraries/Renderer/src/renderers/shared/utils/__tests__/adler32-test.js b/Libraries/Renderer/src/renderers/shared/utils/__tests__/adler32-test.js
index 16be434f65f834..ab6c7a0287cd20 100644
--- a/Libraries/Renderer/src/renderers/shared/utils/__tests__/adler32-test.js
+++ b/Libraries/Renderer/src/renderers/shared/utils/__tests__/adler32-test.js
@@ -26,7 +26,7 @@ describe('adler32', () => {
     expect(adler32('a')).not.toBe(adler32('A'));
   });
 
-  it('doesn\'t barf on large inputs', () => {
+  it("doesn't barf on large inputs", () => {
     var str = '';
     for (var i = 0; i < 100000; i++) {
       str += 'This will be repeated to be very large indeed. ';
@@ -34,7 +34,7 @@ describe('adler32', () => {
     expect(adler32(str)).toBe(692898118);
   });
 
-  it('doesn\'t barf on international inputs', () => {
+  it("doesn't barf on international inputs", () => {
     var str = 'Linux 是一個真棒操作系統!';
     expect(adler32(str)).toBe(-1183804097);
   });
diff --git a/Libraries/Renderer/src/renderers/shared/utils/accumulate.js b/Libraries/Renderer/src/renderers/shared/utils/accumulate.js
index 029b2bad305202..ccb205298e8be7 100644
--- a/Libraries/Renderer/src/renderers/shared/utils/accumulate.js
+++ b/Libraries/Renderer/src/renderers/shared/utils/accumulate.js
@@ -21,10 +21,13 @@ var invariant = require('fbjs/lib/invariant');
  *
  * @return {*|array<*>} An accumulation of items.
  */
-function accumulate<T>(current: ?(T | Array<T>), next: T | Array<T>): T | Array<T> {
+function accumulate<T>(
+  current: ?(T | Array<T>),
+  next: T | Array<T>,
+): T | Array<T> {
   invariant(
     next != null,
-    'accumulate(...): Accumulated items must be not be null or undefined.'
+    'accumulate(...): Accumulated items must be not be null or undefined.',
   );
 
   if (current == null) {
diff --git a/Libraries/Renderer/src/renderers/shared/utils/accumulateInto.js b/Libraries/Renderer/src/renderers/shared/utils/accumulateInto.js
index 851cf79f14cc2c..ae7e498278cc6f 100644
--- a/Libraries/Renderer/src/renderers/shared/utils/accumulateInto.js
+++ b/Libraries/Renderer/src/renderers/shared/utils/accumulateInto.js
@@ -27,10 +27,13 @@ var invariant = require('fbjs/lib/invariant');
  * @return {*|array<*>} An accumulation of items.
  */
 
-function accumulateInto<T>(current: ?(T | Array<T>), next: T | Array<T>): T | Array<T> {
+function accumulateInto<T>(
+  current: ?(T | Array<T>),
+  next: T | Array<T>,
+): T | Array<T> {
   invariant(
     next != null,
-    'accumulateInto(...): Accumulated items must not be null or undefined.'
+    'accumulateInto(...): Accumulated items must not be null or undefined.',
   );
 
   if (current == null) {
diff --git a/Libraries/Renderer/src/renderers/shared/utils/adler32.js b/Libraries/Renderer/src/renderers/shared/utils/adler32.js
index 45d7c005b6c6bd..4899d3b7db3c6b 100644
--- a/Libraries/Renderer/src/renderers/shared/utils/adler32.js
+++ b/Libraries/Renderer/src/renderers/shared/utils/adler32.js
@@ -28,12 +28,10 @@ function adler32(data: string): number {
   while (i < m) {
     var n = Math.min(i + 4096, m);
     for (; i < n; i += 4) {
-      b += (
-        (a += data.charCodeAt(i)) +
+      b += (a += data.charCodeAt(i)) +
         (a += data.charCodeAt(i + 1)) +
         (a += data.charCodeAt(i + 2)) +
-        (a += data.charCodeAt(i + 3))
-      );
+        (a += data.charCodeAt(i + 3));
     }
     a %= MOD;
     b %= MOD;
@@ -43,7 +41,7 @@ function adler32(data: string): number {
   }
   a %= MOD;
   b %= MOD;
-  return a | (b << 16);
+  return a | b << 16;
 }
 
 module.exports = adler32;
diff --git a/Libraries/Renderer/src/renderers/shared/utils/forEachAccumulated.js b/Libraries/Renderer/src/renderers/shared/utils/forEachAccumulated.js
index 1327b046dfdbee..f7dc69f7ae74cc 100644
--- a/Libraries/Renderer/src/renderers/shared/utils/forEachAccumulated.js
+++ b/Libraries/Renderer/src/renderers/shared/utils/forEachAccumulated.js
@@ -23,7 +23,7 @@
  */
 function forEachAccumulated<T>(
   arr: ?(T | Array<T>),
-  cb: ((elem: T) => void),
+  cb: (elem: T) => void,
   scope: ?any,
 ) {
   if (Array.isArray(arr)) {
diff --git a/Libraries/Renderer/src/renderers/shared/utils/isTextInputElement.js b/Libraries/Renderer/src/renderers/shared/utils/isTextInputElement.js
index e464daae31babe..633c19ce33afac 100644
--- a/Libraries/Renderer/src/renderers/shared/utils/isTextInputElement.js
+++ b/Libraries/Renderer/src/renderers/shared/utils/isTextInputElement.js
@@ -16,21 +16,21 @@
  * @see http://www.whatwg.org/specs/web-apps/current-work/multipage/the-input-element.html#input-type-attr-summary
  */
 var supportedInputTypes: {[key: string]: true | void} = {
-  'color': true,
-  'date': true,
-  'datetime': true,
+  color: true,
+  date: true,
+  datetime: true,
   'datetime-local': true,
-  'email': true,
-  'month': true,
-  'number': true,
-  'password': true,
-  'range': true,
-  'search': true,
-  'tel': true,
-  'text': true,
-  'time': true,
-  'url': true,
-  'week': true,
+  email: true,
+  month: true,
+  number: true,
+  password: true,
+  range: true,
+  search: true,
+  tel: true,
+  text: true,
+  time: true,
+  url: true,
+  week: true,
 };
 
 function isTextInputElement(elem: ?HTMLElement): boolean {
diff --git a/Libraries/Renderer/src/renderers/shared/utils/validateCallback.js b/Libraries/Renderer/src/renderers/shared/utils/validateCallback.js
index ab8fda9de36782..cf24bc8fd1a401 100644
--- a/Libraries/Renderer/src/renderers/shared/utils/validateCallback.js
+++ b/Libraries/Renderer/src/renderers/shared/utils/validateCallback.js
@@ -18,8 +18,8 @@ function validateCallback(callback: ?Function) {
   invariant(
     !callback || typeof callback === 'function',
     'Invalid argument passed as callback. Expected a function. Instead ' +
-    'received: %s',
-    String(callback)
+      'received: %s',
+    callback,
   );
 }
 
diff --git a/Libraries/Renderer/src/shared/ReactFiberComponentTreeHook.js b/Libraries/Renderer/src/shared/ReactFiberComponentTreeHook.js
new file mode 100644
index 00000000000000..30a4e83656b88b
--- /dev/null
+++ b/Libraries/Renderer/src/shared/ReactFiberComponentTreeHook.js
@@ -0,0 +1,74 @@
+/**
+ * Copyright 2016-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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.
+ *
+ * @flow
+ * @providesModule ReactFiberComponentTreeHook
+ */
+
+'use strict';
+
+var ReactTypeOfWork = require('ReactTypeOfWork');
+var {
+  IndeterminateComponent,
+  FunctionalComponent,
+  ClassComponent,
+  HostComponent,
+} = ReactTypeOfWork;
+var getComponentName = require('getComponentName');
+
+import type {Fiber} from 'ReactFiber';
+
+function describeComponentFrame(name, source: any, ownerName) {
+  return '\n    in ' +
+    (name || 'Unknown') +
+    (source
+      ? ' (at ' +
+          source.fileName.replace(/^.*[\\\/]/, '') +
+          ':' +
+          source.lineNumber +
+          ')'
+      : ownerName ? ' (created by ' + ownerName + ')' : '');
+}
+
+function describeFiber(fiber: Fiber): string {
+  switch (fiber.tag) {
+    case IndeterminateComponent:
+    case FunctionalComponent:
+    case ClassComponent:
+    case HostComponent:
+      var owner = fiber._debugOwner;
+      var source = fiber._debugSource;
+      var name = getComponentName(fiber);
+      var ownerName = null;
+      if (owner) {
+        ownerName = getComponentName(owner);
+      }
+      return describeComponentFrame(name, source, ownerName);
+    default:
+      return '';
+  }
+}
+
+// This function can only be called with a work-in-progress fiber and
+// only during begin or complete phase. Do not call it under any other
+// circumstances.
+function getStackAddendumByWorkInProgressFiber(workInProgress: Fiber): string {
+  var info = '';
+  var node = workInProgress;
+  do {
+    info += describeFiber(node);
+    // Otherwise this return pointer might point to the wrong tree:
+    node = node.return;
+  } while (node);
+  return info;
+}
+
+module.exports = {
+  getStackAddendumByWorkInProgressFiber,
+  describeComponentFrame,
+};
diff --git a/Libraries/Renderer/src/shared/types/checkReactTypeSpec.js b/Libraries/Renderer/src/shared/types/checkReactTypeSpec.js
index b115ee3f70a073..131e23e1a5f8b5 100644
--- a/Libraries/Renderer/src/shared/types/checkReactTypeSpec.js
+++ b/Libraries/Renderer/src/shared/types/checkReactTypeSpec.js
@@ -12,21 +12,15 @@
 'use strict';
 
 var checkPropTypes = require('react/lib/checkPropTypes');
-var { getStackAddendum } = require('react/lib/ReactDebugCurrentFrame');
+var {getStackAddendum} = require('react/lib/ReactDebugCurrentFrame');
 
 function checkReactTypeSpec(
   typeSpecs,
   values,
   location: string,
-  componentName
+  componentName,
 ) {
-  checkPropTypes(
-    typeSpecs,
-    values,
-    location,
-    componentName,
-    getStackAddendum
-  );
+  checkPropTypes(typeSpecs, values, location, componentName, getStackAddendum);
 }
 
 module.exports = checkReactTypeSpec;
diff --git a/Libraries/Renderer/src/shared/utils/KeyEscapeUtils.js b/Libraries/Renderer/src/shared/utils/KeyEscapeUtils.js
index 223b2c6b67b9c8..b7ed7a00b296e9 100644
--- a/Libraries/Renderer/src/shared/utils/KeyEscapeUtils.js
+++ b/Libraries/Renderer/src/shared/utils/KeyEscapeUtils.js
@@ -24,12 +24,9 @@ function escape(key: string): string {
     '=': '=0',
     ':': '=2',
   };
-  var escapedString = ('' + key).replace(
-    escapeRegex,
-    function(match) {
-      return escaperLookup[match];
-    }
-  );
+  var escapedString = ('' + key).replace(escapeRegex, function(match) {
+    return escaperLookup[match];
+  });
 
   return '$' + escapedString;
 }
@@ -46,15 +43,13 @@ function unescape(key: string): string {
     '=0': '=',
     '=2': ':',
   };
-  var keySubstring = (key[0] === '.' && key[1] === '$')
-    ? key.substring(2) : key.substring(1);
+  var keySubstring = key[0] === '.' && key[1] === '$'
+    ? key.substring(2)
+    : key.substring(1);
 
-  return ('' + keySubstring).replace(
-    unescapeRegex,
-    function(match) {
-      return unescaperLookup[match];
-    }
-  );
+  return ('' + keySubstring).replace(unescapeRegex, function(match) {
+    return unescaperLookup[match];
+  });
 }
 
 var KeyEscapeUtils = {
diff --git a/Libraries/Renderer/src/shared/utils/PooledClass.js b/Libraries/Renderer/src/shared/utils/PooledClass.js
index c2a6fa5322d171..15e00789e3f482 100644
--- a/Libraries/Renderer/src/shared/utils/PooledClass.js
+++ b/Libraries/Renderer/src/shared/utils/PooledClass.js
@@ -69,7 +69,7 @@ var standardReleaser = function(instance) {
   var Klass = this;
   invariant(
     instance instanceof Klass,
-    'Trying to release an instance into a pool of a different type.'
+    'Trying to release an instance into a pool of a different type.',
   );
   instance.destructor();
   if (Klass.instancePool.length < Klass.poolSize) {
@@ -95,7 +95,7 @@ var addPoolingTo = function<T>(
   CopyConstructor: Class<T>,
   pooler: Pooler,
 ): Class<T> & {
-  getPooled(/* arguments of the constructor */): T,
+  getPooled /* arguments of the constructor */(): T,
   release(): void,
 } {
   // Casting as any so that flow ignores the actual implementation and trusts
diff --git a/Libraries/Renderer/src/shared/utils/ReactElementSymbol.js b/Libraries/Renderer/src/shared/utils/ReactElementSymbol.js
index 9d59d505e78bc3..2596b6817f3cbb 100644
--- a/Libraries/Renderer/src/shared/utils/ReactElementSymbol.js
+++ b/Libraries/Renderer/src/shared/utils/ReactElementSymbol.js
@@ -14,8 +14,9 @@
 
 // The Symbol used to tag the ReactElement type. If there is no native Symbol
 // nor polyfill, then a plain number is used for performance.
-var REACT_ELEMENT_TYPE =
-  (typeof Symbol === 'function' && Symbol.for && Symbol.for('react.element')) ||
+var REACT_ELEMENT_TYPE = (typeof Symbol === 'function' &&
+  Symbol.for &&
+  Symbol.for('react.element')) ||
   0xeac7;
 
 module.exports = REACT_ELEMENT_TYPE;
diff --git a/Libraries/Renderer/src/shared/utils/__tests__/PooledClass-test.js b/Libraries/Renderer/src/shared/utils/__tests__/PooledClass-test.js
index 43ead312dbe33d..3c206b74aeaf5d 100644
--- a/Libraries/Renderer/src/shared/utils/__tests__/PooledClass-test.js
+++ b/Libraries/Renderer/src/shared/utils/__tests__/PooledClass-test.js
@@ -31,14 +31,12 @@ describe('Pooled class', () => {
     expect(instance instanceof PoolableClass).toBe(true);
   });
 
-  it('should return the instance back into the pool when it gets released',
-    () => {
-      var instance = PoolableClass.getPooled();
-      PoolableClass.release(instance);
-      expect(PoolableClass.instancePool.length).toBe(1);
-      expect(PoolableClass.instancePool[0]).toBe(instance);
-    }
-  );
+  it('should return the instance back into the pool when it gets released', () => {
+    var instance = PoolableClass.getPooled();
+    PoolableClass.release(instance);
+    expect(PoolableClass.instancePool.length).toBe(1);
+    expect(PoolableClass.instancePool[0]).toBe(instance);
+  });
 
   it('should return an old instance if available in the pool', () => {
     var instance = PoolableClass.getPooled();
@@ -67,7 +65,7 @@ describe('Pooled class', () => {
     PoolableClassWithMultiArguments.prototype.destructor = function() {};
     PooledClass.addPoolingTo(
       PoolableClassWithMultiArguments,
-      PooledClass.twoArgumentPooler
+      PooledClass.twoArgumentPooler,
     );
     PoolableClassWithMultiArguments.getPooled('a', 'b', 'c');
     expect(log).toEqual(['a', 'b']);
@@ -79,9 +77,7 @@ describe('Pooled class', () => {
       log.push(a);
     };
     PoolableClassWithOneArgument.prototype.destructor = function() {};
-    PooledClass.addPoolingTo(
-      PoolableClassWithOneArgument
-    );
+    PooledClass.addPoolingTo(PoolableClassWithOneArgument);
     PoolableClassWithOneArgument.getPooled('new');
     expect(log).toEqual(['new']);
   });
@@ -92,29 +88,25 @@ describe('Pooled class', () => {
       log.push(a);
     };
     PoolableClassWithOneArgument.prototype.destructor = function() {};
-    PooledClass.addPoolingTo(
-      PoolableClassWithOneArgument
-    );
+    PooledClass.addPoolingTo(PoolableClassWithOneArgument);
     var instance = PoolableClassWithOneArgument.getPooled('new');
     PoolableClassWithOneArgument.release(instance);
     PoolableClassWithOneArgument.getPooled('old');
     expect(log).toEqual(['new', 'old']);
   });
 
-  it('should throw when the class releases an instance of a different type',
-    () => {
-      var RandomClass = function() {};
-      RandomClass.prototype.destructor = function() {};
-      PooledClass.addPoolingTo(RandomClass);
-      var randomInstance = RandomClass.getPooled();
-      PoolableClass.getPooled();
-      expect(function() {
-        PoolableClass.release(randomInstance);
-      }).toThrowError(
-        'Trying to release an instance into a pool of a different type.'
-      );
-    }
-  );
+  it('should throw when the class releases an instance of a different type', () => {
+    var RandomClass = function() {};
+    RandomClass.prototype.destructor = function() {};
+    PooledClass.addPoolingTo(RandomClass);
+    var randomInstance = RandomClass.getPooled();
+    PoolableClass.getPooled();
+    expect(function() {
+      PoolableClass.release(randomInstance);
+    }).toThrowError(
+      'Trying to release an instance into a pool of a different type.',
+    );
+  });
 
   it('should throw if no destructor is defined', () => {
     var ImmortalClass = function() {};
diff --git a/Libraries/Renderer/src/shared/utils/__tests__/reactProdInvariant-test.js b/Libraries/Renderer/src/shared/utils/__tests__/reactProdInvariant-test.js
index 7f60f08e25b24b..59180917a560aa 100644
--- a/Libraries/Renderer/src/shared/utils/__tests__/reactProdInvariant-test.js
+++ b/Libraries/Renderer/src/shared/utils/__tests__/reactProdInvariant-test.js
@@ -23,27 +23,27 @@ describe('reactProdInvariant', () => {
       reactProdInvariant(124, 'foo', 'bar');
     }).toThrowError(
       'Minified React error #124; visit ' +
-      'http://facebook.github.io/react/docs/error-decoder.html?invariant=124&args[]=foo&args[]=bar' +
-      ' for the full message or use the non-minified dev environment' +
-      ' for full errors and additional helpful warnings.'
+        'http://facebook.github.io/react/docs/error-decoder.html?invariant=124&args[]=foo&args[]=bar' +
+        ' for the full message or use the non-minified dev environment' +
+        ' for full errors and additional helpful warnings.',
     );
 
     expect(function() {
       reactProdInvariant(20);
     }).toThrowError(
       'Minified React error #20; visit ' +
-      'http://facebook.github.io/react/docs/error-decoder.html?invariant=20' +
-      ' for the full message or use the non-minified dev environment' +
-      ' for full errors and additional helpful warnings.'
+        'http://facebook.github.io/react/docs/error-decoder.html?invariant=20' +
+        ' for the full message or use the non-minified dev environment' +
+        ' for full errors and additional helpful warnings.',
     );
 
     expect(function() {
       reactProdInvariant(77, '<div>', '&?bar');
     }).toThrowError(
       'Minified React error #77; visit ' +
-      'http://facebook.github.io/react/docs/error-decoder.html?invariant=77&args[]=%3Cdiv%3E&args[]=%26%3Fbar' +
-      ' for the full message or use the non-minified dev environment' +
-      ' for full errors and additional helpful warnings.'
+        'http://facebook.github.io/react/docs/error-decoder.html?invariant=77&args[]=%3Cdiv%3E&args[]=%26%3Fbar' +
+        ' for the full message or use the non-minified dev environment' +
+        ' for full errors and additional helpful warnings.',
     );
   });
 });
diff --git a/Libraries/Renderer/src/shared/utils/deprecated.js b/Libraries/Renderer/src/shared/utils/deprecated.js
index c7238310815046..1ed8bb20192835 100644
--- a/Libraries/Renderer/src/shared/utils/deprecated.js
+++ b/Libraries/Renderer/src/shared/utils/deprecated.js
@@ -41,12 +41,13 @@ function deprecated<T: Function>(
         // Require examples in this string must be split to prevent React's
         // build tools from mistaking them for real requires.
         // Otherwise the build tools will attempt to build a '%s' module.
-        'React.%s is deprecated. Please use %s.%s from require' + '(\'%s\') ' +
-        'instead.',
+        'React.%s is deprecated. Please use %s.%s from require' +
+          "('%s') " +
+          'instead.',
         fnName,
         newModule,
         fnName,
-        newPackage
+        newPackage,
       );
       /* eslint-enable no-useless-concat */
       warned = true;
diff --git a/Libraries/Renderer/src/shared/utils/flattenChildren.js b/Libraries/Renderer/src/shared/utils/flattenChildren.js
index d07630580fb689..21a5da7140abb5 100644
--- a/Libraries/Renderer/src/shared/utils/flattenChildren.js
+++ b/Libraries/Renderer/src/shared/utils/flattenChildren.js
@@ -46,7 +46,7 @@ function flattenSingleChildIntoContext(
   // We found a component instance.
   if (traverseContext && typeof traverseContext === 'object') {
     const result = traverseContext;
-    const keyUnique = (result[name] === undefined);
+    const keyUnique = result[name] === undefined;
     if (__DEV__) {
       if (!ReactComponentTreeHook) {
         ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');
@@ -55,10 +55,10 @@ function flattenSingleChildIntoContext(
         warning(
           false,
           'flattenChildren(...): Encountered two children with the same key, ' +
-          '`%s`. Child keys must be unique; when two children share a key, only ' +
-          'the first child will be used.%s',
+            '`%s`. Child keys must be unique; when two children share a key, only ' +
+            'the first child will be used.%s',
           KeyEscapeUtils.unescape(name),
-          ReactComponentTreeHook.getStackAddendumByID(selfDebugID)
+          ReactComponentTreeHook.getStackAddendumByID(selfDebugID),
         );
       }
     }
@@ -76,7 +76,7 @@ function flattenSingleChildIntoContext(
 function flattenChildren(
   children: ReactElement<any>,
   selfDebugID?: number,
-): ?{ [name: string]: ReactElement<any> } {
+): ?{[name: string]: ReactElement<any>} {
   if (children == null) {
     return children;
   }
@@ -85,13 +85,14 @@ function flattenChildren(
   if (__DEV__) {
     traverseAllChildren(
       children,
-      (traverseContext, child, name) => flattenSingleChildIntoContext(
-        traverseContext,
-        child,
-        name,
-        selfDebugID
-      ),
-      result
+      (traverseContext, child, name) =>
+        flattenSingleChildIntoContext(
+          traverseContext,
+          child,
+          name,
+          selfDebugID,
+        ),
+      result,
     );
   } else {
     traverseAllChildren(children, flattenSingleChildIntoContext, result);
diff --git a/Libraries/Renderer/src/shared/utils/getComponentName.js b/Libraries/Renderer/src/shared/utils/getComponentName.js
index bce8814db63fb6..76ee7278e1dc64 100644
--- a/Libraries/Renderer/src/shared/utils/getComponentName.js
+++ b/Libraries/Renderer/src/shared/utils/getComponentName.js
@@ -12,18 +12,20 @@
 
 'use strict';
 
-import type { ReactInstance } from 'ReactInstanceType';
-import type { Fiber } from 'ReactFiber';
+import type {ReactInstance} from 'ReactInstanceType';
+import type {Fiber} from 'ReactFiber';
 
-function getComponentName(instanceOrFiber : ReactInstance | Fiber) : string | null {
+function getComponentName(
+  instanceOrFiber: ReactInstance | Fiber,
+): string | null {
   if (typeof instanceOrFiber.getName === 'function') {
     // Stack reconciler
-    const instance = ((instanceOrFiber : any) : ReactInstance);
+    const instance = ((instanceOrFiber: any): ReactInstance);
     return instance.getName();
   }
   if (typeof instanceOrFiber.tag === 'number') {
     // Fiber reconciler
-    const fiber = ((instanceOrFiber : any) : Fiber);
+    const fiber = ((instanceOrFiber: any): Fiber);
     const {type} = fiber;
     if (typeof type === 'string') {
       return type;
diff --git a/Libraries/Renderer/src/shared/utils/getIteratorFn.js b/Libraries/Renderer/src/shared/utils/getIteratorFn.js
index 8958e63c4a53da..ffde8ff3b90e5d 100644
--- a/Libraries/Renderer/src/shared/utils/getIteratorFn.js
+++ b/Libraries/Renderer/src/shared/utils/getIteratorFn.js
@@ -30,11 +30,10 @@ var FAUX_ITERATOR_SYMBOL = '@@iterator'; // Before Symbol spec.
  * @param {?object} maybeIterable
  * @return {?function}
  */
-function getIteratorFn(maybeIterable: ?any): ?(() => ?Iterator<*>) {
-  var iteratorFn = maybeIterable && (
-    (ITERATOR_SYMBOL && maybeIterable[ITERATOR_SYMBOL]) ||
-    maybeIterable[FAUX_ITERATOR_SYMBOL]
-  );
+function getIteratorFn(maybeIterable: ?any): ?() => ?Iterator<*> {
+  var iteratorFn = maybeIterable &&
+    ((ITERATOR_SYMBOL && maybeIterable[ITERATOR_SYMBOL]) ||
+      maybeIterable[FAUX_ITERATOR_SYMBOL]);
   if (typeof iteratorFn === 'function') {
     return iteratorFn;
   }
diff --git a/Libraries/Renderer/src/shared/utils/reactProdInvariant.js b/Libraries/Renderer/src/shared/utils/reactProdInvariant.js
index ed61b59585ce75..b52766eb206f35 100644
--- a/Libraries/Renderer/src/shared/utils/reactProdInvariant.js
+++ b/Libraries/Renderer/src/shared/utils/reactProdInvariant.js
@@ -20,21 +20,20 @@
 function reactProdInvariant(code: string): void {
   var argCount = arguments.length - 1;
 
-  var message = (
-    'Minified React error #' + code + '; visit ' +
-    'http://facebook.github.io/react/docs/error-decoder.html?invariant=' + code
-  );
+  var message = 'Minified React error #' +
+    code +
+    '; visit ' +
+    'http://facebook.github.io/react/docs/error-decoder.html?invariant=' +
+    code;
 
   for (var argIdx = 0; argIdx < argCount; argIdx++) {
     message += '&args[]=' + encodeURIComponent(arguments[argIdx + 1]);
   }
 
-  message += (
-    ' for the full message or use the non-minified dev environment' +
-    ' for full errors and additional helpful warnings.'
-  );
+  message += ' for the full message or use the non-minified dev environment' +
+    ' for full errors and additional helpful warnings.';
 
-  var error: Error & { framesToPop?: number } = new Error(message);
+  var error: Error & {framesToPop?: number} = new Error(message);
   error.name = 'Invariant Violation';
   error.framesToPop = 1; // we don't care about reactProdInvariant's own frame
 
diff --git a/Libraries/Renderer/src/shared/utils/traverseAllChildren.js b/Libraries/Renderer/src/shared/utils/traverseAllChildren.js
index 0ec33d7ce4a9b7..dd8b49fb580069 100644
--- a/Libraries/Renderer/src/shared/utils/traverseAllChildren.js
+++ b/Libraries/Renderer/src/shared/utils/traverseAllChildren.js
@@ -65,7 +65,7 @@ function traverseAllChildrenImpl(
   children,
   nameSoFar,
   callback,
-  traverseContext
+  traverseContext,
 ) {
   var type = typeof children;
 
@@ -74,18 +74,20 @@ function traverseAllChildrenImpl(
     children = null;
   }
 
-  if (children === null ||
-      type === 'string' ||
-      type === 'number' ||
-      // The following is inlined from ReactElement. This means we can optimize
-      // some checks. React Fiber also inlines this logic for similar purposes.
-      (type === 'object' && children.$$typeof === REACT_ELEMENT_TYPE)) {
+  if (
+    children === null ||
+    type === 'string' ||
+    type === 'number' ||
+    // The following is inlined from ReactElement. This means we can optimize
+    // some checks. React Fiber also inlines this logic for similar purposes.
+    (type === 'object' && children.$$typeof === REACT_ELEMENT_TYPE)
+  ) {
     callback(
       traverseContext,
       children,
       // If it's the only child, treat the name as if it was wrapped in an array
       // so that it's consistent if the number of children grows.
-      nameSoFar === '' ? SEPARATOR + getComponentKey(children, 0) : nameSoFar
+      nameSoFar === '' ? SEPARATOR + getComponentKey(children, 0) : nameSoFar,
     );
     return 1;
   }
@@ -103,7 +105,7 @@ function traverseAllChildrenImpl(
         child,
         nextName,
         callback,
-        traverseContext
+        traverseContext,
       );
     }
   } else {
@@ -116,15 +118,17 @@ function traverseAllChildrenImpl(
           if (ReactCurrentOwner.current) {
             var mapsAsChildrenOwnerName = ReactCurrentOwner.current.getName();
             if (mapsAsChildrenOwnerName) {
-              mapsAsChildrenAddendum = '\n\nCheck the render method of `' + mapsAsChildrenOwnerName + '`.';
+              mapsAsChildrenAddendum = '\n\nCheck the render method of `' +
+                mapsAsChildrenOwnerName +
+                '`.';
             }
           }
           warning(
             didWarnAboutMaps,
             'Using Maps as children is unsupported and will likely yield ' +
-            'unexpected results. Convert it to a sequence/iterable of keyed ' +
-            'ReactElements instead.%s',
-            mapsAsChildrenAddendum
+              'unexpected results. Convert it to a sequence/iterable of keyed ' +
+              'ReactElements instead.%s',
+            mapsAsChildrenAddendum,
           );
           didWarnAboutMaps = true;
         }
@@ -140,16 +144,14 @@ function traverseAllChildrenImpl(
           child,
           nextName,
           callback,
-          traverseContext
+          traverseContext,
         );
       }
     } else if (type === 'object') {
       var addendum = '';
       if (__DEV__) {
-        addendum =
-          ' If you meant to render a collection of children, use an array ' +
-          'instead or wrap the object using createFragment(object) from the ' +
-          'React add-ons.';
+        addendum = ' If you meant to render a collection of children, use an array ' +
+          'instead.';
         if (ReactCurrentOwner.current) {
           var name = ReactCurrentOwner.current.getName();
           if (name) {
@@ -157,14 +159,14 @@ function traverseAllChildrenImpl(
           }
         }
       }
-      var childrenString = String(children);
+      var childrenString = '' + children;
       invariant(
         false,
         'Objects are not valid as a React child (found: %s).%s',
-        childrenString === '[object Object]' ?
-          'object with keys {' + Object.keys(children).join(', ') + '}' :
-          childrenString,
-        addendum
+        childrenString === '[object Object]'
+          ? 'object with keys {' + Object.keys(children).join(', ') + '}'
+          : childrenString,
+        addendum,
       );
     }
   }
diff --git a/jest/setup.js b/jest/setup.js
index 413d3b91a9260f..68492e651091a5 100644
--- a/jest/setup.js
+++ b/jest/setup.js
@@ -152,7 +152,10 @@ const mockNativeModules = {
     deleteTimer: jest.fn(),
   },
   UIManager: {
+    blur: jest.fn(),
     createView: jest.fn(),
+    dispatchViewManagerCommand: jest.fn(),
+    focus: jest.fn(),
     setChildren: jest.fn(),
     manageChildren: jest.fn(),
     updateView: jest.fn(),
@@ -160,6 +163,9 @@ const mockNativeModules = {
     replaceExistingNonRootView: jest.fn(),
     customBubblingEventTypes: {},
     customDirectEventTypes: {},
+    AndroidTextInput: {
+      Commands: {},
+    },
     ModalFullscreenView: {
       Constants: {},
     },
diff --git a/package.json b/package.json
index 615c75787fdb78..7de90fad4475f4 100644
--- a/package.json
+++ b/package.json
@@ -127,7 +127,7 @@
     "react-native": "local-cli/wrong-react-native.js"
   },
   "peerDependencies": {
-    "react": "~16.0.0-alpha.3"
+    "react": "~16.0.0-alpha.4"
   },
   "dependencies": {
     "absolute-path": "^0.0.0",
@@ -223,8 +223,8 @@
     "jest-repl": "19.0.2",
     "jest-runtime": "19.0.2",
     "mock-fs": "^3.11.0",
-    "react": "~16.0.0-alpha.3",
-    "react-dom": "~16.0.0-alpha.3",
+    "react": "~16.0.0-alpha.4",
+    "react-dom": "~16.0.0-alpha.4",
     "react-test-renderer": "~16.0.0-alpha.3",
     "shelljs": "0.6.0",
     "sinon": "^2.0.0-pre.2"

From 971c2be07079b21676cb61b36587449e39b82bd3 Mon Sep 17 00:00:00 2001
From: Janic Duplessis <janicduplessis@gmail.com>
Date: Wed, 22 Mar 2017 23:20:32 -0700
Subject: [PATCH 154/366] Remove duplicate flow ignore

Summary:
Added this as part of a random PR to get flow passing. This collides with a similar fix by bvaughn so let's remove mine. Also I messed up and there is a + at the start of the line :o
Closes https://github.com/facebook/react-native/pull/13103

Differential Revision: D4761349

fbshipit-source-id: 0abde66a1ac4c185bbd7142ecd800cf5ac8f3c5b
---
 .flowconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.flowconfig b/.flowconfig
index e6f09f99d9fc9b..79f6aa7d18c1b7 100644
--- a/.flowconfig
+++ b/.flowconfig
@@ -13,7 +13,6 @@
 
 ; Ignore unexpected extra "@providesModule"
 .*/node_modules/.*/node_modules/fbjs/.*
-+.*/node_modules/react-dom/.*
 
 ; Ignore duplicate module providers
 ; For RN Apps installed via npm, "Libraries" folder is inside

From 8a8f34ae10d8aaffb7b94ccef77a9f62d858b04a Mon Sep 17 00:00:00 2001
From: Yann Pringault <yann@cinq-s.com>
Date: Thu, 23 Mar 2017 04:28:26 -0700
Subject: [PATCH 155/366] Improve dark mode for debugger

Summary:
* Added a label so we can click on the text to toggle the dark mode
* Added `height: 100%` in the CSS to make the dark background fill the entire view
* Improving JS code with `classList.toggle()` instead of redundant `if else` and fragile `document.styleSheets` access
* Adjusted the link color in dark mode to be less flashy

![image](https://cloud.githubusercontent.com/assets/5436545/24155304/bb80bb9a-0e53-11e7-9298-ce2c1ec6672c.png)

![image](https://cloud.githubusercontent.com/assets/5436545/24155311/c27e85f8-0e53-11e7-87ae-0245f54870c5.png)
Closes https://github.com/facebook/react-native/pull/13052

Differential Revision: D4748893

fbshipit-source-id: a81266c52b24f8e5dcedf0b9f37134688342d8d2
---
 local-cli/server/util/debugger.html | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/local-cli/server/util/debugger.html b/local-cli/server/util/debugger.html
index 8678c047eb4ee3..9e8bca4cbc6529 100644
--- a/local-cli/server/util/debugger.html
+++ b/local-cli/server/util/debugger.html
@@ -15,19 +15,6 @@
 <link rel="icon" href="data:;base64,iVBORw0KGgo=">
 <title>React Native Debugger</title>
 <script>
-function toggleDark() {
-  const shortcutRule = document.styleSheets[0]['cssRules'][1]
-  const contentRule = document.styleSheets[0]['cssRules'][2]
-  if (document.getElementById("dark").checked) {
-    shortcutRule.style.color = '#777'
-    contentRule.style.color = '#666'
-    contentRule.style.backgroundColor = '#242424'
-  } else {
-    shortcutRule.style.color = '#eee'
-    contentRule.style.color = ''
-    contentRule.style.backgroundColor = ''
-  }
-}
 /* eslint-env browser */
 (function() {
 
@@ -160,10 +147,12 @@
 })();
 </script>
 <style type="text/css">
+  html,
   body {
     font-family: Helvetica, Verdana, sans-serif;
     font-size: large;
     font-weight: 200;
+    height: 100%;
     margin: 0;
     padding: 0;
   }
@@ -179,11 +168,23 @@
   .content {
     padding: 10px;
   }
+  body.dark {
+    background-color: #242424;
+    color: #666;
+  }
+  .dark .shortcut {
+    color: #777;
+  }
+  .dark a {
+    color: #3b99fc;
+  }
 </style>
 </head>
 <body>
   <div class="content">
-    <input type="checkbox" id="dark" onclick="toggleDark()"> Dark background
+    <label for="dark">
+      <input type="checkbox" id="dark" onclick="document.body.classList.toggle('dark')"> Dark background
+    </label>
     <p>
       React Native JS code runs inside this Chrome tab.
     </p>

From 720e19525ede0570ea5fb5dfe4f29b696eb7c9be Mon Sep 17 00:00:00 2001
From: Tim <me@justim.net>
Date: Thu, 23 Mar 2017 05:59:10 -0700
Subject: [PATCH 156/366] Picker (android): Convert children to an array before
 accessing with a position

Summary:
When using the following component, `this.props.children` is not a flat array.

``` js
class Example extends Component {
    // ...

    render() {
        const values = ['1', '2'];

        return (
            <Picker
                value={this.state.value}
                onValueChange={this.onValueChange.bind(this)}
            >
                <Picker.Item
                    label="n/a"
                    value={null}
                />

                {values.map(value => {
                    return (
                        <Picker.Item
                            label={value}
                            value={value}
                        />
                    );
                })}
            </Picker>
        );
    }
}
```

The resulting `this.props.children` is:

``` js
[
    (child),
    [
        (child),
        (child),
    ],
];
```

Therefor you can't use `this.props.children[2]` to get the last item.

The Android version of the [Picker](https://facebook.github.io/react-native/do
Closes https://github.com/facebook/react-native/pull/8153

Differential Revision: D4753480

Pulled By: javache

fbshipit-source-id: deb0264746b39303e66c69c191af0c962db39085
---
 Libraries/Components/Picker/PickerAndroid.android.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Libraries/Components/Picker/PickerAndroid.android.js b/Libraries/Components/Picker/PickerAndroid.android.js
index 4c42c4e011a6c5..8be1579aec655d 100644
--- a/Libraries/Components/Picker/PickerAndroid.android.js
+++ b/Libraries/Components/Picker/PickerAndroid.android.js
@@ -116,7 +116,8 @@ class PickerAndroid extends React.Component {
     if (this.props.onValueChange) {
       var position = event.nativeEvent.position;
       if (position >= 0) {
-        var value = this.props.children[position].props.value;
+        var children = React.Children.toArray(this.props.children);
+        var value = children[position].props.value;
         this.props.onValueChange(value, position);
       } else {
         this.props.onValueChange(null, position);

From a2cfea1934ab3682b2597a53de0b2b00a319832f Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieter.debaets@gmail.com>
Date: Thu, 23 Mar 2017 06:25:01 -0700
Subject: [PATCH 157/366] Fix usages of ReactComponentWithPureRenderMixin

Summary: Closes https://github.com/facebook/react-native/pull/13111

Differential Revision: D4761971

Pulled By: davidaurelio

fbshipit-source-id: 668dcc58e8e1b075ee760233abc6904beede9218
---
 .../NavigationExperimental/NavigationHeader.js        | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/Libraries/CustomComponents/NavigationExperimental/NavigationHeader.js b/Libraries/CustomComponents/NavigationExperimental/NavigationHeader.js
index 87ce2f36aa94ca..5218a4c055dd40 100644
--- a/Libraries/CustomComponents/NavigationExperimental/NavigationHeader.js
+++ b/Libraries/CustomComponents/NavigationExperimental/NavigationHeader.js
@@ -37,7 +37,6 @@ const NavigationHeaderStyleInterpolator = require('NavigationHeaderStyleInterpol
 const NavigationHeaderTitle = require('NavigationHeaderTitle');
 const NavigationPropTypes = require('NavigationPropTypes');
 const React = require('React');
-const ReactComponentWithPureRenderMixin = require('react/lib/ReactComponentWithPureRenderMixin');
 const ReactNative = require('react-native');
 const TVEventHandler = require('TVEventHandler');
 
@@ -82,7 +81,7 @@ const APPBAR_HEIGHT = Platform.OS === 'ios' ? 44 : 56;
 const STATUSBAR_HEIGHT = Platform.OS === 'ios' ? 20 : 0;
 const {PropTypes} = React;
 
-class NavigationHeader extends React.Component<DefaultProps, Props, any> {
+class NavigationHeader extends React.PureComponent<DefaultProps, Props, any> {
   props: Props;
 
   static defaultProps = {
@@ -121,14 +120,6 @@ class NavigationHeader extends React.Component<DefaultProps, Props, any> {
     viewProps: PropTypes.shape(View.propTypes),
   };
 
-  shouldComponentUpdate(nextProps: Props, nextState: any): boolean {
-    return ReactComponentWithPureRenderMixin.shouldComponentUpdate.call(
-      this,
-      nextProps,
-      nextState
-    );
-  }
-
   _tvEventHandler: TVEventHandler;
 
   componentDidMount(): void {

From 53905a537a58d028fc5eb1c4e9a8ec967d8cd396 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <bvaughn@fb.com>
Date: Thu, 23 Mar 2017 09:08:46 -0700
Subject: [PATCH 158/366] ReactNative moved View.propTypes to ViewPropTypes

Reviewed By: yungsters

Differential Revision: D4761354

fbshipit-source-id: b49922d78ee5d8628f945e5dee476ffe5d889b07
---
 Libraries/Components/View/View.js          | 393 +-------------------
 Libraries/Components/View/ViewPropTypes.js | 410 +++++++++++++++++++++
 2 files changed, 412 insertions(+), 391 deletions(-)
 create mode 100644 Libraries/Components/View/ViewPropTypes.js

diff --git a/Libraries/Components/View/View.js b/Libraries/Components/View/View.js
index e3b4d1b77d489b..86b7237716aee4 100644
--- a/Libraries/Components/View/View.js
+++ b/Libraries/Components/View/View.js
@@ -11,7 +11,6 @@
  */
 'use strict';
 
-const EdgeInsetsPropType = require('EdgeInsetsPropType');
 const NativeMethodsMixin = require('NativeMethodsMixin');
 const NativeModules = require('NativeModules');
 const Platform = require('Platform');
@@ -19,8 +18,7 @@ const React = require('React');
 const ReactNativeFeatureFlags = require('ReactNativeFeatureFlags');
 const ReactNativeStyleAttributes = require('ReactNativeStyleAttributes');
 const ReactNativeViewAttributes = require('ReactNativeViewAttributes');
-const StyleSheetPropType = require('StyleSheetPropType');
-const ViewStylePropTypes = require('ViewStylePropTypes');
+const ViewPropTypes = require('ViewPropTypes');
 
 const invariant = require('fbjs/lib/invariant');
 const warning = require('fbjs/lib/warning');
@@ -30,17 +28,8 @@ const {
   AccessibilityTraits,
 } = require('ViewAccessibility');
 
-var TVViewPropTypes = {};
-if (Platform.isTVOS) {
-  TVViewPropTypes = require('TVViewPropTypes');
-}
-
 const requireNativeComponent = require('requireNativeComponent');
 
-const PropTypes = React.PropTypes;
-
-const stylePropType = StyleSheetPropType(ViewStylePropTypes);
-
 const forceTouchAvailable = (NativeModules.PlatformConstants &&
   NativeModules.PlatformConstants.forceTouchAvailable) || false;
 
@@ -110,385 +99,7 @@ const View = React.createClass({
   // TODO (bvaughn) Replace this with a deprecated getter warning. This object
   // should be accessible via a separate import. It will not be available in
   // production mode in the future and so should not be directly accessed.
-  propTypes: {
-    ...TVViewPropTypes,
-
-    /**
-     * When `true`, indicates that the view is an accessibility element. By default,
-     * all the touchable elements are accessible.
-     */
-    accessible: PropTypes.bool,
-
-    /**
-     * Overrides the text that's read by the screen reader when the user interacts
-     * with the element. By default, the label is constructed by traversing all the
-     * children and accumulating all the `Text` nodes separated by space.
-     */
-    accessibilityLabel: PropTypes.node,
-
-    /**
-     * Indicates to accessibility services to treat UI component like a
-     * native one. Works for Android only.
-     *
-     * Possible values are one of:
-     *
-     * - `'none'`
-     * - `'button'`
-     * - `'radiobutton_checked'`
-     * - `'radiobutton_unchecked'`
-     *
-     * @platform android
-     */
-    accessibilityComponentType: PropTypes.oneOf(AccessibilityComponentTypes),
-
-    /**
-     * Indicates to accessibility services whether the user should be notified
-     * when this view changes. Works for Android API >= 19 only.
-     * Possible values:
-     *
-     * - `'none'` - Accessibility services should not announce changes to this view.
-     * - `'polite'`- Accessibility services should announce changes to this view.
-     * - `'assertive'` - Accessibility services should interrupt ongoing speech to immediately announce changes to this view.
-     *
-     * See the [Android `View` docs](http://developer.android.com/reference/android/view/View.html#attr_android:accessibilityLiveRegion)
-     * for reference.
-     *
-     * @platform android
-     */
-    accessibilityLiveRegion: PropTypes.oneOf([
-      'none',
-      'polite',
-      'assertive',
-    ]),
-
-    /**
-     * Controls how view is important for accessibility which is if it
-     * fires accessibility events and if it is reported to accessibility services
-     * that query the screen. Works for Android only.
-     *
-     * Possible values:
-     *
-     *  - `'auto'` - The system determines whether the view is important for accessibility -
-     *    default (recommended).
-     *  - `'yes'` - The view is important for accessibility.
-     *  - `'no'` - The view is not important for accessibility.
-     *  - `'no-hide-descendants'` - The view is not important for accessibility,
-     *    nor are any of its descendant views.
-     *
-     * See the [Android `importantForAccessibility` docs](http://developer.android.com/reference/android/R.attr.html#importantForAccessibility)
-     * for reference.
-     *
-     * @platform android
-     */
-    importantForAccessibility: PropTypes.oneOf([
-      'auto',
-      'yes',
-      'no',
-      'no-hide-descendants',
-    ]),
-
-    /**
-     * Provides additional traits to screen reader. By default no traits are
-     * provided unless specified otherwise in element.
-     *
-     * You can provide one trait or an array of many traits.
-     *
-     * Possible values for `AccessibilityTraits` are:
-     *
-     * - `'none'` - The element has no traits.
-     * - `'button'` - The element should be treated as a button.
-     * - `'link'` - The element should be treated as a link.
-     * - `'header'` - The element is a header that divides content into sections.
-     * - `'search'` - The element should be treated as a search field.
-     * - `'image'` - The element should be treated as an image.
-     * - `'selected'` - The element is selected.
-     * - `'plays'` - The element plays sound.
-     * - `'key'` - The element should be treated like a keyboard key.
-     * - `'text'` - The element should be treated as text.
-     * - `'summary'` - The element provides app summary information.
-     * - `'disabled'` - The element is disabled.
-     * - `'frequentUpdates'` - The element frequently changes its value.
-     * - `'startsMedia'` - The element starts a media session.
-     * - `'adjustable'` - The element allows adjustment over a range of values.
-     * - `'allowsDirectInteraction'` - The element allows direct touch interaction for VoiceOver users.
-     * - `'pageTurn'` - Informs VoiceOver that it should scroll to the next page when it finishes reading the contents of the element.
-     *
-     * See the [Accessibility guide](docs/accessibility.html#accessibilitytraits-ios)
-     * for more information.
-     *
-     * @platform ios
-     */
-    accessibilityTraits: PropTypes.oneOfType([
-      PropTypes.oneOf(AccessibilityTraits),
-      PropTypes.arrayOf(PropTypes.oneOf(AccessibilityTraits)),
-    ]),
-
-    /**
-     * A value indicating whether VoiceOver should ignore the elements
-     * within views that are siblings of the receiver.
-     * Default is `false`.
-     *
-     * See the [Accessibility guide](docs/accessibility.html#accessibilitytraits-ios)
-     * for more information.
-     *
-     * @platform ios
-     */
-    accessibilityViewIsModal: PropTypes.bool,
-
-    /**
-     * When `accessible` is true, the system will try to invoke this function
-     * when the user performs accessibility tap gesture.
-     */
-    onAccessibilityTap: PropTypes.func,
-
-    /**
-     * When `accessible` is `true`, the system will invoke this function when the
-     * user performs the magic tap gesture.
-     */
-    onMagicTap: PropTypes.func,
-
-    /**
-     * Used to locate this view in end-to-end tests.
-     *
-     * > This disables the 'layout-only view removal' optimization for this view!
-     */
-    testID: PropTypes.string,
-
-    /**
-     * For most touch interactions, you'll simply want to wrap your component in
-     * `TouchableHighlight` or `TouchableOpacity`. Check out `Touchable.js`,
-     * `ScrollResponder.js` and `ResponderEventPlugin.js` for more discussion.
-     */
-
-    /**
-     * The View is now responding for touch events. This is the time to highlight and show the user
-     * what is happening.
-     *
-     * `View.props.onResponderGrant: (event) => {}`, where `event` is a synthetic touch event as
-     * described above.
-     */
-    onResponderGrant: PropTypes.func,
-
-    /**
-     * The user is moving their finger.
-     *
-     * `View.props.onResponderMove: (event) => {}`, where `event` is a synthetic touch event as
-     * described above.
-     */
-    onResponderMove: PropTypes.func,
-
-    /**
-     * Another responder is already active and will not release it to that `View` asking to be
-     * the responder.
-     *
-     * `View.props.onResponderReject: (event) => {}`, where `event` is a synthetic touch event as
-     * described above.
-     */
-    onResponderReject: PropTypes.func,
-
-    /**
-     * Fired at the end of the touch.
-     *
-     * `View.props.onResponderRelease: (event) => {}`, where `event` is a synthetic touch event as
-     * described above.
-     */
-    onResponderRelease: PropTypes.func,
-
-    /**
-     * The responder has been taken from the `View`. Might be taken by other views after a call to
-     * `onResponderTerminationRequest`, or might be taken by the OS without asking (e.g., happens
-     * with control center/ notification center on iOS)
-     *
-     * `View.props.onResponderTerminate: (event) => {}`, where `event` is a synthetic touch event as
-     * described above.
-     */
-    onResponderTerminate: PropTypes.func,
-
-    /**
-     * Some other `View` wants to become responder and is asking this `View` to release its
-     * responder. Returning `true` allows its release.
-     *
-     * `View.props.onResponderTerminationRequest: (event) => {}`, where `event` is a synthetic touch
-     * event as described above.
-     */
-    onResponderTerminationRequest: PropTypes.func,
-
-    /**
-     * Does this view want to become responder on the start of a touch?
-     *
-     * `View.props.onStartShouldSetResponder: (event) => [true | false]`, where `event` is a
-     * synthetic touch event as described above.
-     */
-    onStartShouldSetResponder: PropTypes.func,
-
-    /**
-     * If a parent `View` wants to prevent a child `View` from becoming responder on a touch start,
-     * it should have this handler which returns `true`.
-     *
-     * `View.props.onStartShouldSetResponderCapture: (event) => [true | false]`, where `event` is a
-     * synthetic touch event as described above.
-     */
-    onStartShouldSetResponderCapture: PropTypes.func,
-
-    /**
-     * Does this view want to "claim" touch responsiveness? This is called for every touch move on
-     * the `View` when it is not the responder.
-     *
-     * `View.props.onMoveShouldSetResponder: (event) => [true | false]`, where `event` is a
-     * synthetic touch event as described above.
-     */
-    onMoveShouldSetResponder: PropTypes.func,
-
-    /**
-    * If a parent `View` wants to prevent a child `View` from becoming responder on a move,
-    * it should have this handler which returns `true`.
-    *
-    * `View.props.onMoveShouldSetResponderCapture: (event) => [true | false]`, where `event` is a
-    * synthetic touch event as described above.
-     */
-    onMoveShouldSetResponderCapture: PropTypes.func,
-
-    /**
-     * This defines how far a touch event can start away from the view.
-     * Typical interface guidelines recommend touch targets that are at least
-     * 30 - 40 points/density-independent pixels.
-     *
-     * For example, if a touchable view has a height of 20 the touchable height can be extended to
-     * 40 with `hitSlop={{top: 10, bottom: 10, left: 0, right: 0}}`
-     *
-     * > The touch area never extends past the parent view bounds and the Z-index
-     * > of sibling views always takes precedence if a touch hits two overlapping
-     * > views.
-     */
-    hitSlop: EdgeInsetsPropType,
-
-    /**
-     * Invoked on mount and layout changes with:
-     *
-     * `{nativeEvent: { layout: {x, y, width, height}}}`
-     *
-     * This event is fired immediately once the layout has been calculated, but
-     * the new layout may not yet be reflected on the screen at the time the
-     * event is received, especially if a layout animation is in progress.
-     */
-    onLayout: PropTypes.func,
-
-    /**
-     * Controls whether the `View` can be the target of touch events.
-     *
-     *   - `'auto'`: The View can be the target of touch events.
-     *   - `'none'`: The View is never the target of touch events.
-     *   - `'box-none'`: The View is never the target of touch events but it's
-     *     subviews can be. It behaves like if the view had the following classes
-     *     in CSS:
-     * ```
-     * .box-none {
-     *      pointer-events: none;
-     * }
-     * .box-none * {
-     *      pointer-events: all;
-     * }
-     * ```
-     *   - `'box-only'`: The view can be the target of touch events but it's
-     *     subviews cannot be. It behaves like if the view had the following classes
-     *     in CSS:
-     * ```
-     * .box-only {
-     *      pointer-events: all;
-     * }
-     * .box-only * {
-     *      pointer-events: none;
-     * }
-     * ```
-     * > Since `pointerEvents` does not affect layout/appearance, and we are
-     * > already deviating from the spec by adding additional modes, we opt to not
-     * > include `pointerEvents` on `style`. On some platforms, we would need to
-     * > implement it as a `className` anyways. Using `style` or not is an
-     * > implementation detail of the platform.
-     */
-    pointerEvents: PropTypes.oneOf([
-      'box-none',
-      'none',
-      'box-only',
-      'auto',
-    ]),
-    style: stylePropType,
-
-    /**
-     * This is a special performance property exposed by `RCTView` and is useful
-     * for scrolling content when there are many subviews, most of which are
-     * offscreen. For this property to be effective, it must be applied to a
-     * view that contains many subviews that extend outside its bound. The
-     * subviews must also have `overflow: hidden`, as should the containing view
-     * (or one of its superviews).
-     */
-    removeClippedSubviews: PropTypes.bool,
-
-    /**
-     * Whether this `View` should render itself (and all of its children) into a
-     * single hardware texture on the GPU.
-     *
-     * On Android, this is useful for animations and interactions that only
-     * modify opacity, rotation, translation, and/or scale: in those cases, the
-     * view doesn't have to be redrawn and display lists don't need to be
-     * re-executed. The texture can just be re-used and re-composited with
-     * different parameters. The downside is that this can use up limited video
-     * memory, so this prop should be set back to false at the end of the
-     * interaction/animation.
-     *
-     * @platform android
-     */
-    renderToHardwareTextureAndroid: PropTypes.bool,
-
-    /**
-     * Whether this `View` should be rendered as a bitmap before compositing.
-     *
-     * On iOS, this is useful for animations and interactions that do not
-     * modify this component's dimensions nor its children; for example, when
-     * translating the position of a static view, rasterization allows the
-     * renderer to reuse a cached bitmap of a static view and quickly composite
-     * it during each frame.
-     *
-     * Rasterization incurs an off-screen drawing pass and the bitmap consumes
-     * memory. Test and measure when using this property.
-     *
-     * @platform ios
-     */
-    shouldRasterizeIOS: PropTypes.bool,
-
-    /**
-     * Views that are only used to layout their children or otherwise don't draw
-     * anything may be automatically removed from the native hierarchy as an
-     * optimization. Set this property to `false` to disable this optimization and
-     * ensure that this `View` exists in the native view hierarchy.
-     *
-     * @platform android
-     */
-    collapsable: PropTypes.bool,
-
-    /**
-     * Whether this `View` needs to rendered offscreen and composited with an alpha
-     * in order to preserve 100% correct colors and blending behavior. The default
-     * (`false`) falls back to drawing the component and its children with an alpha
-     * applied to the paint used to draw each element instead of rendering the full
-     * component offscreen and compositing it back with an alpha value. This default
-     * may be noticeable and undesired in the case where the `View` you are setting
-     * an opacity on has multiple overlapping elements (e.g. multiple overlapping
-     * `View`s, or text and a background).
-     *
-     * Rendering offscreen to preserve correct alpha behavior is extremely
-     * expensive and hard to debug for non-native developers, which is why it is
-     * not turned on by default. If you do need to enable this property for an
-     * animation, consider combining it with renderToHardwareTextureAndroid if the
-     * view **contents** are static (i.e. it doesn't need to be redrawn each frame).
-     * If that property is enabled, this View will be rendered off-screen once,
-     * saved in a hardware texture, and then composited onto the screen with an alpha
-     * each frame without having to switch rendering targets on the GPU.
-     *
-     * @platform android
-     */
-    needsOffscreenAlphaCompositing: PropTypes.bool,
-  },
+  propTypes: ViewPropTypes,
 
   contextTypes: {
     isInAParentText: React.PropTypes.bool,
diff --git a/Libraries/Components/View/ViewPropTypes.js b/Libraries/Components/View/ViewPropTypes.js
new file mode 100644
index 00000000000000..86f9f878718d6b
--- /dev/null
+++ b/Libraries/Components/View/ViewPropTypes.js
@@ -0,0 +1,410 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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 ViewPropTypes
+ * @flow
+ */
+'use strict';
+
+const EdgeInsetsPropType = require('EdgeInsetsPropType');
+const Platform = require('Platform');
+const StyleSheetPropType = require('StyleSheetPropType');
+const ViewStylePropTypes = require('ViewStylePropTypes');
+
+const { PropTypes } = require('React');
+const {
+  AccessibilityComponentTypes,
+  AccessibilityTraits,
+} = require('ViewAccessibility');
+
+var TVViewPropTypes = {};
+if (Platform.isTVOS) {
+  TVViewPropTypes = require('TVViewPropTypes');
+}
+
+const stylePropType = StyleSheetPropType(ViewStylePropTypes);
+
+module.exports = {
+  ...TVViewPropTypes,
+
+  /**
+   * When `true`, indicates that the view is an accessibility element. By default,
+   * all the touchable elements are accessible.
+   */
+  accessible: PropTypes.bool,
+
+  /**
+   * Overrides the text that's read by the screen reader when the user interacts
+   * with the element. By default, the label is constructed by traversing all the
+   * children and accumulating all the `Text` nodes separated by space.
+   */
+  accessibilityLabel: PropTypes.node,
+
+  /**
+   * Indicates to accessibility services to treat UI component like a
+   * native one. Works for Android only.
+   *
+   * Possible values are one of:
+   *
+   * - `'none'`
+   * - `'button'`
+   * - `'radiobutton_checked'`
+   * - `'radiobutton_unchecked'`
+   *
+   * @platform android
+   */
+  accessibilityComponentType: PropTypes.oneOf(AccessibilityComponentTypes),
+
+  /**
+   * Indicates to accessibility services whether the user should be notified
+   * when this view changes. Works for Android API >= 19 only.
+   * Possible values:
+   *
+   * - `'none'` - Accessibility services should not announce changes to this view.
+   * - `'polite'`- Accessibility services should announce changes to this view.
+   * - `'assertive'` - Accessibility services should interrupt ongoing speech to immediately announce changes to this view.
+   *
+   * See the [Android `View` docs](http://developer.android.com/reference/android/view/View.html#attr_android:accessibilityLiveRegion)
+   * for reference.
+   *
+   * @platform android
+   */
+  accessibilityLiveRegion: PropTypes.oneOf([
+    'none',
+    'polite',
+    'assertive',
+  ]),
+
+  /**
+   * Controls how view is important for accessibility which is if it
+   * fires accessibility events and if it is reported to accessibility services
+   * that query the screen. Works for Android only.
+   *
+   * Possible values:
+   *
+   *  - `'auto'` - The system determines whether the view is important for accessibility -
+   *    default (recommended).
+   *  - `'yes'` - The view is important for accessibility.
+   *  - `'no'` - The view is not important for accessibility.
+   *  - `'no-hide-descendants'` - The view is not important for accessibility,
+   *    nor are any of its descendant views.
+   *
+   * See the [Android `importantForAccessibility` docs](http://developer.android.com/reference/android/R.attr.html#importantForAccessibility)
+   * for reference.
+   *
+   * @platform android
+   */
+  importantForAccessibility: PropTypes.oneOf([
+    'auto',
+    'yes',
+    'no',
+    'no-hide-descendants',
+  ]),
+
+  /**
+   * Provides additional traits to screen reader. By default no traits are
+   * provided unless specified otherwise in element.
+   *
+   * You can provide one trait or an array of many traits.
+   *
+   * Possible values for `AccessibilityTraits` are:
+   *
+   * - `'none'` - The element has no traits.
+   * - `'button'` - The element should be treated as a button.
+   * - `'link'` - The element should be treated as a link.
+   * - `'header'` - The element is a header that divides content into sections.
+   * - `'search'` - The element should be treated as a search field.
+   * - `'image'` - The element should be treated as an image.
+   * - `'selected'` - The element is selected.
+   * - `'plays'` - The element plays sound.
+   * - `'key'` - The element should be treated like a keyboard key.
+   * - `'text'` - The element should be treated as text.
+   * - `'summary'` - The element provides app summary information.
+   * - `'disabled'` - The element is disabled.
+   * - `'frequentUpdates'` - The element frequently changes its value.
+   * - `'startsMedia'` - The element starts a media session.
+   * - `'adjustable'` - The element allows adjustment over a range of values.
+   * - `'allowsDirectInteraction'` - The element allows direct touch interaction for VoiceOver users.
+   * - `'pageTurn'` - Informs VoiceOver that it should scroll to the next page when it finishes reading the contents of the element.
+   *
+   * See the [Accessibility guide](docs/accessibility.html#accessibilitytraits-ios)
+   * for more information.
+   *
+   * @platform ios
+   */
+  accessibilityTraits: PropTypes.oneOfType([
+    PropTypes.oneOf(AccessibilityTraits),
+    PropTypes.arrayOf(PropTypes.oneOf(AccessibilityTraits)),
+  ]),
+
+  /**
+   * A value indicating whether VoiceOver should ignore the elements
+   * within views that are siblings of the receiver.
+   * Default is `false`.
+   *
+   * See the [Accessibility guide](docs/accessibility.html#accessibilitytraits-ios)
+   * for more information.
+   *
+   * @platform ios
+   */
+  accessibilityViewIsModal: PropTypes.bool,
+
+  /**
+   * When `accessible` is true, the system will try to invoke this function
+   * when the user performs accessibility tap gesture.
+   */
+  onAccessibilityTap: PropTypes.func,
+
+  /**
+   * When `accessible` is `true`, the system will invoke this function when the
+   * user performs the magic tap gesture.
+   */
+  onMagicTap: PropTypes.func,
+
+  /**
+   * Used to locate this view in end-to-end tests.
+   *
+   * > This disables the 'layout-only view removal' optimization for this view!
+   */
+  testID: PropTypes.string,
+
+  /**
+   * For most touch interactions, you'll simply want to wrap your component in
+   * `TouchableHighlight` or `TouchableOpacity`. Check out `Touchable.js`,
+   * `ScrollResponder.js` and `ResponderEventPlugin.js` for more discussion.
+   */
+
+  /**
+   * The View is now responding for touch events. This is the time to highlight and show the user
+   * what is happening.
+   *
+   * `View.props.onResponderGrant: (event) => {}`, where `event` is a synthetic touch event as
+   * described above.
+   */
+  onResponderGrant: PropTypes.func,
+
+  /**
+   * The user is moving their finger.
+   *
+   * `View.props.onResponderMove: (event) => {}`, where `event` is a synthetic touch event as
+   * described above.
+   */
+  onResponderMove: PropTypes.func,
+
+  /**
+   * Another responder is already active and will not release it to that `View` asking to be
+   * the responder.
+   *
+   * `View.props.onResponderReject: (event) => {}`, where `event` is a synthetic touch event as
+   * described above.
+   */
+  onResponderReject: PropTypes.func,
+
+  /**
+   * Fired at the end of the touch.
+   *
+   * `View.props.onResponderRelease: (event) => {}`, where `event` is a synthetic touch event as
+   * described above.
+   */
+  onResponderRelease: PropTypes.func,
+
+  /**
+   * The responder has been taken from the `View`. Might be taken by other views after a call to
+   * `onResponderTerminationRequest`, or might be taken by the OS without asking (e.g., happens
+   * with control center/ notification center on iOS)
+   *
+   * `View.props.onResponderTerminate: (event) => {}`, where `event` is a synthetic touch event as
+   * described above.
+   */
+  onResponderTerminate: PropTypes.func,
+
+  /**
+   * Some other `View` wants to become responder and is asking this `View` to release its
+   * responder. Returning `true` allows its release.
+   *
+   * `View.props.onResponderTerminationRequest: (event) => {}`, where `event` is a synthetic touch
+   * event as described above.
+   */
+  onResponderTerminationRequest: PropTypes.func,
+
+  /**
+   * Does this view want to become responder on the start of a touch?
+   *
+   * `View.props.onStartShouldSetResponder: (event) => [true | false]`, where `event` is a
+   * synthetic touch event as described above.
+   */
+  onStartShouldSetResponder: PropTypes.func,
+
+  /**
+   * If a parent `View` wants to prevent a child `View` from becoming responder on a touch start,
+   * it should have this handler which returns `true`.
+   *
+   * `View.props.onStartShouldSetResponderCapture: (event) => [true | false]`, where `event` is a
+   * synthetic touch event as described above.
+   */
+  onStartShouldSetResponderCapture: PropTypes.func,
+
+  /**
+   * Does this view want to "claim" touch responsiveness? This is called for every touch move on
+   * the `View` when it is not the responder.
+   *
+   * `View.props.onMoveShouldSetResponder: (event) => [true | false]`, where `event` is a
+   * synthetic touch event as described above.
+   */
+  onMoveShouldSetResponder: PropTypes.func,
+
+  /**
+  * If a parent `View` wants to prevent a child `View` from becoming responder on a move,
+  * it should have this handler which returns `true`.
+  *
+  * `View.props.onMoveShouldSetResponderCapture: (event) => [true | false]`, where `event` is a
+  * synthetic touch event as described above.
+   */
+  onMoveShouldSetResponderCapture: PropTypes.func,
+
+  /**
+   * This defines how far a touch event can start away from the view.
+   * Typical interface guidelines recommend touch targets that are at least
+   * 30 - 40 points/density-independent pixels.
+   *
+   * For example, if a touchable view has a height of 20 the touchable height can be extended to
+   * 40 with `hitSlop={{top: 10, bottom: 10, left: 0, right: 0}}`
+   *
+   * > The touch area never extends past the parent view bounds and the Z-index
+   * > of sibling views always takes precedence if a touch hits two overlapping
+   * > views.
+   */
+  hitSlop: EdgeInsetsPropType,
+
+  /**
+   * Invoked on mount and layout changes with:
+   *
+   * `{nativeEvent: { layout: {x, y, width, height}}}`
+   *
+   * This event is fired immediately once the layout has been calculated, but
+   * the new layout may not yet be reflected on the screen at the time the
+   * event is received, especially if a layout animation is in progress.
+   */
+  onLayout: PropTypes.func,
+
+  /**
+   * Controls whether the `View` can be the target of touch events.
+   *
+   *   - `'auto'`: The View can be the target of touch events.
+   *   - `'none'`: The View is never the target of touch events.
+   *   - `'box-none'`: The View is never the target of touch events but it's
+   *     subviews can be. It behaves like if the view had the following classes
+   *     in CSS:
+   * ```
+   * .box-none {
+   *      pointer-events: none;
+   * }
+   * .box-none * {
+   *      pointer-events: all;
+   * }
+   * ```
+   *   - `'box-only'`: The view can be the target of touch events but it's
+   *     subviews cannot be. It behaves like if the view had the following classes
+   *     in CSS:
+   * ```
+   * .box-only {
+   *      pointer-events: all;
+   * }
+   * .box-only * {
+   *      pointer-events: none;
+   * }
+   * ```
+   * > Since `pointerEvents` does not affect layout/appearance, and we are
+   * > already deviating from the spec by adding additional modes, we opt to not
+   * > include `pointerEvents` on `style`. On some platforms, we would need to
+   * > implement it as a `className` anyways. Using `style` or not is an
+   * > implementation detail of the platform.
+   */
+  pointerEvents: PropTypes.oneOf([
+    'box-none',
+    'none',
+    'box-only',
+    'auto',
+  ]),
+  style: stylePropType,
+
+  /**
+   * This is a special performance property exposed by `RCTView` and is useful
+   * for scrolling content when there are many subviews, most of which are
+   * offscreen. For this property to be effective, it must be applied to a
+   * view that contains many subviews that extend outside its bound. The
+   * subviews must also have `overflow: hidden`, as should the containing view
+   * (or one of its superviews).
+   */
+  removeClippedSubviews: PropTypes.bool,
+
+  /**
+   * Whether this `View` should render itself (and all of its children) into a
+   * single hardware texture on the GPU.
+   *
+   * On Android, this is useful for animations and interactions that only
+   * modify opacity, rotation, translation, and/or scale: in those cases, the
+   * view doesn't have to be redrawn and display lists don't need to be
+   * re-executed. The texture can just be re-used and re-composited with
+   * different parameters. The downside is that this can use up limited video
+   * memory, so this prop should be set back to false at the end of the
+   * interaction/animation.
+   *
+   * @platform android
+   */
+  renderToHardwareTextureAndroid: PropTypes.bool,
+
+  /**
+   * Whether this `View` should be rendered as a bitmap before compositing.
+   *
+   * On iOS, this is useful for animations and interactions that do not
+   * modify this component's dimensions nor its children; for example, when
+   * translating the position of a static view, rasterization allows the
+   * renderer to reuse a cached bitmap of a static view and quickly composite
+   * it during each frame.
+   *
+   * Rasterization incurs an off-screen drawing pass and the bitmap consumes
+   * memory. Test and measure when using this property.
+   *
+   * @platform ios
+   */
+  shouldRasterizeIOS: PropTypes.bool,
+
+  /**
+   * Views that are only used to layout their children or otherwise don't draw
+   * anything may be automatically removed from the native hierarchy as an
+   * optimization. Set this property to `false` to disable this optimization and
+   * ensure that this `View` exists in the native view hierarchy.
+   *
+   * @platform android
+   */
+  collapsable: PropTypes.bool,
+
+  /**
+   * Whether this `View` needs to rendered offscreen and composited with an alpha
+   * in order to preserve 100% correct colors and blending behavior. The default
+   * (`false`) falls back to drawing the component and its children with an alpha
+   * applied to the paint used to draw each element instead of rendering the full
+   * component offscreen and compositing it back with an alpha value. This default
+   * may be noticeable and undesired in the case where the `View` you are setting
+   * an opacity on has multiple overlapping elements (e.g. multiple overlapping
+   * `View`s, or text and a background).
+   *
+   * Rendering offscreen to preserve correct alpha behavior is extremely
+   * expensive and hard to debug for non-native developers, which is why it is
+   * not turned on by default. If you do need to enable this property for an
+   * animation, consider combining it with renderToHardwareTextureAndroid if the
+   * view **contents** are static (i.e. it doesn't need to be redrawn each frame).
+   * If that property is enabled, this View will be rendered off-screen once,
+   * saved in a hardware texture, and then composited onto the screen with an alpha
+   * each frame without having to switch rendering targets on the GPU.
+   *
+   * @platform android
+   */
+  needsOffscreenAlphaCompositing: PropTypes.bool,
+};

From 123311cad2ad70071a96881138326a67e080dbf9 Mon Sep 17 00:00:00 2001
From: Peter Hoang <peterhoang@utexas.edu>
Date: Thu, 23 Mar 2017 10:42:44 -0700
Subject: [PATCH 159/366] Update GettingStarted.md

Summary:
Typing "android avd" into the terminal is not supported anymore. The android command is no longer available. There are workarounds, but it involves replacing files with the older ones.

Thanks for submitting a PR! Please read these instructions carefully:

- [ ] Explain the **motivation** for making this change.
- [ ] Provide a **test plan** demonstrating that the code is solid.
- [ ] Match the **code formatting** of the rest of the codebase.
- [ ] Target the `master` branch, NOT a "stable" branch.

What existing problem does the pull request solve?

A good test plan has the exact commands you ran and their output, provides screenshots or videos if the pull request changes UI or updates the website. See [What is a Test Plan?][1] to learn more.

If you have added code that should be tested, add tests.

Sign the [CLA][2], if you haven't already.

Small pull requests are much easier to review and more likely to get merged
Closes https://github.com/facebook/react-native/pull/13096

Reviewed By: AsyncDBConnMarkedDownDBException

Differential Revision: D4762937

Pulled By: AsyncDBConnMarkedDownDBException

fbshipit-source-id: 5289402d7e6934d3493a902247a991cd1d887ec0
---
 docs/GettingStarted.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/docs/GettingStarted.md b/docs/GettingStarted.md
index 2aa0b2623e0112..5a7868eb993be4 100644
--- a/docs/GettingStarted.md
+++ b/docs/GettingStarted.md
@@ -290,11 +290,7 @@ changes in the filesystem. It is highly recommended you install it for better pe
 
 ![Android Studio AVD Manager](img/react-native-tools-avd.png)
 
-You can see the list of available AVDs by opening the "AVD Manager" from within Android Studio. You can also run the following command in a terminal:
-
-```
-android avd
-```
+You can see the list of available AVDs by opening the "AVD Manager" from within Android Studio.
 
 Once in the "AVD Manager", select your AVD and click "Edit...". Choose "Android 6.0 - API Level 23" under Device, and "Intel Atom (x86_64)" under CPU/ABI. Click OK, then select your new AVD and click "Start...", and finally, "Launch".
 

From 333dd5953351db9cb7553af2dc4752c6098827bc Mon Sep 17 00:00:00 2001
From: Brian Vaughn <bvaughn@fb.com>
Date: Thu, 23 Mar 2017 10:50:21 -0700
Subject: [PATCH 160/366] ReactNativeFiber findNodeHandle() bugfix

Reviewed By: sahrens

Differential Revision: D4762397

fbshipit-source-id: d047f5c77067dbf8b0331695bb661e04ce00913c
---
 Libraries/Renderer/src/renderers/native/ReactNativeFiber.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeFiber.js b/Libraries/Renderer/src/renderers/native/ReactNativeFiber.js
index 783ae91397dfa0..014b4dfa85de8e 100644
--- a/Libraries/Renderer/src/renderers/native/ReactNativeFiber.js
+++ b/Libraries/Renderer/src/renderers/native/ReactNativeFiber.js
@@ -382,7 +382,10 @@ const ReactNative = {
   // See NativeMethodsMixin#setNativeProps for more info on why this is done.
   findNodeHandle(componentOrHandle: any): ?number {
     const instance: any = findNodeHandle(componentOrHandle);
-    return instance ? instance._nativeTag : null;
+    if (instance == null || typeof instance === 'number') {
+      return instance;
+    }
+    return instance._nativeTag;
   },
 
   render(element: Element<any>, containerTag: any, callback: ?Function) {

From 04ccbdd8877424edafab815c7f7ed36adcd0e149 Mon Sep 17 00:00:00 2001
From: "Andrew Y. Chen" <ayc@fb.com>
Date: Thu, 23 Mar 2017 10:52:48 -0700
Subject: [PATCH 161/366] Move NetworkRecordingModuleMock into testing/network

Reviewed By: AaaChiuuu

Differential Revision: D4755904

fbshipit-source-id: 8a68530453b1d288da402f17e16fec9c57e5bb2a
---
 .../java/com/facebook/react/testing/BUCK          |  1 +
 .../java/com/facebook/react/testing/network/BUCK  | 15 +++++++++++++++
 .../{ => network}/NetworkRecordingModuleMock.java |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/BUCK
 rename ReactAndroid/src/androidTest/java/com/facebook/react/testing/{ => network}/NetworkRecordingModuleMock.java (98%)

diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
index 6814e3aa316138..33a71555d41223 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
@@ -29,5 +29,6 @@ android_library(
         react_native_target("java/com/facebook/react/shell:shell"),
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
         react_native_integration_tests_target("java/com/facebook/react/testing/idledetection:idledetection"),
+        react_native_integration_tests_target("java/com/facebook/react/testing/network:network"),
     ],
 )
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/BUCK
new file mode 100644
index 00000000000000..860ac4448837f0
--- /dev/null
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/BUCK
@@ -0,0 +1,15 @@
+include_defs("//ReactAndroid/DEFS")
+
+android_library(
+    name = "network",
+    srcs = glob(["**/*.java"]),
+    visibility = [
+        "PUBLIC",
+    ],
+    deps = [
+        react_native_dep("third-party/android/support/v4:lib-support-v4"),
+        react_native_dep("third-party/java/jsr-305:jsr-305"),
+        react_native_target("java/com/facebook/react/bridge:bridge"),
+        react_native_target("java/com/facebook/react/modules/core:core"),
+    ],
+)
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/NetworkRecordingModuleMock.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/NetworkRecordingModuleMock.java
similarity index 98%
rename from ReactAndroid/src/androidTest/java/com/facebook/react/testing/NetworkRecordingModuleMock.java
rename to ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/NetworkRecordingModuleMock.java
index 204d7de7205129..bf1b4e232db507 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/NetworkRecordingModuleMock.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/NetworkRecordingModuleMock.java
@@ -6,7 +6,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package com.facebook.react.testing;
+package com.facebook.react.testing.network;
 
 import javax.annotation.Nullable;
 

From 10918680eb34dd4bc4fee0846c4b2f49186c9eec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <hramos@users.noreply.github.com>
Date: Thu, 23 Mar 2017 11:05:26 -0700
Subject: [PATCH 162/366] Fix grammar in the "Running on a device" docs

Summary:
The wording had some grammar issues. The instructions were also not as precise as they could be.

Verified on Xcode 8.2.1.
Closes https://github.com/facebook/react-native/pull/13093

Differential Revision: D4763071

Pulled By: hramos

fbshipit-source-id: fe9da098f0e457efba4712db704692f6f4857624
---
 docs/RunningOnDevice.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/RunningOnDevice.md b/docs/RunningOnDevice.md
index 56d17de1cc5d1e..b4ea4365213cde 100644
--- a/docs/RunningOnDevice.md
+++ b/docs/RunningOnDevice.md
@@ -56,11 +56,11 @@ Installing an app on an iOS device requires a Mac, an Apple ID, and a USB cable.
 
 <block class="mac ios" />
 
-Connect your device to your Mac via USB, then open Xcode. Navigate into `ios` folder of your project and open the file ending .xcodeproj inside it. In the project navigator, choose your device from the Product > Destination toolbar menu. Xcode will then register your device for development.
+Connect your device to your Mac using a USB cable. Navigate to the `ios` folder in your project, then open the `.xcodeproj` file within it using Xcode. Open the "Product" menu from the menubar, then go to "Destination". Look for and select your device from the list. Xcode will then register your device for development.
 
-> If you run into any issues, please take a look at Apple's [Launching Your App on a Device docs](https://developer.apple.com/library/content/documentation/IDEs/Conceptual/AppDistributionGuide/LaunchingYourApponDevices/LaunchingYourApponDevices.html#//apple_ref/doc/uid/TP40012582-CH27-SW4).
+If everything is set up correctly, your device will be listed as the build target in the Xcode toolbar. You can now press the **Build and run** button or select "Run" from the "Product" menu. Your app will launch on your device shortly.
 
-Finally, select your phone as the build target and press **Build and run**.
+> If you run into any issues, please take a look at Apple's [Launching Your App on a Device](https://developer.apple.com/library/content/documentation/IDEs/Conceptual/AppDistributionGuide/LaunchingYourApponDevices/LaunchingYourApponDevices.html#//apple_ref/doc/uid/TP40012582-CH27-SW4) docs.
 
 <block class="mac windows linux android" />
 

From f06384b1b7ed32e9acc70259800b60840478a08d Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Thu, 23 Mar 2017 11:07:08 -0700
Subject: [PATCH 163/366] packager: ResolutionRequest.js: _loadAsDir and
 _loadAsFile sync

Reviewed By: davidaurelio

Differential Revision: D4754090

fbshipit-source-id: 84ad1d988bf097d3094d90f3738ce64cc523879c
---
 .../DependencyGraph/ResolutionRequest.js      | 166 ++++++++++--------
 1 file changed, 91 insertions(+), 75 deletions(-)

diff --git a/packager/src/node-haste/DependencyGraph/ResolutionRequest.js b/packager/src/node-haste/DependencyGraph/ResolutionRequest.js
index 22e7aaf6400152..fce45179551ba6 100644
--- a/packager/src/node-haste/DependencyGraph/ResolutionRequest.js
+++ b/packager/src/node-haste/DependencyGraph/ResolutionRequest.js
@@ -51,6 +51,22 @@ type Options = {
   preferNativePlatform: boolean,
 };
 
+/**
+ * It may not be a great pattern to leverage exception just for "trying" things
+ * out, notably for performance. We should consider replacing these functions
+ * to be nullable-returning, or being better stucture to the algorithm.
+ */
+function tryResolveSync<T>(action: () => T, secondaryAction: () => T): T {
+  try {
+    return action();
+  } catch (error) {
+    if (error.type !== 'UnableToResolveError') {
+      throw error;
+    }
+    return secondaryAction();
+  }
+}
+
 class ResolutionRequest {
   _dirExists: DirExistsFn;
   _entryPath: string;
@@ -268,7 +284,7 @@ class ResolutionRequest {
           package_.root,
           path.relative(packageName, realModuleName)
         );
-        return this._tryResolve(
+        return tryResolveSync(
           () => this._loadAsFile(
             potentialModulePath,
             fromModule,
@@ -310,7 +326,7 @@ class ResolutionRequest {
           );
         }
 
-        return this._tryResolve(
+        return tryResolveSync(
           () => this._loadAsFile(realModuleName, fromModule, toModuleName),
           () => this._loadAsDir(realModuleName, fromModule, toModuleName)
         );
@@ -371,9 +387,13 @@ class ResolutionRequest {
             p = this._tryResolve(
               () => this._tryResolve(
                 () => p,
-                () => this._loadAsFile(potentialModulePath, fromModule, toModuleName),
+                () => Promise.resolve().then(
+                  () => this._loadAsFile(potentialModulePath, fromModule, toModuleName),
+                ),
+              ),
+              () => Promise.resolve().then(
+                () => this._loadAsDir(potentialModulePath, fromModule, toModuleName),
               ),
-              () => this._loadAsDir(potentialModulePath, fromModule, toModuleName)
             );
           });
 
@@ -398,91 +418,87 @@ class ResolutionRequest {
     }
   }
 
-  _loadAsFile(potentialModulePath: string, fromModule: Module, toModule: string): Promise<Module> {
-    return Promise.resolve().then(() => {
-      if (this._helpers.isAssetFile(potentialModulePath)) {
-        let dirname = path.dirname(potentialModulePath);
-        if (!this._dirExists(dirname)) {
-          throw new UnableToResolveError(
-            fromModule,
-            toModule,
-            `Directory ${dirname} doesn't exist`,
-          );
-        }
-
-        const {name, type} = getAssetDataFromName(potentialModulePath, this._platforms);
-
-        let pattern = name + '(@[\\d\\.]+x)?';
-        if (this._platform != null) {
-          pattern += '(\\.' + this._platform + ')?';
-        }
-        pattern += '\\.' + type;
-
-        // Escape backslashes in the path to be able to use it in the regex
-        if (path.sep === '\\') {
-          dirname = dirname.replace(/\\/g, '\\\\');
-        }
-
-        // We arbitrarly grab the first one, because scale selection
-        // will happen somewhere
-        const [assetFile] = this._hasteFS.matchFiles(
-          new RegExp(dirname + '(\/|\\\\)' + pattern)
-        );
-        if (assetFile) {
-          return this._moduleCache.getAssetModule(assetFile);
-        }
-      }
-
-      let file;
-      if (this._hasteFS.exists(potentialModulePath)) {
-        file = potentialModulePath;
-      } else if (this._platform != null &&
-                 this._hasteFS.exists(potentialModulePath + '.' + this._platform + '.js')) {
-        file = potentialModulePath + '.' + this._platform + '.js';
-      } else if (this._preferNativePlatform &&
-                 this._hasteFS.exists(potentialModulePath + '.native.js')) {
-        file = potentialModulePath + '.native.js';
-      } else if (this._hasteFS.exists(potentialModulePath + '.js')) {
-        file = potentialModulePath + '.js';
-      } else if (this._hasteFS.exists(potentialModulePath + '.json')) {
-        file = potentialModulePath + '.json';
-      } else {
+  _loadAsFile(potentialModulePath: string, fromModule: Module, toModule: string): Module {
+    if (this._helpers.isAssetFile(potentialModulePath)) {
+      let dirname = path.dirname(potentialModulePath);
+      if (!this._dirExists(dirname)) {
         throw new UnableToResolveError(
           fromModule,
           toModule,
-          `File ${potentialModulePath} doesn't exist`,
+          `Directory ${dirname} doesn't exist`,
         );
       }
 
-      return this._moduleCache.getModule(file);
-    });
-  }
+      const {name, type} = getAssetDataFromName(potentialModulePath, this._platforms);
 
-  _loadAsDir(potentialDirPath: string, fromModule: Module, toModule: string) {
-    return Promise.resolve().then(() => {
-      if (!this._dirExists(potentialDirPath)) {
-        throw new UnableToResolveError(
-          fromModule,
-          toModule,
-          `Directory ${potentialDirPath} doesn't exist`,
-        );
+      let pattern = name + '(@[\\d\\.]+x)?';
+      if (this._platform != null) {
+        pattern += '(\\.' + this._platform + ')?';
       }
+      pattern += '\\.' + type;
 
-      const packageJsonPath = path.join(potentialDirPath, 'package.json');
-      if (this._hasteFS.exists(packageJsonPath)) {
-        const main = this._moduleCache.getPackage(packageJsonPath).getMain();
-        return this._tryResolve(
-          () => this._loadAsFile(main, fromModule, toModule),
-          () => this._loadAsDir(main, fromModule, toModule),
-        );
+      // Escape backslashes in the path to be able to use it in the regex
+      if (path.sep === '\\') {
+        dirname = dirname.replace(/\\/g, '\\\\');
+      }
+
+      // We arbitrarly grab the first one, because scale selection
+      // will happen somewhere
+      const [assetFile] = this._hasteFS.matchFiles(
+        new RegExp(dirname + '(\/|\\\\)' + pattern)
+      );
+      if (assetFile) {
+        return this._moduleCache.getAssetModule(assetFile);
       }
+    }
 
-      return this._loadAsFile(
-        path.join(potentialDirPath, 'index'),
+    let file;
+    if (this._hasteFS.exists(potentialModulePath)) {
+      file = potentialModulePath;
+    } else if (this._platform != null &&
+               this._hasteFS.exists(potentialModulePath + '.' + this._platform + '.js')) {
+      file = potentialModulePath + '.' + this._platform + '.js';
+    } else if (this._preferNativePlatform &&
+               this._hasteFS.exists(potentialModulePath + '.native.js')) {
+      file = potentialModulePath + '.native.js';
+    } else if (this._hasteFS.exists(potentialModulePath + '.js')) {
+      file = potentialModulePath + '.js';
+    } else if (this._hasteFS.exists(potentialModulePath + '.json')) {
+      file = potentialModulePath + '.json';
+    } else {
+      throw new UnableToResolveError(
         fromModule,
         toModule,
+        `File ${potentialModulePath} doesn't exist`,
       );
-    });
+    }
+
+    return this._moduleCache.getModule(file);
+  }
+
+  _loadAsDir(potentialDirPath: string, fromModule: Module, toModule: string): Module {
+    if (!this._dirExists(potentialDirPath)) {
+      throw new UnableToResolveError(
+        fromModule,
+        toModule,
+        `Directory ${potentialDirPath} doesn't exist`,
+      );
+    }
+
+    const packageJsonPath = path.join(potentialDirPath, 'package.json');
+    if (this._hasteFS.exists(packageJsonPath)) {
+      const main = this._moduleCache.getPackage(packageJsonPath).getMain();
+      return tryResolveSync(
+        () => this._loadAsFile(main, fromModule, toModule),
+        () => this._loadAsDir(main, fromModule, toModule),
+      );
+    }
+
+    return this._loadAsFile(
+      path.join(potentialDirPath, 'index'),
+      fromModule,
+      toModule,
+    );
   }
 
   _resetResolutionCache() {

From 3f0f7357cf7350483fd83c6c9b8f2eb87c93db45 Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Thu, 23 Mar 2017 11:07:10 -0700
Subject: [PATCH 164/366] packager: ResolutionRequest.js: sync
 _resolveFileOrDir

Reviewed By: davidaurelio

Differential Revision: D4754138

fbshipit-source-id: d19792a726220a673dead1c8c6cdf487e34a6808
---
 .../DependencyGraph/ResolutionRequest.js      | 207 +++++++++---------
 1 file changed, 101 insertions(+), 106 deletions(-)

diff --git a/packager/src/node-haste/DependencyGraph/ResolutionRequest.js b/packager/src/node-haste/DependencyGraph/ResolutionRequest.js
index fce45179551ba6..7bdfec7d5280d4 100644
--- a/packager/src/node-haste/DependencyGraph/ResolutionRequest.js
+++ b/packager/src/node-haste/DependencyGraph/ResolutionRequest.js
@@ -302,120 +302,115 @@ class ResolutionRequest {
     });
   }
 
-  _redirectRequire(fromModule: Module, modulePath: string) {
-    return Promise.resolve(fromModule.getPackage()).then(p => {
-      if (p) {
-        return p.redirectRequire(modulePath);
-      }
-      return modulePath;
-    });
+  _redirectRequire(fromModule: Module, modulePath: string): string | false {
+    const pck = fromModule.getPackage();
+    if (pck) {
+      return pck.redirectRequire(modulePath);
+    }
+    return modulePath;
   }
 
-  _resolveFileOrDir(fromModule: Module, toModuleName: string) {
+  _resolveFileOrDir(fromModule: Module, toModuleName: string): Module {
     const potentialModulePath = isAbsolutePath(toModuleName) ?
-        resolveWindowsPath(toModuleName) :
-        path.join(path.dirname(fromModule.path), toModuleName);
-
-    return this._redirectRequire(fromModule, potentialModulePath).then(
-      realModuleName => {
-        if (realModuleName === false) {
-          return this._loadAsFile(
-            ResolutionRequest.emptyModule,
-            fromModule,
-            toModuleName,
+      resolveWindowsPath(toModuleName) :
+      path.join(path.dirname(fromModule.path), toModuleName);
+
+    const realModuleName = this._redirectRequire(fromModule, potentialModulePath);
+    if (realModuleName === false) {
+      return this._loadAsFile(
+        ResolutionRequest.emptyModule,
+        fromModule,
+        toModuleName,
+      );
+    }
+
+    return tryResolveSync(
+      () => this._loadAsFile(realModuleName, fromModule, toModuleName),
+      () => this._loadAsDir(realModuleName, fromModule, toModuleName)
+    );
+  }
+
+  _resolveNodeDependency(fromModule: Module, toModuleName: string): Promise<Module> {
+    return Promise.resolve().then(() => {
+      if (isRelativeImport(toModuleName) || isAbsolutePath(toModuleName)) {
+        return this._resolveFileOrDir(fromModule, toModuleName);
+      }
+      const realModuleName = this._redirectRequire(fromModule, toModuleName);
+      // exclude
+      if (realModuleName === false) {
+        return this._loadAsFile(
+          ResolutionRequest.emptyModule,
+          fromModule,
+          toModuleName,
+        );
+      }
+
+      if (isRelativeImport(realModuleName) || isAbsolutePath(realModuleName)) {
+        // derive absolute path /.../node_modules/fromModuleDir/realModuleName
+        const fromModuleParentIdx = fromModule.path.lastIndexOf('node_modules' + path.sep) + 13;
+        const fromModuleDir = fromModule.path.slice(
+          0,
+          fromModule.path.indexOf(path.sep, fromModuleParentIdx),
+        );
+        const absPath = path.join(fromModuleDir, realModuleName);
+        return this._resolveFileOrDir(fromModule, absPath);
+      }
+
+      const searchQueue = [];
+      for (let currDir = path.dirname(fromModule.path);
+           currDir !== '.' && currDir !== realPath.parse(fromModule.path).root;
+           currDir = path.dirname(currDir)) {
+        const searchPath = path.join(currDir, 'node_modules');
+        if (this._dirExists(searchPath)) {
+          searchQueue.push(
+            path.join(searchPath, realModuleName)
           );
         }
+      }
 
-        return tryResolveSync(
-          () => this._loadAsFile(realModuleName, fromModule, toModuleName),
-          () => this._loadAsDir(realModuleName, fromModule, toModuleName)
-        );
+      if (this._extraNodeModules) {
+        const {_extraNodeModules} = this;
+        const bits = toModuleName.split(path.sep);
+        const packageName = bits[0];
+        if (_extraNodeModules[packageName]) {
+          bits[0] = _extraNodeModules[packageName];
+          searchQueue.push(path.join.apply(path, bits));
+        }
       }
-    );
-  }
 
-  _resolveNodeDependency(fromModule: Module, toModuleName: string) {
-    if (isRelativeImport(toModuleName) || isAbsolutePath(toModuleName)) {
-      return this._resolveFileOrDir(fromModule, toModuleName);
-    } else {
-      return this._redirectRequire(fromModule, toModuleName).then(
-        realModuleName => {
-          // exclude
-          if (realModuleName === false) {
-            return this._loadAsFile(
-              ResolutionRequest.emptyModule,
-              fromModule,
-              toModuleName,
-            );
-          }
-
-          if (isRelativeImport(realModuleName) || isAbsolutePath(realModuleName)) {
-            // derive absolute path /.../node_modules/fromModuleDir/realModuleName
-            const fromModuleParentIdx = fromModule.path.lastIndexOf('node_modules' + path.sep) + 13;
-            const fromModuleDir = fromModule.path.slice(
-              0,
-              fromModule.path.indexOf(path.sep, fromModuleParentIdx),
-            );
-            const absPath = path.join(fromModuleDir, realModuleName);
-            return this._resolveFileOrDir(fromModule, absPath);
-          }
-
-          const searchQueue = [];
-          for (let currDir = path.dirname(fromModule.path);
-               currDir !== '.' && currDir !== realPath.parse(fromModule.path).root;
-               currDir = path.dirname(currDir)) {
-            const searchPath = path.join(currDir, 'node_modules');
-            if (this._dirExists(searchPath)) {
-              searchQueue.push(
-                path.join(searchPath, realModuleName)
-              );
-            }
-          }
-
-          if (this._extraNodeModules) {
-            const {_extraNodeModules} = this;
-            const bits = toModuleName.split(path.sep);
-            const packageName = bits[0];
-            if (_extraNodeModules[packageName]) {
-              bits[0] = _extraNodeModules[packageName];
-              searchQueue.push(path.join.apply(path, bits));
-            }
-          }
-
-          let p = Promise.reject(new UnableToResolveError(fromModule, toModuleName));
-          searchQueue.forEach(potentialModulePath => {
-            p = this._tryResolve(
-              () => this._tryResolve(
-                () => p,
-                () => Promise.resolve().then(
-                  () => this._loadAsFile(potentialModulePath, fromModule, toModuleName),
-                ),
-              ),
-              () => Promise.resolve().then(
-                () => this._loadAsDir(potentialModulePath, fromModule, toModuleName),
-              ),
-            );
-          });
-
-          return p.catch(error => {
-            if (error.type !== 'UnableToResolveError') {
-              throw error;
-            }
-            const hint = searchQueue.length ? ' or in these directories:' : '';
-            throw new UnableToResolveError(
-              fromModule,
-              toModuleName,
-              `Module does not exist in the module map${hint}\n` +
-                searchQueue.map(searchPath => `  ${path.dirname(searchPath)}\n`).join(', ') + '\n' +
-              `This might be related to https://github.com/facebook/react-native/issues/4968\n` +
-              `To resolve try the following:\n` +
-              `  1. Clear watchman watches: \`watchman watch-del-all\`.\n` +
-              `  2. Delete the \`node_modules\` folder: \`rm -rf node_modules && npm install\`.\n` +
-              '  3. Reset packager cache: `rm -fr $TMPDIR/react-*` or `npm start -- --reset-cache`.'
-            );
-          });
-        });
-    }
+      let p = Promise.reject(new UnableToResolveError(fromModule, toModuleName));
+      searchQueue.forEach(potentialModulePath => {
+        p = this._tryResolve(
+          () => this._tryResolve(
+            () => p,
+            () => Promise.resolve().then(
+              () => this._loadAsFile(potentialModulePath, fromModule, toModuleName),
+            ),
+          ),
+          () => Promise.resolve().then(
+            () => this._loadAsDir(potentialModulePath, fromModule, toModuleName),
+          ),
+        );
+      });
+
+      return p.catch(error => {
+        if (error.type !== 'UnableToResolveError') {
+          throw error;
+        }
+        const hint = searchQueue.length ? ' or in these directories:' : '';
+        throw new UnableToResolveError(
+          fromModule,
+          toModuleName,
+          `Module does not exist in the module map${hint}\n` +
+            searchQueue.map(searchPath => `  ${path.dirname(searchPath)}\n`).join(', ') + '\n' +
+          `This might be related to https://github.com/facebook/react-native/issues/4968\n` +
+          `To resolve try the following:\n` +
+          `  1. Clear watchman watches: \`watchman watch-del-all\`.\n` +
+          `  2. Delete the \`node_modules\` folder: \`rm -rf node_modules && npm install\`.\n` +
+          '  3. Reset packager cache: `rm -fr $TMPDIR/react-*` or `npm start -- --reset-cache`.'
+        );
+      });
+    });
   }
 
   _loadAsFile(potentialModulePath: string, fromModule: Module, toModule: string): Module {

From 337daa3d192d4da7768c638552df83ceb79f3f7d Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Thu, 23 Mar 2017 11:07:12 -0700
Subject: [PATCH 165/366] packager: ResolutionRequest.js: sync
 _resolveHasteDependency()

Summary: Some more synchronicity, one step at a time.

Reviewed By: davidaurelio

Differential Revision: D4756542

fbshipit-source-id: 0c56dbca61b3da764aa8d28e29c0e20b54de091e
---
 .../DependencyGraph/ResolutionRequest.js      | 93 +++++++++----------
 1 file changed, 46 insertions(+), 47 deletions(-)

diff --git a/packager/src/node-haste/DependencyGraph/ResolutionRequest.js b/packager/src/node-haste/DependencyGraph/ResolutionRequest.js
index 7bdfec7d5280d4..c16208044d8be3 100644
--- a/packager/src/node-haste/DependencyGraph/ResolutionRequest.js
+++ b/packager/src/node-haste/DependencyGraph/ResolutionRequest.js
@@ -131,7 +131,7 @@ class ResolutionRequest {
     if (!this._helpers.isNodeModulesDir(fromModule.path)
         && !(isRelativeImport(toModuleName) || isAbsolutePath(toModuleName))) {
       return this._tryResolve(
-        () => this._resolveHasteDependency(fromModule, toModuleName),
+        () => Promise.resolve().then(() => this._resolveHasteDependency(fromModule, toModuleName)),
         () => this._resolveNodeDependency(fromModule, toModuleName)
       ).then(cacheResult);
     }
@@ -243,63 +243,62 @@ class ResolutionRequest {
     });
   }
 
-  _resolveHasteDependency(fromModule: Module, toModuleName: string): Promise<Module> {
+  _resolveHasteDependency(fromModule: Module, toModuleName: string): Module {
     toModuleName = normalizePath(toModuleName);
 
-    let p = fromModule.getPackage();
-    if (p) {
-      p = Promise.resolve(p.redirectRequire(toModuleName));
+    const pck = fromModule.getPackage();
+    let realModuleName;
+    if (pck) {
+      realModuleName = pck.redirectRequire(toModuleName);
     } else {
-      p = Promise.resolve(toModuleName);
+      realModuleName = toModuleName;
     }
 
-    return p.then(realModuleName => {
-      const modulePath = this._moduleMap
-        .getModule(realModuleName, this._platform, /* supportsNativePlatform */ true);
-      if (modulePath != null) {
-        const module = this._moduleCache.getModule(modulePath);
-        /* temporary until we strengthen the typing */
-        invariant(module.type === 'Module', 'expected Module type');
-        return module;
-      }
-
-      let packageName = realModuleName;
-      let packagePath;
-      while (packageName && packageName !== '.') {
-        packagePath = this._moduleMap
-          .getPackage(packageName, this._platform, /* supportsNativePlatform */ true);
-        if (packagePath != null) {
-          break;
-        }
-        packageName = path.dirname(packageName);
-      }
+    const modulePath = this._moduleMap
+      .getModule(realModuleName, this._platform, /* supportsNativePlatform */ true);
+    if (modulePath != null) {
+      const module = this._moduleCache.getModule(modulePath);
+      /* temporary until we strengthen the typing */
+      invariant(module.type === 'Module', 'expected Module type');
+      return module;
+    }
 
+    let packageName = realModuleName;
+    let packagePath;
+    while (packageName && packageName !== '.') {
+      packagePath = this._moduleMap
+        .getPackage(packageName, this._platform, /* supportsNativePlatform */ true);
       if (packagePath != null) {
+        break;
+      }
+      packageName = path.dirname(packageName);
+    }
 
-        const package_ = this._moduleCache.getPackage(packagePath);
-        /* temporary until we strengthen the typing */
-        invariant(package_.type === 'Package', 'expected Package type');
+    if (packagePath != null) {
 
-        const potentialModulePath = path.join(
-          package_.root,
-          path.relative(packageName, realModuleName)
-        );
-        return tryResolveSync(
-          () => this._loadAsFile(
-            potentialModulePath,
-            fromModule,
-            toModuleName,
-          ),
-          () => this._loadAsDir(potentialModulePath, fromModule, toModuleName),
-        );
-      }
+      const package_ = this._moduleCache.getPackage(packagePath);
+      /* temporary until we strengthen the typing */
+      invariant(package_.type === 'Package', 'expected Package type');
 
-      throw new UnableToResolveError(
-        fromModule,
-        toModuleName,
-        'Unable to resolve dependency',
+      const potentialModulePath = path.join(
+        package_.root,
+        path.relative(packageName, realModuleName)
       );
-    });
+      return tryResolveSync(
+        () => this._loadAsFile(
+          potentialModulePath,
+          fromModule,
+          toModuleName,
+        ),
+        () => this._loadAsDir(potentialModulePath, fromModule, toModuleName),
+      );
+    }
+
+    throw new UnableToResolveError(
+      fromModule,
+      toModuleName,
+      'Unable to resolve dependency',
+    );
   }
 
   _redirectRequire(fromModule: Module, modulePath: string): string | false {

From 53f9e6a65980c16d7d5bec78095024c00ebc4f4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <hramos@users.noreply.github.com>
Date: Thu, 23 Mar 2017 11:09:07 -0700
Subject: [PATCH 166/366] Update ISSUE_TEMPLATE.md

Summary:
Thanks for submitting a PR! Please read these instructions carefully:

- [ ] Explain the **motivation** for making this change.
- [ ] Provide a **test plan** demonstrating that the code is solid.
- [ ] Match the **code formatting** of the rest of the codebase.
- [ ] Target the `master` branch, NOT a "stable" branch.

What existing problem does the pull request solve?

A good test plan has the exact commands you ran and their output, provides screenshots or videos if the pull request changes UI or updates the website. See [What is a Test Plan?][1] to learn more.

If you have added code that should be tested, add tests.

Sign the [CLA][2], if you haven't already.

Small pull requests are much easier to review and more likely to get merged. Make sure the PR does only one thing, otherwise please split it.

Make sure all **tests pass** on both [Travis][3] and [Circle CI][4]. PRs that break tests are unlikely to be merged.
Closes https://github.com/facebook/react-native/pull/13122

Differential Revision: D4763115

Pulled By: hramos

fbshipit-source-id: 5d4852a133d42e3fd6eb084cf491a672cf075c29
---
 .github/ISSUE_TEMPLATE.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index dcb01c326bed0e..4359d355b84200 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,25 +1,25 @@
 Please read the following carefully before opening a new issue.
+Your issue may be closed if it does not provide the information required by this template.
 
 We use GitHub Issues for tracking bugs in React Native.
 
-- If you have a non-bug question, ask on Stack Overflow: http://stackoverflow.com/questions/tagged/react-native
+- If you have a question, ask on Stack Overflow: http://stackoverflow.com/questions/tagged/react-native
 - If you have a feature request, post it on Canny: https://react-native.canny.io/feature-requests
 
-Your issue may be closed without explanation if it does not provide the information required by this template.
-
---- Please use this template, and delete everything above this line before submitting your issue ---
+--- Delete everything above this line ---
 
 ### Description
 
-[FILL THIS OUT: Explain what you did, what you expected to happen, and what actually happens.]
+Explain what you did, what you expected to happen, and what actually happens.
 
-### Reproduction
+### Reproduction Steps and Sample Code
 
-[FILL THIS OUT: Try to reproduce your bug on https://sketch.expo.io/ and provide a link. If you can't reproduce the bug on Sketch, provide a sample project. At the very least, provide an example of your code.]
+Try to reproduce your bug on https://sketch.expo.io/ and provide a link. 
+If you can't reproduce the bug on Sketch, provide a sample project. At the very least, provide an example of your code.
 
 ### Solution
 
-[FILL THIS OUT: What needs to be done to address this issue? Ideally, provide a pull request with a fix.]
+What needs to be done to address this issue? Ideally, provide a pull request with a fix.
 
 ### Additional Information
 

From 1f15c7526ae610077494b3c953504e38aa4bda7a Mon Sep 17 00:00:00 2001
From: Hector Ramos <hramos@fb.com>
Date: Thu, 23 Mar 2017 11:11:35 -0700
Subject: [PATCH 167/366] Fix broken icons in Safari

Summary:
The Play Store started serving WebP files for these icons, which are not rendered well in Safari. Switched to JPEGs from the App Store.

Periodical pruning of the showcase: Removed several entries to keep the showcase fresh.
Closes https://github.com/facebook/react-native/pull/13098

Differential Revision: D4762944

Pulled By: hramos

fbshipit-source-id: 5f9c43fd186f20b432c54496b143b4a9dd5851e3
---
 website/showcase.json | 92 ++-----------------------------------------
 1 file changed, 3 insertions(+), 89 deletions(-)

diff --git a/website/showcase.json b/website/showcase.json
index ae2ec8a5fbcb29..8c2b930033ebf8 100644
--- a/website/showcase.json
+++ b/website/showcase.json
@@ -46,7 +46,7 @@
   },
   {
     "name": "Tesla",
-    "icon": "https://lh3.googleusercontent.com/b79jRmQK2sZABaN0xI2wIAFrEcBxs0CuDzNTmF088DGrJXbemaMNRvrhqH0St28J7CU=w300-rw",
+    "icon": "http://is2.mzstatic.com/image/thumb/Purple122/v4/d2/36/28/d23628e5-c9bf-d0fb-104f-61fa52976ff5/source/175x175bb.jpg",
     "linkPlayStore": "https://play.google.com/store/apps/details?id=com.teslamotors.tesla",
     "linkAppStore": "https://itunes.apple.com/us/app/tesla-motors/id582007913?mt=8",
     "pinned": true
@@ -117,31 +117,6 @@
     "infoTitle": "The experience of a web developer building an app using React Native",
     "pinned": true
   },
-  {
-    "name": "Qzone (QQ空间)",
-    "icon": "http://pp.myapp.com/ma_icon/0/icon_9959_1460036593/96",
-    "linkPlayStore": "http://android.myapp.com/myapp/detail.htm?apkName=com.qzone",
-    "infoLink": "https://en.wikipedia.org/wiki/Qzone",
-    "infoTitle": "Qzone is a Chinese social network with over 600 million users",
-    "pinned": false
-  },
-  {
-    "name": "QQ Music (QQ音乐)",
-    "icon": "http://pp.myapp.com/ma_icon/0/icon_6259_1462429453/96",
-    "linkPlayStore": "http://android.myapp.com/myapp/detail.htm?apkName=com.tencent.qqmusic",
-    "infoLink": "http://www.wsj.com/articles/tencent-customers-come-for-the-music-stay-for-the-perks-1433869369",
-    "infoTitle": "Internet giant tries to get people to pay for digital music",
-    "pinned": false
-  },
-  {
-    "name": "Classroom (腾讯课堂)",
-    "icon": "http://pp.myapp.com/ma_icon/0/icon_10927178_1479093114/96",
-    "linkPlayStore": "http://android.myapp.com/myapp/detail.htm?apkName=com.tencent.edu",
-    "linkAppStore": "https://itunes.apple.com/cn/app/teng-xun-ke-tang-zhuan-ye/id931720936?mt=8",
-    "infoLink": "http://baike.baidu.com/view/13030839.htm",
-    "infoTitle": "Classroom is an education app by Chinese Internet giant Baidu",
-    "pinned": false
-  },
   {
     "name": "F8",
     "icon": "https://raw.githubusercontent.com/fbsamples/f8app/master/ios/F8v2/Images.xcassets/AppIcon.appiconset/AppIcon%402x.png",
@@ -149,24 +124,6 @@
     "infoTitle": "Tutorial: Building the F8 2016 conference app",
     "pinned": false
   },
-  {
-    "name": "Discovery VR",
-    "icon": "http://a2.mzstatic.com/us/r30/Purple6/v4/d1/d5/f4/d1d5f437-9f6b-b5aa-5fe7-47bd19f934bf/icon175x175.png",
-    "linkAppStore": "https://itunes.apple.com/us/app/discovery-vr/id1030815031?mt=8",
-    "linkPlayStore": "https://play.google.com/store/apps/details?id=com.discovery.DiscoveryVR",
-    "infoLink": "https://medium.com/ios-os-x-development/an-ios-developer-on-react-native-1f24786c29f0",
-    "infoTitle": "An iOS developer's experience building an app using React Native",
-    "pinned": false
-  },
-  {
-    "name": "Myntra",
-    "icon": "http://a5.mzstatic.com/us/r30/Purple6/v4/9c/78/df/9c78dfa6-0061-1af2-5026-3e1d5a073c94/icon350x350.png",
-    "linkAppStore": "https://itunes.apple.com/in/app/myntra-fashion-shopping-app/id907394059",
-    "linkPlayStore": "https://play.google.com/store/apps/details?id=com.myntra.android",
-    "infoLink": "https://www.youtube.com/watch?v=bXKr--rbewo",
-    "infoTitle": "React Native in Production at Scale",
-    "pinned": false
-  },
   {
     "name": "SoundCloud Pulse",
     "icon": "https://i1.sndcdn.com/artworks-000149203716-k5je96-original.jpg",
@@ -199,18 +156,9 @@
     "infoTitle": "Building a conversational E-commerce app in 6 weeks with React Native",
     "pinned": false
   },
-  {
-    "name": "Sleeperbot",
-    "icon": "https://blitzchat.net/uploads/c8425332190a4f4b852d7770ad32e602/original.png",
-    "linkAppStore": "https://itunes.apple.com/us/app/sleeperbot-fantasy-football/id987367543?mt=8",
-    "linkPlayStore": "https://play.google.com/store/apps/details?id=com.sleeperbot&hl=en",
-    "infoLink": "https://medium.com/sleeperbot-hq/switching-to-react-native-in-production-on-ios-and-android-e6b675402712#.cug6h6qhn",
-    "infoTitle": "Switching to React Native in Production on iOS and Android",
-    "pinned": false
-  },
   {
     "name": "JD（手机京东）",
-    "icon": "https://lh3.googleusercontent.com/AIIAZsqyEG0KmCFruh1Ec374-2l7n1rfv_LG5RWjdAZOzUBCu-5MRqdLbzJfBnOdSFg=w300-rw",
+    "icon": "http://is3.mzstatic.com/image/thumb/Purple111/v4/d4/3c/10/d43c107a-f120-caac-65c0-d412ace0606c/source/175x175bb.jpg",
     "linkAppStore": "https://itunes.apple.com/cn/app/shou-ji-jing-dong-xin-ren/id414245413?mt=8",
     "linkPlayStore": "https://app.jd.com/android.html",
     "infoLink": "http://ir.jd.com/phoenix.zhtml?c=253315&p=irol-homeProfile",
@@ -225,49 +173,15 @@
     "infoTitle": "How we built Chop using React Native",
     "pinned": false
   },
-  {
-    "name": "Blink",
-    "icon": "https://lh3.googleusercontent.com/QaId7rFtOjAT-2tHVkKB4lebX_w4ujWiO7ZIDe3Hd99TfBmPmiZySbLbVJV65qs0ViM=w300-rw",
-    "linkPlayStore": "https://play.google.com/store/apps/details?id=com.witapp",
-    "infoLink": "https://hashnode.com/post/what-we-learned-after-using-react-native-for-a-year-civdr8zv6058l3853wqud7hqp",
-    "infoTitle": "What we learned after using React Native for a year",
-    "pinned": false
-  },
   {
     "name": "Delivery.com",
-    "icon": "https://lh3.googleusercontent.com/ZwwQHQns9Ut2-LqbMqPcmQrsWBh3YbmbIzeDthfdavw99Ziq0unJ6EHUw8bstXUIpg=w300-rw",
+    "icon": "http://is2.mzstatic.com/image/thumb/Purple122/v4/54/a0/d7/54a0d7df-4551-4f4d-a43a-7baf4003668d/source/175x175bb.jpg",
     "linkAppStore": "https://itunes.apple.com/us/app/delivery.com-food-alcohol/id435168129?mt=8",
     "linkPlayStore": "https://play.google.com/store/apps/details?id=com.deliverycom&hl=en",
     "infoLink": "https://medium.com/delivery-com-engineering/react-native-in-an-existing-ios-app-delivered-874ba95a3c52#.37qruw6ck",
     "infoTitle": "React Native in an Existing iOS App: Getting Started",
     "pinned": false
   },
-  {
-    "name": "Yeti Smart Home",
-    "icon": "https://res.cloudinary.com/netbeast/image/upload/v1484303676/Android_192_loykto.png",
-    "linkAppStore": "https://itunes.apple.com/us/app/yeti-smart-home/id1190638808?mt=8",
-    "linkPlayStore": "https://play.google.com/store/apps/details?id=com.netbeast.yeti",
-    "infoLink": "https://medium.com/@jesusdario/developing-beyond-the-screen-9af812b96724#.ozx0xy4lv",
-    "infoTitle": "How React Native is helping us to reinvent the wheel",
-    "pinned": false
-  },
-  {
-    "name": "Jack",
-    "icon": "https://s3-eu-west-1.amazonaws.com/jack-public/react-native-showcase/jack-raw-icon.png",
-    "linkAppStore": "https://itunes.apple.com/us/app/you-have-a-jack/id1019167559?ls=1&mt=8",
-    "linkPlayStore": "https://play.google.com/store/apps/details?id=com.jack45.jack",
-    "infoLink": "https://medium.com/@herdani/our-switch-to-react-native-f4ada19f0f3d#.ogwjzf2tw",
-    "infoTitle": "Our switch to React Native",
-    "pinned": false
-  },
-  {
-    "name": "Causr",
-    "icon": "http://is2.mzstatic.com/image/thumb/Purple111/v4/9d/14/20/9d142015-3319-f613-2886-ad889609466a/source/175x175bb.jpg",
-    "linkAppStore": "https://itunes.apple.com/us/app/causr-business-networking/id1129819484",
-    "infoLink": "https://medium.com/causr/why-we-chose-react-native-abd7d58a18b5",
-    "infoTitle": "Why we chose React Native",
-    "pinned": false
-  },
   {
     "name": "Flare by GoDaddy",
     "icon": "http://x.co/FlareIcon",

From 9d377e98a0ebf54f30225b0d6359e953997ea96b Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieter.debaets@gmail.com>
Date: Thu, 23 Mar 2017 11:25:28 -0700
Subject: [PATCH 168/366] Fix warnings in React.xcodeproj

Summary:
Various fixes of xcode projects and cleaning up some warnings
Closes https://github.com/facebook/react-native/pull/13109

Differential Revision: D4762652

Pulled By: lacker

fbshipit-source-id: b452976a58962439de4adecc8e703264af40cb38
---
 .../UIExplorer.xcodeproj/project.pbxproj      |  20 ++-
 .../xcschemes/UIExplorer-tvOS.xcscheme        |   2 +-
 .../xcschemes/UIExplorer.xcscheme             |   2 +-
 .../UIExplorerCxx.xcodeproj/project.pbxproj   |   8 +-
 .../xcschemes/UIExplorer-tvOS.xcscheme        | 139 ++++++++++++++++++
 .../xcschemes/UIExplorer.xcscheme             |   2 +-
 .../project.pbxproj                           |   4 +-
 React/Base/RCTTVRemoteHandler.m               |   2 +-
 React/Base/RCTUtils.h                         |   2 +-
 React/Base/RCTUtils.m                         |   4 +-
 React/CxxBridge/RCTCxxBridge.mm               |   2 +-
 React/CxxBridge/RCTObjcExecutor.h             |   1 -
 React/DevSupport/RCTReloadPackagerMethod.m    |   2 +-
 .../RCTSamplingProfilerPackagerMethod.mm      |   4 +-
 React/Modules/RCTUIManager.m                  |   2 +-
 React/React.xcodeproj/project.pbxproj         |  20 ++-
 React/ReactCxx.xcodeproj/project.pbxproj      |  76 +++-------
 React/Views/RCTPicker.m                       |   2 +-
 React/Views/RCTTVView.m                       |   2 +-
 ReactCommon/cxxreact/ExecutorToken.h          |   2 +-
 ReactCommon/jschelpers/Value.h                |   2 +-
 21 files changed, 213 insertions(+), 87 deletions(-)
 create mode 100644 Examples/UIExplorer/UIExplorerCxx.xcodeproj/xcshareddata/xcschemes/UIExplorer-tvOS.xcscheme

diff --git a/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj b/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj
index 228917af5f2e43..4024e25f618422 100644
--- a/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj
+++ b/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj
@@ -727,11 +727,11 @@
 				14AADF041AC3DB95002390C9 /* libReact.a */,
 				2DD323D91DA2DD8B000FE1B8 /* libReact.a */,
 				3D3C08811DE3424E00C268FA /* libyoga.a */,
-				3D3C08831DE3424E00C268FA /* libyoga-tvOS.a */,
+				3D3C08831DE3424E00C268FA /* libyoga.a */,
 				3D05748C1DE6008900184BB4 /* libcxxreact.a */,
-				3D05748E1DE6008900184BB4 /* libcxxreact-tvOS.a */,
+				3D05748E1DE6008900184BB4 /* libcxxreact.a */,
 				3D0574901DE6008900184BB4 /* libjschelpers.a */,
-				3D0574921DE6008900184BB4 /* libjschelpers-tvOS.a */,
+				3D0574921DE6008900184BB4 /* libjschelpers.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -997,7 +997,7 @@
 		83CBB9F71A601CBA00E9B192 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0700;
+				LastUpgradeCheck = 0820;
 				ORGANIZATIONNAME = Facebook;
 				TargetAttributes = {
 					004D289D1AAF61C70097A701 = {
@@ -1269,7 +1269,7 @@
 			remoteRef = 3D05748B1DE6008900184BB4 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		3D05748E1DE6008900184BB4 /* libcxxreact-tvOS.a */ = {
+		3D05748E1DE6008900184BB4 /* libcxxreact.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
 			path = libcxxreact.a;
@@ -1283,7 +1283,7 @@
 			remoteRef = 3D05748F1DE6008900184BB4 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		3D0574921DE6008900184BB4 /* libjschelpers-tvOS.a */ = {
+		3D0574921DE6008900184BB4 /* libjschelpers.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
 			path = libjschelpers.a;
@@ -1297,7 +1297,7 @@
 			remoteRef = 3D3C08801DE3424E00C268FA /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		3D3C08831DE3424E00C268FA /* libyoga-tvOS.a */ = {
+		3D3C08831DE3424E00C268FA /* libyoga.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
 			path = libyoga.a;
@@ -1861,9 +1861,11 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -1872,6 +1874,7 @@
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -1927,9 +1930,11 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -1937,6 +1942,7 @@
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
diff --git a/Examples/UIExplorer/UIExplorer.xcodeproj/xcshareddata/xcschemes/UIExplorer-tvOS.xcscheme b/Examples/UIExplorer/UIExplorer.xcodeproj/xcshareddata/xcschemes/UIExplorer-tvOS.xcscheme
index 190472449b9d2b..5cb85ce16ba19a 100644
--- a/Examples/UIExplorer/UIExplorer.xcodeproj/xcshareddata/xcschemes/UIExplorer-tvOS.xcscheme
+++ b/Examples/UIExplorer/UIExplorer.xcodeproj/xcshareddata/xcschemes/UIExplorer-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0810"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "NO"
diff --git a/Examples/UIExplorer/UIExplorer.xcodeproj/xcshareddata/xcschemes/UIExplorer.xcscheme b/Examples/UIExplorer/UIExplorer.xcodeproj/xcshareddata/xcschemes/UIExplorer.xcscheme
index a7dcf9289577f2..88813411bc3eff 100644
--- a/Examples/UIExplorer/UIExplorer.xcodeproj/xcshareddata/xcschemes/UIExplorer.xcscheme
+++ b/Examples/UIExplorer/UIExplorer.xcodeproj/xcshareddata/xcschemes/UIExplorer.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0810"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "NO"
diff --git a/Examples/UIExplorer/UIExplorerCxx.xcodeproj/project.pbxproj b/Examples/UIExplorer/UIExplorerCxx.xcodeproj/project.pbxproj
index b56552e8c7331e..561367c549fb25 100644
--- a/Examples/UIExplorer/UIExplorerCxx.xcodeproj/project.pbxproj
+++ b/Examples/UIExplorer/UIExplorerCxx.xcodeproj/project.pbxproj
@@ -1009,7 +1009,7 @@
 		83CBB9F71A601CBA00E9B192 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0700;
+				LastUpgradeCheck = 0820;
 				ORGANIZATIONNAME = Facebook;
 				TargetAttributes = {
 					004D289D1AAF61C70097A701 = {
@@ -1887,9 +1887,11 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -1898,6 +1900,7 @@
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -1953,9 +1956,11 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -1963,6 +1968,7 @@
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
diff --git a/Examples/UIExplorer/UIExplorerCxx.xcodeproj/xcshareddata/xcschemes/UIExplorer-tvOS.xcscheme b/Examples/UIExplorer/UIExplorerCxx.xcodeproj/xcshareddata/xcschemes/UIExplorer-tvOS.xcscheme
new file mode 100644
index 00000000000000..cd6ee8cea9e99a
--- /dev/null
+++ b/Examples/UIExplorer/UIExplorerCxx.xcodeproj/xcshareddata/xcschemes/UIExplorer-tvOS.xcscheme
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0820"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "NO"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "2D2A28121D9B038B00D4039D"
+               BuildableName = "libReact.a"
+               BlueprintName = "React-tvOS"
+               ReferencedContainer = "container:../../React/ReactCxx.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "3D13F83D1D6F6AE000E69E0E"
+               BuildableName = "UIExplorerBundle.bundle"
+               BlueprintName = "UIExplorerBundle"
+               ReferencedContainer = "container:UIExplorerCxx.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "2DD3238F1DA2DD8A000FE1B8"
+               BuildableName = "UIExplorer-tvOS.app"
+               BlueprintName = "UIExplorer-tvOS"
+               ReferencedContainer = "container:UIExplorerCxx.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "2DD323A41DA2DD8B000FE1B8"
+               BuildableName = "UIExplorer-tvOSUnitTests.xctest"
+               BlueprintName = "UIExplorer-tvOSUnitTests"
+               ReferencedContainer = "container:UIExplorerCxx.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "2D4624C11DA2EA6900C74D09"
+               BuildableName = "UIExplorer-tvOSIntegrationTests.xctest"
+               BlueprintName = "UIExplorer-tvOSIntegrationTests"
+               ReferencedContainer = "container:UIExplorerCxx.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "2DD3238F1DA2DD8A000FE1B8"
+            BuildableName = "UIExplorer-tvOS.app"
+            BlueprintName = "UIExplorer-tvOS"
+            ReferencedContainer = "container:UIExplorerCxx.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "2DD3238F1DA2DD8A000FE1B8"
+            BuildableName = "UIExplorer-tvOS.app"
+            BlueprintName = "UIExplorer-tvOS"
+            ReferencedContainer = "container:UIExplorerCxx.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "2DD3238F1DA2DD8A000FE1B8"
+            BuildableName = "UIExplorer-tvOS.app"
+            BlueprintName = "UIExplorer-tvOS"
+            ReferencedContainer = "container:UIExplorerCxx.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Examples/UIExplorer/UIExplorerCxx.xcodeproj/xcshareddata/xcschemes/UIExplorer.xcscheme b/Examples/UIExplorer/UIExplorerCxx.xcodeproj/xcshareddata/xcschemes/UIExplorer.xcscheme
index f5551bb9306749..4410a73359c712 100644
--- a/Examples/UIExplorer/UIExplorerCxx.xcodeproj/xcshareddata/xcschemes/UIExplorer.xcscheme
+++ b/Examples/UIExplorer/UIExplorerCxx.xcodeproj/xcshareddata/xcschemes/UIExplorer.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0810"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "NO"
diff --git a/Libraries/PushNotificationIOS/RCTPushNotification.xcodeproj/project.pbxproj b/Libraries/PushNotificationIOS/RCTPushNotification.xcodeproj/project.pbxproj
index c120272aad44f9..137a5c9903e7ef 100644
--- a/Libraries/PushNotificationIOS/RCTPushNotification.xcodeproj/project.pbxproj
+++ b/Libraries/PushNotificationIOS/RCTPushNotification.xcodeproj/project.pbxproj
@@ -187,7 +187,7 @@
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
-				TVOS_DEPLOYMENT_TARGET = 10.0;
+				TVOS_DEPLOYMENT_TARGET = 9.2;
 			};
 			name = Debug;
 		};
@@ -204,7 +204,7 @@
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
-				TVOS_DEPLOYMENT_TARGET = 10.0;
+				TVOS_DEPLOYMENT_TARGET = 9.2;
 			};
 			name = Release;
 		};
diff --git a/React/Base/RCTTVRemoteHandler.m b/React/Base/RCTTVRemoteHandler.m
index cad1c472890ddf..5d2e0b980419a9 100644
--- a/React/Base/RCTTVRemoteHandler.m
+++ b/React/Base/RCTTVRemoteHandler.m
@@ -143,7 +143,7 @@ - (void)addSwipeGestureRecognizerWithSelector:(nonnull SEL)selector direction:(U
   [_tvRemoteGestureRecognizers addObject:recognizer];
 }
 
-- (void)sendAppleTVEvent:(NSString *)eventType toView:(UIView *)v
+- (void)sendAppleTVEvent:(NSString *)eventType toView:(__unused UIView *)v
 {
   [[NSNotificationCenter defaultCenter] postNotificationName:RCTTVNavigationEventNotification
                                                       object:@{@"eventType":eventType}];
diff --git a/React/Base/RCTUtils.h b/React/Base/RCTUtils.h
index 14e169ba22a9e3..8d6470260e1101 100644
--- a/React/Base/RCTUtils.h
+++ b/React/Base/RCTUtils.h
@@ -116,7 +116,7 @@ RCT_EXTERN BOOL RCTIsLocalAssetURL(NSURL *__nullable imageURL);
 
 // Returns an UIImage for a local image asset. Returns nil if the URL
 // does not correspond to a local asset.
-RCT_EXTERN UIImage *RCTImageFromLocalAssetURL(NSURL *imageURL);
+RCT_EXTERN UIImage *__nullable RCTImageFromLocalAssetURL(NSURL *imageURL);
 
 // Creates a new, unique temporary file path with the specified extension
 RCT_EXTERN NSString *__nullable RCTTempFilePath(NSString *__nullable extension, NSError **error);
diff --git a/React/Base/RCTUtils.m b/React/Base/RCTUtils.m
index 130c5b1b358955..4cf287359e66d6 100644
--- a/React/Base/RCTUtils.m
+++ b/React/Base/RCTUtils.m
@@ -629,7 +629,7 @@ BOOL RCTIsLocalAssetURL(NSURL *__nullable imageURL)
   return bundleCache[key];
 }
 
-UIImage *RCTImageFromLocalAssetURL(NSURL *imageURL)
+UIImage *__nullable RCTImageFromLocalAssetURL(NSURL *imageURL)
 {
   if (!RCTIsLocalAssetURL(imageURL)) {
     return nil;
@@ -657,7 +657,7 @@ BOOL RCTIsLocalAssetURL(NSURL *__nullable imageURL)
     // We did not find the image in the mainBundle, check in other shipped frameworks.
     NSArray<NSURL *> *possibleFrameworks = [[NSFileManager defaultManager] contentsOfDirectoryAtURL:[[NSBundle mainBundle] privateFrameworksURL]
                                                                         includingPropertiesForKeys:@[]
-                                                                                           options:nil
+                                                                                           options:0
                                                                                              error:nil];
     for (NSURL *frameworkURL in possibleFrameworks) {
       bundle = [NSBundle bundleWithURL:frameworkURL];
diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm
index 461b01d8f39f61..d266d02037029d 100644
--- a/React/CxxBridge/RCTCxxBridge.mm
+++ b/React/CxxBridge/RCTCxxBridge.mm
@@ -424,7 +424,7 @@ - (void)_initializeBridge:(std::shared_ptr<JSExecutorFactory>)executorFactory
       std::unique_ptr<RCTInstanceCallback>(new RCTInstanceCallback(self)),
       executorFactory,
       _jsMessageThread,
-      std::move([self _buildModuleRegistry]));
+      [self _buildModuleRegistry]);
 
 #if RCT_PROFILE
     if (RCTProfileIsProfiling()) {
diff --git a/React/CxxBridge/RCTObjcExecutor.h b/React/CxxBridge/RCTObjcExecutor.h
index a4283c01cd4fad..e2ee2148f3cedf 100644
--- a/React/CxxBridge/RCTObjcExecutor.h
+++ b/React/CxxBridge/RCTObjcExecutor.h
@@ -25,7 +25,6 @@ class RCTObjcExecutorFactory : public JSExecutorFactory {
     std::shared_ptr<MessageQueueThread> jsQueue) override;
 
 private:
-  NSURL *m_url;
   id<RCTJavaScriptExecutor> m_jse;
   RCTJavaScriptCompleteBlock m_errorBlock;
 };
diff --git a/React/DevSupport/RCTReloadPackagerMethod.m b/React/DevSupport/RCTReloadPackagerMethod.m
index 6ac1f947ab8a88..f651b316d10374 100644
--- a/React/DevSupport/RCTReloadPackagerMethod.m
+++ b/React/DevSupport/RCTReloadPackagerMethod.m
@@ -25,7 +25,7 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
   return self;
 }
 
-- (void)handleRequest:(id)params withResponder:(RCTPackagerClientResponder *)responder
+- (void)handleRequest:(__unused id)params withResponder:(RCTPackagerClientResponder *)responder
 {
   [responder respondWithError:[NSString stringWithFormat: @"%@ does not support onRequest", [self class]]];
 }
diff --git a/React/DevSupport/RCTSamplingProfilerPackagerMethod.mm b/React/DevSupport/RCTSamplingProfilerPackagerMethod.mm
index 43a3eca2598087..13906681f4070e 100644
--- a/React/DevSupport/RCTSamplingProfilerPackagerMethod.mm
+++ b/React/DevSupport/RCTSamplingProfilerPackagerMethod.mm
@@ -29,7 +29,7 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
   return self;
 }
 
-- (void)handleRequest:(id)params withResponder:(RCTPackagerClientResponder *)responder
+- (void)handleRequest:(__unused id)params withResponder:(RCTPackagerClientResponder *)responder
 {
   JSContext *context = _bridge.jsContext;
   JSGlobalContextRef globalContext = context.JSGlobalContextRef;
@@ -48,7 +48,7 @@ - (void)handleRequest:(id)params withResponder:(RCTPackagerClientResponder *)res
   }
 }
 
-- (void)handleNotification:(id)params
+- (void)handleNotification:(__unused id)params
 {
   RCTLogError(@"%@ does not implement onNotification", [self class]);
 }
diff --git a/React/Modules/RCTUIManager.m b/React/Modules/RCTUIManager.m
index 6a1576236f01d9..26918341bcae0b 100644
--- a/React/Modules/RCTUIManager.m
+++ b/React/Modules/RCTUIManager.m
@@ -1594,7 +1594,7 @@ + (UIView *)JSResponder
 
 @implementation RCTUIManager (Deprecated)
 
-- (void)registerRootView:(UIView *)rootView withSizeFlexibility:(RCTRootViewSizeFlexibility)sizeFlexibility
+- (void)registerRootView:(UIView *)rootView withSizeFlexibility:(__unused RCTRootViewSizeFlexibility)sizeFlexibility
 {
   RCTLogWarn(@"Calling of `[-RCTUIManager registerRootView:withSizeFlexibility:]` which is deprecated.");
   [self registerRootView:rootView];
diff --git a/React/React.xcodeproj/project.pbxproj b/React/React.xcodeproj/project.pbxproj
index b807434e77b8af..0ce76ef1c9252a 100644
--- a/React/React.xcodeproj/project.pbxproj
+++ b/React/React.xcodeproj/project.pbxproj
@@ -158,7 +158,6 @@
 		2D74EAFA1DAE9590003B751B /* RCTMultipartDataTask.m in Sources */ = {isa = PBXBuildFile; fileRef = 006FC4131D9B20820057AAAD /* RCTMultipartDataTask.m */; };
 		2D7FEB891E734B5700D3238C /* systemJSCWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65F3E41D1E73031C009375BD /* systemJSCWrapper.cpp */; };
 		2D8C2E331DA40441000EE098 /* RCTMultipartStreamReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 001BFCCF1D8381DE008E587E /* RCTMultipartStreamReader.m */; };
-		2D9F8B9B1DE398DB00A16144 /* RCTPlatform.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D7749431DC1065C007EC8D8 /* RCTPlatform.m */; };
 		2DD0EFE11DA84F2800B0C975 /* RCTStatusBarManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 13723B4F1A82FD3C00F88898 /* RCTStatusBarManager.m */; };
 		352DCFF01D19F4C20056D623 /* RCTI18nUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 352DCFEF1D19F4C20056D623 /* RCTI18nUtil.m */; };
 		369123E11DDC75850095B341 /* JSCSamplingProfiler.m in Sources */ = {isa = PBXBuildFile; fileRef = 369123E01DDC75850095B341 /* JSCSamplingProfiler.m */; };
@@ -288,7 +287,6 @@
 		3D302FA61DF8290600D6DDAE /* RCTPushNotificationManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D1FA08D1DE4F4EE00E03CC6 /* RCTPushNotificationManager.h */; };
 		3D302FA71DF8290600D6DDAE /* RCTAssert.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 83CBBA4A1A601E3B00E9B192 /* RCTAssert.h */; };
 		3D302FA81DF8290600D6DDAE /* RCTBridge.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 83CBBA5E1A601EAA00E9B192 /* RCTBridge.h */; };
-		3D302FA91DF8290600D6DDAE /* RCTBridge+Private.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 14A43DB81C1F849600794BC8 /* RCTBridge+Private.h */; };
 		3D302FAA1DF8290600D6DDAE /* RCTBridgeDelegate.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 1482F9E61B55B927000ADFF3 /* RCTBridgeDelegate.h */; };
 		3D302FAB1DF8290600D6DDAE /* RCTBridgeMethod.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13AFBCA11C07287B00BBAEAA /* RCTBridgeMethod.h */; };
 		3D302FAC1DF8290600D6DDAE /* RCTBridgeModule.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 830213F31A654E0800B993E6 /* RCTBridgeModule.h */; };
@@ -387,7 +385,6 @@
 		3D3030151DF8290600D6DDAE /* RCTViewControllerProtocol.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13442BF41AA90E0B0037E5B0 /* RCTViewControllerProtocol.h */; };
 		3D3030161DF8290600D6DDAE /* RCTViewManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13E0674D1A70F44B002CDEE1 /* RCTViewManager.h */; };
 		3D3030191DF8290600D6DDAE /* RCTWrapperViewController.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13B080231A694A8400A75B9A /* RCTWrapperViewController.h */; };
-		3D30301A1DF8290600D6DDAE /* UIView+Private.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 83F15A171B7CC46900F10295 /* UIView+Private.h */; };
 		3D30301B1DF8290600D6DDAE /* UIView+React.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13E067531A70F44B002CDEE1 /* UIView+React.h */; };
 		3D3030221DF8294C00D6DDAE /* JSBundleType.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D3CD8F51DE5FB2300167DC4 /* JSBundleType.h */; };
 		3D3030231DF8294C00D6DDAE /* oss-compat-util.h in Headers */ = {isa = PBXBuildFile; fileRef = AC70D2EE1DE48AC5002E6351 /* oss-compat-util.h */; };
@@ -413,6 +410,11 @@
 		3D5AC71D1E00572F000F9153 /* RCTTVView.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D5AC70F1E0056BC000F9153 /* RCTTVView.h */; };
 		3D5AC7221E005763000F9153 /* RCTTVRemoteHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D5AC71E1E005750000F9153 /* RCTTVRemoteHandler.h */; };
 		3D5AC7231E005766000F9153 /* RCTTVRemoteHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D5AC71F1E005750000F9153 /* RCTTVRemoteHandler.m */; };
+		3D6B76D31E83DD1C008FA614 /* RCTJSCErrorHandling.h in Headers */ = {isa = PBXBuildFile; fileRef = 139324FC1E70B069009FD7E0 /* RCTJSCErrorHandling.h */; };
+		3D6B76D41E83DD1C008FA614 /* RCTConvert+Transform.h in Headers */ = {isa = PBXBuildFile; fileRef = 945929C21DD62ADD00653A7D /* RCTConvert+Transform.h */; };
+		3D6B76D51E83DD3A008FA614 /* RCTDevSettings.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = B505583C1E43DFB900F71A00 /* RCTDevSettings.h */; };
+		3D6B76D61E83DD3A008FA614 /* RCTConvert+Transform.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 945929C21DD62ADD00653A7D /* RCTConvert+Transform.h */; };
+		3D6B76D71E83DD59008FA614 /* RCTJSCErrorHandling.mm in Sources */ = {isa = PBXBuildFile; fileRef = 139324FD1E70B069009FD7E0 /* RCTJSCErrorHandling.mm */; };
 		3D7749441DC1065C007EC8D8 /* RCTPlatform.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D7749431DC1065C007EC8D8 /* RCTPlatform.m */; };
 		3D80D9171DF6F7A80028D040 /* JSBundleType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC70D2EB1DE48A22002E6351 /* JSBundleType.cpp */; };
 		3D80D9181DF6F7A80028D040 /* JSBundleType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC70D2EB1DE48A22002E6351 /* JSBundleType.cpp */; };
@@ -800,6 +802,8 @@
 			dstPath = include/React;
 			dstSubfolderSpec = 16;
 			files = (
+				3D6B76D51E83DD3A008FA614 /* RCTDevSettings.h in Copy Headers */,
+				3D6B76D61E83DD3A008FA614 /* RCTConvert+Transform.h in Copy Headers */,
 				A12E9E211E5DEAFB0029001B /* RCTPackagerClient.h in Copy Headers */,
 				A12E9E221E5DEAFB0029001B /* RCTPackagerClientResponder.h in Copy Headers */,
 				3D5AC71D1E00572F000F9153 /* RCTTVView.h in Copy Headers */,
@@ -814,7 +818,6 @@
 				3D302FA61DF8290600D6DDAE /* RCTPushNotificationManager.h in Copy Headers */,
 				3D302FA71DF8290600D6DDAE /* RCTAssert.h in Copy Headers */,
 				3D302FA81DF8290600D6DDAE /* RCTBridge.h in Copy Headers */,
-				3D302FA91DF8290600D6DDAE /* RCTBridge+Private.h in Copy Headers */,
 				3D302FAA1DF8290600D6DDAE /* RCTBridgeDelegate.h in Copy Headers */,
 				3D302FAB1DF8290600D6DDAE /* RCTBridgeMethod.h in Copy Headers */,
 				3D302FAC1DF8290600D6DDAE /* RCTBridgeModule.h in Copy Headers */,
@@ -913,7 +916,6 @@
 				3D3030151DF8290600D6DDAE /* RCTViewControllerProtocol.h in Copy Headers */,
 				3D3030161DF8290600D6DDAE /* RCTViewManager.h in Copy Headers */,
 				3D3030191DF8290600D6DDAE /* RCTWrapperViewController.h in Copy Headers */,
-				3D30301A1DF8290600D6DDAE /* UIView+Private.h in Copy Headers */,
 				3D30301B1DF8290600D6DDAE /* UIView+React.h in Copy Headers */,
 			);
 			name = "Copy Headers";
@@ -1834,6 +1836,8 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				3D6B76D31E83DD1C008FA614 /* RCTJSCErrorHandling.h in Headers */,
+				3D6B76D41E83DD1C008FA614 /* RCTConvert+Transform.h in Headers */,
 				A12E9E231E5DEB160029001B /* RCTPackagerClient.h in Headers */,
 				A12E9E241E5DEB160029001B /* RCTPackagerClientResponder.h in Headers */,
 				3D302F241DF828F800D6DDAE /* RCTImageLoader.h in Headers */,
@@ -2316,7 +2320,7 @@
 		83CBB9F71A601CBA00E9B192 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0810;
+				LastUpgradeCheck = 0820;
 				ORGANIZATIONNAME = Facebook;
 				TargetAttributes = {
 					2D2A28121D9B038B00D4039D = {
@@ -2421,12 +2425,12 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				3D6B76D71E83DD59008FA614 /* RCTJSCErrorHandling.mm in Sources */,
 				3D80D91B1DF6F8200028D040 /* RCTPlatform.m in Sources */,
 				2DD0EFE11DA84F2800B0C975 /* RCTStatusBarManager.m in Sources */,
 				2D3B5EC91D9B095C00451313 /* RCTBorderDrawing.m in Sources */,
 				B50558411E43E13D00F71A00 /* RCTDevMenu.m in Sources */,
 				2D3B5E991D9B089A00451313 /* RCTDisplayLink.m in Sources */,
-				2D9F8B9B1DE398DB00A16144 /* RCTPlatform.m in Sources */,
 				2D3B5EBF1D9B093300451313 /* RCTJSCProfiler.m in Sources */,
 				2D3B5EA11D9B08B600451313 /* RCTModuleData.mm in Sources */,
 				2D3B5EEA1D9B09CD00451313 /* RCTTabBar.m in Sources */,
@@ -3025,6 +3029,7 @@
 				WARNING_CFLAGS = (
 					"-Wextra",
 					"-Wall",
+					"-Wno-semicolon-before-method-body",
 				);
 			};
 			name = Debug;
@@ -3071,6 +3076,7 @@
 				WARNING_CFLAGS = (
 					"-Wextra",
 					"-Wall",
+					"-Wno-semicolon-before-method-body",
 				);
 			};
 			name = Release;
diff --git a/React/ReactCxx.xcodeproj/project.pbxproj b/React/ReactCxx.xcodeproj/project.pbxproj
index b1f0b1ccccc6ef..62737a92df59e2 100644
--- a/React/ReactCxx.xcodeproj/project.pbxproj
+++ b/React/ReactCxx.xcodeproj/project.pbxproj
@@ -76,16 +76,6 @@
 		1384E2091E806D4E00545659 /* RCTNativeModule.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1384E2071E806D4E00545659 /* RCTNativeModule.mm */; };
 		1384E20A1E806D5700545659 /* RCTNativeModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 1384E2061E806D4E00545659 /* RCTNativeModule.h */; };
 		1384E20B1E806D5B00545659 /* RCTNativeModule.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1384E2071E806D4E00545659 /* RCTNativeModule.mm */; };
-		139D7E4C1E25C5A300323FB7 /* bignum-dtoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E3A1E25C5A300323FB7 /* bignum-dtoa.h */; };
-		139D7E4E1E25C5A300323FB7 /* bignum.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E3C1E25C5A300323FB7 /* bignum.h */; };
-		139D7E501E25C5A300323FB7 /* cached-powers.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E3E1E25C5A300323FB7 /* cached-powers.h */; };
-		139D7E521E25C5A300323FB7 /* diy-fp.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E401E25C5A300323FB7 /* diy-fp.h */; };
-		139D7E541E25C5A300323FB7 /* double-conversion.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E421E25C5A300323FB7 /* double-conversion.h */; };
-		139D7E561E25C5A300323FB7 /* fast-dtoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E441E25C5A300323FB7 /* fast-dtoa.h */; };
-		139D7E581E25C5A300323FB7 /* fixed-dtoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E461E25C5A300323FB7 /* fixed-dtoa.h */; };
-		139D7E591E25C5A300323FB7 /* ieee.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E471E25C5A300323FB7 /* ieee.h */; };
-		139D7E5B1E25C5A300323FB7 /* strtod.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E491E25C5A300323FB7 /* strtod.h */; };
-		139D7E5C1E25C5A300323FB7 /* utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E4A1E25C5A300323FB7 /* utils.h */; };
 		139D7E911E25C70B00323FB7 /* bignum-dtoa.cc in Sources */ = {isa = PBXBuildFile; fileRef = 139D7E391E25C5A300323FB7 /* bignum-dtoa.cc */; };
 		139D7E931E25C70B00323FB7 /* bignum.cc in Sources */ = {isa = PBXBuildFile; fileRef = 139D7E3B1E25C5A300323FB7 /* bignum.cc */; };
 		139D7E951E25C70B00323FB7 /* cached-powers.cc in Sources */ = {isa = PBXBuildFile; fileRef = 139D7E3D1E25C5A300323FB7 /* cached-powers.cc */; };
@@ -104,12 +94,6 @@
 		139D7EAC1E25C85300323FB7 /* ieee.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E471E25C5A300323FB7 /* ieee.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		139D7EAD1E25C85300323FB7 /* strtod.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E491E25C5A300323FB7 /* strtod.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		139D7EAE1E25C85300323FB7 /* utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E4A1E25C5A300323FB7 /* utils.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		139D7EE31E25DBDC00323FB7 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7ED81E25DBDC00323FB7 /* config.h */; };
-		139D7EE41E25DBDC00323FB7 /* demangle.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7ED91E25DBDC00323FB7 /* demangle.h */; };
-		139D7EE71E25DBDC00323FB7 /* signalhandler.cc in Sources */ = {isa = PBXBuildFile; fileRef = 139D7EDC1E25DBDC00323FB7 /* signalhandler.cc */; };
-		139D7EE81E25DBDC00323FB7 /* stacktrace.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7EDD1E25DBDC00323FB7 /* stacktrace.h */; };
-		139D7EEA1E25DBDC00323FB7 /* symbolize.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7EDF1E25DBDC00323FB7 /* symbolize.h */; };
-		139D7EEC1E25DBDC00323FB7 /* utilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7EE11E25DBDC00323FB7 /* utilities.h */; };
 		139D7F021E25DE1100323FB7 /* logging.cc in Sources */ = {isa = PBXBuildFile; fileRef = 139D7EDA1E25DBDC00323FB7 /* logging.cc */; };
 		139D7F031E25DE1100323FB7 /* raw_logging.cc in Sources */ = {isa = PBXBuildFile; fileRef = 139D7EDB1E25DBDC00323FB7 /* raw_logging.cc */; };
 		139D7F041E25DE1100323FB7 /* signalhandler.cc in Sources */ = {isa = PBXBuildFile; fileRef = 139D7EDC1E25DBDC00323FB7 /* signalhandler.cc */; };
@@ -171,7 +155,6 @@
 		13F880361E296D2800C3C7A1 /* JavaScriptCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7A27DC1DE32541002E3F95 /* JavaScriptCore.h */; };
 		13F880371E296D2800C3C7A1 /* JSCHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B1081E0369AD0018521A /* JSCHelpers.h */; };
 		13F880381E296D2800C3C7A1 /* JSCWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7A27DE1DE32541002E3F95 /* JSCWrapper.h */; };
-		13F880391E296D2800C3C7A1 /* noncopyable.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B1091E0369AD0018521A /* noncopyable.h */; };
 		13F8803A1E296D2800C3C7A1 /* Unicode.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B10B1E0369AD0018521A /* Unicode.h */; };
 		13F8803B1E296D2800C3C7A1 /* Value.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B10D1E0369AD0018521A /* Value.h */; };
 		13F880411E29709F00C3C7A1 /* libdouble-conversion.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139D7E881E25C6D100323FB7 /* libdouble-conversion.a */; };
@@ -230,7 +213,6 @@
 		14F7A0F01BDA714B003C6C10 /* RCTFPSGraph.m in Sources */ = {isa = PBXBuildFile; fileRef = 14F7A0EF1BDA714B003C6C10 /* RCTFPSGraph.m */; };
 		191E3EBE1C29D9AF00C180A6 /* RCTRefreshControlManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 191E3EBD1C29D9AF00C180A6 /* RCTRefreshControlManager.m */; };
 		191E3EC11C29DC3800C180A6 /* RCTRefreshControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 191E3EC01C29DC3800C180A6 /* RCTRefreshControl.m */; };
-		19DED2291E77E29200F089BB /* systemJSCWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 19DED2281E77E29200F089BB /* systemJSCWrapper.cpp */; };
 		27595AA41E575C7800CCE2B1 /* CxxModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0A71E03699D0018521A /* CxxModule.h */; };
 		27595AA51E575C7800CCE2B1 /* CxxNativeModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0A91E03699D0018521A /* CxxNativeModule.h */; };
 		27595AA61E575C7800CCE2B1 /* Executor.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0AB1E03699D0018521A /* Executor.h */; };
@@ -283,7 +265,6 @@
 		27595AD61E575C7800CCE2B1 /* Platform.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0D21E03699D0018521A /* Platform.h */; };
 		27595AD71E575C7800CCE2B1 /* SampleCxxModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0D41E03699D0018521A /* SampleCxxModule.h */; };
 		27595AD81E575C7800CCE2B1 /* SystraceSection.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0D51E03699D0018521A /* SystraceSection.h */; };
-		27B958741E57587D0096647A /* JSBigString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27B958731E57587D0096647A /* JSBigString.cpp */; };
 		2D3B5E931D9B087300451313 /* RCTErrorInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 3EDCA8A41D3591E700450C31 /* RCTErrorInfo.m */; };
 		2D3B5E941D9B087900451313 /* RCTBundleURLProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 68EFE4ED1CF6EB3900A1DE13 /* RCTBundleURLProvider.m */; };
 		2D3B5E951D9B087C00451313 /* RCTAssert.m in Sources */ = {isa = PBXBuildFile; fileRef = 83CBBA4B1A601E3B00E9B192 /* RCTAssert.m */; };
@@ -504,7 +485,6 @@
 		3D80D9251DF6FA890028D040 /* RCTPushNotificationManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D1FA08D1DE4F4EE00E03CC6 /* RCTPushNotificationManager.h */; };
 		3D80D9261DF6FA890028D040 /* RCTAssert.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 83CBBA4A1A601E3B00E9B192 /* RCTAssert.h */; };
 		3D80D9271DF6FA890028D040 /* RCTBridge.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 83CBBA5E1A601EAA00E9B192 /* RCTBridge.h */; };
-		3D80D9281DF6FA890028D040 /* RCTBridge+Private.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 14A43DB81C1F849600794BC8 /* RCTBridge+Private.h */; };
 		3D80D9291DF6FA890028D040 /* RCTBridgeDelegate.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 1482F9E61B55B927000ADFF3 /* RCTBridgeDelegate.h */; };
 		3D80D92A1DF6FA890028D040 /* RCTBridgeMethod.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13AFBCA11C07287B00BBAEAA /* RCTBridgeMethod.h */; };
 		3D80D92B1DF6FA890028D040 /* RCTBridgeModule.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 830213F31A654E0800B993E6 /* RCTBridgeModule.h */; };
@@ -607,7 +587,6 @@
 		3D80D9961DF6FA890028D040 /* RCTWebView.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13C156011AB1A2840079392D /* RCTWebView.h */; };
 		3D80D9971DF6FA890028D040 /* RCTWebViewManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13C156031AB1A2840079392D /* RCTWebViewManager.h */; };
 		3D80D9981DF6FA890028D040 /* RCTWrapperViewController.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13B080231A694A8400A75B9A /* RCTWrapperViewController.h */; };
-		3D80D9991DF6FA890028D040 /* UIView+Private.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 83F15A171B7CC46900F10295 /* UIView+Private.h */; };
 		3D80D99A1DF6FA890028D040 /* UIView+React.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13E067531A70F44B002CDEE1 /* UIView+React.h */; };
 		3D80DA191DF820620028D040 /* RCTImageLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1FA0831DE4F3A000E03CC6 /* RCTImageLoader.h */; };
 		3D80DA1A1DF820620028D040 /* RCTImageStoreManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1FA0841DE4F3A000E03CC6 /* RCTImageStoreManager.h */; };
@@ -914,6 +893,9 @@
 		3DA982611E5B1089004F2374 /* noncopyable.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B1091E0369AD0018521A /* noncopyable.h */; };
 		3DA982621E5B1089004F2374 /* Unicode.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B10B1E0369AD0018521A /* Unicode.h */; };
 		3DA982631E5B1089004F2374 /* Value.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B10D1E0369AD0018521A /* Value.h */; };
+		3DC159E41E83E1AE007B1282 /* RCTRootContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59A7B9FC1E577DBF0068EDBF /* RCTRootContentView.m */; };
+		3DC159E51E83E1E9007B1282 /* JSBigString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27B958731E57587D0096647A /* JSBigString.cpp */; };
+		3DC159E61E83E1FA007B1282 /* JSBigString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27B958731E57587D0096647A /* JSBigString.cpp */; };
 		3DCD185D1DF978E7007FE5A1 /* RCTReloadCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = A2440AA11DF8D854006E7BFC /* RCTReloadCommand.m */; };
 		3DDEC1521DDCE0CA0020BBDF /* JSCSamplingProfiler.m in Sources */ = {isa = PBXBuildFile; fileRef = 369123E01DDC75850095B341 /* JSCSamplingProfiler.m */; };
 		3DE4F8681DF85D8E00B9E5A0 /* YGEnums.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 130A77031DF767AF001F9587 /* YGEnums.h */; };
@@ -1018,6 +1000,13 @@
 			remoteGlobalIDString = 3D3C04B91DE3340900C268FA;
 			remoteInfo = yoga;
 		};
+		3DC159E71E83E2A0007B1282 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 3D3CD90C1DE5FBD800167DC4;
+			remoteInfo = "jschelpers-tvOS";
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -1245,7 +1234,6 @@
 				3D80D9251DF6FA890028D040 /* RCTPushNotificationManager.h in Copy Headers */,
 				3D80D9261DF6FA890028D040 /* RCTAssert.h in Copy Headers */,
 				3D80D9271DF6FA890028D040 /* RCTBridge.h in Copy Headers */,
-				3D80D9281DF6FA890028D040 /* RCTBridge+Private.h in Copy Headers */,
 				3D80D9291DF6FA890028D040 /* RCTBridgeDelegate.h in Copy Headers */,
 				3D80D92A1DF6FA890028D040 /* RCTBridgeMethod.h in Copy Headers */,
 				3D80D92B1DF6FA890028D040 /* RCTBridgeModule.h in Copy Headers */,
@@ -1348,7 +1336,6 @@
 				3D80D9961DF6FA890028D040 /* RCTWebView.h in Copy Headers */,
 				3D80D9971DF6FA890028D040 /* RCTWebViewManager.h in Copy Headers */,
 				3D80D9981DF6FA890028D040 /* RCTWrapperViewController.h in Copy Headers */,
-				3D80D9991DF6FA890028D040 /* UIView+Private.h in Copy Headers */,
 				3D80D99A1DF6FA890028D040 /* UIView+React.h in Copy Headers */,
 			);
 			name = "Copy Headers";
@@ -2718,14 +2705,11 @@
 				3D80DA221DF820620028D040 /* RCTBridge+Private.h in Headers */,
 				3D80DA231DF820620028D040 /* RCTBridgeDelegate.h in Headers */,
 				3D80DA241DF820620028D040 /* RCTBridgeMethod.h in Headers */,
-				139D7EE31E25DBDC00323FB7 /* config.h in Headers */,
 				3D80DA251DF820620028D040 /* RCTBridgeModule.h in Headers */,
 				3D80DA261DF820620028D040 /* RCTBundleURLProvider.h in Headers */,
 				3D80DA271DF820620028D040 /* RCTConvert.h in Headers */,
-				139D7EEC1E25DBDC00323FB7 /* utilities.h in Headers */,
 				3D80DA281DF820620028D040 /* RCTDefines.h in Headers */,
 				3D80DA291DF820620028D040 /* RCTDisplayLink.h in Headers */,
-				139D7E541E25C5A300323FB7 /* double-conversion.h in Headers */,
 				3D80DA2A1DF820620028D040 /* RCTErrorCustomizer.h in Headers */,
 				3D80DA2B1DF820620028D040 /* RCTErrorInfo.h in Headers */,
 				1384E2081E806D4E00545659 /* RCTNativeModule.h in Headers */,
@@ -2734,7 +2718,6 @@
 				3D80DA2E1DF820620028D040 /* RCTImageSource.h in Headers */,
 				13F880361E296D2800C3C7A1 /* JavaScriptCore.h in Headers */,
 				3D80DA2F1DF820620028D040 /* RCTInvalidating.h in Headers */,
-				139D7E5C1E25C5A300323FB7 /* utils.h in Headers */,
 				3D80DA301DF820620028D040 /* RCTJavaScriptExecutor.h in Headers */,
 				135A9BFF1E7B0EE600587AEB /* RCTJSCHelpers.h in Headers */,
 				3D80DA311DF820620028D040 /* RCTJavaScriptLoader.h in Headers */,
@@ -2744,7 +2727,6 @@
 				3D80DA331DF820620028D040 /* RCTKeyCommands.h in Headers */,
 				3D80DA341DF820620028D040 /* RCTLog.h in Headers */,
 				3D80DA351DF820620028D040 /* RCTModuleData.h in Headers */,
-				139D7E501E25C5A300323FB7 /* cached-powers.h in Headers */,
 				13F8803B1E296D2800C3C7A1 /* Value.h in Headers */,
 				3D80DA361DF820620028D040 /* RCTModuleMethod.h in Headers */,
 				3D80DA371DF820620028D040 /* RCTMultipartDataTask.h in Headers */,
@@ -2759,19 +2741,16 @@
 				3D80DA3F1DF820620028D040 /* RCTRootViewInternal.h in Headers */,
 				3D80DA401DF820620028D040 /* RCTTouchEvent.h in Headers */,
 				3D80DA411DF820620028D040 /* RCTTouchHandler.h in Headers */,
-				13F880391E296D2800C3C7A1 /* noncopyable.h in Headers */,
 				13134C8C1E296B2A00B9F3CB /* RCTMessageThread.h in Headers */,
 				3D80DA421DF820620028D040 /* RCTURLRequestDelegate.h in Headers */,
 				3D80DA431DF820620028D040 /* RCTURLRequestHandler.h in Headers */,
 				3D80DA441DF820620028D040 /* RCTUtils.h in Headers */,
 				3D80DA451DF820620028D040 /* RCTWebSocketObserverProtocol.h in Headers */,
-				139D7EEA1E25DBDC00323FB7 /* symbolize.h in Headers */,
 				13134C981E296B2A00B9F3CB /* RCTCxxMethod.h in Headers */,
 				3D80DA491DF820620028D040 /* JSCSamplingProfiler.h in Headers */,
 				3D80DA4A1DF820620028D040 /* RCTAccessibilityManager.h in Headers */,
 				3D80DA4B1DF820620028D040 /* RCTAlertManager.h in Headers */,
 				3D80DA4C1DF820620028D040 /* RCTAppState.h in Headers */,
-				139D7EE81E25DBDC00323FB7 /* stacktrace.h in Headers */,
 				3D80DA4D1DF820620028D040 /* RCTAsyncLocalStorage.h in Headers */,
 				3D80DA4E1DF820620028D040 /* RCTClipboard.h in Headers */,
 				3D80DA4F1DF820620028D040 /* RCTDevLoadingView.h in Headers */,
@@ -2804,22 +2783,17 @@
 				3D80DA691DF820620028D040 /* RCTDatePicker.h in Headers */,
 				3D80DA6A1DF820620028D040 /* RCTDatePickerManager.h in Headers */,
 				3D80DA6B1DF820620028D040 /* RCTFont.h in Headers */,
-				139D7EE41E25DBDC00323FB7 /* demangle.h in Headers */,
-				139D7E561E25C5A300323FB7 /* fast-dtoa.h in Headers */,
 				3D80DA701DF820620028D040 /* RCTModalHostView.h in Headers */,
 				3D80DA711DF820620028D040 /* RCTModalHostViewController.h in Headers */,
 				3D80DA721DF820620028D040 /* RCTModalHostViewManager.h in Headers */,
 				13134C9C1E296B2A00B9F3CB /* RCTCxxModule.h in Headers */,
 				3D80DA731DF820620028D040 /* RCTNavigator.h in Headers */,
 				3D80DA741DF820620028D040 /* RCTNavigatorManager.h in Headers */,
-				139D7E581E25C5A300323FB7 /* fixed-dtoa.h in Headers */,
 				3D80DA751DF820620028D040 /* RCTNavItem.h in Headers */,
 				3D80DA761DF820620028D040 /* RCTNavItemManager.h in Headers */,
 				3D80DA771DF820620028D040 /* RCTPicker.h in Headers */,
-				139D7E591E25C5A300323FB7 /* ieee.h in Headers */,
 				3D80DA781DF820620028D040 /* RCTPickerManager.h in Headers */,
 				3D80DA791DF820620028D040 /* RCTPointerEvents.h in Headers */,
-				139D7E521E25C5A300323FB7 /* diy-fp.h in Headers */,
 				3D80DA7A1DF820620028D040 /* RCTProgressViewManager.h in Headers */,
 				3D80DA7B1DF820620028D040 /* RCTRefreshControl.h in Headers */,
 				A2440AA21DF8D854006E7BFC /* RCTReloadCommand.h in Headers */,
@@ -2831,7 +2805,6 @@
 				3D80DA811DF820620028D040 /* RCTSegmentedControl.h in Headers */,
 				3D80DA821DF820620028D040 /* RCTSegmentedControlManager.h in Headers */,
 				3D80DA831DF820620028D040 /* RCTShadowView.h in Headers */,
-				139D7E4E1E25C5A300323FB7 /* bignum.h in Headers */,
 				3D80DA841DF820620028D040 /* RCTSlider.h in Headers */,
 				3D80DA851DF820620028D040 /* RCTSliderManager.h in Headers */,
 				13F880371E296D2800C3C7A1 /* JSCHelpers.h in Headers */,
@@ -2848,10 +2821,8 @@
 				3D80DA8F1DF820620028D040 /* RCTViewManager.h in Headers */,
 				13134CA01E296B2A00B9F3CB /* RCTCxxUtils.h in Headers */,
 				3D80DA901DF820620028D040 /* RCTWebView.h in Headers */,
-				139D7E4C1E25C5A300323FB7 /* bignum-dtoa.h in Headers */,
 				3D80DA911DF820620028D040 /* RCTWebViewManager.h in Headers */,
 				3D80DA921DF820620028D040 /* RCTWrapperViewController.h in Headers */,
-				139D7E5B1E25C5A300323FB7 /* strtod.h in Headers */,
 				3D80DA931DF820620028D040 /* UIView+Private.h in Headers */,
 				59FBEFB01E46D91C0095D885 /* RCTScrollContentShadowView.h in Headers */,
 				3D80DA941DF820620028D040 /* UIView+React.h in Headers */,
@@ -3019,6 +2990,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				3DC159E81E83E2A0007B1282 /* PBXTargetDependency */,
 			);
 			name = "cxxreact-tvOS";
 			productName = "React-tvOS";
@@ -3223,6 +3195,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				3DC159E41E83E1AE007B1282 /* RCTRootContentView.m in Sources */,
 				3D80D91B1DF6F8200028D040 /* RCTPlatform.m in Sources */,
 				2DD0EFE11DA84F2800B0C975 /* RCTStatusBarManager.m in Sources */,
 				2D3B5EC91D9B095C00451313 /* RCTBorderDrawing.m in Sources */,
@@ -3366,6 +3339,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				3DC159E51E83E1E9007B1282 /* JSBigString.cpp in Sources */,
 				13F8877B1E29726200C3C7A1 /* JSIndexedRAMBundle.cpp in Sources */,
 				13F8877D1E29726200C3C7A1 /* ModuleRegistry.cpp in Sources */,
 				13F8876E1E29726200C3C7A1 /* CxxNativeModule.cpp in Sources */,
@@ -3391,6 +3365,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				3DC159E61E83E1FA007B1282 /* JSBigString.cpp in Sources */,
 				13F8878E1E29726300C3C7A1 /* JSIndexedRAMBundle.cpp in Sources */,
 				13F887901E29726300C3C7A1 /* ModuleRegistry.cpp in Sources */,
 				13F8878D1E29726300C3C7A1 /* JSCWebWorker.cpp in Sources */,
@@ -3452,7 +3427,6 @@
 				13E067561A70F44B002CDEE1 /* RCTViewManager.m in Sources */,
 				13BB3D021BECD54500932C10 /* RCTImageSource.m in Sources */,
 				13134CA21E296B2A00B9F3CB /* RCTCxxUtils.mm in Sources */,
-				27B958741E57587D0096647A /* JSBigString.cpp in Sources */,
 				58C571C11AA56C1900CDF9C8 /* RCTDatePickerManager.m in Sources */,
 				1450FF8A1BCFF28A00208362 /* RCTProfileTrampoline-x86_64.S in Sources */,
 				13D9FEEB1CDCCECF00158BD7 /* RCTEventEmitter.m in Sources */,
@@ -3499,7 +3473,6 @@
 				13C156051AB1A2840079392D /* RCTWebView.m in Sources */,
 				83CBBA601A601EAA00E9B192 /* RCTBridge.m in Sources */,
 				13C156061AB1A2840079392D /* RCTWebViewManager.m in Sources */,
-				139D7EE71E25DBDC00323FB7 /* signalhandler.cc in Sources */,
 				58114A161AAE854800E7D092 /* RCTPicker.m in Sources */,
 				137327E81AA5CF210034F82E /* RCTTabBarItem.m in Sources */,
 				83A1FE8C1B62640A00BE0E65 /* RCTModalHostView.m in Sources */,
@@ -3566,6 +3539,11 @@
 			target = 3D3C04B91DE3340900C268FA /* yoga */;
 			targetProxy = 3D8ED92A1E5B11EA00D83D20 /* PBXContainerItemProxy */;
 		};
+		3DC159E81E83E2A0007B1282 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 3D3CD90C1DE5FBD800167DC4 /* jschelpers-tvOS */;
+			targetProxy = 3DC159E71E83E2A0007B1282 /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
@@ -3582,7 +3560,6 @@
 					"DEBUG=1",
 					"$(inherited)",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 10.1;
 				OTHER_LDFLAGS = "-ObjC";
 				PRIVATE_HEADERS_FOLDER_PATH = "/usr/local/include/double-conversion";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3600,7 +3577,6 @@
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = V9WTTPBFK9;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.1;
 				OTHER_LDFLAGS = "-ObjC";
 				PRIVATE_HEADERS_FOLDER_PATH = "/usr/local/include/double-conversion";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3622,7 +3598,6 @@
 					"DEBUG=1",
 					"$(inherited)",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 10.1;
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3642,7 +3617,6 @@
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = V9WTTPBFK9;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.1;
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3670,7 +3644,6 @@
 				PRODUCT_NAME = React;
 				PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/React;
 				SDKROOT = appletvos;
-				TVOS_DEPLOYMENT_TARGET = 9.2;
 			};
 			name = Debug;
 		};
@@ -3689,7 +3662,6 @@
 				PRODUCT_NAME = React;
 				PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/React;
 				SDKROOT = appletvos;
-				TVOS_DEPLOYMENT_TARGET = 9.2;
 			};
 			name = Release;
 		};
@@ -3740,7 +3712,6 @@
 				PRODUCT_NAME = yoga;
 				PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/yoga;
 				SDKROOT = appletvos;
-				TVOS_DEPLOYMENT_TARGET = 9.2;
 			};
 			name = Debug;
 		};
@@ -3759,7 +3730,6 @@
 				PRODUCT_NAME = yoga;
 				PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/yoga;
 				SDKROOT = appletvos;
-				TVOS_DEPLOYMENT_TARGET = 9.2;
 			};
 			name = Release;
 		};
@@ -3812,7 +3782,6 @@
 				PRODUCT_NAME = jschelpers;
 				PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/jschelpers;
 				SDKROOT = appletvos;
-				TVOS_DEPLOYMENT_TARGET = 9.2;
 			};
 			name = Debug;
 		};
@@ -3831,7 +3800,6 @@
 				PRODUCT_NAME = jschelpers;
 				PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/jschelpers;
 				SDKROOT = appletvos;
-				TVOS_DEPLOYMENT_TARGET = 9.2;
 			};
 			name = Release;
 		};
@@ -3884,7 +3852,6 @@
 				PRODUCT_NAME = cxxreact;
 				PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/cxxreact;
 				SDKROOT = appletvos;
-				TVOS_DEPLOYMENT_TARGET = 9.2;
 			};
 			name = Debug;
 		};
@@ -3903,7 +3870,6 @@
 				PRODUCT_NAME = cxxreact;
 				PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/cxxreact;
 				SDKROOT = appletvos;
-				TVOS_DEPLOYMENT_TARGET = 9.2;
 			};
 			name = Release;
 		};
@@ -3954,9 +3920,11 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
+				TVOS_DEPLOYMENT_TARGET = 9.2;
 				WARNING_CFLAGS = (
 					"-Wextra",
 					"-Wall",
+					"-Wno-semicolon-before-method-body",
 				);
 			};
 			name = Debug;
@@ -3999,10 +3967,12 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
+				TVOS_DEPLOYMENT_TARGET = 9.2;
 				VALIDATE_PRODUCT = YES;
 				WARNING_CFLAGS = (
 					"-Wextra",
 					"-Wall",
+					"-Wno-semicolon-before-method-body",
 				);
 			};
 			name = Release;
diff --git a/React/Views/RCTPicker.m b/React/Views/RCTPicker.m
index 0e5295a9427e29..d29dd2e414c488 100644
--- a/React/Views/RCTPicker.m
+++ b/React/Views/RCTPicker.m
@@ -98,7 +98,7 @@ - (void)pickerView:(__unused UIPickerView *)pickerView
       didSelectRow:(NSInteger)row inComponent:(__unused NSInteger)component
 {
   _selectedIndex = row;
-  if (_onChange && _items.count > row) {
+  if (_onChange && _items.count > (NSUInteger)row) {
     _onChange(@{
       @"newIndex": @(row),
       @"newValue": RCTNullIfNil(_items[row][@"value"]),
diff --git a/React/Views/RCTTVView.m b/React/Views/RCTTVView.m
index d27aded86a651c..204b6f390d9288 100644
--- a/React/Views/RCTTVView.m
+++ b/React/Views/RCTTVView.m
@@ -57,7 +57,7 @@ - (void)setIsTVSelectable:(BOOL)isTVSelectable {
   }
 }
 
-- (void)handleSelect:(UIGestureRecognizer *)r
+- (void)handleSelect:(__unused UIGestureRecognizer *)r
 {
   [[NSNotificationCenter defaultCenter] postNotificationName:RCTTVNavigationEventNotification
                                                       object:@{@"eventType":@"select",@"tag":self.reactTag}];
diff --git a/ReactCommon/cxxreact/ExecutorToken.h b/ReactCommon/cxxreact/ExecutorToken.h
index d3be5aafec16b7..8f85d24b44db3c 100644
--- a/ReactCommon/cxxreact/ExecutorToken.h
+++ b/ReactCommon/cxxreact/ExecutorToken.h
@@ -47,7 +47,7 @@ class ExecutorToken {
 namespace std {
   template<>
   struct hash<facebook::react::ExecutorToken> {
-    const size_t operator()(const facebook::react::ExecutorToken& token) const {
+    size_t operator()(const facebook::react::ExecutorToken& token) const {
       return (size_t) token.getPlatformExecutorToken().get();
     }
   };
diff --git a/ReactCommon/jschelpers/Value.h b/ReactCommon/jschelpers/Value.h
index ca8b86bf65f8e2..10dfb18def6316 100644
--- a/ReactCommon/jschelpers/Value.h
+++ b/ReactCommon/jschelpers/Value.h
@@ -95,7 +95,7 @@ class String : public noncopyable {
    */
   std::string str() const {
     const JSChar* utf16 = JSC_JSStringGetCharactersPtr(m_context, m_string);
-    int stringLength = JSC_JSStringGetLength(m_context, m_string);
+    size_t stringLength = JSC_JSStringGetLength(m_context, m_string);
     return unicode::utf16toUTF8(utf16, stringLength);
   }
 

From 3df654e28e7ff8fb69acd32721ebe3de6fe8caf7 Mon Sep 17 00:00:00 2001
From: Gustavo Perdomo <gperdomor@gmail.com>
Date: Thu, 23 Mar 2017 11:48:04 -0700
Subject: [PATCH 169/366] Integrare UNUserNotification

Summary:
Implementing removeAllDeliveredNotifications and removeDeliveredNotifications for remove notifications from notification center, and getDeliveredNotifications

Thanks for submitting a PR! Please read these instructions carefully:

- [x] Explain the **motivation** for making this change.
- [x] Provide a **test plan** demonstrating that the code is solid.
- [x] Match the **code formatting** of the rest of the codebase.
- [x] Target the `master` branch, NOT a "stable" branch.

Currently, calling PushNotificationIOS.cancelAllLocalNotifications not remove the notification from the Notification Center

In iOS 10, a new UNUserNotification class was introduced, this class has a method which get and remove the notifications from notification center

This PR try to solve that.

In my case, i'm working with an messaging app, every message is a new notification, when the user tap a notification, the app is opened and the rest of notifications should be gon
Closes https://github.com/facebook/react-native/pull/13036

Differential Revision: D4761828

Pulled By: javache

fbshipit-source-id: 216e44a64f1bf88b5ae3045d1fa6eca8a1278a71
---
 .../PushNotificationIOS.js                    | 34 +++++++++++
 .../RCTPushNotificationManager.m              | 56 +++++++++++++++++++
 2 files changed, 90 insertions(+)

diff --git a/Libraries/PushNotificationIOS/PushNotificationIOS.js b/Libraries/PushNotificationIOS/PushNotificationIOS.js
index 4ff179559c7104..dfee28a3281d5e 100644
--- a/Libraries/PushNotificationIOS/PushNotificationIOS.js
+++ b/Libraries/PushNotificationIOS/PushNotificationIOS.js
@@ -164,6 +164,40 @@ class PushNotificationIOS {
     RCTPushNotificationManager.cancelAllLocalNotifications();
   }
 
+  /**
+   * Remove all delivered notifications from Notification Center
+   */
+  static removeAllDeliveredNotifications(): void {
+    RCTPushNotificationManager.removeAllDeliveredNotifications();
+  }
+
+  /**
+   * Provides you with a list of the app’s notifications that are still displayed in Notification Center
+   *
+   * @param callback Function which receive an array of delivered notifications
+   *
+   *  A delivered notification is an object containing:
+   *
+   * - `identifier`  : The identifier of this notification.
+   * - `title`  : The title of this notification.
+   * - `body`  : The body of this notification.
+   * - `category`  : The category of this notification, if has one.
+   * - `userInfo`  : An optional object containing additional notification data.
+   * - `thread-id`  : The thread identifier of this notification, if has one.
+   */
+  static getDeliveredNotifications(callback: (notifications: [Object]) => void): void {
+    RCTPushNotificationManager.getDeliveredNotifications(callback);
+  }
+
+  /**
+   * Removes the specified notifications from Notification Center
+   *
+   * @param identifiers Array of notification identifiers
+   */
+  static removeDeliveredNotifications(identifiers: [string]): void {
+    RCTPushNotificationManager.removeDeliveredNotifications(identifiers);
+  }
+
   /**
    * Sets the badge number for the app icon on the home screen
    */
diff --git a/Libraries/PushNotificationIOS/RCTPushNotificationManager.m b/Libraries/PushNotificationIOS/RCTPushNotificationManager.m
index 216c87dd5fdf14..b57fd2b72f0fec 100644
--- a/Libraries/PushNotificationIOS/RCTPushNotificationManager.m
+++ b/Libraries/PushNotificationIOS/RCTPushNotificationManager.m
@@ -9,6 +9,8 @@
 
 #import "RCTPushNotificationManager.h"
 
+#import <UserNotifications/UserNotifications.h>
+
 #import <React/RCTBridge.h>
 #import <React/RCTConvert.h>
 #import <React/RCTEventDispatcher.h>
@@ -97,6 +99,29 @@ @implementation RCTPushNotificationManager
   return formattedLocalNotification;
 }
 
+static NSDictionary *RCTFormatUNNotification(UNNotification *notification)
+{
+  NSMutableDictionary *formattedNotification = [NSMutableDictionary dictionary];
+  UNNotificationContent *content = notification.request.content;
+
+  formattedNotification[@"identifier"] = notification.request.identifier;
+
+  if (notification.date) {
+    NSDateFormatter *formatter = [NSDateFormatter new];
+    [formatter setDateFormat:@"yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ"];
+    NSString *dateString = [formatter stringFromDate:notification.date];
+    formattedNotification[@"date"] = dateString;
+  }
+
+  formattedNotification[@"title"] = RCTNullIfNil(content.title);
+  formattedNotification[@"body"] = RCTNullIfNil(content.body);
+  formattedNotification[@"category"] = RCTNullIfNil(content.categoryIdentifier);
+  formattedNotification[@"thread-id"] = RCTNullIfNil(content.threadIdentifier);
+  formattedNotification[@"userInfo"] = RCTNullIfNil(RCTJSONClean(content.userInfo));
+
+  return formattedNotification;
+}
+
 #endif //TARGET_OS_TV
 
 RCT_EXPORT_MODULE()
@@ -407,6 +432,37 @@ - (void)handleRegisterUserNotificationSettings:(NSNotification *)notification
   callback(@[formattedScheduledLocalNotifications]);
 }
 
+RCT_EXPORT_METHOD(removeAllDeliveredNotifications)
+{
+  if ([UNUserNotificationCenter class]) {
+    UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
+    [center removeAllDeliveredNotifications];
+  }
+}
+
+RCT_EXPORT_METHOD(removeDeliveredNotifications:(NSArray<NSString *> *)identifiers)
+{
+  if ([UNUserNotificationCenter class]) {
+    UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
+    [center removeDeliveredNotificationsWithIdentifiers:identifiers];
+  }
+}
+
+RCT_EXPORT_METHOD(getDeliveredNotifications:(RCTResponseSenderBlock)callback)
+{
+  if ([UNUserNotificationCenter class]) {
+    UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
+    [center getDeliveredNotificationsWithCompletionHandler:^(NSArray<UNNotification *> *_Nonnull notifications) {
+      NSMutableArray<NSDictionary *> *formattedNotifications = [NSMutableArray new];
+
+      for (UNNotification *notification in notifications) {
+        [formattedNotifications addObject:RCTFormatUNNotification(notification)];
+      }
+      callback(@[formattedNotifications]);
+    }];
+  }
+}
+
 #endif //TARGET_OS_TV
 
 @end

From dcf3cbeb313453a6762a8a69d3749f9971d8a268 Mon Sep 17 00:00:00 2001
From: Michael Lee <mzlee@fb.com>
Date: Thu, 23 Mar 2017 11:57:18 -0700
Subject: [PATCH 170/366] Clean up some of the ReactNative Buck rules

Reviewed By: yangchi

Differential Revision: D4739284

fbshipit-source-id: 0ee335df0d114631e5fc60d5d6e51547e5312d39
---
 ReactAndroid/src/main/jni/first-party/fbgloginit/BUCK | 4 +++-
 ReactCommon/DEFS                                      | 3 +++
 ReactCommon/microprofiler/BUCK                        | 5 +++--
 3 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 ReactCommon/DEFS

diff --git a/ReactAndroid/src/main/jni/first-party/fbgloginit/BUCK b/ReactAndroid/src/main/jni/first-party/fbgloginit/BUCK
index a13c4c893b342e..484f90d0f810b0 100644
--- a/ReactAndroid/src/main/jni/first-party/fbgloginit/BUCK
+++ b/ReactAndroid/src/main/jni/first-party/fbgloginit/BUCK
@@ -1,3 +1,5 @@
+include_defs("//ReactCommon/DEFS")
+
 cxx_library(
     name = "fbgloginit",
     srcs = [
@@ -14,6 +16,6 @@ cxx_library(
     visibility = ["PUBLIC"],
     xcode_public_headers_symlinks = True,
     deps = [
-        "//xplat/third-party/glog:glog",
+        GLOG_DEP,
     ],
 )
diff --git a/ReactCommon/DEFS b/ReactCommon/DEFS
new file mode 100644
index 00000000000000..83eab26aa463fc
--- /dev/null
+++ b/ReactCommon/DEFS
@@ -0,0 +1,3 @@
+# Set up common deps
+
+GLOG_DEP = "//ReactAndroid/build/third-party-ndk/glog:glog"
diff --git a/ReactCommon/microprofiler/BUCK b/ReactCommon/microprofiler/BUCK
index d65e3f927d73e6..d84d62c24b8484 100644
--- a/ReactCommon/microprofiler/BUCK
+++ b/ReactCommon/microprofiler/BUCK
@@ -1,3 +1,5 @@
+include_defs("//ReactCommon/DEFS")
+
 cxx_library(
     name = "microprofiler",
     srcs = [
@@ -14,12 +16,11 @@ cxx_library(
     ],
     force_static = True,
     header_namespace = "microprofiler",
-    labels = ["accounts_for_platform_and_build_mode_flags"],
     visibility = [
         "PUBLIC",
     ],
     xcode_public_headers_symlinks = True,
     deps = [
-        "//xplat/third-party/glog:glog",
+        GLOG_DEP,
     ],
 )

From 20ba9871390be44b998a56e264a3dfd3b4582789 Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Thu, 23 Mar 2017 12:25:37 -0700
Subject: [PATCH 171/366] packager: TerminalReporter: stop reporting global
 cache errors

Summary: At FB we log errors into the error infra, and these errors are not actionnable for end users, so let's reduce the noise generated on the terminal. In the OSS case, people can simply add a handler in a TerminalReporter decorator, the same way we do internally (anyhow, I do not know of anyone using the global cache in OSS for now).

Reviewed By: davidaurelio

Differential Revision: D4762858

fbshipit-source-id: 880c02e175ae551df11b7ce273acc318222c46bf
---
 packager/src/lib/TerminalReporter.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packager/src/lib/TerminalReporter.js b/packager/src/lib/TerminalReporter.js
index 58500faa294175..7f63d3b7049cae 100644
--- a/packager/src/lib/TerminalReporter.js
+++ b/packager/src/lib/TerminalReporter.js
@@ -148,10 +148,6 @@ class TerminalReporter {
       case 'dep_graph_loaded':
         terminal.log(`${DEP_GRAPH_MESSAGE}, done.`);
         break;
-      case 'global_cache_error':
-        const message = JSON.stringify(event.error.message);
-        reporting.logWarning(terminal, 'the global cache failed: %s', message);
-        break;
       case 'global_cache_disabled':
         this._logCacheDisabled(event.reason);
         break;

From 7c9173bc9ef4683d2fe82ad1fcbe81b44c635f99 Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieter.debaets@gmail.com>
Date: Thu, 23 Mar 2017 14:58:20 -0700
Subject: [PATCH 172/366] Enable -Wimplicit-retain-self en sync warning config
 for all projects

Summary:
This is enforced for all of our internal iOS code and a common cause of import failures.

cc janicduplessis
Closes https://github.com/facebook/react-native/pull/13124

Differential Revision: D4765016

fbshipit-source-id: 7c8248c98bca0fa6bad24d5a52b666243375e0db
---
 .../RCTActionSheet.xcodeproj/project.pbxproj  |  4 ++--
 .../RCTAdSupport.xcodeproj/project.pbxproj    |  2 ++
 .../RCTCameraRoll.xcodeproj/project.pbxproj   |  2 ++
 .../RCTGeolocation.xcodeproj/project.pbxproj  |  2 ++
 .../Image/RCTImage.xcodeproj/project.pbxproj  |  2 ++
 .../RCTLinking.xcodeproj/project.pbxproj      |  2 ++
 .../RCTAnimation.xcodeproj/project.pbxproj    |  8 +++----
 .../RCTNetwork.xcodeproj/project.pbxproj      |  2 ++
 .../project.pbxproj                           |  6 ++++--
 .../RCTPushNotificationManager.m              | 21 ++++++++++---------
 .../RCTTest/RCTTest.xcodeproj/project.pbxproj |  2 ++
 .../RCTSettings.xcodeproj/project.pbxproj     |  2 ++
 .../Text/RCTText.xcodeproj/project.pbxproj    |  2 ++
 .../RCTVibration.xcodeproj/project.pbxproj    |  2 ++
 .../RCTWebSocket.xcodeproj/project.pbxproj    |  2 ++
 React/React.xcodeproj/project.pbxproj         |  2 --
 16 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj/project.pbxproj b/Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj/project.pbxproj
index ec14be43777e8f..aefd0f1c38d5f0 100644
--- a/Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj/project.pbxproj
+++ b/Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj/project.pbxproj
@@ -138,7 +138,7 @@
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				WARNING_CFLAGS = (
-					"-Wextra",
+					"-Werror",
 					"-Wall",
 				);
 			};
@@ -179,7 +179,7 @@
 				SKIP_INSTALL = YES;
 				VALIDATE_PRODUCT = YES;
 				WARNING_CFLAGS = (
-					"-Wextra",
+					"-Werror",
 					"-Wall",
 				);
 			};
diff --git a/Libraries/AdSupport/RCTAdSupport.xcodeproj/project.pbxproj b/Libraries/AdSupport/RCTAdSupport.xcodeproj/project.pbxproj
index 81bee2ab570dfb..127186d0ec1dea 100644
--- a/Libraries/AdSupport/RCTAdSupport.xcodeproj/project.pbxproj
+++ b/Libraries/AdSupport/RCTAdSupport.xcodeproj/project.pbxproj
@@ -135,6 +135,7 @@
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -182,6 +183,7 @@
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
diff --git a/Libraries/CameraRoll/RCTCameraRoll.xcodeproj/project.pbxproj b/Libraries/CameraRoll/RCTCameraRoll.xcodeproj/project.pbxproj
index 97f4860bf8cfc7..8e8acf275d7047 100644
--- a/Libraries/CameraRoll/RCTCameraRoll.xcodeproj/project.pbxproj
+++ b/Libraries/CameraRoll/RCTCameraRoll.xcodeproj/project.pbxproj
@@ -153,6 +153,7 @@
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -200,6 +201,7 @@
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
diff --git a/Libraries/Geolocation/RCTGeolocation.xcodeproj/project.pbxproj b/Libraries/Geolocation/RCTGeolocation.xcodeproj/project.pbxproj
index 916ec00c2529ea..eabbb8b862370a 100644
--- a/Libraries/Geolocation/RCTGeolocation.xcodeproj/project.pbxproj
+++ b/Libraries/Geolocation/RCTGeolocation.xcodeproj/project.pbxproj
@@ -111,6 +111,7 @@
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -158,6 +159,7 @@
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
diff --git a/Libraries/Image/RCTImage.xcodeproj/project.pbxproj b/Libraries/Image/RCTImage.xcodeproj/project.pbxproj
index 200008e1db2991..5369d035b71a32 100644
--- a/Libraries/Image/RCTImage.xcodeproj/project.pbxproj
+++ b/Libraries/Image/RCTImage.xcodeproj/project.pbxproj
@@ -361,6 +361,7 @@
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
@@ -412,6 +413,7 @@
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
diff --git a/Libraries/LinkingIOS/RCTLinking.xcodeproj/project.pbxproj b/Libraries/LinkingIOS/RCTLinking.xcodeproj/project.pbxproj
index d7916e085f7c82..233265be113fb1 100644
--- a/Libraries/LinkingIOS/RCTLinking.xcodeproj/project.pbxproj
+++ b/Libraries/LinkingIOS/RCTLinking.xcodeproj/project.pbxproj
@@ -174,6 +174,7 @@
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -220,6 +221,7 @@
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
diff --git a/Libraries/NativeAnimation/RCTAnimation.xcodeproj/project.pbxproj b/Libraries/NativeAnimation/RCTAnimation.xcodeproj/project.pbxproj
index 5150f0d3522d46..2318d21b0117bc 100644
--- a/Libraries/NativeAnimation/RCTAnimation.xcodeproj/project.pbxproj
+++ b/Libraries/NativeAnimation/RCTAnimation.xcodeproj/project.pbxproj
@@ -276,7 +276,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
@@ -284,7 +283,6 @@
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
-				TVOS_DEPLOYMENT_TARGET = 9.2;
 			};
 			name = Debug;
 		};
@@ -292,7 +290,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				COPY_PHASE_STRIP = NO;
@@ -301,7 +298,6 @@
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
-				TVOS_DEPLOYMENT_TARGET = 9.2;
 			};
 			name = Release;
 		};
@@ -319,6 +315,7 @@
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -346,6 +343,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
+				TVOS_DEPLOYMENT_TARGET = 9.2;
 				WARNING_CFLAGS = (
 					"-Werror",
 					"-Wall",
@@ -367,6 +365,7 @@
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -386,6 +385,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
+				TVOS_DEPLOYMENT_TARGET = 9.2;
 				VALIDATE_PRODUCT = YES;
 				WARNING_CFLAGS = (
 					"-Werror",
diff --git a/Libraries/Network/RCTNetwork.xcodeproj/project.pbxproj b/Libraries/Network/RCTNetwork.xcodeproj/project.pbxproj
index fb83bf9a5a17bc..d7875a8a137b16 100644
--- a/Libraries/Network/RCTNetwork.xcodeproj/project.pbxproj
+++ b/Libraries/Network/RCTNetwork.xcodeproj/project.pbxproj
@@ -217,6 +217,7 @@
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
@@ -268,6 +269,7 @@
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
diff --git a/Libraries/PushNotificationIOS/RCTPushNotification.xcodeproj/project.pbxproj b/Libraries/PushNotificationIOS/RCTPushNotification.xcodeproj/project.pbxproj
index 137a5c9903e7ef..7a126c7aac2318 100644
--- a/Libraries/PushNotificationIOS/RCTPushNotification.xcodeproj/project.pbxproj
+++ b/Libraries/PushNotificationIOS/RCTPushNotification.xcodeproj/project.pbxproj
@@ -222,6 +222,7 @@
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -246,7 +247,7 @@
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				WARNING_CFLAGS = (
-					"-Wextra",
+					"-Werror",
 					"-Wall",
 				);
 			};
@@ -266,6 +267,7 @@
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -288,7 +290,7 @@
 				SKIP_INSTALL = YES;
 				VALIDATE_PRODUCT = YES;
 				WARNING_CFLAGS = (
-					"-Wextra",
+					"-Werror",
 					"-Wall",
 				);
 			};
diff --git a/Libraries/PushNotificationIOS/RCTPushNotificationManager.m b/Libraries/PushNotificationIOS/RCTPushNotificationManager.m
index b57fd2b72f0fec..4b8988413a877b 100644
--- a/Libraries/PushNotificationIOS/RCTPushNotificationManager.m
+++ b/Libraries/PushNotificationIOS/RCTPushNotificationManager.m
@@ -131,6 +131,7 @@ - (dispatch_queue_t)methodQueue
   return dispatch_get_main_queue();
 }
 
+#if !TARGET_OS_TV
 - (void)startObserving
 {
   [[NSNotificationCenter defaultCenter] addObserver:self
@@ -168,8 +169,6 @@ - (void)stopObserving
            @"remoteNotificationRegistrationError"];
 }
 
-#if !TARGET_OS_TV
-
 + (void)didRegisterUserNotificationSettings:(__unused UIUserNotificationSettings *)notificationSettings
 {
   if ([UIApplication instancesRespondToSelector:@selector(registerForRemoteNotifications)]) {
@@ -337,14 +336,9 @@ - (void)handleRegisterUserNotificationSettings:(NSNotification *)notification
     types = UIUserNotificationTypeAlert | UIUserNotificationTypeBadge | UIUserNotificationTypeSound;
   }
 
-  UIApplication *app = RCTSharedApplication();
-  if ([app respondsToSelector:@selector(registerUserNotificationSettings:)]) {
-    UIUserNotificationSettings *notificationSettings =
-      [UIUserNotificationSettings settingsForTypes:(NSUInteger)types categories:nil];
-    [app registerUserNotificationSettings:notificationSettings];
-  } else {
-    [app registerForRemoteNotificationTypes:(NSUInteger)types];
-  }
+  UIUserNotificationSettings *notificationSettings =
+    [UIUserNotificationSettings settingsForTypes:types categories:nil];
+  [RCTSharedApplication() registerUserNotificationSettings:notificationSettings];
 }
 
 RCT_EXPORT_METHOD(abandonPermissions)
@@ -463,6 +457,13 @@ - (void)handleRegisterUserNotificationSettings:(NSNotification *)notification
   }
 }
 
+#else //TARGET_OS_TV
+
+- (NSArray<NSString *> *)supportedEvents
+{
+  return @[];
+}
+
 #endif //TARGET_OS_TV
 
 @end
diff --git a/Libraries/RCTTest/RCTTest.xcodeproj/project.pbxproj b/Libraries/RCTTest/RCTTest.xcodeproj/project.pbxproj
index 1fec98089e80b7..49b02ca7d5963c 100644
--- a/Libraries/RCTTest/RCTTest.xcodeproj/project.pbxproj
+++ b/Libraries/RCTTest/RCTTest.xcodeproj/project.pbxproj
@@ -301,6 +301,7 @@
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -348,6 +349,7 @@
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
diff --git a/Libraries/Settings/RCTSettings.xcodeproj/project.pbxproj b/Libraries/Settings/RCTSettings.xcodeproj/project.pbxproj
index a40956a1252f5c..22c1bb807bf808 100644
--- a/Libraries/Settings/RCTSettings.xcodeproj/project.pbxproj
+++ b/Libraries/Settings/RCTSettings.xcodeproj/project.pbxproj
@@ -174,6 +174,7 @@
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -221,6 +222,7 @@
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
diff --git a/Libraries/Text/RCTText.xcodeproj/project.pbxproj b/Libraries/Text/RCTText.xcodeproj/project.pbxproj
index c9813036d48f43..9c2c8a8f0d8b3a 100644
--- a/Libraries/Text/RCTText.xcodeproj/project.pbxproj
+++ b/Libraries/Text/RCTText.xcodeproj/project.pbxproj
@@ -280,6 +280,7 @@
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -327,6 +328,7 @@
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
diff --git a/Libraries/Vibration/RCTVibration.xcodeproj/project.pbxproj b/Libraries/Vibration/RCTVibration.xcodeproj/project.pbxproj
index f42c786cc33146..b8a1444bc89223 100644
--- a/Libraries/Vibration/RCTVibration.xcodeproj/project.pbxproj
+++ b/Libraries/Vibration/RCTVibration.xcodeproj/project.pbxproj
@@ -110,6 +110,7 @@
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -156,6 +157,7 @@
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
diff --git a/Libraries/WebSocket/RCTWebSocket.xcodeproj/project.pbxproj b/Libraries/WebSocket/RCTWebSocket.xcodeproj/project.pbxproj
index dd43b03eb93fd5..8008c37898b786 100644
--- a/Libraries/WebSocket/RCTWebSocket.xcodeproj/project.pbxproj
+++ b/Libraries/WebSocket/RCTWebSocket.xcodeproj/project.pbxproj
@@ -204,6 +204,7 @@
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -253,6 +254,7 @@
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
diff --git a/React/React.xcodeproj/project.pbxproj b/React/React.xcodeproj/project.pbxproj
index 0ce76ef1c9252a..108d55556178c4 100644
--- a/React/React.xcodeproj/project.pbxproj
+++ b/React/React.xcodeproj/project.pbxproj
@@ -2737,7 +2737,6 @@
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_TESTABILITY = YES;
-				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -2760,7 +2759,6 @@
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_NO_COMMON_BLOCKS = YES;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = React;
 				PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/React;

From d868e86df0dd51e690b7901b3c860657da527010 Mon Sep 17 00:00:00 2001
From: Gabe Levi <gabe@fb.com>
Date: Thu, 23 Mar 2017 16:33:32 -0700
Subject: [PATCH 173/366] Deploy v0.42.0

Reviewed By: zertosh

Differential Revision: D4732064

fbshipit-source-id: 12fb8f9aff983ff5d1cb01f413bab761259829f9
---
 .flowconfig                                | 6 +++---
 local-cli/templates/HelloWorld/_flowconfig | 6 +++---
 package.json                               | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.flowconfig b/.flowconfig
index 79f6aa7d18c1b7..2eb01377dc3fcf 100644
--- a/.flowconfig
+++ b/.flowconfig
@@ -46,12 +46,12 @@ suppress_type=$FlowIssue
 suppress_type=$FlowFixMe
 suppress_type=$FixMe
 
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(4[0-1]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native_oss[a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(4[0-1]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native_oss[a-z,_]*\\)?)\\)?:? #[0-9]+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(4[0-2]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native_oss[a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(4[0-2]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native_oss[a-z,_]*\\)?)\\)?:? #[0-9]+
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
 
 unsafe.enable_getters_and_setters=true
 
 [version]
-^0.41.0
+^0.42.0
diff --git a/local-cli/templates/HelloWorld/_flowconfig b/local-cli/templates/HelloWorld/_flowconfig
index ee8308a2f984db..a76425eb4881f2 100644
--- a/local-cli/templates/HelloWorld/_flowconfig
+++ b/local-cli/templates/HelloWorld/_flowconfig
@@ -36,12 +36,12 @@ suppress_type=$FlowIssue
 suppress_type=$FlowFixMe
 suppress_type=$FixMe
 
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(4[0-1]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(4[0-1]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(4[0-2]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(4[0-2]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
 
 unsafe.enable_getters_and_setters=true
 
 [version]
-^0.41.0
+^0.42.0
diff --git a/package.json b/package.json
index 7de90fad4475f4..32a89cf239713d 100644
--- a/package.json
+++ b/package.json
@@ -218,7 +218,7 @@
     "eslint-plugin-babel": "^3.3.0",
     "eslint-plugin-flowtype": "^2.20.0",
     "eslint-plugin-react": "^6.4.1",
-    "flow-bin": "^0.41.0",
+    "flow-bin": "^0.42.0",
     "jest": "19.0.2",
     "jest-repl": "19.0.2",
     "jest-runtime": "19.0.2",

From febf3d00ed228391ee4dd6541b0d2746dc56d21f Mon Sep 17 00:00:00 2001
From: Eric Vicenti <evv@fb.com>
Date: Thu, 23 Mar 2017 17:28:34 -0700
Subject: [PATCH 174/366] Remove Deprecated NavigationExperimental

Summary:
Now that there are a number of good navigation solutions provided by the community, we are ready to remove NavigationExperimental from the RN core. The latest navigation doc explains the available options pretty well: http://facebook.github.io/react-native/docs/navigation.html . We should also add a mention to Airbnb's new native-navigation.

For anybody who continues to rely on it, it is recommended to migrate to React Navigation, which will be maintained over the long-term. For those who cannot migrate yet, it is possible to copy this code into your app.
Closes https://github.com/facebook/react-native/pull/13066

Differential Revision: D4757539

Pulled By: ericvicenti

fbshipit-source-id: 949d9b33f188584fb095155fa67d3ce24beba29f
---
 .../NavigationAnimatedValueSubscription.js    |  48 ---
 .../NavigationExperimental/NavigationCard.js  | 132 -------
 .../NavigationCardStack.js                    | 329 ------------------
 .../NavigationCardStackPanResponder.js        | 271 ---------------
 .../NavigationCardStackStyleInterpolator.js   | 176 ----------
 .../NavigationHeader.js                       | 282 ---------------
 .../NavigationHeaderBackButton.js             |  69 ----
 .../NavigationHeaderStyleInterpolator.js      |  99 ------
 .../NavigationHeaderTitle.js                  |  81 -----
 .../NavigationPagerPanResponder.js            | 238 -------------
 .../NavigationPagerStyleInterpolator.js       | 116 ------
 .../NavigationPointerEventsContainer.js       | 158 ---------
 .../assets/back-icon@1.5x.android.png         | Bin 134 -> 0 bytes
 .../assets/back-icon@1.5x.ios.png             | Bin 273 -> 0 bytes
 .../assets/back-icon@1x.android.png           | Bin 100 -> 0 bytes
 .../assets/back-icon@1x.ios.png               | Bin 177 -> 0 bytes
 .../assets/back-icon@2x.android.png           | Bin 134 -> 0 bytes
 .../assets/back-icon@2x.ios.png               | Bin 303 -> 0 bytes
 .../assets/back-icon@3x.android.png           | Bin 167 -> 0 bytes
 .../assets/back-icon@3x.ios.png               | Bin 439 -> 0 bytes
 .../assets/back-icon@4x.android.png           | Bin 207 -> 0 bytes
 .../assets/back-icon@4x.ios.png               | Bin 586 -> 0 bytes
 .../NavigationAbstractPanResponder.js         |  56 ---
 .../NavigationExperimental.js                 |  48 ---
 .../NavigationPropTypes.js                    | 124 -------
 .../NavigationStateUtils.js                   | 215 ------------
 .../NavigationTransitioner.js                 | 292 ----------------
 .../NavigationTypeDefinition.js               | 121 -------
 .../Reducer/NavigationScenesReducer.js        | 210 -----------
 .../__tests__/NavigationScenesReducer-test.js | 300 ----------------
 .../__tests__/NavigationStateUtils-test.js    | 156 ---------
 .../react-native-implementation.js            |   1 -
 32 files changed, 3522 deletions(-)
 delete mode 100644 Libraries/CustomComponents/NavigationExperimental/NavigationAnimatedValueSubscription.js
 delete mode 100644 Libraries/CustomComponents/NavigationExperimental/NavigationCard.js
 delete mode 100644 Libraries/CustomComponents/NavigationExperimental/NavigationCardStack.js
 delete mode 100644 Libraries/CustomComponents/NavigationExperimental/NavigationCardStackPanResponder.js
 delete mode 100644 Libraries/CustomComponents/NavigationExperimental/NavigationCardStackStyleInterpolator.js
 delete mode 100644 Libraries/CustomComponents/NavigationExperimental/NavigationHeader.js
 delete mode 100644 Libraries/CustomComponents/NavigationExperimental/NavigationHeaderBackButton.js
 delete mode 100644 Libraries/CustomComponents/NavigationExperimental/NavigationHeaderStyleInterpolator.js
 delete mode 100644 Libraries/CustomComponents/NavigationExperimental/NavigationHeaderTitle.js
 delete mode 100644 Libraries/CustomComponents/NavigationExperimental/NavigationPagerPanResponder.js
 delete mode 100644 Libraries/CustomComponents/NavigationExperimental/NavigationPagerStyleInterpolator.js
 delete mode 100644 Libraries/CustomComponents/NavigationExperimental/NavigationPointerEventsContainer.js
 delete mode 100644 Libraries/CustomComponents/NavigationExperimental/assets/back-icon@1.5x.android.png
 delete mode 100644 Libraries/CustomComponents/NavigationExperimental/assets/back-icon@1.5x.ios.png
 delete mode 100644 Libraries/CustomComponents/NavigationExperimental/assets/back-icon@1x.android.png
 delete mode 100644 Libraries/CustomComponents/NavigationExperimental/assets/back-icon@1x.ios.png
 delete mode 100644 Libraries/CustomComponents/NavigationExperimental/assets/back-icon@2x.android.png
 delete mode 100644 Libraries/CustomComponents/NavigationExperimental/assets/back-icon@2x.ios.png
 delete mode 100644 Libraries/CustomComponents/NavigationExperimental/assets/back-icon@3x.android.png
 delete mode 100644 Libraries/CustomComponents/NavigationExperimental/assets/back-icon@3x.ios.png
 delete mode 100644 Libraries/CustomComponents/NavigationExperimental/assets/back-icon@4x.android.png
 delete mode 100644 Libraries/CustomComponents/NavigationExperimental/assets/back-icon@4x.ios.png
 delete mode 100644 Libraries/NavigationExperimental/NavigationAbstractPanResponder.js
 delete mode 100644 Libraries/NavigationExperimental/NavigationExperimental.js
 delete mode 100644 Libraries/NavigationExperimental/NavigationPropTypes.js
 delete mode 100644 Libraries/NavigationExperimental/NavigationStateUtils.js
 delete mode 100644 Libraries/NavigationExperimental/NavigationTransitioner.js
 delete mode 100644 Libraries/NavigationExperimental/NavigationTypeDefinition.js
 delete mode 100644 Libraries/NavigationExperimental/Reducer/NavigationScenesReducer.js
 delete mode 100644 Libraries/NavigationExperimental/Reducer/__tests__/NavigationScenesReducer-test.js
 delete mode 100644 Libraries/NavigationExperimental/__tests__/NavigationStateUtils-test.js

diff --git a/Libraries/CustomComponents/NavigationExperimental/NavigationAnimatedValueSubscription.js b/Libraries/CustomComponents/NavigationExperimental/NavigationAnimatedValueSubscription.js
deleted file mode 100644
index 5f06907124f826..00000000000000
--- a/Libraries/CustomComponents/NavigationExperimental/NavigationAnimatedValueSubscription.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * Copyright (c) 2015, Facebook, Inc.  All rights reserved.
- *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @providesModule NavigationAnimatedValueSubscription
- * @flow
- */
-'use strict';
-
-import type  {
-  NavigationAnimatedValue
-} from 'NavigationTypeDefinition';
-
-class NavigationAnimatedValueSubscription {
-  _value: NavigationAnimatedValue;
-  _token: string;
-
-  constructor(value: NavigationAnimatedValue, callback: Function) {
-    this._value = value;
-    this._token = value.addListener(callback);
-  }
-
-  remove(): void {
-    this._value.removeListener(this._token);
-  }
-}
-
-module.exports = NavigationAnimatedValueSubscription;
diff --git a/Libraries/CustomComponents/NavigationExperimental/NavigationCard.js b/Libraries/CustomComponents/NavigationExperimental/NavigationCard.js
deleted file mode 100644
index e2f42fed3ed1ee..00000000000000
--- a/Libraries/CustomComponents/NavigationExperimental/NavigationCard.js
+++ /dev/null
@@ -1,132 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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.
- *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @providesModule NavigationCard
- * @flow
- */
-'use strict';
-
-const Animated = require('Animated');
-const NavigationCardStackPanResponder = require('NavigationCardStackPanResponder');
-const NavigationCardStackStyleInterpolator = require('NavigationCardStackStyleInterpolator');
-const NavigationPagerPanResponder = require('NavigationPagerPanResponder');
-const NavigationPagerStyleInterpolator = require('NavigationPagerStyleInterpolator');
-const NavigationPointerEventsContainer = require('NavigationPointerEventsContainer');
-const NavigationPropTypes = require('NavigationPropTypes');
-const React = require('React');
-const StyleSheet = require('StyleSheet');
-
-import type  {
-  NavigationPanPanHandlers,
-  NavigationSceneRenderer,
-  NavigationSceneRendererProps,
-} from 'NavigationTypeDefinition';
-
-type Props = NavigationSceneRendererProps & {
-  onComponentRef: (ref: any) => void,
-  onNavigateBack: ?Function,
-  panHandlers: ?NavigationPanPanHandlers,
-  pointerEvents: string,
-  renderScene: NavigationSceneRenderer,
-  style: any,
-};
-
-const {PropTypes} = React;
-
-/**
- * Component that renders the scene as card for the <NavigationCardStack />.
- */
-class NavigationCard extends React.Component<any, Props, any> {
-  props: Props;
-
-  static propTypes = {
-    ...NavigationPropTypes.SceneRendererProps,
-    onComponentRef: PropTypes.func.isRequired,
-    onNavigateBack: PropTypes.func,
-    panHandlers: NavigationPropTypes.panHandlers,
-    pointerEvents: PropTypes.string.isRequired,
-    renderScene: PropTypes.func.isRequired,
-    style: PropTypes.any,
-  };
-
-  render(): React.Element<any> {
-    const {
-      panHandlers,
-      pointerEvents,
-      renderScene,
-      style,
-      ...props /* NavigationSceneRendererProps */
-    } = this.props;
-
-    const viewStyle = style === undefined ?
-      NavigationCardStackStyleInterpolator.forHorizontal(props) :
-      style;
-
-    const viewPanHandlers = panHandlers === undefined ?
-      NavigationCardStackPanResponder.forHorizontal({
-        ...props,
-        onNavigateBack: this.props.onNavigateBack,
-      }) :
-      panHandlers;
-
-    return (
-      <Animated.View
-        {...viewPanHandlers}
-        pointerEvents={pointerEvents}
-        ref={this.props.onComponentRef}
-        style={[styles.main, viewStyle]}>
-        {renderScene(props)}
-      </Animated.View>
-    );
-  }
-}
-
-const styles = StyleSheet.create({
-  main: {
-    backgroundColor: '#E9E9EF',
-    bottom: 0,
-    left: 0,
-    position: 'absolute',
-    right: 0,
-    shadowColor: 'black',
-    shadowOffset: {width: 0, height: 0},
-    shadowOpacity: 0.4,
-    shadowRadius: 10,
-    top: 0,
-  },
-});
-
-NavigationCard = NavigationPointerEventsContainer.create(NavigationCard);
-
-NavigationCard.CardStackPanResponder = NavigationCardStackPanResponder;
-NavigationCard.CardStackStyleInterpolator = NavigationCardStackStyleInterpolator;
-NavigationCard.PagerPanResponder = NavigationPagerPanResponder;
-NavigationCard.PagerStyleInterpolator = NavigationPagerStyleInterpolator;
-
-module.exports = NavigationCard;
diff --git a/Libraries/CustomComponents/NavigationExperimental/NavigationCardStack.js b/Libraries/CustomComponents/NavigationExperimental/NavigationCardStack.js
deleted file mode 100644
index 3a54633e7eaa8f..00000000000000
--- a/Libraries/CustomComponents/NavigationExperimental/NavigationCardStack.js
+++ /dev/null
@@ -1,329 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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.
- *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @providesModule NavigationCardStack
- * @flow
- */
-'use strict';
-
-const NativeAnimatedModule = require('NativeModules').NativeAnimatedModule;
-const NavigationCard = require('NavigationCard');
-const NavigationCardStackPanResponder = require('NavigationCardStackPanResponder');
-const NavigationCardStackStyleInterpolator = require('NavigationCardStackStyleInterpolator');
-const NavigationPropTypes = require('NavigationPropTypes');
-const NavigationTransitioner = require('NavigationTransitioner');
-const React = require('React');
-const StyleSheet = require('StyleSheet');
-const View = require('View');
-
-const {PropTypes} = React;
-const {Directions} = NavigationCardStackPanResponder;
-
-import type {
-  NavigationState,
-  NavigationSceneRenderer,
-  NavigationSceneRendererProps,
-  NavigationTransitionProps,
-  NavigationStyleInterpolator,
-} from 'NavigationTypeDefinition';
-
-import type {
-  NavigationGestureDirection,
-} from 'NavigationCardStackPanResponder';
-
-type Props = {
-  direction: NavigationGestureDirection,
-  navigationState: NavigationState,
-  onNavigateBack?: Function,
-  renderHeader: ?NavigationSceneRenderer,
-  renderScene: NavigationSceneRenderer,
-  cardStyle?: any,
-  style: any,
-  gestureResponseDistance?: ?number,
-  enableGestures: ?boolean,
-  cardStyleInterpolator?: ?NavigationStyleInterpolator,
-  scenesStyle?: any,
-};
-
-type DefaultProps = {
-  direction: NavigationGestureDirection,
-  enableGestures: boolean,
-};
-
-/**
- * A controlled navigation view that renders a stack of cards.
- *
- * ```html
- *     +------------+
- *   +-|   Header   |
- * +-+ |------------|
- * | | |            |
- * | | |  Focused   |
- * | | |   Card     |
- * | | |            |
- * +-+ |            |
- *   +-+            |
- *     +------------+
- * ```
- *
- * ## Example
- *
- * ```js
- *
- * class App extends React.Component {
- *   constructor(props, context) {
- *     this.state = {
- *       navigation: {
- *         index: 0,
- *         routes: [
- *           {key: 'page 1'},
- *         },
- *       },
- *     };
- *   }
- *
- *   render() {
- *     return (
- *       <NavigationCardStack
- *         navigationState={this.state.navigation}
- *         renderScene={this._renderScene}
- *       />
- *     );
- *   }
- *
- *   _renderScene: (props) => {
- *     return (
- *       <View>
- *         <Text>{props.scene.route.key}</Text>
- *       </View>
- *     );
- *   };
- * ```
- */
-class NavigationCardStack extends React.Component<DefaultProps, Props, void> {
-  _render : NavigationSceneRenderer;
-  _renderScene : NavigationSceneRenderer;
-
-  static propTypes = {
-    /**
-     * Custom style applied to the card.
-     */
-    cardStyle: PropTypes.any,
-
-    /**
-     * Direction of the cards movement. Value could be `horizontal` or
-     * `vertical`. Default value is `horizontal`.
-     */
-    direction: PropTypes.oneOf([Directions.HORIZONTAL, Directions.VERTICAL]),
-
-    /**
-     * The distance from the edge of the card which gesture response can start
-     * for. Default value is `30`.
-     */
-    gestureResponseDistance: PropTypes.number,
-
-    /**
-     * An interpolator function that is passed an object parameter of type
-     * NavigationSceneRendererProps and should return a style object to apply to
-     * the transitioning navigation card.
-     *
-     * Default interpolator transitions translateX, scale, and opacity.
-     */
-    cardStyleInterpolator: PropTypes.func,
-
-    /**
-     * Enable gestures. Default value is true.
-     *
-     * When disabled, transition animations will be handled natively, which
-     * improves performance of the animation. In future iterations, gestures
-     * will also work with native-driven animation.
-     */
-    enableGestures: PropTypes.bool,
-
-    /**
-     * The controlled navigation state. Typically, the navigation state
-     * look like this:
-     *
-     * ```js
-     * const navigationState = {
-     *   index: 0, // the index of the selected route.
-     *   routes: [ // A list of routes.
-     *     {key: 'page 1'}, // The 1st route.
-     *     {key: 'page 2'}, // The second route.
-     *   ],
-     * };
-     * ```
-     */
-    navigationState: NavigationPropTypes.navigationState.isRequired,
-
-    /**
-     * Callback that is called when the "back" action is performed.
-     * This happens when the back button is pressed or the back gesture is
-     * performed.
-     */
-    onNavigateBack: PropTypes.func,
-
-    /**
-     * Function that renders the header.
-     */
-    renderHeader: PropTypes.func,
-
-    /**
-     * Function that renders the a scene for a route.
-     */
-    renderScene: PropTypes.func.isRequired,
-
-    /**
-     * Custom style applied to the cards stack.
-     */
-    style: View.propTypes.style,
-
-    /**
-     * Custom style applied to the scenes stack.
-     */
-    scenesStyle: View.propTypes.style,
-  };
-
-  static defaultProps: DefaultProps = {
-    direction: Directions.HORIZONTAL,
-    enableGestures: true,
-  };
-
-  constructor(props: Props, context: any) {
-    super(props, context);
-  }
-
-  componentWillMount(): void {
-    this._render = this._render.bind(this);
-    this._renderScene = this._renderScene.bind(this);
-  }
-
-  render(): React.Element<any> {
-    return (
-      <NavigationTransitioner
-        configureTransition={this._configureTransition}
-        navigationState={this.props.navigationState}
-        render={this._render}
-        style={this.props.style}
-      />
-    );
-  }
-
-  _configureTransition = () => {
-    const isVertical = this.props.direction === 'vertical';
-    const animationConfig = {};
-    if (
-      !!NativeAnimatedModule
-
-      // Gestures do not work with the current iteration of native animation
-      // driving. When gestures are disabled, we can drive natively.
-      && !this.props.enableGestures
-
-      // Native animation support also depends on the transforms used:
-      && NavigationCardStackStyleInterpolator.canUseNativeDriver(isVertical)
-    ) {
-      animationConfig.useNativeDriver = true;
-    }
-    return animationConfig;
-  }
-
-  _render(props: NavigationTransitionProps): React.Element<any> {
-    const {
-      renderHeader,
-    } = this.props;
-
-    const header = renderHeader ? <View>{renderHeader(props)}</View> : null;
-
-    const scenes = props.scenes.map(
-     scene => this._renderScene({
-       ...props,
-       scene,
-     })
-    );
-
-    return (
-      <View style={styles.container}>
-        <View
-          style={[styles.scenes, this.props.scenesStyle]}>
-          {scenes}
-        </View>
-        {header}
-      </View>
-    );
-  }
-
-  _renderScene(props: NavigationSceneRendererProps): React.Element<any> {
-    const isVertical = this.props.direction === 'vertical';
-
-    const interpolator = this.props.cardStyleInterpolator || (isVertical ?
-      NavigationCardStackStyleInterpolator.forVertical :
-      NavigationCardStackStyleInterpolator.forHorizontal);
-
-    const style = interpolator(props);
-
-    let panHandlers = null;
-
-    if (this.props.enableGestures) {
-      const panHandlersProps = {
-        ...props,
-        onNavigateBack: this.props.onNavigateBack,
-        gestureResponseDistance: this.props.gestureResponseDistance,
-      };
-      panHandlers = isVertical ?
-        NavigationCardStackPanResponder.forVertical(panHandlersProps) :
-        NavigationCardStackPanResponder.forHorizontal(panHandlersProps);
-    }
-
-    return (
-      <NavigationCard
-        {...props}
-        key={'card_' + props.scene.key}
-        panHandlers={panHandlers}
-        renderScene={this.props.renderScene}
-        style={[style, this.props.cardStyle]}
-      />
-    );
-  }
-}
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    // Header is physically rendered after scenes so that Header won't be
-    // covered by the shadows of the scenes.
-    // That said, we'd have use `flexDirection: 'column-reverse'` to move
-    // Header above the scenes.
-    flexDirection: 'column-reverse',
-  },
-  scenes: {
-    flex: 1,
-  },
-});
-
-module.exports = NavigationCardStack;
diff --git a/Libraries/CustomComponents/NavigationExperimental/NavigationCardStackPanResponder.js b/Libraries/CustomComponents/NavigationExperimental/NavigationCardStackPanResponder.js
deleted file mode 100644
index 6ebf0661026658..00000000000000
--- a/Libraries/CustomComponents/NavigationExperimental/NavigationCardStackPanResponder.js
+++ /dev/null
@@ -1,271 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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 NavigationCardStackPanResponder
- * @flow
- */
-'use strict';
-
-const Animated = require('Animated');
-const I18nManager = require('I18nManager');
-const NavigationAbstractPanResponder = require('NavigationAbstractPanResponder');
-
-const clamp = require('clamp');
-
-import type {
-  NavigationPanPanHandlers,
-  NavigationSceneRendererProps,
-} from 'NavigationTypeDefinition';
-
-const emptyFunction = () => {};
-
-/**
- * The duration of the card animation in milliseconds.
- */
-const ANIMATION_DURATION = 250;
-
-/**
- * The threshold to invoke the `onNavigateBack` action.
- * For instance, `1 / 3` means that moving greater than 1 / 3 of the width of
- * the view will navigate.
- */
-const POSITION_THRESHOLD = 1 / 3;
-
-/**
- * The threshold (in pixels) to start the gesture action.
- */
-const RESPOND_THRESHOLD = 15;
-
-/**
- * The threshold (in pixels) to finish the gesture action.
- */
-const DISTANCE_THRESHOLD = 100;
-
-/**
- * Primitive gesture directions.
- */
-const Directions = {
-  'HORIZONTAL': 'horizontal',
-  'VERTICAL': 'vertical',
-};
-
-export type NavigationGestureDirection =  'horizontal' | 'vertical';
-
-type Props = NavigationSceneRendererProps & {
-  onNavigateBack: ?Function,
-  /**
-  * The distance from the edge of the navigator which gesture response can start for.
-  **/
-  gestureResponseDistance: ?number,
-};
-
-/**
- * Pan responder that handles gesture for a card in the cards stack.
- *
- *     +------------+
- *   +-+            |
- * +-+ |            |
- * | | |            |
- * | | |  Focused   |
- * | | |   Card     |
- * | | |            |
- * +-+ |            |
- *   +-+            |
- *     +------------+
- */
-class NavigationCardStackPanResponder extends NavigationAbstractPanResponder {
-
-  _isResponding: boolean;
-  _isVertical: boolean;
-  _props: Props;
-  _startValue: number;
-
-  constructor(
-    direction: NavigationGestureDirection,
-    props: Props,
-  ) {
-    super();
-    this._isResponding = false;
-    this._isVertical = direction === Directions.VERTICAL;
-    this._props = props;
-    this._startValue = 0;
-
-    // Hack to make this work with native driven animations. We add a single listener
-    // so the JS value of the following animated values gets updated. We rely on
-    // some Animated private APIs and not doing so would require using a bunch of
-    // value listeners but we'd have to remove them to not leak and I'm not sure
-    // when we'd do that with the current structure we have. `stopAnimation` callback
-    // is also broken with native animated values that have no listeners so if we
-    // want to remove this we have to fix this too.
-    this._addNativeListener(this._props.layout.width);
-    this._addNativeListener(this._props.layout.height);
-    this._addNativeListener(this._props.position);
-  }
-
-  onMoveShouldSetPanResponder(event: any, gesture: any): boolean {
-    const props = this._props;
-
-    if (props.navigationState.index !== props.scene.index) {
-      return false;
-    }
-
-    const layout = props.layout;
-    const isVertical = this._isVertical;
-    const index = props.navigationState.index;
-    const currentDragDistance = gesture[isVertical ? 'dy' : 'dx'];
-    const currentDragPosition = gesture[isVertical ? 'moveY' : 'moveX'];
-    const maxDragDistance = isVertical ?
-      layout.height.__getValue() :
-      layout.width.__getValue();
-
-    const positionMax = isVertical ?
-      props.gestureResponseDistance :
-      /**
-      * For horizontal scroll views, a distance of 30 from the left of the screen is the
-      * standard maximum position to start touch responsiveness.
-      */
-      props.gestureResponseDistance || 30;
-
-    if (positionMax != null && currentDragPosition > positionMax) {
-      return false;
-    }
-
-    return (
-      Math.abs(currentDragDistance) > RESPOND_THRESHOLD &&
-      maxDragDistance > 0 &&
-      index > 0
-    );
-  }
-
-  onPanResponderGrant(): void {
-    this._isResponding = false;
-    this._props.position.stopAnimation((value: number) => {
-      this._isResponding = true;
-      this._startValue = value;
-    });
-  }
-
-  onPanResponderMove(event: any, gesture: any): void {
-    if (!this._isResponding) {
-      return;
-    }
-
-    const props = this._props;
-    const layout = props.layout;
-    const isVertical = this._isVertical;
-    const axis = isVertical ? 'dy' : 'dx';
-    const index = props.navigationState.index;
-    const distance = isVertical ?
-      layout.height.__getValue() :
-      layout.width.__getValue();
-    const currentValue = I18nManager.isRTL && axis === 'dx' ?
-      this._startValue + (gesture[axis] / distance) :
-      this._startValue - (gesture[axis] / distance);
-
-    const value = clamp(
-      index - 1,
-      currentValue,
-      index
-    );
-
-    props.position.setValue(value);
-  }
-
-  onPanResponderRelease(event: any, gesture: any): void {
-    if (!this._isResponding) {
-      return;
-    }
-
-    this._isResponding = false;
-
-    const props = this._props;
-    const isVertical = this._isVertical;
-    const axis = isVertical ? 'dy' : 'dx';
-    const index = props.navigationState.index;
-    const distance = I18nManager.isRTL && axis === 'dx' ?
-      -gesture[axis] :
-      gesture[axis];
-
-    props.position.stopAnimation((value: number) => {
-      this._reset();
-
-      if (!props.onNavigateBack) {
-        return;
-      }
-
-      if (
-        distance > DISTANCE_THRESHOLD  ||
-        value <= index - POSITION_THRESHOLD
-      ) {
-        props.onNavigateBack();
-      }
-    });
-  }
-
-  onPanResponderTerminate(): void {
-    this._isResponding = false;
-    this._reset();
-  }
-
-  _reset(): void {
-    const props = this._props;
-    Animated.timing(
-      props.position,
-      {
-        toValue: props.navigationState.index,
-        duration: ANIMATION_DURATION,
-        useNativeDriver: props.position.__isNative,
-      }
-    ).start();
-  }
-
-  _addNativeListener(animatedValue) {
-    if (!animatedValue.__isNative) {
-      return;
-    }
-
-    if (Object.keys(animatedValue._listeners).length === 0) {
-      animatedValue.addListener(emptyFunction);
-    }
-  }
-}
-
-function createPanHandlers(
-  direction: NavigationGestureDirection,
-  props: Props,
-): NavigationPanPanHandlers {
-  const responder = new NavigationCardStackPanResponder(direction, props);
-  return responder.panHandlers;
-}
-
-function forHorizontal(
-  props: Props,
-): NavigationPanPanHandlers {
-  return createPanHandlers(Directions.HORIZONTAL, props);
-}
-
-function forVertical(
-  props: Props,
-): NavigationPanPanHandlers {
-  return createPanHandlers(Directions.VERTICAL, props);
-}
-
-module.exports = {
-  // constants
-  ANIMATION_DURATION,
-  DISTANCE_THRESHOLD,
-  POSITION_THRESHOLD,
-  RESPOND_THRESHOLD,
-
-  // enums
-  Directions,
-
-  // methods.
-  forHorizontal,
-  forVertical,
-};
diff --git a/Libraries/CustomComponents/NavigationExperimental/NavigationCardStackStyleInterpolator.js b/Libraries/CustomComponents/NavigationExperimental/NavigationCardStackStyleInterpolator.js
deleted file mode 100644
index e3ef1ad054306b..00000000000000
--- a/Libraries/CustomComponents/NavigationExperimental/NavigationCardStackStyleInterpolator.js
+++ /dev/null
@@ -1,176 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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.
- *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @providesModule NavigationCardStackStyleInterpolator
- * @flow
- */
-'use strict';
-
-const I18nManager = require('I18nManager');
-
-import type  {
-  NavigationSceneRendererProps,
-} from 'NavigationTypeDefinition';
-
-/**
- * Utility that builds the style for the card in the cards stack.
- *
- *     +------------+
- *   +-+            |
- * +-+ |            |
- * | | |            |
- * | | |  Focused   |
- * | | |   Card     |
- * | | |            |
- * +-+ |            |
- *   +-+            |
- *     +------------+
- */
-
-/**
- * Render the initial style when the initial layout isn't measured yet.
- */
-function forInitial(props: NavigationSceneRendererProps): Object {
-  const {
-    navigationState,
-    scene,
-  } = props;
-
-  const focused = navigationState.index === scene.index;
-  const opacity = focused ? 1 : 0;
-  // If not focused, move the scene to the far away.
-  const translate = focused ? 0 : 1000000;
-  return {
-    opacity,
-    transform: [
-      { translateX: translate },
-      { translateY: translate },
-    ],
-  };
-}
-
-function forHorizontal(props: NavigationSceneRendererProps): Object {
-  const {
-    layout,
-    position,
-    scene,
-  } = props;
-
-  if (!layout.isMeasured) {
-    return forInitial(props);
-  }
-
-  const index = scene.index;
-  const inputRange = [index - 1, index, index + 0.99, index + 1];
-  const width = layout.initWidth;
-  const outputRange = I18nManager.isRTL ?
-    ([-width, 0, 10, 10]: Array<number>) :
-    ([width, 0, -10, -10]: Array<number>);
-
-
-  const opacity = position.interpolate({
-    inputRange,
-    outputRange: ([1, 1, 0.3, 0]: Array<number>),
-  });
-
-  const scale = position.interpolate({
-    inputRange,
-    outputRange: ([1, 1, 0.95, 0.95]: Array<number>),
-  });
-
-  const translateY = 0;
-  const translateX = position.interpolate({
-    inputRange,
-    outputRange,
-  });
-
-  return {
-    opacity,
-    transform: [
-      { scale },
-      { translateX },
-      { translateY },
-    ],
-  };
-}
-
-function forVertical(props: NavigationSceneRendererProps): Object {
-  const {
-    layout,
-    position,
-    scene,
-  } = props;
-
-  if (!layout.isMeasured) {
-    return forInitial(props);
-  }
-
-  const index = scene.index;
-  const inputRange = [index - 1, index, index + 0.99, index + 1];
-  const height = layout.initHeight;
-
-  const opacity = position.interpolate({
-    inputRange,
-    outputRange: ([1, 1, 0.3, 0]: Array<number>),
-  });
-
-  const scale = position.interpolate({
-    inputRange,
-    outputRange: ([1, 1, 0.95, 0.95]: Array<number>),
-  });
-
-  const translateX = 0;
-  const translateY = position.interpolate({
-    inputRange,
-    outputRange: ([height, 0, -10, -10]: Array<number>),
-  });
-
-  return {
-    opacity,
-    transform: [
-      { scale },
-      { translateX },
-      { translateY },
-    ],
-  };
-}
-
-function canUseNativeDriver(isVertical: boolean): boolean {
-  // The native driver can be enabled for this interpolator because the scale,
-  // translateX, and translateY transforms are supported with the native
-  // animation driver.
-
-  return true;
-}
-
-module.exports = {
-  forHorizontal,
-  forVertical,
-  canUseNativeDriver,
-};
diff --git a/Libraries/CustomComponents/NavigationExperimental/NavigationHeader.js b/Libraries/CustomComponents/NavigationExperimental/NavigationHeader.js
deleted file mode 100644
index 5218a4c055dd40..00000000000000
--- a/Libraries/CustomComponents/NavigationExperimental/NavigationHeader.js
+++ /dev/null
@@ -1,282 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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.
- *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @providesModule NavigationHeader
- * @flow
- */
-'use strict';
-
-const NavigationHeaderBackButton = require('NavigationHeaderBackButton');
-const NavigationHeaderStyleInterpolator = require('NavigationHeaderStyleInterpolator');
-const NavigationHeaderTitle = require('NavigationHeaderTitle');
-const NavigationPropTypes = require('NavigationPropTypes');
-const React = require('React');
-const ReactNative = require('react-native');
-const TVEventHandler = require('TVEventHandler');
-
-const {
-  Animated,
-  Platform,
-  StyleSheet,
-  View,
-} = ReactNative;
-
-import type  {
-  NavigationSceneRendererProps,
-  NavigationStyleInterpolator,
-} from 'NavigationTypeDefinition';
-
-type SubViewProps = NavigationSceneRendererProps & {
-  onNavigateBack: ?Function,
-};
-
-type SubViewRenderer = (subViewProps: SubViewProps) => ?React.Element<any>;
-
-type DefaultProps = {
-  renderLeftComponent: SubViewRenderer,
-  renderRightComponent: SubViewRenderer,
-  renderTitleComponent: SubViewRenderer,
-  statusBarHeight: number | Animated.Value,
-};
-
-type Props = NavigationSceneRendererProps & {
-  onNavigateBack: ?Function,
-  renderLeftComponent: SubViewRenderer,
-  renderRightComponent: SubViewRenderer,
-  renderTitleComponent: SubViewRenderer,
-  style?: any,
-  viewProps?: any,
-  statusBarHeight: number | Animated.Value,
-};
-
-type SubViewName = 'left' | 'title' | 'right';
-
-const APPBAR_HEIGHT = Platform.OS === 'ios' ? 44 : 56;
-const STATUSBAR_HEIGHT = Platform.OS === 'ios' ? 20 : 0;
-const {PropTypes} = React;
-
-class NavigationHeader extends React.PureComponent<DefaultProps, Props, any> {
-  props: Props;
-
-  static defaultProps = {
-
-    renderTitleComponent: (props: SubViewProps) => {
-      const title = String(props.scene.route.title || '');
-      return <NavigationHeaderTitle>{title}</NavigationHeaderTitle>;
-    },
-
-    renderLeftComponent: (props: SubViewProps) => {
-      if (props.scene.index === 0 || !props.onNavigateBack) {
-        return null;
-      }
-      return (
-        <NavigationHeaderBackButton
-          onPress={props.onNavigateBack}
-        />
-      );
-    },
-
-    renderRightComponent: (props: SubViewProps) => {
-      return null;
-    },
-
-    statusBarHeight: STATUSBAR_HEIGHT,
-  };
-
-  static propTypes = {
-    ...NavigationPropTypes.SceneRendererProps,
-    onNavigateBack: PropTypes.func,
-    renderLeftComponent: PropTypes.func,
-    renderRightComponent: PropTypes.func,
-    renderTitleComponent: PropTypes.func,
-    style: View.propTypes.style,
-    statusBarHeight: PropTypes.number,
-    viewProps: PropTypes.shape(View.propTypes),
-  };
-
-  _tvEventHandler: TVEventHandler;
-
-  componentDidMount(): void {
-    this._tvEventHandler = new TVEventHandler();
-    this._tvEventHandler.enable(this, function(cmp, evt) {
-      if (evt && evt.eventType === 'menu') {
-        cmp.props.onNavigateBack && cmp.props.onNavigateBack();
-      }
-    });
-  }
-
-  componentWillUnmount(): void {
-    if (this._tvEventHandler) {
-      this._tvEventHandler.disable();
-      delete this._tvEventHandler;
-    }
-  }
-
-  render(): React.Element<any> {
-    const { scenes, style, viewProps } = this.props;
-
-    const scenesProps = scenes.map(scene => {
-      const props = NavigationPropTypes.extractSceneRendererProps(this.props);
-      props.scene = scene;
-      return props;
-    });
-
-    const barHeight = (this.props.statusBarHeight instanceof Animated.Value)
-      ? Animated.add(this.props.statusBarHeight, new Animated.Value(APPBAR_HEIGHT))
-      : APPBAR_HEIGHT + this.props.statusBarHeight;
-
-    return (
-      <Animated.View style={[
-          styles.appbar,
-          { height: barHeight },
-          style
-        ]}
-        {...viewProps}
-      >
-        {scenesProps.map(this._renderLeft, this)}
-        {scenesProps.map(this._renderTitle, this)}
-        {scenesProps.map(this._renderRight, this)}
-      </Animated.View>
-    );
-  }
-
-  _renderLeft = (props: NavigationSceneRendererProps): ?React.Element<any> => {
-    return this._renderSubView(
-      props,
-      'left',
-      this.props.renderLeftComponent,
-      NavigationHeaderStyleInterpolator.forLeft,
-    );
-  };
-
-  _renderTitle = (props: NavigationSceneRendererProps): ?React.Element<any> => {
-    return this._renderSubView(
-      props,
-      'title',
-      this.props.renderTitleComponent,
-      NavigationHeaderStyleInterpolator.forCenter,
-    );
-  };
-
-  _renderRight = (props: NavigationSceneRendererProps): ?React.Element<any> => {
-    return this._renderSubView(
-      props,
-      'right',
-      this.props.renderRightComponent,
-      NavigationHeaderStyleInterpolator.forRight,
-    );
-  };
-
-  _renderSubView(
-    props: NavigationSceneRendererProps,
-    name: SubViewName,
-    renderer: SubViewRenderer,
-    styleInterpolator: NavigationStyleInterpolator,
-  ): ?React.Element<any> {
-    const {
-      scene,
-      navigationState,
-    } = props;
-
-    const {
-      index,
-      isStale,
-      key,
-    } = scene;
-
-    const offset = navigationState.index - index;
-
-    if (Math.abs(offset) > 2) {
-      // Scene is far away from the active scene. Hides it to avoid unnecessary
-      // rendering.
-      return null;
-    }
-
-    const subViewProps = {...props, onNavigateBack: this.props.onNavigateBack};
-    const subView = renderer(subViewProps);
-    if (subView === null) {
-      return null;
-    }
-
-    const pointerEvents = offset !== 0 || isStale ? 'none' : 'box-none';
-    return (
-      <Animated.View
-        pointerEvents={pointerEvents}
-        key={name + '_' + key}
-        style={[
-          styles[name],
-          { marginTop: this.props.statusBarHeight },
-          styleInterpolator(props),
-        ]}>
-        {subView}
-      </Animated.View>
-    );
-  }
-
-  static HEIGHT = APPBAR_HEIGHT + STATUSBAR_HEIGHT;
-  static Title = NavigationHeaderTitle;
-  static BackButton = NavigationHeaderBackButton;
-
-}
-
-const styles = StyleSheet.create({
-  appbar: {
-    alignItems: 'center',
-    backgroundColor: Platform.OS === 'ios' ? '#EFEFF2' : '#FFF',
-    borderBottomColor: 'rgba(0, 0, 0, .15)',
-    borderBottomWidth: Platform.OS === 'ios' ? StyleSheet.hairlineWidth : 0,
-    elevation: 4,
-    flexDirection: 'row',
-    justifyContent: 'flex-start',
-  },
-
-  title: {
-    bottom: 0,
-    left: APPBAR_HEIGHT,
-    position: 'absolute',
-    right: APPBAR_HEIGHT,
-    top: 0,
-  },
-
-  left: {
-    bottom: 0,
-    left: 0,
-    position: 'absolute',
-    top: 0,
-  },
-
-  right: {
-    bottom: 0,
-    position: 'absolute',
-    right: 0,
-    top: 0,
-  },
-});
-
-module.exports = NavigationHeader;
diff --git a/Libraries/CustomComponents/NavigationExperimental/NavigationHeaderBackButton.js b/Libraries/CustomComponents/NavigationExperimental/NavigationHeaderBackButton.js
deleted file mode 100644
index f3e901f3fd20b7..00000000000000
--- a/Libraries/CustomComponents/NavigationExperimental/NavigationHeaderBackButton.js
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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.
- *
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * @providesModule NavigationHeaderBackButton
- * @flow
-*/
-'use strict';
-
-const React = require('react');
-const ReactNative = require('react-native');
-
-const {
-  I18nManager,
-  Image,
-  Platform,
-  StyleSheet,
-  TouchableOpacity,
-} = ReactNative;
-
-type Props = {
-  imageStyle?: any,
-  onPress: Function,
-  style?: any,
-};
-
-const NavigationHeaderBackButton = (props: Props) => (
-  <TouchableOpacity style={[styles.buttonContainer, props.style]} onPress={props.onPress}>
-    <Image style={[styles.button, props.imageStyle]} source={require('./assets/back-icon.png')} />
-  </TouchableOpacity>
-);
-
-NavigationHeaderBackButton.propTypes = {
-  onPress: React.PropTypes.func.isRequired
-};
-
-const styles = StyleSheet.create({
-  buttonContainer: {
-    flex: 1,
-    flexDirection: 'row',
-    alignItems: 'center',
-    justifyContent: 'center',
-  },
-  button: {
-    height: 24,
-    width: 24,
-    margin: Platform.OS === 'ios' ? 10 : 16,
-    resizeMode: 'contain',
-    transform: [{scaleX: I18nManager.isRTL ? -1 : 1}],
-  }
-});
-
-module.exports = NavigationHeaderBackButton;
diff --git a/Libraries/CustomComponents/NavigationExperimental/NavigationHeaderStyleInterpolator.js b/Libraries/CustomComponents/NavigationExperimental/NavigationHeaderStyleInterpolator.js
deleted file mode 100644
index 38a8689c069cfa..00000000000000
--- a/Libraries/CustomComponents/NavigationExperimental/NavigationHeaderStyleInterpolator.js
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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.
- *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @providesModule NavigationHeaderStyleInterpolator
- * @flow
- */
-'use strict';
-
-const I18nManager = require('I18nManager');
-
-import type  {
-  NavigationSceneRendererProps,
-} from 'NavigationTypeDefinition';
-
-/**
- * Utility that builds the style for the navigation header.
- *
- * +-------------+-------------+-------------+
- * |             |             |             |
- * |    Left     |   Title     |   Right     |
- * |  Component  |  Component  | Component   |
- * |             |             |             |
- * +-------------+-------------+-------------+
- */
-
-function forLeft(props: NavigationSceneRendererProps): Object {
-  const {position, scene} = props;
-  const {index} = scene;
-  return {
-    opacity: position.interpolate({
-      inputRange: [ index - 1, index, index + 1 ],
-      outputRange: ([ 0, 1, 0 ]: Array<number>),
-    }),
-  };
-}
-
-function forCenter(props: NavigationSceneRendererProps): Object {
-  const {position, scene} = props;
-  const {index} = scene;
-  return {
-    opacity:position.interpolate({
-      inputRange: [ index - 1, index, index + 1 ],
-      outputRange: ([ 0, 1, 0 ]: Array<number>),
-    }),
-    transform: [
-      {
-        translateX: position.interpolate({
-          inputRange: [ index - 1, index + 1 ],
-          outputRange: I18nManager.isRTL ?
-            ([ -200, 200 ]: Array<number>) :
-            ([ 200, -200 ]: Array<number>),
-        }),
-      }
-    ],
-  };
-}
-
-function forRight(props: NavigationSceneRendererProps): Object {
-  const {position, scene} = props;
-  const {index} = scene;
-  return {
-    opacity: position.interpolate({
-      inputRange: [ index - 1, index, index + 1 ],
-      outputRange: ([ 0, 1, 0 ]: Array<number>),
-    }),
-  };
-}
-
-module.exports = {
-  forCenter,
-  forLeft,
-  forRight,
-};
diff --git a/Libraries/CustomComponents/NavigationExperimental/NavigationHeaderTitle.js b/Libraries/CustomComponents/NavigationExperimental/NavigationHeaderTitle.js
deleted file mode 100644
index 61d39d4608f7ac..00000000000000
--- a/Libraries/CustomComponents/NavigationExperimental/NavigationHeaderTitle.js
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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.
- *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @providesModule NavigationHeaderTitle
- * @flow
- */
-'use strict';
-
-const React = require('react');
-const ReactNative = require('react-native');
-
-const {
-  Platform,
-  StyleSheet,
-  View,
-  Text,
-} = ReactNative;
-
-type Props = {
-  children?: React.Element<any>,
-  style?: any,
-  textStyle?: any,
-  viewProps?: any,
-}
-
-const NavigationHeaderTitle = ({ children, style, textStyle, viewProps }: Props) => (
-  <View style={[ styles.title, style ]} {...viewProps}>
-    <Text style={[ styles.titleText, textStyle ]}>{children}</Text>
-  </View>
-);
-
-const styles = StyleSheet.create({
-  title: {
-    flex: 1,
-    flexDirection: 'row',
-    alignItems: 'center',
-    marginHorizontal: 16
-  },
-
-  titleText: {
-    flex: 1,
-    fontSize: 18,
-    fontWeight: '500',
-    color: 'rgba(0, 0, 0, .9)',
-    textAlign: Platform.OS === 'ios' ? 'center' : 'left'
-  }
-});
-
-NavigationHeaderTitle.propTypes = {
-  children: React.PropTypes.node.isRequired,
-  style: View.propTypes.style,
-  textStyle: Text.propTypes.style
-};
-
-module.exports = NavigationHeaderTitle;
diff --git a/Libraries/CustomComponents/NavigationExperimental/NavigationPagerPanResponder.js b/Libraries/CustomComponents/NavigationExperimental/NavigationPagerPanResponder.js
deleted file mode 100644
index 1cc071ed633759..00000000000000
--- a/Libraries/CustomComponents/NavigationExperimental/NavigationPagerPanResponder.js
+++ /dev/null
@@ -1,238 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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 NavigationPagerPanResponder
- * @flow
- */
-'use strict';
-
-const Animated = require('Animated');
-const NavigationAbstractPanResponder = require('NavigationAbstractPanResponder');
-const NavigationCardStackPanResponder = require('NavigationCardStackPanResponder');
-const I18nManager = require('I18nManager');
-
-const clamp = require('clamp');
-
-import type {
-  NavigationPanPanHandlers,
-  NavigationSceneRendererProps,
-} from 'NavigationTypeDefinition';
-
-import type {
-  NavigationGestureDirection,
-} from 'NavigationCardStackPanResponder';
-
-type Props = NavigationSceneRendererProps & {
-  onNavigateBack: ?Function,
-  onNavigateForward: ?Function,
-};
-
-/**
- * Primitive gesture directions.
- */
-const {
-  ANIMATION_DURATION,
-  POSITION_THRESHOLD,
-  RESPOND_THRESHOLD,
-  Directions,
-} = NavigationCardStackPanResponder;
-
-/**
- * The threshold (in pixels) to finish the gesture action.
- */
-const DISTANCE_THRESHOLD = 50;
-
-/**
- * The threshold to trigger the gesture action. This determines the rate of the
- * flick when the action will be triggered
- */
-const VELOCITY_THRESHOLD = 1.5;
-
-/**
- * Pan responder that handles gesture for a card in the cards list.
- *
- * +-------------+-------------+-------------+
- * |             |             |             |
- * |             |             |             |
- * |             |             |             |
- * |    Next     |   Focused   |  Previous   |
- * |    Card     |    Card     |    Card     |
- * |             |             |             |
- * |             |             |             |
- * |             |             |             |
- * +-------------+-------------+-------------+
- */
-class NavigationPagerPanResponder extends NavigationAbstractPanResponder {
-
-  _isResponding: boolean;
-  _isVertical: boolean;
-  _props: Props;
-  _startValue: number;
-
-  constructor(
-    direction: NavigationGestureDirection,
-    props: Props,
-  ) {
-    super();
-    this._isResponding = false;
-    this._isVertical = direction === Directions.VERTICAL;
-    this._props = props;
-    this._startValue = 0;
-  }
-
-  onMoveShouldSetPanResponder(event: any, gesture: any): boolean {
-    const props = this._props;
-
-    if (props.navigationState.index !== props.scene.index) {
-      return false;
-    }
-
-    const layout = props.layout;
-    const isVertical = this._isVertical;
-    const axis = isVertical ? 'dy' : 'dx';
-    const index = props.navigationState.index;
-    const distance = isVertical ?
-      layout.height.__getValue() :
-      layout.width.__getValue();
-
-    return (
-      Math.abs(gesture[axis]) > RESPOND_THRESHOLD &&
-      distance > 0 &&
-      index >= 0
-    );
-  }
-
-  onPanResponderGrant(): void {
-    this._isResponding = false;
-    this._props.position.stopAnimation((value: number) => {
-      this._isResponding = true;
-      this._startValue = value;
-    });
-  }
-
-  onPanResponderMove(event: any, gesture: any): void {
-    if (!this._isResponding) {
-      return;
-    }
-
-    const {
-      layout,
-      navigationState,
-      position,
-      scenes,
-    } = this._props;
-
-    const isVertical = this._isVertical;
-    const axis = isVertical ? 'dy' : 'dx';
-    const index = navigationState.index;
-    const distance = isVertical ?
-      layout.height.__getValue() :
-      layout.width.__getValue();
-    const currentValue = I18nManager.isRTL && axis === 'dx' ?
-      this._startValue + (gesture[axis] / distance) :
-      this._startValue - (gesture[axis] / distance);
-
-    const prevIndex = Math.max(
-      0,
-      index - 1,
-    );
-
-    const nextIndex = Math.min(
-      index + 1,
-      scenes.length - 1,
-    );
-
-    const value = clamp(
-      prevIndex,
-      currentValue,
-      nextIndex,
-    );
-
-    position.setValue(value);
-  }
-
-  onPanResponderRelease(event: any, gesture: any): void {
-    if (!this._isResponding) {
-      return;
-    }
-
-    this._isResponding = false;
-
-    const {
-      navigationState,
-      onNavigateBack,
-      onNavigateForward,
-      position,
-    } = this._props;
-
-    const isVertical = this._isVertical;
-    const axis = isVertical ? 'dy' : 'dx';
-    const velocityAxis = isVertical ? 'vy' : 'vx';
-    const index = navigationState.index;
-    const distance = I18nManager.isRTL && axis === 'dx' ?
-      -gesture[axis] :
-      gesture[axis];
-    const moveSpeed = I18nManager.isRTL && velocityAxis === 'vx' ?
-      -gesture[velocityAxis] :
-      gesture[velocityAxis];
-
-    position.stopAnimation((value: number) => {
-      this._reset();
-      if (
-        distance > DISTANCE_THRESHOLD  ||
-        value <= index - POSITION_THRESHOLD ||
-        moveSpeed > VELOCITY_THRESHOLD
-      ) {
-        onNavigateBack && onNavigateBack();
-        return;
-      }
-
-      if (
-        distance < -DISTANCE_THRESHOLD ||
-        value >= index  + POSITION_THRESHOLD ||
-        moveSpeed < -VELOCITY_THRESHOLD
-      ) {
-        onNavigateForward && onNavigateForward();
-      }
-    });
-  }
-
-  onPanResponderTerminate(): void {
-    this._isResponding = false;
-    this._reset();
-  }
-
-  _reset(): void {
-    const props = this._props;
-    Animated.timing(
-      props.position,
-      {
-        toValue: props.navigationState.index,
-        duration: ANIMATION_DURATION,
-      }
-    ).start();
-  }
-}
-
-function createPanHandlers(
-  direction: NavigationGestureDirection,
-  props: Props,
-): NavigationPanPanHandlers {
-  const responder = new NavigationPagerPanResponder(direction, props);
-  return responder.panHandlers;
-}
-
-function forHorizontal(
-  props: Props,
-): NavigationPanPanHandlers {
-  return createPanHandlers(Directions.HORIZONTAL, props);
-}
-
-module.exports = {
-  forHorizontal,
-};
diff --git a/Libraries/CustomComponents/NavigationExperimental/NavigationPagerStyleInterpolator.js b/Libraries/CustomComponents/NavigationExperimental/NavigationPagerStyleInterpolator.js
deleted file mode 100644
index 950aa5eb136a1c..00000000000000
--- a/Libraries/CustomComponents/NavigationExperimental/NavigationPagerStyleInterpolator.js
+++ /dev/null
@@ -1,116 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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.
- *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @providesModule NavigationPagerStyleInterpolator
- * @flow
- */
-'use strict';
-
-const I18nManager = require('I18nManager');
-
-import type  {
-  NavigationSceneRendererProps,
-} from 'NavigationTypeDefinition';
-
-/**
- * Utility that builds the style for the card in the cards list.
- *
- * +-------------+-------------+-------------+
- * |             |             |             |
- * |             |             |             |
- * |             |             |             |
- * |    Next     |   Focused   |  Previous   |
- * |    Card     |    Card     |    Card     |
- * |             |             |             |
- * |             |             |             |
- * |             |             |             |
- * +-------------+-------------+-------------+
- */
-
-/**
- * Render the initial style when the initial layout isn't measured yet.
- */
-function forInitial(props: NavigationSceneRendererProps): Object {
-  const {
-    navigationState,
-    scene,
-  } = props;
-
-  const focused = navigationState.index === scene.index;
-  const opacity = focused ? 1 : 0;
-  // If not focused, move the scene to the far away.
-  const dir = scene.index > navigationState.index ? 1 : -1;
-  const translate = focused ? 0 : (1000000 * dir);
-  return {
-    opacity,
-    transform: [
-      { translateX: translate },
-      { translateY: translate },
-    ],
-  };
-}
-
-function forHorizontal(props: NavigationSceneRendererProps): Object {
-  const {
-    layout,
-    position,
-    scene,
-  } = props;
-
-  if (!layout.isMeasured) {
-    return forInitial(props);
-  }
-
-  const index = scene.index;
-  const inputRange = [index - 1, index, index + 1];
-  const width = layout.initWidth;
-  const outputRange = I18nManager.isRTL ?
-    ([-width, 0, width]: Array<number>) :
-    ([width, 0, -width]: Array<number>);
-
-  const translateX = position.interpolate({
-    inputRange,
-    outputRange,
-  });
-
-  return {
-    opacity : 1,
-    shadowColor: 'transparent',
-    shadowRadius: 0,
-    transform: [
-      { scale: 1 },
-      { translateX },
-      { translateY: 0 },
-    ],
-  };
-}
-
-module.exports = {
-  forHorizontal,
-};
diff --git a/Libraries/CustomComponents/NavigationExperimental/NavigationPointerEventsContainer.js b/Libraries/CustomComponents/NavigationExperimental/NavigationPointerEventsContainer.js
deleted file mode 100644
index a6ef36fc258e63..00000000000000
--- a/Libraries/CustomComponents/NavigationExperimental/NavigationPointerEventsContainer.js
+++ /dev/null
@@ -1,158 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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.
- *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @providesModule NavigationPointerEventsContainer
- * @flow
- */
-'use strict';
-
-const React = require('React');
-const NavigationAnimatedValueSubscription = require('NavigationAnimatedValueSubscription');
-
-const invariant = require('fbjs/lib/invariant');
-
-import type  {
-  NavigationSceneRendererProps,
-} from 'NavigationTypeDefinition';
-
-type Props = NavigationSceneRendererProps;
-
-const MIN_POSITION_OFFSET = 0.01;
-
-/**
- * Create a higher-order component that automatically computes the
- * `pointerEvents` property for a component whenever navigation position
- * changes.
- */
-function create(
-  Component: ReactClass<any>,
-): ReactClass<any> {
-
-  class Container extends React.Component<any, Props, any> {
-
-    _component: any;
-    _onComponentRef: (view: any) => void;
-    _onPositionChange: (data: {value: number}) => void;
-    _pointerEvents: string;
-    _positionListener: ?NavigationAnimatedValueSubscription;
-
-    props: Props;
-
-    constructor(props: Props, context: any) {
-      super(props, context);
-      this._pointerEvents = this._computePointerEvents();
-    }
-
-    componentWillMount(): void {
-      this._onPositionChange = this._onPositionChange.bind(this);
-      this._onComponentRef = this._onComponentRef.bind(this);
-    }
-
-    componentDidMount(): void {
-      this._bindPosition(this.props);
-    }
-
-    componentWillUnmount(): void {
-      this._positionListener && this._positionListener.remove();
-    }
-
-    componentWillReceiveProps(nextProps: Props): void {
-      this._bindPosition(nextProps);
-    }
-
-    render(): React.Element<any>  {
-      this._pointerEvents = this._computePointerEvents();
-      return (
-        <Component
-          {...this.props}
-          pointerEvents={this._pointerEvents}
-          onComponentRef={this._onComponentRef}
-        />
-      );
-    }
-
-    _onComponentRef(component: any): void {
-      this._component = component;
-      if (component) {
-        invariant(
-          typeof component.setNativeProps === 'function',
-          'component must implement method `setNativeProps`',
-        );
-      }
-    }
-
-    _bindPosition(props: NavigationSceneRendererProps): void {
-      this._positionListener && this._positionListener.remove();
-      this._positionListener = new  NavigationAnimatedValueSubscription(
-        props.position,
-        this._onPositionChange,
-      );
-    }
-
-    _onPositionChange(): void {
-      if (this._component) {
-        const pointerEvents = this._computePointerEvents();
-        if (this._pointerEvents !== pointerEvents) {
-          this._pointerEvents = pointerEvents;
-          this._component.setNativeProps({pointerEvents});
-        }
-      }
-    }
-
-    _computePointerEvents(): string {
-      const {
-        navigationState,
-        position,
-        scene,
-      } = this.props;
-
-      if (scene.isStale || navigationState.index !== scene.index) {
-        // The scene isn't focused.
-        return scene.index > navigationState.index ?
-          'box-only' :
-          'none';
-      }
-
-      const offset = position.__getAnimatedValue() - navigationState.index;
-      if (Math.abs(offset) > MIN_POSITION_OFFSET) {
-        // The positon is still away from scene's index.
-        // Scene's children should not receive touches until the position
-        // is close enough to scene's index.
-        return 'box-only';
-      }
-
-      return 'auto';
-    }
-  }
-  return  Container;
-}
-
-module.exports = {
-  create,
-};
diff --git a/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@1.5x.android.png b/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@1.5x.android.png
deleted file mode 100644
index ad03a63bf3caba175695f5acca85a690dda2d02c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 134
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;ucwP+NCjiE#Ight69&c5o}c_J
zydef`Jl72k0*^~vo0xKDg<-rzRAUa4z<R?a4p9;=JFjy{Z=LqyfShU8-4Etno$Ffd
hAHK?nXbNOtu<@R<@!E-pIY5IMJYD@<);T3K0RYZnDc}GA

diff --git a/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@1.5x.ios.png b/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@1.5x.ios.png
deleted file mode 100644
index e43fa0622f1994f253465b85a59cabc490f25254..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 273
zcmV+s0q*{ZP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0002kNkl<ZcmeH}
zwN*ty6h%(~xVu9I&;TA05fPD*5ux+m%z6n{57dCWyO)65!To<6F2UVvO}?)W6h%?K
zgJlVN7>R#@V;MZ|!{Y$D84Xc<R>R{V40-cB_Dagsz~k`~nOy`dl9H)~;mL!H;T8hs
zNi}dC49}j(tifY8L@=y}$MYvLOYoR3Ri*|QUObVRL%<Y>;IZ+E2;p%OolKM}Q}YX%
z5d@5b2p;{XGEbME3cXRX(WfQTrj{Rj>BT5;Is}fZem}y0(E9WX8xoJjpZw%2ilSTs
XSG)izRaHxJ00000NkvXXu0mjfJD6{!

diff --git a/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@1x.android.png b/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@1x.android.png
deleted file mode 100644
index 083db295f474b9903408258c71818c2c49151d35..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 100
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1ZBG}+kP60RiDL^GIXr{@&3`D~
x%$9kI*}bEvW<n8f%UlzqEg2JL?P=F#U@%v3;@t9ZUpi15gQu&X%Q~loCIG9+96$g7

diff --git a/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@1x.ios.png b/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@1x.ios.png
deleted file mode 100644
index 4244656b92fb7078e26e9387bc79092e40e32134..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 177
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gj6`n4RAr*{or>F}#ISRN$7dnY>
ziSW7Jaj-kLU-99@V~M-N-maFitX%fhe|fNkw(*M-9%Wj>s_(oO9P$Yh3Qm<1{PRlg
zbWG=S^NM9BywVo3Bx+m!Wb1iw-zCgQwaI?JGS@8i411;jlWxyn`S7BVIP2S`hxE$k
ap5yjcE&i-(aLy6v1_n=8KbLh*2~7ZuaX;z+

diff --git a/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@2x.android.png b/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@2x.android.png
deleted file mode 100644
index 6de0a1cbb365dfd5d9274890d243ca2321f32235..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 134
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}tUr!gukP61P(+)Bo5D;KluXOkB
z|6f;`Uoa>nrTyP5;4+Jm;dJDxe#>oP@r$y*#>rHDd13s5eN)8##R;WH*ZD4M;?i1i
i;i&z7`QNqd4J-@3aX4v+{p181%;4$j=d#Wzp$P!F!7nZV

diff --git a/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@2x.ios.png b/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@2x.ios.png
deleted file mode 100644
index a8b6e9a63e5954e88cdc2c4b376350f0d00df554..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 303
zcmV+~0nq-5P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0002?Nkl<ZcmeI$
zC02()6b10R2ORc*yA(W;NF*BVpU`<9PNT6Qwt?;dcfX$$Y#KJhxxaH>zvF^`PeepS
z7TEyfHda_2WB3*rkKxFyc44eTG>n~aJj;r2>JTd|kD=%L;CPW0Khze2x5NP$uRn!1
zZX$RIM`67E6h7fb4B^LMy!Z5c5<~cLI6iph{7eiBb^?x1o}Mouc#e}WK7R=Rf`n5D
zT@f-1`=QsLi$(>{Sn|yGr(!w<&vC{R{-IdN!80bF#d=?Cp?+$BrqI_Hv9?hiWM98Z
z=rX74^cNpA#&vk;NvTKu7rs^Wv8AuYuMrUukrdBxph|6xwif^Z002ovPDHLkV1oFx
BfD!-z

diff --git a/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@3x.android.png b/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@3x.android.png
deleted file mode 100644
index 15a983a67d97c9a6c39d91550a528c37c53a9e3e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 167
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw@;qG}Ln;{G-aN{9*nr0&aBl6p
z15q2fw>DO<$f$_t-m`#N(R0!@qfL6}is!BA-aP5mqcux*S)AYDzOuXc@WF!zU-mWw
z!RNIrdq3B7GJgpV3USMNx+#Bt3lxOZSlm}!I$z&?|8f=2ODy@*gQAaCs?P@6%;4$j
K=d#Wzp$P!X&_+4{

diff --git a/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@3x.ios.png b/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@3x.ios.png
deleted file mode 100644
index 07ea37b4e1e252d9a406eb33af2efe80e8612330..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 439
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@Zgyv2V65|WaSW+oe0!^TU0k35>w~N5
zD{^m}Eq3eux1v|-U!Z02tG3=(cE0h8%+~eBW#4@=>-m*gUsZpzUi)^h`M$FY6s#)}
z>gj)YrzKG2oQcK!Lmm>@g`Kw*Yv&jz*03tG&-%<gr+UG}!<Gg6S|=`^wOMd_r9qJe
zcfubQ<>R^M+5-<qGNmVGSsZg$P<P=;XPu)e`S6aT$MhXy$3FFBmTG5NNIzWT#jF0%
zx8=zlw&dJnCp;JR&ADrEEq#q;x?tdW%VRfZ7#4lv(0piUF+2FsOQ%DZ0}osBrDva7
z@zUi`Fp$ld9DVA<%LA&<7U`YXIgjBO|MIo!2PX8WKYZgeGi<GGu>PWXN3Y$OD&$vu
zev#}XWBWLRs%-}IWc4L%Yb+=CTrSK#FZ%emrh>0wa_#xpH~Sa4M%~`S*R?C_#imuy
z`{rr><iFTFb6(8XjP?2QwK7)u56UlH-`pi0@=s`Y!>ON!s~fyjD~^@_e`eg-Wf97@
f#;HgU3SP2ZTiYg8>Ayn?7$FRvu6{1-oD!M<DPhAy

diff --git a/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@4x.android.png b/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@4x.android.png
deleted file mode 100644
index 17e52e8550e5668f7117bcb755beb70c3a21c9e9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 207
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcgrg^$JhEy=Vy>(TP*-+rv1Kz7M
z%I*XNJ!<?bcdY)|Wa$ZgiQGVC40bN7r>(VLzdH4Ge@o8ai4)e^3vK%P+bZq#{MQci
z?P`C0d3kxcKa^1~`zt>B;jiLd|K_aKfAEz>edFmDy)D6SUw`+o@R*?B*u=sqq~bB*
zgRIJrKN^lr3+<DqGd8bx>tD}bFTI}~XjubmVU5CWQ(LZ;AgeuH{an^LB{Ts5E|^v%

diff --git a/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@4x.ios.png b/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@4x.ios.png
deleted file mode 100644
index 7899053f61b38b1b3f3e4400d208265e5b9752cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 586
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>U=s9naSW+od~=hzM>bIA=)>UK
z+j4L7ymFJ?da+G<>i2V3@@^C?c1sOmFAV_7Y+pW^_tiJQPwUT5pEG0s#o3iVv^!8i
zim|-RbcHmwI>VWV{uIQ_?D<gB-Ld%NX^lF^ignG(_P4BE&K&Vy{-gEb4n@iRR_As8
zm~_R9%!___LOw^Q=cLTEhUaA#Mj3+bhdX={Gb`Tl^}XLIae5}Zn#g_~8~!C7`vrn$
zNCP=aHvLOF=JOhf^K_((TFmn~c0f0vMmsn{c3yhWoS&Z+(>`V&{_Irnr^8qw?c?ji
zpS`+_?VDyC&F4A)n(^V;_-!g_+!pt^`qrQ4ZA;qL`26mHAHN=?o!YD{BhPa5x_WxD
z;qHSU10T%%f9#XL_{<}AA8Mo|{);O0wMcYY2+TXroNui!SZHv>&F_p#R>Gg>9Toy^
zDvvxY_Hp(6H+gQB>XMXp;G=KCpW`QY9qzE`YkGeB0Q)=UBX3xgg$#xJ-ZP#5v-{+&
zLmd@qOMh%BkT#4y0952F_}?nYtWoe|PtcM5pZ3lDt-v7A*2wU}y6!>)b4)^ODEHl`
zeoV7_{8cmNF!U?zX*vB_vP<4@DTm18DT^;oxH!or_+A7T+vXm%B#Y}6zh3BML<DyI
z-m)m9LDe>URef?`bco}f*(;i)5@ieJ4_O_#+T)lo`NXE!g?<_LHI9Ta0n-E!9AHie
V()u#B%0&&t^K|udS?83{1OT-835oy!

diff --git a/Libraries/NavigationExperimental/NavigationAbstractPanResponder.js b/Libraries/NavigationExperimental/NavigationAbstractPanResponder.js
deleted file mode 100644
index cd31dccdbde158..00000000000000
--- a/Libraries/NavigationExperimental/NavigationAbstractPanResponder.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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 NavigationAbstractPanResponder
- * @flow
- */
-'use strict';
-
-const PanResponder = require('PanResponder');
-
-const invariant = require('fbjs/lib/invariant');
-
-import type  {
-  NavigationPanPanHandlers,
-} from 'NavigationTypeDefinition';
-
-const EmptyPanHandlers = {
-  onMoveShouldSetPanResponder: null,
-  onPanResponderGrant: null,
-  onPanResponderMove: null,
-  onPanResponderRelease: null,
-  onPanResponderTerminate: null,
-};
-
-/**
- * Abstract class that defines the common interface of PanResponder that handles
- * the gesture actions.
- */
-class NavigationAbstractPanResponder {
-
-  panHandlers: NavigationPanPanHandlers;
-
-  constructor() {
-    const config = {};
-    Object.keys(EmptyPanHandlers).forEach(name => {
-      const fn: any = (this: any)[name];
-
-      invariant(
-        typeof fn === 'function',
-        'subclass of `NavigationAbstractPanResponder` must implement method %s',
-        name
-      );
-
-      config[name] = fn.bind(this);
-    }, this);
-
-    this.panHandlers = PanResponder.create(config).panHandlers;
-  }
-}
-
-module.exports = NavigationAbstractPanResponder;
diff --git a/Libraries/NavigationExperimental/NavigationExperimental.js b/Libraries/NavigationExperimental/NavigationExperimental.js
deleted file mode 100644
index c4fd955c8fd34c..00000000000000
--- a/Libraries/NavigationExperimental/NavigationExperimental.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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 NavigationExperimental
- * @flow
- */
-'use strict';
-
-const NavigationCard = require('NavigationCard');
-const NavigationCardStack = require('NavigationCardStack');
-const NavigationHeader = require('NavigationHeader');
-const NavigationPropTypes = require('NavigationPropTypes');
-const NavigationStateUtils = require('NavigationStateUtils');
-const NavigationTransitioner = require('NavigationTransitioner');
-
-const warning = require('fbjs/lib/warning');
-
-// This warning will only be reached if the user has required the module
-warning(
-  false,
-  'NavigationExperimental is deprecated and will be removed in a future ' +
-  'version of React Native. The NavigationExperimental views live on in ' +
-  'the React-Navigation project, which also makes it easy to declare ' +
-  'navigation logic for your app. Learn more at https://reactnavigation.org/'
-);
-
-
-const NavigationExperimental = {
-  // Core
-  StateUtils: NavigationStateUtils,
-
-  // Views
-  Transitioner: NavigationTransitioner,
-
-  // CustomComponents:
-  Card: NavigationCard,
-  CardStack: NavigationCardStack,
-  Header: NavigationHeader,
-
-  PropTypes: NavigationPropTypes,
-};
-
-module.exports = NavigationExperimental;
diff --git a/Libraries/NavigationExperimental/NavigationPropTypes.js b/Libraries/NavigationExperimental/NavigationPropTypes.js
deleted file mode 100644
index 1aed9e9d24d15e..00000000000000
--- a/Libraries/NavigationExperimental/NavigationPropTypes.js
+++ /dev/null
@@ -1,124 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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 NavigationPropTypes
- * @flow
- */
-'use strict';
-
-import type  {
-  NavigationSceneRendererProps,
-} from 'NavigationTypeDefinition';
-
-/**
- * React component PropTypes Definitions. Consider using this as a supplementary
- * measure with `NavigationTypeDefinition`. This helps to capture the propType
- * error at run-time, where as `NavigationTypeDefinition` capture the flow
- * type check errors at build time.
- */
-
-const Animated = require('Animated');
-const React = require('React');
-
-const {PropTypes} = React;
-
-/* NavigationAction */
-const action =  PropTypes.shape({
-  type: PropTypes.string.isRequired,
-});
-
-/* NavigationAnimatedValue  */
-const animatedValue = PropTypes.instanceOf(Animated.Value);
-
-/* NavigationRoute  */
-const navigationRoute = PropTypes.shape({
-  key: PropTypes.string.isRequired,
-});
-
-/* NavigationState  */
-const navigationState = PropTypes.shape({
-  index: PropTypes.number.isRequired,
-  routes: PropTypes.arrayOf(navigationRoute),
-});
-
-/* NavigationLayout */
-const layout = PropTypes.shape({
-  height: animatedValue,
-  initHeight: PropTypes.number.isRequired,
-  initWidth: PropTypes.number.isRequired,
-  isMeasured: PropTypes.bool.isRequired,
-  width: animatedValue,
-});
-
-/* NavigationScene */
-const scene = PropTypes.shape({
-  index: PropTypes.number.isRequired,
-  isActive: PropTypes.bool.isRequired,
-  isStale: PropTypes.bool.isRequired,
-  key: PropTypes.string.isRequired,
-  route: navigationRoute.isRequired,
-});
-
-/* NavigationSceneRendererProps */
-const SceneRendererProps = {
-  layout: layout.isRequired,
-  navigationState: navigationState.isRequired,
-  position: animatedValue.isRequired,
-  progress: animatedValue.isRequired,
-  scene: scene.isRequired,
-  scenes: PropTypes.arrayOf(scene).isRequired,
-};
-
-const SceneRenderer = PropTypes.shape(SceneRendererProps);
-
-/* NavigationPanPanHandlers */
-const panHandlers = PropTypes.shape({
-  onMoveShouldSetResponder: PropTypes.func.isRequired,
-  onMoveShouldSetResponderCapture: PropTypes.func.isRequired,
-  onResponderEnd: PropTypes.func.isRequired,
-  onResponderGrant: PropTypes.func.isRequired,
-  onResponderMove: PropTypes.func.isRequired,
-  onResponderReject: PropTypes.func.isRequired,
-  onResponderRelease: PropTypes.func.isRequired,
-  onResponderStart: PropTypes.func.isRequired,
-  onResponderTerminate: PropTypes.func.isRequired,
-  onResponderTerminationRequest: PropTypes.func.isRequired,
-  onStartShouldSetResponder: PropTypes.func.isRequired,
-  onStartShouldSetResponderCapture: PropTypes.func.isRequired,
-});
-
-/**
- * Helper function that extracts the props needed for scene renderer.
- */
-function extractSceneRendererProps(
-  props: NavigationSceneRendererProps,
-): NavigationSceneRendererProps {
-  return {
-    layout: props.layout,
-    navigationState: props.navigationState,
-    position: props.position,
-    progress: props.progress,
-    scene: props.scene,
-    scenes: props.scenes,
-  };
-}
-
-module.exports = {
-  // helpers
-  extractSceneRendererProps,
-
-  // Bundled propTypes.
-  SceneRendererProps,
-
-  // propTypes
-  SceneRenderer,
-  action,
-  navigationState,
-  navigationRoute,
-  panHandlers,
-};
diff --git a/Libraries/NavigationExperimental/NavigationStateUtils.js b/Libraries/NavigationExperimental/NavigationStateUtils.js
deleted file mode 100644
index e6022c5388948e..00000000000000
--- a/Libraries/NavigationExperimental/NavigationStateUtils.js
+++ /dev/null
@@ -1,215 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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 NavigationStateUtils
- * @flow
- */
-'use strict';
-
-const invariant = require('fbjs/lib/invariant');
-
-import type {
-  NavigationRoute,
-  NavigationState
-} from 'NavigationTypeDefinition';
-
-/**
- * Utilities to perform atomic operation with navigate state and routes.
- *
- * ```javascript
- * const state1 = {key: 'page 1'};
- * const state2 = NavigationStateUtils.push(state1, {key: 'page 2'});
- * ```
- */
-const NavigationStateUtils = {
-
-  /**
-   * Gets a route by key. If the route isn't found, returns `null`.
-   */
-  get(state: NavigationState, key: string): ?NavigationRoute {
-    return state.routes.find(route => route.key === key) || null;
-  },
-
-  /**
-   * Returns the first index at which a given route's key can be found in the
-   * routes of the navigation state, or -1 if it is not present.
-   */
-  indexOf(state: NavigationState, key: string): number {
-    return state.routes.map(route => route.key).indexOf(key);
-  },
-
-  /**
-   * Returns `true` at which a given route's key can be found in the
-   * routes of the navigation state.
-   */
-  has(state: NavigationState, key: string): boolean {
-    return !!state.routes.some(route => route.key === key);
-  },
-
-  /**
-   * Pushes a new route into the navigation state.
-   * Note that this moves the index to the positon to where the last route in the
-   * stack is at.
-   */
-  push(state: NavigationState, route: NavigationRoute): NavigationState {
-    invariant(
-      NavigationStateUtils.indexOf(state, route.key) === -1,
-      'should not push route with duplicated key %s',
-      route.key,
-    );
-
-    const routes = state.routes.slice();
-    routes.push(route);
-
-    return {
-      ...state,
-      index: routes.length - 1,
-      routes,
-    };
-  },
-
-  /**
-   * Pops out a route from the navigation state.
-   * Note that this moves the index to the positon to where the last route in the
-   * stack is at.
-   */
-  pop(state: NavigationState): NavigationState {
-    if (state.index <= 0) {
-      // [Note]: Over-popping does not throw error. Instead, it will be no-op.
-      return state;
-    }
-    const routes = state.routes.slice(0, -1);
-    return {
-      ...state,
-      index: routes.length - 1,
-      routes,
-    };
-  },
-
-  /**
-   * Sets the focused route of the navigation state by index.
-   */
-  jumpToIndex(state: NavigationState, index: number): NavigationState {
-    if (index === state.index) {
-      return state;
-    }
-
-    invariant(!!state.routes[index], 'invalid index %s to jump to', index);
-
-    return {
-      ...state,
-      index,
-    };
-  },
-
-  /**
-   * Sets the focused route of the navigation state by key.
-   */
-  jumpTo(state: NavigationState, key: string): NavigationState {
-    const index = NavigationStateUtils.indexOf(state, key);
-    return NavigationStateUtils.jumpToIndex(state, index);
-  },
-
-  /**
-   * Sets the focused route to the previous route.
-   */
-  back(state: NavigationState): NavigationState {
-    const index = state.index - 1;
-    const route = state.routes[index];
-    return route ? NavigationStateUtils.jumpToIndex(state, index) : state;
-  },
-
-  /**
-   * Sets the focused route to the next route.
-   */
-  forward(state: NavigationState): NavigationState {
-    const index = state.index + 1;
-    const route = state.routes[index];
-    return route ? NavigationStateUtils.jumpToIndex(state, index) : state;
-  },
-
-  /**
-   * Replace a route by a key.
-   * Note that this moves the index to the positon to where the new route in the
-   * stack is at.
-   */
-  replaceAt(
-    state: NavigationState,
-    key: string,
-    route: NavigationRoute,
-  ): NavigationState {
-    const index = NavigationStateUtils.indexOf(state, key);
-    return NavigationStateUtils.replaceAtIndex(state, index, route);
-  },
-
-  /**
-   * Replace a route by a index.
-   * Note that this moves the index to the positon to where the new route in the
-   * stack is at.
-   */
-  replaceAtIndex(
-    state: NavigationState,
-    index: number,
-    route: NavigationRoute,
-  ): NavigationState {
-    invariant(
-      !!state.routes[index],
-      'invalid index %s for replacing route %s',
-      index,
-      route.key,
-    );
-
-    if (state.routes[index] === route) {
-      return state;
-    }
-
-    const routes = state.routes.slice();
-    routes[index] = route;
-
-    return {
-      ...state,
-      index,
-      routes,
-    };
-  },
-
-  /**
-   * Resets all routes.
-   * Note that this moves the index to the positon to where the last route in the
-   * stack is at if the param `index` isn't provided.
-   */
-  reset(
-    state: NavigationState,
-    routes: Array<NavigationRoute>,
-    index?: number,
-  ): NavigationState {
-    invariant(
-      routes.length && Array.isArray(routes),
-      'invalid routes to replace',
-    );
-
-    const nextIndex: number = index === undefined ? routes.length - 1 : index;
-
-    if (state.routes.length === routes.length && state.index === nextIndex) {
-      const compare = (route, ii) => routes[ii] === route;
-      if (state.routes.every(compare)) {
-        return state;
-      }
-    }
-
-    invariant(!!routes[nextIndex], 'invalid index %s to reset', nextIndex);
-
-    return {
-      ...state,
-      index: nextIndex,
-      routes,
-    };
-  },
-};
-
-module.exports = NavigationStateUtils;
diff --git a/Libraries/NavigationExperimental/NavigationTransitioner.js b/Libraries/NavigationExperimental/NavigationTransitioner.js
deleted file mode 100644
index 7edf96faf80eae..00000000000000
--- a/Libraries/NavigationExperimental/NavigationTransitioner.js
+++ /dev/null
@@ -1,292 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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 NavigationTransitioner
- * @flow
- */
-'use strict';
-
-const Animated = require('Animated');
-const Easing = require('Easing');
-const NavigationPropTypes = require('NavigationPropTypes');
-const NavigationScenesReducer = require('NavigationScenesReducer');
-const React = require('React');
-const StyleSheet = require('StyleSheet');
-const View = require('View');
-
-const invariant = require('fbjs/lib/invariant');
-
-import type {
-  NavigationAnimatedValue,
-  NavigationLayout,
-  NavigationScene,
-  NavigationState,
-  NavigationTransitionProps,
-  NavigationTransitionSpec,
-} from 'NavigationTypeDefinition';
-
-type Props = {
-  configureTransition: (
-    a: NavigationTransitionProps,
-    b: ?NavigationTransitionProps,
-  ) => NavigationTransitionSpec,
-  navigationState: NavigationState,
-  onTransitionEnd: () => void,
-  onTransitionStart: () => void,
-  render: (a: NavigationTransitionProps, b: ?NavigationTransitionProps) => any,
-  style: any,
-};
-
-type State = {
-  layout: NavigationLayout,
-  position: NavigationAnimatedValue,
-  progress: NavigationAnimatedValue,
-  scenes: Array<NavigationScene>,
-};
-
-const {PropTypes} = React;
-
-const DefaultTransitionSpec = {
-  duration: 250,
-  easing: Easing.inOut(Easing.ease),
-  timing: Animated.timing,
-};
-
-class NavigationTransitioner extends React.Component<any, Props, State> {
-  _onLayout: (event: any) => void;
-  _onTransitionEnd: () => void;
-  _prevTransitionProps: ?NavigationTransitionProps;
-  _transitionProps: NavigationTransitionProps;
-  _isMounted: boolean;
-
-  props: Props;
-  state: State;
-
-  static propTypes = {
-    configureTransition: PropTypes.func,
-    navigationState: NavigationPropTypes.navigationState.isRequired,
-    onTransitionEnd: PropTypes.func,
-    onTransitionStart: PropTypes.func,
-    render: PropTypes.func.isRequired,
-  };
-
-  constructor(props: Props, context: any) {
-    super(props, context);
-
-    // The initial layout isn't measured. Measured layout will be only available
-    // when the component is mounted.
-    const layout = {
-      height: new Animated.Value(0),
-      initHeight: 0,
-      initWidth: 0,
-      isMeasured: false,
-      width: new Animated.Value(0),
-    };
-
-    this.state = {
-      layout,
-      position: new Animated.Value(this.props.navigationState.index),
-      progress: new Animated.Value(1),
-      scenes: NavigationScenesReducer([], this.props.navigationState),
-    };
-
-    this._prevTransitionProps = null;
-    this._transitionProps = buildTransitionProps(props, this.state);
-    this._isMounted = false;
-  }
-
-  componentWillMount(): void {
-    this._onLayout = this._onLayout.bind(this);
-    this._onTransitionEnd = this._onTransitionEnd.bind(this);
-  }
-
-  componentDidMount(): void {
-    this._isMounted = true;
-  }
-
-  componentWillUnmount(): void {
-    this._isMounted = false;
-  }
-
-  componentWillReceiveProps(nextProps: Props): void {
-    const nextScenes = NavigationScenesReducer(
-      this.state.scenes,
-      nextProps.navigationState,
-      this.props.navigationState
-    );
-
-    if (nextScenes === this.state.scenes) {
-      return;
-    }
-
-    const nextState = {
-      ...this.state,
-      scenes: nextScenes,
-    };
-
-    const {
-      position,
-      progress,
-    } = nextState;
-
-    progress.setValue(0);
-
-    this._prevTransitionProps = this._transitionProps;
-    this._transitionProps = buildTransitionProps(nextProps, nextState);
-
-    // get the transition spec.
-    const transitionUserSpec = nextProps.configureTransition ?
-      nextProps.configureTransition(
-        this._transitionProps,
-        this._prevTransitionProps,
-      ) :
-      null;
-
-    const transitionSpec = {
-      ...DefaultTransitionSpec,
-      ...transitionUserSpec,
-    };
-
-    const {timing} = transitionSpec;
-    delete transitionSpec.timing;
-
-    const animations = [
-      timing(
-        progress,
-        {
-          ...transitionSpec,
-          toValue: 1,
-        },
-      ),
-    ];
-
-    if (nextProps.navigationState.index !== this.props.navigationState.index) {
-      animations.push(
-        timing(
-          position,
-          {
-            ...transitionSpec,
-            toValue: nextProps.navigationState.index,
-          },
-        ),
-      );
-    }
-
-    // update scenes and play the transition
-    this.setState(nextState, () => {
-      nextProps.onTransitionStart && nextProps.onTransitionStart(
-        this._transitionProps,
-        this._prevTransitionProps,
-      );
-      Animated.parallel(animations).start(this._onTransitionEnd);
-    });
-  }
-
-  render(): React.Element<any> {
-    return (
-      <View
-        onLayout={this._onLayout}
-        style={[styles.main, this.props.style]}>
-        {this.props.render(this._transitionProps, this._prevTransitionProps)}
-      </View>
-    );
-  }
-
-  _onLayout(event: any): void {
-    const {height, width} = event.nativeEvent.layout;
-    if (this.state.layout.initWidth === width &&
-      this.state.layout.initHeight === height) {
-      return;
-    }
-    const layout = {
-      ...this.state.layout,
-      initHeight: height,
-      initWidth: width,
-      isMeasured: true,
-    };
-
-    layout.height.setValue(height);
-    layout.width.setValue(width);
-
-    const nextState = {
-      ...this.state,
-      layout,
-    };
-
-    this._transitionProps = buildTransitionProps(this.props, nextState);
-    this.setState(nextState);
-  }
-
-  _onTransitionEnd(): void {
-    if (!this._isMounted) {
-      return;
-    }
-
-    const prevTransitionProps = this._prevTransitionProps;
-    this._prevTransitionProps = null;
-
-    const nextState = {
-      ...this.state,
-      scenes: this.state.scenes.filter(isSceneNotStale),
-    };
-
-    this._transitionProps = buildTransitionProps(this.props, nextState);
-
-    this.setState(nextState, () => {
-      this.props.onTransitionEnd && this.props.onTransitionEnd(
-        this._transitionProps,
-        prevTransitionProps,
-      );
-    });
-  }
-}
-
-function buildTransitionProps(
-  props: Props,
-  state: State,
-): NavigationTransitionProps {
-  const {
-    navigationState,
-  } = props;
-
-  const {
-    layout,
-    position,
-    progress,
-    scenes,
-  } = state;
-
-  const scene = scenes.find(isSceneActive);
-
-  invariant(scene, 'No active scene when building navigation transition props.');
-
-  return {
-    layout,
-    navigationState,
-    position,
-    progress,
-    scenes,
-    scene
-  };
-}
-
-function isSceneNotStale(scene: NavigationScene): boolean {
-  return !scene.isStale;
-}
-
-function isSceneActive(scene: NavigationScene): boolean {
-  return scene.isActive;
-}
-
-const styles = StyleSheet.create({
-  main: {
-    flex: 1,
-  },
-});
-
-module.exports = NavigationTransitioner;
diff --git a/Libraries/NavigationExperimental/NavigationTypeDefinition.js b/Libraries/NavigationExperimental/NavigationTypeDefinition.js
deleted file mode 100644
index af37f9549f71a9..00000000000000
--- a/Libraries/NavigationExperimental/NavigationTypeDefinition.js
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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 NavigationTypeDefinition
- * @flow
- */
-'use strict';
-
-const Animated = require('Animated');
-
-import type React from 'react';
-
-// Object Instances
-
-export type NavigationAnimatedValue = Animated.Value;
-
-// Value  & Structs.
-
-export type NavigationGestureDirection = 'horizontal' | 'vertical';
-
-export type NavigationRoute = {
-  key: string,
-  title?: string
-};
-
-export type NavigationState = {
-  index: number,
-  routes: Array<NavigationRoute>,
-};
-
-export type NavigationLayout = {
-  height: NavigationAnimatedValue,
-  initHeight: number,
-  initWidth: number,
-  isMeasured: boolean,
-  width: NavigationAnimatedValue,
-};
-
-export type NavigationScene = {
-  index: number,
-  isActive: boolean,
-  isStale: boolean,
-  key: string,
-  route: NavigationRoute,
-};
-
-export type NavigationTransitionProps = {
-  // The layout of the transitioner of the scenes.
-  layout: NavigationLayout,
-
-  // The navigation state of the transitioner.
-  navigationState: NavigationState,
-
-  // The progressive index of the transitioner's navigation state.
-  position: NavigationAnimatedValue,
-
-  // The value that represents the progress of the transition when navigation
-  // state changes from one to another. Its numberic value will range from 0
-  // to 1.
-  //  progress.__getAnimatedValue() < 1 : transtion is happening.
-  //  progress.__getAnimatedValue() == 1 : transtion completes.
-  progress: NavigationAnimatedValue,
-
-  // All the scenes of the transitioner.
-  scenes: Array<NavigationScene>,
-
-  // The active scene, corresponding to the route at
-  // `navigationState.routes[navigationState.index]`.
-  scene: NavigationScene,
-
-  // The gesture distance for `horizontal` and `vertical` transitions
-  gestureResponseDistance?: ?number,
-};
-
-// Similar to `NavigationTransitionProps`, except that the prop `scene`
-// represents the scene for the renderer to render.
-export type NavigationSceneRendererProps = NavigationTransitionProps;
-
-export type NavigationPanPanHandlers = {
-  onMoveShouldSetResponder: Function,
-  onMoveShouldSetResponderCapture: Function,
-  onResponderEnd: Function,
-  onResponderGrant: Function,
-  onResponderMove: Function,
-  onResponderReject: Function,
-  onResponderRelease: Function,
-  onResponderStart: Function,
-  onResponderTerminate: Function,
-  onResponderTerminationRequest: Function,
-  onStartShouldSetResponder: Function,
-  onStartShouldSetResponderCapture: Function,
-};
-
-export type NavigationTransitionSpec = {
-  duration?: number,
-  // An easing function from `Easing`.
-  easing?: () => any,
-  // A timing function such as `Animated.timing`.
-  timing?: (value: NavigationAnimatedValue, config: any) => any,
-};
-
-// Functions.
-
-export type NavigationAnimationSetter = (
-  position: NavigationAnimatedValue,
-  newState: NavigationState,
-  lastState: NavigationState,
-) => void;
-
-export type NavigationSceneRenderer = (
-  props: NavigationSceneRendererProps,
-) => ?React.Element<any>;
-
-export type NavigationStyleInterpolator = (
-  props: NavigationSceneRendererProps,
-) => Object;
diff --git a/Libraries/NavigationExperimental/Reducer/NavigationScenesReducer.js b/Libraries/NavigationExperimental/Reducer/NavigationScenesReducer.js
deleted file mode 100644
index 3bfd263f198fd2..00000000000000
--- a/Libraries/NavigationExperimental/Reducer/NavigationScenesReducer.js
+++ /dev/null
@@ -1,210 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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 NavigationScenesReducer
- * @flow
- */
-'use strict';
-
-const invariant = require('fbjs/lib/invariant');
-const shallowEqual = require('fbjs/lib/shallowEqual');
-
-import type {
-  NavigationRoute,
-  NavigationScene,
-  NavigationState,
-} from 'NavigationTypeDefinition';
-
-const SCENE_KEY_PREFIX = 'scene_';
-
-/**
- * Helper function to compare route keys (e.g. "9", "11").
- */
-function compareKey(one: string, two: string): number {
-  const delta = one.length - two.length;
-  if (delta > 0) {
-    return 1;
-  }
-  if (delta < 0) {
-    return -1;
-  }
-  return one > two ? 1 : -1;
-}
-
-/**
- * Helper function to sort scenes based on their index and view key.
- */
-function compareScenes(
-  one: NavigationScene,
-  two: NavigationScene,
-): number {
-  if (one.index > two.index) {
-    return 1;
-  }
-  if (one.index < two.index) {
-    return -1;
-  }
-
-  return compareKey(
-    one.key,
-    two.key,
-  );
-}
-
-/**
- * Whether two routes are the same.
- */
-function areScenesShallowEqual(
-  one: NavigationScene,
-  two: NavigationScene,
-): boolean {
-  return (
-    one.key === two.key &&
-    one.index === two.index &&
-    one.isStale === two.isStale &&
-    one.isActive === two.isActive &&
-    areRoutesShallowEqual(one.route, two.route)
-  );
-}
-
-/**
- * Whether two routes are the same.
- */
-function areRoutesShallowEqual(
-  one: ?NavigationRoute,
-  two: ?NavigationRoute,
-): boolean {
-  if (!one || !two) {
-    return one === two;
-  }
-
-  if (one.key !== two.key) {
-    return false;
-  }
-
-  return shallowEqual(one, two);
-}
-
-function NavigationScenesReducer(
-  scenes: Array<NavigationScene>,
-  nextState: NavigationState,
-  prevState: ?NavigationState,
-): Array<NavigationScene> {
-  if (prevState === nextState) {
-    return scenes;
-  }
-
-  const prevScenes: Map<string, NavigationScene> = new Map();
-  const freshScenes: Map<string, NavigationScene> = new Map();
-  const staleScenes: Map<string, NavigationScene> = new Map();
-
-  // Populate stale scenes from previous scenes marked as stale.
-  scenes.forEach(scene => {
-    const {key} = scene;
-    if (scene.isStale) {
-      staleScenes.set(key, scene);
-    }
-    prevScenes.set(key, scene);
-  });
-
-  const nextKeys = new Set();
-  nextState.routes.forEach((route, index) => {
-    const key = SCENE_KEY_PREFIX + route.key;
-    const scene = {
-      index,
-      isActive: false,
-      isStale: false,
-      key,
-      route,
-    };
-    invariant(
-      !nextKeys.has(key),
-      `navigationState.routes[${index}].key "${key}" conflicts with ` +
-        'another route!'
-    );
-    nextKeys.add(key);
-
-    if (staleScenes.has(key)) {
-      // A previously `stale` scene is now part of the nextState, so we
-      // revive it by removing it from the stale scene map.
-      staleScenes.delete(key);
-    }
-    freshScenes.set(key, scene);
-  });
-
-  if (prevState) {
-    // Look at the previous routes and classify any removed scenes as `stale`.
-    prevState.routes.forEach((route: NavigationRoute, index) => {
-      const key = SCENE_KEY_PREFIX + route.key;
-      if (freshScenes.has(key)) {
-        return;
-      }
-      staleScenes.set(key, {
-        index,
-        isActive: false,
-        isStale: true,
-        key,
-        route,
-      });
-    });
-  }
-
-  const nextScenes = [];
-
-  const mergeScene = (nextScene => {
-    const {key} = nextScene;
-    const prevScene = prevScenes.has(key) ? prevScenes.get(key) : null;
-    if (prevScene && areScenesShallowEqual(prevScene, nextScene)) {
-      // Reuse `prevScene` as `scene` so view can avoid unnecessary re-render.
-      // This assumes that the scene's navigation state is immutable.
-      nextScenes.push(prevScene);
-    } else {
-      nextScenes.push(nextScene);
-    }
-  });
-
-  staleScenes.forEach(mergeScene);
-  freshScenes.forEach(mergeScene);
-
-  nextScenes.sort(compareScenes);
-
-  let activeScenesCount = 0;
-  nextScenes.forEach((scene, ii) => {
-    const isActive = !scene.isStale && scene.index === nextState.index;
-    if (isActive !== scene.isActive) {
-      nextScenes[ii] = {
-        ...scene,
-        isActive,
-      };
-    }
-    if (isActive) {
-      activeScenesCount++;
-    }
-  });
-
-  invariant(
-    activeScenesCount === 1,
-    'there should always be only one scene active, not %s.',
-    activeScenesCount,
-  );
-
-  if (nextScenes.length !== scenes.length) {
-    return nextScenes;
-  }
-
-  if (nextScenes.some(
-    (scene, index) => !areScenesShallowEqual(scenes[index], scene)
-  )) {
-    return nextScenes;
-  }
-
-  // scenes haven't changed.
-  return scenes;
-}
-
-module.exports = NavigationScenesReducer;
diff --git a/Libraries/NavigationExperimental/Reducer/__tests__/NavigationScenesReducer-test.js b/Libraries/NavigationExperimental/Reducer/__tests__/NavigationScenesReducer-test.js
deleted file mode 100644
index 8d320337c65964..00000000000000
--- a/Libraries/NavigationExperimental/Reducer/__tests__/NavigationScenesReducer-test.js
+++ /dev/null
@@ -1,300 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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.
- *
- */
-'use strict';
-
-jest.unmock('NavigationScenesReducer');
-
-const NavigationScenesReducer = require('NavigationScenesReducer');
-
-/**
- * Simulate scenes transtion with changes of navigation states.
- */
-function testTransition(states) {
-  const routes = states.map(keys => {
-    return {
-      index: 0,
-      routes: keys.map(key => {
-        return { key };
-      }),
-    };
-  });
-
-  let scenes = [];
-  let prevState = null;
-  routes.forEach((nextState) => {
-    scenes = NavigationScenesReducer(scenes, nextState, prevState);
-    prevState = nextState;
-  });
-
-  return scenes;
-}
-
-describe('NavigationScenesReducer', () => {
-
-  it('gets initial scenes', () => {
-    const scenes = testTransition([
-      ['1', '2'],
-    ]);
-
-    expect(scenes).toEqual([
-      {
-        index: 0,
-        isActive: true,
-        isStale: false,
-        key: 'scene_1',
-        route: {
-          key: '1'
-        },
-      },
-      {
-        index: 1,
-        isActive: false,
-        isStale: false,
-        key: 'scene_2',
-        route: {
-          key: '2'
-        },
-      },
-    ]);
-  });
-
-  it('pushes new scenes', () => {
-    // Transition from ['1', '2'] to ['1', '2', '3'].
-    const scenes = testTransition([
-      ['1', '2'],
-      ['1', '2', '3'],
-    ]);
-
-    expect(scenes).toEqual([
-      {
-        index: 0,
-        isActive: true,
-        isStale: false,
-        key: 'scene_1',
-        route: {
-          key: '1'
-        },
-      },
-      {
-        index: 1,
-        isActive: false,
-        isStale: false,
-        key: 'scene_2',
-        route: {
-          key: '2'
-        },
-      },
-      {
-        index: 2,
-        isActive: false,
-        isStale: false,
-        key: 'scene_3',
-        route: {
-          key: '3'
-        },
-      },
-    ]);
-  });
-
-  it('gets active scene when index changes', () => {
-    const state1 = {
-      index: 0,
-      routes: [{key: '1'}, {key: '2'}],
-    };
-
-    const state2 = {
-      index: 1,
-      routes: [{key: '1'}, {key: '2'}],
-    };
-
-    const scenes1 = NavigationScenesReducer([], state1, null);
-    const scenes2 = NavigationScenesReducer(scenes1, state2, state1);
-    const route = scenes2.find((scene) => scene.isActive).route;
-    expect(route).toEqual({key: '2'});
-  });
-
-  it('gets same scenes', () => {
-    const state1 = {
-      index: 0,
-      routes: [{key: '1'}, {key: '2'}],
-    };
-
-    const state2 = {
-      index: 0,
-      routes: [{key: '1'}, {key: '2'}],
-    };
-
-    const scenes1 = NavigationScenesReducer([], state1, null);
-    const scenes2 = NavigationScenesReducer(scenes1, state2, state1);
-    expect(scenes1).toBe(scenes2);
-  });
-
-  it('gets different scenes when keys are different', () => {
-    const state1 = {
-      index: 0,
-      routes: [{key: '1'}, {key: '2'}],
-    };
-
-    const state2 = {
-      index: 0,
-      routes: [{key: '2'}, {key: '1'}],
-    };
-
-    const scenes1 = NavigationScenesReducer([], state1, null);
-    const scenes2 = NavigationScenesReducer(scenes1, state2, state1);
-    expect(scenes1).not.toBe(scenes2);
-  });
-
-  it('gets different scenes when routes are different', () => {
-    const state1 = {
-      index: 0,
-      routes: [{key: '1', x: 1}, {key: '2', x: 2}],
-    };
-
-    const state2 = {
-      index: 0,
-      routes: [{key: '1', x: 3}, {key: '2', x: 4}],
-    };
-
-    const scenes1 = NavigationScenesReducer([], state1, null);
-    const scenes2 = NavigationScenesReducer(scenes1, state2, state1);
-    expect(scenes1).not.toBe(scenes2);
-  });
-
-
-  it('gets different scenes when state index changes', () => {
-    const state1 = {
-      index: 0,
-      routes: [{key: '1', x: 1}, {key: '2', x: 2}],
-    };
-
-    const state2 = {
-      index: 1,
-      routes: [{key: '1', x: 1}, {key: '2', x: 2}],
-    };
-
-    const scenes1 = NavigationScenesReducer([], state1, null);
-    const scenes2 = NavigationScenesReducer(scenes1, state2, state1);
-    expect(scenes1).not.toBe(scenes2);
-  });
-
-  it('pops scenes', () => {
-    // Transition from ['1', '2', '3'] to ['1', '2'].
-    const scenes = testTransition([
-      ['1', '2', '3'],
-      ['1', '2'],
-    ]);
-
-    expect(scenes).toEqual([
-      {
-        index: 0,
-        isActive: true,
-        isStale: false,
-        key: 'scene_1',
-        route: {
-          key: '1'
-        },
-      },
-      {
-        index: 1,
-        isActive: false,
-        isStale: false,
-        key: 'scene_2',
-        route: {
-          key: '2'
-        },
-      },
-      {
-        index: 2,
-        isActive: false,
-        isStale: true,
-        key: 'scene_3',
-        route: {
-          key: '3'
-        },
-      },
-    ]);
-  });
-
-  it('replaces scenes', () => {
-    const scenes = testTransition([
-      ['1', '2'],
-      ['3'],
-    ]);
-
-    expect(scenes).toEqual([
-      {
-        index: 0,
-        isActive: false,
-        isStale: true,
-        key: 'scene_1',
-        route: {
-          key: '1'
-        },
-      },
-      {
-        index: 0,
-        isActive: true,
-        isStale: false,
-        key: 'scene_3',
-        route: {
-          key: '3'
-        },
-      },
-      {
-        index: 1,
-        isActive: false,
-        isStale: true,
-        key: 'scene_2',
-        route: {
-          key: '2'
-        },
-      },
-    ]);
-  });
-
-  it('revives scenes', () => {
-    const scenes = testTransition([
-      ['1', '2'],
-      ['3'],
-      ['2'],
-    ]);
-
-    expect(scenes).toEqual([
-      {
-        index: 0,
-        isActive: false,
-        isStale: true,
-        key: 'scene_1',
-        route: {
-          key: '1'
-        },
-      },
-      {
-        index: 0,
-        isActive: true,
-        isStale: false,
-        key: 'scene_2',
-        route: {
-          key: '2'
-        },
-      },
-      {
-        index: 0,
-        isActive: false,
-        isStale: true,
-        key: 'scene_3',
-        route: {
-          key: '3'
-        },
-      },
-    ]);
-  });
-});
diff --git a/Libraries/NavigationExperimental/__tests__/NavigationStateUtils-test.js b/Libraries/NavigationExperimental/__tests__/NavigationStateUtils-test.js
deleted file mode 100644
index d71d88800d42a0..00000000000000
--- a/Libraries/NavigationExperimental/__tests__/NavigationStateUtils-test.js
+++ /dev/null
@@ -1,156 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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.
- */
-'use strict';
-
-jest.unmock('NavigationStateUtils');
-
-const NavigationStateUtils = require('NavigationStateUtils');
-
-describe('NavigationStateUtils', () => {
-
-  // Getters
-  it('gets route', () => {
-    const state = {index: 0, routes: [{key: 'a'}]};
-    expect(NavigationStateUtils.get(state, 'a')).toEqual({key: 'a'});
-    expect(NavigationStateUtils.get(state, 'b')).toBe(null);
-  });
-
-  it('gets route index', () => {
-    const state = {index: 1, routes: [{key: 'a'}, {key: 'b'}]};
-    expect(NavigationStateUtils.indexOf(state, 'a')).toBe(0);
-    expect(NavigationStateUtils.indexOf(state, 'b')).toBe(1);
-    expect(NavigationStateUtils.indexOf(state, 'c')).toBe(-1);
-  });
-
-  it('has a route', () => {
-     const state = {index: 0, routes: [{key: 'a'}, {key: 'b'}]};
-     expect(NavigationStateUtils.has(state, 'b')).toBe(true);
-     expect(NavigationStateUtils.has(state, 'c')).toBe(false);
-  });
-
-  // Push
-  it('pushes a route', () => {
-    const state = {index: 0, routes: [{key: 'a'}]};
-    const newState = {index: 1, routes: [{key: 'a'}, {key: 'b'}]};
-    expect(NavigationStateUtils.push(state, {key: 'b'})).toEqual(newState);
-  });
-
-  it('does not push duplicated route', () => {
-    const state = {index: 0, routes: [{key: 'a'}]};
-    expect(() => NavigationStateUtils.push(state, {key: 'a'})).toThrow();
-  });
-
-  // Pop
-  it('pops route', () => {
-    const state = {index: 1, routes: [{key: 'a'}, {key: 'b'}]};
-    const newState = {index: 0, routes: [{key: 'a'}]};
-    expect(NavigationStateUtils.pop(state)).toEqual(newState);
-  });
-
-  it('does not pop route if not applicable', () => {
-    const state = {index: 0, routes: [{key: 'a'}]};
-    expect(NavigationStateUtils.pop(state)).toBe(state);
-  });
-
-  // Jump
-  it('jumps to new index', () => {
-    const state = {index: 0, routes: [{key: 'a'}, {key: 'b'}]};
-    const newState = {index: 1, routes: [{key: 'a'}, {key: 'b'}]};
-    expect(NavigationStateUtils.jumpToIndex(state, 0)).toBe(state);
-    expect(NavigationStateUtils.jumpToIndex(state, 1)).toEqual(newState);
-  });
-
-  it('throws if jumps to invalid index', () => {
-    const state = {index: 0, routes: [{key: 'a'}, {key: 'b'}]};
-    expect(() => NavigationStateUtils.jumpToIndex(state, 2)).toThrow();
-  });
-
-  it('jumps to new key', () => {
-    const state = {index: 0, routes: [{key: 'a'}, {key: 'b'}]};
-    const newState = {index: 1, routes: [{key: 'a'}, {key: 'b'}]};
-    expect(NavigationStateUtils.jumpTo(state, 'a')).toBe(state);
-    expect(NavigationStateUtils.jumpTo(state, 'b')).toEqual(newState);
-  });
-
-  it('throws if jumps to invalid key', () => {
-    const state = {index: 0, routes: [{key: 'a'}, {key: 'b'}]};
-    expect(() => NavigationStateUtils.jumpTo(state, 'c')).toThrow();
-  });
-
-  it('move backwards', () => {
-    const state = {index: 1, routes: [{key: 'a'}, {key: 'b'}]};
-    const newState = {index: 0, routes: [{key: 'a'}, {key: 'b'}]};
-    expect(NavigationStateUtils.back(state)).toEqual(newState);
-    expect(NavigationStateUtils.back(newState)).toBe(newState);
-  });
-
-  it('move forwards', () => {
-    const state = {index: 0, routes: [{key: 'a'}, {key: 'b'}]};
-    const newState = {index: 1, routes: [{key: 'a'}, {key: 'b'}]};
-    expect(NavigationStateUtils.forward(state)).toEqual(newState);
-    expect(NavigationStateUtils.forward(newState)).toBe(newState);
-  });
-
-  // Replace
-  it('Replaces by key', () => {
-    const state = {index: 0, routes: [{key: 'a'}, {key: 'b'}]};
-    const newState = {index: 1, routes: [{key: 'a'}, {key: 'c'}]};
-    expect(
-      NavigationStateUtils.replaceAt(
-        state,
-        'b',
-        {key: 'c'},
-      )
-    ).toEqual(newState);
-  });
-
-  it('Replaces by index', () => {
-    const state = {index: 0, routes: [{key: 'a'}, {key: 'b'}]};
-    const newState = {index: 1, routes: [{key: 'a'}, {key: 'c'}]};
-    expect(
-      NavigationStateUtils.replaceAtIndex(
-        state,
-        1,
-        {key: 'c'},
-      )
-    ).toEqual(newState);
-  });
-
-  // Reset
-  it('Resets routes', () => {
-    const state = {index: 0, routes: [{key: 'a'}, {key: 'b'}]};
-    const newState = {index: 1, routes: [{key: 'x'}, {key: 'y'}]};
-    expect(
-      NavigationStateUtils.reset(
-        state,
-        [{key: 'x'}, {key: 'y'}],
-      )
-    ).toEqual(newState);
-
-    expect(() => {
-      NavigationStateUtils.reset(state, []);
-    }).toThrow();
-  });
-
-  it('Resets routes with index', () => {
-    const state = {index: 0, routes: [{key: 'a'}, {key: 'b'}]};
-    const newState = {index: 0, routes: [{key: 'x'}, {key: 'y'}]};
-    expect(
-      NavigationStateUtils.reset(
-        state,
-        [{key: 'x'}, {key: 'y'}],
-        0,
-      )
-    ).toEqual(newState);
-
-    expect(() => {
-      NavigationStateUtils.reset(state, [{key: 'x'}, {key: 'y'}], 100);
-    }).toThrow();
-  });
-});
diff --git a/Libraries/react-native/react-native-implementation.js b/Libraries/react-native/react-native-implementation.js
index b0e86440ba11cd..5296fe3cf03dcd 100644
--- a/Libraries/react-native/react-native-implementation.js
+++ b/Libraries/react-native/react-native-implementation.js
@@ -95,7 +95,6 @@ const ReactNative = {
   get LayoutAnimation() { return require('LayoutAnimation'); },
   get Linking() { return require('Linking'); },
   get NativeEventEmitter() { return require('NativeEventEmitter'); },
-  get NavigationExperimental() { return require('NavigationExperimental'); },
   get NetInfo() { return require('NetInfo'); },
   get PanResponder() { return require('PanResponder'); },
   get PermissionsAndroid() { return require('PermissionsAndroid'); },

From 9a88c721635ddb1ad6624b7dd3fc9e21530b00e2 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <bvaughn@fb.com>
Date: Thu, 23 Mar 2017 17:31:16 -0700
Subject: [PATCH 175/366] Exposed new ViewPropTypes object on ReactNative
 renderer (stack and fiber)

Reviewed By: yungsters

Differential Revision: D4765002

fbshipit-source-id: 54be903bf6529df7ab2cff265c1f87b145da8d94
---
 Libraries/react-native/react-native-implementation.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Libraries/react-native/react-native-implementation.js b/Libraries/react-native/react-native-implementation.js
index 5296fe3cf03dcd..d0135c2221688a 100644
--- a/Libraries/react-native/react-native-implementation.js
+++ b/Libraries/react-native/react-native-implementation.js
@@ -123,6 +123,7 @@ const ReactNative = {
   get ColorPropType() { return require('ColorPropType'); },
   get EdgeInsetsPropType() { return require('EdgeInsetsPropType'); },
   get PointPropType() { return require('PointPropType'); },
+  get ViewPropTypes() { return require('ViewPropTypes'); },
 };
 
 // Better error messages when accessing React APIs on ReactNative

From f891985bd853f1732c6d77ee02e5d019190ef04b Mon Sep 17 00:00:00 2001
From: jrodiger <jonathan@rodiger.net>
Date: Thu, 23 Mar 2017 18:11:30 -0700
Subject: [PATCH 176/366] Update runAndroid.js to fix startServerInNewWindow()
 (Windows)

Summary:
**Motivation**
Resolves issue: #12367. The issue is that the packager does not launch automatically on Windows when running `react-native run-android` like it does on OSX. The proposed change fixes this issue, and causes the packager to be launched automatically on Windows 10. Also note the updated code uses the syntax described in the [Node.js documentation](https://nodejs.org/api/all.html#child_process_spawning_bat_and_cmd_files_on_windows) on spawning .bat files on Windows.

**Test plan**
Manually tested on Windows 10.

Running just `react-native run-android` now results in the packager launching, without needing to run `react-native start` in a new command prompt window.

**Screenshot:**
![packager](https://cloud.githubusercontent.com/assets/17132071/23641540/8d82bb7c-02c2-11e7-9c47-d1c9b582bd65.png)
Closes https://github.com/facebook/react-native/pull/12755

Differential Revision: D4767321

fbshipit-source-id: a14f369ba99939aa44d0ee3403e1d262e2657e6e
---
 local-cli/runAndroid/runAndroid.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/local-cli/runAndroid/runAndroid.js b/local-cli/runAndroid/runAndroid.js
index 815c8ebaa746fc..5cc2b13bc9f172 100644
--- a/local-cli/runAndroid/runAndroid.js
+++ b/local-cli/runAndroid/runAndroid.js
@@ -265,7 +265,7 @@ function startServerInNewWindow() {
   } else if (/^win/.test(process.platform)) {
     procConfig.detached = true;
     procConfig.stdio = 'ignore';
-    return child_process.spawn('cmd.exe', ['/C', 'start', launchPackagerScript], procConfig);
+    return child_process.spawn('cmd.exe', ['/C', launchPackagerScript], procConfig);
   } else {
     console.log(chalk.red(`Cannot start the packager. Unknown platform ${process.platform}`));
   }

From de8ce452586d082b50096f26bde01c9c420d6165 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <bvaughn@fb.com>
Date: Fri, 24 Mar 2017 00:22:57 -0700
Subject: [PATCH 177/366] Ran codemod to replace View.propTypes with
 ViewPropTypes

Reviewed By: yungsters

Differential Revision: D4764838

fbshipit-source-id: 0b47a0fdd6793dab9333bb73bb93053fccc27dae
---
 Libraries/Components/ActivityIndicator/ActivityIndicator.js | 4 +++-
 Libraries/Components/DatePicker/DatePickerIOS.ios.js        | 4 +++-
 .../Components/DrawerAndroid/DrawerLayoutAndroid.android.js | 4 +++-
 Libraries/Components/Keyboard/KeyboardAvoidingView.js       | 6 ++++--
 Libraries/Components/Navigation/NavigatorIOS.ios.js         | 6 ++++--
 Libraries/Components/Picker/Picker.js                       | 4 ++--
 Libraries/Components/Picker/PickerAndroid.android.js        | 4 ++--
 Libraries/Components/Picker/PickerIOS.ios.js                | 3 ++-
 .../ProgressBarAndroid/ProgressBarAndroid.android.js        | 4 ++--
 Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js | 4 ++--
 Libraries/Components/RefreshControl/RefreshControl.js       | 4 ++--
 Libraries/Components/ScrollView/ScrollView.js               | 3 ++-
 .../SegmentedControlIOS/SegmentedControlIOS.ios.js          | 4 ++--
 Libraries/Components/Slider/Slider.js                       | 6 +++---
 Libraries/Components/Switch/Switch.js                       | 4 ++--
 Libraries/Components/TabBarIOS/TabBarIOS.ios.js             | 6 +++---
 Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js         | 6 ++++--
 Libraries/Components/TextInput/TextInput.js                 | 4 ++--
 .../Components/ToolbarAndroid/ToolbarAndroid.android.js     | 4 ++--
 Libraries/Components/Touchable/TouchableHighlight.js        | 4 +++-
 Libraries/Components/ViewPager/ViewPagerAndroid.android.js  | 4 ++--
 Libraries/Components/WebView/WebView.android.js             | 6 ++++--
 Libraries/Components/WebView/WebView.ios.js                 | 5 +++--
 Libraries/CustomComponents/Navigator/Navigator.js           | 6 ++++--
 .../Navigator/NavigatorBreadcrumbNavigationBar.js           | 4 +++-
 .../CustomComponents/Navigator/NavigatorNavigationBar.js    | 4 +++-
 Libraries/Experimental/IncrementalPresenter.js              | 4 +++-
 .../Experimental/SwipeableRow/SwipeableQuickActionButton.js | 4 +++-
 .../Experimental/SwipeableRow/SwipeableQuickActions.js      | 4 +++-
 Libraries/Image/Image.android.js                            | 3 ++-
 Libraries/RCTTest/SnapshotViewIOS.ios.js                    | 4 +++-
 31 files changed, 85 insertions(+), 51 deletions(-)

diff --git a/Libraries/Components/ActivityIndicator/ActivityIndicator.js b/Libraries/Components/ActivityIndicator/ActivityIndicator.js
index 74630e39ea60e7..8676f897a4583f 100644
--- a/Libraries/Components/ActivityIndicator/ActivityIndicator.js
+++ b/Libraries/Components/ActivityIndicator/ActivityIndicator.js
@@ -18,6 +18,8 @@ const React = require('React');
 const StyleSheet = require('StyleSheet');
 const View = require('View');
 
+const ViewPropTypes = require('ViewPropTypes');
+
 const requireNativeComponent = require('requireNativeComponent');
 
 const PropTypes = React.PropTypes;
@@ -40,7 +42,7 @@ const ActivityIndicator = React.createClass({
   mixins: [NativeMethodsMixin],
 
   propTypes: {
-    ...View.propTypes,
+    ...ViewPropTypes,
     /**
      * Whether to show the indicator (true, the default) or hide it (false).
      */
diff --git a/Libraries/Components/DatePicker/DatePickerIOS.ios.js b/Libraries/Components/DatePicker/DatePickerIOS.ios.js
index bb001d7e166d12..1d8dfd5bc4e829 100644
--- a/Libraries/Components/DatePicker/DatePickerIOS.ios.js
+++ b/Libraries/Components/DatePicker/DatePickerIOS.ios.js
@@ -18,6 +18,8 @@ const React = require('React');
 const StyleSheet = require('StyleSheet');
 const View = require('View');
 
+const ViewPropTypes = require('ViewPropTypes');
+
 const requireNativeComponent = require('requireNativeComponent');
 
 const PropTypes = React.PropTypes;
@@ -43,7 +45,7 @@ const DatePickerIOS = React.createClass({
   mixins: [NativeMethodsMixin],
 
   propTypes: {
-    ...View.propTypes,
+    ...ViewPropTypes,
     /**
      * The currently selected date.
      */
diff --git a/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js b/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js
index 4898abd11f75c7..6fcca0f53dc7ec 100644
--- a/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js
+++ b/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js
@@ -20,6 +20,8 @@ var StyleSheet = require('StyleSheet');
 var UIManager = require('UIManager');
 var View = require('View');
 
+const ViewPropTypes = require('ViewPropTypes');
+
 var DrawerConsts = UIManager.AndroidDrawerLayout.Constants;
 
 var dismissKeyboard = require('dismissKeyboard');
@@ -73,7 +75,7 @@ var DrawerLayoutAndroid = React.createClass({
   },
 
   propTypes: {
-    ...View.propTypes,
+    ...ViewPropTypes,
     /**
      * Determines whether the keyboard gets dismissed in response to a drag.
      *   - 'none' (the default), drags do not dismiss the keyboard.
diff --git a/Libraries/Components/Keyboard/KeyboardAvoidingView.js b/Libraries/Components/Keyboard/KeyboardAvoidingView.js
index f20fb0323da9cd..ad310e50368b16 100644
--- a/Libraries/Components/Keyboard/KeyboardAvoidingView.js
+++ b/Libraries/Components/Keyboard/KeyboardAvoidingView.js
@@ -18,6 +18,8 @@ const React = require('React');
 const TimerMixin = require('react-timer-mixin');
 const View = require('View');
 
+const ViewPropTypes = require('ViewPropTypes');
+
 const PropTypes = React.PropTypes;
 
 import type EmitterSubscription from 'EmitterSubscription';
@@ -57,13 +59,13 @@ const KeyboardAvoidingView = React.createClass({
   mixins: [TimerMixin],
 
   propTypes: {
-    ...View.propTypes,
+    ...ViewPropTypes,
     behavior: PropTypes.oneOf(['height', 'position', 'padding']),
 
     /**
      * The style of the content container(View) when behavior is 'position'.
      */
-    contentContainerStyle: View.propTypes.style,
+    contentContainerStyle: ViewPropTypes.style,
 
     /**
      * This is the distance between the top of the user screen and the react native view,
diff --git a/Libraries/Components/Navigation/NavigatorIOS.ios.js b/Libraries/Components/Navigation/NavigatorIOS.ios.js
index 10c18e0c507767..d02aea57a8392e 100644
--- a/Libraries/Components/Navigation/NavigatorIOS.ios.js
+++ b/Libraries/Components/Navigation/NavigatorIOS.ios.js
@@ -22,6 +22,8 @@ var StyleSheet = require('StyleSheet');
 var TVEventHandler = require('TVEventHandler');
 var View = require('View');
 
+const ViewPropTypes = require('ViewPropTypes');
+
 var invariant = require('fbjs/lib/invariant');
 var logError = require('logError');
 var requireNativeComponent = require('requireNativeComponent');
@@ -406,7 +408,7 @@ var NavigatorIOS = React.createClass({
       /**
        * Styles for the navigation item containing the component.
        */
-      wrapperStyle: View.propTypes.style,
+      wrapperStyle: ViewPropTypes.style,
 
       /**
        * Boolean value that indicates whether the navigation bar is hidden.
@@ -458,7 +460,7 @@ var NavigatorIOS = React.createClass({
      * The default wrapper style for components in the navigator.
      * A common use case is to set the `backgroundColor` for every scene.
      */
-    itemWrapperStyle: View.propTypes.style,
+    itemWrapperStyle: ViewPropTypes.style,
 
     /**
      * The default color used for the buttons in the navigation bar.
diff --git a/Libraries/Components/Picker/Picker.js b/Libraries/Components/Picker/Picker.js
index 1f8441814f87ab..a85dd7a65cdf50 100644
--- a/Libraries/Components/Picker/Picker.js
+++ b/Libraries/Components/Picker/Picker.js
@@ -20,7 +20,7 @@ var React = require('React');
 var StyleSheetPropType = require('StyleSheetPropType');
 var TextStylePropTypes = require('TextStylePropTypes');
 var UnimplementedView = require('UnimplementedView');
-var View = require('View');
+const ViewPropTypes = require('ViewPropTypes');
 var ViewStylePropTypes = require('ViewStylePropTypes');
 
 var itemStylePropType = StyleSheetPropType(TextStylePropTypes);
@@ -71,7 +71,7 @@ class Picker extends React.Component {
 
  // $FlowFixMe(>=0.41.0)
  static propTypes = {
-   ...View.propTypes,
+   ...ViewPropTypes,
    style: pickerStyleType,
    /**
     * Value matching value of one of the items. Can be a string or an integer.
diff --git a/Libraries/Components/Picker/PickerAndroid.android.js b/Libraries/Components/Picker/PickerAndroid.android.js
index 8be1579aec655d..511b4d3194625c 100644
--- a/Libraries/Components/Picker/PickerAndroid.android.js
+++ b/Libraries/Components/Picker/PickerAndroid.android.js
@@ -16,7 +16,7 @@ var ColorPropType = require('ColorPropType');
 var React = require('React');
 var StyleSheet = require('StyleSheet');
 var StyleSheetPropType = require('StyleSheetPropType');
-var View = require('View');
+const ViewPropTypes = require('ViewPropTypes');
 var ViewStylePropTypes = require('ViewStylePropTypes');
 
 var processColor = require('processColor');
@@ -51,7 +51,7 @@ class PickerAndroid extends React.Component {
   state: *;
 
   static propTypes = {
-    ...View.propTypes,
+    ...ViewPropTypes,
     style: pickerStyleType,
     selectedValue: React.PropTypes.any,
     enabled: ReactPropTypes.bool,
diff --git a/Libraries/Components/Picker/PickerIOS.ios.js b/Libraries/Components/Picker/PickerIOS.ios.js
index 93a429cbe43773..9bdacdddd1d386 100644
--- a/Libraries/Components/Picker/PickerIOS.ios.js
+++ b/Libraries/Components/Picker/PickerIOS.ios.js
@@ -18,6 +18,7 @@ var StyleSheet = require('StyleSheet');
 var StyleSheetPropType = require('StyleSheetPropType');
 var TextStylePropTypes = require('TextStylePropTypes');
 var View = require('View');
+const ViewPropTypes = require('ViewPropTypes');
 var processColor = require('processColor');
 
 var itemStylePropType = StyleSheetPropType(TextStylePropTypes);
@@ -27,7 +28,7 @@ var PickerIOS = React.createClass({
   mixins: [NativeMethodsMixin],
 
   propTypes: {
-    ...View.propTypes,
+    ...ViewPropTypes,
     itemStyle: itemStylePropType,
     onValueChange: React.PropTypes.func,
     selectedValue: React.PropTypes.any, // string or integer basically
diff --git a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js
index 451ddab2209093..a38c25c4697683 100644
--- a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js
+++ b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js
@@ -12,7 +12,7 @@
 
 var NativeMethodsMixin = require('NativeMethodsMixin');
 var React = require('React');
-var View = require('View');
+const ViewPropTypes = require('ViewPropTypes');
 var ColorPropType = require('ColorPropType');
 
 var requireNativeComponent = require('requireNativeComponent');
@@ -66,7 +66,7 @@ var indeterminateType = function(props, propName, componentName) {
  */
 var ProgressBarAndroid = React.createClass({
   propTypes: {
-    ...View.propTypes,
+    ...ViewPropTypes,
     /**
      * Style of the ProgressBar. One of:
      *
diff --git a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js
index 6ee4db298d08e3..a8287f8b456994 100644
--- a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js
+++ b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js
@@ -15,7 +15,7 @@ var Image = require('Image');
 var NativeMethodsMixin = require('NativeMethodsMixin');
 var React = require('React');
 var StyleSheet = require('StyleSheet');
-var View = require('View');
+const ViewPropTypes = require('ViewPropTypes');
 
 var requireNativeComponent = require('requireNativeComponent');
 
@@ -29,7 +29,7 @@ var ProgressViewIOS = React.createClass({
   mixins: [NativeMethodsMixin],
 
   propTypes: {
-    ...View.propTypes,
+    ...ViewPropTypes,
     /**
      * The progress bar style.
      */
diff --git a/Libraries/Components/RefreshControl/RefreshControl.js b/Libraries/Components/RefreshControl/RefreshControl.js
index a1eff537d8a2ef..02db53302fd1fe 100644
--- a/Libraries/Components/RefreshControl/RefreshControl.js
+++ b/Libraries/Components/RefreshControl/RefreshControl.js
@@ -15,7 +15,7 @@ const ColorPropType = require('ColorPropType');
 const NativeMethodsMixin = require('NativeMethodsMixin');
 const Platform = require('Platform');
 const React = require('React');
-const View = require('View');
+const ViewPropTypes = require('ViewPropTypes');
 
 const requireNativeComponent = require('requireNativeComponent');
 
@@ -79,7 +79,7 @@ const RefreshControl = React.createClass({
   mixins: [NativeMethodsMixin],
 
   propTypes: {
-    ...View.propTypes,
+    ...ViewPropTypes,
     /**
      * Called when the view starts refreshing.
      */
diff --git a/Libraries/Components/ScrollView/ScrollView.js b/Libraries/Components/ScrollView/ScrollView.js
index bdd50b3dc06c1a..aa1f7e376252c0 100644
--- a/Libraries/Components/ScrollView/ScrollView.js
+++ b/Libraries/Components/ScrollView/ScrollView.js
@@ -23,6 +23,7 @@ const ScrollViewStickyHeader = require('ScrollViewStickyHeader');
 const StyleSheet = require('StyleSheet');
 const StyleSheetPropType = require('StyleSheetPropType');
 const View = require('View');
+const ViewPropTypes = require('ViewPropTypes');
 const ViewStylePropTypes = require('ViewStylePropTypes');
 
 const dismissKeyboard = require('dismissKeyboard');
@@ -70,7 +71,7 @@ const requireNativeComponent = require('requireNativeComponent');
 // $FlowFixMe(>=0.41.0)
 const ScrollView = React.createClass({
   propTypes: {
-    ...View.propTypes,
+    ...ViewPropTypes,
     /**
      * Controls whether iOS should automatically adjust the content inset
      * for scroll views that are placed behind a navigation bar or
diff --git a/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.ios.js b/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.ios.js
index 200e198e1c025c..9ac6f3cef5f29d 100644
--- a/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.ios.js
+++ b/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.ios.js
@@ -14,7 +14,7 @@
 var NativeMethodsMixin = require('NativeMethodsMixin');
 var React = require('React');
 var StyleSheet = require('StyleSheet');
-var View = require('View');
+const ViewPropTypes = require('ViewPropTypes');
 
 var requireNativeComponent = require('requireNativeComponent');
 
@@ -54,7 +54,7 @@ var SegmentedControlIOS = React.createClass({
   mixins: [NativeMethodsMixin],
 
   propTypes: {
-    ...View.propTypes,
+    ...ViewPropTypes,
     /**
      * The labels for the control's segment buttons, in order.
      */
diff --git a/Libraries/Components/Slider/Slider.js b/Libraries/Components/Slider/Slider.js
index 3fbe92fc5f38af..6ca9e49ae73a1c 100644
--- a/Libraries/Components/Slider/Slider.js
+++ b/Libraries/Components/Slider/Slider.js
@@ -18,7 +18,7 @@ var ReactNativeViewAttributes = require('ReactNativeViewAttributes');
 var Platform = require('Platform');
 var React = require('React');
 var StyleSheet = require('StyleSheet');
-var View = require('View');
+const ViewPropTypes = require('ViewPropTypes');
 
 var requireNativeComponent = require('requireNativeComponent');
 
@@ -34,13 +34,13 @@ var Slider = React.createClass({
   mixins: [NativeMethodsMixin],
 
   propTypes: {
-    ...View.propTypes,
+    ...ViewPropTypes,
 
     /**
      * Used to style and layout the `Slider`.  See `StyleSheet.js` and
      * `ViewStylePropTypes.js` for more info.
      */
-    style: View.propTypes.style,
+    style: ViewPropTypes.style,
 
     /**
      * Initial value of the slider. The value should be between minimumValue
diff --git a/Libraries/Components/Switch/Switch.js b/Libraries/Components/Switch/Switch.js
index f614164cab8577..04ed872dc84d5d 100644
--- a/Libraries/Components/Switch/Switch.js
+++ b/Libraries/Components/Switch/Switch.js
@@ -16,7 +16,7 @@ var NativeMethodsMixin = require('NativeMethodsMixin');
 var Platform = require('Platform');
 var React = require('React');
 var StyleSheet = require('StyleSheet');
-var View = require('View');
+const ViewPropTypes = require('ViewPropTypes');
 
 var requireNativeComponent = require('requireNativeComponent');
 
@@ -41,7 +41,7 @@ type DefaultProps = {
 // $FlowFixMe(>=0.41.0)
 var Switch = React.createClass({
   propTypes: {
-    ...View.propTypes,
+    ...ViewPropTypes,
     /**
      * The value of the switch.  If true the switch will be turned on.
      * Default value is false.
diff --git a/Libraries/Components/TabBarIOS/TabBarIOS.ios.js b/Libraries/Components/TabBarIOS/TabBarIOS.ios.js
index 5ccab62e11fe7d..3ccabc5828f7e9 100644
--- a/Libraries/Components/TabBarIOS/TabBarIOS.ios.js
+++ b/Libraries/Components/TabBarIOS/TabBarIOS.ios.js
@@ -15,7 +15,7 @@ var ColorPropType = require('ColorPropType');
 var React = require('React');
 var StyleSheet = require('StyleSheet');
 var TabBarItemIOS = require('TabBarItemIOS');
-var View = require('View');
+const ViewPropTypes = require('ViewPropTypes');
 
 var requireNativeComponent = require('requireNativeComponent');
 
@@ -34,8 +34,8 @@ class TabBarIOS extends React.Component {
 
   // $FlowFixMe(>=0.41.0)
   static propTypes = {
-    ...View.propTypes,
-    style: View.propTypes.style,
+    ...ViewPropTypes,
+    style: ViewPropTypes.style,
     /**
      * Color of text on unselected tabs
      */
diff --git a/Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js b/Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js
index 63f0cd56d15b22..39eb95ab2adcaf 100644
--- a/Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js
+++ b/Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js
@@ -18,11 +18,13 @@ var StaticContainer = require('StaticContainer.react');
 var StyleSheet = require('StyleSheet');
 var View = require('View');
 
+const ViewPropTypes = require('ViewPropTypes');
+
 var requireNativeComponent = require('requireNativeComponent');
 
 class TabBarItemIOS extends React.Component {
   static propTypes = {
-    ...View.propTypes,
+    ...ViewPropTypes,
     /**
      * Little red bubble that sits at the top right of the icon.
      */
@@ -80,7 +82,7 @@ class TabBarItemIOS extends React.Component {
     /**
      * React style object.
      */
-    style: View.propTypes.style,
+    style: ViewPropTypes.style,
     /**
      * Text that appears under the icon. It is ignored when a system icon
      * is defined.
diff --git a/Libraries/Components/TextInput/TextInput.js b/Libraries/Components/TextInput/TextInput.js
index 3f01022cb6c405..2f24ab240ab6c0 100644
--- a/Libraries/Components/TextInput/TextInput.js
+++ b/Libraries/Components/TextInput/TextInput.js
@@ -24,7 +24,7 @@ const TextInputState = require('TextInputState');
 const TimerMixin = require('react-timer-mixin');
 const TouchableWithoutFeedback = require('TouchableWithoutFeedback');
 const UIManager = require('UIManager');
-const View = require('View');
+const ViewPropTypes = require('ViewPropTypes');
 
 const emptyFunction = require('fbjs/lib/emptyFunction');
 const invariant = require('fbjs/lib/invariant');
@@ -176,7 +176,7 @@ const TextInput = React.createClass({
   },
 
   propTypes: {
-    ...View.propTypes,
+    ...ViewPropTypes,
     /**
      * Can tell `TextInput` to automatically capitalize certain characters.
      *
diff --git a/Libraries/Components/ToolbarAndroid/ToolbarAndroid.android.js b/Libraries/Components/ToolbarAndroid/ToolbarAndroid.android.js
index ccb6e9662f473a..201c9c3fc0801c 100644
--- a/Libraries/Components/ToolbarAndroid/ToolbarAndroid.android.js
+++ b/Libraries/Components/ToolbarAndroid/ToolbarAndroid.android.js
@@ -16,7 +16,7 @@ var NativeMethodsMixin = require('NativeMethodsMixin');
 var React = require('React');
 var ReactNativeViewAttributes = require('ReactNativeViewAttributes');
 var UIManager = require('UIManager');
-var View = require('View');
+const ViewPropTypes = require('ViewPropTypes');
 var ColorPropType = require('ColorPropType');
 
 var requireNativeComponent = require('requireNativeComponent');
@@ -70,7 +70,7 @@ var ToolbarAndroid = React.createClass({
   mixins: [NativeMethodsMixin],
 
   propTypes: {
-    ...View.propTypes,
+    ...ViewPropTypes,
     /**
      * Sets possible actions on the toolbar as part of the action menu. These are displayed as icons
      * or text on the right side of the widget. If they don't fit they are placed in an 'overflow'
diff --git a/Libraries/Components/Touchable/TouchableHighlight.js b/Libraries/Components/Touchable/TouchableHighlight.js
index 4651d9416842c2..ee0d056b22f22b 100644
--- a/Libraries/Components/Touchable/TouchableHighlight.js
+++ b/Libraries/Components/Touchable/TouchableHighlight.js
@@ -23,6 +23,8 @@ var Touchable = require('Touchable');
 var TouchableWithoutFeedback = require('TouchableWithoutFeedback');
 var View = require('View');
 
+const ViewPropTypes = require('ViewPropTypes');
+
 var ensureComponentIsNative = require('ensureComponentIsNative');
 var ensurePositiveDelayProps = require('ensurePositiveDelayProps');
 var keyOf = require('fbjs/lib/keyOf');
@@ -79,7 +81,7 @@ var TouchableHighlight = React.createClass({
      * active.
      */
     underlayColor: ColorPropType,
-    style: View.propTypes.style,
+    style: ViewPropTypes.style,
     /**
      * Called immediately after the underlay is shown
      */
diff --git a/Libraries/Components/ViewPager/ViewPagerAndroid.android.js b/Libraries/Components/ViewPager/ViewPagerAndroid.android.js
index 7345901cf22f47..be70e5a12517a7 100644
--- a/Libraries/Components/ViewPager/ViewPagerAndroid.android.js
+++ b/Libraries/Components/ViewPager/ViewPagerAndroid.android.js
@@ -14,7 +14,7 @@
 var React = require('React');
 var ReactNative = require('ReactNative');
 var UIManager = require('UIManager');
-var View = require('View');
+const ViewPropTypes = require('ViewPropTypes');
 
 var dismissKeyboard = require('dismissKeyboard');
 var requireNativeComponent = require('requireNativeComponent');
@@ -81,7 +81,7 @@ class ViewPagerAndroid extends React.Component {
   };
 
   static propTypes = {
-    ...View.propTypes,
+    ...ViewPropTypes,
     /**
      * Index of initial page that should be selected. Use `setPage` method to
      * update the page, and `onPageSelected` to monitor page changes
diff --git a/Libraries/Components/WebView/WebView.android.js b/Libraries/Components/WebView/WebView.android.js
index 4de8be62dbb289..3bbb58ec5c43e0 100644
--- a/Libraries/Components/WebView/WebView.android.js
+++ b/Libraries/Components/WebView/WebView.android.js
@@ -18,6 +18,8 @@ var StyleSheet = require('StyleSheet');
 var UIManager = require('UIManager');
 var View = require('View');
 
+const ViewPropTypes = require('ViewPropTypes');
+
 var deprecatedPropType = require('deprecatedPropType');
 var keyMirror = require('fbjs/lib/keyMirror');
 var requireNativeComponent = require('requireNativeComponent');
@@ -46,7 +48,7 @@ var defaultRenderLoading = () => (
  */
 class WebView extends React.Component {
   static propTypes = {
-    ...View.propTypes,
+    ...ViewPropTypes,
     renderError: PropTypes.func,
     renderLoading: PropTypes.func,
     onLoad: PropTypes.func,
@@ -59,7 +61,7 @@ class WebView extends React.Component {
     onMessage: PropTypes.func,
     onContentSizeChange: PropTypes.func,
     startInLoadingState: PropTypes.bool, // force WebView to show loadingView on first load
-    style: View.propTypes.style,
+    style: ViewPropTypes.style,
 
     html: deprecatedPropType(
       PropTypes.string,
diff --git a/Libraries/Components/WebView/WebView.ios.js b/Libraries/Components/WebView/WebView.ios.js
index 96488b2c3ccd92..eae1ed6f6f2ee7 100644
--- a/Libraries/Components/WebView/WebView.ios.js
+++ b/Libraries/Components/WebView/WebView.ios.js
@@ -19,6 +19,7 @@ var StyleSheet = require('StyleSheet');
 var Text = require('Text');
 var UIManager = require('UIManager');
 var View = require('View');
+const ViewPropTypes = require('ViewPropTypes');
 var ScrollView = require('ScrollView');
 
 var deprecatedPropType = require('deprecatedPropType');
@@ -117,7 +118,7 @@ class WebView extends React.Component {
   static NavigationType = NavigationType;
 
   static propTypes = {
-    ...View.propTypes,
+    ...ViewPropTypes,
 
     html: deprecatedPropType(
       PropTypes.string,
@@ -253,7 +254,7 @@ class WebView extends React.Component {
     /**
      * The style to apply to the `WebView`.
      */
-    style: View.propTypes.style,
+    style: ViewPropTypes.style,
 
     /**
      * Determines the types of data converted to clickable URLs in the web view’s content.
diff --git a/Libraries/CustomComponents/Navigator/Navigator.js b/Libraries/CustomComponents/Navigator/Navigator.js
index 105e7281a0881e..5f4b05ad26fde4 100644
--- a/Libraries/CustomComponents/Navigator/Navigator.js
+++ b/Libraries/CustomComponents/Navigator/Navigator.js
@@ -29,7 +29,7 @@
  *
  * @providesModule Navigator
  */
- /* eslint-disable no-extra-boolean-cast*/
+/* eslint-disable no-extra-boolean-cast*/
 'use strict';
 
 var AnimationsDebugModule = require('NativeModules').AnimationsDebugModule;
@@ -47,6 +47,8 @@ var TVEventHandler = require('TVEventHandler');
 var TimerMixin = require('react-timer-mixin');
 var View = require('View');
 
+const ViewPropTypes = require('ViewPropTypes');
+
 var clamp = require('clamp');
 var flattenStyle = require('flattenStyle');
 var invariant = require('fbjs/lib/invariant');
@@ -385,7 +387,7 @@ var Navigator = React.createClass({
     /**
      * Styles to apply to the container of each scene.
      */
-    sceneStyle: View.propTypes.style,
+    sceneStyle: ViewPropTypes.style,
   },
 
   statics: {
diff --git a/Libraries/CustomComponents/Navigator/NavigatorBreadcrumbNavigationBar.js b/Libraries/CustomComponents/Navigator/NavigatorBreadcrumbNavigationBar.js
index c75f3f7b3f3857..7ddeafda2c6628 100644
--- a/Libraries/CustomComponents/Navigator/NavigatorBreadcrumbNavigationBar.js
+++ b/Libraries/CustomComponents/Navigator/NavigatorBreadcrumbNavigationBar.js
@@ -39,6 +39,8 @@ const React = require('React');
 const StyleSheet = require('StyleSheet');
 const View = require('View');
 
+const ViewPropTypes = require('ViewPropTypes');
+
 const guid = require('guid');
 const invariant = require('fbjs/lib/invariant');
 
@@ -99,7 +101,7 @@ class NavigatorBreadcrumbNavigationBar extends React.Component {
       routeStack: React.PropTypes.arrayOf(React.PropTypes.object),
       presentedIndex: React.PropTypes.number,
     }),
-    style: View.propTypes.style,
+    style: ViewPropTypes.style,
   };
 
   static Styles = NavigatorBreadcrumbNavigationBarStyles;
diff --git a/Libraries/CustomComponents/Navigator/NavigatorNavigationBar.js b/Libraries/CustomComponents/Navigator/NavigatorNavigationBar.js
index 7a39b18213f323..9df140d45df79d 100644
--- a/Libraries/CustomComponents/Navigator/NavigatorNavigationBar.js
+++ b/Libraries/CustomComponents/Navigator/NavigatorNavigationBar.js
@@ -33,6 +33,8 @@ var Platform = require('Platform');
 var StyleSheet = require('StyleSheet');
 var View = require('View');
 
+const ViewPropTypes = require('ViewPropTypes');
+
 var guid = require('guid');
 
 var { Map } = require('immutable');
@@ -63,7 +65,7 @@ class NavigatorNavigationBar extends React.Component {
       presentedIndex: React.PropTypes.number,
     }),
     navigationStyles: React.PropTypes.object,
-    style: View.propTypes.style,
+    style: ViewPropTypes.style,
   };
 
   static Styles = NavigatorNavigationBarStyles;
diff --git a/Libraries/Experimental/IncrementalPresenter.js b/Libraries/Experimental/IncrementalPresenter.js
index 50d4d56b0dc1b0..90c31fda2333eb 100644
--- a/Libraries/Experimental/IncrementalPresenter.js
+++ b/Libraries/Experimental/IncrementalPresenter.js
@@ -15,6 +15,8 @@ const IncrementalGroup = require('IncrementalGroup');
 const React = require('React');
 const View = require('View');
 
+const ViewPropTypes = require('ViewPropTypes');
+
 import type {Context} from 'Incremental';
 
 /**
@@ -47,7 +49,7 @@ class IncrementalPresenter extends React.Component {
     disabled: React.PropTypes.bool,
     onDone: React.PropTypes.func,
     onLayout: React.PropTypes.func,
-    style: View.propTypes.style,
+    style: ViewPropTypes.style,
   };
   static contextTypes = {
     incrementalGroup: React.PropTypes.object,
diff --git a/Libraries/Experimental/SwipeableRow/SwipeableQuickActionButton.js b/Libraries/Experimental/SwipeableRow/SwipeableQuickActionButton.js
index b1d9ff2b21978a..5681011fcd10b8 100644
--- a/Libraries/Experimental/SwipeableRow/SwipeableQuickActionButton.js
+++ b/Libraries/Experimental/SwipeableRow/SwipeableQuickActionButton.js
@@ -29,6 +29,8 @@ const Text = require('Text');
 const TouchableHighlight = require('TouchableHighlight');
 const View = require('View');
 
+const ViewPropTypes = require('ViewPropTypes');
+
 const {PropTypes} = React;
 
 import type {ImageSource} from 'ImageSource';
@@ -55,7 +57,7 @@ class SwipeableQuickActionButton extends React.Component {
     imageSource: Image.propTypes.source.isRequired,
     imageStyle: Image.propTypes.style,
     onPress: PropTypes.func,
-    style: View.propTypes.style,
+    style: ViewPropTypes.style,
     testID: PropTypes.string,
     text: PropTypes.string,
     textStyle: Text.propTypes.style,
diff --git a/Libraries/Experimental/SwipeableRow/SwipeableQuickActions.js b/Libraries/Experimental/SwipeableRow/SwipeableQuickActions.js
index d13914cb5051f3..94dcc0090ad578 100644
--- a/Libraries/Experimental/SwipeableRow/SwipeableQuickActions.js
+++ b/Libraries/Experimental/SwipeableRow/SwipeableQuickActions.js
@@ -27,6 +27,8 @@ const React = require('React');
 const StyleSheet = require('StyleSheet');
 const View = require('View');
 
+const ViewPropTypes = require('ViewPropTypes');
+
 /**
  * A thin wrapper around standard quick action buttons that can, if the user
  * chooses, be used with SwipeableListView. Sample usage is as follows, in the
@@ -41,7 +43,7 @@ class SwipeableQuickActions extends React.Component {
   props: {style?: $FlowFixMe};
 
   static propTypes = {
-    style: View.propTypes.style,
+    style: ViewPropTypes.style,
   };
 
   render(): React.Element<any> {
diff --git a/Libraries/Image/Image.android.js b/Libraries/Image/Image.android.js
index 7d4a7752d3b56f..dea4fac5422598 100644
--- a/Libraries/Image/Image.android.js
+++ b/Libraries/Image/Image.android.js
@@ -22,6 +22,7 @@ var Set = require('Set');
 var StyleSheet = require('StyleSheet');
 var StyleSheetPropType = require('StyleSheetPropType');
 var View = require('View');
+const ViewPropTypes = require('ViewPropTypes');
 var ViewStylePropTypes = require('ViewStylePropTypes');
 
 var filterObject = require('fbjs/lib/filterObject');
@@ -78,7 +79,7 @@ var ImageSpecificStyleKeys = new Set(Object.keys(ImageStylePropTypes).filter(x =
 
 var Image = React.createClass({
   propTypes: {
-    ...View.propTypes,
+    ...ViewPropTypes,
     style: StyleSheetPropType(ImageStylePropTypes),
    /**
      * `uri` is a string representing the resource identifier for the image, which
diff --git a/Libraries/RCTTest/SnapshotViewIOS.ios.js b/Libraries/RCTTest/SnapshotViewIOS.ios.js
index f14ef0a7d547e1..892f1e2a7b1176 100644
--- a/Libraries/RCTTest/SnapshotViewIOS.ios.js
+++ b/Libraries/RCTTest/SnapshotViewIOS.ios.js
@@ -17,6 +17,8 @@ var { TestModule } = require('NativeModules');
 var UIManager = require('UIManager');
 var View = require('View');
 
+const ViewPropTypes = require('ViewPropTypes');
+
 var requireNativeComponent = require('requireNativeComponent');
 
 class SnapshotViewIOS extends React.Component {
@@ -27,7 +29,7 @@ class SnapshotViewIOS extends React.Component {
 
   // $FlowFixMe(>=0.41.0)
   static propTypes = {
-    ...View.propTypes,
+    ...ViewPropTypes,
     // A callback when the Snapshot view is ready to be compared
     onSnapshotReady : React.PropTypes.func,
     // A name to identify the individual instance to the SnapshotView

From ff7fb6efda0418752302cfa461ade600e636943b Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieterdb@fb.com>
Date: Fri, 24 Mar 2017 04:48:36 -0700
Subject: [PATCH 178/366] Allow overrides of NativeModules

Reviewed By: mhorowitz

Differential Revision: D4764126

fbshipit-source-id: 036f848f8b3debbb3cc4a34fc99044304615760e
---
 ReactCommon/cxxreact/JSCNativeModules.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ReactCommon/cxxreact/JSCNativeModules.cpp b/ReactCommon/cxxreact/JSCNativeModules.cpp
index 105873cfd9fbc8..f55e0049736efb 100644
--- a/ReactCommon/cxxreact/JSCNativeModules.cpp
+++ b/ReactCommon/cxxreact/JSCNativeModules.cpp
@@ -12,7 +12,7 @@ JSCNativeModules::JSCNativeModules(std::shared_ptr<ModuleRegistry> moduleRegistr
 
 JSValueRef JSCNativeModules::getModule(JSContextRef context, JSStringRef jsName) {
   if (!m_moduleRegistry) {
-    return Value::makeUndefined(context);
+    return nullptr;
   }
 
   std::string moduleName = String::ref(context, jsName).str();
@@ -24,7 +24,8 @@ JSValueRef JSCNativeModules::getModule(JSContextRef context, JSStringRef jsName)
 
   auto module = createModule(moduleName, context);
   if (!module.hasValue()) {
-    return Value::makeUndefined(context);
+    // Allow lookup to continue in the objects own properties, which allows for overrides of NativeModules
+    return nullptr;
   }
 
   // Protect since we'll be holding on to this value, even though JS may not

From 893689c82b4869b7ccaaa5f2a645a85259c96033 Mon Sep 17 00:00:00 2001
From: "Andrew Y. Chen" <ayc@fb.com>
Date: Fri, 24 Mar 2017 08:41:01 -0700
Subject: [PATCH 179/366] Fix buck build

Reviewed By: AaaChiuuu

Differential Revision: D4768765

fbshipit-source-id: 91e34faa2fe864b9a9835e6dab07c8396477505f
---
 .../src/androidTest/java/com/facebook/react/testing/BUCK     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
index 33a71555d41223..1a885e2c04f30e 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
@@ -4,7 +4,10 @@ android_library(
     name = "testing",
     srcs = glob(
         ["**/*.java"],
-        excludes = ["idledetection/**/*.java"],
+        excludes = [
+            "idledetection/**/*.java",
+            "network/**/*.java",
+        ],
     ),
     visibility = [
         "PUBLIC",

From 3f46e591ff3e661ada68c15519a0dba13a81ecde Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieterdb@fb.com>
Date: Fri, 24 Mar 2017 09:22:32 -0700
Subject: [PATCH 180/366] Fix crash when overriding native modules on
 RCTJSCExecutor

Reviewed By: alexeylang

Differential Revision: D4769955

fbshipit-source-id: 20f4f4c469eafbe2c7a81ad9f5b9a8386195a8ac
---
 Libraries/BatchedBridge/NativeModules.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Libraries/BatchedBridge/NativeModules.js b/Libraries/BatchedBridge/NativeModules.js
index 071f04f742bd82..3fa30bc8a94c09 100644
--- a/Libraries/BatchedBridge/NativeModules.js
+++ b/Libraries/BatchedBridge/NativeModules.js
@@ -13,7 +13,6 @@
 
 const BatchedBridge = require('BatchedBridge');
 
-const defineLazyObjectProperty = require('defineLazyObjectProperty');
 const invariant = require('fbjs/lib/invariant');
 
 type ModuleConfig = [
@@ -125,6 +124,7 @@ if (global.nativeModuleProxy) {
   const bridgeConfig = global.__fbBatchedBridgeConfig;
   invariant(bridgeConfig, '__fbBatchedBridgeConfig is not set, cannot invoke native modules');
 
+  const defineLazyObjectProperty = require('defineLazyObjectProperty');
   (bridgeConfig.remoteModuleConfig || []).forEach((config: ModuleConfig, moduleID: number) => {
     // Initially this config will only contain the module name when running in JSC. The actual
     // configuration of the module will be lazily loaded.

From 820c8e2466aeb852bd9eac1836801248f202d230 Mon Sep 17 00:00:00 2001
From: "Andrew Y. Chen" <ayc@fb.com>
Date: Fri, 24 Mar 2017 11:11:04 -0700
Subject: [PATCH 181/366] Instrumentation test for PokesDashboardApp

Reviewed By: AaaChiuuu

Differential Revision: D4758149

fbshipit-source-id: 17e448d44af4deccc288738d294146a612d5e9c3
---
 .../src/androidTest/java/com/facebook/react/testing/BUCK   | 1 +
 .../java/com/facebook/react/testing/network/BUCK           | 1 +
 .../react/testing/network/NetworkRecordingModuleMock.java  | 7 +++++++
 3 files changed, 9 insertions(+)

diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
index 1a885e2c04f30e..bb7c09790294af 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
@@ -26,6 +26,7 @@ android_library(
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/cxxbridge:bridge"),
         react_native_target("java/com/facebook/react/devsupport:interfaces"),
+        react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/module/model:model"),
         react_native_target("java/com/facebook/react/modules/core:core"),
         react_native_target("java/com/facebook/react/modules/debug:interfaces"),
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/BUCK
index 860ac4448837f0..edd32f26896d21 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/BUCK
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/BUCK
@@ -10,6 +10,7 @@ android_library(
         react_native_dep("third-party/android/support/v4:lib-support-v4"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_target("java/com/facebook/react/bridge:bridge"),
+        react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/modules/core:core"),
     ],
 )
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/NetworkRecordingModuleMock.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/NetworkRecordingModuleMock.java
index bf1b4e232db507..a7bcd8337ab89e 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/NetworkRecordingModuleMock.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/NetworkRecordingModuleMock.java
@@ -19,12 +19,14 @@
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 
 /**
  * Mock Networking module that records last request received by {@link #sendRequest} method and
  * returns reponse code and body that should be set with {@link #setResponse}
  */
+@ReactModule(name = "Networking", canOverrideExistingModule = true)
 public class NetworkRecordingModuleMock extends ReactContextBaseJavaModule {
 
   public int mRequestCount = 0;
@@ -108,6 +110,11 @@ public void abortRequest(int requestId) {
     mAbortedRequest = true;
   }
 
+  @Override
+  public boolean canOverrideExistingModule() {
+    return true;
+  }
+
   private void onDataReceived(int requestId, String data) {
     WritableArray args = Arguments.createArray();
     args.pushInt(requestId);

From d2fc08d33b2c89812d1871f8b786d666207ed362 Mon Sep 17 00:00:00 2001
From: Lee Byron <leebyron@fb.com>
Date: Fri, 24 Mar 2017 11:21:04 -0700
Subject: [PATCH 182/366] Move classic relay into oss packages

Reviewed By: kassens

Differential Revision: D4769497

fbshipit-source-id: 0144456a82c3969b399a4a0b37814b5627d191c5
---
 packager/blacklist.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packager/blacklist.js b/packager/blacklist.js
index 3ae74047c60a7e..c36526e902bccd 100644
--- a/packager/blacklist.js
+++ b/packager/blacklist.js
@@ -18,7 +18,7 @@ var sharedBlacklist = [
   /website\/node_modules\/.*/,
 
   // TODO(jkassens, #9876132): Remove this rule when it's no longer needed.
-  'Libraries/Relay/relay/tools/relayUnstableBatchedUpdates.js',
+  'Libraries/Relay/oss/react-relay/classic/tools/relayUnstableBatchedUpdates.js',
 
   /heapCapture\/bundle\.js/,
 ];

From 77d52fecbe6b7bbb602dd0a4983fd26dd56bc693 Mon Sep 17 00:00:00 2001
From: Eric Vicenti <evv@fb.com>
Date: Fri, 24 Mar 2017 14:09:17 -0700
Subject: [PATCH 183/366] Remove old examples from RN repo

Summary:
React Native originally shipped with these examples, which have gotten super old and unmaintained.

Cruft like this in the core repo only slows us down with extra issues and pull requests. Eventually we may create a different repo for samples that will be maintained into the future.

We are doing some spring cleaning in the repo, so now is a good time to remove these and let the community share their own examples.
Closes https://github.com/facebook/react-native/pull/13064

Differential Revision: D4770699

Pulled By: ericvicenti

fbshipit-source-id: bbcdec336b28e5a9330afbdb6b166e94e15fa485
---
 Examples/2048/2048.xcodeproj/project.pbxproj  | 489 ----------------
 Examples/2048/2048/AppDelegate.h              |  21 -
 Examples/2048/2048/AppDelegate.m              |  39 --
 .../2048/2048/Base.lproj/LaunchScreen.xib     |  41 --
 .../AppIcon.appiconset/Contents.json          |  38 --
 Examples/2048/2048/Info.plist                 |  43 --
 Examples/2048/2048/main.m                     |  23 -
 Examples/2048/Game2048.js                     | 325 -----------
 Examples/2048/GameBoard.js                    | 201 -------
 Examples/Movies/MovieCell.js                  | 105 ----
 Examples/Movies/MovieScreen.js                | 165 ------
 .../Movies/Movies.xcodeproj/project.pbxproj   | 520 ------------------
 .../xcshareddata/xcschemes/Movies.xcscheme    | 105 ----
 Examples/Movies/Movies/AppDelegate.h          |  22 -
 Examples/Movies/Movies/AppDelegate.m          |  51 --
 .../Movies/Movies/Base.lproj/LaunchScreen.xib |  41 --
 .../AppIcon.appiconset/Contents.json          |  38 --
 Examples/Movies/Movies/Info.plist             |  56 --
 Examples/Movies/Movies/main.m                 |  22 -
 Examples/Movies/MoviesApp.android.js          | 108 ----
 Examples/Movies/MoviesApp.ios.js              |  52 --
 Examples/Movies/README.md                     |  57 --
 Examples/Movies/SearchBar.android.js          | 113 ----
 Examples/Movies/SearchBar.ios.js              |  67 ---
 Examples/Movies/SearchScreen.js               | 370 -------------
 .../Movies/__tests__/getImageSource-test.js   |  36 --
 Examples/Movies/android/app/BUCK              |  31 --
 Examples/Movies/android/app/build.gradle      |  31 --
 Examples/Movies/android/app/gradle.properties |   1 -
 .../Movies/android/app/proguard-rules.pro     |  17 -
 .../android/app/src/main/AndroidManifest.xml  |  30 -
 .../facebook/react/movies/MoviesActivity.java |  23 -
 .../react/movies/MoviesApplication.java       |  58 --
 .../res/drawable-hdpi/android_back_white.png  | Bin 237 -> 0 bytes
 .../drawable-hdpi/android_search_white.png    | Bin 575 -> 0 bytes
 .../res/drawable-mdpi/android_back_white.png  | Bin 190 -> 0 bytes
 .../drawable-mdpi/android_search_white.png    | Bin 337 -> 0 bytes
 .../res/drawable-xhdpi/android_back_white.png | Bin 266 -> 0 bytes
 .../drawable-xhdpi/android_search_white.png   | Bin 581 -> 0 bytes
 .../drawable-xxhdpi/android_back_white.png    | Bin 337 -> 0 bytes
 .../drawable-xxhdpi/android_search_white.png  | Bin 930 -> 0 bytes
 .../res/drawable/rotten_tomatoes_icon.png     | Bin 58467 -> 0 bytes
 .../app/src/main/res/layout/activity_main.xml |  12 -
 .../app/src/main/res/values/strings.xml       |   3 -
 .../app/src/main/res/values/styles.xml        |   8 -
 Examples/Movies/getImageSource.js             |  27 -
 Examples/Movies/getStyleFromScore.js          |  49 --
 Examples/Movies/getTextFromScore.js           |  23 -
 .../TicTacToe.xcodeproj/project.pbxproj       | 518 -----------------
 .../xcshareddata/xcschemes/TicTacToe.xcscheme | 105 ----
 Examples/TicTacToe/TicTacToe/AppDelegate.h    |  21 -
 Examples/TicTacToe/TicTacToe/AppDelegate.m    |  39 --
 .../TicTacToe/Base.lproj/LaunchScreen.xib     |  41 --
 .../AppIcon.appiconset/Contents.json          |  38 --
 Examples/TicTacToe/TicTacToe/Info.plist       |  46 --
 Examples/TicTacToe/TicTacToe/main.m           |  22 -
 Examples/TicTacToe/TicTacToeApp.js            | 327 -----------
 Examples/TicTacToe/android/app/BUCK           |  31 --
 Examples/TicTacToe/android/app/build.gradle   |  31 --
 .../TicTacToe/android/app/gradle.properties   |   1 -
 .../TicTacToe/android/app/proguard-rules.pro  |  17 -
 .../android/app/src/main/AndroidManifest.xml  |  30 -
 .../react/tictactoe/TicTacToeActivity.java    |  23 -
 .../react/tictactoe/TicTacToeApplication.java |  58 --
 .../src/main/res/drawable/launcher_icon.png   | Bin 9578 -> 0 bytes
 .../app/src/main/res/layout/activity_main.xml |  12 -
 .../app/src/main/res/values/strings.xml       |   3 -
 .../app/src/main/res/values/styles.xml        |   8 -
 68 files changed, 4832 deletions(-)
 delete mode 100644 Examples/2048/2048.xcodeproj/project.pbxproj
 delete mode 100644 Examples/2048/2048/AppDelegate.h
 delete mode 100644 Examples/2048/2048/AppDelegate.m
 delete mode 100644 Examples/2048/2048/Base.lproj/LaunchScreen.xib
 delete mode 100644 Examples/2048/2048/Images.xcassets/AppIcon.appiconset/Contents.json
 delete mode 100644 Examples/2048/2048/Info.plist
 delete mode 100644 Examples/2048/2048/main.m
 delete mode 100644 Examples/2048/Game2048.js
 delete mode 100644 Examples/2048/GameBoard.js
 delete mode 100644 Examples/Movies/MovieCell.js
 delete mode 100644 Examples/Movies/MovieScreen.js
 delete mode 100644 Examples/Movies/Movies.xcodeproj/project.pbxproj
 delete mode 100644 Examples/Movies/Movies.xcodeproj/xcshareddata/xcschemes/Movies.xcscheme
 delete mode 100644 Examples/Movies/Movies/AppDelegate.h
 delete mode 100644 Examples/Movies/Movies/AppDelegate.m
 delete mode 100644 Examples/Movies/Movies/Base.lproj/LaunchScreen.xib
 delete mode 100644 Examples/Movies/Movies/Images.xcassets/AppIcon.appiconset/Contents.json
 delete mode 100644 Examples/Movies/Movies/Info.plist
 delete mode 100644 Examples/Movies/Movies/main.m
 delete mode 100644 Examples/Movies/MoviesApp.android.js
 delete mode 100644 Examples/Movies/MoviesApp.ios.js
 delete mode 100644 Examples/Movies/README.md
 delete mode 100644 Examples/Movies/SearchBar.android.js
 delete mode 100644 Examples/Movies/SearchBar.ios.js
 delete mode 100644 Examples/Movies/SearchScreen.js
 delete mode 100644 Examples/Movies/__tests__/getImageSource-test.js
 delete mode 100644 Examples/Movies/android/app/BUCK
 delete mode 100644 Examples/Movies/android/app/build.gradle
 delete mode 100644 Examples/Movies/android/app/gradle.properties
 delete mode 100644 Examples/Movies/android/app/proguard-rules.pro
 delete mode 100644 Examples/Movies/android/app/src/main/AndroidManifest.xml
 delete mode 100644 Examples/Movies/android/app/src/main/java/com/facebook/react/movies/MoviesActivity.java
 delete mode 100644 Examples/Movies/android/app/src/main/java/com/facebook/react/movies/MoviesApplication.java
 delete mode 100644 Examples/Movies/android/app/src/main/res/drawable-hdpi/android_back_white.png
 delete mode 100755 Examples/Movies/android/app/src/main/res/drawable-hdpi/android_search_white.png
 delete mode 100644 Examples/Movies/android/app/src/main/res/drawable-mdpi/android_back_white.png
 delete mode 100755 Examples/Movies/android/app/src/main/res/drawable-mdpi/android_search_white.png
 delete mode 100644 Examples/Movies/android/app/src/main/res/drawable-xhdpi/android_back_white.png
 delete mode 100755 Examples/Movies/android/app/src/main/res/drawable-xhdpi/android_search_white.png
 delete mode 100644 Examples/Movies/android/app/src/main/res/drawable-xxhdpi/android_back_white.png
 delete mode 100755 Examples/Movies/android/app/src/main/res/drawable-xxhdpi/android_search_white.png
 delete mode 100644 Examples/Movies/android/app/src/main/res/drawable/rotten_tomatoes_icon.png
 delete mode 100644 Examples/Movies/android/app/src/main/res/layout/activity_main.xml
 delete mode 100644 Examples/Movies/android/app/src/main/res/values/strings.xml
 delete mode 100644 Examples/Movies/android/app/src/main/res/values/styles.xml
 delete mode 100644 Examples/Movies/getImageSource.js
 delete mode 100644 Examples/Movies/getStyleFromScore.js
 delete mode 100644 Examples/Movies/getTextFromScore.js
 delete mode 100644 Examples/TicTacToe/TicTacToe.xcodeproj/project.pbxproj
 delete mode 100644 Examples/TicTacToe/TicTacToe.xcodeproj/xcshareddata/xcschemes/TicTacToe.xcscheme
 delete mode 100644 Examples/TicTacToe/TicTacToe/AppDelegate.h
 delete mode 100644 Examples/TicTacToe/TicTacToe/AppDelegate.m
 delete mode 100644 Examples/TicTacToe/TicTacToe/Base.lproj/LaunchScreen.xib
 delete mode 100644 Examples/TicTacToe/TicTacToe/Images.xcassets/AppIcon.appiconset/Contents.json
 delete mode 100644 Examples/TicTacToe/TicTacToe/Info.plist
 delete mode 100644 Examples/TicTacToe/TicTacToe/main.m
 delete mode 100755 Examples/TicTacToe/TicTacToeApp.js
 delete mode 100644 Examples/TicTacToe/android/app/BUCK
 delete mode 100644 Examples/TicTacToe/android/app/build.gradle
 delete mode 100644 Examples/TicTacToe/android/app/gradle.properties
 delete mode 100644 Examples/TicTacToe/android/app/proguard-rules.pro
 delete mode 100644 Examples/TicTacToe/android/app/src/main/AndroidManifest.xml
 delete mode 100644 Examples/TicTacToe/android/app/src/main/java/com/facebook/react/tictactoe/TicTacToeActivity.java
 delete mode 100644 Examples/TicTacToe/android/app/src/main/java/com/facebook/react/tictactoe/TicTacToeApplication.java
 delete mode 100644 Examples/TicTacToe/android/app/src/main/res/drawable/launcher_icon.png
 delete mode 100644 Examples/TicTacToe/android/app/src/main/res/layout/activity_main.xml
 delete mode 100644 Examples/TicTacToe/android/app/src/main/res/values/strings.xml
 delete mode 100644 Examples/TicTacToe/android/app/src/main/res/values/styles.xml

diff --git a/Examples/2048/2048.xcodeproj/project.pbxproj b/Examples/2048/2048.xcodeproj/project.pbxproj
deleted file mode 100644
index e463eeae8f18ee..00000000000000
--- a/Examples/2048/2048.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,489 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 46;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
-		13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; };
-		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
-		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
-		1461632D1AC3E23900C2F5AD /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1461632C1AC3E22900C2F5AD /* libReact.a */; };
-		5F82F1781B85785200FAE87E /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5F82F1771B85784500FAE87E /* libRCTWebSocket.a */; };
-		832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
-		E730D7501D4EE4E2000B7DA8 /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E730D74C1D4EE4D0000B7DA8 /* libRCTNetwork.a */; };
-		E730D7571D4EE538000B7DA8 /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E730D7561D4EE534000B7DA8 /* libRCTImage.a */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXContainerItemProxy section */
-		1461632B1AC3E22900C2F5AD /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 146163271AC3E22900C2F5AD /* React.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 83CBBA2E1A601D0E00E9B192;
-			remoteInfo = React;
-		};
-		5F82F1761B85784500FAE87E /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 5F82F1721B85784500FAE87E /* RCTWebSocket.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 3C86DF461ADF2C930047B81A;
-			remoteInfo = RCTWebSocket;
-		};
-		832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 58B5119B1A9E6C1200147676;
-			remoteInfo = RCTText;
-		};
-		E730D74B1D4EE4D0000B7DA8 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = E730D7471D4EE4D0000B7DA8 /* RCTNetwork.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 58B511DB1A9E6C8500147676;
-			remoteInfo = RCTNetwork;
-		};
-		E730D7551D4EE534000B7DA8 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = E730D7511D4EE534000B7DA8 /* RCTImage.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 58B5115D1A9E6B3D00147676;
-			remoteInfo = RCTImage;
-		};
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXFileReference section */
-		13B07F961A680F5B00A75B9A /* 2048.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = 2048.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = 2048/AppDelegate.h; sourceTree = "<group>"; };
-		13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = 2048/AppDelegate.m; sourceTree = "<group>"; };
-		13B07FB21A68108700A75B9A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
-		13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = 2048/Images.xcassets; sourceTree = "<group>"; };
-		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = 2048/Info.plist; sourceTree = "<group>"; };
-		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = 2048/main.m; sourceTree = "<group>"; };
-		146163271AC3E22900C2F5AD /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = ../../React/React.xcodeproj; sourceTree = "<group>"; };
-		5F82F1721B85784500FAE87E /* RCTWebSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocket.xcodeproj; path = ../../Libraries/WebSocket/RCTWebSocket.xcodeproj; sourceTree = "<group>"; };
-		832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = ../../Libraries/Text/RCTText.xcodeproj; sourceTree = "<group>"; };
-		E730D7471D4EE4D0000B7DA8 /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = ../../Libraries/Network/RCTNetwork.xcodeproj; sourceTree = "<group>"; };
-		E730D7511D4EE534000B7DA8 /* RCTImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTImage.xcodeproj; path = ../../Libraries/Image/RCTImage.xcodeproj; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		13B07F8C1A680F5B00A75B9A /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				E730D7571D4EE538000B7DA8 /* libRCTImage.a in Frameworks */,
-				E730D7501D4EE4E2000B7DA8 /* libRCTNetwork.a in Frameworks */,
-				5F82F1781B85785200FAE87E /* libRCTWebSocket.a in Frameworks */,
-				1461632D1AC3E23900C2F5AD /* libReact.a in Frameworks */,
-				832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		13B07FAE1A68108700A75B9A /* 2048 */ = {
-			isa = PBXGroup;
-			children = (
-				13B07FAF1A68108700A75B9A /* AppDelegate.h */,
-				13B07FB01A68108700A75B9A /* AppDelegate.m */,
-				13B07FB51A68108700A75B9A /* Images.xcassets */,
-				13B07FB61A68108700A75B9A /* Info.plist */,
-				13B07FB11A68108700A75B9A /* LaunchScreen.xib */,
-				13B07FB71A68108700A75B9A /* main.m */,
-			);
-			name = 2048;
-			sourceTree = "<group>";
-		};
-		146163281AC3E22900C2F5AD /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				1461632C1AC3E22900C2F5AD /* libReact.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		5F82F1731B85784500FAE87E /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				5F82F1771B85784500FAE87E /* libRCTWebSocket.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		832341AE1AAA6A7D00B99B32 /* Libraries */ = {
-			isa = PBXGroup;
-			children = (
-				E730D7511D4EE534000B7DA8 /* RCTImage.xcodeproj */,
-				E730D7471D4EE4D0000B7DA8 /* RCTNetwork.xcodeproj */,
-				5F82F1721B85784500FAE87E /* RCTWebSocket.xcodeproj */,
-				146163271AC3E22900C2F5AD /* React.xcodeproj */,
-				832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */,
-			);
-			name = Libraries;
-			sourceTree = "<group>";
-		};
-		832341B11AAA6A8300B99B32 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				832341B51AAA6A8300B99B32 /* libRCTText.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		83CBB9F61A601CBA00E9B192 = {
-			isa = PBXGroup;
-			children = (
-				13B07FAE1A68108700A75B9A /* 2048 */,
-				832341AE1AAA6A7D00B99B32 /* Libraries */,
-				83CBBA001A601CBA00E9B192 /* Products */,
-			);
-			indentWidth = 2;
-			sourceTree = "<group>";
-			tabWidth = 2;
-		};
-		83CBBA001A601CBA00E9B192 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				13B07F961A680F5B00A75B9A /* 2048.app */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		E730D7481D4EE4D0000B7DA8 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				E730D74C1D4EE4D0000B7DA8 /* libRCTNetwork.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		E730D7521D4EE534000B7DA8 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				E730D7561D4EE534000B7DA8 /* libRCTImage.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		13B07F861A680F5B00A75B9A /* 2048 */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "2048" */;
-			buildPhases = (
-				13B07F871A680F5B00A75B9A /* Sources */,
-				13B07F8C1A680F5B00A75B9A /* Frameworks */,
-				13B07F8E1A680F5B00A75B9A /* Resources */,
-				68ACCCD51D2BE2D2008E368A /* Run Script */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = 2048;
-			productName = "Hello World";
-			productReference = 13B07F961A680F5B00A75B9A /* 2048.app */;
-			productType = "com.apple.product-type.application";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		83CBB9F71A601CBA00E9B192 /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastUpgradeCheck = 0700;
-				ORGANIZATIONNAME = Facebook;
-			};
-			buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "2048" */;
-			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				en,
-				Base,
-			);
-			mainGroup = 83CBB9F61A601CBA00E9B192;
-			productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */;
-			projectDirPath = "";
-			projectReferences = (
-				{
-					ProductGroup = E730D7521D4EE534000B7DA8 /* Products */;
-					ProjectRef = E730D7511D4EE534000B7DA8 /* RCTImage.xcodeproj */;
-				},
-				{
-					ProductGroup = E730D7481D4EE4D0000B7DA8 /* Products */;
-					ProjectRef = E730D7471D4EE4D0000B7DA8 /* RCTNetwork.xcodeproj */;
-				},
-				{
-					ProductGroup = 832341B11AAA6A8300B99B32 /* Products */;
-					ProjectRef = 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */;
-				},
-				{
-					ProductGroup = 5F82F1731B85784500FAE87E /* Products */;
-					ProjectRef = 5F82F1721B85784500FAE87E /* RCTWebSocket.xcodeproj */;
-				},
-				{
-					ProductGroup = 146163281AC3E22900C2F5AD /* Products */;
-					ProjectRef = 146163271AC3E22900C2F5AD /* React.xcodeproj */;
-				},
-			);
-			projectRoot = "";
-			targets = (
-				13B07F861A680F5B00A75B9A /* 2048 */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXReferenceProxy section */
-		1461632C1AC3E22900C2F5AD /* libReact.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libReact.a;
-			remoteRef = 1461632B1AC3E22900C2F5AD /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		5F82F1771B85784500FAE87E /* libRCTWebSocket.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libRCTWebSocket.a;
-			remoteRef = 5F82F1761B85784500FAE87E /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		832341B51AAA6A8300B99B32 /* libRCTText.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libRCTText.a;
-			remoteRef = 832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		E730D74C1D4EE4D0000B7DA8 /* libRCTNetwork.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libRCTNetwork.a;
-			remoteRef = E730D74B1D4EE4D0000B7DA8 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		E730D7561D4EE534000B7DA8 /* libRCTImage.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libRCTImage.a;
-			remoteRef = E730D7551D4EE534000B7DA8 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-/* End PBXReferenceProxy section */
-
-/* Begin PBXResourcesBuildPhase section */
-		13B07F8E1A680F5B00A75B9A /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
-				13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXShellScriptBuildPhase section */
-		68ACCCD51D2BE2D2008E368A /* Run Script */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Run Script";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "export NODE_BINARY=node\n$SRCROOT/../../packager/react-native-xcode.sh Examples/2048/Game2048.js\n";
-		};
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		13B07F871A680F5B00A75B9A /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */,
-				13B07FC11A68108700A75B9A /* main.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXVariantGroup section */
-		13B07FB11A68108700A75B9A /* LaunchScreen.xib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				13B07FB21A68108700A75B9A /* Base */,
-			);
-			name = LaunchScreen.xib;
-			path = 2048;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-		13B07F941A680F5B00A75B9A /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					"$(SRCROOT)/../../React/**",
-				);
-				INFOPLIST_FILE = "$(SRCROOT)/2048/Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				OTHER_LDFLAGS = (
-					"-ObjC",
-					"-lc++",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = 2048;
-			};
-			name = Debug;
-		};
-		13B07F951A680F5B00A75B9A /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					"$(SRCROOT)/../../React/**",
-				);
-				INFOPLIST_FILE = "$(SRCROOT)/2048/Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				OTHER_LDFLAGS = (
-					"-ObjC",
-					"-lc++",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = 2048;
-			};
-			name = Release;
-		};
-		83CBBA201A601CBA00E9B192 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_TESTABILITY = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					"$(SRCROOT)/../../React/**",
-				);
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				MTL_ENABLE_DEBUG_INFO = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = iphoneos;
-			};
-			name = Debug;
-		};
-		83CBBA211A601CBA00E9B192 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = YES;
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					"$(SRCROOT)/../../React/**",
-				);
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				SDKROOT = iphoneos;
-				VALIDATE_PRODUCT = YES;
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "2048" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				13B07F941A680F5B00A75B9A /* Debug */,
-				13B07F951A680F5B00A75B9A /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "2048" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				83CBBA201A601CBA00E9B192 /* Debug */,
-				83CBBA211A601CBA00E9B192 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 83CBB9F71A601CBA00E9B192 /* Project object */;
-}
diff --git a/Examples/2048/2048/AppDelegate.h b/Examples/2048/2048/AppDelegate.h
deleted file mode 100644
index 1a4317567ce256..00000000000000
--- a/Examples/2048/2048/AppDelegate.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <UIKit/UIKit.h>
-
-@interface AppDelegate : UIResponder <UIApplicationDelegate>
-
-@property (nonatomic, strong) UIWindow *window;
-
-@end
diff --git a/Examples/2048/2048/AppDelegate.m b/Examples/2048/2048/AppDelegate.m
deleted file mode 100644
index 9e3c01b8111ea0..00000000000000
--- a/Examples/2048/2048/AppDelegate.m
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "AppDelegate.h"
-
-#import "RCTBundleURLProvider.h"
-#import "RCTRootView.h"
-
-@implementation AppDelegate
-
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
-{
-  NSURL *jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"Examples/2048/Game2048" fallbackResource:nil];
-
-  RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation
-                                                      moduleName:@"Game2048"
-                                               initialProperties:nil
-                                                   launchOptions:launchOptions];
-
-  self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-  UIViewController *rootViewController = [UIViewController new];
-  rootViewController.view = rootView;
-  self.window.rootViewController = rootViewController;
-  [self.window makeKeyAndVisible];
-  return YES;
-}
-
-@end
diff --git a/Examples/2048/2048/Base.lproj/LaunchScreen.xib b/Examples/2048/2048/Base.lproj/LaunchScreen.xib
deleted file mode 100644
index 351e21c59ccf27..00000000000000
--- a/Examples/2048/2048/Base.lproj/LaunchScreen.xib
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6254" systemVersion="14C109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6247"/>
-        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB">
-            <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2015 Facebook. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
-                    <rect key="frame" x="20" y="439" width="441" height="21"/>
-                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                    <nil key="highlightedColor"/>
-                </label>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2048" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
-                    <rect key="frame" x="20" y="140" width="441" height="43"/>
-                    <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                    <nil key="highlightedColor"/>
-                </label>
-            </subviews>
-            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-            <constraints>
-                <constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
-                <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
-                <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l"/>
-                <constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0"/>
-                <constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9"/>
-                <constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g"/>
-            </constraints>
-            <nil key="simulatedStatusBarMetrics"/>
-            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <point key="canvasLocation" x="548" y="455"/>
-        </view>
-    </objects>
-</document>
diff --git a/Examples/2048/2048/Images.xcassets/AppIcon.appiconset/Contents.json b/Examples/2048/2048/Images.xcassets/AppIcon.appiconset/Contents.json
deleted file mode 100644
index 118c98f7461bf9..00000000000000
--- a/Examples/2048/2048/Images.xcassets/AppIcon.appiconset/Contents.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "iphone",
-      "size" : "29x29",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "29x29",
-      "scale" : "3x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "40x40",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "40x40",
-      "scale" : "3x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "60x60",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "60x60",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/Examples/2048/2048/Info.plist b/Examples/2048/2048/Info.plist
deleted file mode 100644
index 6105445463d64b..00000000000000
--- a/Examples/2048/2048/Info.plist
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSAllowsArbitraryLoads</key>
-		<true/>
-	</dict>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>armv7</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-</dict>
-</plist>
diff --git a/Examples/2048/2048/main.m b/Examples/2048/2048/main.m
deleted file mode 100644
index b2a6473023a8e2..00000000000000
--- a/Examples/2048/2048/main.m
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <UIKit/UIKit.h>
-
-#import "AppDelegate.h"
-
-int main(int argc, char * argv[]) {
-  @autoreleasepool {
-    return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
-  }
-}
diff --git a/Examples/2048/Game2048.js b/Examples/2048/Game2048.js
deleted file mode 100644
index c19e7cf2deb227..00000000000000
--- a/Examples/2048/Game2048.js
+++ /dev/null
@@ -1,325 +0,0 @@
-/**
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * @providesModule Game2048
- * @flow
- */
-'use strict';
-
-var React = require('react');
-var ReactNative = require('react-native');
-var {
-  AppRegistry,
-  StyleSheet,
-  Text,
-  View,
-} = ReactNative;
-
-var Animated = require('Animated');
-var GameBoard = require('GameBoard');
-var TouchableBounce = require('TouchableBounce');
-
-var BOARD_PADDING = 3;
-var CELL_MARGIN = 4;
-var CELL_SIZE = 60;
-
-class Cell extends React.Component {
-  render() {
-    return <View style={styles.cell} />;
-  }
-}
-
-class Board extends React.Component {
-  render() {
-    return (
-      <View style={styles.board}>
-        <View style={styles.row}><Cell/><Cell/><Cell/><Cell/></View>
-        <View style={styles.row}><Cell/><Cell/><Cell/><Cell/></View>
-        <View style={styles.row}><Cell/><Cell/><Cell/><Cell/></View>
-        <View style={styles.row}><Cell/><Cell/><Cell/><Cell/></View>
-        {this.props.children}
-      </View>
-    );
-  }
-}
-
-class Tile extends React.Component {
-  state: any;
-
-  static _getPosition(index): number {
-    return BOARD_PADDING + (index * (CELL_SIZE + CELL_MARGIN * 2) + CELL_MARGIN);
-  }
-
-  constructor(props: {}) {
-    super(props);
-
-    var tile = this.props.tile;
-
-    this.state = {
-      opacity: new Animated.Value(0),
-      top: new Animated.Value(Tile._getPosition(tile.toRow())),
-      left: new Animated.Value(Tile._getPosition(tile.toColumn())),
-    };
-  }
-
-  calculateOffset(): {top: number; left: number; opacity: number} {
-    var tile = this.props.tile;
-
-    var offset = {
-      top: this.state.top,
-      left: this.state.left,
-      opacity: this.state.opacity,
-    };
-
-    if (tile.isNew()) {
-      Animated.timing(this.state.opacity, {
-        duration: 100,
-        toValue: 1,
-      }).start();
-    } else {
-      Animated.parallel([
-        Animated.timing(offset.top, {
-          duration: 100,
-          toValue: Tile._getPosition(tile.toRow()),
-        }),
-        Animated.timing(offset.left, {
-          duration: 100,
-          toValue: Tile._getPosition(tile.toColumn()),
-        }),
-      ]).start();
-    }
-    return offset;
-  }
-
-  render() {
-    var tile = this.props.tile;
-
-    var tileStyles = [
-      styles.tile,
-      styles['tile' + tile.value],
-      this.calculateOffset(),
-    ];
-
-    var textStyles = [
-      styles.value,
-      tile.value > 4 && styles.whiteText,
-      tile.value > 100 && styles.threeDigits,
-      tile.value > 1000 && styles.fourDigits,
-    ];
-
-    return (
-      <Animated.View style={tileStyles}>
-        <Text style={textStyles}>{tile.value}</Text>
-      </Animated.View>
-    );
-  }
-}
-
-class GameEndOverlay extends React.Component {
-  render() {
-    var board = this.props.board;
-
-    if (!board.hasWon() && !board.hasLost()) {
-      return <View/>;
-    }
-
-    var message = board.hasWon() ?
-      'Good Job!' : 'Game Over';
-
-    return (
-      <View style={styles.overlay}>
-        <Text style={styles.overlayMessage}>{message}</Text>
-        <TouchableBounce onPress={this.props.onRestart} style={styles.tryAgain}>
-          <Text style={styles.tryAgainText}>Try Again?</Text>
-        </TouchableBounce>
-      </View>
-    );
-  }
-}
-
-class Game2048 extends React.Component {
-  startX: number;
-  startY: number;
-  state: any;
-
-  constructor(props: {}) {
-    super(props);
-    this.state = {
-      board: new GameBoard(),
-    };
-    this.startX = 0;
-    this.startY = 0;
-  }
-
-  restartGame() {
-    this.setState({board: new GameBoard()});
-  }
-
-  handleTouchStart(event: Object) {
-    if (this.state.board.hasWon()) {
-      return;
-    }
-
-    this.startX = event.nativeEvent.pageX;
-    this.startY = event.nativeEvent.pageY;
-  }
-
-  handleTouchEnd(event: Object) {
-    if (this.state.board.hasWon()) {
-      return;
-    }
-
-    var deltaX = event.nativeEvent.pageX - this.startX;
-    var deltaY = event.nativeEvent.pageY - this.startY;
-
-    var direction = -1;
-    if (Math.abs(deltaX) > 3 * Math.abs(deltaY) && Math.abs(deltaX) > 30) {
-      direction = deltaX > 0 ? 2 : 0;
-    } else if (Math.abs(deltaY) > 3 * Math.abs(deltaX) && Math.abs(deltaY) > 30) {
-      direction = deltaY > 0 ? 3 : 1;
-    }
-
-    if (direction !== -1) {
-      this.setState({board: this.state.board.move(direction)});
-    }
-  }
-
-  render() {
-    var tiles = this.state.board.tiles
-      .filter((tile) => tile.value)
-      .map((tile) => <Tile ref={tile.id} key={tile.id} tile={tile} />);
-
-    return (
-      <View
-        style={styles.container}
-        onTouchStart={(event) => this.handleTouchStart(event)}
-        onTouchEnd={(event) => this.handleTouchEnd(event)}>
-        <Board>
-          {tiles}
-        </Board>
-        <GameEndOverlay board={this.state.board} onRestart={() => this.restartGame()} />
-      </View>
-    );
-  }
-}
-
-var styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    justifyContent: 'center',
-    alignItems: 'center',
-  },
-  board: {
-    padding: BOARD_PADDING,
-    backgroundColor: '#bbaaaa',
-    borderRadius: 5,
-  },
-  overlay: {
-    position: 'absolute',
-    top: 0,
-    bottom: 0,
-    left: 0,
-    right: 0,
-    backgroundColor: 'rgba(221, 221, 221, 0.5)',
-    flex: 1,
-    flexDirection: 'column',
-    justifyContent: 'center',
-    alignItems: 'center',
-  },
-  overlayMessage: {
-    fontSize: 40,
-    marginBottom: 20,
-  },
-  tryAgain: {
-    backgroundColor: '#887761',
-    padding: 20,
-    borderRadius: 5,
-  },
-  tryAgainText: {
-    color: '#ffffff',
-    fontSize: 20,
-    fontWeight: '500',
-  },
-  cell: {
-    width: CELL_SIZE,
-    height: CELL_SIZE,
-    borderRadius: 5,
-    backgroundColor: '#ddccbb',
-    margin: CELL_MARGIN,
-  },
-  row: {
-    flexDirection: 'row',
-  },
-  tile: {
-    position: 'absolute',
-    width: CELL_SIZE,
-    height: CELL_SIZE,
-    backgroundColor: '#ddccbb',
-    borderRadius: 5,
-    flex: 1,
-    justifyContent: 'center',
-    alignItems: 'center',
-  },
-  value: {
-    fontSize: 24,
-    color: '#776666',
-    fontFamily: 'Verdana',
-    fontWeight: '500',
-  },
-  tile2: {
-    backgroundColor: '#eeeeee',
-  },
-  tile4: {
-    backgroundColor: '#eeeecc',
-  },
-  tile8: {
-    backgroundColor: '#ffbb87',
-  },
-  tile16: {
-    backgroundColor: '#ff9966',
-  },
-  tile32: {
-    backgroundColor: '#ff7755',
-  },
-  tile64: {
-    backgroundColor: '#ff5533',
-  },
-  tile128: {
-    backgroundColor: '#eecc77',
-  },
-  tile256: {
-    backgroundColor: '#eecc66',
-  },
-  tile512: {
-    backgroundColor: '#eecc55',
-  },
-  tile1024: {
-    backgroundColor: '#eecc33',
-  },
-  tile2048: {
-    backgroundColor: '#eecc22',
-  },
-  whiteText: {
-    color: '#ffffff',
-  },
-  threeDigits: {
-    fontSize: 20,
-  },
-  fourDigits: {
-    fontSize: 18,
-  },
-});
-
-AppRegistry.registerComponent('Game2048', () => Game2048);
-
-module.exports = Game2048;
diff --git a/Examples/2048/GameBoard.js b/Examples/2048/GameBoard.js
deleted file mode 100644
index 6ed92e6b578ddf..00000000000000
--- a/Examples/2048/GameBoard.js
+++ /dev/null
@@ -1,201 +0,0 @@
-/**
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * @providesModule GameBoard
- * @flow
- */
-'use strict';
-
-// NB: Taken straight from: https://github.com/IvanVergiliev/2048-react/blob/master/src/board.js
-//     with no modification except to format it for CommonJS and fix lint/flow errors
-
-var rotateLeft = function (matrix) {
-  var rows = matrix.length;
-  var columns = matrix[0].length;
-  var res = [];
-  for (var row = 0; row < rows; ++row) {
-    res.push([]);
-    for (var column = 0; column < columns; ++column) {
-      res[row][column] = matrix[column][columns - row - 1];
-    }
-  }
-  return res;
-};
-
-var Tile = function (value?: number, row?: number, column?: number) {
-  this.value = value || 0;
-  this.row = row || -1;
-
-  this.column = column || -1;
-  this.oldRow = -1;
-  this.oldColumn = -1;
-  this.markForDeletion = false;
-  this.mergedInto = null;
-  this.id = Tile.id++;
-};
-
-Tile.id = 0;
-
-Tile.prototype.moveTo = function (row, column) {
-  this.oldRow = this.row;
-  this.oldColumn = this.column;
-  this.row = row;
-  this.column = column;
-};
-
-Tile.prototype.isNew = function () {
-  return this.oldRow === -1 && !this.mergedInto;
-};
-
-Tile.prototype.hasMoved = function () {
-  return (this.fromRow() !== -1 && (this.fromRow() !== this.toRow() || this.fromColumn() !== this.toColumn())) ||
-    this.mergedInto;
-};
-
-Tile.prototype.fromRow = function () {
-  return this.mergedInto ? this.row : this.oldRow;
-};
-
-Tile.prototype.fromColumn = function () {
-  return this.mergedInto ? this.column : this.oldColumn;
-};
-
-Tile.prototype.toRow = function () {
-  return this.mergedInto ? this.mergedInto.row : this.row;
-};
-
-Tile.prototype.toColumn = function () {
-  return this.mergedInto ? this.mergedInto.column : this.column;
-};
-
-var Board = function () {
-  this.tiles = [];
-  this.cells = [];
-  for (var i = 0; i < Board.size; ++i) {
-    this.cells[i] = [this.addTile(), this.addTile(), this.addTile(), this.addTile()];
-  }
-  this.addRandomTile();
-  this.setPositions();
-  this.won = false;
-};
-
-Board.prototype.addTile = function () {
-  var res = new Tile();
-  Tile.apply(res, arguments);
-  this.tiles.push(res);
-  return res;
-};
-
-Board.size = 4;
-
-Board.prototype.moveLeft = function () {
-  var hasChanged = false;
-  for (var row = 0; row < Board.size; ++row) {
-    var currentRow = this.cells[row].filter(function (tile) { return tile.value !== 0; });
-    var resultRow = [];
-    for (var target = 0; target < Board.size; ++target) {
-      var targetTile = currentRow.length ? currentRow.shift() : this.addTile();
-      if (currentRow.length > 0 && currentRow[0].value === targetTile.value) {
-        var tile1 = targetTile;
-        targetTile = this.addTile(targetTile.value);
-        tile1.mergedInto = targetTile;
-        var tile2 = currentRow.shift();
-        tile2.mergedInto = targetTile;
-        targetTile.value += tile2.value;
-      }
-      resultRow[target] = targetTile;
-      this.won = this.won || (targetTile.value === 2048);
-      hasChanged = hasChanged || (targetTile.value !== this.cells[row][target].value);
-    }
-    this.cells[row] = resultRow;
-  }
-  return hasChanged;
-};
-
-Board.prototype.setPositions = function () {
-  this.cells.forEach(function (row, rowIndex) {
-    row.forEach(function (tile, columnIndex) {
-      tile.oldRow = tile.row;
-      tile.oldColumn = tile.column;
-      tile.row = rowIndex;
-      tile.column = columnIndex;
-      tile.markForDeletion = false;
-    });
-  });
-};
-
-Board.fourProbability = 0.1;
-
-Board.prototype.addRandomTile = function () {
-  var emptyCells = [];
-  for (var r = 0; r < Board.size; ++r) {
-    for (var c = 0; c < Board.size; ++c) {
-      if (this.cells[r][c].value === 0) {
-        emptyCells.push({r: r, c: c});
-      }
-    }
-  }
-  var index = Math.floor(Math.random() * emptyCells.length);
-  var cell = emptyCells[index];
-  var newValue = Math.random() < Board.fourProbability ? 4 : 2;
-  this.cells[cell.r][cell.c] = this.addTile(newValue);
-};
-
-Board.prototype.move = function (direction) {
-  // 0 -> left, 1 -> up, 2 -> right, 3 -> down
-  this.clearOldTiles();
-  for (var i = 0; i < direction; ++i) {
-    this.cells = rotateLeft(this.cells);
-  }
-  var hasChanged = this.moveLeft();
-  for (var i = direction; i < 4; ++i) {
-    this.cells = rotateLeft(this.cells);
-  }
-  if (hasChanged) {
-    this.addRandomTile();
-  }
-  this.setPositions();
-  return this;
-};
-
-Board.prototype.clearOldTiles = function () {
-  this.tiles = this.tiles.filter(function (tile) { return tile.markForDeletion === false; });
-  this.tiles.forEach(function (tile) { tile.markForDeletion = true; });
-};
-
-Board.prototype.hasWon = function () {
-  return this.won;
-};
-
-Board.deltaX = [-1, 0, 1, 0];
-Board.deltaY = [0, -1, 0, 1];
-
-Board.prototype.hasLost = function () {
-  var canMove = false;
-  for (var row = 0; row < Board.size; ++row) {
-    for (var column = 0; column < Board.size; ++column) {
-      canMove = canMove || (this.cells[row][column].value === 0);
-      for (var dir = 0; dir < 4; ++dir) {
-        var newRow = row + Board.deltaX[dir];
-        var newColumn = column + Board.deltaY[dir];
-        if (newRow < 0 || newRow >= Board.size || newColumn < 0 || newColumn >= Board.size) {
-          continue;
-        }
-        canMove = canMove || (this.cells[row][column].value === this.cells[newRow][newColumn].value);
-      }
-    }
-  }
-  return !canMove;
-};
-
-module.exports = Board;
diff --git a/Examples/Movies/MovieCell.js b/Examples/Movies/MovieCell.js
deleted file mode 100644
index d67c777eb56856..00000000000000
--- a/Examples/Movies/MovieCell.js
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * @flow
- * @providesModule MovieCell
- */
-'use strict';
-
-var React = require('react');
-var ReactNative = require('react-native');
-var {
-  Image,
-  Platform,
-  StyleSheet,
-  Text,
-  TouchableHighlight,
-  TouchableNativeFeedback,
-  View
-} = ReactNative;
-
-var getStyleFromScore = require('./getStyleFromScore');
-var getImageSource = require('./getImageSource');
-var getTextFromScore = require('./getTextFromScore');
-
-class MovieCell extends React.Component {
-  render() {
-    var criticsScore = this.props.movie.ratings.critics_score;
-    var TouchableElement = TouchableHighlight;
-    if (Platform.OS === 'android') {
-      TouchableElement = TouchableNativeFeedback;
-    }
-    return (
-      <View>
-        <TouchableElement
-          onPress={this.props.onSelect}
-          onShowUnderlay={this.props.onHighlight}
-          onHideUnderlay={this.props.onUnhighlight}>
-          <View style={styles.row}>
-            <Image
-              source={getImageSource(this.props.movie, 'det')}
-              style={styles.cellImage}
-            />
-            <View style={styles.textContainer}>
-              <Text style={styles.movieTitle} numberOfLines={2}>
-                {this.props.movie.title}
-              </Text>
-              <Text style={styles.movieYear} numberOfLines={1}>
-                {this.props.movie.year}
-                {' '}&bull;{' '}
-                <Text style={getStyleFromScore(criticsScore)}>
-                  Critics {getTextFromScore(criticsScore)}
-                </Text>
-              </Text>
-            </View>
-          </View>
-        </TouchableElement>
-      </View>
-    );
-  }
-}
-
-var styles = StyleSheet.create({
-  textContainer: {
-    flex: 1,
-  },
-  movieTitle: {
-    flex: 1,
-    fontSize: 16,
-    fontWeight: '500',
-    marginBottom: 2,
-  },
-  movieYear: {
-    color: '#999999',
-    fontSize: 12,
-  },
-  row: {
-    alignItems: 'center',
-    backgroundColor: 'white',
-    flexDirection: 'row',
-    padding: 5,
-  },
-  cellImage: {
-    backgroundColor: '#dddddd',
-    height: 93,
-    marginRight: 10,
-    width: 60,
-  },
-  cellBorder: {
-    backgroundColor: 'rgba(0, 0, 0, 0.1)',
-    height: StyleSheet.hairlineWidth,
-    marginLeft: 4,
-  },
-});
-
-module.exports = MovieCell;
diff --git a/Examples/Movies/MovieScreen.js b/Examples/Movies/MovieScreen.js
deleted file mode 100644
index 2f013f08ed8db5..00000000000000
--- a/Examples/Movies/MovieScreen.js
+++ /dev/null
@@ -1,165 +0,0 @@
-/**
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * @flow
- * @providesModule MovieScreen
- */
-'use strict';
-
-var React = require('react');
-var ReactNative = require('react-native');
-var {
-  Image,
-  ScrollView,
-  StyleSheet,
-  Text,
-  View,
-} = ReactNative;
-
-var getImageSource = require('./getImageSource');
-var getStyleFromScore = require('./getStyleFromScore');
-var getTextFromScore = require('./getTextFromScore');
-
-class MovieScreen extends React.Component {
-  render() {
-    return (
-      <ScrollView contentContainerStyle={styles.contentContainer}>
-        <View style={styles.mainSection}>
-          <Image
-            source={getImageSource(this.props.movie, 'det')}
-            style={styles.detailsImage}
-          />
-          <View style={styles.rightPane}>
-            <Text style={styles.movieTitle}>{this.props.movie.title}</Text>
-            <Text>{this.props.movie.year}</Text>
-            <View style={styles.mpaaWrapper}>
-              <Text style={styles.mpaaText}>
-                {this.props.movie.mpaa_rating}
-              </Text>
-            </View>
-            <Ratings ratings={this.props.movie.ratings} />
-          </View>
-        </View>
-        <View style={styles.separator} />
-        <Text>
-          {this.props.movie.synopsis}
-        </Text>
-        <View style={styles.separator} />
-        <Cast actors={this.props.movie.abridged_cast} />
-      </ScrollView>
-    );
-  }
-}
-
-class Ratings extends React.Component {
-  render() {
-    var criticsScore = this.props.ratings.critics_score;
-    var audienceScore = this.props.ratings.audience_score;
-
-    return (
-      <View>
-        <View style={styles.rating}>
-          <Text style={styles.ratingTitle}>Critics:</Text>
-          <Text style={[styles.ratingValue, getStyleFromScore(criticsScore)]}>
-            {getTextFromScore(criticsScore)}
-          </Text>
-        </View>
-        <View style={styles.rating}>
-          <Text style={styles.ratingTitle}>Audience:</Text>
-          <Text style={[styles.ratingValue, getStyleFromScore(audienceScore)]}>
-            {getTextFromScore(audienceScore)}
-          </Text>
-        </View>
-      </View>
-    );
-  }
-}
-
-class Cast extends React.Component {
-  render() {
-    if (!this.props.actors) {
-      return null;
-    }
-
-    return (
-      <View>
-        <Text style={styles.castTitle}>Actors</Text>
-        {this.props.actors.map(actor =>
-          <Text key={actor.name} style={styles.castActor}>
-            &bull; {actor.name}
-          </Text>
-        )}
-      </View>
-    );
-  }
-}
-
-var styles = StyleSheet.create({
-  contentContainer: {
-    padding: 10,
-  },
-  rightPane: {
-    justifyContent: 'space-between',
-    flex: 1,
-  },
-  movieTitle: {
-    flex: 1,
-    fontSize: 16,
-    fontWeight: '500',
-  },
-  rating: {
-    marginTop: 10,
-  },
-  ratingTitle: {
-    fontSize: 14,
-  },
-  ratingValue: {
-    fontSize: 28,
-    fontWeight: '500',
-  },
-  mpaaWrapper: {
-    alignSelf: 'flex-start',
-    borderColor: 'black',
-    borderWidth: 1,
-    paddingHorizontal: 3,
-    marginVertical: 5,
-  },
-  mpaaText: {
-    fontFamily: 'Palatino',
-    fontSize: 13,
-    fontWeight: '500',
-  },
-  mainSection: {
-    flexDirection: 'row',
-  },
-  detailsImage: {
-    width: 134,
-    height: 200,
-    backgroundColor: '#eaeaea',
-    marginRight: 10,
-  },
-  separator: {
-    backgroundColor: 'rgba(0, 0, 0, 0.1)',
-    height: StyleSheet.hairlineWidth,
-    marginVertical: 10,
-  },
-  castTitle: {
-    fontWeight: '500',
-    marginBottom: 3,
-  },
-  castActor: {
-    marginLeft: 2,
-  },
-});
-
-module.exports = MovieScreen;
diff --git a/Examples/Movies/Movies.xcodeproj/project.pbxproj b/Examples/Movies/Movies.xcodeproj/project.pbxproj
deleted file mode 100644
index 9087fa7ac65910..00000000000000
--- a/Examples/Movies/Movies.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,520 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 46;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		1341801E1AA91750003F314A /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1341801B1AA91740003F314A /* libRCTNetwork.a */; };
-		13442C061AA90EA00037E5B0 /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 13442C051AA90E7D0037E5B0 /* libRCTImage.a */; };
-		13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
-		13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; };
-		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
-		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
-		140D9B661AC36C42004F25EE /* libRCTLinking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 14312D241AC3654D00CDC950 /* libRCTLinking.a */; };
-		14A2D4421AC3E43800CC738A /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 14A2D4411AC3E41A00CC738A /* libReact.a */; };
-		58C5726B1AA6239E00CDF9C8 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 58C5725B1AA6236500CDF9C8 /* libRCTText.a */; };
-		67C95F201B0E64A30040BCE2 /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67C95F1E1B0E647A0040BCE2 /* libRCTWebSocket.a */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXContainerItemProxy section */
-		1341801A1AA91740003F314A /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 134180151AA91740003F314A /* RCTNetwork.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 58B511DB1A9E6C8500147676;
-			remoteInfo = RCTNetwork;
-		};
-		13442C041AA90E7D0037E5B0 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 13442C001AA90E7D0037E5B0 /* RCTImage.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 58B5115D1A9E6B3D00147676;
-			remoteInfo = RCTImage;
-		};
-		14312D231AC3654D00CDC950 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 14312D1E1AC3654D00CDC950 /* RCTLinking.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 134814201AA4EA6300B7C361;
-			remoteInfo = RCTLinking;
-		};
-		14A2D4401AC3E41A00CC738A /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 14A2D43C1AC3E41A00CC738A /* React.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 83CBBA2E1A601D0E00E9B192;
-			remoteInfo = React;
-		};
-		58C5725A1AA6236500CDF9C8 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 587650F61A9EB120008B8F17 /* RCTText.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 58B5119B1A9E6C1200147676;
-			remoteInfo = RCTText;
-		};
-		67C95F1D1B0E647A0040BCE2 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 67C95F151B0E647A0040BCE2 /* RCTWebSocket.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 3C86DF461ADF2C930047B81A;
-			remoteInfo = RCTWebSocket;
-		};
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXFileReference section */
-		134180151AA91740003F314A /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = ../../Libraries/Network/RCTNetwork.xcodeproj; sourceTree = "<group>"; };
-		13442C001AA90E7D0037E5B0 /* RCTImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTImage.xcodeproj; path = ../../Libraries/Image/RCTImage.xcodeproj; sourceTree = "<group>"; };
-		13B07F961A680F5B00A75B9A /* Movies.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Movies.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = Movies/AppDelegate.h; sourceTree = "<group>"; };
-		13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = Movies/AppDelegate.m; sourceTree = "<group>"; };
-		13B07FB21A68108700A75B9A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
-		13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = Movies/Images.xcassets; sourceTree = "<group>"; };
-		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Movies/Info.plist; sourceTree = "<group>"; };
-		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Movies/main.m; sourceTree = "<group>"; };
-		14312D1E1AC3654D00CDC950 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = ../../Libraries/LinkingIOS/RCTLinking.xcodeproj; sourceTree = "<group>"; };
-		14A2D43C1AC3E41A00CC738A /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = ../../React/React.xcodeproj; sourceTree = "<group>"; };
-		587650F61A9EB120008B8F17 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = ../../Libraries/Text/RCTText.xcodeproj; sourceTree = SOURCE_ROOT; };
-		67C95F151B0E647A0040BCE2 /* RCTWebSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocket.xcodeproj; path = ../../Libraries/WebSocket/RCTWebSocket.xcodeproj; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		13B07F8C1A680F5B00A75B9A /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				67C95F201B0E64A30040BCE2 /* libRCTWebSocket.a in Frameworks */,
-				14A2D4421AC3E43800CC738A /* libReact.a in Frameworks */,
-				140D9B661AC36C42004F25EE /* libRCTLinking.a in Frameworks */,
-				1341801E1AA91750003F314A /* libRCTNetwork.a in Frameworks */,
-				13442C061AA90EA00037E5B0 /* libRCTImage.a in Frameworks */,
-				58C5726B1AA6239E00CDF9C8 /* libRCTText.a in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		134180161AA91740003F314A /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				1341801B1AA91740003F314A /* libRCTNetwork.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		13442C011AA90E7D0037E5B0 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				13442C051AA90E7D0037E5B0 /* libRCTImage.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		13B07FAE1A68108700A75B9A /* Movies */ = {
-			isa = PBXGroup;
-			children = (
-				13B07FAF1A68108700A75B9A /* AppDelegate.h */,
-				13B07FB01A68108700A75B9A /* AppDelegate.m */,
-				13B07FB51A68108700A75B9A /* Images.xcassets */,
-				13B07FB61A68108700A75B9A /* Info.plist */,
-				13B07FB11A68108700A75B9A /* LaunchScreen.xib */,
-				13B07FB71A68108700A75B9A /* main.m */,
-			);
-			name = Movies;
-			sourceTree = "<group>";
-		};
-		14312D1F1AC3654D00CDC950 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				14312D241AC3654D00CDC950 /* libRCTLinking.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		14A2D43D1AC3E41A00CC738A /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				14A2D4411AC3E41A00CC738A /* libReact.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		58C571FC1AA6124500CDF9C8 /* Libraries */ = {
-			isa = PBXGroup;
-			children = (
-				67C95F151B0E647A0040BCE2 /* RCTWebSocket.xcodeproj */,
-				14A2D43C1AC3E41A00CC738A /* React.xcodeproj */,
-				14312D1E1AC3654D00CDC950 /* RCTLinking.xcodeproj */,
-				134180151AA91740003F314A /* RCTNetwork.xcodeproj */,
-				13442C001AA90E7D0037E5B0 /* RCTImage.xcodeproj */,
-				587650F61A9EB120008B8F17 /* RCTText.xcodeproj */,
-			);
-			name = Libraries;
-			sourceTree = "<group>";
-		};
-		58C572571AA6236500CDF9C8 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				58C5725B1AA6236500CDF9C8 /* libRCTText.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		67C95F161B0E647A0040BCE2 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				67C95F1E1B0E647A0040BCE2 /* libRCTWebSocket.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		83CBB9F61A601CBA00E9B192 = {
-			isa = PBXGroup;
-			children = (
-				13B07FAE1A68108700A75B9A /* Movies */,
-				58C571FC1AA6124500CDF9C8 /* Libraries */,
-				83CBBA001A601CBA00E9B192 /* Products */,
-			);
-			indentWidth = 2;
-			sourceTree = "<group>";
-			tabWidth = 2;
-		};
-		83CBBA001A601CBA00E9B192 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				13B07F961A680F5B00A75B9A /* Movies.app */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		13B07F861A680F5B00A75B9A /* Movies */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "Movies" */;
-			buildPhases = (
-				13B07F871A680F5B00A75B9A /* Sources */,
-				13B07F8C1A680F5B00A75B9A /* Frameworks */,
-				13B07F8E1A680F5B00A75B9A /* Resources */,
-				68ACCCEE1D2BE57F008E368A /* ShellScript */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = Movies;
-			productName = "Hello World";
-			productReference = 13B07F961A680F5B00A75B9A /* Movies.app */;
-			productType = "com.apple.product-type.application";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		83CBB9F71A601CBA00E9B192 /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastUpgradeCheck = 0700;
-				ORGANIZATIONNAME = Facebook;
-			};
-			buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "Movies" */;
-			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				en,
-				Base,
-			);
-			mainGroup = 83CBB9F61A601CBA00E9B192;
-			productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */;
-			projectDirPath = "";
-			projectReferences = (
-				{
-					ProductGroup = 13442C011AA90E7D0037E5B0 /* Products */;
-					ProjectRef = 13442C001AA90E7D0037E5B0 /* RCTImage.xcodeproj */;
-				},
-				{
-					ProductGroup = 14312D1F1AC3654D00CDC950 /* Products */;
-					ProjectRef = 14312D1E1AC3654D00CDC950 /* RCTLinking.xcodeproj */;
-				},
-				{
-					ProductGroup = 134180161AA91740003F314A /* Products */;
-					ProjectRef = 134180151AA91740003F314A /* RCTNetwork.xcodeproj */;
-				},
-				{
-					ProductGroup = 58C572571AA6236500CDF9C8 /* Products */;
-					ProjectRef = 587650F61A9EB120008B8F17 /* RCTText.xcodeproj */;
-				},
-				{
-					ProductGroup = 67C95F161B0E647A0040BCE2 /* Products */;
-					ProjectRef = 67C95F151B0E647A0040BCE2 /* RCTWebSocket.xcodeproj */;
-				},
-				{
-					ProductGroup = 14A2D43D1AC3E41A00CC738A /* Products */;
-					ProjectRef = 14A2D43C1AC3E41A00CC738A /* React.xcodeproj */;
-				},
-			);
-			projectRoot = "";
-			targets = (
-				13B07F861A680F5B00A75B9A /* Movies */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXReferenceProxy section */
-		1341801B1AA91740003F314A /* libRCTNetwork.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libRCTNetwork.a;
-			remoteRef = 1341801A1AA91740003F314A /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		13442C051AA90E7D0037E5B0 /* libRCTImage.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libRCTImage.a;
-			remoteRef = 13442C041AA90E7D0037E5B0 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		14312D241AC3654D00CDC950 /* libRCTLinking.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libRCTLinking.a;
-			remoteRef = 14312D231AC3654D00CDC950 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		14A2D4411AC3E41A00CC738A /* libReact.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libReact.a;
-			remoteRef = 14A2D4401AC3E41A00CC738A /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		58C5725B1AA6236500CDF9C8 /* libRCTText.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libRCTText.a;
-			remoteRef = 58C5725A1AA6236500CDF9C8 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		67C95F1E1B0E647A0040BCE2 /* libRCTWebSocket.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libRCTWebSocket.a;
-			remoteRef = 67C95F1D1B0E647A0040BCE2 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-/* End PBXReferenceProxy section */
-
-/* Begin PBXResourcesBuildPhase section */
-		13B07F8E1A680F5B00A75B9A /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
-				13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXShellScriptBuildPhase section */
-		68ACCCEE1D2BE57F008E368A /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "export NODE_BINARY=node\n$SRCROOT/../../packager/react-native-xcode.sh Examples/Movies/MoviesApp.ios.js\n";
-		};
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		13B07F871A680F5B00A75B9A /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */,
-				13B07FC11A68108700A75B9A /* main.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXVariantGroup section */
-		13B07FB11A68108700A75B9A /* LaunchScreen.xib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				13B07FB21A68108700A75B9A /* Base */,
-			);
-			name = LaunchScreen.xib;
-			path = Movies;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-		13B07F941A680F5B00A75B9A /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					"$(SRCROOT)/../../React/**",
-				);
-				INFOPLIST_FILE = "$(SRCROOT)/Movies/Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				OTHER_LDFLAGS = (
-					"-ObjC",
-					"-lc++",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = Movies;
-				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../Libraries/**";
-			};
-			name = Debug;
-		};
-		13B07F951A680F5B00A75B9A /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					"$(SRCROOT)/../../React/**",
-				);
-				INFOPLIST_FILE = "$(SRCROOT)/Movies/Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				OTHER_LDFLAGS = (
-					"-ObjC",
-					"-lc++",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = Movies;
-				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../Libraries/**";
-			};
-			name = Release;
-		};
-		83CBBA201A601CBA00E9B192 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_TESTABILITY = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					"$(SRCROOT)/../../React/**",
-				);
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				MTL_ENABLE_DEBUG_INFO = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = iphoneos;
-			};
-			name = Debug;
-		};
-		83CBBA211A601CBA00E9B192 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = YES;
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					"$(SRCROOT)/../../React/**",
-				);
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				SDKROOT = iphoneos;
-				VALIDATE_PRODUCT = YES;
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "Movies" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				13B07F941A680F5B00A75B9A /* Debug */,
-				13B07F951A680F5B00A75B9A /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "Movies" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				83CBBA201A601CBA00E9B192 /* Debug */,
-				83CBBA211A601CBA00E9B192 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 83CBB9F71A601CBA00E9B192 /* Project object */;
-}
diff --git a/Examples/Movies/Movies.xcodeproj/xcshareddata/xcschemes/Movies.xcscheme b/Examples/Movies/Movies.xcodeproj/xcshareddata/xcschemes/Movies.xcscheme
deleted file mode 100644
index f1006908055e93..00000000000000
--- a/Examples/Movies/Movies.xcodeproj/xcshareddata/xcschemes/Movies.xcscheme
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0700"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "NO"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "83CBBA2D1A601D0E00E9B192"
-               BuildableName = "libReact.a"
-               BlueprintName = "React"
-               ReferencedContainer = "container:../../React/React.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
-               BuildableName = "Movies.app"
-               BlueprintName = "Movies"
-               ReferencedContainer = "container:Movies.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
-            BuildableName = "Movies.app"
-            BlueprintName = "Movies"
-            ReferencedContainer = "container:Movies.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
-            BuildableName = "Movies.app"
-            BlueprintName = "Movies"
-            ReferencedContainer = "container:Movies.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
-            BuildableName = "Movies.app"
-            BlueprintName = "Movies"
-            ReferencedContainer = "container:Movies.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/Examples/Movies/Movies/AppDelegate.h b/Examples/Movies/Movies/AppDelegate.h
deleted file mode 100644
index 55c38cc0bb6b2d..00000000000000
--- a/Examples/Movies/Movies/AppDelegate.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <UIKit/UIKit.h>
-
-@interface AppDelegate : UIResponder <UIApplicationDelegate>
-
-@property (nonatomic, strong) UIWindow *window;
-
-@end
-
diff --git a/Examples/Movies/Movies/AppDelegate.m b/Examples/Movies/Movies/AppDelegate.m
deleted file mode 100644
index 94f5d2ae94411f..00000000000000
--- a/Examples/Movies/Movies/AppDelegate.m
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "AppDelegate.h"
-
-#import "RCTBundleURLProvider.h"
-#import "RCTLinkingManager.h"
-#import "RCTRootView.h"
-
-@implementation AppDelegate
-
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
-{
-  NSURL *jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"Examples/Movies/MoviesApp.ios" fallbackResource:nil];
-
-  RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation
-                                                      moduleName:@"MoviesApp"
-                                               initialProperties:nil
-                                                   launchOptions:launchOptions];
-
-  self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-  UIViewController *rootViewController = [UIViewController new];
-  rootViewController.view = rootView;
-  self.window.rootViewController = rootViewController;
-  [self.window makeKeyAndVisible];
-  return YES;
-}
-
-- (BOOL)application:(UIApplication *)application
-            openURL:(NSURL *)url
-  sourceApplication:(NSString *)sourceApplication
-         annotation:(id)annotation
-{
-  return [RCTLinkingManager application:application
-                                openURL:url
-                      sourceApplication:sourceApplication
-                             annotation:annotation];
-}
-
-@end
diff --git a/Examples/Movies/Movies/Base.lproj/LaunchScreen.xib b/Examples/Movies/Movies/Base.lproj/LaunchScreen.xib
deleted file mode 100644
index d3f0b52a88aaa2..00000000000000
--- a/Examples/Movies/Movies/Base.lproj/LaunchScreen.xib
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6254" systemVersion="14B25" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6247"/>
-        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB">
-            <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2015 Facebook. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
-                    <rect key="frame" x="20" y="439" width="441" height="21"/>
-                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                    <nil key="highlightedColor"/>
-                </label>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Movies" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
-                    <rect key="frame" x="20" y="140" width="441" height="43"/>
-                    <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                    <nil key="highlightedColor"/>
-                </label>
-            </subviews>
-            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-            <constraints>
-                <constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
-                <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
-                <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l"/>
-                <constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0"/>
-                <constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9"/>
-                <constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g"/>
-            </constraints>
-            <nil key="simulatedStatusBarMetrics"/>
-            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <point key="canvasLocation" x="548" y="455"/>
-        </view>
-    </objects>
-</document>
diff --git a/Examples/Movies/Movies/Images.xcassets/AppIcon.appiconset/Contents.json b/Examples/Movies/Movies/Images.xcassets/AppIcon.appiconset/Contents.json
deleted file mode 100644
index 118c98f7461bf9..00000000000000
--- a/Examples/Movies/Movies/Images.xcassets/AppIcon.appiconset/Contents.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "iphone",
-      "size" : "29x29",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "29x29",
-      "scale" : "3x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "40x40",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "40x40",
-      "scale" : "3x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "60x60",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "60x60",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/Examples/Movies/Movies/Info.plist b/Examples/Movies/Movies/Info.plist
deleted file mode 100644
index 4ecf97f70446d6..00000000000000
--- a/Examples/Movies/Movies/Info.plist
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleURLTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>movies</string>
-			</array>
-		</dict>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSAllowsArbitraryLoads</key>
-		<true/>
-	</dict>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>armv7</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
-</dict>
-</plist>
diff --git a/Examples/Movies/Movies/main.m b/Examples/Movies/Movies/main.m
deleted file mode 100644
index 9c58a39a483c81..00000000000000
--- a/Examples/Movies/Movies/main.m
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <UIKit/UIKit.h>
-#import "AppDelegate.h"
-
-int main(int argc, char * argv[]) {
-  @autoreleasepool {
-    return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
-  }
-}
diff --git a/Examples/Movies/MoviesApp.android.js b/Examples/Movies/MoviesApp.android.js
deleted file mode 100644
index c6f78a3d1fc58e..00000000000000
--- a/Examples/Movies/MoviesApp.android.js
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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.
- *
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * @providesModule MoviesApp
- * @flow
- */
-'use strict';
-
-var React = require('react');
-var ReactNative = require('react-native');
-
-var nativeImageSource = require('nativeImageSource');
-var {
-  AppRegistry,
-  BackAndroid,
-  Navigator,
-  StyleSheet,
-  ToolbarAndroid,
-  View,
-} = ReactNative;
-
-var MovieScreen = require('./MovieScreen');
-var SearchScreen = require('./SearchScreen');
-
-var _navigator;
-BackAndroid.addEventListener('hardwareBackPress', () => {
-  if (_navigator && _navigator.getCurrentRoutes().length > 1) {
-    _navigator.pop();
-    return true;
-  }
-  return false;
-});
-
-var RouteMapper = function(route, navigationOperations, onComponentRef) {
-  _navigator = navigationOperations;
-  if (route.name === 'search') {
-    return (
-      <SearchScreen navigator={navigationOperations} />
-    );
-  } else if (route.name === 'movie') {
-    return (
-      <View style={{flex: 1}}>
-        <ToolbarAndroid
-          actions={[]}
-          navIcon={nativeImageSource({
-            android: 'android_back_white',
-            width: 96,
-            height: 96
-          })}
-          onIconClicked={navigationOperations.pop}
-          style={styles.toolbar}
-          titleColor="white"
-          title={route.movie.title} />
-        <MovieScreen
-          style={{flex: 1}}
-          navigator={navigationOperations}
-          movie={route.movie}
-        />
-      </View>
-    );
-  }
-};
-
-class MoviesApp extends React.Component {
-  render() {
-    var initialRoute = {name: 'search'};
-    return (
-      <Navigator
-        style={styles.container}
-        initialRoute={initialRoute}
-        configureScene={() => Navigator.SceneConfigs.FadeAndroid}
-        renderScene={RouteMapper}
-      />
-    );
-  }
-}
-
-var styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    backgroundColor: 'white',
-  },
-  toolbar: {
-    backgroundColor: '#a9a9a9',
-    height: 56,
-  },
-});
-
-AppRegistry.registerComponent('MoviesApp', () => MoviesApp);
-
-module.exports = MoviesApp;
diff --git a/Examples/Movies/MoviesApp.ios.js b/Examples/Movies/MoviesApp.ios.js
deleted file mode 100644
index 99ba1d3783b932..00000000000000
--- a/Examples/Movies/MoviesApp.ios.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * @providesModule MoviesApp
- * @flow
- */
-'use strict';
-
-var React = require('react');
-var ReactNative = require('react-native');
-var {
-  AppRegistry,
-  NavigatorIOS,
-  StyleSheet,
-} = ReactNative;
-
-var SearchScreen = require('./SearchScreen');
-
-class MoviesApp extends React.Component {
-  render() {
-    return (
-      <NavigatorIOS
-        style={styles.container}
-        initialRoute={{
-          title: 'Movies',
-          component: SearchScreen,
-        }}
-      />
-    );
-  }
-}
-
-var styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    backgroundColor: 'white',
-  },
-});
-
-AppRegistry.registerComponent('MoviesApp', () => MoviesApp);
-
-module.exports = MoviesApp;
diff --git a/Examples/Movies/README.md b/Examples/Movies/README.md
deleted file mode 100644
index f2ad9befac5129..00000000000000
--- a/Examples/Movies/README.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# Movies app
-
-The Movies app is a demonstration of basic concepts, such as fetching data, rendering a list of data including images, and navigating between different screens.
-
-## Running this app
-
-Before running the app, make sure you ran:
-
-    git clone https://github.com/facebook/react-native.git
-    cd react-native
-    npm install
-
-### Running on iOS
-
-Mac OS and Xcode are required.
-
-- Open `Examples/Movies/Movies.xcodeproj` in Xcode
-- Hit the Run button
-
-See [Running on device](https://facebook.github.io/react-native/docs/running-on-device.html) if you want to use a physical device.
-
-### Running on Android
-
-You'll need to have all the [prerequisites](https://github.com/facebook/react-native/tree/master/ReactAndroid#prerequisites) (SDK, NDK) for Building React Native installed.
-
-Start an Android emulator ([Genymotion](https://www.genymotion.com) is recommended).
-
-    cd react-native
-    ./gradlew :Examples:Movies:android:app:installDebug
-    ./packager/packager.sh
-
-_Note: Building for the first time can take a while._
-
-Open the Movies app in your emulator.
-
-See [Running on Device](https://facebook.github.io/react-native/docs/running-on-device.html) in case you want to use a physical device.
-
-### Running with Buck
-
-Follow the same setup as running with gradle.
-
-Install Buck from [here](https://buckbuild.com/setup/install.html).
-
-Run the following commands from the react-native folder:
-
-    ./gradlew :ReactAndroid:packageReactNdkLibsForBuck
-    buck fetch movies
-    buck install -r movies
-    ./packager/packager.sh
-
-_Note: The native libs are still built using gradle. Full build with buck is coming soon(tm)._
-
-## Built from source
-
-Building the app on both iOS and Android means building the React Native framework from source. This way you're running the latest native and JS code the way you see it in your clone of the github repo.
-
-This is different from apps created using `react-native init` which have a dependency on a specific version of React Native JS and native code, declared in a `package.json` file (and `build.gradle` for Android apps).
diff --git a/Examples/Movies/SearchBar.android.js b/Examples/Movies/SearchBar.android.js
deleted file mode 100644
index 1a889d7fbebfa2..00000000000000
--- a/Examples/Movies/SearchBar.android.js
+++ /dev/null
@@ -1,113 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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.
- *
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * @providesModule SearchBar
- * @flow
- */
-'use strict';
-
-var React = require('react');
-var ReactNative = require('react-native');
-
-var nativeImageSource = require('nativeImageSource');
-var {
-  Image,
-  Platform,
-  ActivityIndicator,
-  TextInput,
-  StyleSheet,
-  TouchableNativeFeedback,
-  View,
-} = ReactNative;
-
-var IS_RIPPLE_EFFECT_SUPPORTED = Platform.Version >= 21;
-
-class SearchBar extends React.Component {
-  render() {
-    var background = IS_RIPPLE_EFFECT_SUPPORTED ?
-      TouchableNativeFeedback.SelectableBackgroundBorderless() :
-      TouchableNativeFeedback.SelectableBackground();
-    return (
-      <View style={styles.searchBar}>
-        <TouchableNativeFeedback
-            background={background}
-            onPress={() => this.refs.input && this.refs.input.focus()}>
-          <View>
-            <Image
-              source={nativeImageSource({
-                android: 'android_search_white',
-                width: 96,
-                height: 96
-              })}
-              style={styles.icon}
-            />
-          </View>
-        </TouchableNativeFeedback>
-        <TextInput
-          ref="input"
-          autoCapitalize="none"
-          autoCorrect={false}
-          autoFocus={true}
-          onChange={this.props.onSearchChange}
-          placeholder="Search a movie..."
-          placeholderTextColor="rgba(255, 255, 255, 0.5)"
-          onFocus={this.props.onFocus}
-          style={styles.searchBarInput}
-        />
-        <ActivityIndicator
-          animating={this.props.isLoading}
-          color="white"
-          size="large"
-          style={styles.spinner}
-        />
-      </View>
-    );
-  }
-}
-
-var styles = StyleSheet.create({
-  searchBar: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    backgroundColor: '#a9a9a9',
-    height: 56,
-  },
-  searchBarInput: {
-    flex: 1,
-    fontSize: 20,
-    fontWeight: 'bold',
-    color: 'white',
-    height: 50,
-    padding: 0,
-    backgroundColor: 'transparent'
-  },
-  spinner: {
-    width: 30,
-    height: 30,
-    marginRight: 16,
-  },
-  icon: {
-    width: 24,
-    height: 24,
-    marginHorizontal: 8,
-  },
-});
-
-module.exports = SearchBar;
diff --git a/Examples/Movies/SearchBar.ios.js b/Examples/Movies/SearchBar.ios.js
deleted file mode 100644
index c168d40184df05..00000000000000
--- a/Examples/Movies/SearchBar.ios.js
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * @providesModule SearchBar
- * @flow
- */
-'use strict';
-
-var React = require('react');
-var ReactNative = require('react-native');
-var {
-  ActivityIndicator,
-  TextInput,
-  StyleSheet,
-  View,
-} = ReactNative;
-
-class SearchBar extends React.Component {
-  render() {
-    return (
-      <View style={styles.searchBar}>
-        <TextInput
-          autoCapitalize="none"
-          autoCorrect={false}
-          onChange={this.props.onSearchChange}
-          placeholder="Search a movie..."
-          onFocus={this.props.onFocus}
-          style={styles.searchBarInput}
-        />
-        <ActivityIndicator
-          animating={this.props.isLoading}
-          style={styles.spinner}
-        />
-      </View>
-    );
-  }
-}
-
-var styles = StyleSheet.create({
-  searchBar: {
-    marginTop: 64,
-    padding: 3,
-    paddingLeft: 8,
-    flexDirection: 'row',
-    alignItems: 'center',
-  },
-  searchBarInput: {
-    fontSize: 15,
-    flex: 1,
-    height: 30,
-  },
-  spinner: {
-    width: 30,
-  },
-});
-
-module.exports = SearchBar;
diff --git a/Examples/Movies/SearchScreen.js b/Examples/Movies/SearchScreen.js
deleted file mode 100644
index 57fa82885f7950..00000000000000
--- a/Examples/Movies/SearchScreen.js
+++ /dev/null
@@ -1,370 +0,0 @@
-/**
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * @flow
- * @providesModule SearchScreen
- */
-'use strict';
-
-var React = require('react');
-var ReactNative = require('react-native');
-var {
-  ActivityIndicator,
-  ListView,
-  Platform,
-  StyleSheet,
-  Text,
-  View,
-} = ReactNative;
-var TimerMixin = require('react-timer-mixin');
-
-var invariant = require('fbjs/lib/invariant');
-var dismissKeyboard = require('dismissKeyboard');
-
-var MovieCell = require('./MovieCell');
-var MovieScreen = require('./MovieScreen');
-var SearchBar = require('SearchBar');
-
-/**
- * This is for demo purposes only, and rate limited.
- * In case you want to use the Rotten Tomatoes' API on a real app you should
- * create an account at http://developer.rottentomatoes.com/
- */
-var API_URL = 'http://api.rottentomatoes.com/api/public/v1.0/';
-var API_KEYS = [
-  '7waqfqbprs7pajbz28mqf6vz',
-  // 'y4vwv8m33hed9ety83jmv52f', Fallback api_key
-];
-
-// Results should be cached keyed by the query
-// with values of null meaning "being fetched"
-// and anything besides null and undefined
-// as the result of a valid query
-var resultsCache = {
-  dataForQuery: {},
-  nextPageNumberForQuery: {},
-  totalForQuery: {},
-};
-
-var LOADING = {};
-
-var SearchScreen = React.createClass({
-  mixins: [TimerMixin],
-
-  timeoutID: (null: any),
-
-  getInitialState: function() {
-    return {
-      isLoading: false,
-      isLoadingTail: false,
-      dataSource: new ListView.DataSource({
-        rowHasChanged: (row1, row2) => row1 !== row2,
-      }),
-      filter: '',
-      queryNumber: 0,
-    };
-  },
-
-  componentDidMount: function() {
-    this.searchMovies('');
-  },
-
-  _urlForQueryAndPage: function(query: string, pageNumber: number): string {
-    var apiKey = API_KEYS[this.state.queryNumber % API_KEYS.length];
-    if (query) {
-      return (
-        API_URL + 'movies.json?apikey=' + apiKey + '&q=' +
-        encodeURIComponent(query) + '&page_limit=20&page=' + pageNumber
-      );
-    } else {
-      // With no query, load latest movies
-      return (
-        API_URL + 'lists/movies/in_theaters.json?apikey=' + apiKey +
-        '&page_limit=20&page=' + pageNumber
-      );
-    }
-  },
-
-  searchMovies: function(query: string) {
-    this.timeoutID = null;
-
-    this.setState({filter: query});
-
-    var cachedResultsForQuery = resultsCache.dataForQuery[query];
-    if (cachedResultsForQuery) {
-      if (!LOADING[query]) {
-        this.setState({
-          dataSource: this.getDataSource(cachedResultsForQuery),
-          isLoading: false
-        });
-      } else {
-        this.setState({isLoading: true});
-      }
-      return;
-    }
-
-    LOADING[query] = true;
-    resultsCache.dataForQuery[query] = null;
-    this.setState({
-      isLoading: true,
-      queryNumber: this.state.queryNumber + 1,
-      isLoadingTail: false,
-    });
-
-    fetch(this._urlForQueryAndPage(query, 1))
-      .then((response) => response.json())
-      .then((responseData) => {
-        LOADING[query] = false;
-        resultsCache.totalForQuery[query] = responseData.total;
-        resultsCache.dataForQuery[query] = responseData.movies;
-        resultsCache.nextPageNumberForQuery[query] = 2;
-
-        if (this.state.filter !== query) {
-          // do not update state if the query is stale
-          return;
-        }
-
-        this.setState({
-          isLoading: false,
-          dataSource: this.getDataSource(responseData.movies),
-        });
-      })
-      .catch((error) => {
-        LOADING[query] = false;
-        resultsCache.dataForQuery[query] = undefined;
-
-        this.setState({
-          dataSource: this.getDataSource([]),
-          isLoading: false,
-        });
-      })
-      .done();
-  },
-
-  hasMore: function(): boolean {
-    var query = this.state.filter;
-    if (!resultsCache.dataForQuery[query]) {
-      return true;
-    }
-    return (
-      resultsCache.totalForQuery[query] !==
-      resultsCache.dataForQuery[query].length
-    );
-  },
-
-  onEndReached: function() {
-    var query = this.state.filter;
-    if (!this.hasMore() || this.state.isLoadingTail) {
-      // We're already fetching or have all the elements so noop
-      return;
-    }
-
-    if (LOADING[query]) {
-      return;
-    }
-
-    LOADING[query] = true;
-    this.setState({
-      queryNumber: this.state.queryNumber + 1,
-      isLoadingTail: true,
-    });
-
-    var page = resultsCache.nextPageNumberForQuery[query];
-    invariant(page != null, 'Next page number for "%s" is missing', query);
-    fetch(this._urlForQueryAndPage(query, page))
-      .then((response) => response.json())
-      .catch((error) => {
-        console.error(error);
-        LOADING[query] = false;
-        this.setState({
-          isLoadingTail: false,
-        });
-      })
-      .then((responseData) => {
-        var moviesForQuery = resultsCache.dataForQuery[query].slice();
-
-        LOADING[query] = false;
-        // We reached the end of the list before the expected number of results
-        if (!responseData.movies) {
-          resultsCache.totalForQuery[query] = moviesForQuery.length;
-        } else {
-          for (var i in responseData.movies) {
-            moviesForQuery.push(responseData.movies[i]);
-          }
-          resultsCache.dataForQuery[query] = moviesForQuery;
-          resultsCache.nextPageNumberForQuery[query] += 1;
-        }
-
-        if (this.state.filter !== query) {
-          // do not update state if the query is stale
-          return;
-        }
-
-        this.setState({
-          isLoadingTail: false,
-          dataSource: this.getDataSource(resultsCache.dataForQuery[query]),
-        });
-      })
-      .done();
-  },
-
-  getDataSource: function(movies: Array<any>): ListView.DataSource {
-    return this.state.dataSource.cloneWithRows(movies);
-  },
-
-  selectMovie: function(movie: Object) {
-    if (Platform.OS === 'ios') {
-      this.props.navigator.push({
-        title: movie.title,
-        component: MovieScreen,
-        passProps: {movie},
-      });
-    } else {
-      dismissKeyboard();
-      this.props.navigator.push({
-        title: movie.title,
-        name: 'movie',
-        movie: movie,
-      });
-    }
-  },
-
-  onSearchChange: function(event: Object) {
-    var filter = event.nativeEvent.text.toLowerCase();
-
-    this.clearTimeout(this.timeoutID);
-    this.timeoutID = this.setTimeout(() => this.searchMovies(filter), 100);
-  },
-
-  renderFooter: function() {
-    if (!this.hasMore() || !this.state.isLoadingTail) {
-      return <View style={styles.scrollSpinner} />;
-    }
-
-    return <ActivityIndicator style={styles.scrollSpinner} />;
-  },
-
-  renderSeparator: function(
-    sectionID: number | string,
-    rowID: number | string,
-    adjacentRowHighlighted: boolean
-  ) {
-    var style = styles.rowSeparator;
-    if (adjacentRowHighlighted) {
-        style = [style, styles.rowSeparatorHide];
-    }
-    return (
-      <View key={'SEP_' + sectionID + '_' + rowID}  style={style}/>
-    );
-  },
-
-  renderRow: function(
-    movie: Object,
-    sectionID: number | string,
-    rowID: number | string,
-    highlightRowFunc: (sectionID: ?number | string, rowID: ?number | string) => void,
-  ) {
-    return (
-      <MovieCell
-        key={movie.id}
-        onSelect={() => this.selectMovie(movie)}
-        onHighlight={() => highlightRowFunc(sectionID, rowID)}
-        onUnhighlight={() => highlightRowFunc(null, null)}
-        movie={movie}
-      />
-    );
-  },
-
-  render: function() {
-    var content = this.state.dataSource.getRowCount() === 0 ?
-      <NoMovies
-        filter={this.state.filter}
-        isLoading={this.state.isLoading}
-      /> :
-      <ListView
-        ref="listview"
-        renderSeparator={this.renderSeparator}
-        dataSource={this.state.dataSource}
-        renderFooter={this.renderFooter}
-        renderRow={this.renderRow}
-        onEndReached={this.onEndReached}
-        automaticallyAdjustContentInsets={false}
-        keyboardDismissMode="on-drag"
-        keyboardShouldPersistTaps="handled"
-        showsVerticalScrollIndicator={false}
-      />;
-
-    return (
-      <View style={styles.container}>
-        <SearchBar
-          onSearchChange={this.onSearchChange}
-          isLoading={this.state.isLoading}
-          onFocus={() =>
-            this.refs.listview && this.refs.listview.getScrollResponder().scrollTo({ x: 0, y: 0 })}
-        />
-        <View style={styles.separator} />
-        {content}
-      </View>
-    );
-  },
-});
-
-class NoMovies extends React.Component {
-  render() {
-    var text = '';
-    if (this.props.filter) {
-      text = `No results for "${this.props.filter}"`;
-    } else if (!this.props.isLoading) {
-      // If we're looking at the latest movies, aren't currently loading, and
-      // still have no results, show a message
-      text = 'No movies found';
-    }
-
-    return (
-      <View style={[styles.container, styles.centerText]}>
-        <Text style={styles.noMoviesText}>{text}</Text>
-      </View>
-    );
-  }
-}
-
-var styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    backgroundColor: 'white',
-  },
-  centerText: {
-    alignItems: 'center',
-  },
-  noMoviesText: {
-    marginTop: 80,
-    color: '#888888',
-  },
-  separator: {
-    height: 1,
-    backgroundColor: '#eeeeee',
-  },
-  scrollSpinner: {
-    marginVertical: 20,
-  },
-  rowSeparator: {
-    backgroundColor: 'rgba(0, 0, 0, 0.1)',
-    height: 1,
-    marginLeft: 4,
-  },
-  rowSeparatorHide: {
-    opacity: 0.0,
-  },
-});
-
-module.exports = SearchScreen;
diff --git a/Examples/Movies/__tests__/getImageSource-test.js b/Examples/Movies/__tests__/getImageSource-test.js
deleted file mode 100644
index 2061312f020de2..00000000000000
--- a/Examples/Movies/__tests__/getImageSource-test.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Copyright 2004-present Facebook. All Rights Reserved.
- */
-'use strict';
-
-jest.unmock('../getImageSource');
-
-var getImageSource = require('../getImageSource');
-
-describe('getImageSource', () => {
-  it('returns null for invalid input', () => {
-    expect(getImageSource().uri).toBe(null);
-  });
-
-  it('returns a movie thumbnail', () => {
-    var uri = 'https://facebook.com';
-    var source = {
-      posters: {
-        thumbnail: uri,
-      },
-    };
-    expect(getImageSource(source).uri).toBe(uri);
-  });
-
-  it('returns a movie thumbnail with kind', () => {
-    var uri = 'https://facebook.com?tmb';
-    var source = {
-      posters: {
-        thumbnail: uri,
-      },
-    };
-    expect(getImageSource(source, 'kind').uri).toBe(
-      'https://facebook.com?kind'
-    );
-  });
-});
diff --git a/Examples/Movies/android/app/BUCK b/Examples/Movies/android/app/BUCK
deleted file mode 100644
index bed62bb7a7ed01..00000000000000
--- a/Examples/Movies/android/app/BUCK
+++ /dev/null
@@ -1,31 +0,0 @@
-include_defs("//ReactAndroid/DEFS")
-
-android_binary(
-    name = "app",
-    keystore = "//keystores:debug",
-    manifest = "src/main/AndroidManifest.xml",
-    deps = [
-        ":movies-lib",
-    ],
-)
-
-android_library(
-    name = "movies-lib",
-    srcs = glob(["src/main/java/**/*.java"]),
-    deps = [
-        ":res",
-        react_native_dep("third-party/java/jsr-305:jsr-305"),
-        react_native_target("java/com/facebook/react:react"),
-        react_native_target("java/com/facebook/react/modules/core:core"),
-        react_native_target("java/com/facebook/react/shell:shell"),
-        react_native_target("jni/prebuilt:android-jsc"),
-        # .so files are prebuilt by Gradle with `./gradlew :ReactAndroid:packageReactNdkLibsForBuck`
-        react_native_target("jni/prebuilt:reactnative-libs"),
-    ],
-)
-
-android_resource(
-    name = "res",
-    package = "com.facebook.react.movies",
-    res = "src/main/res",
-)
diff --git a/Examples/Movies/android/app/build.gradle b/Examples/Movies/android/app/build.gradle
deleted file mode 100644
index 6bc71ffda74360..00000000000000
--- a/Examples/Movies/android/app/build.gradle
+++ /dev/null
@@ -1,31 +0,0 @@
-apply plugin: 'com.android.application'
-
-android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
-
-    defaultConfig {
-        applicationId "com.facebook.react.movies"
-        minSdkVersion 16
-        targetSdkVersion 22
-        versionCode 1
-        versionName "1.0"
-        ndk {
-            abiFilters "armeabi-v7a", "x86"
-        }
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-}
-
-dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:23.0.1'
-
-    // Build React Native from source
-    compile project(':ReactAndroid')
-}
diff --git a/Examples/Movies/android/app/gradle.properties b/Examples/Movies/android/app/gradle.properties
deleted file mode 100644
index dfbe478748b403..00000000000000
--- a/Examples/Movies/android/app/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-android.useDeprecatedNdk=true
diff --git a/Examples/Movies/android/app/proguard-rules.pro b/Examples/Movies/android/app/proguard-rules.pro
deleted file mode 100644
index a92fa177ee49f0..00000000000000
--- a/Examples/Movies/android/app/proguard-rules.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /usr/local/Cellar/android-sdk/24.3.3/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/Examples/Movies/android/app/src/main/AndroidManifest.xml b/Examples/Movies/android/app/src/main/AndroidManifest.xml
deleted file mode 100644
index 34f5b0bc47ee60..00000000000000
--- a/Examples/Movies/android/app/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.facebook.react.movies"
-    android:versionCode="1"
-    android:versionName="1.0">
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
-
-    <uses-sdk
-      android:minSdkVersion="16"
-      android:targetSdkVersion="22" />
-
-    <application
-      android:name=".MoviesApplication"
-      android:allowBackup="true"
-      android:label="@string/app_name"
-      android:icon="@drawable/rotten_tomatoes_icon"
-      android:theme="@style/AppTheme">
-      <activity
-        android:name=".MoviesActivity">
-        <intent-filter>
-            <action android:name="android.intent.action.MAIN" />
-            <category android:name="android.intent.category.LAUNCHER" />
-        </intent-filter>
-      </activity>
-      <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
-    </application>
-
-</manifest>
diff --git a/Examples/Movies/android/app/src/main/java/com/facebook/react/movies/MoviesActivity.java b/Examples/Movies/android/app/src/main/java/com/facebook/react/movies/MoviesActivity.java
deleted file mode 100644
index da1d7fc5b8fba5..00000000000000
--- a/Examples/Movies/android/app/src/main/java/com/facebook/react/movies/MoviesActivity.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package com.facebook.react.movies;
-
-import com.facebook.react.ReactActivity;
-
-public class MoviesActivity extends ReactActivity {
-  @Override
-  protected String getMainComponentName() {
-    return "MoviesApp";
-  }
-}
diff --git a/Examples/Movies/android/app/src/main/java/com/facebook/react/movies/MoviesApplication.java b/Examples/Movies/android/app/src/main/java/com/facebook/react/movies/MoviesApplication.java
deleted file mode 100644
index ee57b9b595fc58..00000000000000
--- a/Examples/Movies/android/app/src/main/java/com/facebook/react/movies/MoviesApplication.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-package com.facebook.react.movies;
-
-import android.app.Application;
-
-import com.facebook.react.ReactApplication;
-import com.facebook.react.ReactNativeHost;
-import com.facebook.react.ReactPackage;
-import com.facebook.react.shell.MainReactPackage;
-
-import java.util.Arrays;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-public class MoviesApplication extends Application implements ReactApplication {
-  private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
-    @Override
-    public String getJSMainModuleName() {
-      return "Examples/Movies/MoviesApp.android";
-    }
-
-    @Override
-    public @Nullable String getBundleAssetName() {
-      return "MoviesApp.android.bundle";
-    }
-
-    @Override
-    public boolean getUseDeveloperSupport() {
-      return true;
-    }
-
-    @Override
-    protected List<ReactPackage> getPackages() {
-      return Arrays.<ReactPackage>asList(
-        new MainReactPackage()
-      );
-    }
-  };
-
-  @Override
-  public ReactNativeHost getReactNativeHost() {
-    return mReactNativeHost;
-  }
-}
diff --git a/Examples/Movies/android/app/src/main/res/drawable-hdpi/android_back_white.png b/Examples/Movies/android/app/src/main/res/drawable-hdpi/android_back_white.png
deleted file mode 100644
index a34f0dbb8fd520edb1d996294478110d3c085504..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 237
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;V2Nu)NpOBzNqJ&XDnmhDdU8=|
zafU;w=VzegbWaz@5Rc<;uX=Me81S%MXj(8`?2Xs?$Io-}j)w+p%w4vuspIUwi&N4b
zJvcSx_rh{VxqU287#)^dut@|)E||Mg*IX#=(oB&lM~^5bruB6?-t>{!b+APtahl9C
zF3!!1+QYTEI1kTzzA!nvdFj^A$>!H2cDgRLPhnfy%i;Ud**nOmCqP6zhvlf-+obMW
kbF)sbS^O^k=KU74e(?n{ab}NOfKFuaboFyt=akR{0O5RHwEzGB

diff --git a/Examples/Movies/android/app/src/main/res/drawable-hdpi/android_search_white.png b/Examples/Movies/android/app/src/main/res/drawable-hdpi/android_search_white.png
deleted file mode 100755
index 861b40db0d4ddb6d7b7b6d68d174072fb691008c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 575
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbB*pj^6U4S$Y{B+)352QE?JR*yM
zv<Dcwoy@ia36>Q&rUPlPeufHm>3#+V##5dyjv*0;-%hjjmI)MTyC0df$#L?bC7tn^
zn{tC#!w)8LW=uVF%U(h7NZg}oo?EYmdCCW|n}}tySkFG&6tzZ7Ni)V#mxrs)M(o_7
zLZig=wD<3#&P2=VJ-7XC`TgF^>ZKtoqb7^1OIE05I$heZWX+OYOL9G>=RLn@n5DqK
zhG}}sYyJ%!U$#mwVb@^3?sD1g!?vlG|97VzaQ3uU@tyfl+w=9LRg=!C@Oo6Kzid5e
zIsMDM&wJw6g)f(R@z2^oXwr1Xv<BwM)l5%f4n1MMy+!1pG1HZv^rNa5R%!mxZF|pK
zkhtfuUc#@l*Go9}^t}9^)ZnGpu*~=1R+fKFAHyI0GFD7>R{J-1!SYp|?6C~CW*;M&
z76c31mokRrFLk~f`;b}OVYZqc!^{;&YkX(zkh=VPJ;V9^v!!NrKCETPk$xX@+M(`Y
z|FR5OiM|)VQ)=7~2!}iDJupvmANQWTO-A#X!_V#!mM}i4@!`5p0b|YA|HkJV-4AFd
zh~3~ia7Ad&UXOsu2MUiYcXzf{`^T9Q>-_Z3p|d3{ItA6gFNbN!=kRDSiarpqc>c|C
z8&Ay!c8evA-yDuMoL?588N$AxE0&q7@zpyn)&*VPnbbm8`MqRgud`g}emFT07{v^p
Lu6{1-oD!M<TwLoX

diff --git a/Examples/Movies/android/app/src/main/res/drawable-mdpi/android_back_white.png b/Examples/Movies/android/app/src/main/res/drawable-mdpi/android_back_white.png
deleted file mode 100644
index 63111599a3b1773776d507f398c1fdb5a822c19d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 190
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1!4lVqlHmNblJdl&REC1Q^yH$_
z;tYpU&(A=~3{Mxw5R22vKh8TyrASywNi|Gh;pP1g1b^eZBX|X#DjvDT5Gd!hMxH~%
z{W_54mZQ-)<^RF;GLg(4mUa$1*=9^W<k^|2v?YN%Y){k%cNsa|9h2Dnbax2fmwzNI
i@8W%T!udrOiVR{x4f?J+uD5}9GI+ZBxvX<aXaWFT-#&W)

diff --git a/Examples/Movies/android/app/src/main/res/drawable-mdpi/android_search_white.png b/Examples/Movies/android/app/src/main/res/drawable-mdpi/android_search_white.png
deleted file mode 100755
index fedd0c623f5698d635ed5e6234a7a6fe1f5777d5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 337
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE<hRxemd{22U45`9+AaB
z+5?Q;PG;MI1j`B>(}6TtKSPDj(q%x-9Zwg>5Rc<;rx@}zIf%H}s}yibcP=+DRGW8r
z^#R>4JkqvpALW8F(z6@SZkFs(e6^{2s@2(+)PHA;ZXSKpAHiUJfYE({pml=T6$|ET
zdyY$;NMa5%+Q}elz*tncw6q~KM|bVdFRf|61cbt-Td`@_?h3LJmnyiF@bIGOrMXVb
zQoPUPV)bGlfA+CHpZ@WLvH7bP)$DJMc%P5?T_+zE_(F3QJL`!B?`?0e&DLIU-uGSy
z{{aiL7a!wGt_qgr>Ke(5J-T_|hq==wkNeh>R92qNNlg2Cy!`(YZ@c)5-ygG`lV9OA
U_x_2kKz}lLy85}Sb4q9e0DP-{=l}o!

diff --git a/Examples/Movies/android/app/src/main/res/drawable-xhdpi/android_back_white.png b/Examples/Movies/android/app/src/main/res/drawable-xhdpi/android_back_white.png
deleted file mode 100644
index 500892e105e98c5a84da959a6cf4eadc317582ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 266
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}t!4lVqlHmNblJdl&REC1Q^yH$_
z;tYpU&(A=~EuJopArXh)Ui9W-G8AZexN~ZS!NJ}c%H7!;V|X16Ub=@ac3L()^IyNG
zS<cqrIq?UW_A#1l@mj#>(9`jp@j(pZmp{DhwiC`&H<sLE7pUZSc$(XACYoXHeCDP<
zJQJQAZ_u!3O8I%-;e5KC@PkkL8TJVK+cXK+JhATk<vva5v9h3{^%Q~6$&87*7h3i@
z3C&aO`mk28rQFc>NBCryC*{_Ks~F231r@tm7p|>*@<k_sv7TWM!wGGM`}5=t%Yp7^
N@O1TaS?83{1OQ#%Wj+7^

diff --git a/Examples/Movies/android/app/src/main/res/drawable-xhdpi/android_search_white.png b/Examples/Movies/android/app/src/main/res/drawable-xhdpi/android_search_white.png
deleted file mode 100755
index 5713a86f6329d9ca5d92cc10c6016f5f38852f6f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 581
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCwj^(N7a$D;Kb?2i11Zh|kH}&m
z?E%JaC$sH9f@KAc=|CE+pW)oQo^S>R#tWV<jv*QM-p<(T#q223`d(|}M1_d1Wmg&^
zROfE=$$u#QgD)w)rdgndhuhoNN1%qoRma7(dZX|k9T``>$vf<gHw!*LAZEU~_*u<O
z$+9%pML=*WWYTu!4O&XKl`e@*OcjhY^yOFjq@lztXz4lW$+8>|**%Orp6eAaXjpG&
z5PiT=abDn`_xok}OV@npKA_=VuvTz`gw>xrEt<t#Z<tCG?!}aTzWuUA(^On&K{{t4
z>z1G|xihP`RxLbau3P+%DdNO~jS0VAm|o;zELg|3@0?JaV~qCt;`<M;>-7J-o@sn=
zed@>P&zu{Ui?3n!-@D;^SJgS6jO^9FZXEo-$oAIGm>{MrA+;|V9ICGr?OY=GVUb+<
z)yDMD%6%eV=V)dH1Z=iroEN(HiNc0&6`wc@*1ytaXSntFocaNWtJZuBTaI67TprsP
zm-6}^!<hwk+l6Y^KRkQD&b)Z`Jw_h}`P(n^CVWt9dCh!Q`oVi%8@5ANCw}t1%C4x`
zCHHE#!`Vw>e1{rR{;nxH*8kP$*}M$`YA3Yjr?)ZA=l*&%X1jy@4R$k~zgEG_fedy|
zKCMbew!DaUo>IHyPuL_CSwYJ!rc>wYPQEhv#gw_rIgZ@tkrx#e{kr`N<La+Ytxt*-
QKnaGy)78&qol`;+0Gs6U^8f$<

diff --git a/Examples/Movies/android/app/src/main/res/drawable-xxhdpi/android_back_white.png b/Examples/Movies/android/app/src/main/res/drawable-xxhdpi/android_back_white.png
deleted file mode 100644
index 03620979ea75d98afd162a3c87062d32b2f66667..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 337
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw1WQ~aN`mv#O3D+9QW*;J(vyoy
zi!&TbJwF2_e|x$(hGg7(d+j7IlOYf5g_Q|f4StcA)SY#o&0)!W^z^ovg<bv2)bDQ5
z>%5L>1~hVoEMWS}zasE7OO}g^nTmCv;K@nJPMe+z?9J$BIXlPu2^XV<lt7Czd!t2=
zK#wvrqot6*l*8<emN5cz4l`R8SSW~}vpUhanXBmWnnoE*ZH4f2mM3Nwvq@P_b7pWV
zVo}g}F7EJho6f_9eid(p?Rq%(_qEJ_ZGK7ccAdo}6Wuq0w+~rO+|f9*q?h%e=OlqC
zD&35pmmYXjMNfPZDBvmFHld`D!P9#2%q_>8+%D->wN_oS{l)WjiTfAb*PiEJlyiiz
fYC$|<_?r2`s>aPtPE0w#U|{fc^>bP0l+XkKNSc6;

diff --git a/Examples/Movies/android/app/src/main/res/drawable-xxhdpi/android_search_white.png b/Examples/Movies/android/app/src/main/res/drawable-xxhdpi/android_search_white.png
deleted file mode 100755
index d9f75bc794e76f1e7057b35124cefe6c2fa9c5c8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 930
zcmV;T16}-yP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00006VoOIv00000
z008+zyMF)x010qNS#tmY07w7;07w8v$!k6U000Sga6xAP002k;002k;&Ux?!0009m
zNkl<Zc-rlnO-mI~9EX3WFm+LC?Ly&#P)M$WyAlbZO|%hO^(AbRU!XpLA0gan(WaD$
z7LmFUqKE=ZMB0dS)r~jOr^OxNa=B;ToO90%o@aTS`+s?y;k?X9fj}S-2m}IwKo^Xw
zz`%&4dy=Lk-H~)l(p5><BppgRlJrB;S4kfvy)(xA@h!wTzzpybI3^p%(eGw__uxuQ
z9azsO#l|{N_uW%bVg`T(;Itq)XPicH2YmN<9yw#cX2D`Q*#yRX_nJq}1hC^+&KWzv
zgpWRR&0@f)q)(DY6D~cJ^hVNaN#7*>mb5SFhNPR4CL}$ObYHF6EskADbz{t~4^dg<
z45oOj_JAiqf6AEs(e-;N9=Ac?4w9N#NNC~(Fq|{?aP<2)7JNI1YoLyOwmJo#0_R$M
z0w#(Rm#3Ud0AMZVKRaJ=uKAc;Yrb7{D|ja1u_|=i65UC0k6XD`+`zJ>(0yRYQO=<#
zem9nVJ83U;1ZY|copYRf&XTuDYeVcGVAfJ(1IJqdT3eZhCI77J-Y=!RZpt#gVvIR<
zSzr`@C1YKMkyg;8W&D-v0u%B~W{Q%7w1UPh<KJBun2={YQ<NN}6=a*GdbKaI<#955
zwv%e@0$}-5zcJ>o>mq?GlA2u`Fvi)jv6TJ}I<$;mcUfGDJV&k*rxkQy8BaRyC<<Gi
zgG^C!kXF!^W&F150u%CVWr~u6w1U1^#vi&aFd@(99_5dx#4G7XzTKP^S=POn^JzXy
zp=I06FZp)TS!~(PgYNov(yi#SoG7mPc3~^J3}@2+DC?PY)PV1|8qa+@NNU38d$A3m
zub2H+>CLJnElPT9j5+D0q+HP3ck|u&1=M_dNRrfxuRAt?#VSj3^?lF@@C@h!E?4?a
zibNIph1n_{Q+dMm)sPf5lJ^_MCa{EMg&axfxg=j-xgJSsNcySPk;O+zZ;dgHn0Pfw
z?<K`a*p@VHjM;Y8SE&JNzV4*T5F`ajK~j)ZCW53ODM+fcq_i&%D?zk^o>pr`9k3B|
zCtd7Eteq~Bf}Bp;Bn3G(B1tvhbp!%|Kp+qZ1OgX}|BrB-B9PU+=Kufz07*qoM6N<$
Eg1Z%=^Z)<=

diff --git a/Examples/Movies/android/app/src/main/res/drawable/rotten_tomatoes_icon.png b/Examples/Movies/android/app/src/main/res/drawable/rotten_tomatoes_icon.png
deleted file mode 100644
index 395d7043130e5e1712052cf5722608b7f4315b4a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 58467
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

diff --git a/Examples/Movies/android/app/src/main/res/layout/activity_main.xml b/Examples/Movies/android/app/src/main/res/layout/activity_main.xml
deleted file mode 100644
index d42c3b844e6301..00000000000000
--- a/Examples/Movies/android/app/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".MoviesApp">
-
-    <com.facebook.react.ReactRootView
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:id="@+id/react_root_view"/>
-
-</RelativeLayout>
diff --git a/Examples/Movies/android/app/src/main/res/values/strings.xml b/Examples/Movies/android/app/src/main/res/values/strings.xml
deleted file mode 100644
index 7c4632e0d0e8be..00000000000000
--- a/Examples/Movies/android/app/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">MoviesApp</string>
-</resources>
diff --git a/Examples/Movies/android/app/src/main/res/values/styles.xml b/Examples/Movies/android/app/src/main/res/values/styles.xml
deleted file mode 100644
index 319eb0ca100b5a..00000000000000
--- a/Examples/Movies/android/app/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <!-- Customize your theme here. -->
-    </style>
-
-</resources>
diff --git a/Examples/Movies/getImageSource.js b/Examples/Movies/getImageSource.js
deleted file mode 100644
index d2332625e6b63f..00000000000000
--- a/Examples/Movies/getImageSource.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * @flow
- * @providesModule getImageSource
- */
-'use strict';
-
-function getImageSource(movie: Object, kind: ?string): {uri: ?string} {
-  var uri = movie && movie.posters ? movie.posters.thumbnail : null;
-  if (uri && kind) {
-    uri = uri.replace('tmb', kind);
-  }
-  return { uri };
-}
-
-module.exports = getImageSource;
diff --git a/Examples/Movies/getStyleFromScore.js b/Examples/Movies/getStyleFromScore.js
deleted file mode 100644
index 553c0002b12565..00000000000000
--- a/Examples/Movies/getStyleFromScore.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * @flow
- * @providesModule getStyleFromScore
- */
-'use strict';
-
-var ReactNative = require('react-native');
-var {
-  StyleSheet,
-} = ReactNative;
-
-var MAX_VALUE = 200;
-
-import type { StyleObj } from 'StyleSheetTypes';
-
-function getStyleFromScore(score: number): StyleObj {
-  if (score < 0) {
-    return styles.noScore;
-  }
-
-  var normalizedScore = Math.round((score / 100) * MAX_VALUE);
-  return {
-    color: 'rgb(' +
-      (MAX_VALUE - normalizedScore) + ', ' +
-      normalizedScore + ', ' +
-      0 +
-    ')'
-  };
-}
-
-var styles = StyleSheet.create({
-  noScore: {
-    color: '#999999',
-  },
-});
-
-module.exports = getStyleFromScore;
diff --git a/Examples/Movies/getTextFromScore.js b/Examples/Movies/getTextFromScore.js
deleted file mode 100644
index f36c22e32832ec..00000000000000
--- a/Examples/Movies/getTextFromScore.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * @flow
- * @providesModule getTextFromScore
- */
-'use strict';
-
-function getTextFromScore(score: number): string {
-  return score > 0 ? score + '%' : 'N/A';
-}
-
-module.exports = getTextFromScore;
diff --git a/Examples/TicTacToe/TicTacToe.xcodeproj/project.pbxproj b/Examples/TicTacToe/TicTacToe.xcodeproj/project.pbxproj
deleted file mode 100644
index f1f1514d32dc86..00000000000000
--- a/Examples/TicTacToe/TicTacToe.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,518 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 46;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		1341803E1AA91802003F314A /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1341803D1AA917ED003F314A /* libRCTImage.a */; };
-		13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
-		13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; };
-		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
-		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
-		144C5F691AC3E5E300B004E7 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 144C5F681AC3E5D800B004E7 /* libReact.a */; };
-		58C572511AA6229D00CDF9C8 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 58C5724D1AA6224400CDF9C8 /* libRCTText.a */; };
-		5FF8942E1B85571A007731BE /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5FF8942D1B8556F8007731BE /* libRCTWebSocket.a */; };
-		832044981B492C2500E297FC /* libRCTSettings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832044951B492C1E00E297FC /* libRCTSettings.a */; };
-		E730D7731D4EE604000B7DA8 /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E730D76E1D4EE5FC000B7DA8 /* libRCTNetwork.a */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXContainerItemProxy section */
-		1341803C1AA917ED003F314A /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 134180381AA917ED003F314A /* RCTImage.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 58B5115D1A9E6B3D00147676;
-			remoteInfo = RCTImage;
-		};
-		144C5F671AC3E5D800B004E7 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 144C5F631AC3E5D800B004E7 /* React.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 83CBBA2E1A601D0E00E9B192;
-			remoteInfo = React;
-		};
-		58C5724C1AA6224400CDF9C8 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 587650DA1A9EB0DB008B8F17 /* RCTText.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 58B5119B1A9E6C1200147676;
-			remoteInfo = RCTText;
-		};
-		5FF8942C1B8556F8007731BE /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 5FF894281B8556F8007731BE /* RCTWebSocket.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 3C86DF461ADF2C930047B81A;
-			remoteInfo = RCTWebSocket;
-		};
-		832044941B492C1E00E297FC /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 8320448F1B492C1E00E297FC /* RCTSettings.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 134814201AA4EA6300B7C361;
-			remoteInfo = RCTSettings;
-		};
-		E730D76D1D4EE5FC000B7DA8 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = E730D7681D4EE5FC000B7DA8 /* RCTNetwork.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 58B511DB1A9E6C8500147676;
-			remoteInfo = RCTNetwork;
-		};
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXFileReference section */
-		134180381AA917ED003F314A /* RCTImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTImage.xcodeproj; path = ../../Libraries/Image/RCTImage.xcodeproj; sourceTree = "<group>"; };
-		13B07F961A680F5B00A75B9A /* TicTacToe.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TicTacToe.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = TicTacToe/AppDelegate.h; sourceTree = "<group>"; };
-		13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = TicTacToe/AppDelegate.m; sourceTree = "<group>"; };
-		13B07FB21A68108700A75B9A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
-		13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = TicTacToe/Images.xcassets; sourceTree = "<group>"; };
-		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = TicTacToe/Info.plist; sourceTree = "<group>"; };
-		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = TicTacToe/main.m; sourceTree = "<group>"; };
-		144C5F631AC3E5D800B004E7 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = ../../React/React.xcodeproj; sourceTree = "<group>"; };
-		587650DA1A9EB0DB008B8F17 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = ../../Libraries/Text/RCTText.xcodeproj; sourceTree = "<group>"; };
-		5FF894281B8556F8007731BE /* RCTWebSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocket.xcodeproj; path = ../../Libraries/WebSocket/RCTWebSocket.xcodeproj; sourceTree = "<group>"; };
-		8320448F1B492C1E00E297FC /* RCTSettings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTSettings.xcodeproj; path = ../../Libraries/Settings/RCTSettings.xcodeproj; sourceTree = "<group>"; };
-		E730D7681D4EE5FC000B7DA8 /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = ../../Libraries/Network/RCTNetwork.xcodeproj; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		13B07F8C1A680F5B00A75B9A /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				E730D7731D4EE604000B7DA8 /* libRCTNetwork.a in Frameworks */,
-				5FF8942E1B85571A007731BE /* libRCTWebSocket.a in Frameworks */,
-				144C5F691AC3E5E300B004E7 /* libReact.a in Frameworks */,
-				1341803E1AA91802003F314A /* libRCTImage.a in Frameworks */,
-				58C572511AA6229D00CDF9C8 /* libRCTText.a in Frameworks */,
-				832044981B492C2500E297FC /* libRCTSettings.a in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		134180391AA917ED003F314A /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				1341803D1AA917ED003F314A /* libRCTImage.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		13B07FAE1A68108700A75B9A /* TicTacToe */ = {
-			isa = PBXGroup;
-			children = (
-				13B07FAF1A68108700A75B9A /* AppDelegate.h */,
-				13B07FB01A68108700A75B9A /* AppDelegate.m */,
-				13B07FB51A68108700A75B9A /* Images.xcassets */,
-				13B07FB61A68108700A75B9A /* Info.plist */,
-				13B07FB11A68108700A75B9A /* LaunchScreen.xib */,
-				13B07FB71A68108700A75B9A /* main.m */,
-			);
-			name = TicTacToe;
-			sourceTree = "<group>";
-		};
-		144C5F641AC3E5D800B004E7 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				144C5F681AC3E5D800B004E7 /* libReact.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		58C572071AA6126D00CDF9C8 /* Libraries */ = {
-			isa = PBXGroup;
-			children = (
-				E730D7681D4EE5FC000B7DA8 /* RCTNetwork.xcodeproj */,
-				5FF894281B8556F8007731BE /* RCTWebSocket.xcodeproj */,
-				144C5F631AC3E5D800B004E7 /* React.xcodeproj */,
-				134180381AA917ED003F314A /* RCTImage.xcodeproj */,
-				8320448F1B492C1E00E297FC /* RCTSettings.xcodeproj */,
-				587650DA1A9EB0DB008B8F17 /* RCTText.xcodeproj */,
-			);
-			name = Libraries;
-			sourceTree = "<group>";
-		};
-		58C572481AA6224300CDF9C8 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				58C5724D1AA6224400CDF9C8 /* libRCTText.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		5FF894291B8556F8007731BE /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				5FF8942D1B8556F8007731BE /* libRCTWebSocket.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		832044901B492C1E00E297FC /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				832044951B492C1E00E297FC /* libRCTSettings.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		83CBB9F61A601CBA00E9B192 = {
-			isa = PBXGroup;
-			children = (
-				13B07FAE1A68108700A75B9A /* TicTacToe */,
-				58C572071AA6126D00CDF9C8 /* Libraries */,
-				83CBBA001A601CBA00E9B192 /* Products */,
-			);
-			indentWidth = 2;
-			sourceTree = "<group>";
-			tabWidth = 2;
-		};
-		83CBBA001A601CBA00E9B192 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				13B07F961A680F5B00A75B9A /* TicTacToe.app */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		E730D7691D4EE5FC000B7DA8 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				E730D76E1D4EE5FC000B7DA8 /* libRCTNetwork.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		13B07F861A680F5B00A75B9A /* TicTacToe */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "TicTacToe" */;
-			buildPhases = (
-				13B07F871A680F5B00A75B9A /* Sources */,
-				13B07F8C1A680F5B00A75B9A /* Frameworks */,
-				13B07F8E1A680F5B00A75B9A /* Resources */,
-				681C70ED1D2BE73C00E71791 /* ShellScript */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = TicTacToe;
-			productName = "Hello World";
-			productReference = 13B07F961A680F5B00A75B9A /* TicTacToe.app */;
-			productType = "com.apple.product-type.application";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		83CBB9F71A601CBA00E9B192 /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastUpgradeCheck = 0700;
-				ORGANIZATIONNAME = Facebook;
-			};
-			buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "TicTacToe" */;
-			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				en,
-				Base,
-			);
-			mainGroup = 83CBB9F61A601CBA00E9B192;
-			productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */;
-			projectDirPath = "";
-			projectReferences = (
-				{
-					ProductGroup = 134180391AA917ED003F314A /* Products */;
-					ProjectRef = 134180381AA917ED003F314A /* RCTImage.xcodeproj */;
-				},
-				{
-					ProductGroup = E730D7691D4EE5FC000B7DA8 /* Products */;
-					ProjectRef = E730D7681D4EE5FC000B7DA8 /* RCTNetwork.xcodeproj */;
-				},
-				{
-					ProductGroup = 832044901B492C1E00E297FC /* Products */;
-					ProjectRef = 8320448F1B492C1E00E297FC /* RCTSettings.xcodeproj */;
-				},
-				{
-					ProductGroup = 58C572481AA6224300CDF9C8 /* Products */;
-					ProjectRef = 587650DA1A9EB0DB008B8F17 /* RCTText.xcodeproj */;
-				},
-				{
-					ProductGroup = 5FF894291B8556F8007731BE /* Products */;
-					ProjectRef = 5FF894281B8556F8007731BE /* RCTWebSocket.xcodeproj */;
-				},
-				{
-					ProductGroup = 144C5F641AC3E5D800B004E7 /* Products */;
-					ProjectRef = 144C5F631AC3E5D800B004E7 /* React.xcodeproj */;
-				},
-			);
-			projectRoot = "";
-			targets = (
-				13B07F861A680F5B00A75B9A /* TicTacToe */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXReferenceProxy section */
-		1341803D1AA917ED003F314A /* libRCTImage.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libRCTImage.a;
-			remoteRef = 1341803C1AA917ED003F314A /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		144C5F681AC3E5D800B004E7 /* libReact.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libReact.a;
-			remoteRef = 144C5F671AC3E5D800B004E7 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		58C5724D1AA6224400CDF9C8 /* libRCTText.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libRCTText.a;
-			remoteRef = 58C5724C1AA6224400CDF9C8 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		5FF8942D1B8556F8007731BE /* libRCTWebSocket.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libRCTWebSocket.a;
-			remoteRef = 5FF8942C1B8556F8007731BE /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		832044951B492C1E00E297FC /* libRCTSettings.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libRCTSettings.a;
-			remoteRef = 832044941B492C1E00E297FC /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		E730D76E1D4EE5FC000B7DA8 /* libRCTNetwork.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libRCTNetwork.a;
-			remoteRef = E730D76D1D4EE5FC000B7DA8 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-/* End PBXReferenceProxy section */
-
-/* Begin PBXResourcesBuildPhase section */
-		13B07F8E1A680F5B00A75B9A /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
-				13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXShellScriptBuildPhase section */
-		681C70ED1D2BE73C00E71791 /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "export NODE_BINARY=node\n$SRCROOT/../../packager/react-native-xcode.sh Examples/TicTacToe/TicTacToeApp.js\n";
-		};
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		13B07F871A680F5B00A75B9A /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */,
-				13B07FC11A68108700A75B9A /* main.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXVariantGroup section */
-		13B07FB11A68108700A75B9A /* LaunchScreen.xib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				13B07FB21A68108700A75B9A /* Base */,
-			);
-			name = LaunchScreen.xib;
-			path = TicTacToe;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-		13B07F941A680F5B00A75B9A /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					"$(SRCROOT)/../../React/**",
-				);
-				INFOPLIST_FILE = "$(SRCROOT)/TicTacToe/Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				OTHER_LDFLAGS = (
-					"-ObjC",
-					"-lc++",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = TicTacToe;
-			};
-			name = Debug;
-		};
-		13B07F951A680F5B00A75B9A /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					"$(SRCROOT)/../../React/**",
-				);
-				INFOPLIST_FILE = "$(SRCROOT)/TicTacToe/Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				OTHER_LDFLAGS = (
-					"-ObjC",
-					"-lc++",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = TicTacToe;
-			};
-			name = Release;
-		};
-		83CBBA201A601CBA00E9B192 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_TESTABILITY = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					"$(SRCROOT)/../../React/**",
-				);
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				MTL_ENABLE_DEBUG_INFO = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = iphoneos;
-			};
-			name = Debug;
-		};
-		83CBBA211A601CBA00E9B192 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = YES;
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					"$(SRCROOT)/../../React/**",
-				);
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				SDKROOT = iphoneos;
-				VALIDATE_PRODUCT = YES;
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "TicTacToe" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				13B07F941A680F5B00A75B9A /* Debug */,
-				13B07F951A680F5B00A75B9A /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "TicTacToe" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				83CBBA201A601CBA00E9B192 /* Debug */,
-				83CBBA211A601CBA00E9B192 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 83CBB9F71A601CBA00E9B192 /* Project object */;
-}
diff --git a/Examples/TicTacToe/TicTacToe.xcodeproj/xcshareddata/xcschemes/TicTacToe.xcscheme b/Examples/TicTacToe/TicTacToe.xcodeproj/xcshareddata/xcschemes/TicTacToe.xcscheme
deleted file mode 100644
index 635a53803474a1..00000000000000
--- a/Examples/TicTacToe/TicTacToe.xcodeproj/xcshareddata/xcschemes/TicTacToe.xcscheme
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0700"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "NO"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "83CBBA2D1A601D0E00E9B192"
-               BuildableName = "libReact.a"
-               BlueprintName = "React"
-               ReferencedContainer = "container:../../React/React.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
-               BuildableName = "TicTacToe.app"
-               BlueprintName = "TicTacToe"
-               ReferencedContainer = "container:TicTacToe.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
-            BuildableName = "TicTacToe.app"
-            BlueprintName = "TicTacToe"
-            ReferencedContainer = "container:TicTacToe.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
-            BuildableName = "TicTacToe.app"
-            BlueprintName = "TicTacToe"
-            ReferencedContainer = "container:TicTacToe.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
-            BuildableName = "TicTacToe.app"
-            BlueprintName = "TicTacToe"
-            ReferencedContainer = "container:TicTacToe.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/Examples/TicTacToe/TicTacToe/AppDelegate.h b/Examples/TicTacToe/TicTacToe/AppDelegate.h
deleted file mode 100644
index 1a4317567ce256..00000000000000
--- a/Examples/TicTacToe/TicTacToe/AppDelegate.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <UIKit/UIKit.h>
-
-@interface AppDelegate : UIResponder <UIApplicationDelegate>
-
-@property (nonatomic, strong) UIWindow *window;
-
-@end
diff --git a/Examples/TicTacToe/TicTacToe/AppDelegate.m b/Examples/TicTacToe/TicTacToe/AppDelegate.m
deleted file mode 100644
index 3e7399917b5530..00000000000000
--- a/Examples/TicTacToe/TicTacToe/AppDelegate.m
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "AppDelegate.h"
-
-#import "RCTBundleURLProvider.h"
-#import "RCTRootView.h"
-
-@implementation AppDelegate
-
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
-{
-  NSURL *jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"Examples/TicTacToe/TicTacToeApp" fallbackResource:nil];
-
-  RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation
-                                                      moduleName:@"TicTacToeApp"
-                                                initialProperties:nil
-                                                   launchOptions:launchOptions];
-
-  self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-  UIViewController *rootViewController = [UIViewController new];
-  rootViewController.view = rootView;
-  self.window.rootViewController = rootViewController;
-  [self.window makeKeyAndVisible];
-  return YES;
-}
-
-@end
diff --git a/Examples/TicTacToe/TicTacToe/Base.lproj/LaunchScreen.xib b/Examples/TicTacToe/TicTacToe/Base.lproj/LaunchScreen.xib
deleted file mode 100644
index c2d4e9079046d7..00000000000000
--- a/Examples/TicTacToe/TicTacToe/Base.lproj/LaunchScreen.xib
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6254" systemVersion="14B25" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6247"/>
-        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB">
-            <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2015 Facebook. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
-                    <rect key="frame" x="20" y="439" width="441" height="21"/>
-                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                    <nil key="highlightedColor"/>
-                </label>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="TicTacToe" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
-                    <rect key="frame" x="20" y="140" width="441" height="43"/>
-                    <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                    <nil key="highlightedColor"/>
-                </label>
-            </subviews>
-            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-            <constraints>
-                <constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
-                <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
-                <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l"/>
-                <constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0"/>
-                <constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9"/>
-                <constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g"/>
-            </constraints>
-            <nil key="simulatedStatusBarMetrics"/>
-            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <point key="canvasLocation" x="548" y="455"/>
-        </view>
-    </objects>
-</document>
diff --git a/Examples/TicTacToe/TicTacToe/Images.xcassets/AppIcon.appiconset/Contents.json b/Examples/TicTacToe/TicTacToe/Images.xcassets/AppIcon.appiconset/Contents.json
deleted file mode 100644
index 118c98f7461bf9..00000000000000
--- a/Examples/TicTacToe/TicTacToe/Images.xcassets/AppIcon.appiconset/Contents.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "iphone",
-      "size" : "29x29",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "29x29",
-      "scale" : "3x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "40x40",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "40x40",
-      "scale" : "3x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "60x60",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "60x60",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/Examples/TicTacToe/TicTacToe/Info.plist b/Examples/TicTacToe/TicTacToe/Info.plist
deleted file mode 100644
index 25742279c9dce4..00000000000000
--- a/Examples/TicTacToe/TicTacToe/Info.plist
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>armv7</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
-	<key>NSAppTransportSecurity</key>
-  <dict>
-    <!--See http://ste.vn/2015/06/10/configuring-app-transport-security-ios-9-osx-10-11/-->
-    <key>NSAllowsArbitraryLoads</key>
-    <true/>
-  </dict>
-</dict>
-</plist>
diff --git a/Examples/TicTacToe/TicTacToe/main.m b/Examples/TicTacToe/TicTacToe/main.m
deleted file mode 100644
index 9c58a39a483c81..00000000000000
--- a/Examples/TicTacToe/TicTacToe/main.m
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <UIKit/UIKit.h>
-#import "AppDelegate.h"
-
-int main(int argc, char * argv[]) {
-  @autoreleasepool {
-    return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
-  }
-}
diff --git a/Examples/TicTacToe/TicTacToeApp.js b/Examples/TicTacToe/TicTacToeApp.js
deleted file mode 100755
index 17d41a7e675870..00000000000000
--- a/Examples/TicTacToe/TicTacToeApp.js
+++ /dev/null
@@ -1,327 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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.
- *
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * @providesModule TicTacToeApp
- * @flow
- */
-'use strict';
-
-var React = require('react');
-var ReactNative = require('react-native');
-var {
-  AppRegistry,
-  StyleSheet,
-  Text,
-  TouchableHighlight,
-  View,
-} = ReactNative;
-
-class Board {
-  grid: Array<Array<number>>;
-  turn: number;
-
-  constructor() {
-    var size = 3;
-    var grid = Array(size);
-    for (var i = 0; i < size; i++) {
-      var row = Array(size);
-      for (var j = 0; j < size; j++) {
-        row[j] = 0;
-      }
-      grid[i] = row;
-    }
-    this.grid = grid;
-
-    this.turn = 1;
-  }
-
-  mark(row: number, col: number, player: number): Board {
-    this.grid[row][col] = player;
-    return this;
-  }
-
-  hasMark(row: number, col: number): boolean {
-    return this.grid[row][col] !== 0;
-  }
-
-  winner(): ?number {
-    for (var i = 0; i < 3; i++) {
-      if (this.grid[i][0] !== 0 && this.grid[i][0] === this.grid[i][1] &&
-          this.grid[i][0] === this.grid[i][2]) {
-        return this.grid[i][0];
-      }
-    }
-
-    for (var i = 0; i < 3; i++) {
-      if (this.grid[0][i] !== 0 && this.grid[0][i] === this.grid[1][i] &&
-          this.grid[0][i] === this.grid[2][i]) {
-        return this.grid[0][i];
-      }
-    }
-
-    if (this.grid[0][0] !== 0 && this.grid[0][0] === this.grid[1][1] &&
-        this.grid[0][0] === this.grid[2][2]) {
-      return this.grid[0][0];
-    }
-
-    if (this.grid[0][2] !== 0 && this.grid[0][2] === this.grid[1][1] &&
-        this.grid[0][2] === this.grid[2][0]) {
-      return this.grid[0][2];
-    }
-
-    return null;
-  }
-
-  tie(): boolean {
-    for (var i = 0; i < 3; i++) {
-      for (var j = 0; j < 3; j++) {
-        if (this.grid[i][j] === 0) {
-          return false;
-        }
-      }
-    }
-    return this.winner() === null;
-  }
-}
-
-class Cell extends React.Component {
-  cellStyle() {
-    switch (this.props.player) {
-      case 1:
-        return styles.cellX;
-      case 2:
-        return styles.cellO;
-      default:
-        return null;
-    }
-  }
-
-  textStyle() {
-    switch (this.props.player) {
-      case 1:
-        return styles.cellTextX;
-      case 2:
-        return styles.cellTextO;
-      default:
-        return {};
-    }
-  }
-
-  textContents() {
-    switch (this.props.player) {
-      case 1:
-        return 'X';
-      case 2:
-        return 'O';
-      default:
-        return '';
-    }
-  }
-
-  render() {
-    return (
-      <TouchableHighlight
-        onPress={this.props.onPress}
-        underlayColor="transparent"
-        activeOpacity={0.5}>
-        <View style={[styles.cell, this.cellStyle()]}>
-          <Text style={[styles.cellText, this.textStyle()]}>
-            {this.textContents()}
-          </Text>
-        </View>
-      </TouchableHighlight>
-    );
-  }
-}
-
-class GameEndOverlay extends React.Component {
-  render() {
-    var board = this.props.board;
-
-    var tie = board.tie();
-    var winner = board.winner();
-    if (!winner && !tie) {
-      return null;
-    }
-
-    var message;
-    if (tie) {
-      message = 'It\'s a tie!';
-    } else {
-      message = (winner === 1 ? 'X' : 'O') + ' wins!';
-    }
-
-    return (
-      <View style={styles.overlay}>
-        <Text style={styles.overlayMessage}>{message}</Text>
-        <TouchableHighlight
-          onPress={this.props.onRestart}
-          underlayColor="transparent"
-          activeOpacity={0.5}>
-          <View style={styles.newGame}>
-            <Text style={styles.newGameText}>New Game</Text>
-          </View>
-        </TouchableHighlight>
-      </View>
-    );
-  }
-}
-
-var TicTacToeApp = React.createClass({
-  getInitialState() {
-    return { board: new Board(), player: 1 };
-  },
-
-  restartGame() {
-    this.setState(this.getInitialState());
-  },
-
-  nextPlayer(): number {
-    return this.state.player === 1 ? 2 : 1;
-  },
-
-  handleCellPress(row: number, col: number) {
-    if (this.state.board.hasMark(row, col)) {
-      return;
-    }
-
-    this.setState({
-      board: this.state.board.mark(row, col, this.state.player),
-      player: this.nextPlayer(),
-    });
-  },
-
-  render() {
-    var rows = this.state.board.grid.map((cells, row) =>
-      <View key={'row' + row} style={styles.row}>
-        {cells.map((player, col) =>
-          <Cell
-            key={'cell' + col}
-            player={player}
-            onPress={this.handleCellPress.bind(this, row, col)}
-          />
-        )}
-      </View>
-    );
-
-    return (
-      <View style={styles.container}>
-        <Text style={styles.title}>EXTREME T3</Text>
-        <View style={styles.board}>
-          {rows}
-        </View>
-        <GameEndOverlay
-          board={this.state.board}
-          onRestart={this.restartGame}
-        />
-      </View>
-    );
-  }
-});
-
-var styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    justifyContent: 'center',
-    alignItems: 'center',
-    backgroundColor: 'white'
-  },
-  title: {
-    fontFamily: 'Chalkduster',
-    fontSize: 39,
-    marginBottom: 20,
-  },
-  board: {
-    padding: 5,
-    backgroundColor: '#47525d',
-    borderRadius: 10,
-  },
-  row: {
-    flexDirection: 'row',
-  },
-
-  // CELL
-
-  cell: {
-    width: 80,
-    height: 80,
-    borderRadius: 5,
-    backgroundColor: '#7b8994',
-    margin: 5,
-    justifyContent: 'center',
-    alignItems: 'center',
-  },
-  cellX: {
-    backgroundColor: '#72d0eb',
-  },
-  cellO: {
-    backgroundColor: '#7ebd26',
-  },
-
-  // CELL TEXT
-
-  cellText: {
-    fontSize: 50,
-    fontFamily: 'AvenirNext-Bold',
-  },
-  cellTextX: {
-    color: '#19a9e5',
-  },
-  cellTextO: {
-    color: '#b9dc2f',
-  },
-
-  // GAME OVER
-
-  overlay: {
-    position: 'absolute',
-    top: 0,
-    bottom: 0,
-    left: 0,
-    right: 0,
-    backgroundColor: 'rgba(221, 221, 221, 0.5)',
-    flex: 1,
-    flexDirection: 'column',
-    justifyContent: 'center',
-    alignItems: 'center',
-  },
-  overlayMessage: {
-    fontSize: 40,
-    marginBottom: 20,
-    marginLeft: 20,
-    marginRight: 20,
-    fontFamily: 'AvenirNext-DemiBold',
-    textAlign: 'center',
-  },
-  newGame: {
-    backgroundColor: '#887765',
-    padding: 20,
-    borderRadius: 5,
-  },
-  newGameText: {
-    color: 'white',
-    fontSize: 20,
-    fontFamily: 'AvenirNext-DemiBold',
-  },
-});
-
-AppRegistry.registerComponent('TicTacToeApp', () => TicTacToeApp);
-
-module.exports = TicTacToeApp;
diff --git a/Examples/TicTacToe/android/app/BUCK b/Examples/TicTacToe/android/app/BUCK
deleted file mode 100644
index 3dae6c388d4c01..00000000000000
--- a/Examples/TicTacToe/android/app/BUCK
+++ /dev/null
@@ -1,31 +0,0 @@
-include_defs("//ReactAndroid/DEFS")
-
-android_binary(
-    name = "app",
-    keystore = "//keystores:debug",
-    manifest = "src/main/AndroidManifest.xml",
-    deps = [
-        ":tictactoe-lib",
-    ],
-)
-
-android_library(
-    name = "tictactoe-lib",
-    srcs = glob(["src/main/java/**/*.java"]),
-    deps = [
-        ":res",
-        react_native_dep("third-party/java/jsr-305:jsr-305"),
-        react_native_target("java/com/facebook/react:react"),
-        react_native_target("java/com/facebook/react/modules/core:core"),
-        react_native_target("java/com/facebook/react/shell:shell"),
-        react_native_target("jni/prebuilt:android-jsc"),
-        # .so files are prebuilt by Gradle with `./gradlew :ReactAndroid:packageReactNdkLibsForBuck`
-        react_native_target("jni/prebuilt:reactnative-libs"),
-    ],
-)
-
-android_resource(
-    name = "res",
-    package = "com.facebook.react.tictactoe",
-    res = "src/main/res",
-)
diff --git a/Examples/TicTacToe/android/app/build.gradle b/Examples/TicTacToe/android/app/build.gradle
deleted file mode 100644
index 94509eca564bdb..00000000000000
--- a/Examples/TicTacToe/android/app/build.gradle
+++ /dev/null
@@ -1,31 +0,0 @@
-apply plugin: 'com.android.application'
-
-android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
-
-    defaultConfig {
-        applicationId "com.facebook.react.tictactoe"
-        minSdkVersion 16
-        targetSdkVersion 22
-        versionCode 1
-        versionName "1.0"
-        ndk {
-            abiFilters "armeabi-v7a", "x86"
-        }
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-}
-
-dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:23.0.1'
-
-    // Build React Native from source
-    compile project(':ReactAndroid')
-}
diff --git a/Examples/TicTacToe/android/app/gradle.properties b/Examples/TicTacToe/android/app/gradle.properties
deleted file mode 100644
index dfbe478748b403..00000000000000
--- a/Examples/TicTacToe/android/app/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-android.useDeprecatedNdk=true
diff --git a/Examples/TicTacToe/android/app/proguard-rules.pro b/Examples/TicTacToe/android/app/proguard-rules.pro
deleted file mode 100644
index a92fa177ee49f0..00000000000000
--- a/Examples/TicTacToe/android/app/proguard-rules.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /usr/local/Cellar/android-sdk/24.3.3/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/Examples/TicTacToe/android/app/src/main/AndroidManifest.xml b/Examples/TicTacToe/android/app/src/main/AndroidManifest.xml
deleted file mode 100644
index a6dbe21557ad43..00000000000000
--- a/Examples/TicTacToe/android/app/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.facebook.react.tictactoe"
-    android:versionCode="1"
-    android:versionName="1.0">
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
-
-    <uses-sdk
-      android:minSdkVersion="16"
-      android:targetSdkVersion="22" />
-
-    <application
-      android:name=".TicTacToeApplication"
-      android:allowBackup="true"
-      android:label="@string/app_name"
-      android:icon="@drawable/launcher_icon"
-      android:theme="@style/AppTheme">
-      <activity
-        android:name=".TicTacToeActivity">
-        <intent-filter>
-            <action android:name="android.intent.action.MAIN" />
-            <category android:name="android.intent.category.LAUNCHER" />
-        </intent-filter>
-      </activity>
-      <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
-    </application>
-
-</manifest>
diff --git a/Examples/TicTacToe/android/app/src/main/java/com/facebook/react/tictactoe/TicTacToeActivity.java b/Examples/TicTacToe/android/app/src/main/java/com/facebook/react/tictactoe/TicTacToeActivity.java
deleted file mode 100644
index 3589ea4e5a6fe1..00000000000000
--- a/Examples/TicTacToe/android/app/src/main/java/com/facebook/react/tictactoe/TicTacToeActivity.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package com.facebook.react.tictactoe;
-
-import com.facebook.react.ReactActivity;
-
-public class TicTacToeActivity extends ReactActivity {
-  @Override
-  protected String getMainComponentName() {
-    return "TicTacToeApp";
-  }
-}
diff --git a/Examples/TicTacToe/android/app/src/main/java/com/facebook/react/tictactoe/TicTacToeApplication.java b/Examples/TicTacToe/android/app/src/main/java/com/facebook/react/tictactoe/TicTacToeApplication.java
deleted file mode 100644
index c765a847cf39cd..00000000000000
--- a/Examples/TicTacToe/android/app/src/main/java/com/facebook/react/tictactoe/TicTacToeApplication.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-package com.facebook.react.tictactoe;
-
-import android.app.Application;
-
-import com.facebook.react.ReactApplication;
-import com.facebook.react.ReactNativeHost;
-import com.facebook.react.ReactPackage;
-import com.facebook.react.shell.MainReactPackage;
-
-import java.util.Arrays;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-public class TicTacToeApplication extends Application implements ReactApplication {
-  private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
-    @Override
-    public String getJSMainModuleName() {
-      return "Examples/TicTacToe/TicTacToeApp";
-    }
-
-    @Override
-    public @Nullable String getBundleAssetName() {
-      return "TicTacToeApp.bundle";
-    }
-
-    @Override
-    public boolean getUseDeveloperSupport() {
-      return true;
-    }
-
-    @Override
-    protected List<ReactPackage> getPackages() {
-      return Arrays.<ReactPackage>asList(
-        new MainReactPackage()
-      );
-    }
-  };
-
-  @Override
-  public ReactNativeHost getReactNativeHost() {
-    return mReactNativeHost;
-  }
-}
diff --git a/Examples/TicTacToe/android/app/src/main/res/drawable/launcher_icon.png b/Examples/TicTacToe/android/app/src/main/res/drawable/launcher_icon.png
deleted file mode 100644
index a4aa3bd6d9acdc977bc945565d7722d84e0797c8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9578
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
EKl*B@YybcN

diff --git a/Examples/TicTacToe/android/app/src/main/res/layout/activity_main.xml b/Examples/TicTacToe/android/app/src/main/res/layout/activity_main.xml
deleted file mode 100644
index 7d338d621d0232..00000000000000
--- a/Examples/TicTacToe/android/app/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".TicTacToeApp">
-
-    <com.facebook.react.ReactRootView
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:id="@+id/react_root_view"/>
-
-</RelativeLayout>
diff --git a/Examples/TicTacToe/android/app/src/main/res/values/strings.xml b/Examples/TicTacToe/android/app/src/main/res/values/strings.xml
deleted file mode 100644
index 26cdf63c68463c..00000000000000
--- a/Examples/TicTacToe/android/app/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">TicTacToeApp</string>
-</resources>
diff --git a/Examples/TicTacToe/android/app/src/main/res/values/styles.xml b/Examples/TicTacToe/android/app/src/main/res/values/styles.xml
deleted file mode 100644
index 319eb0ca100b5a..00000000000000
--- a/Examples/TicTacToe/android/app/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <!-- Customize your theme here. -->
-    </style>
-
-</resources>

From ff4468ad1b6e5b642bb45dc98c33335497abd8c0 Mon Sep 17 00:00:00 2001
From: Eric Vicenti <evv@fb.com>
Date: Fri, 24 Mar 2017 14:18:39 -0700
Subject: [PATCH 184/366] Re-License Lists with standard React Native License

Reviewed By: sahrens

Differential Revision: D4771084

fbshipit-source-id: 9878a813b7dacb6ec1215fee469b946df0752de9
---
 Libraries/Experimental/WindowedListView.js    | 23 +---------------
 .../{CustomComponents => }/Lists/FlatList.js  | 23 +---------------
 .../ListView/ListView.js                      | 23 +---------------
 .../ListView/ListViewDataSource.js            | 26 ++++---------------
 .../ListView/__mocks__/ListViewMock.js        |  2 +-
 .../Lists/MetroListView.js                    | 23 +---------------
 .../Lists/SectionList.js                      | 23 +---------------
 .../Lists/ViewabilityHelper.js                |  2 +-
 .../Lists/VirtualizeUtils.js                  |  2 +-
 .../Lists/VirtualizedList.js                  | 23 +---------------
 .../Lists/VirtualizedSectionList.js           | 23 +---------------
 .../Lists/__flowtests__/FlatList-flowtest.js  |  2 +-
 .../__flowtests__/SectionList-flowtest.js     |  2 +-
 .../Lists/__tests__/FlatList-test.js          |  2 +-
 .../Lists/__tests__/SectionList-test.js       |  2 +-
 .../Lists/__tests__/ViewabilityHelper-test.js |  2 +-
 .../Lists/__tests__/VirtualizeUtils-test.js   |  2 +-
 .../__snapshots__/FlatList-test.js.snap       |  0
 .../__snapshots__/SectionList-test.js.snap    |  0
 19 files changed, 21 insertions(+), 184 deletions(-)
 rename Libraries/{CustomComponents => }/Lists/FlatList.js (89%)
 rename Libraries/{CustomComponents => Lists}/ListView/ListView.js (94%)
 rename Libraries/{CustomComponents => Lists}/ListView/ListViewDataSource.js (89%)
 rename Libraries/{CustomComponents => Lists}/ListView/__mocks__/ListViewMock.js (97%)
 rename Libraries/{CustomComponents => }/Lists/MetroListView.js (78%)
 rename Libraries/{CustomComponents => }/Lists/SectionList.js (81%)
 rename Libraries/{CustomComponents => }/Lists/ViewabilityHelper.js (99%)
 rename Libraries/{CustomComponents => }/Lists/VirtualizeUtils.js (99%)
 rename Libraries/{CustomComponents => }/Lists/VirtualizedList.js (95%)
 rename Libraries/{CustomComponents => }/Lists/VirtualizedSectionList.js (86%)
 rename Libraries/{CustomComponents => }/Lists/__flowtests__/FlatList-flowtest.js (98%)
 rename Libraries/{CustomComponents => }/Lists/__flowtests__/SectionList-flowtest.js (98%)
 rename Libraries/{CustomComponents => }/Lists/__tests__/FlatList-test.js (97%)
 rename Libraries/{CustomComponents => }/Lists/__tests__/SectionList-test.js (97%)
 rename Libraries/{CustomComponents => }/Lists/__tests__/ViewabilityHelper-test.js (99%)
 rename Libraries/{CustomComponents => }/Lists/__tests__/VirtualizeUtils-test.js (98%)
 rename Libraries/{CustomComponents => }/Lists/__tests__/__snapshots__/FlatList-test.js.snap (100%)
 rename Libraries/{CustomComponents => }/Lists/__tests__/__snapshots__/SectionList-test.js.snap (100%)

diff --git a/Libraries/Experimental/WindowedListView.js b/Libraries/Experimental/WindowedListView.js
index 818801696de207..c2e73c68dce83c 100644
--- a/Libraries/Experimental/WindowedListView.js
+++ b/Libraries/Experimental/WindowedListView.js
@@ -1,32 +1,11 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) 2015-present, Facebook, Inc.
  * All rights reserved.
  *
  * This source code is licensed under the BSD-style license found in the
  * 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.
  *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
  * @providesModule WindowedListView
  * @flow
  */
diff --git a/Libraries/CustomComponents/Lists/FlatList.js b/Libraries/Lists/FlatList.js
similarity index 89%
rename from Libraries/CustomComponents/Lists/FlatList.js
rename to Libraries/Lists/FlatList.js
index 9c90549ca4ea6e..70c21670c26536 100644
--- a/Libraries/CustomComponents/Lists/FlatList.js
+++ b/Libraries/Lists/FlatList.js
@@ -1,32 +1,11 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) 2015-present, Facebook, Inc.
  * All rights reserved.
  *
  * This source code is licensed under the BSD-style license found in the
  * 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.
  *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
  * @providesModule FlatList
  * @flow
  */
diff --git a/Libraries/CustomComponents/ListView/ListView.js b/Libraries/Lists/ListView/ListView.js
similarity index 94%
rename from Libraries/CustomComponents/ListView/ListView.js
rename to Libraries/Lists/ListView/ListView.js
index 066691f54bbc73..afc38070cabc5c 100644
--- a/Libraries/CustomComponents/ListView/ListView.js
+++ b/Libraries/Lists/ListView/ListView.js
@@ -1,32 +1,11 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) 2015-present, Facebook, Inc.
  * All rights reserved.
  *
  * This source code is licensed under the BSD-style license found in the
  * 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.
  *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
  * @providesModule ListView
  * @flow
  */
diff --git a/Libraries/CustomComponents/ListView/ListViewDataSource.js b/Libraries/Lists/ListView/ListViewDataSource.js
similarity index 89%
rename from Libraries/CustomComponents/ListView/ListViewDataSource.js
rename to Libraries/Lists/ListView/ListViewDataSource.js
index 54f1227767a129..70bc43d1a2729b 100644
--- a/Libraries/CustomComponents/ListView/ListViewDataSource.js
+++ b/Libraries/Lists/ListView/ListViewDataSource.js
@@ -1,26 +1,10 @@
 /**
- * Copyright (c) 2015, Facebook, Inc.  All rights reserved.
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
  *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * This source code is licensed under the BSD-style license found in the
+ * 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 ListViewDataSource
  * @flow
diff --git a/Libraries/CustomComponents/ListView/__mocks__/ListViewMock.js b/Libraries/Lists/ListView/__mocks__/ListViewMock.js
similarity index 97%
rename from Libraries/CustomComponents/ListView/__mocks__/ListViewMock.js
rename to Libraries/Lists/ListView/__mocks__/ListViewMock.js
index a3e5e1245373a8..6e86c8fe6cc965 100644
--- a/Libraries/CustomComponents/ListView/__mocks__/ListViewMock.js
+++ b/Libraries/Lists/ListView/__mocks__/ListViewMock.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) 2015-present, Facebook, Inc.
  * All rights reserved.
  *
  * This source code is licensed under the BSD-style license found in the
diff --git a/Libraries/CustomComponents/Lists/MetroListView.js b/Libraries/Lists/MetroListView.js
similarity index 78%
rename from Libraries/CustomComponents/Lists/MetroListView.js
rename to Libraries/Lists/MetroListView.js
index 73e8a9b46983e2..150b27220aa5c0 100644
--- a/Libraries/CustomComponents/Lists/MetroListView.js
+++ b/Libraries/Lists/MetroListView.js
@@ -1,32 +1,11 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) 2015-present, Facebook, Inc.
  * All rights reserved.
  *
  * This source code is licensed under the BSD-style license found in the
  * 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.
  *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
  * @providesModule MetroListView
  * @flow
  */
diff --git a/Libraries/CustomComponents/Lists/SectionList.js b/Libraries/Lists/SectionList.js
similarity index 81%
rename from Libraries/CustomComponents/Lists/SectionList.js
rename to Libraries/Lists/SectionList.js
index 83d50cc2cb4643..86d0f65a50b0ba 100644
--- a/Libraries/CustomComponents/Lists/SectionList.js
+++ b/Libraries/Lists/SectionList.js
@@ -1,32 +1,11 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) 2015-present, Facebook, Inc.
  * All rights reserved.
  *
  * This source code is licensed under the BSD-style license found in the
  * 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.
  *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
  * @providesModule SectionList
  * @flow
  */
diff --git a/Libraries/CustomComponents/Lists/ViewabilityHelper.js b/Libraries/Lists/ViewabilityHelper.js
similarity index 99%
rename from Libraries/CustomComponents/Lists/ViewabilityHelper.js
rename to Libraries/Lists/ViewabilityHelper.js
index 31ce384ba972aa..ee6f353115a4e0 100644
--- a/Libraries/CustomComponents/Lists/ViewabilityHelper.js
+++ b/Libraries/Lists/ViewabilityHelper.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) 2015-present, Facebook, Inc.
  * All rights reserved.
  *
  * This source code is licensed under the BSD-style license found in the
diff --git a/Libraries/CustomComponents/Lists/VirtualizeUtils.js b/Libraries/Lists/VirtualizeUtils.js
similarity index 99%
rename from Libraries/CustomComponents/Lists/VirtualizeUtils.js
rename to Libraries/Lists/VirtualizeUtils.js
index e03fa4dd725662..9342d41bad6765 100644
--- a/Libraries/CustomComponents/Lists/VirtualizeUtils.js
+++ b/Libraries/Lists/VirtualizeUtils.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) 2015-present, Facebook, Inc.
  * All rights reserved.
  *
  * This source code is licensed under the BSD-style license found in the
diff --git a/Libraries/CustomComponents/Lists/VirtualizedList.js b/Libraries/Lists/VirtualizedList.js
similarity index 95%
rename from Libraries/CustomComponents/Lists/VirtualizedList.js
rename to Libraries/Lists/VirtualizedList.js
index 85839147c1faa4..fc64a70c8d43f1 100644
--- a/Libraries/CustomComponents/Lists/VirtualizedList.js
+++ b/Libraries/Lists/VirtualizedList.js
@@ -1,32 +1,11 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) 2015-present, Facebook, Inc.
  * All rights reserved.
  *
  * This source code is licensed under the BSD-style license found in the
  * 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.
  *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
  * @providesModule VirtualizedList
  * @flow
  */
diff --git a/Libraries/CustomComponents/Lists/VirtualizedSectionList.js b/Libraries/Lists/VirtualizedSectionList.js
similarity index 86%
rename from Libraries/CustomComponents/Lists/VirtualizedSectionList.js
rename to Libraries/Lists/VirtualizedSectionList.js
index c3e724fee26acb..9d6752e48265cf 100644
--- a/Libraries/CustomComponents/Lists/VirtualizedSectionList.js
+++ b/Libraries/Lists/VirtualizedSectionList.js
@@ -1,32 +1,11 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) 2015-present, Facebook, Inc.
  * All rights reserved.
  *
  * This source code is licensed under the BSD-style license found in the
  * 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.
  *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
  * @providesModule VirtualizedSectionList
  * @flow
  */
diff --git a/Libraries/CustomComponents/Lists/__flowtests__/FlatList-flowtest.js b/Libraries/Lists/__flowtests__/FlatList-flowtest.js
similarity index 98%
rename from Libraries/CustomComponents/Lists/__flowtests__/FlatList-flowtest.js
rename to Libraries/Lists/__flowtests__/FlatList-flowtest.js
index 13fec8472a381f..b77b88b22a22b5 100644
--- a/Libraries/CustomComponents/Lists/__flowtests__/FlatList-flowtest.js
+++ b/Libraries/Lists/__flowtests__/FlatList-flowtest.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) 2015-present, Facebook, Inc.
  * All rights reserved.
  *
  * This source code is licensed under the BSD-style license found in the
diff --git a/Libraries/CustomComponents/Lists/__flowtests__/SectionList-flowtest.js b/Libraries/Lists/__flowtests__/SectionList-flowtest.js
similarity index 98%
rename from Libraries/CustomComponents/Lists/__flowtests__/SectionList-flowtest.js
rename to Libraries/Lists/__flowtests__/SectionList-flowtest.js
index dc1941f2dda406..4f94e6dc2c3f58 100644
--- a/Libraries/CustomComponents/Lists/__flowtests__/SectionList-flowtest.js
+++ b/Libraries/Lists/__flowtests__/SectionList-flowtest.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) 2015-present, Facebook, Inc.
  * All rights reserved.
  *
  * This source code is licensed under the BSD-style license found in the
diff --git a/Libraries/CustomComponents/Lists/__tests__/FlatList-test.js b/Libraries/Lists/__tests__/FlatList-test.js
similarity index 97%
rename from Libraries/CustomComponents/Lists/__tests__/FlatList-test.js
rename to Libraries/Lists/__tests__/FlatList-test.js
index 945e5f64e64361..e0d6fe56c8b1e5 100644
--- a/Libraries/CustomComponents/Lists/__tests__/FlatList-test.js
+++ b/Libraries/Lists/__tests__/FlatList-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) 2015-present, Facebook, Inc.
  * All rights reserved.
  *
  * This source code is licensed under the BSD-style license found in the
diff --git a/Libraries/CustomComponents/Lists/__tests__/SectionList-test.js b/Libraries/Lists/__tests__/SectionList-test.js
similarity index 97%
rename from Libraries/CustomComponents/Lists/__tests__/SectionList-test.js
rename to Libraries/Lists/__tests__/SectionList-test.js
index 295cd75da51bd7..0e49c1deb117dc 100644
--- a/Libraries/CustomComponents/Lists/__tests__/SectionList-test.js
+++ b/Libraries/Lists/__tests__/SectionList-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) 2015-present, Facebook, Inc.
  * All rights reserved.
  *
  * This source code is licensed under the BSD-style license found in the
diff --git a/Libraries/CustomComponents/Lists/__tests__/ViewabilityHelper-test.js b/Libraries/Lists/__tests__/ViewabilityHelper-test.js
similarity index 99%
rename from Libraries/CustomComponents/Lists/__tests__/ViewabilityHelper-test.js
rename to Libraries/Lists/__tests__/ViewabilityHelper-test.js
index 1d97105a7ad411..25d98fc3836fe0 100644
--- a/Libraries/CustomComponents/Lists/__tests__/ViewabilityHelper-test.js
+++ b/Libraries/Lists/__tests__/ViewabilityHelper-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) 2015-present, Facebook, Inc.
  * All rights reserved.
  *
  * This source code is licensed under the BSD-style license found in the
diff --git a/Libraries/CustomComponents/Lists/__tests__/VirtualizeUtils-test.js b/Libraries/Lists/__tests__/VirtualizeUtils-test.js
similarity index 98%
rename from Libraries/CustomComponents/Lists/__tests__/VirtualizeUtils-test.js
rename to Libraries/Lists/__tests__/VirtualizeUtils-test.js
index 3c0d95ef6bdcf5..5dc7487381e601 100644
--- a/Libraries/CustomComponents/Lists/__tests__/VirtualizeUtils-test.js
+++ b/Libraries/Lists/__tests__/VirtualizeUtils-test.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) 2015-present, Facebook, Inc.
  * All rights reserved.
  *
  * This source code is licensed under the BSD-style license found in the
diff --git a/Libraries/CustomComponents/Lists/__tests__/__snapshots__/FlatList-test.js.snap b/Libraries/Lists/__tests__/__snapshots__/FlatList-test.js.snap
similarity index 100%
rename from Libraries/CustomComponents/Lists/__tests__/__snapshots__/FlatList-test.js.snap
rename to Libraries/Lists/__tests__/__snapshots__/FlatList-test.js.snap
diff --git a/Libraries/CustomComponents/Lists/__tests__/__snapshots__/SectionList-test.js.snap b/Libraries/Lists/__tests__/__snapshots__/SectionList-test.js.snap
similarity index 100%
rename from Libraries/CustomComponents/Lists/__tests__/__snapshots__/SectionList-test.js.snap
rename to Libraries/Lists/__tests__/__snapshots__/SectionList-test.js.snap

From 8ff813e6e0d4b91c066811c0fde689987a5b2827 Mon Sep 17 00:00:00 2001
From: Eric Vicenti <evv@fb.com>
Date: Fri, 24 Mar 2017 14:35:16 -0700
Subject: [PATCH 185/366] Fix license header on
 websocket_integration_test_server

Reviewed By: hramos

Differential Revision: D4770121

fbshipit-source-id: c05b45e8775cf3d05c8c9a6e87ab35a3bd032087
---
 .../websocket_integration_test_server.js           | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/IntegrationTests/websocket_integration_test_server.js b/IntegrationTests/websocket_integration_test_server.js
index b96ee79d660583..175c1db69fae7d 100755
--- a/IntegrationTests/websocket_integration_test_server.js
+++ b/IntegrationTests/websocket_integration_test_server.js
@@ -1,25 +1,13 @@
 #!/usr/bin/env node
 
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) 2015-present, Facebook, Inc.
  * All rights reserved.
  *
  * This source code is licensed under the BSD-style license found in the
  * 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.
  *
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
  * @flow
  * @providesModule websocket_integration_test_server
  */

From 09fe99972d35eded7e739c9f7af1691395a8eb35 Mon Sep 17 00:00:00 2001
From: Eric Vicenti <evv@fb.com>
Date: Fri, 24 Mar 2017 14:36:07 -0700
Subject: [PATCH 186/366] Fix license headers on SwipableRow

Reviewed By: hramos

Differential Revision: D4770164

fbshipit-source-id: fc1cbbdd2161d4fd307cb14821318466fa6fca57
---
 .../Experimental/SwipeableRow/SwipeableListView.js | 14 +-------------
 .../SwipeableRow/SwipeableListViewDataSource.js    | 14 +-------------
 .../SwipeableRow/SwipeableQuickActionButton.js     | 14 +-------------
 .../SwipeableRow/SwipeableQuickActions.js          | 14 +-------------
 .../Experimental/SwipeableRow/SwipeableRow.js      | 14 +-------------
 5 files changed, 5 insertions(+), 65 deletions(-)

diff --git a/Libraries/Experimental/SwipeableRow/SwipeableListView.js b/Libraries/Experimental/SwipeableRow/SwipeableListView.js
index 0f9af8cbead296..b62addd04f20f0 100644
--- a/Libraries/Experimental/SwipeableRow/SwipeableListView.js
+++ b/Libraries/Experimental/SwipeableRow/SwipeableListView.js
@@ -1,23 +1,11 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) 2015-present, Facebook, Inc.
  * All rights reserved.
  *
  * This source code is licensed under the BSD-style license found in the
  * 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.
  *
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  *
- *
  * @providesModule SwipeableListView
  * @flow
  */
diff --git a/Libraries/Experimental/SwipeableRow/SwipeableListViewDataSource.js b/Libraries/Experimental/SwipeableRow/SwipeableListViewDataSource.js
index 4c01bf1a0f9a4d..506b434160d98e 100644
--- a/Libraries/Experimental/SwipeableRow/SwipeableListViewDataSource.js
+++ b/Libraries/Experimental/SwipeableRow/SwipeableListViewDataSource.js
@@ -1,23 +1,11 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) 2015-present, Facebook, Inc.
  * All rights reserved.
  *
  * This source code is licensed under the BSD-style license found in the
  * 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.
  *
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  *
- *
  * @providesModule SwipeableListViewDataSource
  */
 'use strict';
diff --git a/Libraries/Experimental/SwipeableRow/SwipeableQuickActionButton.js b/Libraries/Experimental/SwipeableRow/SwipeableQuickActionButton.js
index 5681011fcd10b8..64195eb7b3f169 100644
--- a/Libraries/Experimental/SwipeableRow/SwipeableQuickActionButton.js
+++ b/Libraries/Experimental/SwipeableRow/SwipeableQuickActionButton.js
@@ -1,23 +1,11 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) 2015-present, Facebook, Inc.
  * All rights reserved.
  *
  * This source code is licensed under the BSD-style license found in the
  * 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.
  *
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  *
- *
  * @providesModule SwipeableQuickActionButton
  * @flow
  */
diff --git a/Libraries/Experimental/SwipeableRow/SwipeableQuickActions.js b/Libraries/Experimental/SwipeableRow/SwipeableQuickActions.js
index 94dcc0090ad578..48b90cea4c4996 100644
--- a/Libraries/Experimental/SwipeableRow/SwipeableQuickActions.js
+++ b/Libraries/Experimental/SwipeableRow/SwipeableQuickActions.js
@@ -1,23 +1,11 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) 2015-present, Facebook, Inc.
  * All rights reserved.
  *
  * This source code is licensed under the BSD-style license found in the
  * 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.
  *
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  *
- *
  * @providesModule SwipeableQuickActions
  * @flow
  */
diff --git a/Libraries/Experimental/SwipeableRow/SwipeableRow.js b/Libraries/Experimental/SwipeableRow/SwipeableRow.js
index eead0ee3805428..0e105c2526b8f8 100644
--- a/Libraries/Experimental/SwipeableRow/SwipeableRow.js
+++ b/Libraries/Experimental/SwipeableRow/SwipeableRow.js
@@ -1,23 +1,11 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) 2015-present, Facebook, Inc.
  * All rights reserved.
  *
  * This source code is licensed under the BSD-style license found in the
  * 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.
  *
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  *
- *
  * @providesModule SwipeableRow
  * @flow
  */

From c87c4d052f9a450c37ef94875fed170d0a58dc50 Mon Sep 17 00:00:00 2001
From: Sokovikov <skv-headless@yandex.ru>
Date: Fri, 24 Mar 2017 18:07:12 -0700
Subject: [PATCH 187/366] Fixed previously broken support for negative `scale`
 (`transform` style property)

Summary:
closes #13081

UIExplorer, TransformExample
Closes https://github.com/facebook/react-native/pull/13083

Reviewed By: mmmulani

Differential Revision: D4758237

Pulled By: shergin

fbshipit-source-id: 58385a4cde7a739b6657c293c381644a92918265
---
 React/Views/RCTConvert+Transform.m | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/React/Views/RCTConvert+Transform.m b/React/Views/RCTConvert+Transform.m
index 32a1abfb57c7e2..1625a4917d30e7 100644
--- a/React/Views/RCTConvert+Transform.m
+++ b/React/Views/RCTConvert+Transform.m
@@ -63,6 +63,9 @@ + (CATransform3D)CATransform3D:(id)json
     RCTLogWarn(@"[RCTConvert CATransform3D:] has deprecated a matrix as input. Pass an array of configs (which can contain a matrix key) instead.");
     return [self CATransform3DFromMatrix:json];
   }
+
+  CGFloat zeroScaleThreshold = FLT_EPSILON;
+
   for (NSDictionary *transformConfig in (NSArray<NSDictionary *> *)json) {
     if (transformConfig.count != 1) {
       RCTLogConvertError(json, @"a CATransform3D. You must specify exactly one property per transform object.");
@@ -90,15 +93,18 @@ + (CATransform3D)CATransform3D:(id)json
       transform = CATransform3DRotate(transform, rotate, 0, 0, 1);
 
     } else if ([property isEqualToString:@"scale"]) {
-      CGFloat scale = MAX([value floatValue], FLT_EPSILON);
+      CGFloat scale = [value floatValue];
+      scale = ABS(scale) < zeroScaleThreshold ? zeroScaleThreshold : scale;
       transform = CATransform3DScale(transform, scale, scale, 1);
 
     } else if ([property isEqualToString:@"scaleX"]) {
-      CGFloat scale = MAX([value floatValue], FLT_EPSILON);
+      CGFloat scale = [value floatValue];
+      scale = ABS(scale) < zeroScaleThreshold ? zeroScaleThreshold : scale;
       transform = CATransform3DScale(transform, scale, 1, 1);
 
     } else if ([property isEqualToString:@"scaleY"]) {
-      CGFloat scale = MAX([value floatValue], FLT_EPSILON);
+      CGFloat scale = [value floatValue];
+      scale = ABS(scale) < zeroScaleThreshold ? zeroScaleThreshold : scale;
       transform = CATransform3DScale(transform, 1, scale, 1);
 
     } else if ([property isEqualToString:@"translate"]) {

From 27c3e32abf48c50f369b98fac9c7b73ab0d9aade Mon Sep 17 00:00:00 2001
From: Spencer Ahrens <sahrens@fb.com>
Date: Fri, 24 Mar 2017 18:15:42 -0700
Subject: [PATCH 188/366] FrameRateLogger JS module

Summary:
This adds a flowified JS module for the FrameRateLogger native module and plugs
it into `ScrollResponder` and `AppRegistry`.

If there is no `FrameRateLogger` native module, then the function calls will be no-ops.

One major limitation is that we can't track animated/programatic scrolls because we don't
have reliable end events. Would be generally useful to add those in a followup though.

Reviewed By: fkgozali

Differential Revision: D4765694

fbshipit-source-id: f3bec771df6ac918200c1afd1a7d8b6da540a4e2
---
 Libraries/Components/ScrollResponder.js  | 13 +++++
 Libraries/Interaction/FrameRateLogger.js | 74 ++++++++++++++++++++++++
 Libraries/ReactNative/AppRegistry.js     |  2 +
 3 files changed, 89 insertions(+)
 create mode 100644 Libraries/Interaction/FrameRateLogger.js

diff --git a/Libraries/Components/ScrollResponder.js b/Libraries/Components/ScrollResponder.js
index 955d7ea43be729..a7c5f4e1cd2cbd 100644
--- a/Libraries/Components/ScrollResponder.js
+++ b/Libraries/Components/ScrollResponder.js
@@ -12,6 +12,7 @@
 'use strict';
 
 var Dimensions = require('Dimensions');
+var FrameRateLogger = require('FrameRateLogger');
 var Platform = require('Platform');
 var Keyboard = require('Keyboard');
 var ReactNative = require('ReactNative');
@@ -295,6 +296,7 @@ var ScrollResponderMixin = {
    * Invoke this from an `onScrollBeginDrag` event.
    */
   scrollResponderHandleScrollBeginDrag: function(e: Event) {
+    FrameRateLogger.beginScroll(); // TODO: track all scrolls after implementing onScrollEndAnimation
     this.props.onScrollBeginDrag && this.props.onScrollBeginDrag(e);
   },
 
@@ -302,6 +304,16 @@ var ScrollResponderMixin = {
    * Invoke this from an `onScrollEndDrag` event.
    */
   scrollResponderHandleScrollEndDrag: function(e: Event) {
+    const {velocity} = e.nativeEvent;
+    // - If we are animating, then this is a "drag" that is stopping the scrollview and momentum end
+    //   will fire.
+    // - If velocity is non-zero, then the interaction will stop when momentum scroll ends or
+    //   another drag starts and ends.
+    // - If we don't get velocity, better to stop the interaction twice than not stop it.
+    if (!this.scrollResponderIsAnimating() &&
+        (!velocity || velocity.x === 0 && velocity.y === 0)) {
+      FrameRateLogger.endScroll();
+    }
     this.props.onScrollEndDrag && this.props.onScrollEndDrag(e);
   },
 
@@ -317,6 +329,7 @@ var ScrollResponderMixin = {
    * Invoke this from an `onMomentumScrollEnd` event.
    */
   scrollResponderHandleMomentumScrollEnd: function(e: Event) {
+    FrameRateLogger.endScroll();
     this.state.lastMomentumScrollEndTime = Date.now();
     this.props.onMomentumScrollEnd && this.props.onMomentumScrollEnd(e);
   },
diff --git a/Libraries/Interaction/FrameRateLogger.js b/Libraries/Interaction/FrameRateLogger.js
new file mode 100644
index 00000000000000..3f1265b4140b03
--- /dev/null
+++ b/Libraries/Interaction/FrameRateLogger.js
@@ -0,0 +1,74 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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 FrameRateLogger
+ * @flow
+ */
+'use strict';
+
+const NativeModules = require('NativeModules');
+
+const invariant = require('fbjs/lib/invariant');
+
+/**
+ * Flow API for native FrameRateLogger module. If the native module is not installed, function calls
+ * are just no-ops.
+ *
+ * Typical behavior is that `setContext` is called when a new screen is loaded (e.g. via a
+ * navigation integration), and then `beginScroll` is called by `ScrollResponder` at which point the
+ * native module then begins tracking frame drops. When `ScrollResponder` calls `endScroll`, the
+ * native module gathers up all it's frame drop data and reports it via an analytics pipeline for
+ * analysis.
+ *
+ * Note that `beginScroll` may be called multiple times by `ScrollResponder` - unclear if that's a
+ * bug, but the native module should be robust to that.
+ *
+ * In the future we may add support for tracking frame drops in other types of interactions beyond
+ * scrolling.
+ */
+const FrameRateLogger = {
+  /**
+   * Enable `debug` to see local logs of what's going on. `reportStackTraces` will grab stack traces
+   * during UI thread stalls and upload them if the native module supports it.
+   */
+  setGlobalOptions: function(options: {debug?: boolean, reportStackTraces?: boolean}) {
+    if (options.debug !== undefined) {
+      invariant(
+        NativeModules.FrameRateLogger,
+        'Trying to debug FrameRateLogger without the native module!',
+      );
+    }
+    NativeModules.FrameRateLogger && NativeModules.FrameRateLogger.setGlobalOptions(options);
+  },
+
+  /**
+   * Must call `setContext` before any events can be properly tracked, which is done automatically
+   * in `AppRegistry`, but navigation is also a common place to hook in.
+   */
+  setContext: function(context: string) {
+    NativeModules.FrameRateLogger && NativeModules.FrameRateLogger.setContext(context);
+  },
+
+  /**
+   * Called in `ScrollResponder` so any component that uses that module will handle this
+   * automatically.
+   */
+  beginScroll() {
+    NativeModules.FrameRateLogger && NativeModules.FrameRateLogger.beginScroll();
+  },
+
+  /**
+   * Called in `ScrollResponder` so any component that uses that module will handle this
+   * automatically.
+   */
+  endScroll() {
+    NativeModules.FrameRateLogger && NativeModules.FrameRateLogger.endScroll();
+  },
+};
+
+module.exports = FrameRateLogger;
diff --git a/Libraries/ReactNative/AppRegistry.js b/Libraries/ReactNative/AppRegistry.js
index 15773d1f7c90ca..b68a293b2c1c13 100644
--- a/Libraries/ReactNative/AppRegistry.js
+++ b/Libraries/ReactNative/AppRegistry.js
@@ -13,6 +13,7 @@
 
 const BatchedBridge = require('BatchedBridge');
 const BugReporting = require('BugReporting');
+const FrameRateLogger = require('FrameRateLogger');
 const NativeModules = require('NativeModules');
 const ReactNative = require('ReactNative');
 
@@ -172,6 +173,7 @@ const AppRegistry = {
       'This error can also happen due to a require() error during ' +
       'initialization or failure to call AppRegistry.registerComponent.\n\n'
     );
+    FrameRateLogger.setContext(appKey);
     runnables[appKey].run(appParameters);
   },
 

From 94d93f7d41365cbcdddf36b1a9c0bcd8ec2fd325 Mon Sep 17 00:00:00 2001
From: dabit1 <david.escalera.ponce@gmail.com>
Date: Fri, 24 Mar 2017 18:28:34 -0700
Subject: [PATCH 189/366] PositionError must be an object, not string

Summary:
As specifications says, the Position error must be an object with code and message attributes. Right now it is a string. If not, we can't know what kind of error is. Another issue is that the message must be exactly "No available location provider."

Specifications:
https://developer.mozilla.org/en/docs/Web/API/PositionError
Closes https://github.com/facebook/react-native/pull/13140

Differential Revision: D4774922

Pulled By: ericvicenti

fbshipit-source-id: f956af051461e9f8d6435496283e54b3c4dc8ef5
---
 .../com/facebook/react/modules/location/LocationModule.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/location/LocationModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/location/LocationModule.java
index ea0ed5a5c8ab3c..866309241258f8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/location/LocationModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/location/LocationModule.java
@@ -123,7 +123,7 @@ public void getCurrentPosition(
           (LocationManager) getReactApplicationContext().getSystemService(Context.LOCATION_SERVICE);
       String provider = getValidProvider(locationManager, locationOptions.highAccuracy);
       if (provider == null) {
-        error.invoke("No available location provider.");
+        emitError(PositionError.PERMISSION_DENIED, "No location provider available.");
         return;
       }
       Location location = locationManager.getLastKnownLocation(provider);

From 30778b62eade6dc9add5880220af6242be2b7af8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <hramos@users.noreply.github.com>
Date: Fri, 24 Mar 2017 18:30:36 -0700
Subject: [PATCH 190/366] Update RunningOnDevice.md

Summary:
Taking another pass at this doc after running apps on iOS and Android devices this week. Of note, the Connecting to Dev server section on iOS seemed incomplete.

Tested steps on iOS and Android.

Tested rendering of the site on all permutations.
Closes https://github.com/facebook/react-native/pull/13143

Differential Revision: D4775026

Pulled By: hramos

fbshipit-source-id: 9b64120922a093ac646d12861d8dee98fb4e5d7d
---
 docs/RunningOnDevice.md | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/docs/RunningOnDevice.md b/docs/RunningOnDevice.md
index b4ea4365213cde..f79d7a31dca306 100644
--- a/docs/RunningOnDevice.md
+++ b/docs/RunningOnDevice.md
@@ -48,15 +48,21 @@ It's always a good idea to test your app on an actual device before releasing it
   <a href="javascript:void(0);" class="button-windows" onclick="display('os', 'windows')">Windows</a>
 </div>
 
-<block class="mac linux windows ios" />
+<block class="linux windows ios" />
 
-## Setting up an iOS device
-
-Installing an app on an iOS device requires a Mac, an Apple ID, and a USB cable.
+A Mac is required in order to build your app for iOS devices.
 
 <block class="mac ios" />
 
-Connect your device to your Mac using a USB cable. Navigate to the `ios` folder in your project, then open the `.xcodeproj` file within it using Xcode. Open the "Product" menu from the menubar, then go to "Destination". Look for and select your device from the list. Xcode will then register your device for development.
+## Running your app on iOS devices
+
+Register for a [Apple developer account](https://developer.apple.com/) if you don't have one yet.
+
+Connect your device to your Mac using a USB to Lightning cable. Navigate to the `ios` folder in your project, then open the `.xcodeproj` file within it using Xcode.
+
+Select your app in the Project Navigator and look for the "General" tab. Go to "Signing" and make sure your Apple developer account is selected.
+
+Open the "Product" menu from Xcode's menubar, then go to "Destination". Look for and select your device from the list. Xcode will then register your device for development.
 
 If everything is set up correctly, your device will be listed as the build target in the Xcode toolbar. You can now press the **Build and run** button or select "Run" from the "Product" menu. Your app will launch on your device shortly.
 
@@ -64,9 +70,7 @@ If everything is set up correctly, your device will be listed as the build targe
 
 <block class="mac windows linux android" />
 
-## Setting up an Android device
-
-Running an Android app on a device requires a Mac or PC and a USB cable.
+## Running your app on Android devices
 
 ### 1. Enable Debugging over USB
 
@@ -154,16 +158,19 @@ $ react-native run-android
 
 <block class="mac windows linux android ios" />
 
+<block class="mac ios" />
+
 ## Connecting to the development server
 
-<block class="mac ios" />
+You can also iterate quickly on a device using the development server. You only have to be on the same Wi-Fi network as your computer. Enable Live reloading from the [Developer menu](docs/debugging.html#accessing-the-in-app-developer-menu) and your app will reload whenever your JavaScript code has changed.
 
-You can also iterate quickly on a device using the development server. You only have to be on the same Wi-Fi network as your computer. Shake the device to open the [Developer menu](docs/debugging.html#accessing-the-in-app-developer-menu).
+> If you have any issues, ensure that your Mac and device are on the same network and can reach each other. Many open wireless networks with captive portals are configured to prevent devices from reaching other devices on the network. You may use your device's Personal Hotspot feature in this case.
 
 <block class="mac windows linux android" />
 
-You can also iterate quickly on a device by connecting to the development server running on your development machine. There are several ways of accomplishing this, depending on whether you have access to a USB cable or a Wi-Fi network.
+## Connecting to the development server
 
+You can also iterate quickly on a device by connecting to the development server running on your development machine. There are several ways of accomplishing this, depending on whether you have access to a USB cable or a Wi-Fi network.
 
 ### Method 1: Using adb reverse (recommended)
 
@@ -179,7 +186,7 @@ Run the following in a command prompt:
 $ adb reverse tcp:8081 tcp:8081
 ```
 
-You can now use `Reload JS` from the React Native in-app Developer menu without any additional configuration.
+You can now enable Live reloading from the [Developer menu](docs/debugging.html#accessing-the-in-app-developer-menu). Your app will reload whenever your JavaScript code has changed.
 
 ### Method 2: Connect via Wi-Fi
 
@@ -207,6 +214,8 @@ Open a terminal and type `/sbin/ifconfig` to find your machine's IP address.
 6. Type in your machine's IP address and the port of the local dev server (e.g. 10.0.1.1:8081).
 7. Go back to the **Developer menu** and select **Reload JS**.
 
+You can now enable Live reloading from the [Developer menu](docs/debugging.html#accessing-the-in-app-developer-menu). Your app will reload whenever your JavaScript code has changed.
+
 <block class="mac ios" />
 
 ## Building your app for production

From 848593c0f0b75da9ff342596908c5091a2cd1430 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <bvaughn@fb.com>
Date: Sat, 25 Mar 2017 00:37:51 -0700
Subject: [PATCH 191/366] Moved takeSnapshot method from UIManager to
 ReactNative

Reviewed By: spicyj

Differential Revision: D4767428

fbshipit-source-id: 77c80c0135641ab46f9dce2763f27499a96373a0
---
 .../UIExplorer/js/ActionSheetIOSExample.js    |  4 +-
 Libraries/ReactNative/UIManager.js            | 72 ++++---------------
 .../src/renderers/native/ReactNativeFiber.js  |  3 +
 .../src/renderers/native/ReactNativeStack.js  |  4 ++
 .../src/renderers/native/takeSnapshot.js      | 55 ++++++++++++++
 5 files changed, 76 insertions(+), 62 deletions(-)
 create mode 100644 Libraries/Renderer/src/renderers/native/takeSnapshot.js

diff --git a/Examples/UIExplorer/js/ActionSheetIOSExample.js b/Examples/UIExplorer/js/ActionSheetIOSExample.js
index 43a921e99c0247..fe6084acdb4faa 100644
--- a/Examples/UIExplorer/js/ActionSheetIOSExample.js
+++ b/Examples/UIExplorer/js/ActionSheetIOSExample.js
@@ -28,8 +28,8 @@ var ReactNative = require('react-native');
 var {
   ActionSheetIOS,
   StyleSheet,
+  takeSnapshot,
   Text,
-  UIManager,
   View,
 } = ReactNative;
 
@@ -164,7 +164,7 @@ class ShareScreenshotExample extends React.Component {
 
   showShareActionSheet = () => {
     // Take the snapshot (returns a temp file uri)
-    UIManager.takeSnapshot('window').then((uri) => {
+    takeSnapshot('window').then((uri) => {
       // Share image data
       ActionSheetIOS.showShareActionSheetWithOptions({
         url: uri,
diff --git a/Libraries/ReactNative/UIManager.js b/Libraries/ReactNative/UIManager.js
index 3b131de7041c11..3ae73c303d122a 100644
--- a/Libraries/ReactNative/UIManager.js
+++ b/Libraries/ReactNative/UIManager.js
@@ -15,72 +15,24 @@ const NativeModules = require('NativeModules');
 const Platform = require('Platform');
 
 const defineLazyObjectProperty = require('defineLazyObjectProperty');
-const findNodeHandle = require('findNodeHandle');
 const invariant = require('fbjs/lib/invariant');
 
-import type React from 'react';
-
 const { UIManager } = NativeModules;
 
 invariant(UIManager, 'UIManager is undefined. The native module config is probably incorrect.');
 
-const _takeSnapshot = UIManager.takeSnapshot;
-
-// findNodeHandle() returns a reference to a wrapper component with viewConfig.
-// This wrapper is required for NativeMethodsMixin.setNativeProps, but most
-// callers want the native tag (number) and not the wrapper. For this purpose,
-// the ReactNative renderer decorates findNodeHandle() and extracts the tag.
-// However UIManager can't require ReactNative without introducing a cycle, and
-// deferring the require causes a significant performance regression in Wilde
-// (along the lines of 17% regression in RN Bridge startup). So as a temporary
-// workaround, this wrapper method mimics what the native renderer does.
-// TODO (bvaughn) Remove this and use findNodeHandle directly once stack is gone
-function findNodeHandleWrapper(componentOrHandle : any) : ?number {
-  const instance: any = findNodeHandle(componentOrHandle);
-
-  if (instance) {
-    return typeof instance._nativeTag === 'number'
-      ? instance._nativeTag
-      : instance.getHostNode();
-  } else {
-    return null;
-  }
-}
-
-/**
- * Capture an image of the screen, window or an individual view. The image
- * will be stored in a temporary file that will only exist for as long as the
- * app is running.
- *
- * The `view` argument can be the literal string `window` if you want to
- * capture the entire window, or it can be a reference to a specific
- * React Native component.
- *
- * The `options` argument may include:
- * - width/height (number) - the width and height of the image to capture.
- * - format (string) - either 'png' or 'jpeg'. Defaults to 'png'.
- * - quality (number) - the quality when using jpeg. 0.0 - 1.0 (default).
- *
- * Returns a Promise.
- * @platform ios
- */
-UIManager.takeSnapshot = async function(
-  view ?: 'window' | React.Element<any> | number,
-  options ?: {
-    width ?: number,
-    height ?: number,
-    format ?: 'png' | 'jpeg',
-    quality ?: number,
-  },
-) {
-  if (!_takeSnapshot) {
-    console.warn('UIManager.takeSnapshot is not available on this platform');
-    return;
-  }
-  if (typeof view !== 'number' && view !== 'window') {
-    view = findNodeHandleWrapper(view) || 'window';
-  }
-  return _takeSnapshot(view, options);
+// In past versions of ReactNative users called UIManager.takeSnapshot()
+// However takeSnapshot was moved to ReactNative in order to support flat
+// bundles and to avoid a cyclic dependency between UIManager and ReactNative.
+// UIManager.takeSnapshot still exists though. In order to avoid confusion or
+// accidental usage, mask the method with a deprecation warning.
+UIManager.__takeSnapshot = UIManager.takeSnapshot;
+UIManager.takeSnapshot = function() {
+  invariant(
+    false,
+    'UIManager.takeSnapshot should not be called directly. ' +
+    'Use ReactNative.takeSnapshot instead.'
+  );
 };
 
 /**
diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeFiber.js b/Libraries/Renderer/src/renderers/native/ReactNativeFiber.js
index 014b4dfa85de8e..a43e51f2088c35 100644
--- a/Libraries/Renderer/src/renderers/native/ReactNativeFiber.js
+++ b/Libraries/Renderer/src/renderers/native/ReactNativeFiber.js
@@ -27,6 +27,7 @@ const deepFreezeAndThrowOnMutationInDev = require('deepFreezeAndThrowOnMutationI
 const emptyObject = require('fbjs/lib/emptyObject');
 const findNodeHandle = require('findNodeHandle');
 const invariant = require('fbjs/lib/invariant');
+const takeSnapshot = require('takeSnapshot');
 
 const {injectInternals} = require('ReactFiberDevToolsHook');
 
@@ -402,6 +403,8 @@ const ReactNative = {
     return NativeRenderer.getPublicRootInstance(root);
   },
 
+  takeSnapshot,
+
   unmountComponentAtNode(containerTag: number) {
     const root = roots.get(containerTag);
     if (root) {
diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeStack.js b/Libraries/Renderer/src/renderers/native/ReactNativeStack.js
index 2a5b8f509b7079..0d1f323f0237e8 100644
--- a/Libraries/Renderer/src/renderers/native/ReactNativeStack.js
+++ b/Libraries/Renderer/src/renderers/native/ReactNativeStack.js
@@ -18,6 +18,7 @@ var ReactNativeStackInjection = require('ReactNativeStackInjection');
 var ReactUpdates = require('ReactUpdates');
 
 var findNodeHandle = require('findNodeHandle');
+var takeSnapshot = require('takeSnapshot');
 
 ReactNativeInjection.inject();
 ReactNativeStackInjection.inject();
@@ -45,6 +46,9 @@ var ReactNative = {
   },
 
   render: render,
+
+  takeSnapshot,
+
   unmountComponentAtNode: ReactNativeMount.unmountComponentAtNode,
 
   /* eslint-disable camelcase */
diff --git a/Libraries/Renderer/src/renderers/native/takeSnapshot.js b/Libraries/Renderer/src/renderers/native/takeSnapshot.js
new file mode 100644
index 00000000000000..f0f39d3f20ba79
--- /dev/null
+++ b/Libraries/Renderer/src/renderers/native/takeSnapshot.js
@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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 takeSnapshot
+ * @flow
+ */
+'use strict';
+
+var ReactNative = require('ReactNative');
+var UIManager = require('UIManager');
+
+import type {Element} from 'React';
+
+/**
+ * Capture an image of the screen, window or an individual view. The image
+ * will be stored in a temporary file that will only exist for as long as the
+ * app is running.
+ *
+ * The `view` argument can be the literal string `window` if you want to
+ * capture the entire window, or it can be a reference to a specific
+ * React Native component.
+ *
+ * The `options` argument may include:
+ * - width/height (number) - the width and height of the image to capture.
+ * - format (string) - either 'png' or 'jpeg'. Defaults to 'png'.
+ * - quality (number) - the quality when using jpeg. 0.0 - 1.0 (default).
+ *
+ * Returns a Promise.
+ * @platform ios
+ */
+module.exports = async function takeSnapshot(
+  view ?: 'window' | Element<any> | number,
+  options ?: {
+     width ?: number,
+     height ?: number,
+     format ?: 'png' | 'jpeg',
+     quality ?: number,
+  },
+) {
+  if (
+    typeof view !== 'number' &&
+    view !== 'window'
+  ) {
+    view = ReactNative.findNodeHandle(view) || 'window';
+  }
+
+  // Call the hidden '__takeSnapshot' method; the main one throws an error to
+  // prevent accidental backwards-incompatible usage.
+  return UIManager.__takeSnapshot(view, options);
+};

From e2204c5ccbb9b2eaa62408af09d7d1ad79f6ba67 Mon Sep 17 00:00:00 2001
From: Aaron Chiu <aaronechiu@fb.com>
Date: Sat, 25 Mar 2017 09:32:45 -0700
Subject: [PATCH 192/366] measure delay of calling into UI thread when setting
 up ReactContext

Reviewed By: yungsters

Differential Revision: D4736627

fbshipit-source-id: 6d425ef0ad7bbd54296a619009136c929cb16030
---
 .../java/com/facebook/react/ReactInstanceManager.java     | 8 +++++++-
 .../com/facebook/react/bridge/ReactMarkerConstants.java   | 3 ++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
index 32a4f92c93802a..3f97a282838622 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
@@ -78,6 +78,8 @@
 import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_REACT_CONTEXT_START;
 import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_VIEW_MANAGERS_END;
 import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_VIEW_MANAGERS_START;
+import static com.facebook.react.bridge.ReactMarkerConstants.PRE_SETUP_REACT_CONTEXT_END;
+import static com.facebook.react.bridge.ReactMarkerConstants.PRE_SETUP_REACT_CONTEXT_START;
 import static com.facebook.react.bridge.ReactMarkerConstants.PROCESS_PACKAGES_END;
 import static com.facebook.react.bridge.ReactMarkerConstants.PROCESS_PACKAGES_START;
 import static com.facebook.react.bridge.ReactMarkerConstants.SETUP_REACT_CONTEXT_END;
@@ -217,7 +219,10 @@ protected Result<ReactApplicationContext> doInBackground(ReactContextInitParams.
       Assertions.assertCondition(params != null && params.length > 0 && params[0] != null);
       try {
         JavaScriptExecutor jsExecutor = params[0].getJsExecutorFactory().create();
-        return Result.of(createReactContext(jsExecutor, params[0].getJsBundleLoader()));
+        ReactApplicationContext reactApplicationContext =
+          createReactContext(jsExecutor, params[0].getJsBundleLoader());
+        ReactMarker.logMarker(PRE_SETUP_REACT_CONTEXT_START);
+        return Result.of(reactApplicationContext);
       } catch (Exception e) {
         // Pass exception to onPostExecute() so it can be handled on the main thread
         return Result.of(e);
@@ -777,6 +782,7 @@ private void recreateReactContextInBackground(
   }
 
   private void setupReactContext(ReactApplicationContext reactContext) {
+    ReactMarker.logMarker(PRE_SETUP_REACT_CONTEXT_END);
     ReactMarker.logMarker(SETUP_REACT_CONTEXT_START);
     Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "setupReactContext");
     UiThreadUtil.assertOnUiThread();
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java
index a3f2f8e355ceb3..70f868d9072e35 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java
@@ -68,5 +68,6 @@ public class ReactMarkerConstants {
   public static final String ON_HOST_PAUSE_END = "ON_HOST_PAUSE_END";
   public static final String CONVERT_CONSTANTS_START = "CONVERT_CONSTANTS_START";
   public static final String CONVERT_CONSTANTS_END = "CONVERT_CONSTANTS_END";
-  public static final String PRE_REACT_CONTEXT_END = "PRE_REACT_CONTEXT_END";
+  public static final String PRE_SETUP_REACT_CONTEXT_START = "PRE_SETUP_REACT_CONTEXT_START";
+  public static final String PRE_SETUP_REACT_CONTEXT_END = "PRE_SETUP_REACT_CONTEXT_END";
 }

From 73c85e4f3164999352dbea006d21c7ed9769ca43 Mon Sep 17 00:00:00 2001
From: Tim Yung <yungsters@fb.com>
Date: Sun, 26 Mar 2017 16:01:05 -0700
Subject: [PATCH 193/366] RN: Cleanup Flow / Jest / Metro Configs

Reviewed By: kassens

Differential Revision: D4777088

fbshipit-source-id: d07f4d1dd019a814c8bee4caeb57fc1dd3721c27
---
 packager/blacklist.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packager/blacklist.js b/packager/blacklist.js
index c36526e902bccd..7c2cbb487d16ba 100644
--- a/packager/blacklist.js
+++ b/packager/blacklist.js
@@ -17,9 +17,6 @@ var sharedBlacklist = [
 
   /website\/node_modules\/.*/,
 
-  // TODO(jkassens, #9876132): Remove this rule when it's no longer needed.
-  'Libraries/Relay/oss/react-relay/classic/tools/relayUnstableBatchedUpdates.js',
-
   /heapCapture\/bundle\.js/,
 ];
 

From 3b2864404edfb1de94d2bb7995c74d725800bf3e Mon Sep 17 00:00:00 2001
From: Eric Vicenti <evv@fb.com>
Date: Sun, 26 Mar 2017 17:09:02 -0700
Subject: [PATCH 194/366] Fix broken references in website, moved lists, remove
 navigator

Reviewed By: mkonicek

Differential Revision: D4775152

fbshipit-source-id: 8af949573ed827ec86a68c1f311c4180f19da742
---
 website/server/docsList.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/website/server/docsList.js b/website/server/docsList.js
index 47bad1f8209f85..01759ce9b69ceb 100644
--- a/website/server/docsList.js
+++ b/website/server/docsList.js
@@ -14,12 +14,11 @@ const components = [
   '../Libraries/Components/Button.js',
   '../Libraries/Components/DatePicker/DatePickerIOS.ios.js',
   '../Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js',
-  '../Libraries/CustomComponents/Lists/FlatList.js',
+  '../Libraries/Lists/FlatList.js',
   '../Libraries/Image/Image.ios.js',
   '../Libraries/Components/Keyboard/KeyboardAvoidingView.js',
-  '../Libraries/CustomComponents/ListView/ListView.js',
+  '../Libraries/Lists/ListView/ListView.js',
   '../Libraries/Modal/Modal.js',
-  '../Libraries/CustomComponents/Navigator/Navigator.js',
   '../Libraries/Components/Navigation/NavigatorIOS.ios.js',
   '../Libraries/Components/Picker/Picker.js',
   '../Libraries/Components/Picker/PickerIOS.ios.js',
@@ -27,7 +26,7 @@ const components = [
   '../Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js',
   '../Libraries/Components/RefreshControl/RefreshControl.js',
   '../Libraries/Components/ScrollView/ScrollView.js',
-  '../Libraries/CustomComponents/Lists/SectionList.js',
+  '../Libraries/Lists/SectionList.js',
   '../Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.ios.js',
   '../Libraries/Components/Slider/Slider.js',
   '../Libraries/RCTTest/SnapshotViewIOS.ios.js',
@@ -44,7 +43,7 @@ const components = [
   '../Libraries/Components/Touchable/TouchableWithoutFeedback.js',
   '../Libraries/Components/View/View.js',
   '../Libraries/Components/ViewPager/ViewPagerAndroid.android.js',
-  '../Libraries/CustomComponents/Lists/VirtualizedList.js',
+  '../Libraries/Lists/VirtualizedList.js',
   '../Libraries/Components/WebView/WebView.ios.js',
 ];
 
@@ -74,7 +73,7 @@ const apis = [
   '../Libraries/Components/Keyboard/Keyboard.js',
   '../Libraries/LayoutAnimation/LayoutAnimation.js',
   '../Libraries/Linking/Linking.js',
-  '../Libraries/CustomComponents/ListView/ListViewDataSource.js',
+  '../Libraries/Lists/ListView/ListViewDataSource.js',
   '../Libraries/Renderer/src/renderers/native/NativeMethodsMixin.js',
   '../Libraries/Network/NetInfo.js',
   '../Libraries/Interaction/PanResponder.js',

From d2939eafbf56f99ea4da7374b9812ae6f54c1d3d Mon Sep 17 00:00:00 2001
From: "wenzhe.lv" <wenzhe.lv@wormpex.com>
Date: Mon, 27 Mar 2017 07:00:58 -0700
Subject: [PATCH 195/366] Fix crash when move on the edge of some phones like
 HUAWEI P9

Summary:
The app crashes because of `TouchEventCoalescingKeyHelper.getCoalescingKey` throwing an exception when move on the edge of some phones like HUAWEI P9. It's caused by that the down time differs from `ACTION_DOWN` to `ACTION_MOVE` which belongs to the same gesture when I touched on the edge of my HUAWEI P9. It seems a native bug of manufacturer. Related issue #11302.
```
java.lang.RuntimeException: Tried to get non-existent cookie
    at com.facebook.react.uimanager.events.TouchEventCoalescingKeyHelper.getCoalescingKey(TouchEventCoalescingKeyHelper.java:75)
    at com.facebook.react.uimanager.events.TouchEvent.init(TouchEvent.java:93)
    at com.facebook.react.uimanager.events.TouchEvent.obtain(TouchEvent.java:46)
    at com.facebook.react.uimanager.JSTouchDispatcher.handleTouchEvent(JSTouchDispatcher.java:118)
    at com.facebook.react.ReactRootView.dispatchJSTouchEvent(ReactRootView.java:158)
    at com.facebook.react.ReactRootView.onInterceptTouchEvent(ReactRootView.java:130)
    at android.view.Vie
Closes https://github.com/facebook/react-native/pull/12063

Differential Revision: D4779060

Pulled By: astreet

fbshipit-source-id: 5cf20084ff9081f2535ff9cb3b99d1d52c443f03
---
 .../react/uimanager/JSTouchDispatcher.java     | 10 ++++++++++
 .../react/uimanager/events/TouchEvent.java     | 18 +++++++++++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/JSTouchDispatcher.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/JSTouchDispatcher.java
index 97d366a53853c1..ba8d56be8ad2fe 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/JSTouchDispatcher.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/JSTouchDispatcher.java
@@ -30,6 +30,7 @@ public class JSTouchDispatcher {
   private int mTargetTag = -1;
   private final float[] mTargetCoordinates = new float[2];
   private boolean mChildIsHandlingNativeGesture = false;
+  private long mGestureStartTime = TouchEvent.UNSET;
   private final ViewGroup mRootViewGroup;
   private final TouchEventCoalescingKeyHelper mTouchEventCoalescingKeyHelper =
     new TouchEventCoalescingKeyHelper();
@@ -72,6 +73,7 @@ public void handleTouchEvent(MotionEvent ev, EventDispatcher eventDispatcher) {
       // {@link #findTargetTagForTouch} to find react view ID that will be responsible for handling
       // this gesture
       mChildIsHandlingNativeGesture = false;
+      mGestureStartTime = ev.getEventTime();
       mTargetTag = TouchTargetHelper.findTargetTagAndCoordinatesForTouch(
         ev.getX(),
         ev.getY(),
@@ -83,6 +85,7 @@ public void handleTouchEvent(MotionEvent ev, EventDispatcher eventDispatcher) {
           mTargetTag,
           TouchEventType.START,
           ev,
+          mGestureStartTime,
           mTargetCoordinates[0],
           mTargetCoordinates[1],
           mTouchEventCoalescingKeyHelper));
@@ -105,10 +108,12 @@ public void handleTouchEvent(MotionEvent ev, EventDispatcher eventDispatcher) {
           mTargetTag,
           TouchEventType.END,
           ev,
+          mGestureStartTime,
           mTargetCoordinates[0],
           mTargetCoordinates[1],
           mTouchEventCoalescingKeyHelper));
       mTargetTag = -1;
+      mGestureStartTime = TouchEvent.UNSET;
     } else if (action == MotionEvent.ACTION_MOVE) {
       // Update pointer position for current gesture
       eventDispatcher.dispatchEvent(
@@ -116,6 +121,7 @@ public void handleTouchEvent(MotionEvent ev, EventDispatcher eventDispatcher) {
           mTargetTag,
           TouchEventType.MOVE,
           ev,
+          mGestureStartTime,
           mTargetCoordinates[0],
           mTargetCoordinates[1],
           mTouchEventCoalescingKeyHelper));
@@ -126,6 +132,7 @@ public void handleTouchEvent(MotionEvent ev, EventDispatcher eventDispatcher) {
           mTargetTag,
           TouchEventType.START,
           ev,
+          mGestureStartTime,
           mTargetCoordinates[0],
           mTargetCoordinates[1],
           mTouchEventCoalescingKeyHelper));
@@ -136,6 +143,7 @@ public void handleTouchEvent(MotionEvent ev, EventDispatcher eventDispatcher) {
           mTargetTag,
           TouchEventType.END,
           ev,
+          mGestureStartTime,
           mTargetCoordinates[0],
           mTargetCoordinates[1],
           mTouchEventCoalescingKeyHelper));
@@ -149,6 +157,7 @@ public void handleTouchEvent(MotionEvent ev, EventDispatcher eventDispatcher) {
         );
       }
       mTargetTag = -1;
+      mGestureStartTime = TouchEvent.UNSET;
     } else {
       FLog.w(
         ReactConstants.TAG,
@@ -176,6 +185,7 @@ private void dispatchCancelEvent(MotionEvent androidEvent, EventDispatcher event
         mTargetTag,
         TouchEventType.CANCEL,
         androidEvent,
+        mGestureStartTime,
         mTargetCoordinates[0],
         mTargetCoordinates[1],
         mTouchEventCoalescingKeyHelper));
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEvent.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEvent.java
index 0262f0bd085459..03d922852ea361 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEvent.java
@@ -15,6 +15,7 @@
 import android.view.MotionEvent;
 
 import com.facebook.infer.annotation.Assertions;
+import com.facebook.react.bridge.SoftAssertions;
 
 /**
  * An event representing the start, end or movement of a touch. Corresponds to a single
@@ -31,10 +32,13 @@ public class TouchEvent extends Event<TouchEvent> {
   private static final Pools.SynchronizedPool<TouchEvent> EVENTS_POOL =
       new Pools.SynchronizedPool<>(TOUCH_EVENTS_POOL_SIZE);
 
+  public static final long UNSET = Long.MIN_VALUE;
+
   public static TouchEvent obtain(
       int viewTag,
       TouchEventType touchEventType,
       MotionEvent motionEventToCopy,
+      long gestureStartTime,
       float viewX,
       float viewY,
       TouchEventCoalescingKeyHelper touchEventCoalescingKeyHelper) {
@@ -46,6 +50,7 @@ public static TouchEvent obtain(
       viewTag,
       touchEventType,
       motionEventToCopy,
+      gestureStartTime,
       viewX,
       viewY,
       touchEventCoalescingKeyHelper);
@@ -67,30 +72,33 @@ private void init(
       int viewTag,
       TouchEventType touchEventType,
       MotionEvent motionEventToCopy,
+      long gestureStartTime,
       float viewX,
       float viewY,
       TouchEventCoalescingKeyHelper touchEventCoalescingKeyHelper) {
     super.init(viewTag);
 
+    SoftAssertions.assertCondition(gestureStartTime != UNSET,
+        "Gesture start time must be initialized");
     short coalescingKey = 0;
     int action = (motionEventToCopy.getAction() & MotionEvent.ACTION_MASK);
     switch (action) {
       case MotionEvent.ACTION_DOWN:
-        touchEventCoalescingKeyHelper.addCoalescingKey(motionEventToCopy.getDownTime());
+        touchEventCoalescingKeyHelper.addCoalescingKey(gestureStartTime);
         break;
       case MotionEvent.ACTION_UP:
-        touchEventCoalescingKeyHelper.removeCoalescingKey(motionEventToCopy.getDownTime());
+        touchEventCoalescingKeyHelper.removeCoalescingKey(gestureStartTime);
         break;
       case MotionEvent.ACTION_POINTER_DOWN:
       case MotionEvent.ACTION_POINTER_UP:
-        touchEventCoalescingKeyHelper.incrementCoalescingKey(motionEventToCopy.getDownTime());
+        touchEventCoalescingKeyHelper.incrementCoalescingKey(gestureStartTime);
         break;
       case MotionEvent.ACTION_MOVE:
         coalescingKey =
-          touchEventCoalescingKeyHelper.getCoalescingKey(motionEventToCopy.getDownTime());
+          touchEventCoalescingKeyHelper.getCoalescingKey(gestureStartTime);
         break;
       case MotionEvent.ACTION_CANCEL:
-        touchEventCoalescingKeyHelper.removeCoalescingKey(motionEventToCopy.getDownTime());
+        touchEventCoalescingKeyHelper.removeCoalescingKey(gestureStartTime);
         break;
       default:
         throw new RuntimeException("Unhandled MotionEvent action: " + action);

From b96e210500229e80e90886230c9b47293bb09896 Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Mon, 27 Mar 2017 09:43:11 -0700
Subject: [PATCH 196/366] packager: ResolutionRequest.js: sync
 _resolveNodeDependency()

Summary: Moar synchronicity.

Reviewed By: davidaurelio

Differential Revision: D4756495

fbshipit-source-id: 4e0758ba8b55bd25a24d79dcc8ac4ace101e2ae8
---
 .../DependencyGraph/ResolutionRequest.js      | 152 +++++++++---------
 1 file changed, 78 insertions(+), 74 deletions(-)

diff --git a/packager/src/node-haste/DependencyGraph/ResolutionRequest.js b/packager/src/node-haste/DependencyGraph/ResolutionRequest.js
index c16208044d8be3..f0f656cb95384f 100644
--- a/packager/src/node-haste/DependencyGraph/ResolutionRequest.js
+++ b/packager/src/node-haste/DependencyGraph/ResolutionRequest.js
@@ -132,11 +132,12 @@ class ResolutionRequest {
         && !(isRelativeImport(toModuleName) || isAbsolutePath(toModuleName))) {
       return this._tryResolve(
         () => Promise.resolve().then(() => this._resolveHasteDependency(fromModule, toModuleName)),
-        () => this._resolveNodeDependency(fromModule, toModuleName)
+        () => Promise.resolve().then(() => this._resolveNodeDependency(fromModule, toModuleName))
       ).then(cacheResult);
     }
 
-    return this._resolveNodeDependency(fromModule, toModuleName)
+    return Promise.resolve()
+      .then(() => this._resolveNodeDependency(fromModule, toModuleName))
       .then(cacheResult);
   }
 
@@ -329,87 +330,90 @@ class ResolutionRequest {
     );
   }
 
-  _resolveNodeDependency(fromModule: Module, toModuleName: string): Promise<Module> {
-    return Promise.resolve().then(() => {
-      if (isRelativeImport(toModuleName) || isAbsolutePath(toModuleName)) {
-        return this._resolveFileOrDir(fromModule, toModuleName);
-      }
-      const realModuleName = this._redirectRequire(fromModule, toModuleName);
-      // exclude
-      if (realModuleName === false) {
-        return this._loadAsFile(
-          ResolutionRequest.emptyModule,
-          fromModule,
-          toModuleName,
-        );
-      }
+  _resolveNodeDependency(fromModule: Module, toModuleName: string): Module {
+    if (isRelativeImport(toModuleName) || isAbsolutePath(toModuleName)) {
+      return this._resolveFileOrDir(fromModule, toModuleName);
+    }
+    const realModuleName = this._redirectRequire(fromModule, toModuleName);
+    // exclude
+    if (realModuleName === false) {
+      return this._loadAsFile(
+        ResolutionRequest.emptyModule,
+        fromModule,
+        toModuleName,
+      );
+    }
+
+    if (isRelativeImport(realModuleName) || isAbsolutePath(realModuleName)) {
+      // derive absolute path /.../node_modules/fromModuleDir/realModuleName
+      const fromModuleParentIdx = fromModule.path.lastIndexOf('node_modules' + path.sep) + 13;
+      const fromModuleDir = fromModule.path.slice(
+        0,
+        fromModule.path.indexOf(path.sep, fromModuleParentIdx),
+      );
+      const absPath = path.join(fromModuleDir, realModuleName);
+      return this._resolveFileOrDir(fromModule, absPath);
+    }
 
-      if (isRelativeImport(realModuleName) || isAbsolutePath(realModuleName)) {
-        // derive absolute path /.../node_modules/fromModuleDir/realModuleName
-        const fromModuleParentIdx = fromModule.path.lastIndexOf('node_modules' + path.sep) + 13;
-        const fromModuleDir = fromModule.path.slice(
-          0,
-          fromModule.path.indexOf(path.sep, fromModuleParentIdx),
+    const searchQueue = [];
+    for (let currDir = path.dirname(fromModule.path);
+         currDir !== '.' && currDir !== realPath.parse(fromModule.path).root;
+         currDir = path.dirname(currDir)) {
+      const searchPath = path.join(currDir, 'node_modules');
+      if (this._dirExists(searchPath)) {
+        searchQueue.push(
+          path.join(searchPath, realModuleName)
         );
-        const absPath = path.join(fromModuleDir, realModuleName);
-        return this._resolveFileOrDir(fromModule, absPath);
       }
+    }
 
-      const searchQueue = [];
-      for (let currDir = path.dirname(fromModule.path);
-           currDir !== '.' && currDir !== realPath.parse(fromModule.path).root;
-           currDir = path.dirname(currDir)) {
-        const searchPath = path.join(currDir, 'node_modules');
-        if (this._dirExists(searchPath)) {
-          searchQueue.push(
-            path.join(searchPath, realModuleName)
-          );
-        }
+    if (this._extraNodeModules) {
+      const {_extraNodeModules} = this;
+      const bits = toModuleName.split(path.sep);
+      const packageName = bits[0];
+      if (_extraNodeModules[packageName]) {
+        bits[0] = _extraNodeModules[packageName];
+        searchQueue.push(path.join.apply(path, bits));
       }
+    }
 
-      if (this._extraNodeModules) {
-        const {_extraNodeModules} = this;
-        const bits = toModuleName.split(path.sep);
-        const packageName = bits[0];
-        if (_extraNodeModules[packageName]) {
-          bits[0] = _extraNodeModules[packageName];
-          searchQueue.push(path.join.apply(path, bits));
-        }
+    for (let i = 0; i < searchQueue.length; ++i) {
+      const resolvedModule = this._tryResolveNodeDep(searchQueue[i], fromModule, toModuleName);
+      if (resolvedModule != null) {
+        return resolvedModule;
       }
+    }
 
-      let p = Promise.reject(new UnableToResolveError(fromModule, toModuleName));
-      searchQueue.forEach(potentialModulePath => {
-        p = this._tryResolve(
-          () => this._tryResolve(
-            () => p,
-            () => Promise.resolve().then(
-              () => this._loadAsFile(potentialModulePath, fromModule, toModuleName),
-            ),
-          ),
-          () => Promise.resolve().then(
-            () => this._loadAsDir(potentialModulePath, fromModule, toModuleName),
-          ),
-        );
-      });
+    const hint = searchQueue.length ? ' or in these directories:' : '';
+    throw new UnableToResolveError(
+      fromModule,
+      toModuleName,
+      `Module does not exist in the module map${hint}\n` +
+        searchQueue.map(searchPath => `  ${path.dirname(searchPath)}\n`).join(', ') + '\n' +
+      `This might be related to https://github.com/facebook/react-native/issues/4968\n` +
+      `To resolve try the following:\n` +
+      `  1. Clear watchman watches: \`watchman watch-del-all\`.\n` +
+      `  2. Delete the \`node_modules\` folder: \`rm -rf node_modules && npm install\`.\n` +
+      '  3. Reset packager cache: `rm -fr $TMPDIR/react-*` or `npm start -- --reset-cache`.'
+    );
+  }
 
-      return p.catch(error => {
-        if (error.type !== 'UnableToResolveError') {
-          throw error;
-        }
-        const hint = searchQueue.length ? ' or in these directories:' : '';
-        throw new UnableToResolveError(
-          fromModule,
-          toModuleName,
-          `Module does not exist in the module map${hint}\n` +
-            searchQueue.map(searchPath => `  ${path.dirname(searchPath)}\n`).join(', ') + '\n' +
-          `This might be related to https://github.com/facebook/react-native/issues/4968\n` +
-          `To resolve try the following:\n` +
-          `  1. Clear watchman watches: \`watchman watch-del-all\`.\n` +
-          `  2. Delete the \`node_modules\` folder: \`rm -rf node_modules && npm install\`.\n` +
-          '  3. Reset packager cache: `rm -fr $TMPDIR/react-*` or `npm start -- --reset-cache`.'
-        );
-      });
-    });
+  /**
+   * This is written as a separate function because "try..catch" blocks cause
+   * the entire surrounding function to be deoptimized.
+   */
+  _tryResolveNodeDep(searchPath: string, fromModule: Module, toModuleName: string): ?Module {
+    try {
+      return tryResolveSync(
+        () => this._loadAsFile(searchPath, fromModule, toModuleName),
+        () => this._loadAsDir(searchPath, fromModule, toModuleName),
+      );
+    } catch (error) {
+      if (error.type !== 'UnableToResolveError') {
+        throw error;
+      }
+      return null;
+    }
   }
 
   _loadAsFile(potentialModulePath: string, fromModule: Module, toModule: string): Module {

From e0ad42592b99c3a912210d7259b773c839f4eb08 Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Mon, 27 Mar 2017 09:43:13 -0700
Subject: [PATCH 197/366] packager: ResolutionRequest.js: resolveDependency()
 now sync

Reviewed By: davidaurelio

Differential Revision: D4763593

fbshipit-source-id: b3dc95229d040c776833a88c9a156b9168e0cc4c
---
 .../DependencyGraph/ResolutionRequest.js      | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/packager/src/node-haste/DependencyGraph/ResolutionRequest.js b/packager/src/node-haste/DependencyGraph/ResolutionRequest.js
index f0f656cb95384f..b2433fb6ce1577 100644
--- a/packager/src/node-haste/DependencyGraph/ResolutionRequest.js
+++ b/packager/src/node-haste/DependencyGraph/ResolutionRequest.js
@@ -116,11 +116,12 @@ class ResolutionRequest {
   }
 
   // TODO(cpojer): Remove 'any' type. This is used for ModuleGraph/node-haste
-  resolveDependency(fromModule: Module | any, toModuleName: string) {
+  resolveDependency(fromModule: Module | any, toModuleName: string): Module {
     const resHash = resolutionHash(fromModule.path, toModuleName);
 
-    if (this._immediateResolutionCache[resHash]) {
-      return Promise.resolve(this._immediateResolutionCache[resHash]);
+    const immediateResolution = this._immediateResolutionCache[resHash];
+    if (immediateResolution) {
+      return immediateResolution;
     }
 
     const cacheResult = result => {
@@ -130,15 +131,14 @@ class ResolutionRequest {
 
     if (!this._helpers.isNodeModulesDir(fromModule.path)
         && !(isRelativeImport(toModuleName) || isAbsolutePath(toModuleName))) {
-      return this._tryResolve(
-        () => Promise.resolve().then(() => this._resolveHasteDependency(fromModule, toModuleName)),
-        () => Promise.resolve().then(() => this._resolveNodeDependency(fromModule, toModuleName))
-      ).then(cacheResult);
+      const result = tryResolveSync(
+        () => this._resolveHasteDependency(fromModule, toModuleName),
+        () => this._resolveNodeDependency(fromModule, toModuleName),
+      );
+      return cacheResult(result);
     }
 
-    return Promise.resolve()
-      .then(() => this._resolveNodeDependency(fromModule, toModuleName))
-      .then(cacheResult);
+    return cacheResult(this._resolveNodeDependency(fromModule, toModuleName));
   }
 
   getOrderedDependencies({
@@ -160,11 +160,10 @@ class ResolutionRequest {
 
     const resolveDependencies = module =>
       module.getDependencies(transformOptions)
-        .then(dependencyNames =>
-          Promise.all(
-            dependencyNames.map(name => this.resolveDependency(module, name))
-          ).then(dependencies => [dependencyNames, dependencies])
-        );
+        .then(dependencyNames => {
+          const dependencies = dependencyNames.map(name => this.resolveDependency(module, name));
+          return [dependencyNames, dependencies];
+        });
 
     const collectedDependencies = new MapWithDefaults(module => collect(module));
     const crawlDependencies = (mod, [depNames, dependencies]) => {

From af34c3452f5168f0bca528c8babd1c92c4941ce4 Mon Sep 17 00:00:00 2001
From: Eric Vicenti <evv@fb.com>
Date: Mon, 27 Mar 2017 10:26:13 -0700
Subject: [PATCH 198/366] Fix license header for TVEventHandler

Reviewed By: yungsters

Differential Revision: D4775067

fbshipit-source-id: 3504b0429c14d6a7d79ac4c8464113f4a19ae230
---
 .../AppleTV/TVEventHandler.android.js         | 23 +------------------
 .../Components/AppleTV/TVEventHandler.ios.js  | 23 +------------------
 2 files changed, 2 insertions(+), 44 deletions(-)

diff --git a/Libraries/Components/AppleTV/TVEventHandler.android.js b/Libraries/Components/AppleTV/TVEventHandler.android.js
index 6d52d0d5eff88b..dc5a1d6b94e931 100644
--- a/Libraries/Components/AppleTV/TVEventHandler.android.js
+++ b/Libraries/Components/AppleTV/TVEventHandler.android.js
@@ -1,32 +1,11 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
+ * Copyright (c) 2015-present, Facebook, Inc.
  * All rights reserved.
  *
  * This source code is licensed under the BSD-style license found in the
  * 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.
  *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
  * @providesModule TVEventHandler
  * @flow
  */
diff --git a/Libraries/Components/AppleTV/TVEventHandler.ios.js b/Libraries/Components/AppleTV/TVEventHandler.ios.js
index bda9737459a4e0..c01f2b065a76fd 100644
--- a/Libraries/Components/AppleTV/TVEventHandler.ios.js
+++ b/Libraries/Components/AppleTV/TVEventHandler.ios.js
@@ -1,32 +1,11 @@
 /**
- * Copyright (c) 2016-present, Facebook, Inc.
+ * Copyright (c) 2015-present, Facebook, Inc.
  * All rights reserved.
  *
  * This source code is licensed under the BSD-style license found in the
  * 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.
  *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
  * @providesModule TVEventHandler
  * @flow
  */

From 7aa2c9ab17097ca7bc748fbbd104bce213ae1fce Mon Sep 17 00:00:00 2001
From: Eric Vicenti <evv@fb.com>
Date: Mon, 27 Mar 2017 10:41:42 -0700
Subject: [PATCH 199/366] NavigatorIOS - Remove NavigationContext

Reviewed By: fkgozali

Differential Revision: D4774022

fbshipit-source-id: 0184bcbcf6a458eac6377cc6e1cffc0924f0d2d2
---
 .../Components/Navigation/NavigatorIOS.ios.js | 20 -------------------
 1 file changed, 20 deletions(-)

diff --git a/Libraries/Components/Navigation/NavigatorIOS.ios.js b/Libraries/Components/Navigation/NavigatorIOS.ios.js
index d02aea57a8392e..3b5697371eb33b 100644
--- a/Libraries/Components/Navigation/NavigatorIOS.ios.js
+++ b/Libraries/Components/Navigation/NavigatorIOS.ios.js
@@ -13,7 +13,6 @@
 
 var EventEmitter = require('EventEmitter');
 var Image = require('Image');
-var NavigationContext = require('NavigationContext');
 var RCTNavigatorManager = require('NativeModules').NavigatorManager;
 var React = require('React');
 var ReactNative = require('ReactNative');
@@ -499,7 +498,6 @@ var NavigatorIOS = React.createClass({
   },
 
   navigator: (undefined: ?Object),
-  navigationContext: new NavigationContext(),
 
   componentWillMount: function() {
     // Precompute a pack of callbacks that's frequently generated and passed to
@@ -515,19 +513,14 @@ var NavigatorIOS = React.createClass({
       resetTo: this.resetTo,
       popToRoute: this.popToRoute,
       popToTop: this.popToTop,
-      navigationContext: this.navigationContext,
     };
-    this._emitWillFocus(this.state.routeStack[this.state.observedTopOfStack]);
   },
 
   componentDidMount: function() {
-    this._emitDidFocus(this.state.routeStack[this.state.observedTopOfStack]);
     this._enableTVEventHandler();
   },
 
   componentWillUnmount: function() {
-    this.navigationContext.dispose();
-    this.navigationContext = new NavigationContext();
     this._disableTVEventHandler();
   },
 
@@ -608,7 +601,6 @@ var NavigatorIOS = React.createClass({
 
   _handleNavigatorStackChanged: function(e: Event) {
     var newObservedTopOfStack = e.nativeEvent.stackLength - 1;
-    this._emitDidFocus(this.state.routeStack[newObservedTopOfStack]);
 
     invariant(
       newObservedTopOfStack <= this.state.requestedTopOfStack,
@@ -661,14 +653,6 @@ var NavigatorIOS = React.createClass({
     });
   },
 
-  _emitDidFocus: function(route: Route) {
-    this.navigationContext.emit('didfocus', {route: route});
-  },
-
-  _emitWillFocus: function(route: Route) {
-    this.navigationContext.emit('willfocus', {route: route});
-  },
-
   /**
    * Navigate forward to a new route.
    * @param route The new route to navigate to.
@@ -678,7 +662,6 @@ var NavigatorIOS = React.createClass({
     // Make sure all previous requests are caught up first. Otherwise reject.
     if (this.state.requestedTopOfStack === this.state.observedTopOfStack) {
       this._tryLockNavigator(() => {
-        this._emitWillFocus(route);
 
         var nextStack = this.state.routeStack.concat([route]);
         var nextIDStack = this.state.idStack.concat([getuid()]);
@@ -709,7 +692,6 @@ var NavigatorIOS = React.createClass({
         this._tryLockNavigator(() => {
           var newRequestedTopOfStack = this.state.requestedTopOfStack - n;
           invariant(newRequestedTopOfStack >= 0, 'Cannot pop below 0');
-          this._emitWillFocus(this.state.routeStack[newRequestedTopOfStack]);
           this.setState({
             requestedTopOfStack: newRequestedTopOfStack,
             makingNavigatorRequest: true,
@@ -758,8 +740,6 @@ var NavigatorIOS = React.createClass({
       updatingAllIndicesAtOrBeyond: index,
     });
 
-    this._emitWillFocus(route);
-    this._emitDidFocus(route);
   },
 
   /**

From 87b0378eb8877cb749688cfe76182167a17d3fea Mon Sep 17 00:00:00 2001
From: Janic Duplessis <janicduplessis@gmail.com>
Date: Mon, 27 Mar 2017 11:34:32 -0700
Subject: [PATCH 200/366] Native Animated - Restore, reorganize and add new
 tests

Summary:
Native Animated tests were removed a while back because they were failing, this restores the existing tests and reorganize / cleanup them. It also adds new ones so we have at least one test for each public API. These tests mostly assert that the native animated module is called with the proper args.
Closes https://github.com/facebook/react-native/pull/12775

Differential Revision: D4684968

Pulled By: ericvicenti

fbshipit-source-id: 4783d5edd08101cab7c0ce2eec4f3ccd0fbc1d27
---
 .gitignore                                    |   1 +
 .../src/__tests__/AnimatedNative-test.js      | 678 ++++++++++++++++++
 .../__mocks__/NativeEventEmitter.js           |  25 +
 3 files changed, 704 insertions(+)
 create mode 100644 Libraries/Animated/src/__tests__/AnimatedNative-test.js
 create mode 100644 Libraries/EventEmitter/__mocks__/NativeEventEmitter.js

diff --git a/.gitignore b/.gitignore
index 1ecdbc1bd3fa7d..57b9cbcb1cadc1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,4 +55,5 @@ node_modules
 /ReactAndroid/src/androidTest/assets/AndroidTestBundle.js
 *.js.meta
 
+/coverage
 /third-party
diff --git a/Libraries/Animated/src/__tests__/AnimatedNative-test.js b/Libraries/Animated/src/__tests__/AnimatedNative-test.js
new file mode 100644
index 00000000000000..c39079c656087e
--- /dev/null
+++ b/Libraries/Animated/src/__tests__/AnimatedNative-test.js
@@ -0,0 +1,678 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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.
+ */
+'use strict';
+
+jest
+  .disableAutomock()
+  .setMock('Text', {})
+  .setMock('View', {})
+  .setMock('Image', {})
+  .setMock('React', {Component: class {}})
+  .setMock('NativeModules', {
+    NativeAnimatedModule: {},
+  })
+  .mock('NativeEventEmitter')
+  // findNodeHandle is imported from ReactNative so mock that whole module.
+  .setMock('ReactNative', {findNodeHandle: () => 1});
+
+const Animated = require('Animated');
+const NativeAnimatedHelper = require('NativeAnimatedHelper');
+
+function createAndMountComponent(ComponentClass, props) {
+  const component = new ComponentClass();
+  component.props = props;
+  component.componentWillMount();
+  // Simulate that refs were set.
+  component._component = {};
+  component.componentDidMount();
+  return component;
+}
+
+describe('Native Animated', () => {
+
+  let nativeAnimatedModule = require('NativeModules').NativeAnimatedModule;
+
+  beforeEach(() => {
+    nativeAnimatedModule.addAnimatedEventToView = jest.fn();
+    nativeAnimatedModule.connectAnimatedNodes = jest.fn();
+    nativeAnimatedModule.connectAnimatedNodeToView = jest.fn();
+    nativeAnimatedModule.createAnimatedNode = jest.fn();
+    nativeAnimatedModule.disconnectAnimatedNodeFromView = jest.fn();
+    nativeAnimatedModule.disconnectAnimatedNodes = jest.fn();
+    nativeAnimatedModule.dropAnimatedNode = jest.fn();
+    nativeAnimatedModule.extractAnimatedNodeOffset = jest.fn();
+    nativeAnimatedModule.flattenAnimatedNodeOffset = jest.fn();
+    nativeAnimatedModule.removeAnimatedEventFromView = jest.fn();
+    nativeAnimatedModule.setAnimatedNodeOffset = jest.fn();
+    nativeAnimatedModule.setAnimatedNodeValue = jest.fn();
+    nativeAnimatedModule.startAnimatingNode = jest.fn();
+    nativeAnimatedModule.startListeningToAnimatedNodeValue = jest.fn();
+    nativeAnimatedModule.stopAnimation = jest.fn();
+    nativeAnimatedModule.stopListeningToAnimatedNodeValue = jest.fn();
+
+    // jest environment doesn't have cancelAnimationFrame :(
+    if (!global.cancelAnimationFrame) {
+      global.cancelAnimationFrame = jest.fn();
+    }
+  });
+
+  describe('Animated Value', () => {
+    it('proxies `setValue` correctly', () => {
+      const anim = new Animated.Value(0);
+      Animated.timing(anim, {toValue: 10, duration: 1000, useNativeDriver: true}).start();
+
+      const c = createAndMountComponent(Animated.View, {
+        style: {
+          opacity: anim,
+        },
+      });
+
+      // We expect `setValue` not to propagate down to `setNativeProps`, otherwise it may try to access `setNativeProps`
+      // via component refs table that we override here.
+      c.refs = {
+        node: {
+          setNativeProps: jest.genMockFunction(),
+        },
+      };
+
+      anim.setValue(0.5);
+
+      expect(nativeAnimatedModule.setAnimatedNodeValue).toBeCalledWith(jasmine.any(Number), 0.5);
+      expect(c.refs.node.setNativeProps).not.toHaveBeenCalled();
+    });
+
+    it('should set offset', () => {
+      const anim = new Animated.Value(0);
+      anim.setOffset(10);
+      anim.__makeNative();
+      createAndMountComponent(Animated.View, {
+        style: {
+          opacity: anim,
+        },
+      });
+
+      expect(nativeAnimatedModule.createAnimatedNode).toBeCalledWith(
+        jasmine.any(Number),
+        {type: 'value', value: 0, offset: 10},
+      );
+      anim.setOffset(20);
+      expect(nativeAnimatedModule.setAnimatedNodeOffset)
+        .toBeCalledWith(jasmine.any(Number), 20);
+    });
+
+    it('should flatten offset', () => {
+      const anim = new Animated.Value(0);
+      anim.__makeNative();
+      createAndMountComponent(Animated.View, {
+        style: {
+          opacity: anim,
+        },
+      });
+
+      expect(nativeAnimatedModule.createAnimatedNode).toBeCalledWith(
+        jasmine.any(Number),
+        {type: 'value', value: 0, offset: 0},
+      );
+      anim.flattenOffset();
+      expect(nativeAnimatedModule.flattenAnimatedNodeOffset)
+        .toBeCalledWith(jasmine.any(Number));
+    });
+
+    it('should extract offset', () => {
+      const anim = new Animated.Value(0);
+      anim.__makeNative();
+      createAndMountComponent(Animated.View, {
+        style: {
+          opacity: anim,
+        },
+      });
+
+      expect(nativeAnimatedModule.createAnimatedNode).toBeCalledWith(
+        jasmine.any(Number),
+        {type: 'value', value: 0, offset: 0},
+      );
+      anim.extractOffset();
+      expect(nativeAnimatedModule.extractAnimatedNodeOffset)
+        .toBeCalledWith(jasmine.any(Number));
+    });
+  });
+
+  describe('Animated Listeners', () => {
+    it('should get updates', () => {
+      const value1 = new Animated.Value(0);
+      value1.__makeNative();
+      const listener = jest.fn();
+      const id = value1.addListener(listener);
+      expect(nativeAnimatedModule.startListeningToAnimatedNodeValue)
+        .toHaveBeenCalledWith(value1.__getNativeTag());
+
+      NativeAnimatedHelper.nativeEventEmitter.emit(
+        'onAnimatedValueUpdate',
+        {value: 42, tag: value1.__getNativeTag()},
+      );
+      expect(listener).toHaveBeenCalledTimes(1);
+      expect(listener).toBeCalledWith({value: 42});
+      expect(value1.__getValue()).toBe(42);
+
+      NativeAnimatedHelper.nativeEventEmitter.emit(
+        'onAnimatedValueUpdate',
+        {value: 7, tag: value1.__getNativeTag()},
+      );
+      expect(listener).toHaveBeenCalledTimes(2);
+      expect(listener).toBeCalledWith({value: 7});
+      expect(value1.__getValue()).toBe(7);
+
+      value1.removeListener(id);
+      expect(nativeAnimatedModule.stopListeningToAnimatedNodeValue)
+        .toHaveBeenCalledWith(value1.__getNativeTag());
+
+      NativeAnimatedHelper.nativeEventEmitter.emit(
+        'onAnimatedValueUpdate',
+        {value: 1492, tag: value1.__getNativeTag()},
+      );
+      expect(listener).toHaveBeenCalledTimes(2);
+      expect(value1.__getValue()).toBe(7);
+    });
+
+    it('should removeAll', () => {
+      const value1 = new Animated.Value(0);
+      value1.__makeNative();
+      const listener = jest.fn();
+      [1,2,3,4].forEach(() => value1.addListener(listener));
+      expect(nativeAnimatedModule.startListeningToAnimatedNodeValue)
+        .toHaveBeenCalledWith(value1.__getNativeTag());
+
+      NativeAnimatedHelper.nativeEventEmitter.emit(
+        'onAnimatedValueUpdate',
+        {value: 42, tag: value1.__getNativeTag()},
+      );
+      expect(listener).toHaveBeenCalledTimes(4);
+      expect(listener).toBeCalledWith({value: 42});
+
+      value1.removeAllListeners();
+      expect(nativeAnimatedModule.stopListeningToAnimatedNodeValue)
+        .toHaveBeenCalledWith(value1.__getNativeTag());
+
+      NativeAnimatedHelper.nativeEventEmitter.emit(
+        'onAnimatedValueUpdate',
+        {value: 7, tag: value1.__getNativeTag()},
+      );
+      expect(listener).toHaveBeenCalledTimes(4);
+    });
+  });
+
+  describe('Animated Events', () => {
+    it('should map events', () => {
+      const value = new Animated.Value(0);
+      value.__makeNative();
+      const event = Animated.event(
+        [{nativeEvent: {state: {foo: value}}}],
+        {useNativeDriver: true},
+      );
+      const c = createAndMountComponent(Animated.View, {onTouchMove: event});
+      expect(nativeAnimatedModule.addAnimatedEventToView).toBeCalledWith(
+        jasmine.any(Number),
+        'onTouchMove',
+        {nativeEventPath: ['state', 'foo'], animatedValueTag: value.__getNativeTag()},
+      );
+
+      c.componentWillUnmount();
+      expect(nativeAnimatedModule.removeAnimatedEventFromView).toBeCalledWith(
+        jasmine.any(Number),
+        'onTouchMove',
+        value.__getNativeTag(),
+      );
+    });
+
+    it('should throw on invalid event path', () => {
+      const value = new Animated.Value(0);
+      value.__makeNative();
+      const event = Animated.event(
+        [{notNativeEvent: {foo: value}}],
+        {useNativeDriver: true},
+      );
+      expect(() => createAndMountComponent(Animated.View, {onTouchMove: event}))
+        .toThrowError(/nativeEvent/);
+      expect(nativeAnimatedModule.addAnimatedEventToView).not.toBeCalled();
+    });
+
+    it('should call listeners', () => {
+      const value = new Animated.Value(0);
+      value.__makeNative();
+      const listener = jest.fn();
+      const event = Animated.event(
+        [{nativeEvent: {foo: value}}],
+        {useNativeDriver: true, listener},
+      );
+      const handler = event.__getHandler();
+      handler({foo: 42});
+      expect(listener).toHaveBeenCalledTimes(1);
+      expect(listener).toBeCalledWith({foo: 42});
+    });
+  });
+
+  describe('Animated Graph', () => {
+    it('creates and detaches nodes', () => {
+      const anim = new Animated.Value(0);
+      const c = createAndMountComponent(Animated.View, {
+        style: {
+          opacity: anim,
+        },
+      });
+
+      Animated.timing(anim, {toValue: 10, duration: 1000, useNativeDriver: true}).start();
+
+      c.componentWillUnmount();
+
+      expect(nativeAnimatedModule.createAnimatedNode).toHaveBeenCalledTimes(3);
+      expect(nativeAnimatedModule.connectAnimatedNodes).toHaveBeenCalledTimes(2);
+
+      expect(nativeAnimatedModule.startAnimatingNode).toBeCalledWith(
+        jasmine.any(Number),
+        jasmine.any(Number),
+        {type: 'frames', frames: jasmine.any(Array), toValue: jasmine.any(Number), delay: jasmine.any(Number), iterations: 1},
+        jasmine.any(Function)
+      );
+
+      expect(nativeAnimatedModule.disconnectAnimatedNodes).toHaveBeenCalledTimes(2);
+      expect(nativeAnimatedModule.dropAnimatedNode).toHaveBeenCalledTimes(2);
+    });
+
+    it('sends a valid description for value, style and props nodes', () => {
+      const anim = new Animated.Value(0);
+      createAndMountComponent(Animated.View, {
+        style: {
+          opacity: anim,
+        },
+      });
+
+      Animated.timing(anim, {toValue: 10, duration: 1000, useNativeDriver: true}).start();
+
+      expect(nativeAnimatedModule.createAnimatedNode)
+        .toBeCalledWith(jasmine.any(Number), {type: 'value', value: 0, offset: 0});
+      expect(nativeAnimatedModule.createAnimatedNode)
+        .toBeCalledWith(jasmine.any(Number), {type: 'style', style: {opacity: jasmine.any(Number)}});
+      expect(nativeAnimatedModule.createAnimatedNode)
+        .toBeCalledWith(jasmine.any(Number), {type: 'props', props: {style: jasmine.any(Number)}});
+    });
+
+    it('sends a valid graph description for Animated.add nodes', () => {
+      const first = new Animated.Value(1);
+      const second = new Animated.Value(2);
+      first.__makeNative();
+      second.__makeNative();
+
+      createAndMountComponent(Animated.View, {
+        style: {
+          opacity: Animated.add(first, second),
+        },
+      });
+
+      expect(nativeAnimatedModule.createAnimatedNode).toBeCalledWith(
+        jasmine.any(Number),
+        {type: 'addition', input: jasmine.any(Array)},
+      );
+      const additionCalls = nativeAnimatedModule.createAnimatedNode.mock.calls.filter(
+        (call) => call[1].type === 'addition'
+      );
+      expect(additionCalls.length).toBe(1);
+      const additionCall = additionCalls[0];
+      const additionNodeTag = additionCall[0];
+      const additionConnectionCalls = nativeAnimatedModule.connectAnimatedNodes.mock.calls.filter(
+        (call) => call[1] === additionNodeTag
+      );
+      expect(additionConnectionCalls.length).toBe(2);
+      expect(nativeAnimatedModule.createAnimatedNode)
+        .toBeCalledWith(additionCall[1].input[0], {type: 'value', value: 1, offset: 0});
+      expect(nativeAnimatedModule.createAnimatedNode)
+        .toBeCalledWith(additionCall[1].input[1], {type: 'value', value: 2, offset: 0});
+    });
+
+    it('sends a valid graph description for Animated.multiply nodes', () => {
+      const first = new Animated.Value(2);
+      const second = new Animated.Value(1);
+      first.__makeNative();
+      second.__makeNative();
+
+      createAndMountComponent(Animated.View, {
+        style: {
+          opacity: Animated.multiply(first, second),
+        },
+      });
+
+      expect(nativeAnimatedModule.createAnimatedNode).toBeCalledWith(
+        jasmine.any(Number),
+        {type: 'multiplication', input: jasmine.any(Array)},
+      );
+      const multiplicationCalls = nativeAnimatedModule.createAnimatedNode.mock.calls.filter(
+        (call) => call[1].type === 'multiplication'
+      );
+      expect(multiplicationCalls.length).toBe(1);
+      const multiplicationCall = multiplicationCalls[0];
+      const multiplicationNodeTag = multiplicationCall[0];
+      const multiplicationConnectionCalls = nativeAnimatedModule.connectAnimatedNodes.mock.calls.filter(
+        (call) => call[1] === multiplicationNodeTag
+      );
+      expect(multiplicationConnectionCalls.length).toBe(2);
+      expect(nativeAnimatedModule.createAnimatedNode)
+        .toBeCalledWith(multiplicationCall[1].input[0], {type: 'value', value: 2, offset: 0});
+      expect(nativeAnimatedModule.createAnimatedNode)
+        .toBeCalledWith(multiplicationCall[1].input[1], {type: 'value', value: 1, offset: 0});
+    });
+
+    it('sends a valid graph description for Animated.divide nodes', () => {
+      const first = new Animated.Value(4);
+      const second = new Animated.Value(2);
+      first.__makeNative();
+      second.__makeNative();
+
+      createAndMountComponent(Animated.View, {
+        style: {
+          opacity: Animated.divide(first, second),
+        },
+      });
+
+      expect(nativeAnimatedModule.createAnimatedNode)
+        .toBeCalledWith(jasmine.any(Number), {type: 'division', input: jasmine.any(Array)});
+      const divisionCalls = nativeAnimatedModule.createAnimatedNode.mock.calls.filter(
+        (call) => call[1].type === 'division'
+      );
+      expect(divisionCalls.length).toBe(1);
+      const divisionCall = divisionCalls[0];
+      const divisionNodeTag = divisionCall[0];
+      const divisionConnectionCalls = nativeAnimatedModule.connectAnimatedNodes.mock.calls.filter(
+        (call) => call[1] === divisionNodeTag
+      );
+      expect(divisionConnectionCalls.length).toBe(2);
+      expect(nativeAnimatedModule.createAnimatedNode)
+        .toBeCalledWith(divisionCall[1].input[0], {type: 'value', value: 4, offset: 0});
+      expect(nativeAnimatedModule.createAnimatedNode)
+        .toBeCalledWith(divisionCall[1].input[1], {type: 'value', value: 2, offset: 0});
+    });
+
+    it('sends a valid graph description for Animated.modulo nodes', () => {
+      const value = new Animated.Value(4);
+      value.__makeNative();
+
+      createAndMountComponent(Animated.View, {
+        style: {
+          opacity: Animated.modulo(value, 4),
+        },
+      });
+
+      expect(nativeAnimatedModule.createAnimatedNode).toBeCalledWith(
+        jasmine.any(Number),
+        {type: 'modulus', modulus: 4, input: jasmine.any(Number)},
+      );
+      const moduloCalls = nativeAnimatedModule.createAnimatedNode.mock.calls.filter(
+        (call) => call[1].type === 'modulus'
+      );
+      expect(moduloCalls.length).toBe(1);
+      const moduloCall = moduloCalls[0];
+      const moduloNodeTag = moduloCall[0];
+      const moduloConnectionCalls = nativeAnimatedModule.connectAnimatedNodes.mock.calls.filter(
+        (call) => call[1] === moduloNodeTag
+      );
+      expect(moduloConnectionCalls.length).toBe(1);
+      expect(nativeAnimatedModule.createAnimatedNode)
+        .toBeCalledWith(moduloCall[1].input, {type: 'value', value: 4, offset: 0});
+    });
+
+    it('sends a valid graph description for interpolate() nodes', () => {
+      const value = new Animated.Value(10);
+      value.__makeNative();
+
+      createAndMountComponent(Animated.View, {
+        style: {
+          opacity: value.interpolate({
+            inputRange: [10, 20],
+            outputRange: [0, 1],
+          }),
+        },
+      });
+
+      expect(nativeAnimatedModule.createAnimatedNode).toBeCalledWith(
+        jasmine.any(Number),
+        {type: 'value', value: 10, offset: 0}
+      );
+      expect(nativeAnimatedModule.createAnimatedNode)
+        .toBeCalledWith(jasmine.any(Number), {
+          type: 'interpolation',
+          inputRange: [10, 20],
+          outputRange: [0, 1],
+          extrapolateLeft: 'extend',
+          extrapolateRight: 'extend',
+        });
+      const interpolationNodeTag = nativeAnimatedModule.createAnimatedNode.mock.calls.find(
+        (call) => call[1].type === 'interpolation'
+      )[0];
+      const valueNodeTag = nativeAnimatedModule.createAnimatedNode.mock.calls.find(
+        (call) => call[1].type === 'value'
+      )[0];
+      expect(nativeAnimatedModule.connectAnimatedNodes).toBeCalledWith(valueNodeTag, interpolationNodeTag);
+    });
+
+    it('sends a valid graph description for transform nodes', () => {
+      const value = new Animated.Value(0);
+      value.__makeNative();
+
+      createAndMountComponent(Animated.View, {
+        style: {
+          transform: [{translateX: value}, {scale: 2}],
+        },
+      });
+
+      expect(nativeAnimatedModule.createAnimatedNode).toBeCalledWith(
+        jasmine.any(Number),
+        {
+          type: 'transform',
+          transforms: [{
+            nodeTag: jasmine.any(Number),
+            property: 'translateX',
+            type: 'animated',
+          }, {
+            value: 2,
+            property: 'scale',
+            type: 'static',
+          }],
+        },
+      );
+    });
+
+    it('sends a valid graph description for Animated.diffClamp nodes', () => {
+      const value = new Animated.Value(2);
+      value.__makeNative();
+
+      createAndMountComponent(Animated.View, {
+        style: {
+          opacity: Animated.diffClamp(value, 0, 20),
+        },
+      });
+
+      expect(nativeAnimatedModule.createAnimatedNode).toBeCalledWith(
+        jasmine.any(Number),
+        {type: 'diffclamp', input: jasmine.any(Number), max: 20, min: 0},
+      );
+      const diffClampCalls = nativeAnimatedModule.createAnimatedNode.mock.calls.filter(
+        (call) => call[1].type === 'diffclamp'
+      );
+      expect(diffClampCalls.length).toBe(1);
+      const diffClampCall = diffClampCalls[0];
+      const diffClampNodeTag = diffClampCall[0];
+      const diffClampConnectionCalls = nativeAnimatedModule.connectAnimatedNodes.mock.calls.filter(
+        (call) => call[1] === diffClampNodeTag
+      );
+      expect(diffClampConnectionCalls.length).toBe(1);
+      expect(nativeAnimatedModule.createAnimatedNode)
+        .toBeCalledWith(diffClampCall[1].input, {type: 'value', value: 2, offset: 0});
+    });
+
+    it('doesn\'t call into native API if useNativeDriver is set to false', () => {
+      const anim = new Animated.Value(0);
+
+      const c = createAndMountComponent(Animated.View, {
+        style: {
+          opacity: anim,
+        },
+      });
+
+      Animated.timing(anim, {toValue: 10, duration: 1000, useNativeDriver: false}).start();
+
+      c.componentWillUnmount();
+
+      expect(nativeAnimatedModule.createAnimatedNode).not.toBeCalled();
+    });
+
+    it('fails when trying to run non-native animation on native node', () => {
+      const anim = new Animated.Value(0);
+
+      createAndMountComponent(Animated.View, {
+        style: {
+          opacity: anim,
+        },
+      });
+
+      Animated.timing(anim, {toValue: 10, duration: 50, useNativeDriver: true}).start();
+      jest.runAllTimers();
+
+      Animated.timing(anim, {toValue: 4, duration: 500, useNativeDriver: false}).start();
+      expect(jest.runAllTimers).toThrow();
+    });
+
+    it('fails for unsupported styles', () => {
+      const anim = new Animated.Value(0);
+
+      createAndMountComponent(Animated.View, {
+        style: {
+          left: anim,
+        },
+      });
+
+      const animation = Animated.timing(anim, {toValue: 10, duration: 50, useNativeDriver: true});
+      expect(animation.start).toThrowError(/left/);
+    });
+
+    it('works for any `static` props and styles', () => {
+      // Passing "unsupported" props should work just fine as long as they are not animated
+      const value = new Animated.Value(0);
+      value.__makeNative();
+
+      createAndMountComponent(Animated.View, {
+        style: {
+          left: 10,
+          top: 20,
+          opacity: value,
+        },
+        removeClippedSubviews: true,
+      });
+
+      expect(nativeAnimatedModule.createAnimatedNode)
+        .toBeCalledWith(jasmine.any(Number), { type: 'style', style: { opacity: jasmine.any(Number) }});
+      expect(nativeAnimatedModule.createAnimatedNode)
+        .toBeCalledWith(jasmine.any(Number), { type: 'props', props: { style: jasmine.any(Number) }});
+    });
+  });
+
+  describe('Animations', () => {
+    it('sends a valid timing animation description', () => {
+      const anim = new Animated.Value(0);
+      Animated.timing(anim, {toValue: 10, duration: 1000, useNativeDriver: true}).start();
+
+      expect(nativeAnimatedModule.startAnimatingNode).toBeCalledWith(
+        jasmine.any(Number),
+        jasmine.any(Number),
+        {type: 'frames', frames: jasmine.any(Array), toValue: jasmine.any(Number), delay: jasmine.any(Number), iterations: 1},
+        jasmine.any(Function)
+      );
+    });
+
+    it('sends a valid spring animation description', () => {
+      const anim = new Animated.Value(0);
+      Animated.spring(anim, {toValue: 10, friction: 5, tension: 164, useNativeDriver: true}).start();
+      expect(nativeAnimatedModule.startAnimatingNode).toBeCalledWith(
+        jasmine.any(Number),
+        jasmine.any(Number),
+        {
+          type: 'spring',
+          friction: 16,
+          initialVelocity: 0,
+          overshootClamping: false,
+          restDisplacementThreshold: 0.001,
+          restSpeedThreshold: 0.001,
+          tension: 679.08,
+          toValue: 10,
+          iterations: 1,
+        },
+        jasmine.any(Function)
+      );
+
+      Animated.spring(anim, {toValue: 10, bounciness: 8, speed: 10, useNativeDriver: true}).start();
+      expect(nativeAnimatedModule.startAnimatingNode).toBeCalledWith(
+        jasmine.any(Number),
+        jasmine.any(Number),
+        {
+          type: 'spring',
+          friction: 23.05223140901191,
+          initialVelocity: 0,
+          overshootClamping: false,
+          restDisplacementThreshold: 0.001,
+          restSpeedThreshold: 0.001,
+          tension: 299.61882352941177,
+          toValue: 10,
+          iterations: 1,
+        },
+        jasmine.any(Function)
+      );
+    });
+
+    it('sends a valid decay animation description', () => {
+      const anim = new Animated.Value(0);
+      Animated.decay(anim, {velocity: 10, deceleration: 0.1, useNativeDriver: true}).start();
+
+      expect(nativeAnimatedModule.startAnimatingNode).toBeCalledWith(
+        jasmine.any(Number),
+        jasmine.any(Number),
+        {type: 'decay', deceleration: 0.1, velocity: 10, iterations: 1},
+        jasmine.any(Function)
+      );
+    });
+
+    it('works with Animated.loop', () => {
+      const anim = new Animated.Value(0);
+      Animated.loop(
+        Animated.decay(anim, {velocity: 10, deceleration: 0.1, useNativeDriver: true}),
+        { iterations: 10 },
+      ).start();
+
+      expect(nativeAnimatedModule.startAnimatingNode).toBeCalledWith(
+        jasmine.any(Number),
+        jasmine.any(Number),
+        {type: 'decay', deceleration: 0.1, velocity: 10, iterations: 10},
+        jasmine.any(Function)
+      );
+    });
+
+    it('sends stopAnimation command to native', () => {
+      const value = new Animated.Value(0);
+      const animation = Animated.timing(value, {toValue: 10, duration: 50, useNativeDriver: true});
+
+      animation.start();
+      expect(nativeAnimatedModule.startAnimatingNode).toBeCalledWith(
+        jasmine.any(Number),
+        jasmine.any(Number),
+        {type: 'frames', frames: jasmine.any(Array), toValue: jasmine.any(Number), delay: jasmine.any(Number), iterations: 1},
+        jasmine.any(Function)
+      );
+      const animationId = nativeAnimatedModule.startAnimatingNode.mock.calls[0][0];
+
+      animation.stop();
+      expect(nativeAnimatedModule.stopAnimation).toBeCalledWith(animationId);
+    });
+  });
+});
diff --git a/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js b/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js
new file mode 100644
index 00000000000000..e2aa9526571b63
--- /dev/null
+++ b/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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.
+ *
+ * @flow
+ */
+'use strict';
+
+const EventEmitter = require('EventEmitter');
+const RCTDeviceEventEmitter = require('RCTDeviceEventEmitter');
+
+/**
+ * Mock the NativeEventEmitter as a normal JS EventEmitter.
+ */
+class NativeEventEmitter extends EventEmitter {
+  constructor() {
+    super(RCTDeviceEventEmitter.sharedSubscriber);
+  }
+}
+
+module.exports = NativeEventEmitter;

From 8706b663b6d169d80f0db03cd873a7bf16f141e5 Mon Sep 17 00:00:00 2001
From: Marc Horowitz <mhorowitz@fb.com>
Date: Mon, 27 Mar 2017 11:52:07 -0700
Subject: [PATCH 201/366] Include ios-cc.sh in the package.

Reviewed By: javache

Differential Revision: D4775797

fbshipit-source-id: 632853cc5b809b8e4f5c9bd06386ede385104f7f
---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 32a89cf239713d..fba4c5e4bb0a9e 100644
--- a/package.json
+++ b/package.json
@@ -91,6 +91,7 @@
     "cli.js",
     "flow",
     "init.sh",
+    "ios-cc.sh",
     "ios-install-third-party.sh",
     "jest-preset.json",
     "jest",

From 92d985fb4982e739f66582ae0cc08c7312a6ef4a Mon Sep 17 00:00:00 2001
From: Eric Vicenti <evv@fb.com>
Date: Mon, 27 Mar 2017 13:27:12 -0700
Subject: [PATCH 202/366] Deprecate Navigator

Reviewed By: fkgozali

Differential Revision: D4770514

fbshipit-source-id: ea3ea7fc5515ff42394bacb4a63a9a6411185e2a
---
 .../js/Navigator/BreadcrumbNavSample.js       |  167 --
 .../js/Navigator/JumpingNavSample.js          |  239 ---
 .../js/Navigator/NavigationBarSample.js       |  206 ---
 .../js/Navigator/NavigatorExample.js          |  214 ---
 Examples/UIExplorer/js/UIExplorerList.ios.js  |    5 -
 .../Navigator/Navigation/NavigationContext.js |  271 ----
 .../Navigator/Navigation/NavigationEvent.js   |  191 ---
 .../Navigation/NavigationEventEmitter.js      |  106 --
 .../Navigation/NavigationRouteStack.js        |  283 ----
 .../Navigation/NavigationTreeNode.js          |  110 --
 .../__tests__/NavigationContext-test.js       |  263 ----
 .../__tests__/NavigationEvent-test.js         |   68 -
 .../__tests__/NavigationEventEmitter-test.js  |  187 ---
 .../__tests__/NavigationRouteStack-test.js    |  433 ------
 .../__tests__/NavigationTreeNode-test.js      |  110 --
 .../CustomComponents/Navigator/Navigator.js   | 1368 -----------------
 .../NavigatorBreadcrumbNavigationBar.js       |  318 ----
 ...orBreadcrumbNavigationBarStyles.android.js |  223 ---
 ...igatorBreadcrumbNavigationBarStyles.ios.js |  227 ---
 .../Navigator/NavigatorNavigationBar.js       |  224 ---
 .../NavigatorNavigationBarStylesAndroid.js    |  175 ---
 .../NavigatorNavigationBarStylesIOS.js        |  173 ---
 .../Navigator/NavigatorSceneConfigs.js        |  788 ----------
 .../react-native-implementation.js            |   13 +-
 24 files changed, 12 insertions(+), 6350 deletions(-)
 delete mode 100644 Examples/UIExplorer/js/Navigator/BreadcrumbNavSample.js
 delete mode 100644 Examples/UIExplorer/js/Navigator/JumpingNavSample.js
 delete mode 100644 Examples/UIExplorer/js/Navigator/NavigationBarSample.js
 delete mode 100644 Examples/UIExplorer/js/Navigator/NavigatorExample.js
 delete mode 100644 Libraries/CustomComponents/Navigator/Navigation/NavigationContext.js
 delete mode 100644 Libraries/CustomComponents/Navigator/Navigation/NavigationEvent.js
 delete mode 100644 Libraries/CustomComponents/Navigator/Navigation/NavigationEventEmitter.js
 delete mode 100644 Libraries/CustomComponents/Navigator/Navigation/NavigationRouteStack.js
 delete mode 100644 Libraries/CustomComponents/Navigator/Navigation/NavigationTreeNode.js
 delete mode 100644 Libraries/CustomComponents/Navigator/Navigation/__tests__/NavigationContext-test.js
 delete mode 100644 Libraries/CustomComponents/Navigator/Navigation/__tests__/NavigationEvent-test.js
 delete mode 100644 Libraries/CustomComponents/Navigator/Navigation/__tests__/NavigationEventEmitter-test.js
 delete mode 100644 Libraries/CustomComponents/Navigator/Navigation/__tests__/NavigationRouteStack-test.js
 delete mode 100644 Libraries/CustomComponents/Navigator/Navigation/__tests__/NavigationTreeNode-test.js
 delete mode 100644 Libraries/CustomComponents/Navigator/Navigator.js
 delete mode 100644 Libraries/CustomComponents/Navigator/NavigatorBreadcrumbNavigationBar.js
 delete mode 100644 Libraries/CustomComponents/Navigator/NavigatorBreadcrumbNavigationBarStyles.android.js
 delete mode 100644 Libraries/CustomComponents/Navigator/NavigatorBreadcrumbNavigationBarStyles.ios.js
 delete mode 100644 Libraries/CustomComponents/Navigator/NavigatorNavigationBar.js
 delete mode 100644 Libraries/CustomComponents/Navigator/NavigatorNavigationBarStylesAndroid.js
 delete mode 100644 Libraries/CustomComponents/Navigator/NavigatorNavigationBarStylesIOS.js
 delete mode 100644 Libraries/CustomComponents/Navigator/NavigatorSceneConfigs.js

diff --git a/Examples/UIExplorer/js/Navigator/BreadcrumbNavSample.js b/Examples/UIExplorer/js/Navigator/BreadcrumbNavSample.js
deleted file mode 100644
index df8c065f450b87..00000000000000
--- a/Examples/UIExplorer/js/Navigator/BreadcrumbNavSample.js
+++ /dev/null
@@ -1,167 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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.
- *
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- * @providesModule BreadcrumbNavSample
- */
-'use strict';
-
-var React = require('react');
-var ReactNative = require('react-native');
-var {
-  Navigator,
-  StyleSheet,
-  ScrollView,
-  Text,
-  TouchableHighlight,
-  TouchableOpacity
-} = ReactNative;
-
-var _getRandomRoute = function() {
-  return {
-    title: '#' + Math.ceil(Math.random() * 1000),
-  };
-};
-
-class NavButton extends React.Component {
-  render() {
-    return (
-      <TouchableHighlight
-        style={styles.button}
-        underlayColor="#B5B5B5"
-        onPress={this.props.onPress}>
-        <Text style={styles.buttonText}>{this.props.text}</Text>
-      </TouchableHighlight>
-    );
-  }
-}
-
-class BreadcrumbNavSample extends React.Component {
-  componentWillMount() {
-    this._navBarRouteMapper = {
-      rightContentForRoute: function(route, navigator) {
-        return null;
-      },
-      titleContentForRoute: function(route, navigator) {
-        return (
-          <TouchableOpacity
-            onPress={() => navigator.push(_getRandomRoute())}>
-            <Text style={styles.titleText}>{route.title}</Text>
-          </TouchableOpacity>
-        );
-      },
-      iconForRoute: function(route, navigator) {
-        return (
-          <TouchableOpacity
-            onPress={() => { navigator.popToRoute(route); }}
-            style={styles.crumbIconPlaceholder}
-          />
-        );
-      },
-      separatorForRoute: function(route, navigator) {
-        return (
-          <TouchableOpacity
-            onPress={navigator.pop}
-            style={styles.crumbSeparatorPlaceholder}
-          />
-        );
-      }
-    };
-  }
-
-  _renderScene = (route, navigator) => {
-    return (
-      <ScrollView style={styles.scene}>
-        <NavButton
-          onPress={() => { navigator.push(_getRandomRoute()); }}
-          text="Push"
-        />
-        <NavButton
-          onPress={() => { navigator.immediatelyResetRouteStack([_getRandomRoute(), _getRandomRoute()]); }}
-          text="Reset w/ 2 scenes"
-        />
-        <NavButton
-          onPress={() => { navigator.popToTop(); }}
-          text="Pop to top"
-        />
-        <NavButton
-          onPress={() => { navigator.replace(_getRandomRoute()); }}
-          text="Replace"
-        />
-        <NavButton
-          onPress={() => { this.props.navigator.pop(); }}
-          text="Close breadcrumb example"
-        />
-      </ScrollView>
-    );
-  };
-
-  render() {
-    return (
-      <Navigator
-        style={styles.container}
-        initialRoute={_getRandomRoute()}
-        renderScene={this._renderScene}
-        navigationBar={
-          <Navigator.BreadcrumbNavigationBar
-            routeMapper={this._navBarRouteMapper}
-          />
-        }
-      />
-    );
-  }
-}
-
-var styles = StyleSheet.create({
-  scene: {
-    paddingTop: 50,
-    flex: 1,
-  },
-  button: {
-    backgroundColor: 'white',
-    padding: 15,
-    borderBottomWidth: StyleSheet.hairlineWidth,
-    borderBottomColor: '#CDCDCD',
-  },
-  buttonText: {
-    fontSize: 17,
-    fontWeight: '500',
-  },
-  container: {
-    overflow: 'hidden',
-    backgroundColor: '#dddddd',
-    flex: 1,
-  },
-  titleText: {
-    fontSize: 18,
-    color: '#666666',
-    textAlign: 'center',
-    fontWeight: 'bold',
-    lineHeight: 32,
-  },
-  crumbIconPlaceholder: {
-    flex: 1,
-    backgroundColor: '#666666',
-  },
-  crumbSeparatorPlaceholder: {
-    flex: 1,
-    backgroundColor: '#aaaaaa',
-  },
-});
-
-module.exports = BreadcrumbNavSample;
diff --git a/Examples/UIExplorer/js/Navigator/JumpingNavSample.js b/Examples/UIExplorer/js/Navigator/JumpingNavSample.js
deleted file mode 100644
index c4e1a502772cff..00000000000000
--- a/Examples/UIExplorer/js/Navigator/JumpingNavSample.js
+++ /dev/null
@@ -1,239 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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.
- *
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- * @providesModule JumpingNavSample
- */
-'use strict';
-
-var React = require('react');
-var ReactNative = require('react-native');
-
-var nativeImageSource = require('nativeImageSource');
-var {
-  Navigator,
-  StyleSheet,
-  ScrollView,
-  TabBarIOS,
-  Text,
-  TouchableHighlight,
-  View,
-} = ReactNative;
-
-var _getRandomRoute = function() {
-  return {
-    randNumber: Math.ceil(Math.random() * 1000),
-  };
-};
-
-class NavButton extends React.Component {
-  render() {
-    return (
-      <TouchableHighlight
-        style={styles.button}
-        underlayColor="#B5B5B5"
-        onPress={this.props.onPress}>
-        <Text style={styles.buttonText}>{this.props.text}</Text>
-      </TouchableHighlight>
-    );
-  }
-}
-
-var ROUTE_STACK = [
-  _getRandomRoute(),
-  _getRandomRoute(),
-  _getRandomRoute(),
-];
-var INIT_ROUTE_INDEX = 1;
-
-class JumpingNavBar extends React.Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      tabIndex: props.initTabIndex,
-    };
-  }
-  handleWillFocus(route) {
-    var tabIndex = ROUTE_STACK.indexOf(route);
-    this.setState({ tabIndex, });
-  }
-  render() {
-    return (
-      <View style={styles.tabs}>
-        <TabBarIOS>
-          <TabBarIOS.Item
-            icon={nativeImageSource({
-              ios: 'tabnav_notification',
-              width: 24,
-              height: 24
-            })}
-            selected={this.state.tabIndex === 0}
-            onPress={() => {
-              this.props.onTabIndex(0);
-              this.setState({ tabIndex: 0, });
-            }}>
-            <View />
-          </TabBarIOS.Item>
-          <TabBarIOS.Item
-            icon={nativeImageSource({
-              ios: 'tabnav_list',
-              width: 24,
-              height: 24
-            })}
-            selected={this.state.tabIndex === 1}
-            onPress={() => {
-              this.props.onTabIndex(1);
-              this.setState({ tabIndex: 1, });
-            }}>
-            <View />
-          </TabBarIOS.Item>
-          <TabBarIOS.Item
-            icon={nativeImageSource({
-              ios: 'tabnav_settings',
-              width: 24,
-              height: 24
-            })}
-            selected={this.state.tabIndex === 2}
-            onPress={() => {
-              this.props.onTabIndex(2);
-              this.setState({ tabIndex: 2, });
-            }}>
-            <View />
-          </TabBarIOS.Item>
-        </TabBarIOS>
-      </View>
-    );
-  }
-}
-
-class JumpingNavSample extends React.Component {
-  render() {
-    return (
-      <Navigator
-        debugOverlay={false}
-        style={styles.appContainer}
-        ref={(navigator) => {
-          this._navigator = navigator;
-        }}
-        initialRoute={ROUTE_STACK[INIT_ROUTE_INDEX]}
-        initialRouteStack={ROUTE_STACK}
-        renderScene={this.renderScene}
-        configureScene={() => ({
-          ...Navigator.SceneConfigs.HorizontalSwipeJump,
-        })}
-        navigationBar={
-          <JumpingNavBar
-            ref={(navBar) => { this.navBar = navBar; }}
-            initTabIndex={INIT_ROUTE_INDEX}
-            routeStack={ROUTE_STACK}
-            onTabIndex={(index) => {
-              this._navigator.jumpTo(ROUTE_STACK[index]);
-            }}
-          />
-        }
-      />
-    );
-  }
-
-  renderScene = (route, navigator) => {
-    var backBtn;
-    var forwardBtn;
-    if (ROUTE_STACK.indexOf(route) !== 0) {
-      backBtn = (
-        <NavButton
-          onPress={() => {
-            navigator.jumpBack();
-          }}
-          text="jumpBack"
-        />
-      );
-    }
-    if (ROUTE_STACK.indexOf(route) !== ROUTE_STACK.length - 1) {
-      forwardBtn = (
-        <NavButton
-          onPress={() => {
-            navigator.jumpForward();
-          }}
-          text="jumpForward"
-        />
-      );
-    }
-    return (
-      <ScrollView style={styles.scene}>
-        <Text style={styles.messageText}>#{route.randNumber}</Text>
-        {backBtn}
-        {forwardBtn}
-        <NavButton
-          onPress={() => {
-            navigator.jumpTo(ROUTE_STACK[1]);
-          }}
-          text="jumpTo middle route"
-        />
-        <NavButton
-          onPress={() => {
-            this.props.navigator.pop();
-          }}
-          text="Exit Navigation Example"
-        />
-        <NavButton
-          onPress={() => {
-            this.props.navigator.push({
-              message: 'Came from jumping example',
-            });
-          }}
-          text="Nav Menu"
-        />
-      </ScrollView>
-    );
-  };
-}
-
-var styles = StyleSheet.create({
-  button: {
-    backgroundColor: 'white',
-    padding: 15,
-    borderBottomWidth: StyleSheet.hairlineWidth,
-    borderBottomColor: '#CDCDCD',
-  },
-  buttonText: {
-    fontSize: 17,
-    fontWeight: '500',
-  },
-  appContainer: {
-    overflow: 'hidden',
-    backgroundColor: '#dddddd',
-    flex: 1,
-  },
-  messageText: {
-    fontSize: 17,
-    fontWeight: '500',
-    padding: 15,
-    marginTop: 50,
-    marginLeft: 15,
-  },
-  scene: {
-    flex: 1,
-    paddingTop: 20,
-    backgroundColor: '#EAEAEA',
-  },
-  tabs: {
-    height: 50,
-  }
-});
-
-module.exports = JumpingNavSample;
diff --git a/Examples/UIExplorer/js/Navigator/NavigationBarSample.js b/Examples/UIExplorer/js/Navigator/NavigationBarSample.js
deleted file mode 100644
index 5d767c7c793c73..00000000000000
--- a/Examples/UIExplorer/js/Navigator/NavigationBarSample.js
+++ /dev/null
@@ -1,206 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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.
- *
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- * @providesModule NavigationBarSample
- */
-'use strict';
-
-
-var React = require('react');
-var ReactNative = require('react-native');
-var {
-  Navigator,
-  ScrollView,
-  StyleSheet,
-  Text,
-  TouchableHighlight,
-  TouchableOpacity,
-} = ReactNative;
-
-class NavButton extends React.Component {
-  render() {
-    return (
-      <TouchableHighlight
-        style={styles.button}
-        underlayColor="#B5B5B5"
-        onPress={this.props.onPress}>
-        <Text style={styles.buttonText}>{this.props.text}</Text>
-      </TouchableHighlight>
-    );
-  }
-}
-
-var NavigationBarRouteMapper = {
-
-  LeftButton: function(route, navigator, index, navState) {
-    if (index === 0) {
-      return null;
-    }
-
-    var previousRoute = navState.routeStack[index - 1];
-    return (
-      <TouchableOpacity
-        onPress={() => navigator.pop()}
-        style={styles.navBarLeftButton}>
-        <Text style={[styles.navBarText, styles.navBarButtonText]}>
-          {previousRoute.title}
-        </Text>
-      </TouchableOpacity>
-    );
-  },
-
-  RightButton: function(route, navigator, index, navState) {
-    return (
-      <TouchableOpacity
-        onPress={() => navigator.push(newRandomRoute())}
-        style={styles.navBarRightButton}>
-        <Text style={[styles.navBarText, styles.navBarButtonText]}>
-          Next
-        </Text>
-      </TouchableOpacity>
-    );
-  },
-
-  Title: function(route, navigator, index, navState) {
-    return (
-      <Text style={[styles.navBarText, styles.navBarTitleText]}>
-        {route.title} [{index}]
-      </Text>
-    );
-  },
-
-};
-
-function newRandomRoute() {
-  return {
-    title: '#' + Math.ceil(Math.random() * 1000),
-  };
-}
-
-class NavigationBarSample extends React.Component {
-  componentWillMount() {
-    var navigator = this.props.navigator;
-
-    var callback = (event) => {
-      console.log(
-        `NavigationBarSample : event ${event.type}`,
-        {
-          route: JSON.stringify(event.data.route),
-          target: event.target,
-          type: event.type,
-        }
-      );
-    };
-
-    // Observe focus change events from this component.
-    this._listeners = [
-      navigator.navigationContext.addListener('willfocus', callback),
-      navigator.navigationContext.addListener('didfocus', callback),
-    ];
-  }
-
-  componentWillUnmount() {
-    this._listeners && this._listeners.forEach(listener => listener.remove());
-  }
-
-  render() {
-    return (
-      <Navigator
-        debugOverlay={false}
-        style={styles.appContainer}
-        initialRoute={newRandomRoute()}
-        renderScene={(route, navigator) => (
-          <ScrollView style={styles.scene}>
-            <Text style={styles.messageText}>{route.content}</Text>
-            <NavButton
-              onPress={() => {
-                navigator.immediatelyResetRouteStack([
-                  newRandomRoute(),
-                  newRandomRoute(),
-                  newRandomRoute(),
-                ]);
-              }}
-              text="Reset w/ 3 scenes"
-            />
-            <NavButton
-              onPress={() => {
-                this.props.navigator.pop();
-              }}
-              text="Exit NavigationBar Example"
-            />
-          </ScrollView>
-        )}
-        navigationBar={
-          <Navigator.NavigationBar
-            routeMapper={NavigationBarRouteMapper}
-            style={styles.navBar}
-          />
-        }
-      />
-    );
-  }
-}
-
-var styles = StyleSheet.create({
-  messageText: {
-    fontSize: 17,
-    fontWeight: '500',
-    padding: 15,
-    marginTop: 50,
-    marginLeft: 15,
-  },
-  button: {
-    backgroundColor: 'white',
-    padding: 15,
-    borderBottomWidth: StyleSheet.hairlineWidth,
-    borderBottomColor: '#CDCDCD',
-  },
-  buttonText: {
-    fontSize: 17,
-    fontWeight: '500',
-  },
-  navBar: {
-    backgroundColor: 'white',
-  },
-  navBarText: {
-    fontSize: 16,
-    marginVertical: 10,
-  },
-  navBarTitleText: {
-    color: '#373E4D',
-    fontWeight: '500',
-    marginVertical: 9,
-  },
-  navBarLeftButton: {
-    paddingLeft: 10,
-  },
-  navBarRightButton: {
-    paddingRight: 10,
-  },
-  navBarButtonText: {
-    color: '#5890FF',
-  },
-  scene: {
-    flex: 1,
-    paddingTop: 20,
-    backgroundColor: '#EAEAEA',
-  },
-});
-
-module.exports = NavigationBarSample;
diff --git a/Examples/UIExplorer/js/Navigator/NavigatorExample.js b/Examples/UIExplorer/js/Navigator/NavigatorExample.js
deleted file mode 100644
index 9815ce06661809..00000000000000
--- a/Examples/UIExplorer/js/Navigator/NavigatorExample.js
+++ /dev/null
@@ -1,214 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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.
- *
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * @providesModule NavigatorExample
- */
-'use strict';
-
-var React = require('react');
-var ReactNative = require('react-native');
-var {
-  Navigator,
-  ScrollView,
-  StyleSheet,
-  Text,
-  TouchableHighlight,
-} = ReactNative;
-var BreadcrumbNavSample = require('./BreadcrumbNavSample');
-var NavigationBarSample = require('./NavigationBarSample');
-var JumpingNavSample = require('./JumpingNavSample');
-
-class NavButton extends React.Component {
-  render() {
-    return (
-      <TouchableHighlight
-        style={styles.button}
-        underlayColor="#B5B5B5"
-        onPress={this.props.onPress}>
-        <Text style={styles.buttonText}>{this.props.text}</Text>
-      </TouchableHighlight>
-    );
-  }
-}
-
-class NavMenu extends React.Component {
-  render() {
-    return (
-      <ScrollView style={styles.scene}>
-        <Text style={styles.messageText}>{this.props.message}</Text>
-        <NavButton
-          onPress={() => {
-            this.props.navigator.push({
-              message: 'Swipe right to dismiss',
-              sceneConfig: Navigator.SceneConfigs.FloatFromRight,
-            });
-          }}
-          text="Float in from right"
-        />
-        <NavButton
-          onPress={() => {
-            this.props.navigator.push({
-              message: 'Swipe down to dismiss',
-              sceneConfig: Navigator.SceneConfigs.FloatFromBottom,
-            });
-          }}
-          text="Float in from bottom"
-        />
-        <NavButton
-          onPress={() => {
-            this.props.navigator.pop();
-          }}
-          text="Pop"
-        />
-        <NavButton
-          onPress={() => {
-            this.props.navigator.popToTop();
-          }}
-          text="Pop to top"
-        />
-        <NavButton
-          onPress={() => {
-            this.props.navigator.push({ id: 'navbar' });
-          }}
-          text="Navbar Example"
-        />
-        <NavButton
-          onPress={() => {
-            this.props.navigator.push({ id: 'jumping' });
-          }}
-          text="Jumping Example"
-        />
-        <NavButton
-          onPress={() => {
-            this.props.navigator.push({ id: 'breadcrumbs' });
-          }}
-          text="Breadcrumbs Example"
-        />
-        <NavButton
-          onPress={() => {
-            this.props.onExampleExit();
-          }}
-          text="Exit <Navigator> Example"
-        />
-      </ScrollView>
-    );
-  }
-}
-
-class TabBarExample extends React.Component {
-  static title = '<Navigator>';
-  static description = 'JS-implemented navigation';
-
-  renderScene = (route, nav) => {
-    switch (route.id) {
-      case 'navbar':
-        return <NavigationBarSample navigator={nav} />;
-      case 'breadcrumbs':
-        return <BreadcrumbNavSample navigator={nav} />;
-      case 'jumping':
-        return <JumpingNavSample navigator={nav} />;
-      default:
-        return (
-          <NavMenu
-            message={route.message}
-            navigator={nav}
-            onExampleExit={this.props.onExampleExit}
-          />
-        );
-    }
-  };
-
-  render() {
-    return (
-      <Navigator
-        ref={this._setNavigatorRef}
-        style={styles.container}
-        initialRoute={{ message: 'First Scene', }}
-        renderScene={this.renderScene}
-        configureScene={(route) => {
-          if (route.sceneConfig) {
-            return route.sceneConfig;
-          }
-          return Navigator.SceneConfigs.FloatFromBottom;
-        }}
-      />
-    );
-  }
-
-  componentWillUnmount() {
-    this._listeners && this._listeners.forEach(listener => listener.remove());
-  }
-
-  _setNavigatorRef = (navigator) => {
-    if (navigator !== this._navigator) {
-      this._navigator = navigator;
-
-      if (navigator) {
-        var callback = (event) => {
-          console.log(
-            `TabBarExample: event ${event.type}`,
-            {
-              route: JSON.stringify(event.data.route),
-              target: event.target,
-              type: event.type,
-            }
-          );
-        };
-        // Observe focus change events from the owner.
-        this._listeners = [
-          navigator.navigationContext.addListener('willfocus', callback),
-          navigator.navigationContext.addListener('didfocus', callback),
-        ];
-      }
-    }
-  };
-}
-
-var styles = StyleSheet.create({
-  messageText: {
-    fontSize: 17,
-    fontWeight: '500',
-    padding: 15,
-    marginTop: 50,
-    marginLeft: 15,
-  },
-  container: {
-    flex: 1,
-  },
-  button: {
-    backgroundColor: 'white',
-    padding: 15,
-    borderBottomWidth: StyleSheet.hairlineWidth,
-    borderBottomColor: '#CDCDCD',
-  },
-  buttonText: {
-    fontSize: 17,
-    fontWeight: '500',
-  },
-  scene: {
-    flex: 1,
-    paddingTop: 20,
-    backgroundColor: '#EAEAEA',
-  }
-});
-
-TabBarExample.external = true;
-
-module.exports = TabBarExample;
diff --git a/Examples/UIExplorer/js/UIExplorerList.ios.js b/Examples/UIExplorer/js/UIExplorerList.ios.js
index 9ac8aeeeb3fe2b..5a082acc659b34 100644
--- a/Examples/UIExplorer/js/UIExplorerList.ios.js
+++ b/Examples/UIExplorer/js/UIExplorerList.ios.js
@@ -90,11 +90,6 @@ const ComponentExamples: Array<UIExplorerExample> = [
     module: require('./MultiColumnExample'),
     supportsTVOS: true,
   },
-  {
-    key: 'NavigatorExample',
-    module: require('./Navigator/NavigatorExample'),
-    supportsTVOS: true,
-  },
   {
     key: 'NavigatorIOSColorsExample',
     module: require('./NavigatorIOSColorsExample'),
diff --git a/Libraries/CustomComponents/Navigator/Navigation/NavigationContext.js b/Libraries/CustomComponents/Navigator/Navigation/NavigationContext.js
deleted file mode 100644
index 406e8be2fc6368..00000000000000
--- a/Libraries/CustomComponents/Navigator/Navigation/NavigationContext.js
+++ /dev/null
@@ -1,271 +0,0 @@
-/**
- * Copyright (c) 2015, Facebook, Inc.  All rights reserved.
- *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @providesModule NavigationContext
- * @noflow
- */
-'use strict';
-
-var NavigationEvent = require('NavigationEvent');
-var NavigationEventEmitter = require('NavigationEventEmitter');
-var NavigationTreeNode = require('NavigationTreeNode');
-
-var Set = require('Set');
-
-var emptyFunction = require('fbjs/lib/emptyFunction');
-var invariant = require('fbjs/lib/invariant');
-
-import type EventSubscription from 'EventSubscription';
-
-var {
-  AT_TARGET,
-  BUBBLING_PHASE,
-  CAPTURING_PHASE,
-} = NavigationEvent;
-
-// Event types that do not support event bubbling, capturing and
-// reconciliation API (e.g event.preventDefault(), event.stopPropagation()).
-var LegacyEventTypes = new Set([
-  'willfocus',
-  'didfocus',
-]);
-
-/**
- * Class that contains the info and methods for app navigation.
- */
-class NavigationContext {
-  __node: NavigationTreeNode;
-  _bubbleEventEmitter: ?NavigationEventEmitter;
-  _captureEventEmitter: ?NavigationEventEmitter;
-  _currentRoute: any;
-  _emitCounter: number;
-  _emitQueue: Array<any>;
-
-  constructor() {
-    this._bubbleEventEmitter = new NavigationEventEmitter(this);
-    this._captureEventEmitter = new NavigationEventEmitter(this);
-    this._currentRoute = null;
-
-    // Sets the protected property `__node`.
-    this.__node = new NavigationTreeNode(this);
-
-    this._emitCounter = 0;
-    this._emitQueue = [];
-
-    this.addListener('willfocus', this._onFocus);
-    this.addListener('didfocus', this._onFocus);
-  }
-
-  /* $FlowFixMe - get/set properties not yet supported */
-  get parent(): ?NavigationContext {
-    var parent = this.__node.getParent();
-    return parent ? parent.getValue() : null;
-  }
-
-  /* $FlowFixMe - get/set properties not yet supported */
-  get top(): ?NavigationContext {
-    var result = null;
-    var parentNode = this.__node.getParent();
-    while (parentNode) {
-      result = parentNode.getValue();
-      parentNode = parentNode.getParent();
-    }
-    return result;
-  }
-
-  /* $FlowFixMe - get/set properties not yet supported */
-  get currentRoute(): any {
-    return this._currentRoute;
-  }
-
-  appendChild(childContext: NavigationContext): void {
-    this.__node.appendChild(childContext.__node);
-  }
-
-  addListener(
-    eventType: string,
-    listener: Function,
-    useCapture: ?boolean
-  ): EventSubscription {
-    if (LegacyEventTypes.has(eventType)) {
-      useCapture = false;
-    }
-
-    var emitter = useCapture ?
-      this._captureEventEmitter :
-      this._bubbleEventEmitter;
-
-    if (emitter) {
-      return emitter.addListener(eventType, listener, this);
-    } else {
-      return {remove: emptyFunction};
-    }
-  }
-
-  emit(eventType: String, data: any, didEmitCallback: ?Function): void {
-    if (this._emitCounter > 0) {
-      // An event cycle that was previously created hasn't finished yet.
-      // Put this event cycle into the queue and will finish them later.
-      var args: any = Array.prototype.slice.call(arguments);
-      this._emitQueue.push(args);
-      return;
-    }
-
-    this._emitCounter++;
-
-    if (LegacyEventTypes.has(eventType)) {
-      // Legacy events does not support event bubbling and reconciliation.
-      this.__emit(
-        eventType,
-        data,
-        null,
-        {
-          defaultPrevented: false,
-          eventPhase: AT_TARGET,
-          propagationStopped: true,
-          target: this,
-        }
-      );
-    } else {
-      var targets = [this];
-      var parentTarget = this.parent;
-      while (parentTarget) {
-        targets.unshift(parentTarget);
-        parentTarget = parentTarget.parent;
-      }
-
-      var propagationStopped = false;
-      var defaultPrevented = false;
-      var callback = (event) => {
-        propagationStopped = propagationStopped || event.isPropagationStopped();
-        defaultPrevented = defaultPrevented || event.defaultPrevented;
-      };
-
-      // Capture phase
-      targets.some((currentTarget) => {
-        if (propagationStopped) {
-          return true;
-        }
-
-        var extraInfo = {
-          defaultPrevented,
-          eventPhase: CAPTURING_PHASE,
-          propagationStopped,
-          target: this,
-        };
-
-        currentTarget.__emit(eventType, data, callback, extraInfo);
-      }, this);
-
-      // bubble phase
-      targets.reverse().some((currentTarget) => {
-        if (propagationStopped) {
-          return true;
-        }
-        var extraInfo = {
-          defaultPrevented,
-          eventPhase: BUBBLING_PHASE,
-          propagationStopped,
-          target: this,
-        };
-        currentTarget.__emit(eventType, data, callback, extraInfo);
-      }, this);
-    }
-
-    if (didEmitCallback) {
-      var event = NavigationEvent.pool(eventType, this, data);
-      propagationStopped && event.stopPropagation();
-      defaultPrevented && event.preventDefault();
-      didEmitCallback.call(this, event);
-      event.dispose();
-    }
-
-    this._emitCounter--;
-    while (this._emitQueue.length) {
-      var args: any = this._emitQueue.shift();
-      this.emit.apply(this, args);
-    }
-  }
-
-  dispose(): void {
-    // clean up everything.
-    this._bubbleEventEmitter && this._bubbleEventEmitter.removeAllListeners();
-    this._captureEventEmitter && this._captureEventEmitter.removeAllListeners();
-    this._bubbleEventEmitter = null;
-    this._captureEventEmitter = null;
-    this._currentRoute = null;
-  }
-
-  // This method `__method` is protected.
-  __emit(
-    eventType: String,
-    data: any,
-    didEmitCallback: ?Function,
-    extraInfo: Object,
-  ): void {
-    var emitter;
-    switch (extraInfo.eventPhase) {
-      case CAPTURING_PHASE: // phase = 1
-        emitter = this._captureEventEmitter;
-        break;
-
-      case AT_TARGET: // phase = 2
-        emitter = this._bubbleEventEmitter;
-        break;
-
-      case BUBBLING_PHASE: // phase = 3
-        emitter = this._bubbleEventEmitter;
-        break;
-
-      default:
-        invariant(false, 'invalid event phase %s', extraInfo.eventPhase);
-    }
-
-    if (extraInfo.target === this) {
-      // phase = 2
-      extraInfo.eventPhase = AT_TARGET;
-    }
-
-    if (emitter) {
-      emitter.emit(
-        eventType,
-        data,
-        didEmitCallback,
-        extraInfo
-      );
-    }
-  }
-
-  _onFocus(event: NavigationEvent): void {
-    invariant(
-      event.data && event.data.hasOwnProperty('route'),
-      'event type "%s" should provide route',
-      event.type
-    );
-
-    this._currentRoute = event.data.route;
-  }
-}
-
-module.exports = NavigationContext;
diff --git a/Libraries/CustomComponents/Navigator/Navigation/NavigationEvent.js b/Libraries/CustomComponents/Navigator/Navigation/NavigationEvent.js
deleted file mode 100644
index 797097cac1b8d4..00000000000000
--- a/Libraries/CustomComponents/Navigator/Navigation/NavigationEvent.js
+++ /dev/null
@@ -1,191 +0,0 @@
-/**
- * Copyright (c) 2015, Facebook, Inc.  All rights reserved.
- *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @providesModule NavigationEvent
- * @flow
- */
-'use strict';
-
-const invariant = require('fbjs/lib/invariant');
-
-class NavigationEventPool {
-  _list: Array<any>;
-
-  constructor() {
-    this._list = [];
-  }
-
-  get(type: string, currentTarget: Object, data: any): NavigationEvent {
-    let event;
-    if (this._list.length > 0) {
-      event = this._list.pop();
-      event.constructor.call(event, type, currentTarget, data);
-    } else {
-      event = new NavigationEvent(type, currentTarget, data);
-    }
-    return event;
-  }
-
-  put(event: NavigationEvent) {
-    this._list.push(event);
-  }
-}
-
-const _navigationEventPool = new NavigationEventPool();
-
-/**
- * The NavigationEvent interface represents any event of the navigation.
- * It contains common properties and methods to any event.
- *
- * == Important Properties ==
- *
- * - target:
- *   A reference to the navigation context that dispatched the event. It is
- *   different from event.currentTarget when the event handler is called during
- *   the bubbling or capturing phase of the event.
- *
- * - currentTarget:
- *   Identifies the current target for the event, as the event traverses the
- *   navigation context tree. It always refers to the navigation context the
- *   event handler has been attached to as opposed to event.target which
- *   identifies the navigation context on which the event occurred.
- *
- * - eventPhase:
- *   Returns an integer value which specifies the current evaluation phase of
- *   the event flow; possible values are listed in NavigationEvent phase
- *   constants below.
- */
-class NavigationEvent {
-  static AT_TARGET: number;
-  static BUBBLING_PHASE: number;
-  static CAPTURING_PHASE: number;
-  static NONE: number;
-
-  _currentTarget: ?Object;
-  _data: any;
-  _defaultPrevented: boolean;
-  _disposed: boolean;
-  _propagationStopped: boolean;
-  _type: string;
-
-  target: ?Object;
-
-  // Returns an integer value which specifies the current evaluation phase of
-  // the event flow.
-  eventPhase: number;
-
-  static pool(type: string, currentTarget: Object, data: any): NavigationEvent {
-    return _navigationEventPool.get(type, currentTarget, data);
-  }
-
-  constructor(type: string, currentTarget: Object, data: any) {
-    this.target = currentTarget;
-    this.eventPhase = NavigationEvent.NONE;
-
-    this._type = type;
-    this._currentTarget = currentTarget;
-    this._data = data;
-    this._defaultPrevented = false;
-    this._disposed = false;
-    this._propagationStopped = false;
-  }
-
-  get type(): string {
-    return this._type;
-  }
-
-  get currentTarget(): ?Object {
-    return this._currentTarget;
-  }
-
-  get data(): any {
-    return this._data;
-  }
-
-  get defaultPrevented(): boolean {
-    return this._defaultPrevented;
-  }
-
-  preventDefault(): void {
-    this._defaultPrevented = true;
-  }
-
-  stopPropagation(): void {
-    this._propagationStopped = true;
-  }
-
-  stop(): void {
-    this.preventDefault();
-    this.stopPropagation();
-  }
-
-  isPropagationStopped(): boolean {
-    return this._propagationStopped;
-  }
-
-  /**
-   * Dispose the event.
-   * NavigationEvent shall be disposed after being emitted by
-   * `NavigationEventEmitter`.
-   */
-  dispose(): void {
-    invariant(!this._disposed, 'NavigationEvent is already disposed');
-    this._disposed = true;
-
-    // Clean up.
-    this.target = null;
-    this.eventPhase = NavigationEvent.NONE;
-    this._type = '';
-    this._currentTarget = null;
-    this._data = null;
-    this._defaultPrevented = false;
-
-    // Put this back to the pool to reuse the instance.
-    _navigationEventPool.put(this);
-  }
-}
-
-/**
- * Event phase constants.
- * These values describe which phase the event flow is currently being
- * evaluated.
- */
-
-// No event is being processed at this time.
-NavigationEvent.NONE = 0;
-
-// The event is being propagated through the currentTarget's ancestor objects.
-NavigationEvent.CAPTURING_PHASE = 1;
-
-// The event has arrived at the event's currentTarget. Event listeners registered for
-// this phase are called at this time.
-NavigationEvent.AT_TARGET = 2;
-
-// The event is propagating back up through the currentTarget's ancestors in reverse
-// order, starting with the parent. This is known as bubbling, and occurs only
-// if event propagation isn't prevented. Event listeners registered for this
-// phase are triggered during this process.
-NavigationEvent.BUBBLING_PHASE = 3;
-
-module.exports = NavigationEvent;
diff --git a/Libraries/CustomComponents/Navigator/Navigation/NavigationEventEmitter.js b/Libraries/CustomComponents/Navigator/Navigation/NavigationEventEmitter.js
deleted file mode 100644
index 339c957340389f..00000000000000
--- a/Libraries/CustomComponents/Navigator/Navigation/NavigationEventEmitter.js
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * Copyright (c) 2015, Facebook, Inc.  All rights reserved.
- *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  *
- * @providesModule NavigationEventEmitter
- * @flow
- */
-'use strict';
-
-var EventEmitter = require('EventEmitter');
-var NavigationEvent = require('NavigationEvent');
-
-type ExtraInfo = {
-  defaultPrevented: ?boolean,
-  eventPhase: ?number,
-  propagationStopped: ?boolean,
-  target: ?Object,
-};
-
-class NavigationEventEmitter extends EventEmitter {
-  _emitQueue: Array<any>;
-  _emitting: boolean;
-  _target: Object;
-
-  constructor(target: Object) {
-    super();
-    this._emitting = false;
-    this._emitQueue = [];
-    this._target = target;
-  }
-
-  emit(
-    eventType: string,
-    data: any,
-    didEmitCallback: ?Function,
-    extraInfo: ?ExtraInfo
-  ): void {
-    if (this._emitting) {
-      // An event cycle that was previously created hasn't finished yet.
-      // Put this event cycle into the queue and will finish them later.
-      var args: any = Array.prototype.slice.call(arguments);
-      this._emitQueue.push(args);
-      return;
-    }
-
-    this._emitting = true;
-
-    var event = NavigationEvent.pool(eventType, this._target, data);
-
-    if (extraInfo) {
-      if (extraInfo.target) {
-        event.target = extraInfo.target;
-      }
-
-      if (extraInfo.eventPhase) {
-        event.eventPhase = extraInfo.eventPhase;
-      }
-
-      if (extraInfo.defaultPrevented) {
-        event.preventDefault();
-      }
-
-      if (extraInfo.propagationStopped) {
-        event.stopPropagation();
-      }
-    }
-
-    // EventEmitter#emit only takes `eventType` as `String`. Casting `eventType`
-    // to `String` to make @flow happy.
-    super.emit(String(eventType), event);
-
-    if (typeof didEmitCallback === 'function') {
-      didEmitCallback.call(this._target, event);
-    }
-    event.dispose();
-
-    this._emitting = false;
-
-    while (this._emitQueue.length) {
-      var args: any = this._emitQueue.shift();
-      this.emit.apply(this, args);
-    }
-  }
-}
-
-module.exports = NavigationEventEmitter;
diff --git a/Libraries/CustomComponents/Navigator/Navigation/NavigationRouteStack.js b/Libraries/CustomComponents/Navigator/Navigation/NavigationRouteStack.js
deleted file mode 100644
index fe40a609110e46..00000000000000
--- a/Libraries/CustomComponents/Navigator/Navigation/NavigationRouteStack.js
+++ /dev/null
@@ -1,283 +0,0 @@
-/**
- * Copyright (c) 2015, Facebook, Inc.  All rights reserved.
- *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @providesModule NavigationRouteStack
- * @flow
- */
-'use strict';
-
-var immutable = require('immutable');
-var invariant = require('fbjs/lib/invariant');
-
-type IterationCallback = (route: any, index: number, key: string) => void;
-
-var {List, Set} = immutable;
-
-function isRouteEmpty(route: any): boolean {
-  return (route === undefined || route === null || route === '') || false;
-}
-
-var _nextID = 0;
-
-class RouteNode {
-  key: string;
-  value: any;
-  constructor(route: any) {
-    // Key value gets bigger incrementally. Developer can compare the
-    // keys of two routes then know which route is added to the stack
-    // earlier.
-    this.key = String(_nextID++);
-
-    this.value = route;
-  }
-}
-
-var StackDiffRecord = immutable.Record({
-  key: null,
-  route: null,
-  index: null,
-});
-
-/**
- * The immutable route stack.
- */
-class RouteStack {
-  _index: number;
-
-  _routeNodes: List<RouteNode>;
-
-  constructor(index: number, routeNodes: List<RouteNode>) {
-    invariant(
-      routeNodes.size > 0,
-      'size must not be empty'
-    );
-
-    invariant(
-      index > -1 && index <= routeNodes.size - 1,
-      'index out of bound'
-    );
-
-    this._routeNodes = routeNodes;
-    this._index = index;
-  }
-
-  get size(): number {
-    return this._routeNodes.size;
-  }
-
-  get index(): number {
-    return this._index;
-  }
-
-  toArray(): Array<any> {
-    var result = [];
-    var ii = 0;
-    var nodes = this._routeNodes;
-    while (ii < nodes.size) {
-      result.push(nodes.get(ii).value);
-      ii++;
-    }
-    return result;
-  }
-
-  get(index: number): any {
-    if (index < 0 || index > this._routeNodes.size - 1) {
-      return null;
-    }
-    return this._routeNodes.get(index).value;
-  }
-
-  /**
-   * Returns the key associated with the route.
-   * When a route is added to a stack, the stack creates a key for this route.
-   * The key will persist until the initial stack and its derived stack
-   * no longer contains this route.
-   */
-  keyOf(route: any): ?string {
-    if (isRouteEmpty(route)) {
-      return null;
-    }
-    var index = this.indexOf(route);
-    return index > -1 ?
-      this._routeNodes.get(index).key :
-      null;
-  }
-
-  indexOf(route: any): number {
-    if (isRouteEmpty(route)) {
-      return -1;
-    }
-
-    var finder = (node) => {
-      return (node: RouteNode).value === route;
-    };
-
-    return this._routeNodes.findIndex(finder, this);
-  }
-
-  slice(begin?: number, end?: number): RouteStack {
-    var routeNodes = this._routeNodes.slice(begin, end);
-    var index = Math.min(this._index, routeNodes.size - 1);
-    return this._update(index, routeNodes);
-  }
-
-  /**
-   * Returns a new stack with the provided route appended,
-   * starting at this stack size.
-   */
-  push(route: any): RouteStack {
-
-    invariant(
-      !isRouteEmpty(route),
-      'Must supply route to push'
-    );
-
-    invariant(this._routeNodes.indexOf(route) === -1, 'route must be unique');
-
-    // When pushing, removes the rest of the routes past the current index.
-    var routeNodes = this._routeNodes.withMutations((list: List<RouteNode>) => {
-      list.slice(0, this._index + 1).push(new RouteNode(route));
-    });
-
-    return this._update(routeNodes.size - 1, routeNodes);
-  }
-
-  /**
-   * Returns a new stack a size ones less than this stack,
-   * excluding the last index in this stack.
-   */
-  pop(): RouteStack {
-    invariant(this._routeNodes.size > 1, 'should not pop routeNodes stack to empty');
-
-    // When popping, removes the rest of the routes past the current index.
-    var routeNodes = this._routeNodes.slice(0, this._index);
-    return this._update(routeNodes.size - 1, routeNodes);
-  }
-
-  jumpToIndex(index: number): RouteStack {
-    invariant(
-      index > -1 && index < this._routeNodes.size,
-      'index out of bound'
-    );
-
-    return this._update(index, this._routeNodes);
-  }
-
-  /**
-   * Replace a route in the navigation stack.
-   *
-   * `index` specifies the route in the stack that should be replaced.
-   * If it's negative, it counts from the back.
-   */
-  replaceAtIndex(index: number, route: any): RouteStack {
-    invariant(
-      !isRouteEmpty(route),
-      'Must supply route to replace'
-    );
-
-    if (this.get(index) === route) {
-      return this;
-    }
-
-    invariant(this.indexOf(route) === -1, 'route must be unique');
-
-    if (index < 0) {
-      index += this._routeNodes.size;
-    }
-
-    invariant(
-      index > -1 && index < this._routeNodes.size,
-      'index out of bound'
-    );
-
-    var routeNodes = this._routeNodes.set(index, new RouteNode(route));
-    return this._update(index, routeNodes);
-  }
-
-  // Iterations
-  forEach(callback: IterationCallback, context: ?Object): void {
-    var ii = 0;
-    var nodes = this._routeNodes;
-    while (ii < nodes.size) {
-      var node = nodes.get(ii);
-      callback.call(context, node.value, ii, node.key);
-      ii++;
-    }
-  }
-
-  mapToArray(callback: IterationCallback, context: ?Object): Array<any> {
-    var result = [];
-    this.forEach((route, index, key) => {
-      result.push(callback.call(context, route, index, key));
-    });
-    return result;
-  }
-
-  /**
-   * Returns a Set excluding any routes contained within the stack given.
-   */
-  subtract(stack: RouteStack): Set<StackDiffRecord> {
-    var items = [];
-    this._routeNodes.forEach((node: RouteNode, index: number) => {
-      if (!stack._routeNodes.contains(node)) {
-        items.push(
-          new StackDiffRecord({
-            route: node.value,
-            index: index,
-            key: node.key,
-          })
-        );
-      }
-    });
-    return new Set(items);
-  }
-
-  _update(index: number, routeNodes: List<RouteNode>): RouteStack {
-    if (this._index === index && this._routeNodes === routeNodes) {
-      return this;
-    }
-    return new RouteStack(index, routeNodes);
-  }
-}
-
-/**
- * The first class data structure for NavigationContext to manage the navigation
- * stack of routes.
- */
-class NavigationRouteStack extends RouteStack {
-  constructor(index: number, routeNodes: Array<any>) {
-    // For now, `RouteStack` internally,  uses an immutable `List` to keep
-    // track of routeNodes. Since using `List` is really just the implementation
-    // detail, we don't want to accept `routeNodes` as `list` from constructor
-    // for developer.
-    var nodes = routeNodes.map((route) => {
-      invariant(!isRouteEmpty(route), 'route must not be mepty');
-      return new RouteNode(route);
-    });
-
-    super(index, new List(nodes));
-  }
-}
-
-module.exports = NavigationRouteStack;
diff --git a/Libraries/CustomComponents/Navigator/Navigation/NavigationTreeNode.js b/Libraries/CustomComponents/Navigator/Navigation/NavigationTreeNode.js
deleted file mode 100644
index d188c366f74596..00000000000000
--- a/Libraries/CustomComponents/Navigator/Navigation/NavigationTreeNode.js
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- * Copyright (c) 2015, Facebook, Inc.  All rights reserved.
- *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @providesModule NavigationTreeNode
- * @flow
- */
-'use strict';
-
-var invariant = require('fbjs/lib/invariant');
-var immutable = require('immutable');
-
-var {List} = immutable;
-
-/**
- * Utility to build a tree of nodes.
- * Note that this tree does not perform cyclic redundancy check
- * while appending child node.
- */
-class NavigationTreeNode {
-  __parent: ?NavigationTreeNode;
-
-  _children: List<NavigationTreeNode>;
-
-  _value: any;
-
-  constructor(value: any) {
-    this.__parent = null;
-    this._children = new List();
-    this._value = value;
-  }
-
-  getValue(): any {
-    return this._value;
-  }
-
-  getParent(): ?NavigationTreeNode {
-    return this.__parent;
-  }
-
-  getChildrenCount(): number {
-    return this._children.size;
-  }
-
-  getChildAt(index: number): ?NavigationTreeNode {
-    return index > -1 && index < this._children.size ?
-      this._children.get(index) :
-      null;
-  }
-
-  appendChild(child: NavigationTreeNode): void {
-    if (child.__parent) {
-      child.__parent.removeChild(child);
-    }
-    child.__parent = this;
-    this._children = this._children.push(child);
-  }
-
-  removeChild(child: NavigationTreeNode): void {
-    var index = this._children.indexOf(child);
-
-    invariant(
-      index > -1,
-      'The node to be removed is not a child of this node.'
-    );
-
-    child.__parent = null;
-
-    this._children = this._children.splice(index, 1);
-  }
-
-  indexOf(child: NavigationTreeNode): number {
-    return this._children.indexOf(child);
-  }
-
-  forEach(callback: Function, context: any): void {
-    this._children.forEach(callback, context);
-  }
-
-  map(callback: Function, context: any): Array<NavigationTreeNode> {
-    return this._children.map(callback, context).toJS();
-  }
-
-  some(callback: Function, context: any): boolean {
-    return this._children.some(callback, context);
-  }
-}
-
-
-module.exports = NavigationTreeNode;
diff --git a/Libraries/CustomComponents/Navigator/Navigation/__tests__/NavigationContext-test.js b/Libraries/CustomComponents/Navigator/Navigation/__tests__/NavigationContext-test.js
deleted file mode 100644
index 9f867e704356a4..00000000000000
--- a/Libraries/CustomComponents/Navigator/Navigation/__tests__/NavigationContext-test.js
+++ /dev/null
@@ -1,263 +0,0 @@
-/**
- * Copyright (c) 2015, Facebook, Inc.  All rights reserved.
- *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-'use strict';
-
-jest
-  .disableAutomock()
-  .mock('ErrorUtils');
-
-var NavigationContext = require('NavigationContext');
-var NavigationEvent = require('NavigationEvent');
-
-describe('NavigationContext', () => {
-  it('defaults `currentRoute` to null', () => {
-    var context = new NavigationContext();
-    expect(context.currentRoute).toEqual(null);
-  });
-
-  it('updates `currentRoute`', () => {
-    var context = new NavigationContext();
-    context.emit('didfocus', {route: {name: 'a'}});
-    expect(context.currentRoute.name).toEqual('a');
-  });
-
-  it('has parent', () => {
-    var parent = new NavigationContext();
-    var child = new NavigationContext();
-    parent.appendChild(child);
-    expect(child.parent).toBe(parent);
-  });
-
-  it('has `top`', () => {
-    var top = new NavigationContext();
-    var parent = new NavigationContext();
-    var child = new NavigationContext();
-    top.appendChild(parent);
-    parent.appendChild(child);
-    expect(child.top).toBe(top);
-  });
-
-  it('captures event', () => {
-    var parent = new NavigationContext();
-    var child = new NavigationContext();
-    parent.appendChild(child);
-
-    var logs = [];
-
-    var listener = (event) => {
-      var {currentTarget, eventPhase, target, type} = event;
-      logs.push({
-        currentTarget,
-        eventPhase,
-        target,
-        type,
-      });
-    };
-
-    parent.addListener('yo', listener, true);
-    child.addListener('yo', listener, true);
-
-    child.emit('yo');
-
-    expect(logs).toEqual([
-      {
-        currentTarget: parent,
-        eventPhase: NavigationEvent.CAPTURING_PHASE,
-        target: child,
-        type: 'yo',
-      },
-      {
-        currentTarget: child,
-        eventPhase: NavigationEvent.AT_TARGET,
-        target: child,
-        type: 'yo',
-      }
-    ]);
-  });
-
-  it('bubbles events', () => {
-    var parent = new NavigationContext();
-    var child = new NavigationContext();
-    parent.appendChild(child);
-
-    var logs = [];
-
-    var listener = (event) => {
-      var {currentTarget, eventPhase, target, type} = event;
-      logs.push({
-        currentTarget,
-        eventPhase,
-        target,
-        type,
-      });
-    };
-
-    parent.addListener('yo', listener);
-    child.addListener('yo', listener);
-
-    child.emit('yo');
-
-    expect(logs).toEqual([
-      {
-        currentTarget: child,
-        eventPhase: NavigationEvent.AT_TARGET,
-        target: child,
-        type: 'yo',
-      },
-      {
-        currentTarget: parent,
-        eventPhase: NavigationEvent.BUBBLING_PHASE,
-        target: child,
-        type: 'yo',
-      },
-    ]);
-  });
-
-  it('stops event propagation at capture phase', () => {
-    var parent = new NavigationContext();
-    var child = new NavigationContext();
-    parent.appendChild(child);
-
-    var counter = 0;
-
-    parent.addListener('yo', event => event.stopPropagation(), true);
-    child.addListener('yo', event => counter++, true);
-
-    child.emit('yo');
-
-    expect(counter).toBe(0);
-  });
-
-  it('stops event propagation at bubbling phase', () => {
-    var parent = new NavigationContext();
-    var child = new NavigationContext();
-    parent.appendChild(child);
-
-    var counter = 0;
-
-    parent.addListener('yo', event => counter++);
-    child.addListener('yo', event => event.stopPropagation());
-
-    child.emit('yo');
-
-    expect(counter).toBe(0);
-  });
-
-  it('prevents event at capture phase', () => {
-    var parent = new NavigationContext();
-    var child = new NavigationContext();
-    parent.appendChild(child);
-
-    var val;
-    parent.addListener('yo', event => event.preventDefault(), true);
-    child.addListener('yo', event => val = event.defaultPrevented, true);
-
-    child.emit('yo');
-
-    expect(val).toBe(true);
-  });
-
-  it('prevents event at bubble phase', () => {
-    var parent = new NavigationContext();
-    var child = new NavigationContext();
-    parent.appendChild(child);
-
-    var val;
-    parent.addListener('yo', event => val = event.defaultPrevented);
-    child.addListener('yo', event => event.preventDefault());
-
-    child.emit('yo');
-
-    expect(val).toBe(true);
-  });
-
-  it('emits nested events in order at capture phase', () => {
-    var parent = new NavigationContext();
-    var child = new NavigationContext();
-    parent.appendChild(child);
-
-    var logs = [];
-
-    var listener = (event) => {
-      var {currentTarget, type} = event;
-      logs.push({
-        currentTarget,
-        type,
-      });
-    };
-
-    child.addListener('yo', event => {
-      // event `didyo` should be fired after the full propagation cycle of the
-      // `yo` event.
-      child.emit('didyo');
-    });
-
-    parent.addListener('yo', listener, true);
-    parent.addListener('didyo', listener, true);
-    child.addListener('yo', listener, true);
-
-    child.emit('yo');
-
-    expect(logs).toEqual([
-      {type: 'yo', currentTarget: parent},
-      {type: 'yo', currentTarget: child},
-      {type: 'didyo', currentTarget: parent},
-    ]);
-  });
-
-  it('emits nested events in order at bubbling phase', () => {
-    var parent = new NavigationContext();
-    var child = new NavigationContext();
-    parent.appendChild(child);
-
-    var logs = [];
-
-    var listener = (event) => {
-      var {currentTarget, type} = event;
-      logs.push({
-        currentTarget,
-        type,
-      });
-    };
-
-    child.addListener('yo', event => {
-      // event `didyo` should be fired after the full propagation cycle of the
-      // `yo` event.
-      child.emit('didyo');
-    });
-
-    parent.addListener('yo', listener);
-    child.addListener('yo', listener);
-    parent.addListener('didyo', listener);
-
-    child.emit('yo');
-
-    expect(logs).toEqual([
-      {type: 'yo', currentTarget: child},
-      {type: 'yo', currentTarget: parent},
-      {type: 'didyo', currentTarget: parent},
-    ]);
-  });
-});
diff --git a/Libraries/CustomComponents/Navigator/Navigation/__tests__/NavigationEvent-test.js b/Libraries/CustomComponents/Navigator/Navigation/__tests__/NavigationEvent-test.js
deleted file mode 100644
index e9a54290dcd9f4..00000000000000
--- a/Libraries/CustomComponents/Navigator/Navigation/__tests__/NavigationEvent-test.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Copyright (c) 2015, Facebook, Inc.  All rights reserved.
- *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-'use strict';
-
-jest
-  .unmock('NavigationEvent')
-  .unmock('fbjs/lib/invariant');
-
-var NavigationEvent = require('NavigationEvent');
-
-describe('NavigationEvent', () => {
-  it('constructs', () => {
-    var target = {};
-    var event = new NavigationEvent('foo', target, 123);
-    expect(event.type).toBe('foo');
-    expect(event.target).toBe(target);
-    expect(event.data).toBe(123);
-  });
-
-  it('constructs from pool', () => {
-    var target = {};
-    var event = NavigationEvent.pool('foo', target, 123);
-    expect(event.type).toBe('foo');
-    expect(event.target).toBe(target);
-    expect(event.data).toBe(123);
-  });
-
-  it('prevents default', () => {
-    var event = new NavigationEvent('foo', {}, 123);
-    expect(event.defaultPrevented).toBe(false);
-    event.preventDefault();
-    expect(event.defaultPrevented).toBe(true);
-  });
-
-  it('recycles', () => {
-    var event1 = NavigationEvent.pool('foo', {}, 123);
-    event1.dispose();
-    expect(event1.type).toBeFalsy();
-    expect(event1.data).toBe(null);
-    expect(event1.target).toBe(null);
-
-    var event2 = NavigationEvent.pool('bar', {}, 456);
-    expect(event2.type).toBe('bar');
-    expect(event2).toBe(event1);
-  });
-});
diff --git a/Libraries/CustomComponents/Navigator/Navigation/__tests__/NavigationEventEmitter-test.js b/Libraries/CustomComponents/Navigator/Navigation/__tests__/NavigationEventEmitter-test.js
deleted file mode 100644
index 6704b1f0236a4a..00000000000000
--- a/Libraries/CustomComponents/Navigator/Navigation/__tests__/NavigationEventEmitter-test.js
+++ /dev/null
@@ -1,187 +0,0 @@
-/**
- * Copyright (c) 2015, Facebook, Inc.  All rights reserved.
- *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-'use strict';
-
-jest
-  .unmock('EmitterSubscription')
-  .unmock('EventSubscription')
-  .unmock('EventEmitter')
-  .unmock('EventSubscriptionVendor')
-  .unmock('NavigationEvent')
-  .unmock('NavigationEventEmitter');
-
-var NavigationEventEmitter = require('NavigationEventEmitter');
-
-describe('NavigationEventEmitter', () => {
-  it('emits event', () => {
-    var context = {};
-    var emitter = new NavigationEventEmitter(context);
-    var logs = [];
-
-    emitter.addListener('ping', (event) => {
-      var {type, data, target, defaultPrevented} = event;
-
-      logs.push({
-        data,
-        defaultPrevented,
-        target,
-        type,
-      });
-
-    });
-
-    emitter.emit('ping', 'hello');
-
-    expect(logs.length).toBe(1);
-    expect(logs[0].target).toBe(context);
-    expect(logs[0].type).toBe('ping');
-    expect(logs[0].data).toBe('hello');
-    expect(logs[0].defaultPrevented).toBe(false);
-  });
-
-  it('does not emit event that has no listeners', () => {
-    var context = {};
-    var emitter = new NavigationEventEmitter(context);
-    var pinged = false;
-
-    emitter.addListener('ping', () => {
-      pinged = true;
-    });
-
-    emitter.emit('yo', 'bo');
-    expect(pinged).toBe(false);
-  });
-
-  it('puts nested emit call in a queue', () => {
-    var context = {};
-    var emitter = new NavigationEventEmitter(context);
-    var logs = [];
-
-    emitter.addListener('one', () => {
-      logs.push(1);
-      emitter.emit('two');
-      logs.push(2);
-    });
-
-    emitter.addListener('two', () => {
-      logs.push(3);
-      emitter.emit('three');
-      logs.push(4);
-    });
-
-    emitter.addListener('three', () => {
-      logs.push(5);
-    });
-
-    emitter.emit('one');
-
-    expect(logs).toEqual([1, 2, 3, 4, 5]);
-  });
-
-  it('puts nested emit call in a queue should be in sequence order', () => {
-    var context = {};
-    var emitter = new NavigationEventEmitter(context);
-    var logs = [];
-
-    emitter.addListener('one', () => {
-      logs.push(1);
-      emitter.emit('two');
-      emitter.emit('three');
-      logs.push(2);
-    });
-
-    emitter.addListener('two', () => {
-      logs.push(3);
-      logs.push(4);
-    });
-
-    emitter.addListener('three', () => {
-      logs.push(5);
-    });
-
-    emitter.emit('one');
-
-    expect(logs).toEqual([1, 2, 3, 4, 5]);
-  });
-
-  it('calls callback after emitting', () => {
-    var context = {};
-    var emitter = new NavigationEventEmitter(context);
-    var logs = [];
-
-    emitter.addListener('ping', (event) => {
-      var {type, data, target, defaultPrevented} = event;
-      logs.push({
-        data,
-        defaultPrevented,
-        target,
-        type,
-      });
-      event.preventDefault();
-    });
-
-    emitter.emit('ping', 'hello', (event) => {
-      var {type, data, target, defaultPrevented} = event;
-      logs.push({
-        data,
-        defaultPrevented,
-        target,
-        type,
-      });
-    });
-
-    expect(logs.length).toBe(2);
-    expect(logs[1].target).toBe(context);
-    expect(logs[1].type).toBe('ping');
-    expect(logs[1].data).toBe('hello');
-    expect(logs[1].defaultPrevented).toBe(true);
-  });
-
-  it('calls callback after emitting the current event and before ' +
-       'emitting the next event', () => {
-    var context = {};
-    var emitter = new NavigationEventEmitter(context);
-    var logs = [];
-
-    emitter.addListener('ping', (event) => {
-      logs.push('ping');
-      emitter.emit('pong');
-    });
-
-    emitter.addListener('pong', (event) => {
-      logs.push('pong');
-    });
-
-    emitter.emit('ping', null, () => {
-      logs.push('did-ping');
-    });
-
-    expect(logs).toEqual([
-      'ping',
-      'did-ping',
-      'pong',
-    ]);
-  });
-});
diff --git a/Libraries/CustomComponents/Navigator/Navigation/__tests__/NavigationRouteStack-test.js b/Libraries/CustomComponents/Navigator/Navigation/__tests__/NavigationRouteStack-test.js
deleted file mode 100644
index a27e5502f68fb3..00000000000000
--- a/Libraries/CustomComponents/Navigator/Navigation/__tests__/NavigationRouteStack-test.js
+++ /dev/null
@@ -1,433 +0,0 @@
-/**
- * Copyright (c) 2015, Facebook, Inc.  All rights reserved.
- *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-'use strict';
-
-
-jest
- .disableAutomock()
- .mock('ErrorUtils');
-
-var NavigationRouteStack = require('NavigationRouteStack');
-
-function assetStringNotEmpty(str) {
-  expect(!!str && typeof str === 'string').toBe(true);
-}
-
-describe('NavigationRouteStack:', () => {
-  // Different types of routes.
-  var ROUTES = [
-    'foo',
-    1,
-    true,
-    {foo: 'bar'},
-    ['foo'],
-  ];
-
-  // Basic
-  it('gets index', () => {
-    var stack = new NavigationRouteStack(1, ['a', 'b', 'c']);
-    expect(stack.index).toBe(1);
-  });
-
-  it('gets size', () => {
-    var stack = new NavigationRouteStack(1, ['a', 'b', 'c']);
-    expect(stack.size).toBe(3);
-  });
-
-  it('gets route', () => {
-    var stack = new NavigationRouteStack(0, ['a', 'b', 'c']);
-    expect(stack.get(2)).toBe('c');
-  });
-
-  it('converts to an array', () => {
-    var stack = new NavigationRouteStack(0, ['a', 'b']);
-    expect(stack.toArray()).toEqual(['a', 'b']);
-  });
-
-  it('creates a new stack after mutation', () => {
-    var stack1 = new NavigationRouteStack(0, ['a', 'b']);
-    var stack2 = stack1.push('c');
-    expect(stack1).not.toBe(stack2);
-  });
-
-  it('throws at index out of bound', () => {
-    expect(() => {
-      new NavigationRouteStack(-1, ['a', 'b']);
-    }).toThrow();
-
-    expect(() => {
-      new NavigationRouteStack(100, ['a', 'b']);
-    }).toThrow();
-  });
-
-  it('finds index', () => {
-    var stack = new NavigationRouteStack(0, ['a', 'b']);
-    expect(stack.indexOf('b')).toBe(1);
-    expect(stack.indexOf('c')).toBe(-1);
-  });
-
-  // Key
-  it('gets key for route', () => {
-    var test = (route) => {
-      var stack = new NavigationRouteStack(0, ['a']);
-      var key = stack.push(route).keyOf(route);
-      expect(typeof key).toBe('string');
-      expect(!!key).toBe(true);
-    };
-
-    ROUTES.forEach(test);
-  });
-
-  it('gets a key of larger value for route', () => {
-    var lastKey = '';
-    var test = (route) => {
-      var stack = new NavigationRouteStack(0, ['a']);
-      var key = stack.push(route).keyOf(route);
-      expect(key > lastKey).toBe(true);
-      lastKey = key;
-    };
-
-    ROUTES.forEach(test);
-  });
-
-  it('gets an unique key for a different route', () => {
-    var stack = new NavigationRouteStack(0, ['a']);
-    var keys = {};
-
-    var test = (route) => {
-      stack = stack.push(route);
-      var key = stack.keyOf(route);
-      expect(keys[key]).toBe(undefined);
-      keys[key] = true;
-    };
-
-    ROUTES.forEach(test);
-  });
-
-  it('gets the same unique key for the same route', () => {
-    var test = (route) => {
-      var stack = new NavigationRouteStack(0, [route]);
-      expect(stack.keyOf(route)).toBe(stack.keyOf(route));
-    };
-
-    ROUTES.forEach(test);
-  });
-
-
-  it('gets the same unique key form the derived stack', () => {
-    var test = (route) => {
-      var stack = new NavigationRouteStack(0, [route]);
-      var derivedStack = stack.push('wow').pop().slice(0, 10).push('blah');
-      expect(derivedStack.keyOf(route)).toBe(stack.keyOf(route));
-    };
-
-    ROUTES.forEach(test);
-  });
-
-  it('gets a different key from a different stack', () => {
-    var test = (route) => {
-      var stack1 = new NavigationRouteStack(0, [route]);
-      var stack2 = new NavigationRouteStack(0, [route]);
-      expect(stack1.keyOf(route)).not.toBe(stack2.keyOf(route));
-    };
-
-    ROUTES.forEach(test);
-  });
-
-  it('gets no key for a route that does not contains this route', () => {
-     var stack = new NavigationRouteStack(0, ['a']);
-     expect(stack.keyOf('b')).toBe(null);
-  });
-
-  it('gets a new key for a route that was removed and added again', () => {
-    var test = (route) => {
-      var stack = new NavigationRouteStack(0, ['a']);
-
-      var key1 = stack.push(route).keyOf(route);
-      var key2 = stack.push(route).pop().push(route).keyOf(route);
-      expect(key1).not.toBe(key2);
-    };
-
-    ROUTES.forEach(test);
-  });
-
-  // Slice
-  it('slices', () => {
-    var stack1 = new NavigationRouteStack(1, ['a', 'b', 'c', 'd']);
-    var stack2 = stack1.slice(1, 3);
-    expect(stack2).not.toBe(stack1);
-    expect(stack2.toArray()).toEqual(['b', 'c']);
-  });
-
-  it('may update index after slicing', () => {
-    var stack = new NavigationRouteStack(2, ['a', 'b', 'c']);
-    expect(stack.slice().index).toBe(2);
-    expect(stack.slice(0, 1).index).toBe(0);
-    expect(stack.slice(0, 2).index).toBe(1);
-    expect(stack.slice(0, 3).index).toBe(2);
-    expect(stack.slice(0, 100).index).toBe(2);
-    expect(stack.slice(-2).index).toBe(1);
-  });
-
-  it('slices without specifying params', () => {
-    var stack1 = new NavigationRouteStack(1, ['a', 'b', 'c']);
-    var stack2 = stack1.slice();
-    expect(stack2).toBe(stack1);
-  });
-
-  it('slices to from the end', () => {
-    var stack1 = new NavigationRouteStack(1, ['a', 'b', 'c', 'd']);
-    var stack2 = stack1.slice(-2);
-    expect(stack2.toArray()).toEqual(['c', 'd']);
-  });
-
-  it('throws when slicing to empty', () => {
-      expect(() => {
-        var stack = new NavigationRouteStack(1, ['a', 'b']);
-        stack.slice(100);
-      }).toThrow();
-  });
-
-  // Push
-  it('pushes route', () => {
-    var stack1 = new NavigationRouteStack(1, ['a', 'b']);
-    var stack2 = stack1.push('c');
-
-    expect(stack2).not.toBe(stack1);
-    expect(stack2.toArray()).toEqual(['a', 'b', 'c']);
-    expect(stack2.index).toBe(2);
-    expect(stack2.size).toBe(3);
-  });
-
-  it('throws when pushing empty route', () => {
-    expect(() => {
-      var stack = new NavigationRouteStack(1, ['a', 'b']);
-      stack.push(null);
-    }).toThrow();
-
-    expect(() => {
-      var stack = new NavigationRouteStack(1, ['a', 'b']);
-      stack.push('');
-    }).toThrow();
-
-    expect(() => {
-      var stack = new NavigationRouteStack(1, ['a', 'b']);
-      stack.push(undefined);
-    }).toThrow();
-  });
-
-  it('replaces routes on push', () => {
-    var stack1 = new NavigationRouteStack(1, ['a', 'b', 'c']);
-    var stack2 = stack1.push('d');
-    expect(stack2).not.toBe(stack1);
-    expect(stack2.toArray()).toEqual(['a', 'b', 'd']);
-    expect(stack2.index).toBe(2);
-  });
-
-  // Pop
-  it('pops route', () => {
-    var stack1 = new NavigationRouteStack(2, ['a', 'b', 'c']);
-    var stack2 = stack1.pop();
-    expect(stack2).not.toBe(stack1);
-    expect(stack2.toArray()).toEqual(['a', 'b']);
-    expect(stack2.index).toBe(1);
-    expect(stack2.size).toBe(2);
-  });
-
-  it('replaces routes on pop', () => {
-    var stack1 = new NavigationRouteStack(1, ['a', 'b', 'c']);
-    var stack2 = stack1.pop();
-    expect(stack2).not.toBe(stack1);
-    expect(stack2.toArray()).toEqual(['a']);
-    expect(stack2.index).toBe(0);
-  });
-
-  it('throws when popping to empty stack', () => {
-    expect(() => {
-      var stack = new NavigationRouteStack(0, ['a']);
-      stack.pop();
-    }).toThrow();
-  });
-
-  // Jump
-  it('jumps to index', () => {
-    var stack1 = new NavigationRouteStack(0, ['a', 'b', 'c']);
-    var stack2 = stack1.jumpToIndex(2);
-
-    expect(stack2).not.toBe(stack1);
-    expect(stack2.index).toBe(2);
-  });
-
-  it('throws then jumping to index out of bound', () => {
-    expect(() => {
-      var stack = new NavigationRouteStack(1, ['a', 'b']);
-      stack.jumpToIndex(2);
-    }).toThrow();
-
-    expect(() => {
-      var stack = new NavigationRouteStack(1, ['a', 'b']);
-      stack.jumpToIndex(-1);
-    }).toThrow();
-  });
-
-  // Replace
-  it('replaces route at index', () => {
-    var stack1 = new NavigationRouteStack(1, ['a', 'b']);
-    var stack2 = stack1.replaceAtIndex(0, 'x');
-
-    expect(stack2).not.toBe(stack1);
-    expect(stack2.toArray()).toEqual(['x', 'b']);
-    expect(stack2.index).toBe(0);
-  });
-
-  it('replaces route at negative index', () => {
-    var stack1 = new NavigationRouteStack(1, ['a', 'b']);
-    var stack2 = stack1.replaceAtIndex(-1, 'x');
-
-    expect(stack2).not.toBe(stack1);
-    expect(stack2.toArray()).toEqual(['a', 'x']);
-    expect(stack2.index).toBe(1);
-  });
-
-  it('throws when replacing empty route', () => {
-    expect(() => {
-      var stack = new NavigationRouteStack(1, ['a', 'b']);
-      stack.replaceAtIndex(1, null);
-    }).toThrow();
-  });
-
-  it('throws when replacing at index out of bound', () => {
-    expect(() => {
-      var stack = new NavigationRouteStack(1, ['a', 'b']);
-      stack.replaceAtIndex(100, 'x');
-    }).toThrow();
-  });
-
-  // Iteration
-  it('iterates each item', () => {
-    var stack = new NavigationRouteStack(0, ['a', 'b']);
-    var logs = [];
-    var keys = {};
-    var context = {name: 'yo'};
-
-    stack.forEach(function (route, index, key) {
-      assetStringNotEmpty(key);
-      if (!keys.hasOwnProperty(key)) {
-        keys[key] = true;
-        logs.push([
-          route,
-          index,
-          this.name,
-        ]);
-      }
-    }, context);
-
-    expect(logs).toEqual([
-      ['a', 0, 'yo'],
-      ['b', 1, 'yo'],
-    ]);
-  });
-
-  it('Maps to an array', () => {
-    var stack = new NavigationRouteStack(0, ['a', 'b']);
-    var keys = {};
-    var context = {name: 'yo'};
-
-    var logs = stack.mapToArray(function(route, index, key) {
-      assetStringNotEmpty(key);
-      if (!keys.hasOwnProperty(key)) {
-        keys[key] = true;
-        return [
-          route,
-          index,
-          this.name,
-        ];
-      }
-    }, context);
-
-    expect(logs).toEqual([
-      ['a', 0, 'yo'],
-      ['b', 1, 'yo'],
-    ]);
-  });
-
-  // Diff
-  it('subtracts stack', () => {
-    var stack1 = new NavigationRouteStack(2, ['a', 'b', 'c']);
-    var stack2 = stack1.pop().pop().push('x').push('y');
-
-    var diff = stack1.subtract(stack2);
-
-    var result = diff.toJS().map((record) => {
-      assetStringNotEmpty(record.key);
-      return {
-        index: record.index,
-        route: record.route,
-      };
-    });
-
-    // route `b` and `c` are no longer in the stack.
-    expect(result).toEqual([
-      {
-        index: 1,
-        route: 'b',
-      },
-      {
-        index: 2,
-        route: 'c',
-      },
-    ]);
-  });
-
-  it('only subtracts the derived stack', () => {
-    var stack1 = new NavigationRouteStack(2, ['a', 'b', 'c']);
-    var stack2 = new NavigationRouteStack(0, ['a']);
-    var diff = stack1.subtract(stack2);
-
-    var result = diff.toJS().map((record) => {
-      assetStringNotEmpty(record.key);
-      return {
-        index: record.index,
-        route: record.route,
-      };
-    });
-
-    expect(result).toEqual([
-      {
-        index: 0,
-        route: 'a',
-      },
-      {
-        index: 1,
-        route: 'b',
-      },
-      {
-        index: 2,
-        route: 'c',
-      },
-    ]);
-
-  });
-});
diff --git a/Libraries/CustomComponents/Navigator/Navigation/__tests__/NavigationTreeNode-test.js b/Libraries/CustomComponents/Navigator/Navigation/__tests__/NavigationTreeNode-test.js
deleted file mode 100644
index f76d5e9bdada55..00000000000000
--- a/Libraries/CustomComponents/Navigator/Navigation/__tests__/NavigationTreeNode-test.js
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- * Copyright (c) 2015, Facebook, Inc.  All rights reserved.
- */
-
-'use strict';
-
-jest
-  .unmock('NavigationTreeNode')
-  .unmock('fbjs/lib/invariant')
-  .unmock('immutable');
-
-var NavigationTreeNode = require('NavigationTreeNode');
-
-describe('NavigationTreeNode-test', () => {
-  it('should be empty', () => {
-    var node = new NavigationTreeNode();
-    expect(node.getValue()).toEqual(undefined);
-    expect(node.getParent()).toEqual(null);
-    expect(node.getChildrenCount()).toEqual(0);
-    expect(node.getChildAt(0)).toEqual(null);
-  });
-
-
-  it('should contain value', () => {
-    var node = new NavigationTreeNode(123);
-    expect(node.getValue()).toEqual(123);
-  });
-
-  it('should appendChild', () => {
-    var papa = new NavigationTreeNode('hedger');
-    var baby = new NavigationTreeNode('hedger jr');
-    papa.appendChild(baby);
-    expect(papa.getChildAt(0)).toEqual(baby);
-    expect(papa.getChildrenCount()).toEqual(1);
-    expect(baby.getParent()).toEqual(papa);
-  });
-
-  it('should removeChild', () => {
-    var papa = new NavigationTreeNode('Eddard Stark');
-    var baby = new NavigationTreeNode('Robb Stark');
-    papa.appendChild(baby);
-
-    papa.removeChild(baby);
-    expect(papa.getChildAt(0)).toEqual(null);
-    expect(papa.getChildrenCount()).toEqual(0);
-    expect(baby.getParent()).toEqual(null);
-  });
-
-  it('should not remove non-child', () => {
-    var papa = new NavigationTreeNode('dog');
-    var baby = new NavigationTreeNode('cat');
-    expect(papa.removeChild.bind(papa, baby)).toThrow();
-  });
-
-  it('should find child', () => {
-    var papa = new NavigationTreeNode('Eddard Stark');
-    var baby = new NavigationTreeNode('Robb Stark');
-
-    papa.appendChild(baby);
-    expect(papa.indexOf(baby)).toEqual(0);
-
-    papa.removeChild(baby);
-    expect(papa.indexOf(baby)).toEqual(-1);
-  });
-
-
-  it('should traverse each child', () => {
-    var parent = new NavigationTreeNode();
-    parent.appendChild(new NavigationTreeNode('a'));
-    parent.appendChild(new NavigationTreeNode('b'));
-    parent.appendChild(new NavigationTreeNode('c'));
-    var result = [];
-    parent.forEach((child, index) => {
-      result[index] = child.getValue();
-    });
-
-    expect(result).toEqual(['a', 'b', 'c']);
-  });
-
-  it('should map children', () => {
-    var parent = new NavigationTreeNode();
-    parent.appendChild(new NavigationTreeNode('a'));
-    parent.appendChild(new NavigationTreeNode('b'));
-    parent.appendChild(new NavigationTreeNode('c'));
-    var result = parent.map((child, index) => {
-      return child.getValue();
-    });
-
-    expect(result).toEqual(['a', 'b', 'c']);
-  });
-
-  it('should traverse some children', () => {
-    var parent = new NavigationTreeNode();
-    parent.appendChild(new NavigationTreeNode('a'));
-    parent.appendChild(new NavigationTreeNode('b'));
-    parent.appendChild(new NavigationTreeNode('c'));
-
-    var result = [];
-    var value = parent.some((child, index) => {
-      if (index > 1) {
-        return true;
-      } else {
-        result[index] = child.getValue();
-      }
-    });
-
-    expect(value).toEqual(true);
-    expect(result).toEqual(['a', 'b']);
-  });
-});
diff --git a/Libraries/CustomComponents/Navigator/Navigator.js b/Libraries/CustomComponents/Navigator/Navigator.js
deleted file mode 100644
index 5f4b05ad26fde4..00000000000000
--- a/Libraries/CustomComponents/Navigator/Navigator.js
+++ /dev/null
@@ -1,1368 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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.
- *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @providesModule Navigator
- */
-/* eslint-disable no-extra-boolean-cast*/
-'use strict';
-
-var AnimationsDebugModule = require('NativeModules').AnimationsDebugModule;
-var Dimensions = require('Dimensions');
-var InteractionMixin = require('InteractionMixin');
-var NavigationContext = require('NavigationContext');
-var NavigatorBreadcrumbNavigationBar = require('NavigatorBreadcrumbNavigationBar');
-var NavigatorNavigationBar = require('NavigatorNavigationBar');
-var NavigatorSceneConfigs = require('NavigatorSceneConfigs');
-var PanResponder = require('PanResponder');
-var React = require('React');
-var StyleSheet = require('StyleSheet');
-var Subscribable = require('Subscribable');
-var TVEventHandler = require('TVEventHandler');
-var TimerMixin = require('react-timer-mixin');
-var View = require('View');
-
-const ViewPropTypes = require('ViewPropTypes');
-
-var clamp = require('clamp');
-var flattenStyle = require('flattenStyle');
-var invariant = require('fbjs/lib/invariant');
-var rebound = require('rebound');
-
-var PropTypes = React.PropTypes;
-
-// TODO: this is not ideal because there is no guarantee that the navigator
-// is full screen, however we don't have a good way to measure the actual
-// size of the navigator right now, so this is the next best thing.
-var SCREEN_WIDTH = Dimensions.get('window').width;
-var SCREEN_HEIGHT = Dimensions.get('window').height;
-var SCENE_DISABLED_NATIVE_PROPS = {
-  pointerEvents: 'none',
-  style: {
-    top: SCREEN_HEIGHT,
-    bottom: -SCREEN_HEIGHT,
-    opacity: 0,
-  },
-};
-
-var __uid = 0;
-function getuid() {
-  return __uid++;
-}
-
-function getRouteID(route) {
-  if (route === null || typeof route !== 'object') {
-    return String(route);
-  }
-
-  var key = '__navigatorRouteID';
-
-  if (!route.hasOwnProperty(key)) {
-    Object.defineProperty(route, key, {
-      enumerable: false,
-      configurable: false,
-      writable: false,
-      value: getuid(),
-    });
-  }
-  return route[key];
-}
-
-// styles moved to the top of the file so getDefaultProps can refer to it
-var styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    overflow: 'hidden',
-  },
-  defaultSceneStyle: {
-    position: 'absolute',
-    left: 0,
-    right: 0,
-    bottom: 0,
-    top: 0,
-    transform: [
-      {translateX: 0},
-      {translateY: 0},
-      {scaleX: 1},
-      {scaleY: 1},
-      {rotate: '0deg'},
-      {skewX: '0deg'},
-      {skewY: '0deg'},
-    ],
-  },
-  baseScene: {
-    position: 'absolute',
-    overflow: 'hidden',
-    left: 0,
-    right: 0,
-    bottom: 0,
-    top: 0,
-  },
-  disabledScene: {
-    top: SCREEN_HEIGHT,
-    bottom: -SCREEN_HEIGHT,
-  },
-  transitioner: {
-    flex: 1,
-    backgroundColor: 'transparent',
-    overflow: 'hidden',
-  }
-});
-
-var GESTURE_ACTIONS = [
-  'pop',
-  'jumpBack',
-  'jumpForward',
-];
-
-/**
- * `Navigator` handles the transition between different scenes in your app.
- * It is implemented in JavaScript and is available on both iOS and Android. If
- * you are targeting iOS only, you may also want to consider using
- * [`NavigatorIOS`](docs/navigatorios.html) as it leverages native UIKit
- * navigation.
- *
- * To set up the `Navigator` you provide one or more objects called routes,
- * to identify each scene. You also provide a `renderScene` function that
- * renders the scene for each route object.
- *
- * ```
- * import React, { Component } from 'react';
- * import { Text, Navigator, TouchableHighlight } from 'react-native';
- *
- * export default class NavAllDay extends Component {
- *   render() {
- *     return (
- *       <Navigator
- *         initialRoute={{ title: 'Awesome Scene', index: 0 }}
- *         renderScene={(route, navigator) =>
- *           <Text>Hello {route.title}!</Text>
- *         }
- *         style={{padding: 100}}
- *       />
- *     );
- *   }
- * }
- * ```
- *
- * In the above example, `initialRoute` is used to specify the first route. It
- * contains a `title` property that identifies the route. The `renderScene`
- * prop returns a function that displays text based on the route's title.
- *
- * ### Additional Scenes
- *
- * The first example demonstrated one scene. To set up multiple scenes, you pass
- * the `initialRouteStack` prop to `Navigator`:
- *
- * ```
- * render() {
- *   const routes = [
- *     {title: 'First Scene', index: 0},
- *     {title: 'Second Scene', index: 1},
- *   ];
- *   return (
- *     <Navigator
- *       initialRoute={routes[0]}
- *       initialRouteStack={routes}
- *       renderScene={(route, navigator) =>
- *         <TouchableHighlight onPress={() => {
- *           if (route.index === 0) {
- *             navigator.push(routes[1]);
- *           } else {
- *             navigator.pop();
- *           }
- *         }}>
- *         <Text>Hello {route.title}!</Text>
- *         </TouchableHighlight>
- *       }
- *       style={{padding: 100}}
- *     />
- *   );
- * }
- * ```
- *
- * In the above example, a `routes` variable is defined with two route objects
- * representing two scenes. Each route has an `index` property that is used to
- * manage the scene being rendered. The `renderScene` method is changed to
- * either push or pop the navigator depending on the current route's index.
- * Finally, the `Text` component in the scene is now wrapped in a
- * `TouchableHighlight` component to help trigger the navigator transitions.
- *
- * ### Navigation Bar
- *
- * You can optionally pass in your own navigation bar by returning a
- * `Navigator.NavigationBar` component to the `navigationBar` prop in
- * `Navigator`. You can configure the navigation bar properties, through
- * the `routeMapper` prop. There you set up the left, right, and title
- * properties of the navigation bar:
- *
- * ```
- * <Navigator
- *   renderScene={(route, navigator) =>
- *     // ...
- *   }
- *   navigationBar={
- *      <Navigator.NavigationBar
- *        routeMapper={{
- *          LeftButton: (route, navigator, index, navState) =>
- *           { return (<Text>Cancel</Text>); },
- *          RightButton: (route, navigator, index, navState) =>
- *            { return (<Text>Done</Text>); },
- *          Title: (route, navigator, index, navState) =>
- *            { return (<Text>Awesome Nav Bar</Text>); },
- *        }}
- *        style={{backgroundColor: 'gray'}}
- *      />
- *   }
- * />
- * ```
- *
- * When configuring the left, right, and title items for the navigation bar,
- * you have access to info such as the current route object and navigation
- * state. This allows you to customize the title for each scene as well as
- * the buttons. For example, you can choose to hide the left button for one of
- * the scenes.
- *
- * Typically you want buttons to represent the left and right buttons. Building
- * on the previous example, you can set this up as follows:
- *
- * ```
- * LeftButton: (route, navigator, index, navState) =>
- *   {
- *     if (route.index === 0) {
- *       return null;
- *     } else {
- *       return (
- *         <TouchableHighlight onPress={() => navigator.pop()}>
- *           <Text>Back</Text>
- *         </TouchableHighlight>
- *       );
- *     }
- *   },
- * ```
- *
- * This sets up a left navigator bar button that's visible on scenes after the
- * the first one. When the button is tapped the navigator is popped.
- *
- * Another type of navigation bar, with breadcrumbs, is provided by
- * `Navigator.BreadcrumbNavigationBar`. You can also provide your own navigation
- * bar by passing it through the `navigationBar` prop. See the
- * [UIExplorer](https://github.com/facebook/react-native/tree/master/Examples/UIExplorer)
- * demo to try out both built-in navigation bars out and see how to use them.
- *
- * ### Scene Transitions
- *
- * To change the animation or gesture properties of the scene, provide a
- * `configureScene` prop to get the config object for a given route:
- *
- * ```
- * <Navigator
- *   renderScene={(route, navigator) =>
- *     // ...
- *   }
- *   configureScene={(route, routeStack) =>
- *     Navigator.SceneConfigs.FloatFromBottom}
- * />
- * ```
- * In the above example, the newly pushed scene will float up from the bottom.
- * See `Navigator.SceneConfigs` for default animations and more info on
- * available [scene config options](docs/navigator.html#configurescene).
- */
-var Navigator = React.createClass({
-
-  propTypes: {
-    /**
-     * Optional function where you can configure scene animations and
-     * gestures. Will be invoked with `route` and `routeStack` parameters,
-     * where `route` corresponds to the current scene being rendered by the
-     * `Navigator` and `routeStack` is the set of currently mounted routes
-     * that the navigator could transition to.
-     *
-     * The function should return a scene configuration object.
-     *
-     * ```
-     * (route, routeStack) => Navigator.SceneConfigs.FloatFromRight
-     * ```
-     *
-     * Available scene configuration options are:
-     *
-     *  - Navigator.SceneConfigs.PushFromRight (default)
-     *  - Navigator.SceneConfigs.FloatFromRight
-     *  - Navigator.SceneConfigs.FloatFromLeft
-     *  - Navigator.SceneConfigs.FloatFromBottom
-     *  - Navigator.SceneConfigs.FloatFromBottomAndroid
-     *  - Navigator.SceneConfigs.FadeAndroid
-     *  - Navigator.SceneConfigs.SwipeFromLeft
-     *  - Navigator.SceneConfigs.HorizontalSwipeJump
-     *  - Navigator.SceneConfigs.HorizontalSwipeJumpFromRight
-     *  - Navigator.SceneConfigs.HorizontalSwipeJumpFromLeft
-     *  - Navigator.SceneConfigs.VerticalUpSwipeJump
-     *  - Navigator.SceneConfigs.VerticalDownSwipeJump
-     *
-     */
-    configureScene: PropTypes.func,
-
-    /**
-     * Required function which renders the scene for a given route. Will be
-     * invoked with the `route` and the `navigator` object.
-     *
-     * ```
-     * (route, navigator) =>
-     *   <MySceneComponent title={route.title} navigator={navigator} />
-     * ```
-     */
-    renderScene: PropTypes.func.isRequired,
-
-    /**
-     * The initial route for navigation. A route is an object that the navigator
-     * will use to identify each scene it renders.
-     *
-     * If both `initialRoute` and `initialRouteStack` props are passed to
-     * `Navigator`, then `initialRoute` must be in a route in
-     * `initialRouteStack`. If `initialRouteStack` is passed as a prop but
-     * `initialRoute` is not, then `initialRoute` will default internally to
-     * the last item in `initialRouteStack`.
-     */
-    initialRoute: PropTypes.object,
-
-    /**
-     * Pass this in to provide a set of routes to initially mount. This prop
-     * is required if `initialRoute` is not provided to the navigator. If this
-     * prop is not passed in, it will default internally to an array
-     * containing only `initialRoute`.
-     */
-    initialRouteStack: PropTypes.arrayOf(PropTypes.object),
-
-    /**
-     * Pass in a function to get notified with the target route when
-     * the navigator component is mounted and before each navigator transition.
-     */
-    onWillFocus: PropTypes.func,
-
-    /**
-     * Will be called with the new route of each scene after the transition is
-     * complete or after the initial mounting.
-     */
-    onDidFocus: PropTypes.func,
-
-    /**
-     * Use this to provide an optional component representing a navigation bar
-     * that is persisted across scene transitions. This component will receive
-     * two props: `navigator` and `navState` representing the navigator
-     * component and its state. The component is re-rendered when the route
-     * changes.
-     */
-    navigationBar: PropTypes.node,
-
-    /**
-     * Optionally pass in the navigator object from a parent `Navigator`.
-     */
-    navigator: PropTypes.object,
-
-    /**
-     * Styles to apply to the container of each scene.
-     */
-    sceneStyle: ViewPropTypes.style,
-  },
-
-  statics: {
-    BreadcrumbNavigationBar: NavigatorBreadcrumbNavigationBar,
-    NavigationBar: NavigatorNavigationBar,
-    SceneConfigs: NavigatorSceneConfigs,
-  },
-
-  mixins: [TimerMixin, InteractionMixin, Subscribable.Mixin],
-
-  getDefaultProps: function() {
-    return {
-      configureScene: () => NavigatorSceneConfigs.PushFromRight,
-      sceneStyle: styles.defaultSceneStyle,
-    };
-  },
-
-  getInitialState: function() {
-    this._navigationBarNavigator = this.props.navigationBarNavigator || this;
-
-    this._renderedSceneMap = new Map();
-
-    this._sceneRefs = [];
-
-    var routeStack = this.props.initialRouteStack || [this.props.initialRoute];
-    invariant(
-      routeStack.length >= 1,
-      'Navigator requires props.initialRoute or props.initialRouteStack.'
-    );
-    var initialRouteIndex = routeStack.length - 1;
-    if (this.props.initialRoute) {
-      initialRouteIndex = routeStack.indexOf(this.props.initialRoute);
-      invariant(
-        initialRouteIndex !== -1,
-        'initialRoute is not in initialRouteStack.'
-      );
-    }
-    return {
-      sceneConfigStack: routeStack.map(
-        (route) => this.props.configureScene(route, routeStack)
-      ),
-      routeStack,
-      presentedIndex: initialRouteIndex,
-      transitionFromIndex: null,
-      activeGesture: null,
-      pendingGestureProgress: null,
-      transitionQueue: [],
-    };
-  },
-
-  componentWillMount: function() {
-    // TODO(t7489503): Don't need this once ES6 Class landed.
-    this.__defineGetter__('navigationContext', this._getNavigationContext);
-
-    this._subRouteFocus = [];
-    this.parentNavigator = this.props.navigator;
-    this._handlers = {};
-    this.springSystem = new rebound.SpringSystem();
-    this.spring = this.springSystem.createSpring();
-    this.spring.setRestSpeedThreshold(0.05);
-    this.spring.setCurrentValue(0).setAtRest();
-    this.spring.addListener({
-      onSpringEndStateChange: () => {
-        if (!this._interactionHandle) {
-          this._interactionHandle = this.createInteractionHandle();
-        }
-      },
-      onSpringUpdate: () => {
-        this._handleSpringUpdate();
-      },
-      onSpringAtRest: () => {
-        this._completeTransition();
-      },
-    });
-    this.panGesture = PanResponder.create({
-      onMoveShouldSetPanResponder: this._handleMoveShouldSetPanResponder,
-      onPanResponderRelease: this._handlePanResponderRelease,
-      onPanResponderMove: this._handlePanResponderMove,
-      onPanResponderTerminate: this._handlePanResponderTerminate,
-    });
-    this._interactionHandle = null;
-    this._emitWillFocus(this.state.routeStack[this.state.presentedIndex]);
-  },
-
-  componentDidMount: function() {
-    this._handleSpringUpdate();
-    this._emitDidFocus(this.state.routeStack[this.state.presentedIndex]);
-    this._enableTVEventHandler();
-  },
-
-  componentWillUnmount: function() {
-    if (this._navigationContext) {
-      this._navigationContext.dispose();
-      this._navigationContext = null;
-    }
-
-    this.spring.destroy();
-
-    if (this._interactionHandle) {
-      this.clearInteractionHandle(this._interactionHandle);
-    }
-
-    this._disableTVEventHandler();
-  },
-
-  /**
-   * Reset every scene with an array of routes.
-   *
-   * @param {RouteStack} nextRouteStack Next route stack to reinitialize.
-   * All existing route stacks are destroyed and potentially recreated. There
-   * is no accompanying animation and this method immediately replaces and
-   * re-renders the navigation bar and the stack items.
-   */
-  immediatelyResetRouteStack: function(nextRouteStack) {
-    var destIndex = nextRouteStack.length - 1;
-    this._emitWillFocus(nextRouteStack[destIndex]);
-    this.setState({
-      routeStack: nextRouteStack,
-      sceneConfigStack: nextRouteStack.map(
-        route => this.props.configureScene(route, nextRouteStack)
-      ),
-      presentedIndex: destIndex,
-      activeGesture: null,
-      transitionFromIndex: null,
-      transitionQueue: [],
-    }, () => {
-      this._handleSpringUpdate();
-      var navBar = this._navBar;
-      if (navBar && navBar.immediatelyRefresh) {
-        navBar.immediatelyRefresh();
-      }
-      this._emitDidFocus(this.state.routeStack[this.state.presentedIndex]);
-    });
-  },
-
-  _transitionTo: function(destIndex, velocity, jumpSpringTo, cb) {
-    if (this.state.presentedIndex === destIndex) {
-      cb && cb();
-      return;
-    }
-
-    if (this.state.transitionFromIndex !== null) {
-      // Navigation is still transitioning, put the `destIndex` into queue.
-      this.state.transitionQueue.push({
-        destIndex,
-        velocity,
-        cb,
-      });
-      return;
-    }
-
-    this.state.transitionFromIndex = this.state.presentedIndex;
-    this.state.presentedIndex = destIndex;
-    this.state.transitionCb = cb;
-    this._onAnimationStart();
-    if (AnimationsDebugModule) {
-      AnimationsDebugModule.startRecordingFps();
-    }
-    var sceneConfig = this.state.sceneConfigStack[this.state.transitionFromIndex] ||
-      this.state.sceneConfigStack[this.state.presentedIndex];
-    invariant(
-      sceneConfig,
-      'Cannot configure scene at index ' + this.state.transitionFromIndex
-    );
-    if (jumpSpringTo != null) {
-      this.spring.setCurrentValue(jumpSpringTo);
-    }
-    this.spring.setOvershootClampingEnabled(true);
-    this.spring.getSpringConfig().friction = sceneConfig.springFriction;
-    this.spring.getSpringConfig().tension = sceneConfig.springTension;
-    this.spring.setVelocity(velocity || sceneConfig.defaultTransitionVelocity);
-    this.spring.setEndValue(1);
-  },
-
-  /**
-   * This happens for each frame of either a gesture or a transition. If both are
-   * happening, we only set values for the transition and the gesture will catch up later
-   */
-  _handleSpringUpdate: function() {
-    if (!this.isMounted()) {
-      return;
-    }
-    // Prioritize handling transition in progress over a gesture:
-    if (this.state.transitionFromIndex != null) {
-      this._transitionBetween(
-        this.state.transitionFromIndex,
-        this.state.presentedIndex,
-        this.spring.getCurrentValue()
-      );
-    } else if (this.state.activeGesture != null) {
-      var presentedToIndex = this.state.presentedIndex + this._deltaForGestureAction(this.state.activeGesture);
-      this._transitionBetween(
-        this.state.presentedIndex,
-        presentedToIndex,
-        this.spring.getCurrentValue()
-      );
-    }
-  },
-
-  /**
-   * This happens at the end of a transition started by transitionTo, and when the spring catches up to a pending gesture
-   */
-  _completeTransition: function() {
-    if (!this.isMounted()) {
-      return;
-    }
-
-    if (this.spring.getCurrentValue() !== 1 && this.spring.getCurrentValue() !== 0) {
-      // The spring has finished catching up to a gesture in progress. Remove the pending progress
-      // and we will be in a normal activeGesture state
-      if (this.state.pendingGestureProgress) {
-        this.state.pendingGestureProgress = null;
-      }
-      return;
-    }
-    this._onAnimationEnd();
-    var presentedIndex = this.state.presentedIndex;
-    var didFocusRoute = this._subRouteFocus[presentedIndex] || this.state.routeStack[presentedIndex];
-
-    if (AnimationsDebugModule) {
-      AnimationsDebugModule.stopRecordingFps(Date.now());
-    }
-    this.state.transitionFromIndex = null;
-    this.spring.setCurrentValue(0).setAtRest();
-    this._hideScenes();
-    if (this.state.transitionCb) {
-      this.state.transitionCb();
-      this.state.transitionCb = null;
-    }
-
-    this._emitDidFocus(didFocusRoute);
-
-    if (this._interactionHandle) {
-      this.clearInteractionHandle(this._interactionHandle);
-      this._interactionHandle = null;
-    }
-    if (this.state.pendingGestureProgress) {
-      // A transition completed, but there is already another gesture happening.
-      // Enable the scene and set the spring to catch up with the new gesture
-      var gestureToIndex = this.state.presentedIndex + this._deltaForGestureAction(this.state.activeGesture);
-      this._enableScene(gestureToIndex);
-      this.spring.setEndValue(this.state.pendingGestureProgress);
-      return;
-    }
-    if (this.state.transitionQueue.length) {
-      var queuedTransition = this.state.transitionQueue.shift();
-      this._enableScene(queuedTransition.destIndex);
-      this._emitWillFocus(this.state.routeStack[queuedTransition.destIndex]);
-      this._transitionTo(
-        queuedTransition.destIndex,
-        queuedTransition.velocity,
-        null,
-        queuedTransition.cb
-      );
-    }
-  },
-
-  _emitDidFocus: function(route) {
-    this.navigationContext.emit('didfocus', {route: route});
-
-    if (this.props.onDidFocus) {
-      this.props.onDidFocus(route);
-    }
-  },
-
-  _emitWillFocus: function(route) {
-    this.navigationContext.emit('willfocus', {route: route});
-
-    var navBar = this._navBar;
-    if (navBar && navBar.handleWillFocus) {
-      navBar.handleWillFocus(route);
-    }
-    if (this.props.onWillFocus) {
-      this.props.onWillFocus(route);
-    }
-  },
-
-  /**
-   * Hides all scenes that we are not currently on, gesturing to, or transitioning from
-   */
-  _hideScenes: function() {
-    var gesturingToIndex = null;
-    if (this.state.activeGesture) {
-      gesturingToIndex = this.state.presentedIndex + this._deltaForGestureAction(this.state.activeGesture);
-    }
-    for (var i = 0; i < this.state.routeStack.length; i++) {
-      if (i === this.state.presentedIndex ||
-          i === this.state.transitionFromIndex ||
-          i === gesturingToIndex) {
-        continue;
-      }
-      this._disableScene(i);
-    }
-  },
-
-  /**
-   * Push a scene off the screen, so that opacity:0 scenes will not block touches sent to the presented scenes
-   */
-  _disableScene: function(sceneIndex) {
-    this._sceneRefs[sceneIndex] &&
-      this._sceneRefs[sceneIndex].setNativeProps(SCENE_DISABLED_NATIVE_PROPS);
-  },
-
-  /**
-   * Put the scene back into the state as defined by props.sceneStyle, so transitions can happen normally
-   */
-  _enableScene: function(sceneIndex) {
-    // First, determine what the defined styles are for scenes in this navigator
-    var sceneStyle = flattenStyle([styles.baseScene, this.props.sceneStyle]);
-    // Then restore the pointer events and top value for this scene
-    var enabledSceneNativeProps = {
-      pointerEvents: 'auto',
-      style: {
-        top: sceneStyle.top,
-        bottom: sceneStyle.bottom,
-      },
-    };
-    if (sceneIndex !== this.state.transitionFromIndex &&
-        sceneIndex !== this.state.presentedIndex) {
-      // If we are not in a transition from this index, make sure opacity is 0
-      // to prevent the enabled scene from flashing over the presented scene
-      enabledSceneNativeProps.style.opacity = 0;
-    }
-    this._sceneRefs[sceneIndex] &&
-      this._sceneRefs[sceneIndex].setNativeProps(enabledSceneNativeProps);
-  },
-
-  _clearTransformations: function(sceneIndex) {
-    const defaultStyle = flattenStyle([styles.defaultSceneStyle]);
-    this._sceneRefs[sceneIndex].setNativeProps({ style: defaultStyle });
-  },
-
-  _onAnimationStart: function() {
-    var fromIndex = this.state.presentedIndex;
-    var toIndex = this.state.presentedIndex;
-    if (this.state.transitionFromIndex != null) {
-      fromIndex = this.state.transitionFromIndex;
-    } else if (this.state.activeGesture) {
-      toIndex = this.state.presentedIndex + this._deltaForGestureAction(this.state.activeGesture);
-    }
-    this._setRenderSceneToHardwareTextureAndroid(fromIndex, true);
-    this._setRenderSceneToHardwareTextureAndroid(toIndex, true);
-    var navBar = this._navBar;
-    if (navBar && navBar.onAnimationStart) {
-      navBar.onAnimationStart(fromIndex, toIndex);
-    }
-  },
-
-  _onAnimationEnd: function() {
-    var max = this.state.routeStack.length - 1;
-    for (var index = 0; index <= max; index++) {
-      this._setRenderSceneToHardwareTextureAndroid(index, false);
-    }
-
-    var navBar = this._navBar;
-    if (navBar && navBar.onAnimationEnd) {
-      navBar.onAnimationEnd();
-    }
-  },
-
-  _setRenderSceneToHardwareTextureAndroid: function(sceneIndex, shouldRenderToHardwareTexture) {
-    var viewAtIndex = this._sceneRefs[sceneIndex];
-    if (viewAtIndex === null || viewAtIndex === undefined) {
-      return;
-    }
-    viewAtIndex.setNativeProps({renderToHardwareTextureAndroid: shouldRenderToHardwareTexture});
-  },
-
-  _handleTouchStart: function() {
-    this._eligibleGestures = GESTURE_ACTIONS;
-  },
-
-  _handleMoveShouldSetPanResponder: function(e, gestureState) {
-    var sceneConfig = this.state.sceneConfigStack[this.state.presentedIndex];
-    if (!sceneConfig) {
-      return false;
-    }
-    this._expectingGestureGrant =
-      this._matchGestureAction(this._eligibleGestures, sceneConfig.gestures, gestureState);
-    return !!this._expectingGestureGrant;
-  },
-
-  _doesGestureOverswipe: function(gestureName) {
-    var wouldOverswipeBack = this.state.presentedIndex <= 0 &&
-      (gestureName === 'pop' || gestureName === 'jumpBack');
-    var wouldOverswipeForward = this.state.presentedIndex >= this.state.routeStack.length - 1 &&
-      gestureName === 'jumpForward';
-    return wouldOverswipeForward || wouldOverswipeBack;
-  },
-
-  _deltaForGestureAction: function(gestureAction) {
-    switch (gestureAction) {
-      case 'pop':
-      case 'jumpBack':
-        return -1;
-      case 'jumpForward':
-        return 1;
-      default:
-        invariant(false, 'Unsupported gesture action ' + gestureAction);
-        return;
-    }
-  },
-
-  _handlePanResponderRelease: function(e, gestureState) {
-    var sceneConfig = this.state.sceneConfigStack[this.state.presentedIndex];
-    var releaseGestureAction = this.state.activeGesture;
-    if (!releaseGestureAction) {
-      // The gesture may have been detached while responder, so there is no action here
-      return;
-    }
-    var releaseGesture = sceneConfig.gestures[releaseGestureAction];
-    var destIndex = this.state.presentedIndex + this._deltaForGestureAction(this.state.activeGesture);
-    if (this.spring.getCurrentValue() === 0) {
-      // The spring is at zero, so the gesture is already complete
-      this.spring.setCurrentValue(0).setAtRest();
-      this._completeTransition();
-      return;
-    }
-    var isTravelVertical = releaseGesture.direction === 'top-to-bottom' || releaseGesture.direction === 'bottom-to-top';
-    var isTravelInverted = releaseGesture.direction === 'right-to-left' || releaseGesture.direction === 'bottom-to-top';
-    var velocity, gestureDistance;
-    if (isTravelVertical) {
-      velocity = isTravelInverted ? -gestureState.vy : gestureState.vy;
-      gestureDistance = isTravelInverted ? -gestureState.dy : gestureState.dy;
-    } else {
-      velocity = isTravelInverted ? -gestureState.vx : gestureState.vx;
-      gestureDistance = isTravelInverted ? -gestureState.dx : gestureState.dx;
-    }
-    var transitionVelocity = clamp(-10, velocity, 10);
-    if (Math.abs(velocity) < releaseGesture.notMoving) {
-      // The gesture velocity is so slow, is "not moving"
-      var hasGesturedEnoughToComplete = gestureDistance > releaseGesture.fullDistance * releaseGesture.stillCompletionRatio;
-      transitionVelocity = hasGesturedEnoughToComplete ? releaseGesture.snapVelocity : -releaseGesture.snapVelocity;
-    }
-    if (transitionVelocity < 0 || this._doesGestureOverswipe(releaseGestureAction)) {
-      // This gesture is to an overswiped region or does not have enough velocity to complete
-      // If we are currently mid-transition, then this gesture was a pending gesture. Because this gesture takes no action, we can stop here
-      if (this.state.transitionFromIndex == null) {
-        // There is no current transition, so we need to transition back to the presented index
-        var transitionBackToPresentedIndex = this.state.presentedIndex;
-        // slight hack: change the presented index for a moment in order to transitionTo correctly
-        this.state.presentedIndex = destIndex;
-        this._transitionTo(
-          transitionBackToPresentedIndex,
-          -transitionVelocity,
-          1 - this.spring.getCurrentValue()
-        );
-      }
-    } else {
-      // The gesture has enough velocity to complete, so we transition to the gesture's destination
-      this._emitWillFocus(this.state.routeStack[destIndex]);
-      this._transitionTo(
-        destIndex,
-        transitionVelocity,
-        null,
-        () => {
-          if (releaseGestureAction === 'pop') {
-            this._cleanScenesPastIndex(destIndex);
-          }
-        }
-      );
-    }
-    this._detachGesture();
-  },
-
-  _handlePanResponderTerminate: function(e, gestureState) {
-    if (this.state.activeGesture == null) {
-      return;
-    }
-    var destIndex = this.state.presentedIndex + this._deltaForGestureAction(this.state.activeGesture);
-    this._detachGesture();
-    var transitionBackToPresentedIndex = this.state.presentedIndex;
-    // slight hack: change the presented index for a moment in order to transitionTo correctly
-    this.state.presentedIndex = destIndex;
-    this._transitionTo(
-      transitionBackToPresentedIndex,
-      null,
-      1 - this.spring.getCurrentValue()
-    );
-  },
-
-  _attachGesture: function(gestureId) {
-    this.state.activeGesture = gestureId;
-    var gesturingToIndex = this.state.presentedIndex + this._deltaForGestureAction(this.state.activeGesture);
-    this._enableScene(gesturingToIndex);
-  },
-
-  _detachGesture: function() {
-    this.state.activeGesture = null;
-    this.state.pendingGestureProgress = null;
-    this._hideScenes();
-  },
-
-  _handlePanResponderMove: function(e, gestureState) {
-    if (this._isMoveGestureAttached !== undefined) {
-      invariant(
-        this._expectingGestureGrant,
-        'Responder granted unexpectedly.'
-      );
-      this._attachGesture(this._expectingGestureGrant);
-      this._onAnimationStart();
-      this._expectingGestureGrant = undefined;
-    }
-
-    var sceneConfig = this.state.sceneConfigStack[this.state.presentedIndex];
-    if (this.state.activeGesture) {
-      var gesture = sceneConfig.gestures[this.state.activeGesture];
-      return this._moveAttachedGesture(gesture, gestureState);
-    }
-    var matchedGesture = this._matchGestureAction(GESTURE_ACTIONS, sceneConfig.gestures, gestureState);
-    if (matchedGesture) {
-      this._attachGesture(matchedGesture);
-    }
-  },
-
-  _moveAttachedGesture: function(gesture, gestureState) {
-    var isTravelVertical = gesture.direction === 'top-to-bottom' || gesture.direction === 'bottom-to-top';
-    var isTravelInverted = gesture.direction === 'right-to-left' || gesture.direction === 'bottom-to-top';
-    var distance = isTravelVertical ? gestureState.dy : gestureState.dx;
-    distance = isTravelInverted ? -distance : distance;
-    var gestureDetectMovement = gesture.gestureDetectMovement;
-    var nextProgress = (distance - gestureDetectMovement) /
-      (gesture.fullDistance - gestureDetectMovement);
-    if (nextProgress < 0 && gesture.isDetachable) {
-      var gesturingToIndex = this.state.presentedIndex + this._deltaForGestureAction(this.state.activeGesture);
-      this._transitionBetween(this.state.presentedIndex, gesturingToIndex, 0);
-      this._detachGesture();
-      if (this.state.pendingGestureProgress != null) {
-        this.spring.setCurrentValue(0);
-      }
-      return;
-    }
-    if (gesture.overswipe && this._doesGestureOverswipe(this.state.activeGesture)) {
-      var frictionConstant = gesture.overswipe.frictionConstant;
-      var frictionByDistance = gesture.overswipe.frictionByDistance;
-      var frictionRatio = 1 / ((frictionConstant) + (Math.abs(nextProgress) * frictionByDistance));
-      nextProgress *= frictionRatio;
-    }
-    nextProgress = clamp(0, nextProgress, 1);
-    if (this.state.transitionFromIndex != null) {
-      this.state.pendingGestureProgress = nextProgress;
-    } else if (this.state.pendingGestureProgress) {
-      this.spring.setEndValue(nextProgress);
-    } else {
-      this.spring.setCurrentValue(nextProgress);
-    }
-  },
-
-  _matchGestureAction: function(eligibleGestures, gestures, gestureState) {
-    if (!gestures || !eligibleGestures || !eligibleGestures.some) {
-      return null;
-    }
-    var matchedGesture = null;
-    eligibleGestures.some((gestureName, gestureIndex) => {
-      var gesture = gestures[gestureName];
-      if (!gesture) {
-        return;
-      }
-      if (gesture.overswipe == null && this._doesGestureOverswipe(gestureName)) {
-        // cannot swipe past first or last scene without overswiping
-        return false;
-      }
-      var isTravelVertical = gesture.direction === 'top-to-bottom' || gesture.direction === 'bottom-to-top';
-      var isTravelInverted = gesture.direction === 'right-to-left' || gesture.direction === 'bottom-to-top';
-      var startedLoc = isTravelVertical ? gestureState.y0 : gestureState.x0;
-      var currentLoc = isTravelVertical ? gestureState.moveY : gestureState.moveX;
-      var travelDist = isTravelVertical ? gestureState.dy : gestureState.dx;
-      var oppositeAxisTravelDist =
-        isTravelVertical ? gestureState.dx : gestureState.dy;
-      var edgeHitWidth = gesture.edgeHitWidth;
-      if (isTravelInverted) {
-        startedLoc = -startedLoc;
-        currentLoc = -currentLoc;
-        travelDist = -travelDist;
-        oppositeAxisTravelDist = -oppositeAxisTravelDist;
-        edgeHitWidth = isTravelVertical ?
-          -(SCREEN_HEIGHT - edgeHitWidth) :
-          -(SCREEN_WIDTH - edgeHitWidth);
-      }
-      if (startedLoc === 0) {
-        startedLoc = currentLoc;
-      }
-      var moveStartedInRegion = gesture.edgeHitWidth == null ||
-        startedLoc < edgeHitWidth;
-      if (!moveStartedInRegion) {
-        return false;
-      }
-      var moveTravelledFarEnough = travelDist >= gesture.gestureDetectMovement;
-      if (!moveTravelledFarEnough) {
-        return false;
-      }
-      var directionIsCorrect = Math.abs(travelDist) > Math.abs(oppositeAxisTravelDist) * gesture.directionRatio;
-      if (directionIsCorrect) {
-        matchedGesture = gestureName;
-        return true;
-      } else {
-        this._eligibleGestures = this._eligibleGestures.slice().splice(gestureIndex, 1);
-      }
-    });
-    return matchedGesture || null;
-  },
-
-  _transitionSceneStyle: function(fromIndex, toIndex, progress, index) {
-    var viewAtIndex = this._sceneRefs[index];
-    if (viewAtIndex === null || viewAtIndex === undefined) {
-      return;
-    }
-    // Use toIndex animation when we move forwards. Use fromIndex when we move back
-    var sceneConfigIndex = fromIndex < toIndex ? toIndex : fromIndex;
-    var sceneConfig = this.state.sceneConfigStack[sceneConfigIndex];
-    // this happens for overswiping when there is no scene at toIndex
-    if (!sceneConfig) {
-      sceneConfig = this.state.sceneConfigStack[sceneConfigIndex - 1];
-    }
-    var styleToUse = {};
-    var useFn = index < fromIndex || index < toIndex ?
-      sceneConfig.animationInterpolators.out :
-      sceneConfig.animationInterpolators.into;
-    var directionAdjustedProgress = fromIndex < toIndex ? progress : 1 - progress;
-    var didChange = useFn(styleToUse, directionAdjustedProgress);
-    if (didChange) {
-      viewAtIndex.setNativeProps({style: styleToUse});
-    }
-  },
-
-  _transitionBetween: function(fromIndex, toIndex, progress) {
-    this._transitionSceneStyle(fromIndex, toIndex, progress, fromIndex);
-    this._transitionSceneStyle(fromIndex, toIndex, progress, toIndex);
-    var navBar = this._navBar;
-    if (navBar && navBar.updateProgress && toIndex >= 0 && fromIndex >= 0) {
-      navBar.updateProgress(progress, fromIndex, toIndex);
-    }
-  },
-
-  _handleResponderTerminationRequest: function() {
-    return false;
-  },
-
-  _getDestIndexWithinBounds: function(n) {
-    var currentIndex = this.state.presentedIndex;
-    var destIndex = currentIndex + n;
-    invariant(
-      destIndex >= 0,
-      'Cannot jump before the first route.'
-    );
-    var maxIndex = this.state.routeStack.length - 1;
-    invariant(
-      maxIndex >= destIndex,
-      'Cannot jump past the last route.'
-    );
-    return destIndex;
-  },
-
-  _jumpN: function(n) {
-    var destIndex = this._getDestIndexWithinBounds(n);
-    this._enableScene(destIndex);
-    this._emitWillFocus(this.state.routeStack[destIndex]);
-    this._transitionTo(destIndex);
-  },
-
-  /**
-   * Transition to an existing scene without unmounting.
-   * @param {object} route Route to transition to. The specified route must
-   * be in the currently mounted set of routes defined in `routeStack`.
-   */
-  jumpTo: function(route) {
-    var destIndex = this.state.routeStack.indexOf(route);
-    invariant(
-      destIndex !== -1,
-      'Cannot jump to route that is not in the route stack'
-    );
-    this._jumpN(destIndex - this.state.presentedIndex);
-  },
-
-  /**
-   * Jump forward to the next scene in the route stack.
-   */
-  jumpForward: function() {
-    this._jumpN(1);
-  },
-
-  /**
-   * Jump backward without unmounting the current scene.
-   */
-  jumpBack: function() {
-    this._jumpN(-1);
-  },
-
-  /**
-   * Navigate forward to a new scene, squashing any scenes that you could
-   * jump forward to.
-   * @param {object} route Route to push into the navigator stack.
-   */
-  push: function(route) {
-    invariant(!!route, 'Must supply route to push');
-    var activeLength = this.state.presentedIndex + 1;
-    var activeStack = this.state.routeStack.slice(0, activeLength);
-    var activeAnimationConfigStack = this.state.sceneConfigStack.slice(0, activeLength);
-    var nextStack = activeStack.concat([route]);
-    var destIndex = nextStack.length - 1;
-    var nextSceneConfig = this.props.configureScene(route, nextStack);
-    var nextAnimationConfigStack = activeAnimationConfigStack.concat([nextSceneConfig]);
-    this._emitWillFocus(nextStack[destIndex]);
-    this.setState({
-      routeStack: nextStack,
-      sceneConfigStack: nextAnimationConfigStack,
-    }, () => {
-      this._enableScene(destIndex);
-      this._transitionTo(destIndex, nextSceneConfig.defaultTransitionVelocity);
-    });
-  },
-
-  /**
-   * Go back N scenes at once. When N=1, behavior matches `pop()`.
-   * When N is invalid(negative or bigger than current routes count), do nothing.
-   * @param {number} n The number of scenes to pop. Should be an integer.
-   */
-  popN: function(n) {
-    invariant(typeof n === 'number', 'Must supply a number to popN');
-    n = parseInt(n, 10);
-    if (n <= 0 || this.state.presentedIndex - n < 0) {
-      return;
-    }
-    var popIndex = this.state.presentedIndex - n;
-    var presentedRoute = this.state.routeStack[this.state.presentedIndex];
-    var popSceneConfig = this.props.configureScene(presentedRoute); // using the scene config of the currently presented view
-    this._enableScene(popIndex);
-    // This is needed because scene at the pop index may be transformed
-    // with a configuration different from the configuration on the presented
-    // route.
-    this._clearTransformations(popIndex);
-    this._emitWillFocus(this.state.routeStack[popIndex]);
-    this._transitionTo(
-      popIndex,
-      popSceneConfig.defaultTransitionVelocity,
-      null, // no spring jumping
-      () => {
-        this._cleanScenesPastIndex(popIndex);
-      }
-    );
-  },
-
-  /**
-   * Transition back and unmount the current scene.
-   */
-  pop: function() {
-    if (this.state.transitionQueue.length) {
-      // This is the workaround to prevent user from firing multiple `pop()`
-      // calls that may pop the routes beyond the limit.
-      // Because `this.state.presentedIndex` does not update until the
-      // transition starts, we can't reliably use `this.state.presentedIndex`
-      // to know whether we can safely keep popping the routes or not at this
-      //  moment.
-      return;
-    }
-
-    this.popN(1);
-  },
-
-  /**
-   * Replace a scene as specified by an index.
-   * @param {object} route Route representing the new scene to render.
-   * @param {number} index The route in the stack that should be replaced.
-   *   If negative, it counts from the back of the stack.
-   * @param {Function} cb Callback function when the scene has been replaced.
-   */
-  replaceAtIndex: function(route, index, cb) {
-    invariant(!!route, 'Must supply route to replace');
-    if (index < 0) {
-      index += this.state.routeStack.length;
-    }
-
-    if (this.state.routeStack.length <= index) {
-      return;
-    }
-
-    var nextRouteStack = this.state.routeStack.slice();
-    var nextAnimationModeStack = this.state.sceneConfigStack.slice();
-    nextRouteStack[index] = route;
-    nextAnimationModeStack[index] = this.props.configureScene(route, nextRouteStack);
-
-    if (index === this.state.presentedIndex) {
-      this._emitWillFocus(route);
-    }
-    this.setState({
-      routeStack: nextRouteStack,
-      sceneConfigStack: nextAnimationModeStack,
-    }, () => {
-      if (index === this.state.presentedIndex) {
-        this._emitDidFocus(route);
-      }
-      cb && cb();
-    });
-  },
-
-  /**
-   * Replace the current scene with a new route.
-   * @param {object} route Route that replaces the current scene.
-   */
-  replace: function(route) {
-    this.replaceAtIndex(route, this.state.presentedIndex);
-  },
-
-  /**
-   * Replace the previous scene.
-   * @param {object} route Route that replaces the previous scene.
-   */
-  replacePrevious: function(route) {
-    this.replaceAtIndex(route, this.state.presentedIndex - 1);
-  },
-
-  /**
-   * Pop to the first scene in the stack, unmounting every other scene.
-   */
-  popToTop: function() {
-    this.popToRoute(this.state.routeStack[0]);
-  },
-
-  /**
-   * Pop to a particular scene, as specified by its route.
-   * All scenes after it will be unmounted.
-   * @param {object} route Route to pop to.
-   */
-  popToRoute: function(route) {
-    var indexOfRoute = this.state.routeStack.indexOf(route);
-    invariant(
-      indexOfRoute !== -1,
-      'Calling popToRoute for a route that doesn\'t exist!'
-    );
-    var numToPop = this.state.presentedIndex - indexOfRoute;
-    this.popN(numToPop);
-  },
-
-  /**
-   * Replace the previous scene and pop to it.
-   * @param {object} route Route that replaces the previous scene.
-   */
-  replacePreviousAndPop: function(route) {
-    if (this.state.routeStack.length < 2) {
-      return;
-    }
-    this.replacePrevious(route);
-    this.pop();
-  },
-
-  /**
-   * Navigate to a new scene and reset route stack.
-   * @param {object} route Route to navigate to.
-   */
-  resetTo: function(route) {
-    invariant(!!route, 'Must supply route to push');
-    this.replaceAtIndex(route, 0, () => {
-      // Do not use popToRoute here, because race conditions could prevent the
-      // route from existing at this time. Instead, just go to index 0
-      this.popN(this.state.presentedIndex);
-    });
-  },
-
-  /**
-   * Returns the current list of routes.
-   */
-  getCurrentRoutes: function() {
-    // Clone before returning to avoid caller mutating the stack
-    return this.state.routeStack.slice();
-  },
-
-  _cleanScenesPastIndex: function(index) {
-    var newStackLength = index + 1;
-    // Remove any unneeded rendered routes.
-    if (newStackLength < this.state.routeStack.length) {
-      this.setState({
-        sceneConfigStack: this.state.sceneConfigStack.slice(0, newStackLength),
-        routeStack: this.state.routeStack.slice(0, newStackLength),
-      });
-    }
-  },
-
-  _renderScene: function(route, i) {
-    var disabledSceneStyle = null;
-    var disabledScenePointerEvents = 'auto';
-    if (i !== this.state.presentedIndex) {
-      disabledSceneStyle = styles.disabledScene;
-      disabledScenePointerEvents = 'none';
-    }
-    return (
-      <View
-        collapsable={false}
-        key={'scene_' + getRouteID(route)}
-        ref={(scene) => {
-          this._sceneRefs[i] = scene;
-        }}
-        onStartShouldSetResponderCapture={() => {
-          return (this.state.transitionFromIndex != null);
-        }}
-        pointerEvents={disabledScenePointerEvents}
-        style={[styles.baseScene, this.props.sceneStyle, disabledSceneStyle]}>
-        {this.props.renderScene(
-          route,
-          this
-        )}
-      </View>
-    );
-  },
-
-  _renderNavigationBar: function() {
-    const { navigationBar } = this.props;
-    if (!navigationBar) {
-      return null;
-    }
-    return React.cloneElement(navigationBar, {
-      ref: (navBar) => {
-        this._navBar = navBar;
-        if (navigationBar && typeof navigationBar.ref === 'function') {
-          navigationBar.ref(navBar);
-        }
-      },
-      navigator: this._navigationBarNavigator,
-      navState: this.state,
-    });
-  },
-
-  _tvEventHandler: TVEventHandler,
-
-  _enableTVEventHandler: function() {
-    this._tvEventHandler = new TVEventHandler();
-    this._tvEventHandler.enable(this, function(cmp, evt) {
-      if (evt && evt.eventType === 'menu') {
-        cmp.pop();
-      }
-    });
-  },
-
-  _disableTVEventHandler: function() {
-    if (this._tvEventHandler) {
-      this._tvEventHandler.disable();
-      delete this._tvEventHandler;
-    }
-  },
-
-  render: function() {
-    var newRenderedSceneMap = new Map();
-    var scenes = this.state.routeStack.map((route, index) => {
-      var renderedScene;
-      if (this._renderedSceneMap.has(route) &&
-          index !== this.state.presentedIndex) {
-        renderedScene = this._renderedSceneMap.get(route);
-      } else {
-        renderedScene = this._renderScene(route, index);
-      }
-      newRenderedSceneMap.set(route, renderedScene);
-      return renderedScene;
-    });
-    this._renderedSceneMap = newRenderedSceneMap;
-    return (
-      <View style={[styles.container, this.props.style]}>
-        <View
-          style={styles.transitioner}
-          {...this.panGesture.panHandlers}
-          onTouchStart={this._handleTouchStart}
-          onResponderTerminationRequest={
-            this._handleResponderTerminationRequest
-          }>
-          {scenes}
-        </View>
-        {this._renderNavigationBar()}
-      </View>
-    );
-  },
-
-  _getNavigationContext: function() {
-    if (!this._navigationContext) {
-      this._navigationContext = new NavigationContext();
-    }
-    return this._navigationContext;
-  }
-});
-
-module.exports = Navigator;
diff --git a/Libraries/CustomComponents/Navigator/NavigatorBreadcrumbNavigationBar.js b/Libraries/CustomComponents/Navigator/NavigatorBreadcrumbNavigationBar.js
deleted file mode 100644
index 7ddeafda2c6628..00000000000000
--- a/Libraries/CustomComponents/Navigator/NavigatorBreadcrumbNavigationBar.js
+++ /dev/null
@@ -1,318 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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.
- *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @providesModule NavigatorBreadcrumbNavigationBar
- */
-'use strict';
-
-const NavigatorBreadcrumbNavigationBarStyles = require('NavigatorBreadcrumbNavigationBarStyles');
-const NavigatorNavigationBarStylesAndroid = require('NavigatorNavigationBarStylesAndroid');
-const NavigatorNavigationBarStylesIOS = require('NavigatorNavigationBarStylesIOS');
-const Platform = require('Platform');
-const React = require('React');
-const StyleSheet = require('StyleSheet');
-const View = require('View');
-
-const ViewPropTypes = require('ViewPropTypes');
-
-const guid = require('guid');
-const invariant = require('fbjs/lib/invariant');
-
-const { Map } = require('immutable');
-
-const Interpolators = NavigatorBreadcrumbNavigationBarStyles.Interpolators;
-const NavigatorNavigationBarStyles = Platform.OS === 'android' ?
-  NavigatorNavigationBarStylesAndroid : NavigatorNavigationBarStylesIOS;
-const PropTypes = React.PropTypes;
-
-/**
- * Reusable props objects.
- */
-const CRUMB_PROPS = Interpolators.map(() => ({style: {}}));
-const ICON_PROPS = Interpolators.map(() => ({style: {}}));
-const SEPARATOR_PROPS = Interpolators.map(() => ({style: {}}));
-const TITLE_PROPS = Interpolators.map(() => ({style: {}}));
-const RIGHT_BUTTON_PROPS = Interpolators.map(() => ({style: {}}));
-
-
-function navStatePresentedIndex(navState) {
-  if (navState.presentedIndex !== undefined) {
-    return navState.presentedIndex;
-  }
-  // TODO: rename `observedTopOfStack` to `presentedIndex` in `NavigatorIOS`
-  return navState.observedTopOfStack;
-}
-
-
-/**
- * The first route is initially rendered using a different style than all
- * future routes.
- *
- * @param {number} index Index of breadcrumb.
- * @return {object} Style config for initial rendering of index.
- */
-function initStyle(index, presentedIndex) {
-  return index === presentedIndex ? NavigatorBreadcrumbNavigationBarStyles.Center[index] :
-    index < presentedIndex ? NavigatorBreadcrumbNavigationBarStyles.Left[index] :
-    NavigatorBreadcrumbNavigationBarStyles.Right[index];
-}
-
-class NavigatorBreadcrumbNavigationBar extends React.Component {
-  static propTypes = {
-    navigator: PropTypes.shape({
-      push: PropTypes.func,
-      pop: PropTypes.func,
-      replace: PropTypes.func,
-      popToRoute: PropTypes.func,
-      popToTop: PropTypes.func,
-    }),
-    routeMapper: PropTypes.shape({
-      rightContentForRoute: PropTypes.func,
-      titleContentForRoute: PropTypes.func,
-      iconForRoute: PropTypes.func,
-    }),
-    navState: React.PropTypes.shape({
-      routeStack: React.PropTypes.arrayOf(React.PropTypes.object),
-      presentedIndex: React.PropTypes.number,
-    }),
-    style: ViewPropTypes.style,
-  };
-
-  static Styles = NavigatorBreadcrumbNavigationBarStyles;
-
-  _updateIndexProgress(progress, index, fromIndex, toIndex) {
-    var amount = toIndex > fromIndex ? progress : (1 - progress);
-    var oldDistToCenter = index - fromIndex;
-    var newDistToCenter = index - toIndex;
-    var interpolate;
-    invariant(
-      Interpolators[index],
-      'Cannot find breadcrumb interpolators for ' + index
-    );
-    if (oldDistToCenter > 0 && newDistToCenter === 0 ||
-        newDistToCenter > 0 && oldDistToCenter === 0) {
-      interpolate = Interpolators[index].RightToCenter;
-    } else if (oldDistToCenter < 0 && newDistToCenter === 0 ||
-               newDistToCenter < 0 && oldDistToCenter === 0) {
-      interpolate = Interpolators[index].CenterToLeft;
-    } else if (oldDistToCenter === newDistToCenter) {
-      interpolate = Interpolators[index].RightToCenter;
-    } else {
-      interpolate = Interpolators[index].RightToLeft;
-    }
-
-    if (interpolate.Crumb(CRUMB_PROPS[index].style, amount)) {
-      this._setPropsIfExists('crumb_' + index, CRUMB_PROPS[index]);
-    }
-    if (interpolate.Icon(ICON_PROPS[index].style, amount)) {
-      this._setPropsIfExists('icon_' + index, ICON_PROPS[index]);
-    }
-    if (interpolate.Separator(SEPARATOR_PROPS[index].style, amount)) {
-      this._setPropsIfExists('separator_' + index, SEPARATOR_PROPS[index]);
-    }
-    if (interpolate.Title(TITLE_PROPS[index].style, amount)) {
-      this._setPropsIfExists('title_' + index, TITLE_PROPS[index]);
-    }
-    var right = this.refs['right_' + index];
-
-    const rightButtonStyle = RIGHT_BUTTON_PROPS[index].style;
-    if (right && interpolate.RightItem(rightButtonStyle, amount)) {
-      right.setNativeProps({
-        style: rightButtonStyle,
-        pointerEvents: rightButtonStyle.opacity === 0 ? 'none' : 'auto',
-      });
-    }
-  }
-
-  updateProgress(progress, fromIndex, toIndex) {
-    var max = Math.max(fromIndex, toIndex);
-    var min = Math.min(fromIndex, toIndex);
-    for (var index = min; index <= max; index++) {
-      this._updateIndexProgress(progress, index, fromIndex, toIndex);
-    }
-  }
-
-  onAnimationStart(fromIndex, toIndex) {
-    var max = Math.max(fromIndex, toIndex);
-    var min = Math.min(fromIndex, toIndex);
-    for (var index = min; index <= max; index++) {
-      this._setRenderViewsToHardwareTextureAndroid(index, true);
-    }
-  }
-
-  onAnimationEnd() {
-    var max = this.props.navState.routeStack.length - 1;
-    for (var index = 0; index <= max; index++) {
-      this._setRenderViewsToHardwareTextureAndroid(index, false);
-    }
-  }
-
-  _setRenderViewsToHardwareTextureAndroid(index, renderToHardwareTexture) {
-    var props = {
-      renderToHardwareTextureAndroid: renderToHardwareTexture,
-    };
-
-    this._setPropsIfExists('icon_' + index, props);
-    this._setPropsIfExists('separator_' + index, props);
-    this._setPropsIfExists('title_' + index, props);
-    this._setPropsIfExists('right_' + index, props);
-  }
-
-  componentWillMount() {
-    this._reset();
-  }
-
-  render() {
-    var navState = this.props.navState;
-    var icons = navState && navState.routeStack.map(this._getBreadcrumb);
-    var titles = navState.routeStack.map(this._getTitle);
-    var buttons = navState.routeStack.map(this._getRightButton);
-
-    return (
-      <View
-        key={this._key}
-        style={[styles.breadCrumbContainer, this.props.style]}>
-        {titles}
-        {icons}
-        {buttons}
-      </View>
-    );
-  }
-
-  immediatelyRefresh() {
-    this._reset();
-    this.forceUpdate();
-  }
-
-  _reset() {
-    this._key = guid();
-    this._descriptors = {
-      title: new Map(),
-      right: new Map(),
-    };
-  }
-
-  _getBreadcrumb = (route, index) => {
-    /**
-     * To prevent the case where titles on an empty navigation stack covers the first icon and
-     * becomes partially unpressable, we set the first breadcrumb to be unpressable by default, and
-     * make it pressable when there are multiple items in the stack.
-     */
-    const pointerEvents = (
-      (this.props.navState.routeStack.length <= 1 && index === 0) ?
-      'none' :
-      'auto'
-    );
-    const navBarRouteMapper = this.props.routeMapper;
-    const firstStyles = initStyle(index, navStatePresentedIndex(this.props.navState));
-
-    var breadcrumbDescriptor = (
-      <View
-        key={'crumb_' + index}
-        pointerEvents={pointerEvents}
-        ref={'crumb_' + index}
-        style={firstStyles.Crumb}>
-        <View ref={'icon_' + index} style={firstStyles.Icon}>
-          {navBarRouteMapper.iconForRoute(route, this.props.navigator)}
-        </View>
-        <View ref={'separator_' + index} style={firstStyles.Separator}>
-          {navBarRouteMapper.separatorForRoute(route, this.props.navigator)}
-        </View>
-      </View>
-    );
-
-    return breadcrumbDescriptor;
-  };
-
-  _getTitle = (route, index) => {
-    if (this._descriptors.title.has(route)) {
-      return this._descriptors.title.get(route);
-    }
-
-    var titleContent = this.props.routeMapper.titleContentForRoute(
-      this.props.navState.routeStack[index],
-      this.props.navigator
-    );
-    var firstStyles = initStyle(index, navStatePresentedIndex(this.props.navState));
-
-    var titleDescriptor = (
-      <View
-        key={'title_' + index}
-        ref={'title_' + index}
-        style={firstStyles.Title}>
-        {titleContent}
-      </View>
-    );
-    this._descriptors.title = this._descriptors.title.set(route, titleDescriptor);
-    return titleDescriptor;
-  };
-
-  _getRightButton = (route, index) => {
-    if (this._descriptors.right.has(route)) {
-      return this._descriptors.right.get(route);
-    }
-    var rightContent = this.props.routeMapper.rightContentForRoute(
-      this.props.navState.routeStack[index],
-      this.props.navigator
-    );
-    if (!rightContent) {
-      this._descriptors.right = this._descriptors.right.set(route, null);
-      return null;
-    }
-    var firstStyles = initStyle(index, navStatePresentedIndex(this.props.navState));
-    var rightButtonDescriptor = (
-      <View
-        key={'right_' + index}
-        ref={'right_' + index}
-        style={firstStyles.RightItem}>
-        {rightContent}
-      </View>
-    );
-    this._descriptors.right = this._descriptors.right.set(route, rightButtonDescriptor);
-    return rightButtonDescriptor;
-  };
-
-  _setPropsIfExists(ref, props) {
-    var ref = this.refs[ref];
-    ref && ref.setNativeProps(props);
-  }
-}
-
-const styles = StyleSheet.create({
-  breadCrumbContainer: {
-    overflow: 'hidden',
-    position: 'absolute',
-    height: NavigatorNavigationBarStyles.General.TotalNavHeight,
-    top: 0,
-    left: 0,
-    right: 0,
-  },
-});
-
-module.exports = NavigatorBreadcrumbNavigationBar;
diff --git a/Libraries/CustomComponents/Navigator/NavigatorBreadcrumbNavigationBarStyles.android.js b/Libraries/CustomComponents/Navigator/NavigatorBreadcrumbNavigationBarStyles.android.js
deleted file mode 100644
index 7ff687b49da6e6..00000000000000
--- a/Libraries/CustomComponents/Navigator/NavigatorBreadcrumbNavigationBarStyles.android.js
+++ /dev/null
@@ -1,223 +0,0 @@
-/**
- * Copyright (c) 2015, Facebook, Inc.  All rights reserved.
- *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @providesModule NavigatorBreadcrumbNavigationBarStyles
- */
-'use strict';
-
-var NavigatorNavigationBarStylesAndroid = require('NavigatorNavigationBarStylesAndroid');
-
-var buildStyleInterpolator = require('buildStyleInterpolator');
-var merge = require('merge');
-
-var NAV_BAR_HEIGHT = NavigatorNavigationBarStylesAndroid.General.NavBarHeight;
-
-var SPACING = 8;
-var ICON_WIDTH = 40;
-var SEPARATOR_WIDTH = 9;
-var CRUMB_WIDTH = ICON_WIDTH + SEPARATOR_WIDTH;
-var NAV_ELEMENT_HEIGHT = NAV_BAR_HEIGHT;
-
-var OPACITY_RATIO = 100;
-var ICON_INACTIVE_OPACITY = 0.6;
-var MAX_BREADCRUMBS = 10;
-
-var CRUMB_BASE = {
-  position: 'absolute',
-  flexDirection: 'row',
-  top: 0,
-  width: CRUMB_WIDTH,
-  height: NAV_ELEMENT_HEIGHT,
-  backgroundColor: 'transparent',
-};
-
-var ICON_BASE = {
-  width: ICON_WIDTH,
-  height: NAV_ELEMENT_HEIGHT,
-};
-
-var SEPARATOR_BASE = {
-  width: SEPARATOR_WIDTH,
-  height: NAV_ELEMENT_HEIGHT,
-};
-
-var TITLE_BASE = {
-  position: 'absolute',
-  top: 0,
-  height: NAV_ELEMENT_HEIGHT,
-  backgroundColor: 'transparent',
-  alignItems: 'flex-start',
-};
-
-var FIRST_TITLE_BASE = merge(TITLE_BASE, {
-  left: 0,
-  right: 0,
-});
-
-var RIGHT_BUTTON_BASE = {
-  position: 'absolute',
-  top: 0,
-  right: 0,
-  overflow: 'hidden',
-  opacity: 1,
-  height: NAV_ELEMENT_HEIGHT,
-  backgroundColor: 'transparent',
-};
-
-/**
- * Precompute crumb styles so that they don't need to be recomputed on every
- * interaction.
- */
-var LEFT = [];
-var CENTER = [];
-var RIGHT = [];
-for (var i = 0; i < MAX_BREADCRUMBS; i++) {
-  var crumbLeft = CRUMB_WIDTH * i + SPACING;
-  LEFT[i] = {
-    Crumb: merge(CRUMB_BASE, { left: crumbLeft }),
-    Icon: merge(ICON_BASE, { opacity: ICON_INACTIVE_OPACITY }),
-    Separator: merge(SEPARATOR_BASE, { opacity: 1 }),
-    Title: merge(TITLE_BASE, { left: crumbLeft, opacity: 0 }),
-    RightItem: merge(RIGHT_BUTTON_BASE, { opacity: 0 }),
-  };
-  CENTER[i] = {
-    Crumb: merge(CRUMB_BASE, { left: crumbLeft }),
-    Icon: merge(ICON_BASE, { opacity: 1 }),
-    Separator: merge(SEPARATOR_BASE, { opacity: 0 }),
-    Title: merge(TITLE_BASE, {
-      left: crumbLeft + ICON_WIDTH,
-      opacity: 1,
-    }),
-    RightItem: merge(RIGHT_BUTTON_BASE, { opacity: 1 }),
-  };
-  var crumbRight = crumbLeft + 50;
-  RIGHT[i] = {
-    Crumb: merge(CRUMB_BASE, { left: crumbRight}),
-    Icon: merge(ICON_BASE, { opacity: 0 }),
-    Separator: merge(SEPARATOR_BASE, { opacity: 0 }),
-    Title: merge(TITLE_BASE, {
-      left: crumbRight + ICON_WIDTH,
-      opacity: 0,
-    }),
-    RightItem: merge(RIGHT_BUTTON_BASE, { opacity: 0 }),
-  };
-}
-
-// Special case the CENTER state of the first scene.
-CENTER[0] = {
-  Crumb: merge(CRUMB_BASE, {left: SPACING + CRUMB_WIDTH}),
-  Icon: merge(ICON_BASE, {opacity: 0}),
-  Separator: merge(SEPARATOR_BASE, {opacity: 0}),
-  Title: merge(FIRST_TITLE_BASE, {opacity: 1}),
-  RightItem: CENTER[0].RightItem,
-};
-LEFT[0].Title = merge(FIRST_TITLE_BASE, {opacity: 0});
-RIGHT[0].Title = merge(FIRST_TITLE_BASE, {opacity: 0});
-
-
-var buildIndexSceneInterpolator = function(startStyles, endStyles) {
-  return {
-    Crumb: buildStyleInterpolator({
-      left: {
-        type: 'linear',
-        from: startStyles.Crumb.left,
-        to: endStyles.Crumb.left,
-        min: 0,
-        max: 1,
-        extrapolate: true,
-      },
-    }),
-    Icon: buildStyleInterpolator({
-      opacity: {
-        type: 'linear',
-        from: startStyles.Icon.opacity,
-        to: endStyles.Icon.opacity,
-        min: 0,
-        max: 1,
-      },
-    }),
-    Separator: buildStyleInterpolator({
-      opacity: {
-        type: 'linear',
-        from: startStyles.Separator.opacity,
-        to: endStyles.Separator.opacity,
-        min: 0,
-        max: 1,
-      },
-    }),
-    Title: buildStyleInterpolator({
-      opacity: {
-        type: 'linear',
-        from: startStyles.Title.opacity,
-        to: endStyles.Title.opacity,
-        min: 0,
-        max: 1,
-      },
-      left: {
-        type: 'linear',
-        from: startStyles.Title.left,
-        to: endStyles.Title.left,
-        min: 0,
-        max: 1,
-        extrapolate: true,
-      },
-    }),
-    RightItem: buildStyleInterpolator({
-      opacity: {
-        type: 'linear',
-        from: startStyles.RightItem.opacity,
-        to: endStyles.RightItem.opacity,
-        min: 0,
-        max: 1,
-        round: OPACITY_RATIO,
-      },
-    }),
-  };
-};
-
-var Interpolators = CENTER.map(function(_, ii) {
-  return {
-    // Animating *into* the center stage from the right
-    RightToCenter: buildIndexSceneInterpolator(RIGHT[ii], CENTER[ii]),
-    // Animating out of the center stage, to the left
-    CenterToLeft: buildIndexSceneInterpolator(CENTER[ii], LEFT[ii]),
-    // Both stages (animating *past* the center stage)
-    RightToLeft: buildIndexSceneInterpolator(RIGHT[ii], LEFT[ii]),
-  };
-});
-
-/**
- * Contains constants that are used in constructing both `StyleSheet`s and
- * inline styles during transitions.
- */
-module.exports = {
-  Interpolators,
-  Left: LEFT,
-  Center: CENTER,
-  Right: RIGHT,
-  IconWidth: ICON_WIDTH,
-  IconHeight: NAV_BAR_HEIGHT,
-  SeparatorWidth: SEPARATOR_WIDTH,
-  SeparatorHeight: NAV_BAR_HEIGHT,
-};
diff --git a/Libraries/CustomComponents/Navigator/NavigatorBreadcrumbNavigationBarStyles.ios.js b/Libraries/CustomComponents/Navigator/NavigatorBreadcrumbNavigationBarStyles.ios.js
deleted file mode 100644
index eea15eee9bec52..00000000000000
--- a/Libraries/CustomComponents/Navigator/NavigatorBreadcrumbNavigationBarStyles.ios.js
+++ /dev/null
@@ -1,227 +0,0 @@
-/**
- * Copyright (c) 2015, Facebook, Inc.  All rights reserved.
- *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @providesModule NavigatorBreadcrumbNavigationBarStyles
- */
-'use strict';
-
-var Dimensions = require('Dimensions');
-var NavigatorNavigationBarStylesIOS = require('NavigatorNavigationBarStylesIOS');
-
-var buildStyleInterpolator = require('buildStyleInterpolator');
-var merge = require('merge');
-
-var SCREEN_WIDTH = Dimensions.get('window').width;
-var STATUS_BAR_HEIGHT = NavigatorNavigationBarStylesIOS.General.StatusBarHeight;
-var NAV_BAR_HEIGHT = NavigatorNavigationBarStylesIOS.General.NavBarHeight;
-
-var SPACING = 4;
-var ICON_WIDTH = 40;
-var SEPARATOR_WIDTH = 9;
-var CRUMB_WIDTH = ICON_WIDTH + SEPARATOR_WIDTH;
-
-var OPACITY_RATIO = 100;
-var ICON_INACTIVE_OPACITY = 0.6;
-var MAX_BREADCRUMBS = 10;
-
-var CRUMB_BASE = {
-  position: 'absolute',
-  flexDirection: 'row',
-  top: STATUS_BAR_HEIGHT,
-  width: CRUMB_WIDTH,
-  height: NAV_BAR_HEIGHT,
-  backgroundColor: 'transparent',
-};
-
-var ICON_BASE = {
-  width: ICON_WIDTH,
-  height: NAV_BAR_HEIGHT,
-};
-
-var SEPARATOR_BASE = {
-  width: SEPARATOR_WIDTH,
-  height: NAV_BAR_HEIGHT,
-};
-
-var TITLE_BASE = {
-  position: 'absolute',
-  top: STATUS_BAR_HEIGHT,
-  height: NAV_BAR_HEIGHT,
-  backgroundColor: 'transparent',
-};
-
-// For first title styles, make sure first title is centered
-var FIRST_TITLE_BASE = merge(TITLE_BASE, {
-  left: 0,
-  right: 0,
-  alignItems: 'center',
-  height: NAV_BAR_HEIGHT,
-});
-
-var RIGHT_BUTTON_BASE = {
-  position: 'absolute',
-  top: STATUS_BAR_HEIGHT,
-  right: SPACING,
-  overflow: 'hidden',
-  opacity: 1,
-  height: NAV_BAR_HEIGHT,
-  backgroundColor: 'transparent',
-};
-
-/**
- * Precompute crumb styles so that they don't need to be recomputed on every
- * interaction.
- */
-var LEFT = [];
-var CENTER = [];
-var RIGHT = [];
-for (var i = 0; i < MAX_BREADCRUMBS; i++) {
-  var crumbLeft = CRUMB_WIDTH * i + SPACING;
-  LEFT[i] = {
-    Crumb: merge(CRUMB_BASE, { left: crumbLeft }),
-    Icon: merge(ICON_BASE, { opacity: ICON_INACTIVE_OPACITY }),
-    Separator: merge(SEPARATOR_BASE, { opacity: 1 }),
-    Title: merge(TITLE_BASE, { left: crumbLeft, opacity: 0 }),
-    RightItem: merge(RIGHT_BUTTON_BASE, { opacity: 0 }),
-  };
-  CENTER[i] = {
-    Crumb: merge(CRUMB_BASE, { left: crumbLeft }),
-    Icon: merge(ICON_BASE, { opacity: 1 }),
-    Separator: merge(SEPARATOR_BASE, { opacity: 0 }),
-    Title: merge(TITLE_BASE, {
-      left: crumbLeft + ICON_WIDTH,
-      opacity: 1,
-    }),
-    RightItem: merge(RIGHT_BUTTON_BASE, { opacity: 1 }),
-  };
-  var crumbRight = SCREEN_WIDTH - 100;
-  RIGHT[i] = {
-    Crumb: merge(CRUMB_BASE, { left: crumbRight}),
-    Icon: merge(ICON_BASE, { opacity: 0 }),
-    Separator: merge(SEPARATOR_BASE, { opacity: 0 }),
-    Title: merge(TITLE_BASE, {
-      left: crumbRight + ICON_WIDTH,
-      opacity: 0,
-    }),
-    RightItem: merge(RIGHT_BUTTON_BASE, { opacity: 0 }),
-  };
-}
-
-// Special case the CENTER state of the first scene.
-CENTER[0] = {
-  Crumb: merge(CRUMB_BASE, {left: SCREEN_WIDTH / 4}),
-  Icon: merge(ICON_BASE, {opacity: 0}),
-  Separator: merge(SEPARATOR_BASE, {opacity: 0}),
-  Title: merge(FIRST_TITLE_BASE, {opacity: 1}),
-  RightItem: CENTER[0].RightItem,
-};
-LEFT[0].Title = merge(FIRST_TITLE_BASE, {left: -SCREEN_WIDTH / 4, opacity: 0});
-RIGHT[0].Title = merge(FIRST_TITLE_BASE, {opacity: 0});
-
-
-var buildIndexSceneInterpolator = function(startStyles, endStyles) {
-  return {
-    Crumb: buildStyleInterpolator({
-      left: {
-        type: 'linear',
-        from: startStyles.Crumb.left,
-        to: endStyles.Crumb.left,
-        min: 0,
-        max: 1,
-        extrapolate: true,
-      },
-    }),
-    Icon: buildStyleInterpolator({
-      opacity: {
-        type: 'linear',
-        from: startStyles.Icon.opacity,
-        to: endStyles.Icon.opacity,
-        min: 0,
-        max: 1,
-      },
-    }),
-    Separator: buildStyleInterpolator({
-      opacity: {
-        type: 'linear',
-        from: startStyles.Separator.opacity,
-        to: endStyles.Separator.opacity,
-        min: 0,
-        max: 1,
-      },
-    }),
-    Title: buildStyleInterpolator({
-      opacity: {
-        type: 'linear',
-        from: startStyles.Title.opacity,
-        to: endStyles.Title.opacity,
-        min: 0,
-        max: 1,
-      },
-      left: {
-        type: 'linear',
-        from: startStyles.Title.left,
-        to: endStyles.Title.left,
-        min: 0,
-        max: 1,
-        extrapolate: true,
-      },
-    }),
-    RightItem: buildStyleInterpolator({
-      opacity: {
-        type: 'linear',
-        from: startStyles.RightItem.opacity,
-        to: endStyles.RightItem.opacity,
-        min: 0,
-        max: 1,
-        round: OPACITY_RATIO,
-      },
-    }),
-  };
-};
-
-var Interpolators = CENTER.map(function(_, ii) {
-  return {
-    // Animating *into* the center stage from the right
-    RightToCenter: buildIndexSceneInterpolator(RIGHT[ii], CENTER[ii]),
-    // Animating out of the center stage, to the left
-    CenterToLeft: buildIndexSceneInterpolator(CENTER[ii], LEFT[ii]),
-    // Both stages (animating *past* the center stage)
-    RightToLeft: buildIndexSceneInterpolator(RIGHT[ii], LEFT[ii]),
-  };
-});
-
-/**
- * Contains constants that are used in constructing both `StyleSheet`s and
- * inline styles during transitions.
- */
-module.exports = {
-  Interpolators,
-  Left: LEFT,
-  Center: CENTER,
-  Right: RIGHT,
-  IconWidth: ICON_WIDTH,
-  IconHeight: NAV_BAR_HEIGHT,
-  SeparatorWidth: SEPARATOR_WIDTH,
-  SeparatorHeight: NAV_BAR_HEIGHT,
-};
diff --git a/Libraries/CustomComponents/Navigator/NavigatorNavigationBar.js b/Libraries/CustomComponents/Navigator/NavigatorNavigationBar.js
deleted file mode 100644
index 9df140d45df79d..00000000000000
--- a/Libraries/CustomComponents/Navigator/NavigatorNavigationBar.js
+++ /dev/null
@@ -1,224 +0,0 @@
-/**
- * Copyright (c) 2015, Facebook, Inc.  All rights reserved.
- *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @providesModule NavigatorNavigationBar
- */
-'use strict';
-
-var React = require('React');
-var NavigatorNavigationBarStylesAndroid = require('NavigatorNavigationBarStylesAndroid');
-var NavigatorNavigationBarStylesIOS = require('NavigatorNavigationBarStylesIOS');
-var Platform = require('Platform');
-var StyleSheet = require('StyleSheet');
-var View = require('View');
-
-const ViewPropTypes = require('ViewPropTypes');
-
-var guid = require('guid');
-
-var { Map } = require('immutable');
-
-var COMPONENT_NAMES = ['Title', 'LeftButton', 'RightButton'];
-
-var NavigatorNavigationBarStyles = Platform.OS === 'android' ?
-  NavigatorNavigationBarStylesAndroid : NavigatorNavigationBarStylesIOS;
-
-var navStatePresentedIndex = function(navState) {
-  if (navState.presentedIndex !== undefined) {
-    return navState.presentedIndex;
-  }
-  // TODO: rename `observedTopOfStack` to `presentedIndex` in `NavigatorIOS`
-  return navState.observedTopOfStack;
-};
-
-class NavigatorNavigationBar extends React.Component {
-  static propTypes = {
-    navigator: React.PropTypes.object,
-    routeMapper: React.PropTypes.shape({
-      Title: React.PropTypes.func.isRequired,
-      LeftButton: React.PropTypes.func.isRequired,
-      RightButton: React.PropTypes.func.isRequired,
-    }).isRequired,
-    navState: React.PropTypes.shape({
-      routeStack: React.PropTypes.arrayOf(React.PropTypes.object),
-      presentedIndex: React.PropTypes.number,
-    }),
-    navigationStyles: React.PropTypes.object,
-    style: ViewPropTypes.style,
-  };
-
-  static Styles = NavigatorNavigationBarStyles;
-  static StylesAndroid = NavigatorNavigationBarStylesAndroid;
-  static StylesIOS = NavigatorNavigationBarStylesIOS;
-
-  static defaultProps = {
-    navigationStyles: NavigatorNavigationBarStyles,
-  };
-
-  componentWillMount() {
-    this._reset();
-  }
-
-  /**
-   * Stop transtion, immediately resets the cached state and re-render the
-   * whole view.
-   */
-  immediatelyRefresh = () => {
-    this._reset();
-    this.forceUpdate();
-  };
-
-  _reset = () => {
-    this._key = guid();
-    this._reusableProps = {};
-    this._components = {};
-    this._descriptors = {};
-
-    COMPONENT_NAMES.forEach(componentName => {
-      this._components[componentName] = new Map();
-      this._descriptors[componentName] = new Map();
-    });
-  };
-
-  _getReusableProps = (/*string*/componentName, /*number*/index) => /*object*/ {
-    var propStack = this._reusableProps[componentName];
-    if (!propStack) {
-      propStack = this._reusableProps[componentName] = [];
-    }
-    var props = propStack[index];
-    if (!props) {
-      props = propStack[index] = {style:{}};
-    }
-    return props;
-  };
-
-  _updateIndexProgress = (
-    /*number*/progress,
-    /*number*/index,
-    /*number*/fromIndex,
-    /*number*/toIndex,
-  ) => {
-    var amount = toIndex > fromIndex ? progress : (1 - progress);
-    var oldDistToCenter = index - fromIndex;
-    var newDistToCenter = index - toIndex;
-    var interpolate;
-    if (oldDistToCenter > 0 && newDistToCenter === 0 ||
-        newDistToCenter > 0 && oldDistToCenter === 0) {
-      interpolate = this.props.navigationStyles.Interpolators.RightToCenter;
-    } else if (oldDistToCenter < 0 && newDistToCenter === 0 ||
-               newDistToCenter < 0 && oldDistToCenter === 0) {
-      interpolate = this.props.navigationStyles.Interpolators.CenterToLeft;
-    } else if (oldDistToCenter === newDistToCenter) {
-      interpolate = this.props.navigationStyles.Interpolators.RightToCenter;
-    } else {
-      interpolate = this.props.navigationStyles.Interpolators.RightToLeft;
-    }
-
-    COMPONENT_NAMES.forEach(function (componentName) {
-      var component = this._components[componentName].get(this.props.navState.routeStack[index]);
-      var props = this._getReusableProps(componentName, index);
-      if (component && interpolate[componentName](props.style, amount)) {
-        props.pointerEvents = props.style.opacity === 0 ? 'none' : 'box-none';
-        component.setNativeProps(props);
-      }
-    }, this);
-  };
-
-  updateProgress = (/*number*/progress, /*number*/fromIndex, /*number*/toIndex) => {
-    var max = Math.max(fromIndex, toIndex);
-    var min = Math.min(fromIndex, toIndex);
-    for (var index = min; index <= max; index++) {
-      this._updateIndexProgress(progress, index, fromIndex, toIndex);
-    }
-  };
-
-  render() {
-    var navBarStyle = {
-      height: this.props.navigationStyles.General.TotalNavHeight,
-    };
-    var navState = this.props.navState;
-    var components = navState.routeStack.map((route, index) =>
-      COMPONENT_NAMES.map(componentName =>
-        this._getComponent(componentName, route, index)
-      )
-    );
-
-    return (
-      <View
-        key={this._key}
-        style={[styles.navBarContainer, navBarStyle, this.props.style]}>
-        {components}
-      </View>
-    );
-  }
-
-  _getComponent = (/*string*/componentName, /*object*/route, /*number*/index) => /*?Object*/ {
-    if (this._descriptors[componentName].includes(route)) {
-      return this._descriptors[componentName].get(route);
-    }
-
-    var rendered = null;
-
-    var content = this.props.routeMapper[componentName](
-      this.props.navState.routeStack[index],
-      this.props.navigator,
-      index,
-      this.props.navState
-    );
-    if (!content) {
-      return null;
-    }
-
-    var componentIsActive = index === navStatePresentedIndex(this.props.navState);
-    var initialStage = componentIsActive ?
-      this.props.navigationStyles.Stages.Center :
-      this.props.navigationStyles.Stages.Left;
-    rendered = (
-      <View
-        ref={(ref) => {
-          this._components[componentName] = this._components[componentName].set(route, ref);
-        }}
-        pointerEvents={componentIsActive ? 'box-none' : 'none'}
-        style={initialStage[componentName]}>
-        {content}
-      </View>
-    );
-
-    this._descriptors[componentName] = this._descriptors[componentName].set(route, rendered);
-    return rendered;
-  };
-}
-
-
-var styles = StyleSheet.create({
-  navBarContainer: {
-    position: 'absolute',
-    top: 0,
-    left: 0,
-    right: 0,
-    backgroundColor: 'transparent',
-  },
-});
-
-module.exports = NavigatorNavigationBar;
diff --git a/Libraries/CustomComponents/Navigator/NavigatorNavigationBarStylesAndroid.js b/Libraries/CustomComponents/Navigator/NavigatorNavigationBarStylesAndroid.js
deleted file mode 100644
index 42db9a9d926848..00000000000000
--- a/Libraries/CustomComponents/Navigator/NavigatorNavigationBarStylesAndroid.js
+++ /dev/null
@@ -1,175 +0,0 @@
-/**
- * Copyright (c) 2015, Facebook, Inc.  All rights reserved.
- *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @providesModule NavigatorNavigationBarStylesAndroid
- */
-'use strict';
-
-var buildStyleInterpolator = require('buildStyleInterpolator');
-var merge = require('merge');
-
-// Android Material Design
-var NAV_BAR_HEIGHT = 56;
-var TITLE_LEFT = 72;
-var BUTTON_SIZE = 24;
-var TOUCH_TARGT_SIZE = 48;
-var BUTTON_HORIZONTAL_MARGIN = 16;
-
-var BUTTON_EFFECTIVE_MARGIN = BUTTON_HORIZONTAL_MARGIN - (TOUCH_TARGT_SIZE - BUTTON_SIZE) / 2;
-var NAV_ELEMENT_HEIGHT = NAV_BAR_HEIGHT;
-
-var BASE_STYLES = {
-  Title: {
-    position: 'absolute',
-    bottom: 0,
-    left: 0,
-    right: 0,
-    alignItems: 'flex-start',
-    height: NAV_ELEMENT_HEIGHT,
-    backgroundColor: 'transparent',
-    marginLeft: TITLE_LEFT,
-  },
-  LeftButton: {
-    position: 'absolute',
-    top: 0,
-    left: BUTTON_EFFECTIVE_MARGIN,
-    overflow: 'hidden',
-    height: NAV_ELEMENT_HEIGHT,
-    backgroundColor: 'transparent',
-  },
-  RightButton: {
-    position: 'absolute',
-    top: 0,
-    right: BUTTON_EFFECTIVE_MARGIN,
-    overflow: 'hidden',
-    alignItems: 'flex-end',
-    height: NAV_ELEMENT_HEIGHT,
-    backgroundColor: 'transparent',
-  },
-};
-
-// There are 3 stages: left, center, right. All previous navigation
-// items are in the left stage. The current navigation item is in the
-// center stage. All upcoming navigation items are in the right stage.
-// Another way to think of the stages is in terms of transitions. When
-// we move forward in the navigation stack, we perform a
-// right-to-center transition on the new navigation item and a
-// center-to-left transition on the current navigation item.
-var Stages = {
-  Left: {
-    Title: merge(BASE_STYLES.Title, { opacity: 0 }),
-    LeftButton: merge(BASE_STYLES.LeftButton, { opacity: 0 }),
-    RightButton: merge(BASE_STYLES.RightButton, { opacity: 0 }),
-  },
-  Center: {
-    Title: merge(BASE_STYLES.Title, { opacity: 1 }),
-    LeftButton: merge(BASE_STYLES.LeftButton, { opacity: 1 }),
-    RightButton: merge(BASE_STYLES.RightButton, { opacity: 1 }),
-  },
-  Right: {
-    Title: merge(BASE_STYLES.Title, { opacity: 0 }),
-    LeftButton: merge(BASE_STYLES.LeftButton, { opacity: 0 }),
-    RightButton: merge(BASE_STYLES.RightButton, { opacity: 0 }),
-  },
-};
-
-
-var opacityRatio = 100;
-
-function buildSceneInterpolators(startStyles, endStyles) {
-  return {
-    Title: buildStyleInterpolator({
-      opacity: {
-        type: 'linear',
-        from: startStyles.Title.opacity,
-        to: endStyles.Title.opacity,
-        min: 0,
-        max: 1,
-      },
-      left: {
-        type: 'linear',
-        from: startStyles.Title.left,
-        to: endStyles.Title.left,
-        min: 0,
-        max: 1,
-        extrapolate: true,
-      },
-    }),
-    LeftButton: buildStyleInterpolator({
-      opacity: {
-        type: 'linear',
-        from: startStyles.LeftButton.opacity,
-        to: endStyles.LeftButton.opacity,
-        min: 0,
-        max: 1,
-        round: opacityRatio,
-      },
-      left: {
-        type: 'linear',
-        from: startStyles.LeftButton.left,
-        to: endStyles.LeftButton.left,
-        min: 0,
-        max: 1,
-      },
-    }),
-    RightButton: buildStyleInterpolator({
-      opacity: {
-        type: 'linear',
-        from: startStyles.RightButton.opacity,
-        to: endStyles.RightButton.opacity,
-        min: 0,
-        max: 1,
-        round: opacityRatio,
-      },
-      left: {
-        type: 'linear',
-        from: startStyles.RightButton.left,
-        to: endStyles.RightButton.left,
-        min: 0,
-        max: 1,
-        extrapolate: true,
-      },
-    }),
-  };
-}
-
-var Interpolators = {
-  // Animating *into* the center stage from the right
-  RightToCenter: buildSceneInterpolators(Stages.Right, Stages.Center),
-  // Animating out of the center stage, to the left
-  CenterToLeft: buildSceneInterpolators(Stages.Center, Stages.Left),
-  // Both stages (animating *past* the center stage)
-  RightToLeft: buildSceneInterpolators(Stages.Right, Stages.Left),
-};
-
-
-module.exports = {
-  General: {
-    NavBarHeight: NAV_BAR_HEIGHT,
-    StatusBarHeight: 0,
-    TotalNavHeight: NAV_BAR_HEIGHT,
-  },
-  Interpolators,
-  Stages,
-};
diff --git a/Libraries/CustomComponents/Navigator/NavigatorNavigationBarStylesIOS.js b/Libraries/CustomComponents/Navigator/NavigatorNavigationBarStylesIOS.js
deleted file mode 100644
index 8163d49674a7f0..00000000000000
--- a/Libraries/CustomComponents/Navigator/NavigatorNavigationBarStylesIOS.js
+++ /dev/null
@@ -1,173 +0,0 @@
-/**
- * Copyright (c) 2015, Facebook, Inc.  All rights reserved.
- *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @providesModule NavigatorNavigationBarStylesIOS
- */
-'use strict';
-
-var Dimensions = require('Dimensions');
-
-var buildStyleInterpolator = require('buildStyleInterpolator');
-var merge = require('merge');
-
-var SCREEN_WIDTH = Dimensions.get('window').width;
-var NAV_BAR_HEIGHT = 44;
-var STATUS_BAR_HEIGHT = 20;
-var NAV_HEIGHT = NAV_BAR_HEIGHT + STATUS_BAR_HEIGHT;
-
-var BASE_STYLES = {
-  Title: {
-    position: 'absolute',
-    top: STATUS_BAR_HEIGHT,
-    left: 0,
-    right: 0,
-    alignItems: 'center',
-    height: NAV_BAR_HEIGHT,
-    backgroundColor: 'transparent',
-  },
-  LeftButton: {
-    position: 'absolute',
-    top: STATUS_BAR_HEIGHT,
-    left: 0,
-    overflow: 'hidden',
-    opacity: 1,
-    height: NAV_BAR_HEIGHT,
-    backgroundColor: 'transparent',
-  },
-  RightButton: {
-    position: 'absolute',
-    top: STATUS_BAR_HEIGHT,
-    right: 0,
-    overflow: 'hidden',
-    opacity: 1,
-    alignItems: 'flex-end',
-    height: NAV_BAR_HEIGHT,
-    backgroundColor: 'transparent',
-  },
-};
-
-// There are 3 stages: left, center, right. All previous navigation
-// items are in the left stage. The current navigation item is in the
-// center stage. All upcoming navigation items are in the right stage.
-// Another way to think of the stages is in terms of transitions. When
-// we move forward in the navigation stack, we perform a
-// right-to-center transition on the new navigation item and a
-// center-to-left transition on the current navigation item.
-var Stages = {
-  Left: {
-    Title: merge(BASE_STYLES.Title, { left: -SCREEN_WIDTH / 2, opacity: 0 }),
-    LeftButton: merge(BASE_STYLES.LeftButton, { left: 0, opacity: 0 }),
-    RightButton: merge(BASE_STYLES.RightButton, { opacity: 0 }),
-  },
-  Center: {
-    Title: merge(BASE_STYLES.Title, { left: 0, opacity: 1 }),
-    LeftButton: merge(BASE_STYLES.LeftButton, { left: 0, opacity: 1 }),
-    RightButton: merge(BASE_STYLES.RightButton, { opacity: 1 }),
-  },
-  Right: {
-    Title: merge(BASE_STYLES.Title, { left: SCREEN_WIDTH / 2, opacity: 0 }),
-    LeftButton: merge(BASE_STYLES.LeftButton, { left: 0, opacity: 0 }),
-    RightButton: merge(BASE_STYLES.RightButton, { opacity: 0 }),
-  },
-};
-
-
-var opacityRatio = 100;
-
-function buildSceneInterpolators(startStyles, endStyles) {
-  return {
-    Title: buildStyleInterpolator({
-      opacity: {
-        type: 'linear',
-        from: startStyles.Title.opacity,
-        to: endStyles.Title.opacity,
-        min: 0,
-        max: 1,
-      },
-      left: {
-        type: 'linear',
-        from: startStyles.Title.left,
-        to: endStyles.Title.left,
-        min: 0,
-        max: 1,
-        extrapolate: true,
-      },
-    }),
-    LeftButton: buildStyleInterpolator({
-      opacity: {
-        type: 'linear',
-        from: startStyles.LeftButton.opacity,
-        to: endStyles.LeftButton.opacity,
-        min: 0,
-        max: 1,
-        round: opacityRatio,
-      },
-      left: {
-        type: 'linear',
-        from: startStyles.LeftButton.left,
-        to: endStyles.LeftButton.left,
-        min: 0,
-        max: 1,
-      },
-    }),
-    RightButton: buildStyleInterpolator({
-      opacity: {
-        type: 'linear',
-        from: startStyles.RightButton.opacity,
-        to: endStyles.RightButton.opacity,
-        min: 0,
-        max: 1,
-        round: opacityRatio,
-      },
-      left: {
-        type: 'linear',
-        from: startStyles.RightButton.left,
-        to: endStyles.RightButton.left,
-        min: 0,
-        max: 1,
-        extrapolate: true,
-      },
-    }),
-  };
-}
-
-var Interpolators = {
-  // Animating *into* the center stage from the right
-  RightToCenter: buildSceneInterpolators(Stages.Right, Stages.Center),
-  // Animating out of the center stage, to the left
-  CenterToLeft: buildSceneInterpolators(Stages.Center, Stages.Left),
-  // Both stages (animating *past* the center stage)
-  RightToLeft: buildSceneInterpolators(Stages.Right, Stages.Left),
-};
-
-
-module.exports = {
-  General: {
-    NavBarHeight: NAV_BAR_HEIGHT,
-    StatusBarHeight: STATUS_BAR_HEIGHT,
-    TotalNavHeight: NAV_HEIGHT,
-  },
-  Interpolators,
-  Stages,
-};
diff --git a/Libraries/CustomComponents/Navigator/NavigatorSceneConfigs.js b/Libraries/CustomComponents/Navigator/NavigatorSceneConfigs.js
deleted file mode 100644
index eeacd4993a05f2..00000000000000
--- a/Libraries/CustomComponents/Navigator/NavigatorSceneConfigs.js
+++ /dev/null
@@ -1,788 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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.
- *
- * Facebook, Inc. ("Facebook") owns all right, title and interest, including
- * all intellectual property and other proprietary rights, in and to the React
- * Native CustomComponents software (the "Software").  Subject to your
- * compliance with these terms, you are hereby granted a non-exclusive,
- * worldwide, royalty-free copyright license to (1) use and copy the Software;
- * and (2) reproduce and distribute the Software as part of your own software
- * ("Your Software").  Facebook reserves all rights not expressly granted to
- * you in this license agreement.
- *
- * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.
- * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR
- * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @providesModule NavigatorSceneConfigs
- */
-'use strict';
-
-var Dimensions = require('Dimensions');
-var I18nManager = require('I18nManager');
-var PixelRatio = require('PixelRatio');
-
-var buildStyleInterpolator = require('buildStyleInterpolator');
-
-var IS_RTL = I18nManager.isRTL;
-
-var SCREEN_WIDTH = Dimensions.get('window').width;
-var SCREEN_HEIGHT = Dimensions.get('window').height;
-var PIXEL_RATIO = PixelRatio.get();
-
-var ToTheLeftIOS = {
-  transformTranslate: {
-    from: {x: 0, y: 0, z: 0},
-    to: {x: -SCREEN_WIDTH * 0.3, y: 0, z: 0},
-    min: 0,
-    max: 1,
-    type: 'linear',
-    extrapolate: true,
-    round: PIXEL_RATIO,
-  },
-  opacity: {
-    value: 1.0,
-    type: 'constant',
-  },
-};
-
-var ToTheRightIOS = {
-  ...ToTheLeftIOS,
-  transformTranslate: {
-    from: {x: 0, y: 0, z: 0},
-    to: {x: SCREEN_WIDTH * 0.3, y: 0, z: 0},
-  },
-};
-
-var FadeToTheLeft = {
-  // Rotate *requires* you to break out each individual component of
-  // rotation (x, y, z, w)
-  transformTranslate: {
-    from: {x: 0, y: 0, z: 0},
-    to: {x: -Math.round(SCREEN_WIDTH * 0.3), y: 0, z: 0},
-    min: 0,
-    max: 1,
-    type: 'linear',
-    extrapolate: true,
-    round: PIXEL_RATIO,
-  },
-  // Uncomment to try rotation:
-  // Quick guide to reasoning about rotations:
-  // http://www.opengl-tutorial.org/intermediate-tutorials/tutorial-17-quaternions/#Quaternions
-  // transformRotateRadians: {
-  //   from: {x: 0, y: 0, z: 0, w: 1},
-  //   to: {x: 0, y: 0, z: -0.47, w: 0.87},
-  //   min: 0,
-  //   max: 1,
-  //   type: 'linear',
-  //   extrapolate: true
-  // },
-  transformScale: {
-    from: {x: 1, y: 1, z: 1},
-    to: {x: 0.95, y: 0.95, z: 1},
-    min: 0,
-    max: 1,
-    type: 'linear',
-    extrapolate: true
-  },
-  opacity: {
-    from: 1,
-    to: 0.3,
-    min: 0,
-    max: 1,
-    type: 'linear',
-    extrapolate: false,
-    round: 100,
-  },
-  translateX: {
-    from: 0,
-    to: -Math.round(SCREEN_WIDTH * 0.3),
-    min: 0,
-    max: 1,
-    type: 'linear',
-    extrapolate: true,
-    round: PIXEL_RATIO,
-  },
-  scaleX: {
-    from: 1,
-    to: 0.95,
-    min: 0,
-    max: 1,
-    type: 'linear',
-    extrapolate: true
-  },
-  scaleY: {
-    from: 1,
-    to: 0.95,
-    min: 0,
-    max: 1,
-    type: 'linear',
-    extrapolate: true
-  },
-};
-
-var FadeToTheRight = {
-  ...FadeToTheLeft,
-  transformTranslate: {
-    from: {x: 0, y: 0, z: 0},
-    to: {x: Math.round(SCREEN_WIDTH * 0.3), y: 0, z: 0},
-  },
-  translateX: {
-    from: 0,
-    to: Math.round(SCREEN_WIDTH * 0.3),
-  },
-};
-
-var FadeIn = {
-  opacity: {
-    from: 0,
-    to: 1,
-    min: 0.5,
-    max: 1,
-    type: 'linear',
-    extrapolate: false,
-    round: 100,
-  },
-};
-
-var FadeOut = {
-  opacity: {
-    from: 1,
-    to: 0,
-    min: 0,
-    max: 0.5,
-    type: 'linear',
-    extrapolate: false,
-    round: 100,
-  },
-};
-
-var ToTheLeft = {
-  transformTranslate: {
-    from: {x: 0, y: 0, z: 0},
-    to: {x: -SCREEN_WIDTH, y: 0, z: 0},
-    min: 0,
-    max: 1,
-    type: 'linear',
-    extrapolate: true,
-    round: PIXEL_RATIO,
-  },
-  opacity: {
-    value: 1.0,
-    type: 'constant',
-  },
-
-  translateX: {
-    from: 0,
-    to: -SCREEN_WIDTH,
-    min: 0,
-    max: 1,
-    type: 'linear',
-    extrapolate: true,
-    round: PIXEL_RATIO,
-  },
-};
-
-var ToTheRight = {
-  transformTranslate: {
-    from: {x: 0, y: 0, z: 0},
-    to: {x: SCREEN_WIDTH, y: 0, z: 0},
-    min: 0,
-    max: 1,
-    type: 'linear',
-    extrapolate: true,
-    round: PIXEL_RATIO,
-  },
-  opacity: {
-    value: 1.0,
-    type: 'constant',
-  },
-
-  translateX: {
-    from: 0,
-    to: SCREEN_WIDTH,
-    min: 0,
-    max: 1,
-    type: 'linear',
-    extrapolate: true,
-    round: PIXEL_RATIO,
-  },
-};
-
-var ToTheUp = {
-  transformTranslate: {
-    from: {x: 0, y: 0, z: 0},
-    to: {x: 0, y: -SCREEN_HEIGHT, z: 0},
-    min: 0,
-    max: 1,
-    type: 'linear',
-    extrapolate: true,
-    round: PIXEL_RATIO,
-  },
-  opacity: {
-    value: 1.0,
-    type: 'constant',
-  },
-  translateY: {
-    from: 0,
-    to: -SCREEN_HEIGHT,
-    min: 0,
-    max: 1,
-    type: 'linear',
-    extrapolate: true,
-    round: PIXEL_RATIO,
-  },
-};
-
-var ToTheDown = {
-  transformTranslate: {
-    from: {x: 0, y: 0, z: 0},
-    to: {x: 0, y: SCREEN_HEIGHT, z: 0},
-    min: 0,
-    max: 1,
-    type: 'linear',
-    extrapolate: true,
-    round: PIXEL_RATIO,
-  },
-  opacity: {
-    value: 1.0,
-    type: 'constant',
-  },
-  translateY: {
-    from: 0,
-    to: SCREEN_HEIGHT,
-    min: 0,
-    max: 1,
-    type: 'linear',
-    extrapolate: true,
-    round: PIXEL_RATIO,
-  },
-};
-
-var FromTheRight = {
-  opacity: {
-    value: 1.0,
-    type: 'constant',
-  },
-
-  transformTranslate: {
-    from: {x: SCREEN_WIDTH, y: 0, z: 0},
-    to: {x: 0, y: 0, z: 0},
-    min: 0,
-    max: 1,
-    type: 'linear',
-    extrapolate: true,
-    round: PIXEL_RATIO,
-  },
-
-  translateX: {
-    from: SCREEN_WIDTH,
-    to: 0,
-    min: 0,
-    max: 1,
-    type: 'linear',
-    extrapolate: true,
-    round: PIXEL_RATIO,
-  },
-
-  scaleX: {
-    value: 1,
-    type: 'constant',
-  },
-  scaleY: {
-    value: 1,
-    type: 'constant',
-  },
-};
-
-var FromTheLeft = {
-  ...FromTheRight,
-  transformTranslate: {
-    from: {x: -SCREEN_WIDTH, y: 0, z: 0},
-    to: {x: 0, y: 0, z: 0},
-    min: 0,
-    max: 1,
-    type: 'linear',
-    extrapolate: true,
-    round: PIXEL_RATIO,
-  },
-  translateX: {
-    from: -SCREEN_WIDTH,
-    to: 0,
-    min: 0,
-    max: 1,
-    type: 'linear',
-    extrapolate: true,
-    round: PIXEL_RATIO,
-  },
-};
-
-var FromTheDown = {
-  ...FromTheRight,
-  transformTranslate: {
-    from: {y: SCREEN_HEIGHT, x: 0, z: 0},
-    to: {x: 0, y: 0, z: 0},
-    min: 0,
-    max: 1,
-    type: 'linear',
-    extrapolate: true,
-    round: PIXEL_RATIO,
-  },
-  translateY: {
-    from: SCREEN_HEIGHT,
-    to: 0,
-    min: 0,
-    max: 1,
-    type: 'linear',
-    extrapolate: true,
-    round: PIXEL_RATIO,
-  },
-};
-
-var FromTheTop = {
-  ...FromTheRight,
-  transformTranslate: {
-    from: {y: -SCREEN_HEIGHT, x: 0, z: 0},
-    to: {x: 0, y: 0, z: 0},
-    min: 0,
-    max: 1,
-    type: 'linear',
-    extrapolate: true,
-    round: PIXEL_RATIO,
-  },
-  translateY: {
-    from: -SCREEN_HEIGHT,
-    to: 0,
-    min: 0,
-    max: 1,
-    type: 'linear',
-    extrapolate: true,
-    round: PIXEL_RATIO,
-  },
-};
-
-var ToTheBack = {
-  // Rotate *requires* you to break out each individual component of
-  // rotation (x, y, z, w)
-  transformTranslate: {
-    from: {x: 0, y: 0, z: 0},
-    to: {x: 0, y: 0, z: 0},
-    min: 0,
-    max: 1,
-    type: 'linear',
-    extrapolate: true,
-    round: PIXEL_RATIO,
-  },
-  transformScale: {
-    from: {x: 1, y: 1, z: 1},
-    to: {x: 0.95, y: 0.95, z: 1},
-    min: 0,
-    max: 1,
-    type: 'linear',
-    extrapolate: true
-  },
-  opacity: {
-    from: 1,
-    to: 0.3,
-    min: 0,
-    max: 1,
-    type: 'linear',
-    extrapolate: false,
-    round: 100,
-  },
-  scaleX: {
-    from: 1,
-    to: 0.95,
-    min: 0,
-    max: 1,
-    type: 'linear',
-    extrapolate: true
-  },
-  scaleY: {
-    from: 1,
-    to: 0.95,
-    min: 0,
-    max: 1,
-    type: 'linear',
-    extrapolate: true
-  },
-};
-
-var FromTheFront = {
-  opacity: {
-    value: 1.0,
-    type: 'constant',
-  },
-
-  transformTranslate: {
-    from: {x: 0, y: SCREEN_HEIGHT, z: 0},
-    to: {x: 0, y: 0, z: 0},
-    min: 0,
-    max: 1,
-    type: 'linear',
-    extrapolate: true,
-    round: PIXEL_RATIO,
-  },
-  translateY: {
-    from: SCREEN_HEIGHT,
-    to: 0,
-    min: 0,
-    max: 1,
-    type: 'linear',
-    extrapolate: true,
-    round: PIXEL_RATIO,
-  },
-  scaleX: {
-    value: 1,
-    type: 'constant',
-  },
-  scaleY: {
-    value: 1,
-    type: 'constant',
-  },
-};
-
-var ToTheBackAndroid = {
-  opacity: {
-    value: 1,
-    type: 'constant',
-  },
-};
-
-var FromTheFrontAndroid = {
-  opacity: {
-    from: 0,
-    to: 1,
-    min: 0.5,
-    max: 1,
-    type: 'linear',
-    extrapolate: false,
-    round: 100,
-  },
-  transformTranslate: {
-    from: {x: 0, y: 100, z: 0},
-    to: {x: 0, y: 0, z: 0},
-    min: 0,
-    max: 1,
-    type: 'linear',
-    extrapolate: true,
-    round: PIXEL_RATIO,
-  },
-  translateY: {
-    from: 100,
-    to: 0,
-    min: 0,
-    max: 1,
-    type: 'linear',
-    extrapolate: true,
-    round: PIXEL_RATIO,
-  },
-};
-
-var BaseOverswipeConfig = {
-  frictionConstant: 1,
-  frictionByDistance: 1.5,
-};
-
-var BaseLeftToRightGesture = {
-
-  // If the gesture can end and restart during one continuous touch
-  isDetachable: false,
-
-  // How far the swipe must drag to start transitioning
-  gestureDetectMovement: 2,
-
-  // Amplitude of release velocity that is considered still
-  notMoving: 0.3,
-
-  // Fraction of directional move required.
-  directionRatio: 0.66,
-
-  // Velocity to transition with when the gesture release was "not moving"
-  snapVelocity: 2,
-
-  // Region that can trigger swipe. iOS default is 30px from the left edge
-  edgeHitWidth: 30,
-
-  // Ratio of gesture completion when non-velocity release will cause action
-  stillCompletionRatio: 3 / 5,
-
-  fullDistance: SCREEN_WIDTH,
-
-  direction: 'left-to-right',
-
-};
-
-var BaseRightToLeftGesture = {
-  ...BaseLeftToRightGesture,
-  direction: 'right-to-left',
-};
-
-var BaseDownUpGesture = {
-  ...BaseLeftToRightGesture,
-  fullDistance: SCREEN_HEIGHT,
-  direction: 'bottom-to-top',
-};
-
-var BaseUpDownGesture = {
-  ...BaseLeftToRightGesture,
-  fullDistance: SCREEN_HEIGHT,
-  direction: 'top-to-bottom',
-};
-
-// For RTL experiment, we need to swap all the Left and Right gesture and animation.
-// So we create a direction mapping for both LTR and RTL, and change left/right to start/end.
-let directionMapping = {
-  ToTheStartIOS: ToTheLeftIOS,
-  ToTheEndIOS: ToTheRightIOS,
-  FadeToTheStart: FadeToTheLeft,
-  FadeToTheEnd: FadeToTheRight,
-  ToTheStart: ToTheLeft,
-  ToTheEnd: ToTheRight,
-  FromTheStart: FromTheLeft,
-  FromTheEnd: FromTheRight,
-  BaseStartToEndGesture: BaseLeftToRightGesture,
-  BaseEndToStartGesture: BaseRightToLeftGesture,
-};
-
-if (IS_RTL) {
-  directionMapping = {
-    ToTheStartIOS: ToTheRightIOS,
-    ToTheEndIOS: ToTheLeftIOS,
-    FadeToTheStart: FadeToTheRight,
-    FadeToTheEnd: FadeToTheLeft,
-    ToTheStart: ToTheRight,
-    ToTheEnd: ToTheLeft,
-    FromTheStart: FromTheRight,
-    FromTheEnd: FromTheLeft,
-    BaseStartToEndGesture: BaseRightToLeftGesture,
-    BaseEndToStartGesture: BaseLeftToRightGesture,
-  };
-}
-
-var BaseConfig = {
-  // A list of all gestures that are enabled on this scene
-  gestures: {
-    pop: directionMapping.BaseStartToEndGesture,
-  },
-
-  // Rebound spring parameters when transitioning FROM this scene
-  springFriction: 26,
-  springTension: 200,
-
-  // Velocity to start at when transitioning without gesture
-  defaultTransitionVelocity: 1.5,
-
-  // Animation interpolators for horizontal transitioning:
-  animationInterpolators: {
-    into: buildStyleInterpolator(directionMapping.FromTheEnd),
-    out: buildStyleInterpolator(directionMapping.FadeToTheStart),
-  },
-};
-
-var NavigatorSceneConfigs = {
-  PushFromRight: {
-    ...BaseConfig,
-    animationInterpolators: {
-      into: buildStyleInterpolator(directionMapping.FromTheEnd),
-      out: buildStyleInterpolator(directionMapping.ToTheStartIOS),
-    },
-  },
-  PushFromLeft: {
-    ...BaseConfig,
-    animationInterpolators: {
-      into: buildStyleInterpolator(directionMapping.FromTheStart),
-      out: buildStyleInterpolator(directionMapping.ToTheEndIOS),
-    },
-  },
-  FloatFromRight: {
-    ...BaseConfig,
-    // We will want to customize this soon
-  },
-  FloatFromLeft: {
-    ...BaseConfig,
-    gestures: {
-      pop: directionMapping.BaseEndToStartGesture,
-    },
-    animationInterpolators: {
-      into: buildStyleInterpolator(directionMapping.FromTheStart),
-      out: buildStyleInterpolator(directionMapping.FadeToTheEnd),
-    },
-  },
-  FloatFromBottom: {
-    ...BaseConfig,
-    gestures: {
-      pop: {
-        ...directionMapping.BaseStartToEndGesture,
-        edgeHitWidth: 150,
-        direction: 'top-to-bottom',
-        fullDistance: SCREEN_HEIGHT,
-      }
-    },
-    animationInterpolators: {
-      into: buildStyleInterpolator(FromTheFront),
-      out: buildStyleInterpolator(ToTheBack),
-    },
-  },
-  FloatFromBottomAndroid: {
-    ...BaseConfig,
-    gestures: null,
-    defaultTransitionVelocity: 3,
-    springFriction: 20,
-    animationInterpolators: {
-      into: buildStyleInterpolator(FromTheFrontAndroid),
-      out: buildStyleInterpolator(ToTheBackAndroid),
-    },
-  },
-  FadeAndroid: {
-    ...BaseConfig,
-    gestures: null,
-    animationInterpolators: {
-      into: buildStyleInterpolator(FadeIn),
-      out: buildStyleInterpolator(FadeOut),
-    },
-  },
-  SwipeFromLeft: {
-    ...BaseConfig,
-    gestures: {
-      jumpBack: {
-        ...directionMapping.BaseEndToStartGesture,
-        overswipe: BaseOverswipeConfig,
-        edgeHitWidth: null,
-        isDetachable: true,
-      },
-      jumpForward: {
-        ...directionMapping.BaseStartToEndGesture,
-        overswipe: BaseOverswipeConfig,
-        edgeHitWidth: null,
-        isDetachable: true,
-      },
-    },
-    animationInterpolators: {
-      into: buildStyleInterpolator(directionMapping.FromTheStart),
-      out: buildStyleInterpolator(directionMapping.ToTheEnd),
-    },
-  },
-  HorizontalSwipeJump: {
-    ...BaseConfig,
-    gestures: {
-      jumpBack: {
-        ...directionMapping.BaseStartToEndGesture,
-        overswipe: BaseOverswipeConfig,
-        edgeHitWidth: null,
-        isDetachable: true,
-      },
-      jumpForward: {
-        ...directionMapping.BaseEndToStartGesture,
-        overswipe: BaseOverswipeConfig,
-        edgeHitWidth: null,
-        isDetachable: true,
-      },
-    },
-    animationInterpolators: {
-      into: buildStyleInterpolator(directionMapping.FromTheEnd),
-      out: buildStyleInterpolator(directionMapping.ToTheStart),
-    },
-  },
-  HorizontalSwipeJumpFromRight: {
-    ...BaseConfig,
-    gestures: {
-      jumpBack: {
-        ...directionMapping.BaseEndToStartGesture,
-        overswipe: BaseOverswipeConfig,
-        edgeHitWidth: null,
-        isDetachable: true,
-      },
-      jumpForward: {
-        ...directionMapping.BaseStartToEndGesture,
-        overswipe: BaseOverswipeConfig,
-        edgeHitWidth: null,
-        isDetachable: true,
-      },
-      pop: directionMapping.BaseEndToStartGesture,
-    },
-    animationInterpolators: {
-      into: buildStyleInterpolator(directionMapping.FromTheStart),
-      out: buildStyleInterpolator(directionMapping.FadeToTheEnd),
-    },
-  },
-  HorizontalSwipeJumpFromLeft: {
-    ...BaseConfig,
-    gestures: {
-      jumpBack: {
-        ...directionMapping.BaseEndToStartGesture,
-        overswipe: BaseOverswipeConfig,
-        edgeHitWidth: null,
-        isDetachable: true,
-      },
-      jumpForward: {
-        ...directionMapping.BaseStartToEndGesture,
-        overswipe: BaseOverswipeConfig,
-        edgeHitWidth: null,
-        isDetachable: true,
-      },
-      pop: directionMapping.BaseEndToStartGesture,
-    },
-    animationInterpolators: {
-      into: buildStyleInterpolator(directionMapping.FromTheStart),
-      out: buildStyleInterpolator(directionMapping.ToTheEnd),
-    },
-  },
-  VerticalUpSwipeJump: {
-    ...BaseConfig,
-    gestures: {
-      jumpBack: {
-        ...BaseUpDownGesture,
-        overswipe: BaseOverswipeConfig,
-        edgeHitWidth: null,
-        isDetachable: true,
-      },
-      jumpForward: {
-        ...BaseDownUpGesture,
-        overswipe: BaseOverswipeConfig,
-        edgeHitWidth: null,
-        isDetachable: true,
-      },
-    },
-    animationInterpolators: {
-      into: buildStyleInterpolator(FromTheDown),
-      out: buildStyleInterpolator(ToTheUp),
-    },
-  },
-  VerticalDownSwipeJump: {
-    ...BaseConfig,
-    gestures: {
-      jumpBack: {
-        ...BaseDownUpGesture,
-        overswipe: BaseOverswipeConfig,
-        edgeHitWidth: null,
-        isDetachable: true,
-      },
-      jumpForward: {
-        ...BaseUpDownGesture,
-        overswipe: BaseOverswipeConfig,
-        edgeHitWidth: null,
-        isDetachable: true,
-      },
-    },
-    animationInterpolators: {
-      into: buildStyleInterpolator(FromTheTop),
-      out: buildStyleInterpolator(ToTheDown),
-    },
-  },
-};
-
-module.exports = NavigatorSceneConfigs;
diff --git a/Libraries/react-native/react-native-implementation.js b/Libraries/react-native/react-native-implementation.js
index d0135c2221688a..d64353492e38c8 100644
--- a/Libraries/react-native/react-native-implementation.js
+++ b/Libraries/react-native/react-native-implementation.js
@@ -11,6 +11,7 @@
  */
 'use strict';
 
+const invariant = require('fbjs/lib/invariant');
 const warning = require('fbjs/lib/warning');
 
 if (__DEV__) {
@@ -41,7 +42,6 @@ const ReactNative = {
   get KeyboardAvoidingView() { return require('KeyboardAvoidingView'); },
   get ListView() { return require('ListView'); },
   get Modal() { return require('Modal'); },
-  get Navigator() { return require('Navigator'); },
   get NavigatorIOS() { return require('NavigatorIOS'); },
   get Picker() { return require('Picker'); },
   get PickerIOS() { return require('PickerIOS'); },
@@ -124,6 +124,17 @@ const ReactNative = {
   get EdgeInsetsPropType() { return require('EdgeInsetsPropType'); },
   get PointPropType() { return require('PointPropType'); },
   get ViewPropTypes() { return require('ViewPropTypes'); },
+
+  // Deprecated
+  get Navigator() {
+    invariant(
+      false,
+      'Navigator is deprecated and has been removed from this package. It can now be installed ' +
+      'and imported from `react-native-deprecated-custom-components` instead of `react-native`. ' +
+      'Learn about alternative navigation solutions at http://facebook.github.io/react-native/docs/navigation.html'
+    );
+    return null;
+  },
 };
 
 // Better error messages when accessing React APIs on ReactNative

From 6f9447e7b23b06bd17c68723a052bdf0655945db Mon Sep 17 00:00:00 2001
From: Brian Vaughn <bvaughn@fb.com>
Date: Mon, 27 Mar 2017 16:54:08 -0700
Subject: [PATCH 203/366] React sync (16 beta 6 plus addons)

Reviewed By: sebmarkbage

Differential Revision: D4775005

fbshipit-source-id: c50d099dc3d01c10e122c56f11bd990a2b1e81d1
---
 Libraries/Renderer/src/ReactVersion.js        |   2 +-
 .../native/ReactNativeEventEmitter.js         |   5 -
 .../__tests__/ReactNativeEvents-test.js       |  94 ++++++++++++
 .../shared/fiber/ReactFiberErrorLogger.js     |  21 +++
 .../renderers/shared/utils/ReactErrorUtils.js | 138 ++++++++++--------
 package.json                                  |  11 +-
 6 files changed, 197 insertions(+), 74 deletions(-)

diff --git a/Libraries/Renderer/src/ReactVersion.js b/Libraries/Renderer/src/ReactVersion.js
index 6800654f5d6d29..6bf2d3b1bba84c 100644
--- a/Libraries/Renderer/src/ReactVersion.js
+++ b/Libraries/Renderer/src/ReactVersion.js
@@ -11,4 +11,4 @@
 
 'use strict';
 
-module.exports = '16.0.0-alpha.4';
+module.exports = '16.0.0-alpha.6';
diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeEventEmitter.js b/Libraries/Renderer/src/renderers/native/ReactNativeEventEmitter.js
index 6cea86f9d6ae65..42b69aa1506635 100644
--- a/Libraries/Renderer/src/renderers/native/ReactNativeEventEmitter.js
+++ b/Libraries/Renderer/src/renderers/native/ReactNativeEventEmitter.js
@@ -102,11 +102,6 @@ var ReactNativeEventEmitter = {
   ) {
     var nativeEvent = nativeEventParam || EMPTY_NATIVE_EVENT;
     var inst = ReactNativeComponentTree.getInstanceFromNode(rootNodeID);
-    if (!inst) {
-      // If the original instance is already gone, we don't have to dispatch
-      // any events.
-      return;
-    }
     ReactGenericBatching.batchedUpdates(function() {
       ReactNativeEventEmitter.handleTopLevel(
         topLevelType,
diff --git a/Libraries/Renderer/src/renderers/native/__tests__/ReactNativeEvents-test.js b/Libraries/Renderer/src/renderers/native/__tests__/ReactNativeEvents-test.js
index 783f4bab164c57..56206149a75e06 100644
--- a/Libraries/Renderer/src/renderers/native/__tests__/ReactNativeEvents-test.js
+++ b/Libraries/Renderer/src/renderers/native/__tests__/ReactNativeEvents-test.js
@@ -267,3 +267,97 @@ it('handles when a responder is unmounted while a touch sequence is in progress'
   expect(getResponderId()).toBe('two');
   expect(log).toEqual(['two responder start']);
 });
+
+it('handles events without target', () => {
+  var EventEmitter = RCTEventEmitter.register.mock.calls[0][0];
+  var View = createReactNativeComponentClass({
+    validAttributes: {id: true},
+    uiViewClassName: 'View',
+  });
+
+  function getViewById(id) {
+    return UIManager.createView.mock.calls.find(
+      args => args[3] && args[3].id === id,
+    )[0];
+  }
+
+  function getResponderId() {
+    const responder = ResponderEventPlugin._getResponder();
+    if (responder === null) {
+      return null;
+    }
+    const props = typeof responder.tag === 'number'
+      ? responder.memoizedProps
+      : responder._currentElement.props;
+    return props ? props.id : null;
+  }
+
+  var log = [];
+
+  function render(renderFirstComponent) {
+    ReactNative.render(
+      <View id="parent">
+        <View key={1}>
+          {renderFirstComponent
+            ? <View
+                id="one"
+                onResponderEnd={() => log.push('one responder end')}
+                onResponderStart={() => log.push('one responder start')}
+                onStartShouldSetResponder={() => true}
+              />
+            : null}
+        </View>
+        <View key={2}>
+          <View
+            id="two"
+            onResponderEnd={() => log.push('two responder end')}
+            onResponderStart={() => log.push('two responder start')}
+            onStartShouldSetResponder={() => true}
+          />
+        </View>
+      </View>,
+      1,
+    );
+  }
+
+  render(true);
+
+  EventEmitter.receiveTouches(
+    'topTouchStart',
+    [{target: getViewById('one'), identifier: 17}],
+    [0],
+  );
+
+  // Unmounting component 'one'.
+  render(false);
+
+  EventEmitter.receiveTouches(
+    'topTouchEnd',
+    [{target: getViewById('one'), identifier: 17}],
+    [0],
+  );
+
+  expect(getResponderId()).toBe(null);
+
+  EventEmitter.receiveTouches(
+    'topTouchStart',
+    [{target: getViewById('two'), identifier: 18}],
+    [0],
+  );
+
+  expect(getResponderId()).toBe('two');
+
+  EventEmitter.receiveTouches(
+    'topTouchEnd',
+    [{target: getViewById('two'), identifier: 18}],
+    [0],
+  );
+
+  expect(getResponderId()).toBe(null);
+
+  expect(log).toEqual([
+    'one responder start',
+    'two responder start',
+    'two responder end',
+  ]);
+});
diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberErrorLogger.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberErrorLogger.js
index 30678fc0826c78..4deb6549322a72 100644
--- a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberErrorLogger.js
+++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberErrorLogger.js
@@ -12,8 +12,13 @@
 
 'use strict';
 
+const emptyFunction = require('fbjs/lib/emptyFunction');
+const invariant = require('fbjs/lib/invariant');
+
 import type {CapturedError} from 'ReactFiberScheduler';
 
+let showDialog = emptyFunction;
+
 function logCapturedError(capturedError: CapturedError): void {
   if (__DEV__) {
     const {
@@ -80,6 +85,22 @@ function logCapturedError(capturedError: CapturedError): void {
       `React caught an error thrown by one of your components.\n\n${error.stack}`,
     );
   }
+
+  showDialog(capturedError);
 }
 
+exports.injection = {
+  injectDialog(fn: (e: CapturedError) => void) {
+    invariant(
+      showDialog === emptyFunction,
+      'The custom dialog was already injected.',
+    );
+    invariant(
+      typeof fn === 'function',
+      'Injected showDialog() must be a function.',
+    );
+    showDialog = fn;
+  },
+};
+
 exports.logCapturedError = logCapturedError;
diff --git a/Libraries/Renderer/src/renderers/shared/utils/ReactErrorUtils.js b/Libraries/Renderer/src/renderers/shared/utils/ReactErrorUtils.js
index b3910a0dd8953d..2a08fb1124f18c 100644
--- a/Libraries/Renderer/src/renderers/shared/utils/ReactErrorUtils.js
+++ b/Libraries/Renderer/src/renderers/shared/utils/ReactErrorUtils.js
@@ -12,8 +12,70 @@
 
 'use strict';
 
+const invariant = require('fbjs/lib/invariant');
+
 let caughtError = null;
 
+let invokeGuardedCallback = function(name, func, context, a, b, c, d, e, f) {
+  const funcArgs = Array.prototype.slice.call(arguments, 3);
+  try {
+    func.apply(context, funcArgs);
+  } catch (error) {
+    return error;
+  }
+  return null;
+};
+
+if (__DEV__) {
+  /**
+   * To help development we can get better devtools integration by simulating a
+   * real browser event.
+   */
+  if (
+    typeof window !== 'undefined' &&
+    typeof window.dispatchEvent === 'function' &&
+    typeof document !== 'undefined' &&
+    typeof document.createEvent === 'function'
+  ) {
+    const fakeNode = document.createElement('react');
+    let depth = 0;
+
+    invokeGuardedCallback = function(name, func, context, a, b, c, d, e, f) {
+      depth++;
+      const thisDepth = depth;
+      const funcArgs = Array.prototype.slice.call(arguments, 3);
+      const boundFunc = function() {
+        func.apply(context, funcArgs);
+      };
+      let fakeEventError = null;
+      const onFakeEventError = function(event) {
+        // Don't capture nested errors
+        if (depth === thisDepth) {
+          fakeEventError = event.error;
+        }
+      };
+      const evtType = `react-${name ? name : 'invokeguardedcallback'}-${depth}`;
+      window.addEventListener('error', onFakeEventError);
+      fakeNode.addEventListener(evtType, boundFunc, false);
+      const evt = document.createEvent('Event');
+      evt.initEvent(evtType, false, false);
+      fakeNode.dispatchEvent(evt);
+      fakeNode.removeEventListener(evtType, boundFunc, false);
+      window.removeEventListener('error', onFakeEventError);
+      depth--;
+      return fakeEventError;
+    };
+  }
+}
+
+let rethrowCaughtError = function() {
+  if (caughtError) {
+    const error = caughtError;
+    caughtError = null;
+    throw error;
+  }
+};
+
 /**
  * Call a function while guarding against errors that happens within it.
  * Returns an error if it throws, otherwise null.
@@ -24,6 +86,16 @@ let caughtError = null;
  * @param {...*} args Arguments for function
  */
 const ReactErrorUtils = {
+  injection: {
+    injectErrorUtils(injectedErrorUtils: Object) {
+      invariant(
+        typeof injectedErrorUtils.invokeGuardedCallback === 'function',
+        'Injected invokeGuardedCallback() must be a function.',
+      );
+      invokeGuardedCallback = injectedErrorUtils.invokeGuardedCallback;
+    },
+  },
+
   invokeGuardedCallback: function<A, B, C, D, E, F, Context>(
     name: string | null,
     func: (a: A, b: B, c: C, d: D, e: E, f: F) => void,
@@ -35,13 +107,7 @@ const ReactErrorUtils = {
     e: E,
     f: F,
   ): Error | null {
-    const funcArgs = Array.prototype.slice.call(arguments, 3);
-    try {
-      func.apply(context, funcArgs);
-    } catch (error) {
-      return error;
-    }
-    return null;
+    return invokeGuardedCallback.apply(this, arguments);
   },
 
   /**
@@ -75,64 +141,8 @@ const ReactErrorUtils = {
    * we will rethrow to be handled by the top level error handler.
    */
   rethrowCaughtError: function() {
-    if (caughtError) {
-      const error = caughtError;
-      caughtError = null;
-      throw error;
-    }
+    return rethrowCaughtError.apply(this, arguments);
   },
 };
 
-if (__DEV__) {
-  /**
-   * To help development we can get better devtools integration by simulating a
-   * real browser event.
-   */
-  if (
-    typeof window !== 'undefined' &&
-    typeof window.dispatchEvent === 'function' &&
-    typeof document !== 'undefined' &&
-    typeof document.createEvent === 'function'
-  ) {
-    const fakeNode = document.createElement('react');
-    let depth = 0;
-
-    ReactErrorUtils.invokeGuardedCallback = function(
-      name,
-      func,
-      context,
-      a,
-      b,
-      c,
-      d,
-      e,
-      f,
-    ) {
-      depth++;
-      const thisDepth = depth;
-      const funcArgs = Array.prototype.slice.call(arguments, 3);
-      const boundFunc = function() {
-        func.apply(context, funcArgs);
-      };
-      let fakeEventError = null;
-      const onFakeEventError = function(event) {
-        // Don't capture nested errors
-        if (depth === thisDepth) {
-          fakeEventError = event.error;
-        }
-      };
-      const evtType = `react-${name ? name : 'invokeguardedcallback'}-${depth}`;
-      window.addEventListener('error', onFakeEventError);
-      fakeNode.addEventListener(evtType, boundFunc, false);
-      const evt = document.createEvent('Event');
-      evt.initEvent(evtType, false, false);
-      fakeNode.dispatchEvent(evt);
-      fakeNode.removeEventListener(evtType, boundFunc, false);
-      window.removeEventListener('error', onFakeEventError);
-      depth--;
-      return fakeEventError;
-    };
-  }
-}
-
 module.exports = ReactErrorUtils;
diff --git a/package.json b/package.json
index fba4c5e4bb0a9e..43b74612e52ae7 100644
--- a/package.json
+++ b/package.json
@@ -128,7 +128,7 @@
     "react-native": "local-cli/wrong-react-native.js"
   },
   "peerDependencies": {
-    "react": "~16.0.0-alpha.4"
+    "react": "16.0.0-alpha.6"
   },
   "dependencies": {
     "absolute-path": "^0.0.0",
@@ -187,6 +187,9 @@
     "plist": "^1.2.0",
     "pretty-format": "^4.2.1",
     "promise": "^7.1.1",
+    "react-addons-create-fragment": "15.5.0-alpha.0",
+    "react-addons-pure-render-mixin": "15.5.0-alpha.0",
+    "react-addons-shallow-compare": "15.5.0-alpha.0",
     "react-clone-referenced-element": "^1.0.1",
     "react-devtools-core": "^2.0.8",
     "react-timer-mixin": "^0.13.2",
@@ -224,9 +227,9 @@
     "jest-repl": "19.0.2",
     "jest-runtime": "19.0.2",
     "mock-fs": "^3.11.0",
-    "react": "~16.0.0-alpha.4",
-    "react-dom": "~16.0.0-alpha.4",
-    "react-test-renderer": "~16.0.0-alpha.3",
+    "react": "16.0.0-alpha.6",
+    "react-dom": "16.0.0-alpha.6",
+    "react-test-renderer": "16.0.0-alpha.6",
     "shelljs": "0.6.0",
     "sinon": "^2.0.0-pre.2"
   }

From acc1edd188c16769a6709a8e6feb428203d6235f Mon Sep 17 00:00:00 2001
From: Spencer Ahrens <sahrens@fb.com>
Date: Mon, 27 Mar 2017 19:51:40 -0700
Subject: [PATCH 204/366] expand example with `PureComponent` usage, explicit
 `extraData` prop, `initialNumToRender`

Summary: Should help with some common pitfalls, e.g. https://github.com/facebook/react-native/issues/12512#issuecomment-289521758.

Reviewed By: yungsters

Differential Revision: D4781833

fbshipit-source-id: 3dec2f0c444645ad710e9ed81390636da4581f0f
---
 Libraries/Lists/FlatList.js        | 100 ++++++++++++++++++++++++++---
 Libraries/Lists/SectionList.js     |  25 ++++++--
 Libraries/Lists/VirtualizedList.js |   9 ++-
 3 files changed, 121 insertions(+), 13 deletions(-)

diff --git a/Libraries/Lists/FlatList.js b/Libraries/Lists/FlatList.js
index 70c21670c26536..15cbcc437409cb 100644
--- a/Libraries/Lists/FlatList.js
+++ b/Libraries/Lists/FlatList.js
@@ -57,6 +57,16 @@ type OptionalProps<ItemT> = {
    * Rendered at the top of all the items.
    */
   ListHeaderComponent?: ?ReactClass<any>,
+  /**
+   * Optional custom style for multi-item rows generated when numColumns > 1.
+   */
+  columnWrapperStyle?: StyleObj,
+  /**
+   * A marker property for telling the list to re-render (since it implements `PureComponent`). If
+   * your `renderItem` function depends on anything outside of the `data` prop, stick it here and
+   * treat it immutably.
+   */
+  extraData?: any,
   /**
    * `getItemLayout` is an optional optimizations that let us skip measurement of dynamic content if
    * you know the height of items a priori. `getItemLayout` is the most efficient, and is easy to
@@ -75,6 +85,12 @@ type OptionalProps<ItemT> = {
    * If true, renders items next to each other horizontally instead of stacked vertically.
    */
   horizontal?: ?boolean,
+  /**
+   * How many items to render in the initial batch. This should be enough to fill the screen but not
+   * much more. Note these items will never be unmounted as part of the windowed rendering in order
+   * to improve perceived performance of scroll-to-top actions.
+   */
+  initialNumToRender: number,
   /**
    * Used to extract a unique key for a given item at the specified index. Key is used for caching
    * and as the react key to track item re-ordering. The default extractor checks `item.key`, then
@@ -91,6 +107,12 @@ type OptionalProps<ItemT> = {
    * content.
    */
   onEndReached?: ?(info: {distanceFromEnd: number}) => void,
+  /**
+   * How far from the end (in units of visible length of the list) the bottom edge of the
+   * list must be from the end of the content to trigger the `onEndReached` callback.
+   * Thus a value of 0.5 will trigger `onEndReached` when the end of the content is
+   * within half the visible length of the list.
+   */
   onEndReachedThreshold?: ?number,
   /**
    * If provided, a standard RefreshControl will be added for "Pull to Refresh" functionality. Make
@@ -98,19 +120,17 @@ type OptionalProps<ItemT> = {
    */
   onRefresh?: ?() => void,
   /**
-   * Called when the viewability of rows changes, as defined by the
-   * `viewablePercentThreshold` prop.
+   * Called when the viewability of rows changes, as defined by the `viewabilityConfig` prop.
    */
-  onViewableItemsChanged?: ?(info: {viewableItems: Array<ViewToken>, changed: Array<ViewToken>}) => void,
+  onViewableItemsChanged?: ?(info: {
+    viewableItems: Array<ViewToken>,
+    changed: Array<ViewToken>,
+  }) => void,
   legacyImplementation?: ?boolean,
   /**
    * Set this true while waiting for new data from a refresh.
    */
   refreshing?: ?boolean,
-  /**
-   * Optional custom style for multi-item rows generated when numColumns > 1
-   */
-  columnWrapperStyle?: StyleObj,
   /**
    * See `ViewabilityHelper` for flow type and further documentation.
    */
@@ -148,8 +168,71 @@ type DefaultProps = typeof defaultProps;
  *       renderItem={({item}) => <Text>{item.key}</Text>}
  *     />
  *
+ * More complex example demonstrating `PureComponent` usage for perf optimization and avoiding bugs.
+ *
+ * - By binding the `onPressItem` handler, the props will remain `===` and `PureComponent` will
+ *   prevent wasteful re-renders unless the actual `id`, `selected`, or `title` props change, even
+ *   if the inner `SomeOtherWidget` has no such optimizations.
+ * - By passing `extraData={this.state}` to `FlatList` we make sure `FlatList` itself will re-render
+ *   when the `state.selected` changes. Without setting this prop, `FlatList` would not know it
+ *   needs to re-render any items because it is also a `PureComponent` and the prop comparison will
+ *   not show any changes.
+ * - `keyExtractor` tells the list to use the `id`s for the react keys.
+ *
+ *
+ *     class MyListItem extends React.PureComponent {
+ *       _onPress = () => {
+ *         this.props.onPressItem(this.props.id);
+ *       };
+ *
+ *       render() {
+ *         return (
+ *           <SomeOtherWidget
+ *             {...this.props}
+ *             onPress={this._onPress}
+ *           />
+ *         )
+ *       }
+ *     }
+ *
+ *     class MyList extends React.PureComponent {
+ *       state = {selected: (new Map(): Map<string, boolean>)};
+ *
+ *       _keyExtractor = (item, index) => item.id;
+ *
+ *       _onPressItem = (id: string) => {
+ *         // updater functions are preferred for transactional updates
+ *         this.setState((state) => {
+ *           // copy the map rather than modifying state.
+ *           const selected = new Map(state.selected);
+ *           selected.set(id, !state.get(id)); // toggle
+ *           return {selected};
+ *         });
+ *       };
+ *
+ *       _renderItem = ({item}) => (
+ *         <MyListItem
+ *           id={item.id}
+ *           onPressItem={this._onPressItem}
+ *           selected={!!this.state.selected.get(item.id)}
+ *           title={item.title}
+ *         />
+ *       );
+ *
+ *       render() {
+ *         return (
+ *           <FlatList
+ *             data={this.props.data}
+ *             extraData={this.state}
+ *             keyExtractor={this._keyExtractor}
+ *             renderItem={this._renderItem}
+ *           />
+ *         );
+ *       }
+ *     }
+ *
  * This is a convenience wrapper around [`<VirtualizedList>`](docs/virtualizedlist.html),
- * and thus inherits the following caveats:
+ * and thus inherits it's props that aren't explicitly listed here along with the following caveats:
  *
  * - Internal state is not preserved when content scrolls out of the render window. Make sure all
  *   your data is captured in the item data or external stores like Flux, Redux, or Relay.
@@ -305,6 +388,7 @@ class FlatList<ItemT> extends React.PureComponent<DefaultProps, Props<ItemT>, vo
       arr.push({...v, item, key: keyExtractor(item, index), index});
     });
   }
+
   _onViewableItemsChanged = (info) => {
     const {numColumns, onViewableItemsChanged} = this.props;
     if (!onViewableItemsChanged) {
diff --git a/Libraries/Lists/SectionList.js b/Libraries/Lists/SectionList.js
index 86d0f65a50b0ba..cb875b3dd2d3e1 100644
--- a/Libraries/Lists/SectionList.js
+++ b/Libraries/Lists/SectionList.js
@@ -56,21 +56,34 @@ type OptionalProps<SectionT: SectionBase<any>> = {
    * Rendered at the very end of the list.
    */
   ListFooterComponent?: ?ReactClass<any>,
-  /**
-   * Rendered at the top of each section. Sticky headers are not yet supported.
-   */
-  renderSectionHeader?: ?(info: {section: SectionT}) => ?React.Element<any>,
   /**
    * Rendered in between each section.
    */
   SectionSeparatorComponent?: ?ReactClass<any>,
+  /**
+   * How many items to render in the initial batch. This should be enough to fill the screen but not
+   * much more. Note these items will never be unmounted as part of the windowed rendering in order
+   * to improve perceived performance of scroll-to-top actions.
+   */
+  initialNumToRender: number,
   /**
    * Used to extract a unique key for a given item at the specified index. Key is used for caching
    * and as the react key to track item re-ordering. The default extractor checks item.key, then
    * falls back to using the index, like react does.
    */
   keyExtractor: (item: Item, index: number) => string,
+  /**
+   * Called once when the scroll position gets within `onEndReachedThreshold` of the rendered
+   * content.
+   */
   onEndReached?: ?(info: {distanceFromEnd: number}) => void,
+  /**
+   * How far from the end (in units of visible length of the list) the bottom edge of the
+   * list must be from the end of the content to trigger the `onEndReached` callback.
+   * Thus a value of 0.5 will trigger `onEndReached` when the end of the content is
+   * within half the visible length of the list.
+   */
+  onEndReachedThreshold?: ?number,
   /**
    * If provided, a standard RefreshControl will be added for "Pull to Refresh" functionality. Make
    * sure to also set the `refreshing` prop correctly.
@@ -88,6 +101,10 @@ type OptionalProps<SectionT: SectionBase<any>> = {
    * Set this true while waiting for new data from a refresh.
    */
   refreshing?: ?boolean,
+  /**
+   * Rendered at the top of each section. Sticky headers are not yet supported.
+   */
+  renderSectionHeader?: ?(info: {section: SectionT}) => ?React.Element<any>,
   /**
    * Makes section headers stick to the top of the screen until the next one pushes it off. Only
    * enabled by default on iOS because that is the platform standard there.
diff --git a/Libraries/Lists/VirtualizedList.js b/Libraries/Lists/VirtualizedList.js
index fc64a70c8d43f1..509971609debac 100644
--- a/Libraries/Lists/VirtualizedList.js
+++ b/Libraries/Lists/VirtualizedList.js
@@ -49,6 +49,12 @@ type OptionalProps = {
    * this for debugging purposes.
    */
   disableVirtualization: boolean,
+  /**
+   * A marker property for telling the list to re-render (since it implements `PureComponent`). If
+   * your `renderItem` function depends on anything outside of the `data` prop, stick it here and
+   * treat it immutably.
+   */
+  extraData?: any,
   /**
    * A generic accessor for extracting an item from any sort of data blob.
    */
@@ -62,7 +68,8 @@ type OptionalProps = {
   horizontal?: ?boolean,
   /**
    * How many items to render in the initial batch. This should be enough to fill the screen but not
-   * much more.
+   * much more. Note these items will never be unmounted as part of the windowed rendering in order
+   * to improve perceived performance of scroll-to-top actions.
    */
   initialNumToRender: number,
   keyExtractor: (item: Item, index: number) => string,

From c9fae2fb935c7b7b619b246f42b3fb9d3c14c9ac Mon Sep 17 00:00:00 2001
From: Janic Duplessis <janicduplessis@gmail.com>
Date: Tue, 28 Mar 2017 05:30:00 -0700
Subject: [PATCH 205/366] Native Animated - Restore default values when
 removing props on iOS

Summary:
This fixes a bug that causes properties to keep stale values because they were not restored to their default after being removed when their value was controlled by native animated.

To fix this we restore default values in `disconnectFromView` by updating views with null values for all props that we modified previously. However this causes another issue where we lose any props that were set by the normal process because NativeAnimated operations are always executed after UIManager operatations. To fix this I added a way to hook into UIManager view updating process to be able to execute NativeAnimated operations either before or after updating native views.

In the case of disconnecting we want to do it before updating views so that it does: Value changed by native animated -> value restored to default -> (optional) value updated by normal prop.

This PR also depends on #10658.

**Test plan**
Tested that this fixed a particular bug in an app that uses ex-navigation + native animations where a navbar w
Closes https://github.com/facebook/react-native/pull/11819

Differential Revision: D4752566

Pulled By: javache

fbshipit-source-id: 68ee28200ffeba859ae1b98ac753bd7dcb8910f0
---
 .../Nodes/RCTPropsAnimatedNode.m              | 42 +++++++---
 .../NativeAnimation/RCTNativeAnimatedModule.h |  3 +-
 .../NativeAnimation/RCTNativeAnimatedModule.m | 84 +++++++++++++------
 React/Modules/RCTUIManager.h                  | 34 ++++++++
 React/Modules/RCTUIManager.m                  | 33 ++++++++
 5 files changed, 158 insertions(+), 38 deletions(-)

diff --git a/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.m
index 76b146e525e07a..e2c676d9b1ec79 100644
--- a/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.m
@@ -16,10 +16,21 @@
 #import "RCTStyleAnimatedNode.h"
 #import "RCTValueAnimatedNode.h"
 
-@implementation RCTPropsAnimatedNode {
+@implementation RCTPropsAnimatedNode
+{
   NSNumber *_connectedViewTag;
   NSString *_connectedViewName;
   RCTUIManager *_uiManager;
+  NSMutableDictionary<NSString *, NSObject *> *_propsDictionary;
+}
+
+- (instancetype)initWithTag:(NSNumber *)tag
+                     config:(NSDictionary<NSString *, id> *)config;
+{
+  if (self = [super initWithTag:tag config:config]) {
+    _propsDictionary = [NSMutableDictionary new];
+  }
+  return self;
 }
 
 - (void)connectToView:(NSNumber *)viewTag
@@ -33,6 +44,17 @@ - (void)connectToView:(NSNumber *)viewTag
 
 - (void)disconnectFromView:(NSNumber *)viewTag
 {
+  // Restore the default value for all props that were modified by this node.
+  for (NSString *key in _propsDictionary.allKeys) {
+    _propsDictionary[key] = [NSNull null];
+  }
+
+  if (_propsDictionary.count) {
+    [_uiManager synchronouslyUpdateViewOnUIThread:_connectedViewTag
+                                         viewName:_connectedViewName
+                                            props:_propsDictionary];
+  }
+
   _connectedViewTag = nil;
   _connectedViewName = nil;
   _uiManager = nil;
@@ -41,7 +63,7 @@ - (void)disconnectFromView:(NSNumber *)viewTag
 - (NSString *)propertyNameForParentTag:(NSNumber *)parentTag
 {
   __block NSString *propertyName;
-  [self.config[@"props"] enumerateKeysAndObjectsUsingBlock:^(NSString * _Nonnull property, NSNumber * _Nonnull tag, BOOL * _Nonnull stop) {
+  [self.config[@"props"] enumerateKeysAndObjectsUsingBlock:^(NSString *_Nonnull property, NSNumber *_Nonnull tag, BOOL *_Nonnull stop) {
     if ([tag isEqualToNumber:parentTag]) {
       propertyName = property;
       *stop = YES;
@@ -54,29 +76,29 @@ - (void)performUpdate
 {
   [super performUpdate];
 
+  // Since we are updating nodes after detaching them from views there is a time where it's
+  // possible that the view was disconnected and still receive an update, this is normal and we can
+  // simply skip that update.
   if (!_connectedViewTag) {
-    RCTLogError(@"Node has not been attached to a view");
     return;
   }
 
-  NSMutableDictionary *props = [NSMutableDictionary dictionary];
-  [self.parentNodes enumerateKeysAndObjectsUsingBlock:^(NSNumber * _Nonnull parentTag, RCTAnimatedNode * _Nonnull parentNode, BOOL * _Nonnull stop) {
+  [self.parentNodes enumerateKeysAndObjectsUsingBlock:^(NSNumber *_Nonnull parentTag, RCTAnimatedNode *_Nonnull parentNode, BOOL *_Nonnull stop) {
 
     if ([parentNode isKindOfClass:[RCTStyleAnimatedNode class]]) {
-      [props addEntriesFromDictionary:[(RCTStyleAnimatedNode *)parentNode propsDictionary]];
+      [self->_propsDictionary addEntriesFromDictionary:[(RCTStyleAnimatedNode *)parentNode propsDictionary]];
 
     } else if ([parentNode isKindOfClass:[RCTValueAnimatedNode class]]) {
       NSString *property = [self propertyNameForParentTag:parentTag];
       CGFloat value = [(RCTValueAnimatedNode *)parentNode value];
-      [props setObject:@(value) forKey:property];
+      self->_propsDictionary[property] = @(value);
     }
-
   }];
 
-  if (props.count) {
+  if (_propsDictionary.count) {
     [_uiManager synchronouslyUpdateViewOnUIThread:_connectedViewTag
                                          viewName:_connectedViewName
-                                            props:props];
+                                            props:_propsDictionary];
   }
 }
 
diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedModule.h b/Libraries/NativeAnimation/RCTNativeAnimatedModule.h
index 4bc7831b1b9ade..c6579438f5a519 100644
--- a/Libraries/NativeAnimation/RCTNativeAnimatedModule.h
+++ b/Libraries/NativeAnimation/RCTNativeAnimatedModule.h
@@ -10,9 +10,10 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTEventDispatcher.h>
 #import <React/RCTEventEmitter.h>
+#import <React/RCTUIManager.h>
 
 #import "RCTValueAnimatedNode.h"
 
-@interface RCTNativeAnimatedModule : RCTEventEmitter <RCTBridgeModule, RCTValueAnimatedNodeObserver, RCTEventDispatcherObserver>
+@interface RCTNativeAnimatedModule : RCTEventEmitter <RCTBridgeModule, RCTValueAnimatedNodeObserver, RCTEventDispatcherObserver, RCTUIManagerObserver>
 
 @end
diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedModule.m b/Libraries/NativeAnimation/RCTNativeAnimatedModule.m
index 4b30c47d7c419c..26cfbf567fc934 100644
--- a/Libraries/NativeAnimation/RCTNativeAnimatedModule.m
+++ b/Libraries/NativeAnimation/RCTNativeAnimatedModule.m
@@ -15,7 +15,11 @@
 @implementation RCTNativeAnimatedModule
 {
   RCTNativeAnimatedNodesManager *_nodesManager;
+
+  // Oparations called after views have been updated.
   NSMutableArray<AnimatedOperation> *_operations;
+  // Operations called before views have been updated.
+  NSMutableArray<AnimatedOperation> *_preOperations;
 }
 
 RCT_EXPORT_MODULE();
@@ -23,15 +27,15 @@ @implementation RCTNativeAnimatedModule
 - (void)invalidate
 {
   [_nodesManager stopAnimationLoop];
-}
-
-- (void)dealloc
-{
   [self.bridge.eventDispatcher removeDispatchObserver:self];
+  [self.bridge.uiManager removeUIManagerObserver:self];
 }
 
 - (dispatch_queue_t)methodQueue
 {
+  // This module needs to be on the same queue as the UIManager to avoid
+  // having to lock `_operations` and `_preOperations` since `uiManagerWillFlushUIBlocks`
+  // will be called from that queue.
   return RCTGetUIManagerQueue();
 }
 
@@ -41,8 +45,10 @@ - (void)setBridge:(RCTBridge *)bridge
 
   _nodesManager = [[RCTNativeAnimatedNodesManager alloc] initWithUIManager:self.bridge.uiManager];
   _operations = [NSMutableArray new];
+  _preOperations = [NSMutableArray new];
 
   [bridge.eventDispatcher addDispatchObserver:self];
+  [bridge.uiManager addUIManagerObserver:self];
 }
 
 #pragma mark -- API
@@ -50,7 +56,7 @@ - (void)setBridge:(RCTBridge *)bridge
 RCT_EXPORT_METHOD(createAnimatedNode:(nonnull NSNumber *)tag
                   config:(NSDictionary<NSString *, id> *)config)
 {
-  [_operations addObject:^(RCTNativeAnimatedNodesManager *nodesManager) {
+  [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager createAnimatedNode:tag config:config];
   }];
 }
@@ -58,7 +64,7 @@ - (void)setBridge:(RCTBridge *)bridge
 RCT_EXPORT_METHOD(connectAnimatedNodes:(nonnull NSNumber *)parentTag
                   childTag:(nonnull NSNumber *)childTag)
 {
-  [_operations addObject:^(RCTNativeAnimatedNodesManager *nodesManager) {
+  [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager connectAnimatedNodes:parentTag childTag:childTag];
   }];
 }
@@ -66,7 +72,7 @@ - (void)setBridge:(RCTBridge *)bridge
 RCT_EXPORT_METHOD(disconnectAnimatedNodes:(nonnull NSNumber *)parentTag
                   childTag:(nonnull NSNumber *)childTag)
 {
-  [_operations addObject:^(RCTNativeAnimatedNodesManager *nodesManager) {
+  [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager disconnectAnimatedNodes:parentTag childTag:childTag];
   }];
 }
@@ -76,14 +82,14 @@ - (void)setBridge:(RCTBridge *)bridge
                   config:(NSDictionary<NSString *, id> *)config
                   endCallback:(RCTResponseSenderBlock)callBack)
 {
-  [_operations addObject:^(RCTNativeAnimatedNodesManager *nodesManager) {
+  [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager startAnimatingNode:animationId nodeTag:nodeTag config:config endCallback:callBack];
   }];
 }
 
 RCT_EXPORT_METHOD(stopAnimation:(nonnull NSNumber *)animationId)
 {
-  [_operations addObject:^(RCTNativeAnimatedNodesManager *nodesManager) {
+  [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager stopAnimation:animationId];
   }];
 }
@@ -91,7 +97,7 @@ - (void)setBridge:(RCTBridge *)bridge
 RCT_EXPORT_METHOD(setAnimatedNodeValue:(nonnull NSNumber *)nodeTag
                   value:(nonnull NSNumber *)value)
 {
-  [_operations addObject:^(RCTNativeAnimatedNodesManager *nodesManager) {
+  [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager setAnimatedNodeValue:nodeTag value:value];
   }];
 }
@@ -99,21 +105,21 @@ - (void)setBridge:(RCTBridge *)bridge
 RCT_EXPORT_METHOD(setAnimatedNodeOffset:(nonnull NSNumber *)nodeTag
                   offset:(nonnull NSNumber *)offset)
 {
-  [_operations addObject:^(RCTNativeAnimatedNodesManager *nodesManager) {
+  [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager setAnimatedNodeOffset:nodeTag offset:offset];
   }];
 }
 
 RCT_EXPORT_METHOD(flattenAnimatedNodeOffset:(nonnull NSNumber *)nodeTag)
 {
-  [_operations addObject:^(RCTNativeAnimatedNodesManager *nodesManager) {
+  [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager flattenAnimatedNodeOffset:nodeTag];
   }];
 }
 
 RCT_EXPORT_METHOD(extractAnimatedNodeOffset:(nonnull NSNumber *)nodeTag)
 {
-  [_operations addObject:^(RCTNativeAnimatedNodesManager *nodesManager) {
+  [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager extractAnimatedNodeOffset:nodeTag];
   }];
 }
@@ -122,7 +128,7 @@ - (void)setBridge:(RCTBridge *)bridge
                   viewTag:(nonnull NSNumber *)viewTag)
 {
   NSString *viewName = [self.bridge.uiManager viewNameForReactTag:viewTag];
-  [_operations addObject:^(RCTNativeAnimatedNodesManager *nodesManager) {
+  [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager connectAnimatedNodeToView:nodeTag viewTag:viewTag viewName:viewName];
   }];
 }
@@ -130,14 +136,17 @@ - (void)setBridge:(RCTBridge *)bridge
 RCT_EXPORT_METHOD(disconnectAnimatedNodeFromView:(nonnull NSNumber *)nodeTag
                   viewTag:(nonnull NSNumber *)viewTag)
 {
-  [_operations addObject:^(RCTNativeAnimatedNodesManager *nodesManager) {
+  // Disconnecting a view also restores its default values so we have to make
+  // sure this happens before views get updated with their new props. This is
+  // why we enqueue this on the pre-operations queue.
+  [self addPreOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager disconnectAnimatedNodeFromView:nodeTag viewTag:viewTag];
   }];
 }
 
 RCT_EXPORT_METHOD(dropAnimatedNode:(nonnull NSNumber *)tag)
 {
-  [_operations addObject:^(RCTNativeAnimatedNodesManager *nodesManager) {
+  [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager dropAnimatedNode:tag];
   }];
 }
@@ -145,7 +154,7 @@ - (void)setBridge:(RCTBridge *)bridge
 RCT_EXPORT_METHOD(startListeningToAnimatedNodeValue:(nonnull NSNumber *)tag)
 {
   __weak id<RCTValueAnimatedNodeObserver> valueObserver = self;
-  [_operations addObject:^(RCTNativeAnimatedNodesManager *nodesManager) {
+  [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager startListeningToAnimatedNodeValue:tag valueObserver:valueObserver];
   }];
 }
@@ -153,7 +162,7 @@ - (void)setBridge:(RCTBridge *)bridge
 RCT_EXPORT_METHOD(stopListeningToAnimatedNodeValue:(nonnull NSNumber *)tag)
 {
   __weak id<RCTValueAnimatedNodeObserver> valueObserver = self;
-  [_operations addObject:^(RCTNativeAnimatedNodesManager *nodesManager) {
+  [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager stopListeningToAnimatedNodeValue:tag valueObserver:valueObserver];
   }];
 }
@@ -162,7 +171,7 @@ - (void)setBridge:(RCTBridge *)bridge
                   eventName:(nonnull NSString *)eventName
                   eventMapping:(NSDictionary<NSString *, id> *)eventMapping)
 {
-  [_operations addObject:^(RCTNativeAnimatedNodesManager *nodesManager) {
+  [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager addAnimatedEventToView:viewTag eventName:eventName eventMapping:eventMapping];
   }];
 }
@@ -171,24 +180,45 @@ - (void)setBridge:(RCTBridge *)bridge
                   eventName:(nonnull NSString *)eventName
             animatedNodeTag:(nonnull NSNumber *)animatedNodeTag)
 {
-  [_operations addObject:^(RCTNativeAnimatedNodesManager *nodesManager) {
+  [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager removeAnimatedEventFromView:viewTag eventName:eventName animatedNodeTag:animatedNodeTag];
   }];
 }
 
 #pragma mark -- Batch handling
 
-- (void)batchDidComplete
+- (void)addOperationBlock:(AnimatedOperation)operation
 {
-  NSArray *operations = _operations;
+  [_operations addObject:operation];
+}
+
+- (void)addPreOperationBlock:(AnimatedOperation)operation
+{
+  [_preOperations addObject:operation];
+}
+
+- (void)uiManagerWillFlushUIBlocks:(RCTUIManager *)uiManager
+{
+  if (_preOperations.count == 0 && _operations.count == 0) {
+    return;
+  }
+
+  NSArray<AnimatedOperation> *preOperations = _preOperations;
+  NSArray<AnimatedOperation> *operations = _operations;
+  _preOperations = [NSMutableArray new];
   _operations = [NSMutableArray new];
 
-  dispatch_async(dispatch_get_main_queue(), ^{
-    [operations enumerateObjectsUsingBlock:^(AnimatedOperation operation, NSUInteger i, BOOL *stop) {
+  [uiManager prependUIBlock:^(__unused RCTUIManager *manager, __unused NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+    for (AnimatedOperation operation in preOperations) {
       operation(self->_nodesManager);
-    }];
-    [self->_nodesManager updateAnimations];
-  });
+    }
+  }];
+
+  [uiManager addUIBlock:^(__unused RCTUIManager *manager, __unused NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+    for (AnimatedOperation operation in operations) {
+      operation(self->_nodesManager);
+    }
+  }];
 }
 
 #pragma mark -- Events
diff --git a/React/Modules/RCTUIManager.h b/React/Modules/RCTUIManager.h
index f1aa37b954aba4..e65f889b8a1bd3 100644
--- a/React/Modules/RCTUIManager.h
+++ b/React/Modules/RCTUIManager.h
@@ -48,6 +48,23 @@ RCT_EXTERN NSString *const RCTUIManagerDidRemoveRootViewNotification;
  */
 RCT_EXTERN NSString *const RCTUIManagerRootViewKey;
 
+@class RCTUIManager;
+
+/**
+ * Allows to hook into UIManager internals. This can be used to execute code at
+ * specific points during the view updating process.
+ */
+@protocol RCTUIManagerObserver <NSObject>
+
+/**
+ * Called before flushing UI blocks at the end of a batch. Note that this won't
+ * get called for partial batches when using `unsafeFlushUIChangesBeforeBatchEnds`.
+ * This is called from the UIManager queue. Can be used to add UI operations in that batch.
+ */
+- (void)uiManagerWillFlushUIBlocks:(RCTUIManager *)manager;
+
+@end
+
 @protocol RCTScrollableProtocol;
 
 /**
@@ -105,6 +122,23 @@ RCT_EXTERN NSString *const RCTUIManagerRootViewKey;
  */
 - (void)addUIBlock:(RCTViewManagerUIBlock)block;
 
+/**
+ * Schedule a block to be executed on the UI thread. Useful if you need to execute
+ * view logic before all currently queued view updates have completed.
+ */
+- (void)prependUIBlock:(RCTViewManagerUIBlock)block;
+
+/**
+ * Add a UIManagerObserver. See the RCTUIManagerObserver protocol for more info. This
+ * method can be called safely from any queue.
+ */
+- (void)addUIManagerObserver:(id<RCTUIManagerObserver>)observer;
+
+/**
+ * Remove a UIManagerObserver. This method can be called safely from any queue.
+ */
+- (void)removeUIManagerObserver:(id<RCTUIManagerObserver>)observer;
+
 /**
  * Used by native animated module to bypass the process of updating the values through the shadow
  * view hierarchy. This method will directly update native views, which means that updates for
diff --git a/React/Modules/RCTUIManager.m b/React/Modules/RCTUIManager.m
index 26918341bcae0b..bd1e72bb6f4f5f 100644
--- a/React/Modules/RCTUIManager.m
+++ b/React/Modules/RCTUIManager.m
@@ -225,6 +225,7 @@ @implementation RCTUIManager
   NSDictionary *_componentDataByName;
 
   NSMutableSet<id<RCTComponent>> *_bridgeTransactionListeners;
+  NSMutableSet<id<RCTUIManagerObserver>> *_uiManagerObservers;
 }
 
 @synthesize bridge = _bridge;
@@ -305,6 +306,7 @@ - (void)setBridge:(RCTBridge *)bridge
   _rootViewTags = [NSMutableSet new];
 
   _bridgeTransactionListeners = [NSMutableSet new];
+  _uiManagerObservers = [NSMutableSet new];
 
   _viewsToBeDeleted = [NSMutableSet new];
 
@@ -501,6 +503,19 @@ - (void)addUIBlock:(RCTViewManagerUIBlock)block
   [_pendingUIBlocks addObject:block];
 }
 
+- (void)prependUIBlock:(RCTViewManagerUIBlock)block
+{
+  RCTAssertThread(RCTGetUIManagerQueue(),
+                  @"-[RCTUIManager prependUIBlock:] should only be called from the "
+                  "UIManager's queue (get this using `RCTGetUIManagerQueue()`)");
+
+  if (!block || !_viewRegistry) {
+    return;
+  }
+
+  [_pendingUIBlocks insertObject:block atIndex:0];
+}
+
 - (RCTViewManagerUIBlock)uiBlockWithLayoutUpdateForRootView:(RCTRootShadowView *)rootShadowView
 {
   RCTAssert(!RCTIsMainQueue(), @"Should be called on shadow queue");
@@ -698,6 +713,20 @@ - (void)_amendPendingUIBlocksWithStylePropagationUpdateForShadowView:(RCTShadowV
   }
 }
 
+- (void)addUIManagerObserver:(id<RCTUIManagerObserver>)observer
+{
+  dispatch_async(RCTGetUIManagerQueue(), ^{
+    [self->_uiManagerObservers addObject:observer];
+  });
+}
+
+- (void)removeUIManagerObserver:(id<RCTUIManagerObserver>)observer
+{
+  dispatch_async(RCTGetUIManagerQueue(), ^{
+    [self->_uiManagerObservers removeObject:observer];
+  });
+}
+
 /**
  * A method to be called from JS, which takes a container ID and then releases
  * all subviews for that container upon receipt.
@@ -1139,6 +1168,10 @@ - (void)_layoutAndMount
     }
   }];
 
+  for (id<RCTUIManagerObserver> observer in _uiManagerObservers) {
+    [observer uiManagerWillFlushUIBlocks:self];
+  }
+
   [self flushUIBlocks];
 }
 

From ec5baf02bd2549489fdf871344eb0a0777b495be Mon Sep 17 00:00:00 2001
From: Janic Duplessis <janicduplessis@gmail.com>
Date: Tue, 28 Mar 2017 06:38:28 -0700
Subject: [PATCH 206/366] Fix cxx bridge headers when archiving

Summary:
There were some headers that were in the `public` or `private` section instead of `project` this causes headers to be included in archives and prevent it from being able to be uploaded to the app store. This fixes it by using only `project` headers and copy files like we use in other places.

Also fixes a file that was moved and not updated in ReactCxx.xcodeproj.

**Test plan**
Tested that I am now able to upload an archive on the app store.
Closes https://github.com/facebook/react-native/pull/13008

Differential Revision: D4779894

Pulled By: javache

fbshipit-source-id: 6e36e925cc3fc03c095c9f1872eb5a45b7f0d78c
---
 React/ReactCxx.xcodeproj/project.pbxproj | 60 +++++++++++++++++-------
 1 file changed, 44 insertions(+), 16 deletions(-)

diff --git a/React/ReactCxx.xcodeproj/project.pbxproj b/React/ReactCxx.xcodeproj/project.pbxproj
index 62737a92df59e2..e39212a8cbffba 100644
--- a/React/ReactCxx.xcodeproj/project.pbxproj
+++ b/React/ReactCxx.xcodeproj/project.pbxproj
@@ -84,16 +84,16 @@
 		139D7E9B1E25C70B00323FB7 /* fast-dtoa.cc in Sources */ = {isa = PBXBuildFile; fileRef = 139D7E431E25C5A300323FB7 /* fast-dtoa.cc */; };
 		139D7E9D1E25C70B00323FB7 /* fixed-dtoa.cc in Sources */ = {isa = PBXBuildFile; fileRef = 139D7E451E25C5A300323FB7 /* fixed-dtoa.cc */; };
 		139D7EA01E25C70B00323FB7 /* strtod.cc in Sources */ = {isa = PBXBuildFile; fileRef = 139D7E481E25C5A300323FB7 /* strtod.cc */; };
-		139D7EA51E25C85300323FB7 /* bignum-dtoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E3A1E25C5A300323FB7 /* bignum-dtoa.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		139D7EA61E25C85300323FB7 /* bignum.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E3C1E25C5A300323FB7 /* bignum.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		139D7EA71E25C85300323FB7 /* cached-powers.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E3E1E25C5A300323FB7 /* cached-powers.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		139D7EA81E25C85300323FB7 /* diy-fp.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E401E25C5A300323FB7 /* diy-fp.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		139D7EA91E25C85300323FB7 /* double-conversion.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E421E25C5A300323FB7 /* double-conversion.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		139D7EAA1E25C85300323FB7 /* fast-dtoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E441E25C5A300323FB7 /* fast-dtoa.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		139D7EAB1E25C85300323FB7 /* fixed-dtoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E461E25C5A300323FB7 /* fixed-dtoa.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		139D7EAC1E25C85300323FB7 /* ieee.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E471E25C5A300323FB7 /* ieee.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		139D7EAD1E25C85300323FB7 /* strtod.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E491E25C5A300323FB7 /* strtod.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		139D7EAE1E25C85300323FB7 /* utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E4A1E25C5A300323FB7 /* utils.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		139D7EA51E25C85300323FB7 /* bignum-dtoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E3A1E25C5A300323FB7 /* bignum-dtoa.h */; };
+		139D7EA61E25C85300323FB7 /* bignum.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E3C1E25C5A300323FB7 /* bignum.h */; };
+		139D7EA71E25C85300323FB7 /* cached-powers.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E3E1E25C5A300323FB7 /* cached-powers.h */; };
+		139D7EA81E25C85300323FB7 /* diy-fp.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E401E25C5A300323FB7 /* diy-fp.h */; };
+		139D7EA91E25C85300323FB7 /* double-conversion.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E421E25C5A300323FB7 /* double-conversion.h */; };
+		139D7EAA1E25C85300323FB7 /* fast-dtoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E441E25C5A300323FB7 /* fast-dtoa.h */; };
+		139D7EAB1E25C85300323FB7 /* fixed-dtoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E461E25C5A300323FB7 /* fixed-dtoa.h */; };
+		139D7EAC1E25C85300323FB7 /* ieee.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E471E25C5A300323FB7 /* ieee.h */; };
+		139D7EAD1E25C85300323FB7 /* strtod.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E491E25C5A300323FB7 /* strtod.h */; };
+		139D7EAE1E25C85300323FB7 /* utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 139D7E4A1E25C5A300323FB7 /* utils.h */; };
 		139D7F021E25DE1100323FB7 /* logging.cc in Sources */ = {isa = PBXBuildFile; fileRef = 139D7EDA1E25DBDC00323FB7 /* logging.cc */; };
 		139D7F031E25DE1100323FB7 /* raw_logging.cc in Sources */ = {isa = PBXBuildFile; fileRef = 139D7EDB1E25DBDC00323FB7 /* raw_logging.cc */; };
 		139D7F041E25DE1100323FB7 /* signalhandler.cc in Sources */ = {isa = PBXBuildFile; fileRef = 139D7EDC1E25DBDC00323FB7 /* signalhandler.cc */; };
@@ -147,10 +147,10 @@
 		13EBC67A1E2870E400880AC5 /* Value.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B10C1E0369AD0018521A /* Value.cpp */; };
 		13EBC67B1E28723000880AC5 /* Unicode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B10A1E0369AD0018521A /* Unicode.cpp */; };
 		13EBC67D1E28725900880AC5 /* JSCHelpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B1071E0369AD0018521A /* JSCHelpers.cpp */; };
-		13EBC67E1E28726000880AC5 /* JSCHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B1081E0369AD0018521A /* JSCHelpers.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		13EBC6801E28733C00880AC5 /* noncopyable.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B1091E0369AD0018521A /* noncopyable.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		13EBC6811E28733C00880AC5 /* Unicode.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B10B1E0369AD0018521A /* Unicode.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		13EBC6821E28733C00880AC5 /* Value.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B10D1E0369AD0018521A /* Value.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		13EBC67E1E28726000880AC5 /* JSCHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B1081E0369AD0018521A /* JSCHelpers.h */; };
+		13EBC6801E28733C00880AC5 /* noncopyable.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B1091E0369AD0018521A /* noncopyable.h */; };
+		13EBC6811E28733C00880AC5 /* Unicode.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B10B1E0369AD0018521A /* Unicode.h */; };
+		13EBC6821E28733C00880AC5 /* Value.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B10D1E0369AD0018521A /* Value.h */; };
 		13F17A851B8493E5007D4C75 /* RCTRedBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 13F17A841B8493E5007D4C75 /* RCTRedBox.m */; };
 		13F880361E296D2800C3C7A1 /* JavaScriptCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7A27DC1DE32541002E3F95 /* JavaScriptCore.h */; };
 		13F880371E296D2800C3C7A1 /* JSCHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B1081E0369AD0018521A /* JSCHelpers.h */; };
@@ -213,6 +213,20 @@
 		14F7A0F01BDA714B003C6C10 /* RCTFPSGraph.m in Sources */ = {isa = PBXBuildFile; fileRef = 14F7A0EF1BDA714B003C6C10 /* RCTFPSGraph.m */; };
 		191E3EBE1C29D9AF00C180A6 /* RCTRefreshControlManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 191E3EBD1C29D9AF00C180A6 /* RCTRefreshControlManager.m */; };
 		191E3EC11C29DC3800C180A6 /* RCTRefreshControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 191E3EC01C29DC3800C180A6 /* RCTRefreshControl.m */; };
+		19F61BFA1E8495CD00571D81 /* bignum-dtoa.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 139D7E3A1E25C5A300323FB7 /* bignum-dtoa.h */; };
+		19F61BFB1E8495CD00571D81 /* bignum.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 139D7E3C1E25C5A300323FB7 /* bignum.h */; };
+		19F61BFC1E8495CD00571D81 /* cached-powers.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 139D7E3E1E25C5A300323FB7 /* cached-powers.h */; };
+		19F61BFD1E8495CD00571D81 /* diy-fp.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 139D7E401E25C5A300323FB7 /* diy-fp.h */; };
+		19F61BFE1E8495CD00571D81 /* double-conversion.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 139D7E421E25C5A300323FB7 /* double-conversion.h */; };
+		19F61BFF1E8495CD00571D81 /* fast-dtoa.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 139D7E441E25C5A300323FB7 /* fast-dtoa.h */; };
+		19F61C001E8495CD00571D81 /* fixed-dtoa.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 139D7E461E25C5A300323FB7 /* fixed-dtoa.h */; };
+		19F61C011E8495CD00571D81 /* ieee.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 139D7E471E25C5A300323FB7 /* ieee.h */; };
+		19F61C021E8495CD00571D81 /* strtod.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 139D7E491E25C5A300323FB7 /* strtod.h */; };
+		19F61C031E8495CD00571D81 /* utils.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 139D7E4A1E25C5A300323FB7 /* utils.h */; };
+		19F61C041E8495FF00571D81 /* JSCHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B1081E0369AD0018521A /* JSCHelpers.h */; };
+		19F61C051E8495FF00571D81 /* noncopyable.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B1091E0369AD0018521A /* noncopyable.h */; };
+		19F61C061E8495FF00571D81 /* Unicode.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B10B1E0369AD0018521A /* Unicode.h */; };
+		19F61C071E8495FF00571D81 /* Value.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B10D1E0369AD0018521A /* Value.h */; };
 		27595AA41E575C7800CCE2B1 /* CxxModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0A71E03699D0018521A /* CxxModule.h */; };
 		27595AA51E575C7800CCE2B1 /* CxxNativeModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0A91E03699D0018521A /* CxxNativeModule.h */; };
 		27595AA61E575C7800CCE2B1 /* Executor.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0AB1E03699D0018521A /* Executor.h */; };
@@ -459,8 +473,8 @@
 		3D3030261DF8295E00D6DDAE /* JSCWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7A27DE1DE32541002E3F95 /* JSCWrapper.h */; };
 		3D37B5821D522B190042D5B5 /* RCTFont.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3D37B5811D522B190042D5B5 /* RCTFont.mm */; };
 		3D3C08891DE342FB00C268FA /* libyoga.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D3C059A1DE3340900C268FA /* libyoga.a */; };
-		3D3CD93D1DE5FC1400167DC4 /* JavaScriptCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7A27DC1DE32541002E3F95 /* JavaScriptCore.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		3D3CD93E1DE5FC1400167DC4 /* JSCWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7A27DE1DE32541002E3F95 /* JSCWrapper.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		3D3CD93D1DE5FC1400167DC4 /* JavaScriptCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7A27DC1DE32541002E3F95 /* JavaScriptCore.h */; };
+		3D3CD93E1DE5FC1400167DC4 /* JSCWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7A27DE1DE32541002E3F95 /* JSCWrapper.h */; };
 		3D3CD9411DE5FC5300167DC4 /* libcxxreact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D3CD9251DE5FBEC00167DC4 /* libcxxreact.a */; };
 		3D3CD9451DE5FC7100167DC4 /* JSBundleType.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D3CD8F51DE5FB2300167DC4 /* JSBundleType.h */; };
 		3D3CD9471DE5FC7800167DC4 /* oss-compat-util.h in Headers */ = {isa = PBXBuildFile; fileRef = AC70D2EE1DE48AC5002E6351 /* oss-compat-util.h */; };
@@ -1016,6 +1030,16 @@
 			dstPath = "include/$(PRODUCT_NAME)";
 			dstSubfolderSpec = 16;
 			files = (
+				19F61BFA1E8495CD00571D81 /* bignum-dtoa.h in CopyFiles */,
+				19F61BFB1E8495CD00571D81 /* bignum.h in CopyFiles */,
+				19F61BFC1E8495CD00571D81 /* cached-powers.h in CopyFiles */,
+				19F61BFD1E8495CD00571D81 /* diy-fp.h in CopyFiles */,
+				19F61BFE1E8495CD00571D81 /* double-conversion.h in CopyFiles */,
+				19F61BFF1E8495CD00571D81 /* fast-dtoa.h in CopyFiles */,
+				19F61C001E8495CD00571D81 /* fixed-dtoa.h in CopyFiles */,
+				19F61C011E8495CD00571D81 /* ieee.h in CopyFiles */,
+				19F61C021E8495CD00571D81 /* strtod.h in CopyFiles */,
+				19F61C031E8495CD00571D81 /* utils.h in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2618,6 +2642,10 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				19F61C041E8495FF00571D81 /* JSCHelpers.h in Headers */,
+				19F61C051E8495FF00571D81 /* noncopyable.h in Headers */,
+				19F61C061E8495FF00571D81 /* Unicode.h in Headers */,
+				19F61C071E8495FF00571D81 /* Value.h in Headers */,
 				3D3030251DF8295E00D6DDAE /* JavaScriptCore.h in Headers */,
 				3D3030261DF8295E00D6DDAE /* JSCWrapper.h in Headers */,
 			);

From 7de59b102d173ab1583b8c7d3a34556614182c94 Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieterdb@fb.com>
Date: Tue, 28 Mar 2017 07:11:45 -0700
Subject: [PATCH 207/366] Support calls through MessageQueue when interecting
 with JSValue directly

Reviewed By: yungsters

Differential Revision: D4756241

fbshipit-source-id: 5c7309a18ac476a620451bf471471596c9f82cf8
---
 Libraries/BatchedBridge/MessageQueue.js | 33 ++++++++++++++-----------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/Libraries/BatchedBridge/MessageQueue.js b/Libraries/BatchedBridge/MessageQueue.js
index 2c5cc61de1a385..80c27443b2c0c9 100644
--- a/Libraries/BatchedBridge/MessageQueue.js
+++ b/Libraries/BatchedBridge/MessageQueue.js
@@ -41,20 +41,13 @@ const TRACE_TAG_REACT_APPS = 1 << 17;
 
 const DEBUG_INFO_LIMIT = 32;
 
-const guard = (fn) => {
-  try {
-    fn();
-  } catch (error) {
-    ErrorUtils.reportFatalError(error);
-  }
-};
-
 class MessageQueue {
   _callableModules: {[key: string]: Object};
   _queue: [Array<number>, Array<number>, Array<any>, number];
   _callbacks: [];
   _callbackID: number;
   _callID: number;
+  _inCall: number;
   _lastFlush: number;
   _eventLoopStartTime: number;
 
@@ -104,7 +97,7 @@ class MessageQueue {
   }
 
   callFunctionReturnFlushedQueue(module: string, method: string, args: Array<any>) {
-    guard(() => {
+    this.__guard(() => {
       this.__callFunction(module, method, args);
       this.__callImmediates();
     });
@@ -114,7 +107,7 @@ class MessageQueue {
 
   callFunctionReturnResultAndFlushedQueue(module: string, method: string, args: Array<any>) {
     let result;
-    guard(() => {
+    this.__guard(() => {
       result = this.__callFunction(module, method, args);
       this.__callImmediates();
     });
@@ -123,7 +116,7 @@ class MessageQueue {
   }
 
   invokeCallbackAndReturnFlushedQueue(cbID: number, args: Array<any>) {
-    guard(() => {
+    this.__guard(() => {
       this.__invokeCallback(cbID, args);
       this.__callImmediates();
     });
@@ -188,7 +181,8 @@ class MessageQueue {
 
     const now = new Date().getTime();
     if (global.nativeFlushQueueImmediate &&
-        now - this._lastFlush >= MIN_TIME_BETWEEN_FLUSHES_MS) {
+        (now - this._lastFlush >= MIN_TIME_BETWEEN_FLUSHES_MS ||
+        this._inCall === 0)) {
       global.nativeFlushQueueImmediate(this._queue);
       this._queue = [[], [], [], this._callID];
       this._lastFlush = now;
@@ -214,12 +208,23 @@ class MessageQueue {
   }
 
   /**
-   * "Private" methods
+   * Private methods
    */
 
+  __guard(fn: () => void) {
+    this._inCall++;
+    try {
+      fn();
+    } catch (error) {
+      ErrorUtils.reportFatalError(error);
+    } finally {
+      this._inCall--;
+    }
+  }
+
   __callImmediates() {
     Systrace.beginEvent('JSTimersExecution.callImmediates()');
-    guard(() => JSTimersExecution.callImmediates());
+    this.__guard(() => JSTimersExecution.callImmediates());
     Systrace.endEvent();
   }
 

From bb48c0c608b16ecce9b6a1c7b81318b43d840ca0 Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieterdb@fb.com>
Date: Tue, 28 Mar 2017 08:25:51 -0700
Subject: [PATCH 208/366] Manually inline parseErrorStack

Reviewed By: davidaurelio

Differential Revision: D4779541

fbshipit-source-id: bb395a0abd3cf1f9c940429f375cd57ecb992789
---
 Libraries/Core/Timers/JSTimers.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/Libraries/Core/Timers/JSTimers.js b/Libraries/Core/Timers/JSTimers.js
index 967552c29ec833..a236c07cb76510 100644
--- a/Libraries/Core/Timers/JSTimers.js
+++ b/Libraries/Core/Timers/JSTimers.js
@@ -13,11 +13,10 @@
 
 // Note that the module JSTimers is split into two in order to solve a cycle
 // in dependencies. NativeModules > BatchedBridge > MessageQueue > JSTimersExecution
-const RCTTiming = require('NativeModules').Timing;
 const JSTimersExecution = require('JSTimersExecution');
 const Platform = require('Platform');
 
-const parseErrorStack = require('parseErrorStack');
+const {Timing} = require('NativeModules');
 
 import type {JSTimerType} from 'JSTimersExecution';
 
@@ -37,6 +36,7 @@ function _allocateCallback(func: Function, type: JSTimerType): number {
   JSTimersExecution.callbacks[freeIndex] = func;
   JSTimersExecution.types[freeIndex] = type;
   if (__DEV__) {
+    const parseErrorStack = require('parseErrorStack');
     const e = (new Error() : any);
     e.framesToPop = 1;
     const stack = parseErrorStack(e);
@@ -60,14 +60,14 @@ function _freeCallback(timerID: number) {
     JSTimersExecution._clearIndex(index);
     const type = JSTimersExecution.types[index];
     if (type !== 'setImmediate' && type !== 'requestIdleCallback') {
-      RCTTiming.deleteTimer(timerID);
+      Timing.deleteTimer(timerID);
     }
   }
 }
 
 const MAX_TIMER_DURATION_MS = 60 * 1000;
 const IS_ANDROID = Platform.OS === 'android';
-const ANDROID_LONG_TIMER_MESSAGE = 
+const ANDROID_LONG_TIMER_MESSAGE =
   'Setting a timer for a long period of time, i.e. multiple minutes, is a ' +
   'performance and correctness issue on Android as it keeps the timer ' +
   'module awake, and timers can only be called when the app is in the foreground. ' +
@@ -84,13 +84,13 @@ const JSTimers = {
    * @param {number} duration Number of milliseconds.
    */
   setTimeout: function(func: Function, duration: number, ...args?: any): number {
-    if (IS_ANDROID && duration > MAX_TIMER_DURATION_MS) {
+    if (__DEV__ && IS_ANDROID && duration > MAX_TIMER_DURATION_MS) {
       console.warn(
           ANDROID_LONG_TIMER_MESSAGE + '\n' + '(Saw setTimeout with duration ' +
           duration + 'ms)');
     }
     const id = _allocateCallback(() => func.apply(undefined, args), 'setTimeout');
-    RCTTiming.createTimer(id, duration || 0, Date.now(), /* recurring */ false);
+    Timing.createTimer(id, duration || 0, Date.now(), /* recurring */ false);
     return id;
   },
 
@@ -99,13 +99,13 @@ const JSTimers = {
    * @param {number} duration Number of milliseconds.
    */
   setInterval: function(func: Function, duration: number, ...args?: any): number {
-    if (IS_ANDROID && duration > MAX_TIMER_DURATION_MS) {
+    if (__DEV__ && IS_ANDROID && duration > MAX_TIMER_DURATION_MS) {
       console.warn(
           ANDROID_LONG_TIMER_MESSAGE + '\n' + '(Saw setInterval with duration ' +
           duration + 'ms)');
     }
     const id = _allocateCallback(() => func.apply(undefined, args), 'setInterval');
-    RCTTiming.createTimer(id, duration || 0, Date.now(), /* recurring */ true);
+    Timing.createTimer(id, duration || 0, Date.now(), /* recurring */ true);
     return id;
   },
 
@@ -124,7 +124,7 @@ const JSTimers = {
    */
   requestAnimationFrame: function(func : Function) {
     const id = _allocateCallback(func, 'requestAnimationFrame');
-    RCTTiming.createTimer(id, 1, Date.now(), /* recurring */ false);
+    Timing.createTimer(id, 1, Date.now(), /* recurring */ false);
     return id;
   },
 
@@ -134,7 +134,7 @@ const JSTimers = {
    */
   requestIdleCallback: function(func : Function) {
     if (JSTimersExecution.requestIdleCallbacks.length === 0) {
-      RCTTiming.setSendIdleEvents(true);
+      Timing.setSendIdleEvents(true);
     }
 
     const id = _allocateCallback(func, 'requestIdleCallback');
@@ -150,7 +150,7 @@ const JSTimers = {
     }
 
     if (JSTimersExecution.requestIdleCallbacks.length === 0) {
-      RCTTiming.setSendIdleEvents(false);
+      Timing.setSendIdleEvents(false);
     }
   },
 

From fb54a1eb3ec09473b765cea66326b2200eb4a3c3 Mon Sep 17 00:00:00 2001
From: Janic Duplessis <janicduplessis@gmail.com>
Date: Tue, 28 Mar 2017 09:08:49 -0700
Subject: [PATCH 209/366] Native Animated - Fix timing animation delay on iOS

Summary:
Delay was broken with native animations on iOS. After checking what android does to handle delay, I noticed it does nothing at all since the delay is already handled when generating the animation frames. This removes all code that tried to handle delay on iOS since it is not needed and breaks it. Also updated an example to have delay in UI explorer.

Fixes #12388

**Test plan**
Tested that delay works in UIExplorer on iOS and Android.
Closes https://github.com/facebook/react-native/pull/12443

Differential Revision: D4582514

Pulled By: javache

fbshipit-source-id: dc53295e716c8476c71ccd578380962f056de2be
---
 Examples/UIExplorer/js/NativeAnimationsExample.js      |  4 ++--
 Libraries/Animated/src/AnimatedImplementation.js       |  1 -
 .../Animated/src/__tests__/AnimatedNative-test.js      |  8 ++++----
 Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m  | 10 ----------
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/Examples/UIExplorer/js/NativeAnimationsExample.js b/Examples/UIExplorer/js/NativeAnimationsExample.js
index a45986ee9a84e8..cbf0b7b394feb2 100644
--- a/Examples/UIExplorer/js/NativeAnimationsExample.js
+++ b/Examples/UIExplorer/js/NativeAnimationsExample.js
@@ -352,12 +352,12 @@ exports.examples = [
     },
   },
   {
-    title: 'Opacity without interpolation',
+    title: 'Opacity with delay',
     render: function() {
       return (
         <Tester
           type="timing"
-          config={{ duration: 1000 }}>
+          config={{ duration: 1000, delay: 1000 }}>
           {anim => (
             <Animated.View
               style={[
diff --git a/Libraries/Animated/src/AnimatedImplementation.js b/Libraries/Animated/src/AnimatedImplementation.js
index 09c3c2129452a6..1304517abd7560 100644
--- a/Libraries/Animated/src/AnimatedImplementation.js
+++ b/Libraries/Animated/src/AnimatedImplementation.js
@@ -289,7 +289,6 @@ class TimingAnimation extends Animation {
       type: 'frames',
       frames,
       toValue: this._toValue,
-      delay: this._delay,
       iterations: this.__iterations,
     };
   }
diff --git a/Libraries/Animated/src/__tests__/AnimatedNative-test.js b/Libraries/Animated/src/__tests__/AnimatedNative-test.js
index c39079c656087e..4631eae43f749f 100644
--- a/Libraries/Animated/src/__tests__/AnimatedNative-test.js
+++ b/Libraries/Animated/src/__tests__/AnimatedNative-test.js
@@ -36,7 +36,7 @@ function createAndMountComponent(ComponentClass, props) {
 
 describe('Native Animated', () => {
 
-  let nativeAnimatedModule = require('NativeModules').NativeAnimatedModule;
+  const nativeAnimatedModule = require('NativeModules').NativeAnimatedModule;
 
   beforeEach(() => {
     nativeAnimatedModule.addAnimatedEventToView = jest.fn();
@@ -276,7 +276,7 @@ describe('Native Animated', () => {
       expect(nativeAnimatedModule.startAnimatingNode).toBeCalledWith(
         jasmine.any(Number),
         jasmine.any(Number),
-        {type: 'frames', frames: jasmine.any(Array), toValue: jasmine.any(Number), delay: jasmine.any(Number), iterations: 1},
+        {type: 'frames', frames: jasmine.any(Array), toValue: jasmine.any(Number), iterations: 1},
         jasmine.any(Function)
       );
 
@@ -587,7 +587,7 @@ describe('Native Animated', () => {
       expect(nativeAnimatedModule.startAnimatingNode).toBeCalledWith(
         jasmine.any(Number),
         jasmine.any(Number),
-        {type: 'frames', frames: jasmine.any(Array), toValue: jasmine.any(Number), delay: jasmine.any(Number), iterations: 1},
+        {type: 'frames', frames: jasmine.any(Array), toValue: jasmine.any(Number), iterations: 1},
         jasmine.any(Function)
       );
     });
@@ -666,7 +666,7 @@ describe('Native Animated', () => {
       expect(nativeAnimatedModule.startAnimatingNode).toBeCalledWith(
         jasmine.any(Number),
         jasmine.any(Number),
-        {type: 'frames', frames: jasmine.any(Array), toValue: jasmine.any(Number), delay: jasmine.any(Number), iterations: 1},
+        {type: 'frames', frames: jasmine.any(Array), toValue: jasmine.any(Number), iterations: 1},
         jasmine.any(Function)
       );
       const animationId = nativeAnimatedModule.startAnimatingNode.mock.calls[0][0];
diff --git a/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m b/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m
index ebe4d60d7e8d8e..ffd1740dceb13c 100644
--- a/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m
+++ b/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m
@@ -33,7 +33,6 @@ @implementation RCTFrameAnimation
   NSArray<NSNumber *> *_frames;
   CGFloat _toValue;
   CGFloat _fromValue;
-  NSTimeInterval _delay;
   NSTimeInterval _animationStartTime;
   NSTimeInterval _animationCurrentTime;
   RCTResponseSenderBlock _callback;
@@ -46,14 +45,12 @@ - (instancetype)initWithId:(NSNumber *)animationId
 {
   if ((self = [super init])) {
     NSNumber *toValue = [RCTConvert NSNumber:config[@"toValue"]] ?: @1;
-    NSTimeInterval delay = [RCTConvert double:config[@"delay"]];
     NSArray<NSNumber *> *frames = [RCTConvert NSNumberArray:config[@"frames"]];
 
     _animationId = animationId;
     _toValue = toValue.floatValue;
     _fromValue = valueNode.value;
     _valueNode = valueNode;
-    _delay = delay;
     _frames = [frames copy];
     _callback = [callback copy];
   }
@@ -93,16 +90,9 @@ - (void)stepAnimation
   }
 
   NSTimeInterval currentTime = CACurrentMediaTime();
-  NSTimeInterval stepInterval = currentTime - _animationCurrentTime;
   _animationCurrentTime = currentTime;
   NSTimeInterval currentDuration = _animationCurrentTime - _animationStartTime;
 
-  if (_delay > 0) {
-    // Decrement delay
-    _delay -= stepInterval;
-    return;
-  }
-
   // Determine how many frames have passed since last update.
   // Get index of frames that surround the current interval
   NSUInteger startIndex = floor(currentDuration / SINGLE_FRAME_INTERVAL);

From 1d37dd063c2470b597dc0ad90d4b57ba1ead7203 Mon Sep 17 00:00:00 2001
From: Janic Duplessis <janicduplessis@gmail.com>
Date: Tue, 28 Mar 2017 09:08:51 -0700
Subject: [PATCH 210/366] Native Animated - Add tests on iOS

Summary:
Adds unit tests to the Native Animated implementation on iOS. This pretty much mirrors the tests we currently have on Android.

It also fixes 2 bugs I've found when adding the tests and pass the current time in `stepAnimation` instead of using `CACurrentMediaTime` to make testing easier.

- `stopListeningToAnimatedNodeValue` did not actually work at all, it should set the listener to nil.
- The finished value in the animation end callback was always true, this simplifies the `RCTAnimationDriver` interface to get rid of `removeAnimation` and fixes the end callback value.

**Test plan**
- Run the tests
- Make sure the UIExplorer example still works
Closes https://github.com/facebook/react-native/pull/13068

Differential Revision: D4786701

Pulled By: javache

fbshipit-source-id: a4f07e6eec1f363ca47b6f27984041793c915bfc
---
 .../UIExplorer.xcodeproj/project.pbxproj      |  27 +-
 .../RCTAnimationUtilsTests.m                  | 122 ++++
 .../RCTNativeAnimatedNodesManagerTests.m      | 666 ++++++++++++++++++
 .../Drivers/RCTAnimationDriver.h              |   5 +-
 .../Drivers/RCTFrameAnimation.m               |  18 +-
 .../Drivers/RCTSpringAnimation.m              |  18 +-
 .../Nodes/RCTInterpolationAnimatedNode.m      |  32 +-
 .../RCTAnimation.xcodeproj/project.pbxproj    | 186 +++++
 Libraries/NativeAnimation/RCTAnimationUtils.h |   6 +
 Libraries/NativeAnimation/RCTAnimationUtils.m |  37 +
 .../NativeAnimation/RCTNativeAnimatedModule.m |   3 +-
 .../RCTNativeAnimatedNodesManager.h           |   8 +-
 .../RCTNativeAnimatedNodesManager.m           |  14 +-
 13 files changed, 1069 insertions(+), 73 deletions(-)
 create mode 100644 Examples/UIExplorer/UIExplorerUnitTests/RCTAnimationUtilsTests.m
 create mode 100644 Examples/UIExplorer/UIExplorerUnitTests/RCTNativeAnimatedNodesManagerTests.m

diff --git a/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj b/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj
index 4024e25f618422..484503d464fbe7 100644
--- a/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj
+++ b/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj
@@ -55,6 +55,10 @@
 		14D6D7281B2222EF001FB087 /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139FDED91B0651EA00C62182 /* libRCTWebSocket.a */; };
 		14D6D7291B2222EF001FB087 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 14AADF041AC3DB95002390C9 /* libReact.a */; };
 		14DC67F41AB71881001358AB /* libRCTPushNotification.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 14DC67F11AB71876001358AB /* libRCTPushNotification.a */; };
+		192F69B81E82409A008692C7 /* RCTAnimationUtilsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 192F69B51E82409A008692C7 /* RCTAnimationUtilsTests.m */; };
+		192F69B91E82409A008692C7 /* RCTConvert_YGValueTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 192F69B61E82409A008692C7 /* RCTConvert_YGValueTests.m */; };
+		192F69BA1E82409A008692C7 /* RCTNativeAnimatedNodesManagerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 192F69B71E82409A008692C7 /* RCTNativeAnimatedNodesManagerTests.m */; };
+		192F69DA1E8240E2008692C7 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 13E501A31D07A502005F35D8 /* libRCTAnimation.a */; };
 		272E6B3F1BEA849E001FCF37 /* UpdatePropertiesExampleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 272E6B3C1BEA849E001FCF37 /* UpdatePropertiesExampleView.m */; };
 		27B885561BED29AF00008352 /* RCTRootViewIntegrationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 27B885551BED29AF00008352 /* RCTRootViewIntegrationTests.m */; };
 		27F441EC1BEBE5030039B79C /* FlexibleSizeExampleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 27F441E81BEBE5030039B79C /* FlexibleSizeExampleView.m */; };
@@ -422,6 +426,9 @@
 		14D6D7101B220EB3001FB087 /* libOCMock.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libOCMock.a; sourceTree = "<group>"; };
 		14DC67E71AB71876001358AB /* RCTPushNotification.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTPushNotification.xcodeproj; path = ../../Libraries/PushNotificationIOS/RCTPushNotification.xcodeproj; sourceTree = "<group>"; };
 		14E0EEC81AB118F7000DECC3 /* RCTActionSheet.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTActionSheet.xcodeproj; path = ../../Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj; sourceTree = "<group>"; };
+		192F69B51E82409A008692C7 /* RCTAnimationUtilsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTAnimationUtilsTests.m; sourceTree = "<group>"; };
+		192F69B61E82409A008692C7 /* RCTConvert_YGValueTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTConvert_YGValueTests.m; sourceTree = "<group>"; };
+		192F69B71E82409A008692C7 /* RCTNativeAnimatedNodesManagerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTNativeAnimatedNodesManagerTests.m; sourceTree = "<group>"; };
 		272E6B3B1BEA849E001FCF37 /* UpdatePropertiesExampleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UpdatePropertiesExampleView.h; path = UIExplorer/NativeExampleViews/UpdatePropertiesExampleView.h; sourceTree = "<group>"; };
 		272E6B3C1BEA849E001FCF37 /* UpdatePropertiesExampleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UpdatePropertiesExampleView.m; path = UIExplorer/NativeExampleViews/UpdatePropertiesExampleView.m; sourceTree = "<group>"; };
 		27B885551BED29AF00008352 /* RCTRootViewIntegrationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTRootViewIntegrationTests.m; sourceTree = "<group>"; };
@@ -456,6 +463,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				192F69DA1E8240E2008692C7 /* libRCTAnimation.a in Frameworks */,
 				14D6D71E1B2222EF001FB087 /* libRCTActionSheet.a in Frameworks */,
 				14D6D71F1B2222EF001FB087 /* libRCTAdSupport.a in Frameworks */,
 				14D6D7201B2222EF001FB087 /* libRCTGeolocation.a in Frameworks */,
@@ -660,6 +668,9 @@
 		143BC57C1B21E18100462512 /* UIExplorerUnitTests */ = {
 			isa = PBXGroup;
 			children = (
+				192F69B51E82409A008692C7 /* RCTAnimationUtilsTests.m */,
+				192F69B61E82409A008692C7 /* RCTConvert_YGValueTests.m */,
+				192F69B71E82409A008692C7 /* RCTNativeAnimatedNodesManagerTests.m */,
 				13B6C1A21C34225900D3FAF5 /* RCTURLUtilsTests.m */,
 				68FF44371CF6111500720EFD /* RCTBundleURLProviderTests.m */,
 				1497CFA41B21F5E400C1F8F2 /* RCTAllocationTests.m */,
@@ -1433,8 +1444,10 @@
 				1497CFAF1B21F5E400C1F8F2 /* RCTConvert_NSURLTests.m in Sources */,
 				1497CFAE1B21F5E400C1F8F2 /* RCTJSCExecutorTests.m in Sources */,
 				13129DD41C85F87C007D611C /* RCTModuleInitNotificationRaceTests.m in Sources */,
+				192F69B81E82409A008692C7 /* RCTAnimationUtilsTests.m in Sources */,
 				1497CFAD1B21F5E400C1F8F2 /* RCTBridgeTests.m in Sources */,
 				134CB92A1C85A38800265FA6 /* RCTModuleInitTests.m in Sources */,
+				192F69BA1E82409A008692C7 /* RCTNativeAnimatedNodesManagerTests.m in Sources */,
 				1497CFB11B21F5E400C1F8F2 /* RCTEventDispatcherTests.m in Sources */,
 				1497CFB31B21F5E400C1F8F2 /* RCTUIManagerTests.m in Sources */,
 				13DB03481B5D2ED500C27245 /* RCTJSONTests.m in Sources */,
@@ -1445,6 +1458,7 @@
 				39AA31A41DC1DFDC000F7EBB /* RCTUnicodeDecodeTests.m in Sources */,
 				13B6C1A31C34225900D3FAF5 /* RCTURLUtilsTests.m in Sources */,
 				8385CF041B87479200C6273E /* RCTImageLoaderHelpers.m in Sources */,
+				192F69B91E82409A008692C7 /* RCTConvert_YGValueTests.m in Sources */,
 				BC9C03401DC9F1D600B1C635 /* RCTDevMenuTests.m in Sources */,
 				68FF44381CF6111500720EFD /* RCTBundleURLProviderTests.m in Sources */,
 				8385CEF51B873B5C00C6273E /* RCTImageLoaderTests.m in Sources */,
@@ -1613,9 +1627,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
 				INFOPLIST_FILE = "$(SRCROOT)/UIExplorer/Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited)";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.facebook.react.uiapp;
 				PRODUCT_NAME = UIExplorer;
@@ -1629,7 +1641,6 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				DEVELOPMENT_TEAM = V9WTTPBFK9;
 				INFOPLIST_FILE = "$(SRCROOT)/UIExplorer/Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited)";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.facebook.react.uiapp;
 				PRODUCT_NAME = UIExplorer;
@@ -1864,6 +1875,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
@@ -1907,9 +1919,7 @@
 				WARNING_CFLAGS = (
 					"-Wextra",
 					"-Wall",
-					"-Wincompatible-pointer-types",
-					"-Wincompatible-pointer-types-discards-qualifiers",
-					"-Wshadow",
+					"-Wno-semicolon-before-method-body",
 				);
 			};
 			name = Debug;
@@ -1933,6 +1943,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
@@ -1969,9 +1980,7 @@
 				WARNING_CFLAGS = (
 					"-Wextra",
 					"-Wall",
-					"-Wincompatible-pointer-types",
-					"-Wincompatible-pointer-types-discards-qualifiers",
-					"-Wshadow",
+					"-Wno-semicolon-before-method-body",
 				);
 			};
 			name = Release;
diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTAnimationUtilsTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTAnimationUtilsTests.m
new file mode 100644
index 00000000000000..53f176f1232f79
--- /dev/null
+++ b/Examples/UIExplorer/UIExplorerUnitTests/RCTAnimationUtilsTests.m
@@ -0,0 +1,122 @@
+/**
+ * The examples provided by Facebook are for non-commercial testing and
+ * evaluation purposes only.
+ *
+ * Facebook reserves all rights not expressly granted.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
+ * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#import <XCTest/XCTest.h>
+
+#import <RCTAnimation/RCTAnimationUtils.h>
+
+@interface RCTAnimationUtilsTests : XCTestCase
+
+@end
+
+static CGFloat RCTSimpleInterpolation(CGFloat value, NSArray<NSNumber *> *inputRange, NSArray<NSNumber *> *outputRange) {
+  return RCTInterpolateValueInRange(value,
+                                    inputRange,
+                                    outputRange,
+                                    EXTRAPOLATE_TYPE_EXTEND,
+                                    EXTRAPOLATE_TYPE_EXTEND);
+}
+
+@implementation RCTAnimationUtilsTests
+
+// RCTInterpolateValueInRange
+
+- (void)testSimpleOneToOneMapping
+{
+  NSArray<NSNumber *> *input = @[@0, @1];
+  NSArray<NSNumber *> *output = @[@0, @1];
+  XCTAssertEqual(RCTSimpleInterpolation(0, input, output), 0);
+  XCTAssertEqual(RCTSimpleInterpolation(0.5, input, output), 0.5);
+  XCTAssertEqual(RCTSimpleInterpolation(0.8, input, output), 0.8);
+  XCTAssertEqual(RCTSimpleInterpolation(1, input, output), 1);
+}
+
+- (void)testWiderOutputRange
+{
+  NSArray<NSNumber *> *input = @[@0, @1];
+  NSArray<NSNumber *> *output = @[@100, @200];
+  XCTAssertEqual(RCTSimpleInterpolation(0, input, output), 100);
+  XCTAssertEqual(RCTSimpleInterpolation(0.5, input, output), 150);
+  XCTAssertEqual(RCTSimpleInterpolation(0.8, input, output), 180);
+  XCTAssertEqual(RCTSimpleInterpolation(1, input, output), 200);
+}
+
+- (void)testWiderInputRange
+{
+  NSArray<NSNumber *> *input = @[@2000, @3000];
+  NSArray<NSNumber *> *output = @[@1, @2];
+  XCTAssertEqual(RCTSimpleInterpolation(2000, input, output), 1);
+  XCTAssertEqual(RCTSimpleInterpolation(2250, input, output), 1.25);
+  XCTAssertEqual(RCTSimpleInterpolation(2800, input, output), 1.8);
+  XCTAssertEqual(RCTSimpleInterpolation(3000, input, output), 2);
+}
+
+- (void)testManySegments
+{
+  NSArray<NSNumber *> *input = @[@-1, @1, @5];
+  NSArray<NSNumber *> *output = @[@0, @10, @20];
+  XCTAssertEqual(RCTSimpleInterpolation(-1, input, output), 0);
+  XCTAssertEqual(RCTSimpleInterpolation(0, input, output), 5);
+  XCTAssertEqual(RCTSimpleInterpolation(1, input, output), 10);
+  XCTAssertEqual(RCTSimpleInterpolation(2, input, output), 12.5);
+  XCTAssertEqual(RCTSimpleInterpolation(5, input, output), 20);
+}
+
+- (void)testExtendExtrapolate
+{
+  NSArray<NSNumber *> *input = @[@10, @20];
+  NSArray<NSNumber *> *output = @[@0, @1];
+  XCTAssertEqual(RCTSimpleInterpolation(30, input, output), 2);
+  XCTAssertEqual(RCTSimpleInterpolation(5, input, output), -0.5);
+}
+
+- (void)testClampExtrapolate
+{
+  NSArray<NSNumber *> *input = @[@10, @20];
+  NSArray<NSNumber *> *output = @[@0, @1];
+  CGFloat value;
+  value = RCTInterpolateValueInRange(30,
+                                     input,
+                                     output,
+                                     EXTRAPOLATE_TYPE_CLAMP,
+                                     EXTRAPOLATE_TYPE_CLAMP);
+  XCTAssertEqual(value, 1);
+  value = RCTInterpolateValueInRange(5,
+                                     input,
+                                     output,
+                                     EXTRAPOLATE_TYPE_CLAMP,
+                                     EXTRAPOLATE_TYPE_CLAMP);
+  XCTAssertEqual(value, 0);
+}
+
+- (void)testIdentityExtrapolate
+{
+  NSArray<NSNumber *> *input = @[@10, @20];
+  NSArray<NSNumber *> *output = @[@0, @1];
+  CGFloat value;
+  value = RCTInterpolateValueInRange(30,
+                                     input,
+                                     output,
+                                     EXTRAPOLATE_TYPE_IDENTITY,
+                                     EXTRAPOLATE_TYPE_IDENTITY);
+  XCTAssertEqual(value, 30);
+  value = RCTInterpolateValueInRange(5,
+                                     input,
+                                     output,
+                                     EXTRAPOLATE_TYPE_IDENTITY,
+                                     EXTRAPOLATE_TYPE_IDENTITY);
+  XCTAssertEqual(value, 5);
+}
+
+@end
diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTNativeAnimatedNodesManagerTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTNativeAnimatedNodesManagerTests.m
new file mode 100644
index 00000000000000..5b7016dfd8c8ed
--- /dev/null
+++ b/Examples/UIExplorer/UIExplorerUnitTests/RCTNativeAnimatedNodesManagerTests.m
@@ -0,0 +1,666 @@
+/**
+ * The examples provided by Facebook are for non-commercial testing and
+ * evaluation purposes only.
+ *
+ * Facebook reserves all rights not expressly granted.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
+ * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#import <XCTest/XCTest.h>
+
+#import <OCMock/OCMock.h>
+
+#import <RCTAnimation/RCTNativeAnimatedNodesManager.h>
+#import <RCTAnimation/RCTValueAnimatedNode.h>
+#import <React/RCTUIManager.h>
+
+static const NSTimeInterval FRAME_LENGTH = 1.0 / 60.0;
+
+@interface RCTFakeDisplayLink : CADisplayLink
+
+@end
+
+@implementation RCTFakeDisplayLink
+{
+  NSTimeInterval _timestamp;
+}
+
+- (instancetype)init
+{
+  self = [super init];
+  if (self) {
+    _timestamp = 1124.1234143251; // Random
+  }
+  return self;
+}
+
+- (NSTimeInterval)timestamp
+{
+  _timestamp += FRAME_LENGTH;
+  return _timestamp;
+}
+
+@end
+
+@interface RCTFakeValueObserver : NSObject<RCTValueAnimatedNodeObserver>
+
+@property (nonatomic, strong) NSMutableArray<NSNumber *> *calls;
+
+@end
+
+@implementation RCTFakeValueObserver
+
+- (instancetype)init
+{
+  self = [super init];
+  if (self) {
+    _calls = [NSMutableArray new];
+  }
+  return self;
+}
+
+- (void)animatedNode:(__unused RCTValueAnimatedNode *)node didUpdateValue:(CGFloat)value
+{
+  [_calls addObject:@(value)];
+}
+
+@end
+
+@interface RCTFakeEvent : NSObject<RCTEvent>
+
+@end
+
+@implementation RCTFakeEvent
+{
+  NSArray *_arguments;
+}
+
+@synthesize eventName = _eventName;
+@synthesize viewTag = _viewTag;
+@synthesize coalescingKey = _coalescingKey;
+
+- (instancetype)initWithName:(NSString *)name viewTag:(NSNumber *)viewTag arguments:(NSArray *)arguments
+{
+  self = [super init];
+  if (self) {
+    _eventName = name;
+    _viewTag = viewTag;
+    _arguments = arguments;
+  }
+  return self;
+}
+
+- (NSArray *)arguments
+{
+  return _arguments;
+}
+
+RCT_NOT_IMPLEMENTED(+ (NSString *)moduleDotMethod);
+RCT_NOT_IMPLEMENTED(- (BOOL)canCoalesce);
+RCT_NOT_IMPLEMENTED(- (id<RCTEvent>)coalesceWithEvent:(id<RCTEvent>)newEvent);
+
+@end
+
+static id RCTPropChecker(NSString *prop, NSNumber *value)
+{
+  return [OCMArg checkWithBlock:^BOOL(NSDictionary<NSString *, NSNumber *> *props) {
+    BOOL match = fabs(props[prop].doubleValue - value.doubleValue) < FLT_EPSILON;
+    if (!match) {
+      NSLog(@"Props `%@` with value `%@` is not close to `%@`", prop, props[prop], value);
+    }
+    return match;
+  }];
+}
+
+@interface RCTNativeAnimatedNodesManagerTests : XCTestCase
+
+@end
+
+@implementation RCTNativeAnimatedNodesManagerTests
+{
+  id _uiManager;
+  RCTNativeAnimatedNodesManager *_nodesManager;
+  RCTFakeDisplayLink *_displayLink;
+}
+
+- (void)setUp
+{
+  [super setUp];
+
+  _uiManager = [OCMockObject niceMockForClass:[RCTUIManager class]];
+  _nodesManager = [[RCTNativeAnimatedNodesManager alloc] initWithUIManager:_uiManager];
+  _displayLink = [RCTFakeDisplayLink new];
+}
+
+/**
+ * Generates a simple animated nodes graph and attaches the props node to a given viewTag
+ * Parameter opacity is used as a initial value for the "opacity" attribute.
+ *
+ * Nodes are connected as follows (nodes IDs in parens):
+ * ValueNode(1) -> StyleNode(2) -> PropNode(3)
+ */
+- (void)createSimpleAnimatedView:(NSNumber *)viewTag withOpacity:(CGFloat)opacity
+{
+  [_nodesManager createAnimatedNode:@1
+                             config:@{@"type": @"value", @"value": @(opacity), @"offset": @0}];
+  [_nodesManager createAnimatedNode:@2
+                             config:@{@"type": @"style", @"style": @{@"opacity": @1}}];
+  [_nodesManager createAnimatedNode:@3
+                             config:@{@"type": @"props", @"props": @{@"style": @2}}];
+
+  [_nodesManager connectAnimatedNodes:@1 childTag:@2];
+  [_nodesManager connectAnimatedNodes:@2 childTag:@3];
+  [_nodesManager connectAnimatedNodeToView:@3 viewTag:viewTag viewName:@"UIView"];
+}
+
+- (void)testFramesAnimation
+{
+  [self createSimpleAnimatedView:@1000 withOpacity:0];
+  NSArray<NSNumber *> *frames = @[@0, @0.2, @0.4, @0.6, @0.8, @1];
+  [_nodesManager startAnimatingNode:@1
+                            nodeTag:@1
+                             config:@{@"type": @"frames", @"frames": frames, @"toValue": @1}
+                        endCallback:nil];
+
+  for (NSNumber *frame in frames) {
+    [[_uiManager expect] synchronouslyUpdateViewOnUIThread:@1000
+                                                  viewName:@"UIView"
+                                                     props:RCTPropChecker(@"opacity", frame)];
+    [_nodesManager stepAnimations:_displayLink];
+    [_uiManager verify];
+  }
+
+  [[_uiManager expect] synchronouslyUpdateViewOnUIThread:@1000
+                                                viewName:@"UIView"
+                                                   props:RCTPropChecker(@"opacity", @1)];
+  [_nodesManager stepAnimations:_displayLink];
+  [_uiManager verify];
+
+  [[_uiManager reject] synchronouslyUpdateViewOnUIThread:OCMOCK_ANY viewName:OCMOCK_ANY props:OCMOCK_ANY];
+  [_nodesManager stepAnimations:_displayLink];
+  [_uiManager verify];
+}
+
+- (void)testNodeValueListenerIfNotListening
+{
+  NSNumber *nodeId = @1;
+  [self createSimpleAnimatedView:@1000 withOpacity:0];
+  NSArray<NSNumber *> *frames = @[@0, @0.2, @0.4, @0.6, @0.8, @1];
+
+  RCTFakeValueObserver *observer = [RCTFakeValueObserver new];
+  [_nodesManager startListeningToAnimatedNodeValue:nodeId valueObserver:observer];
+
+  [_nodesManager startAnimatingNode:@1
+                            nodeTag:nodeId
+                             config:@{@"type": @"frames", @"frames": frames, @"toValue": @1}
+                        endCallback:nil];
+
+  [_nodesManager stepAnimations:_displayLink];
+  XCTAssertEqual(observer.calls.count, 1UL);
+  XCTAssertEqualObjects(observer.calls[0], @0);
+
+  [_nodesManager stopListeningToAnimatedNodeValue:nodeId];
+
+  [_nodesManager stepAnimations:_displayLink];
+  XCTAssertEqual(observer.calls.count, 1UL);
+}
+
+- (void)testNodeValueListenerIfListening
+{
+  NSNumber *nodeId = @1;
+  [self createSimpleAnimatedView:@1000 withOpacity:0];
+  NSArray<NSNumber *> *frames = @[@0, @0.2, @0.4, @0.6, @0.8, @1];
+
+  RCTFakeValueObserver *observer = [RCTFakeValueObserver new];
+  [_nodesManager startListeningToAnimatedNodeValue:nodeId valueObserver:observer];
+
+  [_nodesManager startAnimatingNode:@1
+                            nodeTag:nodeId
+                             config:@{@"type": @"frames", @"frames": frames, @"toValue": @1}
+                        endCallback:nil];
+
+  for (NSUInteger i = 0; i < frames.count; i++) {
+    [_nodesManager stepAnimations:_displayLink];
+    XCTAssertEqual(observer.calls.count, i + 1);
+    XCTAssertEqualWithAccuracy(observer.calls[i].doubleValue, frames[i].doubleValue, FLT_EPSILON);
+  }
+
+  [_nodesManager stepAnimations:_displayLink];
+  XCTAssertEqual(observer.calls.count, 7UL);
+  XCTAssertEqualObjects(observer.calls[6], @1);
+
+  [_nodesManager stepAnimations:_displayLink];
+  XCTAssertEqual(observer.calls.count, 7UL);
+}
+
+- (void)testSpringAnimation
+{
+  [self createSimpleAnimatedView:@1000 withOpacity:0];
+  [_nodesManager startAnimatingNode:@1
+                            nodeTag:@1
+                             config:@{@"type": @"spring",
+                                      @"friction": @7,
+                                      @"tension": @40,
+                                      @"initialVelocity": @0,
+                                      @"toValue": @1,
+                                      @"restSpeedThreshold": @0.001,
+                                      @"restDisplacementThreshold": @0.001,
+                                      @"overshootClamping": @NO}
+                        endCallback:nil];
+
+  BOOL wasGreaterThanOne = NO;
+  CGFloat previousValue = 0;
+  __block CGFloat currentValue;
+  [[[_uiManager stub] andDo:^(NSInvocation *invocation) {
+    __unsafe_unretained NSDictionary<NSString *, NSNumber *> *props;
+    [invocation getArgument:&props atIndex:4];
+    currentValue = props[@"opacity"].doubleValue;
+  }] synchronouslyUpdateViewOnUIThread:OCMOCK_ANY viewName:OCMOCK_ANY props:OCMOCK_ANY];
+
+  // Run for 3 seconds.
+  for (NSUInteger i = 0; i < 3 * 60; i++) {
+    [_nodesManager stepAnimations:_displayLink];
+
+    if (currentValue > 1) {
+      wasGreaterThanOne = YES;
+    }
+
+    // Verify that animation step is relatively small.
+    XCTAssertLessThan(fabs(currentValue - previousValue), 0.1);
+
+    previousValue = currentValue;
+  }
+
+  // Verify that we've reach the final value at the end of animation.
+  XCTAssertEqual(previousValue, 1.0);
+
+  // Verify that value has reached some maximum value that is greater than the final value (bounce).
+  XCTAssertTrue(wasGreaterThanOne);
+
+  [[_uiManager reject] synchronouslyUpdateViewOnUIThread:OCMOCK_ANY viewName:OCMOCK_ANY props:OCMOCK_ANY];
+  [_nodesManager stepAnimations:_displayLink];
+  [_uiManager verify];
+}
+
+- (void)testAnimationCallbackFinish
+{
+  [self createSimpleAnimatedView:@1000 withOpacity:0];
+  NSArray<NSNumber *> *frames = @[@0, @1];
+
+  __block NSInteger endCallbackCalls = 0;
+
+  RCTResponseSenderBlock endCallback = ^(NSArray *response) {
+    endCallbackCalls++;
+    XCTAssertEqualObjects(response, @[@{@"finished": @YES}]);
+  };
+
+  [_nodesManager startAnimatingNode:@1
+                            nodeTag:@1
+                             config:@{@"type": @"frames", @"frames": frames, @"toValue": @1}
+                        endCallback:endCallback];
+
+  [_nodesManager stepAnimations:_displayLink];
+  [_nodesManager stepAnimations:_displayLink];
+  XCTAssertEqual(endCallbackCalls, 0);
+  [_nodesManager stepAnimations:_displayLink];
+  XCTAssertEqual(endCallbackCalls, 1);
+  [_nodesManager stepAnimations:_displayLink];
+  XCTAssertEqual(endCallbackCalls, 1);
+}
+
+/**
+ * Creates a following graph of nodes:
+ * Value(1, firstValue) ----> Add(3) ---> Style(4) ---> Props(5) ---> View(viewTag)
+ *                         |
+ * Value(2, secondValue) --+
+ *
+ * Add(3) node maps to a "translateX" attribute of the Style(4) node.
+ */
+- (void)createAnimatedGraphWithAdditionNode:(NSNumber *)viewTag
+                                 firstValue:(CGFloat)firstValue
+                                secondValue:(CGFloat)secondValue
+{
+  [_nodesManager createAnimatedNode:@1
+                             config:@{@"type": @"value", @"value": @(firstValue), @"offset": @0}];
+  [_nodesManager createAnimatedNode:@2
+                             config:@{@"type": @"value", @"value": @(secondValue), @"offset": @0}];
+  [_nodesManager createAnimatedNode:@3
+                             config:@{@"type": @"addition", @"input": @[@1, @2]}];
+  [_nodesManager createAnimatedNode:@4
+                             config:@{@"type": @"style", @"style": @{@"translateX": @3}}];
+  [_nodesManager createAnimatedNode:@5
+                             config:@{@"type": @"props", @"props": @{@"style": @4}}];
+
+  [_nodesManager connectAnimatedNodes:@1 childTag:@3];
+  [_nodesManager connectAnimatedNodes:@2 childTag:@3];
+  [_nodesManager connectAnimatedNodes:@3 childTag:@4];
+  [_nodesManager connectAnimatedNodes:@4 childTag:@5];
+  [_nodesManager connectAnimatedNodeToView:@5 viewTag:viewTag viewName:@"UIView"];
+}
+
+- (void)testAdditionNode
+{
+  NSNumber *viewTag = @50;
+  [self createAnimatedGraphWithAdditionNode:viewTag firstValue:100 secondValue:1000];
+
+  NSArray<NSNumber *> *frames = @[@0, @1];
+  [_nodesManager startAnimatingNode:@1
+                            nodeTag:@1
+                             config:@{@"type": @"frames", @"frames": frames, @"toValue": @101}
+                        endCallback:nil];
+  [_nodesManager startAnimatingNode:@2
+                            nodeTag:@2
+                             config:@{@"type": @"frames", @"frames": frames, @"toValue": @1010}
+                        endCallback:nil];
+
+  [[_uiManager expect] synchronouslyUpdateViewOnUIThread:viewTag
+                                                viewName:@"UIView"
+                                                   props:RCTPropChecker(@"translateX", @1100)];
+  [_nodesManager stepAnimations:_displayLink];
+  [_uiManager verify];
+
+  [[_uiManager expect] synchronouslyUpdateViewOnUIThread:viewTag
+                                                viewName:@"UIView"
+                                                   props:RCTPropChecker(@"translateX", @1111)];
+  [_nodesManager stepAnimations:_displayLink];
+  [_uiManager verify];
+
+  [[_uiManager expect] synchronouslyUpdateViewOnUIThread:viewTag
+                                                viewName:@"UIView"
+                                                   props:RCTPropChecker(@"translateX", @1111)];
+  [_nodesManager stepAnimations:_displayLink];
+  [_uiManager verify];
+
+  [[_uiManager reject] synchronouslyUpdateViewOnUIThread:OCMOCK_ANY viewName:OCMOCK_ANY props:OCMOCK_ANY];
+  [_nodesManager stepAnimations:_displayLink];
+  [_uiManager verify];
+}
+
+/**
+ * Verifies that views are updated properly when one of the addition input nodes has started animating
+ * while the other one has not.
+ *
+ * We expect that the output of the addition node will take the starting value of the second input
+ * node even though the node hasn't been connected to an active animation driver.
+ */
+- (void)testViewReceiveUpdatesIfOneOfAnimationHasntStarted
+{
+  NSNumber *viewTag = @50;
+  [self createAnimatedGraphWithAdditionNode:viewTag firstValue:100 secondValue:1000];
+
+  NSArray<NSNumber *> *frames = @[@0, @1];
+  [_nodesManager startAnimatingNode:@1
+                            nodeTag:@1
+                             config:@{@"type": @"frames", @"frames": frames, @"toValue": @101}
+                        endCallback:nil];
+
+  [[_uiManager expect] synchronouslyUpdateViewOnUIThread:viewTag
+                                                viewName:@"UIView"
+                                                   props:RCTPropChecker(@"translateX", @1100)];
+  [_nodesManager stepAnimations:_displayLink];
+  [_uiManager verify];
+
+  [[_uiManager expect] synchronouslyUpdateViewOnUIThread:viewTag
+                                                viewName:@"UIView"
+                                                   props:RCTPropChecker(@"translateX", @1101)];
+  [_nodesManager stepAnimations:_displayLink];
+  [_uiManager verify];
+
+  [[_uiManager expect] synchronouslyUpdateViewOnUIThread:viewTag
+                                                viewName:@"UIView"
+                                                   props:RCTPropChecker(@"translateX", @1101)];
+  [_nodesManager stepAnimations:_displayLink];
+  [_uiManager verify];
+
+  [[_uiManager reject] synchronouslyUpdateViewOnUIThread:OCMOCK_ANY viewName:OCMOCK_ANY props:OCMOCK_ANY];
+  [_nodesManager stepAnimations:_displayLink];
+  [_uiManager verify];
+}
+
+/**
+ * Verifies that views are updated properly when one of the addition input nodes animation finishes
+ * before the other.
+ *
+ * We expect that the output of the addition node after one of the animation has finished will
+ * take the last value of the animated node and the view will receive updates up until the second
+ * animation is over.
+ */
+- (void)testViewReceiveUpdatesWhenOneOfAnimationHasFinished
+{
+  NSNumber *viewTag = @50;
+  [self createAnimatedGraphWithAdditionNode:viewTag firstValue:100 secondValue:1000];
+
+  NSArray<NSNumber *> *firstFrames = @[@0, @1];
+  [_nodesManager startAnimatingNode:@1
+                            nodeTag:@1
+                             config:@{@"type": @"frames", @"frames": firstFrames, @"toValue": @200}
+                        endCallback:nil];
+  NSArray<NSNumber *> *secondFrames = @[@0, @0.2, @0.4, @0.6, @0.8, @1];
+  [_nodesManager startAnimatingNode:@2
+                            nodeTag:@2
+                             config:@{@"type": @"frames", @"frames": secondFrames, @"toValue": @1010}
+                        endCallback:nil];
+
+  [[_uiManager expect] synchronouslyUpdateViewOnUIThread:viewTag
+                                                viewName:@"UIView"
+                                                   props:RCTPropChecker(@"translateX", @1100)];
+  [_nodesManager stepAnimations:_displayLink];
+  [_uiManager verify];
+
+  for (NSUInteger i = 1; i < secondFrames.count; i++) {
+    CGFloat expected = 1200.0 + secondFrames[i].doubleValue * 10.0;
+    [[_uiManager expect] synchronouslyUpdateViewOnUIThread:viewTag
+                                                  viewName:@"UIView"
+                                                     props:RCTPropChecker(@"translateX", @(expected))];
+    [_nodesManager stepAnimations:_displayLink];
+    [_uiManager verify];
+  }
+
+  [[_uiManager expect] synchronouslyUpdateViewOnUIThread:viewTag
+                                                viewName:@"UIView"
+                                                   props:RCTPropChecker(@"translateX", @1210)];
+  [_nodesManager stepAnimations:_displayLink];
+  [_uiManager verify];
+
+  [[_uiManager reject] synchronouslyUpdateViewOnUIThread:OCMOCK_ANY viewName:OCMOCK_ANY props:OCMOCK_ANY];
+  [_nodesManager stepAnimations:_displayLink];
+  [_uiManager verify];
+}
+
+- (void)testMultiplicationNode
+{
+  NSNumber *viewTag = @50;
+  [_nodesManager createAnimatedNode:@1
+                             config:@{@"type": @"value", @"value": @1, @"offset": @0}];
+  [_nodesManager createAnimatedNode:@2
+                             config:@{@"type": @"value", @"value": @5, @"offset": @0}];
+  [_nodesManager createAnimatedNode:@3
+                             config:@{@"type": @"multiplication", @"input": @[@1, @2]}];
+  [_nodesManager createAnimatedNode:@4
+                             config:@{@"type": @"style", @"style": @{@"translateX": @3}}];
+  [_nodesManager createAnimatedNode:@5
+                             config:@{@"type": @"props", @"props": @{@"style": @4}}];
+
+  [_nodesManager connectAnimatedNodes:@1 childTag:@3];
+  [_nodesManager connectAnimatedNodes:@2 childTag:@3];
+  [_nodesManager connectAnimatedNodes:@3 childTag:@4];
+  [_nodesManager connectAnimatedNodes:@4 childTag:@5];
+  [_nodesManager connectAnimatedNodeToView:@5 viewTag:viewTag viewName:@"UIView"];
+
+  NSArray<NSNumber *> *frames = @[@0, @1];
+  [_nodesManager startAnimatingNode:@1
+                            nodeTag:@1
+                             config:@{@"type": @"frames", @"frames": frames, @"toValue": @2}
+                        endCallback:nil];
+  [_nodesManager startAnimatingNode:@2
+                            nodeTag:@2
+                             config:@{@"type": @"frames", @"frames": frames, @"toValue": @10}
+                        endCallback:nil];
+
+  [[_uiManager expect] synchronouslyUpdateViewOnUIThread:viewTag
+                                                viewName:@"UIView"
+                                                   props:RCTPropChecker(@"translateX", @5)];
+  [_nodesManager stepAnimations:_displayLink];
+  [_uiManager verify];
+
+  [[_uiManager expect] synchronouslyUpdateViewOnUIThread:viewTag
+                                                viewName:@"UIView"
+                                                   props:RCTPropChecker(@"translateX", @20)];
+  [_nodesManager stepAnimations:_displayLink];
+  [_uiManager verify];
+
+  [[_uiManager expect] synchronouslyUpdateViewOnUIThread:viewTag
+                                                viewName:@"UIView"
+                                                   props:RCTPropChecker(@"translateX", @20)];
+  [_nodesManager stepAnimations:_displayLink];
+  [_uiManager verify];
+
+  [[_uiManager reject] synchronouslyUpdateViewOnUIThread:OCMOCK_ANY viewName:OCMOCK_ANY props:OCMOCK_ANY];
+  [_nodesManager stepAnimations:_displayLink];
+  [_uiManager verify];
+}
+
+- (void)testHandleStoppingAnimation
+{
+  [self createSimpleAnimatedView:@1000 withOpacity:0];
+  NSArray<NSNumber *> *frames = @[@0, @0.2, @0.4, @0.6, @0.8, @1];
+
+  __block BOOL endCallbackCalled = NO;
+
+  RCTResponseSenderBlock endCallback = ^(NSArray *response) {
+    endCallbackCalled = YES;
+    XCTAssertEqualObjects(response, @[@{@"finished": @NO}]);
+  };
+
+  [_nodesManager startAnimatingNode:@404
+                            nodeTag:@1
+                             config:@{@"type": @"frames", @"frames": frames, @"toValue": @1}
+                        endCallback:endCallback];
+
+  [[_uiManager expect] synchronouslyUpdateViewOnUIThread:OCMOCK_ANY viewName:OCMOCK_ANY props:OCMOCK_ANY];
+  [_nodesManager stepAnimations:_displayLink];
+  [_uiManager verify];
+  [[_uiManager expect] synchronouslyUpdateViewOnUIThread:OCMOCK_ANY viewName:OCMOCK_ANY props:OCMOCK_ANY];
+  [_nodesManager stepAnimations:_displayLink];
+  [_uiManager verify];
+
+  [_nodesManager stopAnimation:@404];
+  XCTAssertEqual(endCallbackCalled, YES);
+
+  // Run "update" loop a few more times -> we expect no further updates nor callback calls to be
+  // triggered
+  for (NSUInteger i = 0; i < 5; i++) {
+    [[_uiManager reject] synchronouslyUpdateViewOnUIThread:OCMOCK_ANY viewName:OCMOCK_ANY props:OCMOCK_ANY];
+    [_nodesManager stepAnimations:_displayLink];
+    [_uiManager verify];
+  }
+}
+
+- (void)testInterpolationNode
+{
+  NSNumber *viewTag = @50;
+  [_nodesManager createAnimatedNode:@1
+                             config:@{@"type": @"value", @"value": @10, @"offset": @0}];
+  [_nodesManager createAnimatedNode:@2
+                             config:@{@"type": @"interpolation",
+                                      @"inputRange": @[@10, @20],
+                                      @"outputRange": @[@0, @1],
+                                      @"extrapolateLeft": @"extend",
+                                      @"extrapolateRight": @"extend"}];
+  [_nodesManager createAnimatedNode:@3
+                             config:@{@"type": @"style", @"style": @{@"opacity": @2}}];
+  [_nodesManager createAnimatedNode:@4
+                             config:@{@"type": @"props", @"props": @{@"style": @3}}];
+
+  [_nodesManager connectAnimatedNodes:@1 childTag:@2];
+  [_nodesManager connectAnimatedNodes:@2 childTag:@3];
+  [_nodesManager connectAnimatedNodes:@3 childTag:@4];
+  [_nodesManager connectAnimatedNodeToView:@4 viewTag:viewTag viewName:@"UIView"];
+
+  NSArray<NSNumber *> *frames = @[@0, @0.2, @0.4, @0.6, @0.8, @1];
+  [_nodesManager startAnimatingNode:@1
+                            nodeTag:@1
+                             config:@{@"type": @"frames", @"frames": frames, @"toValue": @20}
+                        endCallback:nil];
+
+  for (NSNumber *frame in frames) {
+    [[_uiManager expect] synchronouslyUpdateViewOnUIThread:viewTag
+                                                  viewName:@"UIView"
+                                                     props:RCTPropChecker(@"opacity", frame)];
+    [_nodesManager stepAnimations:_displayLink];
+    [_uiManager verify];
+  }
+
+  [[_uiManager expect] synchronouslyUpdateViewOnUIThread:viewTag
+                                                viewName:@"UIView"
+                                                   props:RCTPropChecker(@"opacity", @1)];
+  [_nodesManager stepAnimations:_displayLink];
+  [_uiManager verify];
+
+
+  [[_uiManager reject] synchronouslyUpdateViewOnUIThread:OCMOCK_ANY viewName:OCMOCK_ANY props:OCMOCK_ANY];
+  [_nodesManager stepAnimations:_displayLink];
+  [_uiManager verify];
+}
+
+- (id<RCTEvent>)createScrollEventWithTag:(NSNumber *)viewTag value:(CGFloat)value
+{
+  // The event value is the 3rd argument.
+  NSArray *arguments = @[@1, @1, @{@"contentOffset": @{@"y": @(value)}}];
+  return [[RCTFakeEvent alloc] initWithName:@"topScroll"
+                                    viewTag:viewTag
+                                  arguments:arguments];
+}
+
+- (void)testNativeAnimatedEventDoUpdate
+{
+  NSNumber *viewTag = @1000;
+  [self createSimpleAnimatedView:viewTag withOpacity:0];
+
+  [_nodesManager addAnimatedEventToView:viewTag
+                              eventName:@"topScroll"
+                           eventMapping:@{@"animatedValueTag": @1,
+                                          @"nativeEventPath": @[@"contentOffset", @"y"]}];
+
+
+
+  // Make sure that the update actually happened synchronously in `handleAnimatedEvent` and does
+  // not wait for the next animation loop.
+  [[_uiManager expect] synchronouslyUpdateViewOnUIThread:viewTag
+                                                viewName:@"UIView"
+                                                   props:RCTPropChecker(@"opacity", @10)];
+  [_nodesManager handleAnimatedEvent:[self createScrollEventWithTag:viewTag value:10]];
+  [_uiManager verify];
+
+  [[_uiManager reject] synchronouslyUpdateViewOnUIThread:OCMOCK_ANY viewName:OCMOCK_ANY props:OCMOCK_ANY];
+  [_nodesManager stepAnimations:_displayLink];
+  [_uiManager verify];
+}
+
+- (void)testNativeAnimatedEventDoNotUpdate
+{
+  NSNumber *viewTag = @1000;
+  [self createSimpleAnimatedView:viewTag withOpacity:0];
+
+  [_nodesManager addAnimatedEventToView:viewTag
+                              eventName:@"otherEvent"
+                           eventMapping:@{@"animatedValueTag": @1,
+                                          @"nativeEventPath": @[@"contentOffset", @"y"]}];
+
+  [_nodesManager addAnimatedEventToView:@999
+                              eventName:@"topScroll"
+                           eventMapping:@{@"animatedValueTag": @1,
+                                          @"nativeEventPath": @[@"contentOffset", @"y"]}];
+
+  [[_uiManager reject] synchronouslyUpdateViewOnUIThread:OCMOCK_ANY viewName:OCMOCK_ANY props:OCMOCK_ANY];
+  [_nodesManager handleAnimatedEvent:[self createScrollEventWithTag:viewTag value:10]];
+  [_uiManager verify];
+}
+
+@end
diff --git a/Libraries/NativeAnimation/Drivers/RCTAnimationDriver.h b/Libraries/NativeAnimation/Drivers/RCTAnimationDriver.h
index ed2f75f4bc0ab5..13c30e5e402b4d 100644
--- a/Libraries/NativeAnimation/Drivers/RCTAnimationDriver.h
+++ b/Libraries/NativeAnimation/Drivers/RCTAnimationDriver.h
@@ -7,8 +7,8 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import <Foundation/Foundation.h>
 #import <CoreGraphics/CoreGraphics.h>
+#import <Foundation/Foundation.h>
 
 #import <React/RCTBridgeModule.h>
 
@@ -29,9 +29,8 @@ NS_ASSUME_NONNULL_BEGIN
                   callBack:(nullable RCTResponseSenderBlock)callback;
 
 - (void)startAnimation;
+- (void)stepAnimationWithTime:(NSTimeInterval)currentTime;
 - (void)stopAnimation;
-- (void)stepAnimation;
-- (void)removeAnimation;
 
 NS_ASSUME_NONNULL_END
 
diff --git a/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m b/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m
index ffd1740dceb13c..7b02dba7ccb26c 100644
--- a/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m
+++ b/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m
@@ -61,19 +61,12 @@ - (instancetype)initWithId:(NSNumber *)animationId
 
 - (void)startAnimation
 {
-  _animationStartTime = CACurrentMediaTime();
-  _animationCurrentTime = _animationStartTime;
+  _animationStartTime = _animationCurrentTime = -1;
   _animationHasBegun = YES;
 }
 
 - (void)stopAnimation
 {
-  _animationHasFinished = YES;
-}
-
-- (void)removeAnimation
-{
-  [self stopAnimation];
   _valueNode = nil;
   if (_callback) {
     _callback(@[@{
@@ -82,14 +75,17 @@ - (void)removeAnimation
   }
 }
 
-- (void)stepAnimation
+- (void)stepAnimationWithTime:(NSTimeInterval)currentTime
 {
   if (!_animationHasBegun || _animationHasFinished || _frames.count == 0) {
     // Animation has not begun or animation has already finished.
     return;
   }
 
-  NSTimeInterval currentTime = CACurrentMediaTime();
+  if (_animationStartTime == -1) {
+    _animationStartTime = _animationCurrentTime = currentTime;
+  }
+
   _animationCurrentTime = currentTime;
   NSTimeInterval currentDuration = _animationCurrentTime - _animationStartTime;
 
@@ -103,7 +99,7 @@ - (void)stepAnimation
     // Update value and flag animation has ended.
     NSNumber *finalValue = _frames.lastObject;
     [self updateOutputWithFrameOutput:finalValue.doubleValue];
-    [self stopAnimation];
+    _animationHasFinished = YES;
     return;
   }
 
diff --git a/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m b/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m
index c9709d48e56184..a75aa5aee2f47d 100644
--- a/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m
+++ b/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m
@@ -71,19 +71,12 @@ - (instancetype)initWithId:(NSNumber *)animationId
 
 - (void)startAnimation
 {
-  _animationStartTime = CACurrentMediaTime();
-  _animationCurrentTime = _animationStartTime;
+  _animationStartTime = _animationCurrentTime = -1;
   _animationHasBegun = YES;
 }
 
 - (void)stopAnimation
 {
-  _animationHasFinished = YES;
-}
-
-- (void)removeAnimation
-{
-  [self stopAnimation];
   _valueNode = nil;
   if (_callback) {
     _callback(@[@{
@@ -92,13 +85,17 @@ - (void)removeAnimation
   }
 }
 
-- (void)stepAnimation
+- (void)stepAnimationWithTime:(NSTimeInterval)currentTime
 {
   if (!_animationHasBegun || _animationHasFinished) {
     // Animation has not begun or animation has already finished.
     return;
   }
 
+  if (_animationStartTime == -1) {
+    _animationStartTime = _animationCurrentTime = currentTime;
+  }
+
   // We are using a fixed time step and a maximum number of iterations.
   // The following post provides a lot of thoughts into how to build this
   // loop: http://gafferongames.com/game-physics/fix-your-timestep/
@@ -106,7 +103,6 @@ - (void)stepAnimation
   // Velocity is based on seconds instead of milliseconds
   CGFloat step = TIMESTEP_MSEC / 1000;
 
-  NSTimeInterval currentTime = CACurrentMediaTime();
   NSInteger numSteps = floorf((currentTime - _animationCurrentTime) / step);
   _animationCurrentTime = currentTime;
   if (numSteps == 0) {
@@ -182,7 +178,7 @@ - (void)stepAnimation
       [self onUpdate:_toValue];
     }
 
-    [self stopAnimation];
+    _animationHasFinished = YES;
   }
 }
 
diff --git a/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.m
index a87f3c485ae4d3..be804eda0492f4 100644
--- a/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.m
@@ -8,6 +8,7 @@
  */
 
 #import "RCTInterpolationAnimatedNode.h"
+
 #import "RCTAnimationUtils.h"
 
 @implementation RCTInterpolationAnimatedNode
@@ -53,20 +54,6 @@ - (void)onDetachedFromNode:(RCTAnimatedNode *)parent
   }
 }
 
-- (NSUInteger)findIndexOfNearestValue:(CGFloat)value
-                              inRange:(NSArray<NSNumber *> *)range
-{
-  NSUInteger index;
-  NSUInteger rangeCount = range.count;
-  for (index = 1; index < rangeCount - 1; index++) {
-    NSNumber *inputValue = range[index];
-    if (inputValue.doubleValue >= value) {
-      break;
-    }
-  }
-  return index - 1;
-}
-
 - (void)performUpdate
 {
   [super performUpdate];
@@ -75,19 +62,12 @@ - (void)performUpdate
   }
 
   CGFloat inputValue = _parentNode.value;
-  NSUInteger rangeIndex = [self findIndexOfNearestValue:inputValue inRange:_inputRange];
-  NSNumber *inputMin = _inputRange[rangeIndex];
-  NSNumber *inputMax = _inputRange[rangeIndex + 1];
-  NSNumber *outputMin = _outputRange[rangeIndex];
-  NSNumber *outputMax = _outputRange[rangeIndex + 1];
 
-  self.value = RCTInterpolateValue(inputValue,
-                                   inputMin.doubleValue,
-                                   inputMax.doubleValue,
-                                   outputMin.doubleValue,
-                                   outputMax.doubleValue,
-                                   _extrapolateLeft,
-                                   _extrapolateRight);
+  self.value = RCTInterpolateValueInRange(inputValue,
+                                          _inputRange,
+                                          _outputRange,
+                                          _extrapolateLeft,
+                                          _extrapolateRight);
 }
 
 @end
diff --git a/Libraries/NativeAnimation/RCTAnimation.xcodeproj/project.pbxproj b/Libraries/NativeAnimation/RCTAnimation.xcodeproj/project.pbxproj
index 2318d21b0117bc..ec4fe97d2ac490 100644
--- a/Libraries/NativeAnimation/RCTAnimation.xcodeproj/project.pbxproj
+++ b/Libraries/NativeAnimation/RCTAnimation.xcodeproj/project.pbxproj
@@ -17,7 +17,79 @@
 		13E501EE1D07A6C9005F35D8 /* RCTStyleAnimatedNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 13E501E31D07A6C9005F35D8 /* RCTStyleAnimatedNode.m */; };
 		13E501EF1D07A6C9005F35D8 /* RCTTransformAnimatedNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 13E501E51D07A6C9005F35D8 /* RCTTransformAnimatedNode.m */; };
 		13E501F01D07A6C9005F35D8 /* RCTValueAnimatedNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 13E501E71D07A6C9005F35D8 /* RCTValueAnimatedNode.m */; };
+		192F69811E823F4A008692C7 /* RCTAnimationUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E501B71D07A644005F35D8 /* RCTAnimationUtils.h */; };
+		192F69821E823F4A008692C7 /* RCTNativeAnimatedModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E501BD1D07A644005F35D8 /* RCTNativeAnimatedModule.h */; };
+		192F69831E823F4A008692C7 /* RCTNativeAnimatedNodesManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 94DA09161DC7971C00AEA8C9 /* RCTNativeAnimatedNodesManager.h */; };
+		192F69841E823F4A008692C7 /* RCTAnimationDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 94C1294A1D4069170025F25C /* RCTAnimationDriver.h */; };
+		192F69851E823F4A008692C7 /* RCTEventAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 19F00F201DC8847500113FEE /* RCTEventAnimation.h */; };
+		192F69861E823F4A008692C7 /* RCTFrameAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 94C1294C1D4069170025F25C /* RCTFrameAnimation.h */; };
+		192F69871E823F4A008692C7 /* RCTSpringAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 94C1294E1D4069170025F25C /* RCTSpringAnimation.h */; };
+		192F69881E823F4A008692C7 /* RCTDivisionAnimatedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C9894931D999639008027DB /* RCTDivisionAnimatedNode.h */; };
+		192F69891E823F4A008692C7 /* RCTDiffClampAnimatedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 193F64F21D776EC6004D1CAA /* RCTDiffClampAnimatedNode.h */; };
+		192F698A1E823F4A008692C7 /* RCTAdditionAnimatedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E501D61D07A6C9005F35D8 /* RCTAdditionAnimatedNode.h */; };
+		192F698B1E823F4A008692C7 /* RCTAnimatedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E501D81D07A6C9005F35D8 /* RCTAnimatedNode.h */; };
+		192F698C1E823F4A008692C7 /* RCTInterpolationAnimatedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E501DC1D07A6C9005F35D8 /* RCTInterpolationAnimatedNode.h */; };
+		192F698D1E823F4A008692C7 /* RCTModuloAnimatedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 94DAE3F71D7334A70059942F /* RCTModuloAnimatedNode.h */; };
+		192F698E1E823F4A008692C7 /* RCTMultiplicationAnimatedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E501DE1D07A6C9005F35D8 /* RCTMultiplicationAnimatedNode.h */; };
+		192F698F1E823F4A008692C7 /* RCTPropsAnimatedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E501E01D07A6C9005F35D8 /* RCTPropsAnimatedNode.h */; };
+		192F69901E823F4A008692C7 /* RCTStyleAnimatedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E501E21D07A6C9005F35D8 /* RCTStyleAnimatedNode.h */; };
+		192F69911E823F4A008692C7 /* RCTTransformAnimatedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E501E41D07A6C9005F35D8 /* RCTTransformAnimatedNode.h */; };
+		192F69921E823F4A008692C7 /* RCTValueAnimatedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E501E61D07A6C9005F35D8 /* RCTValueAnimatedNode.h */; };
+		192F69941E823F78008692C7 /* RCTAnimationUtils.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 13E501B71D07A644005F35D8 /* RCTAnimationUtils.h */; };
+		192F69951E823F78008692C7 /* RCTNativeAnimatedModule.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 13E501BD1D07A644005F35D8 /* RCTNativeAnimatedModule.h */; };
+		192F69961E823F78008692C7 /* RCTNativeAnimatedNodesManager.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 94DA09161DC7971C00AEA8C9 /* RCTNativeAnimatedNodesManager.h */; };
+		192F69971E823F78008692C7 /* RCTAnimationDriver.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 94C1294A1D4069170025F25C /* RCTAnimationDriver.h */; };
+		192F69981E823F78008692C7 /* RCTEventAnimation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 19F00F201DC8847500113FEE /* RCTEventAnimation.h */; };
+		192F69991E823F78008692C7 /* RCTFrameAnimation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 94C1294C1D4069170025F25C /* RCTFrameAnimation.h */; };
+		192F699A1E823F78008692C7 /* RCTSpringAnimation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 94C1294E1D4069170025F25C /* RCTSpringAnimation.h */; };
+		192F699B1E823F78008692C7 /* RCTDivisionAnimatedNode.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5C9894931D999639008027DB /* RCTDivisionAnimatedNode.h */; };
+		192F699C1E823F78008692C7 /* RCTDiffClampAnimatedNode.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 193F64F21D776EC6004D1CAA /* RCTDiffClampAnimatedNode.h */; };
+		192F699D1E823F78008692C7 /* RCTAdditionAnimatedNode.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 13E501D61D07A6C9005F35D8 /* RCTAdditionAnimatedNode.h */; };
+		192F699E1E823F78008692C7 /* RCTAnimatedNode.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 13E501D81D07A6C9005F35D8 /* RCTAnimatedNode.h */; };
+		192F699F1E823F78008692C7 /* RCTInterpolationAnimatedNode.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 13E501DC1D07A6C9005F35D8 /* RCTInterpolationAnimatedNode.h */; };
+		192F69A01E823F78008692C7 /* RCTModuloAnimatedNode.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 94DAE3F71D7334A70059942F /* RCTModuloAnimatedNode.h */; };
+		192F69A11E823F78008692C7 /* RCTMultiplicationAnimatedNode.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 13E501DE1D07A6C9005F35D8 /* RCTMultiplicationAnimatedNode.h */; };
+		192F69A21E823F78008692C7 /* RCTPropsAnimatedNode.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 13E501E01D07A6C9005F35D8 /* RCTPropsAnimatedNode.h */; };
+		192F69A31E823F78008692C7 /* RCTStyleAnimatedNode.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 13E501E21D07A6C9005F35D8 /* RCTStyleAnimatedNode.h */; };
+		192F69A41E823F78008692C7 /* RCTTransformAnimatedNode.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 13E501E41D07A6C9005F35D8 /* RCTTransformAnimatedNode.h */; };
+		192F69A51E823F78008692C7 /* RCTValueAnimatedNode.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 13E501E61D07A6C9005F35D8 /* RCTValueAnimatedNode.h */; };
 		193F64F41D776EC6004D1CAA /* RCTDiffClampAnimatedNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 193F64F31D776EC6004D1CAA /* RCTDiffClampAnimatedNode.m */; };
+		1980B70E1E80D1C4004DC789 /* RCTAnimationUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E501B71D07A644005F35D8 /* RCTAnimationUtils.h */; };
+		1980B7101E80D1C4004DC789 /* RCTNativeAnimatedModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E501BD1D07A644005F35D8 /* RCTNativeAnimatedModule.h */; };
+		1980B7121E80D1C4004DC789 /* RCTNativeAnimatedNodesManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 94DA09161DC7971C00AEA8C9 /* RCTNativeAnimatedNodesManager.h */; };
+		1980B7141E80D1C4004DC789 /* RCTAnimationDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 94C1294A1D4069170025F25C /* RCTAnimationDriver.h */; };
+		1980B7151E80D1C4004DC789 /* RCTEventAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 19F00F201DC8847500113FEE /* RCTEventAnimation.h */; };
+		1980B7171E80D1C4004DC789 /* RCTFrameAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 94C1294C1D4069170025F25C /* RCTFrameAnimation.h */; };
+		1980B7191E80D1C4004DC789 /* RCTSpringAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 94C1294E1D4069170025F25C /* RCTSpringAnimation.h */; };
+		1980B71B1E80D1C4004DC789 /* RCTDivisionAnimatedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C9894931D999639008027DB /* RCTDivisionAnimatedNode.h */; };
+		1980B71D1E80D1C4004DC789 /* RCTDiffClampAnimatedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 193F64F21D776EC6004D1CAA /* RCTDiffClampAnimatedNode.h */; };
+		1980B71F1E80D1C4004DC789 /* RCTAdditionAnimatedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E501D61D07A6C9005F35D8 /* RCTAdditionAnimatedNode.h */; };
+		1980B7211E80D1C4004DC789 /* RCTAnimatedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E501D81D07A6C9005F35D8 /* RCTAnimatedNode.h */; };
+		1980B7231E80D1C4004DC789 /* RCTInterpolationAnimatedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E501DC1D07A6C9005F35D8 /* RCTInterpolationAnimatedNode.h */; };
+		1980B7251E80D1C4004DC789 /* RCTModuloAnimatedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 94DAE3F71D7334A70059942F /* RCTModuloAnimatedNode.h */; };
+		1980B7271E80D1C4004DC789 /* RCTMultiplicationAnimatedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E501DE1D07A6C9005F35D8 /* RCTMultiplicationAnimatedNode.h */; };
+		1980B7291E80D1C4004DC789 /* RCTPropsAnimatedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E501E01D07A6C9005F35D8 /* RCTPropsAnimatedNode.h */; };
+		1980B72B1E80D1C4004DC789 /* RCTStyleAnimatedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E501E21D07A6C9005F35D8 /* RCTStyleAnimatedNode.h */; };
+		1980B72D1E80D1C4004DC789 /* RCTTransformAnimatedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E501E41D07A6C9005F35D8 /* RCTTransformAnimatedNode.h */; };
+		1980B72F1E80D1C4004DC789 /* RCTValueAnimatedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E501E61D07A6C9005F35D8 /* RCTValueAnimatedNode.h */; };
+		1980B7321E80D259004DC789 /* RCTAnimationUtils.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 13E501B71D07A644005F35D8 /* RCTAnimationUtils.h */; };
+		1980B7351E80DD6F004DC789 /* RCTNativeAnimatedModule.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 13E501BD1D07A644005F35D8 /* RCTNativeAnimatedModule.h */; };
+		1980B7361E80DD6F004DC789 /* RCTNativeAnimatedNodesManager.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 94DA09161DC7971C00AEA8C9 /* RCTNativeAnimatedNodesManager.h */; };
+		1980B7371E80DD6F004DC789 /* RCTAnimationDriver.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 94C1294A1D4069170025F25C /* RCTAnimationDriver.h */; };
+		1980B7381E80DD6F004DC789 /* RCTEventAnimation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 19F00F201DC8847500113FEE /* RCTEventAnimation.h */; };
+		1980B7391E80DD6F004DC789 /* RCTFrameAnimation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 94C1294C1D4069170025F25C /* RCTFrameAnimation.h */; };
+		1980B73A1E80DD6F004DC789 /* RCTSpringAnimation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 94C1294E1D4069170025F25C /* RCTSpringAnimation.h */; };
+		1980B73B1E80DD6F004DC789 /* RCTDivisionAnimatedNode.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5C9894931D999639008027DB /* RCTDivisionAnimatedNode.h */; };
+		1980B73C1E80DD6F004DC789 /* RCTDiffClampAnimatedNode.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 193F64F21D776EC6004D1CAA /* RCTDiffClampAnimatedNode.h */; };
+		1980B73D1E80DD6F004DC789 /* RCTAdditionAnimatedNode.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 13E501D61D07A6C9005F35D8 /* RCTAdditionAnimatedNode.h */; };
+		1980B73E1E80DD6F004DC789 /* RCTAnimatedNode.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 13E501D81D07A6C9005F35D8 /* RCTAnimatedNode.h */; };
+		1980B73F1E80DD6F004DC789 /* RCTInterpolationAnimatedNode.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 13E501DC1D07A6C9005F35D8 /* RCTInterpolationAnimatedNode.h */; };
+		1980B7401E80DD6F004DC789 /* RCTModuloAnimatedNode.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 94DAE3F71D7334A70059942F /* RCTModuloAnimatedNode.h */; };
+		1980B7411E80DD6F004DC789 /* RCTMultiplicationAnimatedNode.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 13E501DE1D07A6C9005F35D8 /* RCTMultiplicationAnimatedNode.h */; };
+		1980B7421E80DD6F004DC789 /* RCTPropsAnimatedNode.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 13E501E01D07A6C9005F35D8 /* RCTPropsAnimatedNode.h */; };
+		1980B7431E80DD6F004DC789 /* RCTStyleAnimatedNode.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 13E501E21D07A6C9005F35D8 /* RCTStyleAnimatedNode.h */; };
+		1980B7441E80DD6F004DC789 /* RCTTransformAnimatedNode.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 13E501E41D07A6C9005F35D8 /* RCTTransformAnimatedNode.h */; };
+		1980B7451E80DD6F004DC789 /* RCTValueAnimatedNode.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 13E501E61D07A6C9005F35D8 /* RCTValueAnimatedNode.h */; };
 		19F00F221DC8847500113FEE /* RCTEventAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = 19F00F211DC8847500113FEE /* RCTEventAnimation.m */; };
 		19F00F231DC8848E00113FEE /* RCTEventAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = 19F00F211DC8847500113FEE /* RCTEventAnimation.m */; };
 		2D3B5EF21D9B0B3100451313 /* RCTAnimationUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 13E501B81D07A644005F35D8 /* RCTAnimationUtils.m */; };
@@ -43,6 +115,63 @@
 		94DAE3F91D7334A70059942F /* RCTModuloAnimatedNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 94DAE3F81D7334A70059942F /* RCTModuloAnimatedNode.m */; };
 /* End PBXBuildFile section */
 
+/* Begin PBXCopyFilesBuildPhase section */
+		192F69931E823F4F008692C7 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = include/RCTAnimation;
+			dstSubfolderSpec = 16;
+			files = (
+				192F69941E823F78008692C7 /* RCTAnimationUtils.h in CopyFiles */,
+				192F69951E823F78008692C7 /* RCTNativeAnimatedModule.h in CopyFiles */,
+				192F69961E823F78008692C7 /* RCTNativeAnimatedNodesManager.h in CopyFiles */,
+				192F69971E823F78008692C7 /* RCTAnimationDriver.h in CopyFiles */,
+				192F69981E823F78008692C7 /* RCTEventAnimation.h in CopyFiles */,
+				192F69991E823F78008692C7 /* RCTFrameAnimation.h in CopyFiles */,
+				192F699A1E823F78008692C7 /* RCTSpringAnimation.h in CopyFiles */,
+				192F699B1E823F78008692C7 /* RCTDivisionAnimatedNode.h in CopyFiles */,
+				192F699C1E823F78008692C7 /* RCTDiffClampAnimatedNode.h in CopyFiles */,
+				192F699D1E823F78008692C7 /* RCTAdditionAnimatedNode.h in CopyFiles */,
+				192F699E1E823F78008692C7 /* RCTAnimatedNode.h in CopyFiles */,
+				192F699F1E823F78008692C7 /* RCTInterpolationAnimatedNode.h in CopyFiles */,
+				192F69A01E823F78008692C7 /* RCTModuloAnimatedNode.h in CopyFiles */,
+				192F69A11E823F78008692C7 /* RCTMultiplicationAnimatedNode.h in CopyFiles */,
+				192F69A21E823F78008692C7 /* RCTPropsAnimatedNode.h in CopyFiles */,
+				192F69A31E823F78008692C7 /* RCTStyleAnimatedNode.h in CopyFiles */,
+				192F69A41E823F78008692C7 /* RCTTransformAnimatedNode.h in CopyFiles */,
+				192F69A51E823F78008692C7 /* RCTValueAnimatedNode.h in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		1980B7311E80D21C004DC789 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = include/RCTAnimation;
+			dstSubfolderSpec = 16;
+			files = (
+				1980B7351E80DD6F004DC789 /* RCTNativeAnimatedModule.h in CopyFiles */,
+				1980B7361E80DD6F004DC789 /* RCTNativeAnimatedNodesManager.h in CopyFiles */,
+				1980B7371E80DD6F004DC789 /* RCTAnimationDriver.h in CopyFiles */,
+				1980B7381E80DD6F004DC789 /* RCTEventAnimation.h in CopyFiles */,
+				1980B7391E80DD6F004DC789 /* RCTFrameAnimation.h in CopyFiles */,
+				1980B73A1E80DD6F004DC789 /* RCTSpringAnimation.h in CopyFiles */,
+				1980B73B1E80DD6F004DC789 /* RCTDivisionAnimatedNode.h in CopyFiles */,
+				1980B73C1E80DD6F004DC789 /* RCTDiffClampAnimatedNode.h in CopyFiles */,
+				1980B73D1E80DD6F004DC789 /* RCTAdditionAnimatedNode.h in CopyFiles */,
+				1980B73E1E80DD6F004DC789 /* RCTAnimatedNode.h in CopyFiles */,
+				1980B73F1E80DD6F004DC789 /* RCTInterpolationAnimatedNode.h in CopyFiles */,
+				1980B7401E80DD6F004DC789 /* RCTModuloAnimatedNode.h in CopyFiles */,
+				1980B7411E80DD6F004DC789 /* RCTMultiplicationAnimatedNode.h in CopyFiles */,
+				1980B7421E80DD6F004DC789 /* RCTPropsAnimatedNode.h in CopyFiles */,
+				1980B7431E80DD6F004DC789 /* RCTStyleAnimatedNode.h in CopyFiles */,
+				1980B7441E80DD6F004DC789 /* RCTTransformAnimatedNode.h in CopyFiles */,
+				1980B7451E80DD6F004DC789 /* RCTValueAnimatedNode.h in CopyFiles */,
+				1980B7321E80D259004DC789 /* RCTAnimationUtils.h in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
 /* Begin PBXFileReference section */
 		134814201AA4EA6300B7C361 /* libRCTAnimation.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTAnimation.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		13E501B71D07A644005F35D8 /* RCTAnimationUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTAnimationUtils.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
@@ -153,12 +282,67 @@
 		};
 /* End PBXGroup section */
 
+/* Begin PBXHeadersBuildPhase section */
+		192F69801E823F2E008692C7 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				192F69811E823F4A008692C7 /* RCTAnimationUtils.h in Headers */,
+				192F69821E823F4A008692C7 /* RCTNativeAnimatedModule.h in Headers */,
+				192F69831E823F4A008692C7 /* RCTNativeAnimatedNodesManager.h in Headers */,
+				192F69841E823F4A008692C7 /* RCTAnimationDriver.h in Headers */,
+				192F69851E823F4A008692C7 /* RCTEventAnimation.h in Headers */,
+				192F69861E823F4A008692C7 /* RCTFrameAnimation.h in Headers */,
+				192F69871E823F4A008692C7 /* RCTSpringAnimation.h in Headers */,
+				192F69881E823F4A008692C7 /* RCTDivisionAnimatedNode.h in Headers */,
+				192F69891E823F4A008692C7 /* RCTDiffClampAnimatedNode.h in Headers */,
+				192F698A1E823F4A008692C7 /* RCTAdditionAnimatedNode.h in Headers */,
+				192F698B1E823F4A008692C7 /* RCTAnimatedNode.h in Headers */,
+				192F698C1E823F4A008692C7 /* RCTInterpolationAnimatedNode.h in Headers */,
+				192F698D1E823F4A008692C7 /* RCTModuloAnimatedNode.h in Headers */,
+				192F698E1E823F4A008692C7 /* RCTMultiplicationAnimatedNode.h in Headers */,
+				192F698F1E823F4A008692C7 /* RCTPropsAnimatedNode.h in Headers */,
+				192F69901E823F4A008692C7 /* RCTStyleAnimatedNode.h in Headers */,
+				192F69911E823F4A008692C7 /* RCTTransformAnimatedNode.h in Headers */,
+				192F69921E823F4A008692C7 /* RCTValueAnimatedNode.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		1980B70D1E80D1B5004DC789 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				1980B70E1E80D1C4004DC789 /* RCTAnimationUtils.h in Headers */,
+				1980B7101E80D1C4004DC789 /* RCTNativeAnimatedModule.h in Headers */,
+				1980B7121E80D1C4004DC789 /* RCTNativeAnimatedNodesManager.h in Headers */,
+				1980B7141E80D1C4004DC789 /* RCTAnimationDriver.h in Headers */,
+				1980B7151E80D1C4004DC789 /* RCTEventAnimation.h in Headers */,
+				1980B7171E80D1C4004DC789 /* RCTFrameAnimation.h in Headers */,
+				1980B7191E80D1C4004DC789 /* RCTSpringAnimation.h in Headers */,
+				1980B71B1E80D1C4004DC789 /* RCTDivisionAnimatedNode.h in Headers */,
+				1980B71D1E80D1C4004DC789 /* RCTDiffClampAnimatedNode.h in Headers */,
+				1980B71F1E80D1C4004DC789 /* RCTAdditionAnimatedNode.h in Headers */,
+				1980B7211E80D1C4004DC789 /* RCTAnimatedNode.h in Headers */,
+				1980B7231E80D1C4004DC789 /* RCTInterpolationAnimatedNode.h in Headers */,
+				1980B7251E80D1C4004DC789 /* RCTModuloAnimatedNode.h in Headers */,
+				1980B7271E80D1C4004DC789 /* RCTMultiplicationAnimatedNode.h in Headers */,
+				1980B7291E80D1C4004DC789 /* RCTPropsAnimatedNode.h in Headers */,
+				1980B72B1E80D1C4004DC789 /* RCTStyleAnimatedNode.h in Headers */,
+				1980B72D1E80D1C4004DC789 /* RCTTransformAnimatedNode.h in Headers */,
+				1980B72F1E80D1C4004DC789 /* RCTValueAnimatedNode.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
 /* Begin PBXNativeTarget section */
 		2D2A281F1D9B03D100D4039D /* RCTAnimation-tvOS */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 2D2A28281D9B03D100D4039D /* Build configuration list for PBXNativeTarget "RCTAnimation-tvOS" */;
 			buildPhases = (
 				2D2A281C1D9B03D100D4039D /* Sources */,
+				192F69801E823F2E008692C7 /* Headers */,
+				192F69931E823F4F008692C7 /* CopyFiles */,
 			);
 			buildRules = (
 			);
@@ -174,6 +358,8 @@
 			buildConfigurationList = 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RCTAnimation" */;
 			buildPhases = (
 				58B511D71A9E6C8500147676 /* Sources */,
+				1980B70D1E80D1B5004DC789 /* Headers */,
+				1980B7311E80D21C004DC789 /* CopyFiles */,
 			);
 			buildRules = (
 			);
diff --git a/Libraries/NativeAnimation/RCTAnimationUtils.h b/Libraries/NativeAnimation/RCTAnimationUtils.h
index dde6e697b437da..5327c36676405a 100644
--- a/Libraries/NativeAnimation/RCTAnimationUtils.h
+++ b/Libraries/NativeAnimation/RCTAnimationUtils.h
@@ -16,6 +16,12 @@ static NSString *const EXTRAPOLATE_TYPE_IDENTITY = @"identity";
 static NSString *const EXTRAPOLATE_TYPE_CLAMP = @"clamp";
 static NSString *const EXTRAPOLATE_TYPE_EXTEND = @"extend";
 
+RCT_EXTERN CGFloat RCTInterpolateValueInRange(CGFloat value,
+                                              NSArray<NSNumber *> *inputRange,
+                                              NSArray<NSNumber *> *outputRange,
+                                              NSString *extrapolateLeft,
+                                              NSString *extrapolateRight);
+
 RCT_EXTERN CGFloat RCTInterpolateValue(CGFloat value,
                                        CGFloat inputMin,
                                        CGFloat inputMax,
diff --git a/Libraries/NativeAnimation/RCTAnimationUtils.m b/Libraries/NativeAnimation/RCTAnimationUtils.m
index fc2b2161210410..d159c05b80416d 100644
--- a/Libraries/NativeAnimation/RCTAnimationUtils.m
+++ b/Libraries/NativeAnimation/RCTAnimationUtils.m
@@ -11,6 +11,19 @@
 
 #import <React/RCTLog.h>
 
+static NSUInteger _RCTFindIndexOfNearestValue(CGFloat value, NSArray<NSNumber *> *range)
+{
+  NSUInteger index;
+  NSUInteger rangeCount = range.count;
+  for (index = 1; index < rangeCount - 1; index++) {
+    NSNumber *inputValue = range[index];
+    if (inputValue.doubleValue >= value) {
+      break;
+    }
+  }
+  return index - 1;
+}
+
 /**
  * Interpolates value by remapping it linearly fromMin->fromMax to toMin->toMax
  */
@@ -49,6 +62,30 @@ CGFloat RCTInterpolateValue(CGFloat value,
   return outputMin + (value - inputMin) * (outputMax - outputMin) / (inputMax - inputMin);
 }
 
+/**
+ * Interpolates value by mapping it from the inputRange to the outputRange.
+ */
+CGFloat RCTInterpolateValueInRange(CGFloat value,
+                                   NSArray<NSNumber *> *inputRange,
+                                   NSArray<NSNumber *> *outputRange,
+                                   NSString *extrapolateLeft,
+                                   NSString *extrapolateRight)
+{
+  NSUInteger rangeIndex = _RCTFindIndexOfNearestValue(value, inputRange);
+  CGFloat inputMin = inputRange[rangeIndex].doubleValue;
+  CGFloat inputMax = inputRange[rangeIndex + 1].doubleValue;
+  CGFloat outputMin = outputRange[rangeIndex].doubleValue;
+  CGFloat outputMax = outputRange[rangeIndex + 1].doubleValue;
+
+  return RCTInterpolateValue(value,
+                             inputMin,
+                             inputMax,
+                             outputMin,
+                             outputMax,
+                             extrapolateLeft,
+                             extrapolateRight);
+}
+
 CGFloat RCTRadiansToDegrees(CGFloat radians)
 {
   return radians * 180.0 / M_PI;
diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedModule.m b/Libraries/NativeAnimation/RCTNativeAnimatedModule.m
index 26cfbf567fc934..c8e88e4ed0e6ce 100644
--- a/Libraries/NativeAnimation/RCTNativeAnimatedModule.m
+++ b/Libraries/NativeAnimation/RCTNativeAnimatedModule.m
@@ -161,9 +161,8 @@ - (void)setBridge:(RCTBridge *)bridge
 
 RCT_EXPORT_METHOD(stopListeningToAnimatedNodeValue:(nonnull NSNumber *)tag)
 {
-  __weak id<RCTValueAnimatedNodeObserver> valueObserver = self;
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
-    [nodesManager stopListeningToAnimatedNodeValue:tag valueObserver:valueObserver];
+    [nodesManager stopListeningToAnimatedNodeValue:tag];
   }];
 }
 
diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h b/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h
index c4ffc652a693ad..5aca37f6411a03 100644
--- a/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h
+++ b/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h
@@ -9,17 +9,18 @@
 
 #import <Foundation/Foundation.h>
 
+#import <RCTAnimation/RCTValueAnimatedNode.h>
 #import <React/RCTBridgeModule.h>
 #import <React/RCTUIManager.h>
 
-#import "RCTValueAnimatedNode.h"
-
 @interface RCTNativeAnimatedNodesManager : NSObject
 
 - (nonnull instancetype)initWithUIManager:(nonnull RCTUIManager *)uiManager;
 
 - (void)updateAnimations;
 
+- (void)stepAnimations:(nonnull CADisplayLink *)displaylink;
+
 // graph
 
 - (void)createAnimatedNode:(nonnull NSNumber *)tag
@@ -80,7 +81,6 @@
 - (void)startListeningToAnimatedNodeValue:(nonnull NSNumber *)tag
                             valueObserver:(nonnull id<RCTValueAnimatedNodeObserver>)valueObserver;
 
-- (void)stopListeningToAnimatedNodeValue:(nonnull NSNumber *)tag
-                           valueObserver:(nonnull id<RCTValueAnimatedNodeObserver>)valueObserver;
+- (void)stopListeningToAnimatedNodeValue:(nonnull NSNumber *)tag;
 
 @end
diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m b/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m
index caeabba7232a62..f0a89bb4059b2e 100644
--- a/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m
+++ b/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m
@@ -235,7 +235,7 @@ - (void)stopAnimation:(nonnull NSNumber *)animationId
 {
   for (id<RCTAnimationDriver> driver in _activeAnimations) {
     if ([driver.animationId isEqual:animationId]) {
-      [driver removeAnimation];
+      [driver stopAnimation];
       [_activeAnimations removeObject:driver];
       break;
     }
@@ -325,11 +325,10 @@ - (void)startListeningToAnimatedNodeValue:(nonnull NSNumber *)tag
 }
 
 - (void)stopListeningToAnimatedNodeValue:(nonnull NSNumber *)tag
-                           valueObserver:(id<RCTValueAnimatedNodeObserver>)valueObserver
 {
   RCTAnimatedNode *node = _animationNodes[tag];
   if ([node isKindOfClass:[RCTValueAnimatedNode class]]) {
-    ((RCTValueAnimatedNode *)node).valueObserver = valueObserver;
+    ((RCTValueAnimatedNode *)node).valueObserver = nil;
   }
 }
 
@@ -339,7 +338,7 @@ - (void)stopListeningToAnimatedNodeValue:(nonnull NSNumber *)tag
 - (void)startAnimationLoopIfNeeded
 {
   if (!_displayLink && _activeAnimations.count > 0) {
-    _displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(stepAnimations)];
+    _displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(stepAnimations:)];
     [_displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
   }
 }
@@ -359,17 +358,18 @@ - (void)stopAnimationLoop
   }
 }
 
-- (void)stepAnimations
+- (void)stepAnimations:(CADisplayLink *)displaylink
 {
+  NSTimeInterval time = displaylink.timestamp;
   for (id<RCTAnimationDriver> animationDriver in _activeAnimations) {
-    [animationDriver stepAnimation];
+    [animationDriver stepAnimationWithTime:time];
   }
 
   [self updateAnimations];
 
   for (id<RCTAnimationDriver> animationDriver in [_activeAnimations copy]) {
     if (animationDriver.animationHasFinished) {
-      [animationDriver removeAnimation];
+      [animationDriver stopAnimation];
       [_activeAnimations removeObject:animationDriver];
     }
   }

From 33000c74f9b0178f547506688f2a28dc47f6579e Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Tue, 28 Mar 2017 10:48:29 -0700
Subject: [PATCH 211/366] packager: GlobalTransformCache: retry keys fetches

Reviewed By: davidaurelio

Differential Revision: D4779641

fbshipit-source-id: 1b156bf075fa2456d9e6b1a3f38855357abc1abb
---
 packager/src/lib/GlobalTransformCache.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packager/src/lib/GlobalTransformCache.js b/packager/src/lib/GlobalTransformCache.js
index c0a03e1c33988e..eccf54fbbdd1f3 100644
--- a/packager/src/lib/GlobalTransformCache.js
+++ b/packager/src/lib/GlobalTransformCache.js
@@ -239,13 +239,17 @@ class GlobalTransformCache {
    */
   static fetchResultFromURI(uri: string): Promise<CachedResult> {
     return GlobalTransformCache._fetchResultFromURI(uri).catch(error => {
-      if (!(error instanceof FetchError && error.type === 'request-timeout')) {
+      if (!GlobalTransformCache.isTimeoutError(error)) {
         throw error;
       }
       return this._fetchResultFromURI(uri);
     });
   }
 
+  static isTimeoutError(error: Error): boolean {
+    return error instanceof FetchError && error.type === 'request-timeout';
+  }
+
   shouldFetch(props: FetchProps): boolean {
     return this._profileSet.has(props.transformOptions);
   }

From f46fd36a44bf6f4a2ceb50b0d2325f1e26b7d742 Mon Sep 17 00:00:00 2001
From: Janic Duplessis <janicduplessis@gmail.com>
Date: Tue, 28 Mar 2017 10:50:00 -0700
Subject: [PATCH 212/366] NativeAnimated - Fix missing update at the end of the
 batch

Summary:
This call got lost in the refactor of #11819 and caused some view updating issues.
Closes https://github.com/facebook/react-native/pull/13183

Differential Revision: D4787565

Pulled By: javache

fbshipit-source-id: 8f7d456824c67abee6ac1d5f906e4c831ede889b
---
 Libraries/NativeAnimation/RCTNativeAnimatedModule.m | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedModule.m b/Libraries/NativeAnimation/RCTNativeAnimatedModule.m
index c8e88e4ed0e6ce..67a0e844b5e327 100644
--- a/Libraries/NativeAnimation/RCTNativeAnimatedModule.m
+++ b/Libraries/NativeAnimation/RCTNativeAnimatedModule.m
@@ -217,6 +217,8 @@ - (void)uiManagerWillFlushUIBlocks:(RCTUIManager *)uiManager
     for (AnimatedOperation operation in operations) {
       operation(self->_nodesManager);
     }
+
+    [self->_nodesManager updateAnimations];
   }];
 }
 

From 01215c013d54b525c099d866ffd79accc914d49f Mon Sep 17 00:00:00 2001
From: Brian Vaughn <bvaughn@fb.com>
Date: Tue, 28 Mar 2017 10:51:29 -0700
Subject: [PATCH 213/366] Re-added null inst check to avoid EventPropagators
 bug

Reviewed By: fkgozali

Differential Revision: D4787522

fbshipit-source-id: 80eb4da5a6df46a8a7235358c70b2a04e43dc574
---
 .../src/renderers/shared/shared/event/EventPropagators.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Libraries/Renderer/src/renderers/shared/shared/event/EventPropagators.js b/Libraries/Renderer/src/renderers/shared/shared/event/EventPropagators.js
index db9537b8338e76..05d6863d3855e3 100644
--- a/Libraries/Renderer/src/renderers/shared/shared/event/EventPropagators.js
+++ b/Libraries/Renderer/src/renderers/shared/shared/event/EventPropagators.js
@@ -93,7 +93,7 @@ function accumulateTwoPhaseDispatchesSingleSkipTarget(event) {
  * requiring that the `dispatchMarker` be the same as the dispatched ID.
  */
 function accumulateDispatches(inst, ignoredDirection, event) {
-  if (event && event.dispatchConfig.registrationName) {
+  if (inst && event && event.dispatchConfig.registrationName) {
     var registrationName = event.dispatchConfig.registrationName;
     var listener = getListener(inst, registrationName);
     if (listener) {

From 777e80a2b73eb58c0c57598fccf27922692a041f Mon Sep 17 00:00:00 2001
From: Eric Vicenti <evv@fb.com>
Date: Tue, 28 Mar 2017 11:04:25 -0700
Subject: [PATCH 214/366] Remove CustomComponents folder and license

Reviewed By: yungsters

Differential Revision: D4787296

fbshipit-source-id: fddf3c520cb1092ed61b81db247a9572528eb767
---
 LICENSE-CustomComponents           | 9 ---------
 Libraries/CustomComponents/LICENSE | 9 ---------
 2 files changed, 18 deletions(-)
 delete mode 100644 LICENSE-CustomComponents
 delete mode 100644 Libraries/CustomComponents/LICENSE

diff --git a/LICENSE-CustomComponents b/LICENSE-CustomComponents
deleted file mode 100644
index 01f2fbc020bb37..00000000000000
--- a/LICENSE-CustomComponents
+++ /dev/null
@@ -1,9 +0,0 @@
-LICENSE AGREEMENT
-
-For React Native Custom Components software
-
-Copyright (c) 2015, Facebook, Inc.  All rights reserved.
-
-Facebook, Inc. (“Facebook”) owns all right, title and interest, including all intellectual property and other proprietary rights, in and to the React Native Custom Components software (the “Software”).  Subject to your compliance with these terms, you are hereby granted a non-exclusive, worldwide, royalty-free copyright license to (1) use and copy the Software; and (2) reproduce and distribute the Software as part of your own software (“Your Software”).  Facebook reserves all rights not expressly granted to you in this license agreement.
-
-THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.  IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Libraries/CustomComponents/LICENSE b/Libraries/CustomComponents/LICENSE
deleted file mode 100644
index ef4ae1360ea149..00000000000000
--- a/Libraries/CustomComponents/LICENSE
+++ /dev/null
@@ -1,9 +0,0 @@
-LICENSE AGREEMENT
-
-For React Native Custom Components software
-
-Copyright (c) 2015, Facebook, Inc.  All rights reserved.
-
-Facebook, Inc. ("Facebook") owns all right, title and interest, including all intellectual property and other proprietary rights, in and to the React Native Custom Components software (the "Software").  Subject to your compliance with these terms, you are hereby granted a non-exclusive, worldwide, royalty-free copyright license to (1) use and copy the Software; and (2) reproduce and distribute the Software as part of your own software ("Your Software").  Facebook reserves all rights not expressly granted to you in this license agreement.
-
-THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED.  IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

From 1129c6096d2f2b86e7b26f25f51992d5c259a744 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <bvaughn@fb.com>
Date: Tue, 28 Mar 2017 11:17:21 -0700
Subject: [PATCH 215/366] Replaced View.propTypes with a static getter that
 warned about deprecation

Reviewed By: spicyj

Differential Revision: D4766860

fbshipit-source-id: c0ef46df58b6167178e801d9dbe481101c0dc773
---
 .../Animated/src/AnimatedImplementation.js    | 14 +++-
 Libraries/Components/View/View.js             | 83 +++++++++++--------
 .../ReactNative/requireNativeComponent.js     | 15 +++-
 Libraries/ReactNative/verifyPropTypes.js      | 15 +++-
 4 files changed, 88 insertions(+), 39 deletions(-)

diff --git a/Libraries/Animated/src/AnimatedImplementation.js b/Libraries/Animated/src/AnimatedImplementation.js
index 1304517abd7560..141bde1cb99ccb 100644
--- a/Libraries/Animated/src/AnimatedImplementation.js
+++ b/Libraries/Animated/src/AnimatedImplementation.js
@@ -1854,14 +1854,24 @@ function createAnimatedComponent(Component: any): any {
       return this._component;
     }
   }
+
+  // ReactNative `View.propTypes` have been deprecated in favor of
+  // `ViewPropTypes`. In their place a temporary getter has been added with a
+  // deprecated warning message. Avoid triggering that warning here by using
+  // temporary workaround, __propTypesSecretDontUseThesePlease.
+  // TODO (bvaughn) Revert this particular change any time after April 1
+  var propTypes =
+    Component.__propTypesSecretDontUseThesePlease ||
+    Component.propTypes;
+
   AnimatedComponent.propTypes = {
     style: function(props, propName, componentName) {
-      if (!Component.propTypes) {
+      if (!propTypes) {
         return;
       }
 
       for (var key in ViewStylePropTypes) {
-        if (!Component.propTypes[key] && props[key] !== undefined) {
+        if (!propTypes[key] && props[key] !== undefined) {
           console.warn(
             'You are setting the style `{ ' + key + ': ... }` as a prop. You ' +
             'should nest it in a style object. ' +
diff --git a/Libraries/Components/View/View.js b/Libraries/Components/View/View.js
index 86b7237716aee4..b054ef8cce42da 100644
--- a/Libraries/Components/View/View.js
+++ b/Libraries/Components/View/View.js
@@ -87,6 +87,21 @@ const View = React.createClass({
   // values had to be hardcoded.
   mixins: [NativeMethodsMixin],
 
+  // `propTypes` should not be accessed directly on View since this wrapper only
+  // exists for DEV mode. However it's important for them to be declared.
+  // If the object passed to `createClass` specifies `propTypes`, Flow will
+  // create a static type from it. This property will be over-written below with
+  // a warn-on-use getter though.
+  // TODO (bvaughn) Remove the warn-on-use comment after April 1.
+  propTypes: ViewPropTypes,
+
+  // ReactElementValidator will (temporarily) use this private accessor when
+  // detected to avoid triggering the warning message.
+  // TODO (bvaughn) Remove this after April 1 ReactNative RC is tagged.
+  statics: {
+    __propTypesSecretDontUseThesePlease: ViewPropTypes
+  },
+
   /**
    * `NativeMethodsMixin` will look for this when invoking `setNativeProps`. We
    * make `this` look like an actual native component class.
@@ -96,11 +111,6 @@ const View = React.createClass({
     validAttributes: ReactNativeViewAttributes.RCTView
   },
 
-  // TODO (bvaughn) Replace this with a deprecated getter warning. This object
-  // should be accessible via a separate import. It will not be available in
-  // production mode in the future and so should not be directly accessed.
-  propTypes: ViewPropTypes,
-
   contextTypes: {
     isInAParentText: React.PropTypes.bool,
   },
@@ -122,57 +132,64 @@ const View = React.createClass({
 // be supported with React fiber. This warning message will go away in the next
 // ReactNative release. Use defineProperty() rather than createClass() statics
 // because the mixin process auto-triggers the 1-time warning message.
-// TODO (bvaughn) Remove these warning messages after the April ReactNative tag.
+// TODO (bvaughn) Remove this after April 1 ReactNative RC is tagged.
 function mixinStatics (target) {
   let warnedAboutAccessibilityTraits = false;
   let warnedAboutAccessibilityComponentType = false;
   let warnedAboutForceTouchAvailable = false;
+  let warnedAboutPropTypes = false;
 
   // $FlowFixMe https://github.com/facebook/flow/issues/285
   Object.defineProperty(target, 'AccessibilityTraits', {
     get: function() {
-      if (!warnedAboutAccessibilityTraits) {
-        warnedAboutAccessibilityTraits = true;
-        warning(
-          false,
-          'View.AccessibilityTraits has been deprecated and will be ' +
-          'removed in a future version of ReactNative. Use ' +
-          'ViewAccessibility.AccessibilityTraits instead.'
-        );
-      }
+      warning(
+        warnedAboutAccessibilityTraits,
+        'View.AccessibilityTraits has been deprecated and will be ' +
+        'removed in a future version of ReactNative. Use ' +
+        'ViewAccessibility.AccessibilityTraits instead.'
+      );
+      warnedAboutAccessibilityTraits = true;
       return AccessibilityTraits;
     }
   });
   // $FlowFixMe https://github.com/facebook/flow/issues/285
   Object.defineProperty(target, 'AccessibilityComponentType', {
     get: function() {
-      if (!warnedAboutAccessibilityComponentType) {
-        warnedAboutAccessibilityComponentType = true;
-        warning(
-          false,
-          'View.AccessibilityComponentType has been deprecated and will be ' +
-          'removed in a future version of ReactNative. Use ' +
-          'ViewAccessibility.AccessibilityComponentTypes instead.'
-        );
-      }
+      warning(
+        warnedAboutAccessibilityComponentType,
+        'View.AccessibilityComponentType has been deprecated and will be ' +
+        'removed in a future version of ReactNative. Use ' +
+        'ViewAccessibility.AccessibilityComponentTypes instead.'
+      );
+      warnedAboutAccessibilityComponentType = true;
       return AccessibilityComponentTypes;
     }
   });
   // $FlowFixMe https://github.com/facebook/flow/issues/285
   Object.defineProperty(target, 'forceTouchAvailable', {
     get: function() {
-      if (!warnedAboutForceTouchAvailable) {
-        warnedAboutForceTouchAvailable = true;
-        warning(
-          false,
-          'View.forceTouchAvailable has been deprecated and will be removed ' +
-          'in a future version of ReactNative. Use ' +
-          'NativeModules.PlatformConstants.forceTouchAvailable instead.'
-        );
-      }
+      warning(
+        warnedAboutForceTouchAvailable,
+        'View.forceTouchAvailable has been deprecated and will be removed ' +
+        'in a future version of ReactNative. Use ' +
+        'NativeModules.PlatformConstants.forceTouchAvailable instead.'
+      );
+      warnedAboutForceTouchAvailable = true;
       return forceTouchAvailable;
     }
   });
+  // $FlowFixMe https://github.com/facebook/flow/issues/285
+  Object.defineProperty(target, 'propTypes', {
+    get: function() {
+      warning(
+        warnedAboutPropTypes,
+        'View.propTypes has been deprecated and will be removed in a future ' +
+        'version of ReactNative. Use ViewPropTypes instead.'
+      );
+      warnedAboutPropTypes = true;
+      return ViewPropTypes;
+    }
+  });
 }
 
 const RCTView = requireNativeComponent('RCTView', View, {
diff --git a/Libraries/ReactNative/requireNativeComponent.js b/Libraries/ReactNative/requireNativeComponent.js
index 682a8240c57b43..00327a97c73e9f 100644
--- a/Libraries/ReactNative/requireNativeComponent.js
+++ b/Libraries/ReactNative/requireNativeComponent.js
@@ -55,7 +55,20 @@ function requireNativeComponent(
 
   viewConfig.uiViewClassName = viewName;
   viewConfig.validAttributes = {};
-  viewConfig.propTypes = componentInterface && componentInterface.propTypes;
+
+  // ReactNative `View.propTypes` have been deprecated in favor of
+  // `ViewPropTypes`. In their place a temporary getter has been added with a
+  // deprecated warning message. Avoid triggering that warning here by using
+  // temporary workaround, __propTypesSecretDontUseThesePlease.
+  // TODO (bvaughn) Revert this particular change any time after April 1
+  if (componentInterface) {
+    viewConfig.propTypes =
+      typeof componentInterface.__propTypesSecretDontUseThesePlease === 'object'
+        ? componentInterface.__propTypesSecretDontUseThesePlease
+        : componentInterface.propTypes;
+  } else {
+    viewConfig.propTypes = null;
+  }
 
   // The ViewConfig doesn't contain any props inherited from the view manager's
   // superclass, so we manually merge in the RCTView ones. Other inheritance
diff --git a/Libraries/ReactNative/verifyPropTypes.js b/Libraries/ReactNative/verifyPropTypes.js
index 03ec3792a17542..d140182760a6aa 100644
--- a/Libraries/ReactNative/verifyPropTypes.js
+++ b/Libraries/ReactNative/verifyPropTypes.js
@@ -32,7 +32,16 @@ function verifyPropTypes(
     componentInterface.name ||
     'unknown';
 
-  if (!componentInterface.propTypes) {
+  // ReactNative `View.propTypes` have been deprecated in favor of
+  // `ViewPropTypes`. In their place a temporary getter has been added with a
+  // deprecated warning message. Avoid triggering that warning here by using
+  // temporary workaround, __propTypesSecretDontUseThesePlease.
+  // TODO (bvaughn) Revert this particular change any time after April 1
+  var propTypes =
+    (componentInterface : any).__propTypesSecretDontUseThesePlease ||
+    componentInterface.propTypes;
+
+  if (!propTypes) {
     throw new Error(
       '`' + componentName + '` has no propTypes defined`'
     );
@@ -40,11 +49,11 @@ function verifyPropTypes(
 
   var nativeProps = viewConfig.NativeProps;
   for (var prop in nativeProps) {
-    if (!componentInterface.propTypes[prop] &&
+    if (!propTypes[prop] &&
         !ReactNativeStyleAttributes[prop] &&
         (!nativePropsToIgnore || !nativePropsToIgnore[prop])) {
       var message;
-      if (componentInterface.propTypes.hasOwnProperty(prop)) {
+      if (propTypes.hasOwnProperty(prop)) {
         message = '`' + componentName + '` has incorrectly defined propType for native prop `' +
         viewConfig.uiViewClassName + '.' + prop + '` of native type `' + nativeProps[prop];
       } else {

From 4bf2d8cb7d47d6ffa25aa697723086ffd3753083 Mon Sep 17 00:00:00 2001
From: Emil Sjolander <emilsj@fb.com>
Date: Tue, 28 Mar 2017 12:37:49 -0700
Subject: [PATCH 216/366] Set hasNewLayout on children when changing their
 layout due to display none parent

Reviewed By: astreet

Differential Revision: D4786615

fbshipit-source-id: 2f3a16661d37bc37939e8e7a551445886a06524e
---
 ReactCommon/yoga/yoga/Yoga.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ReactCommon/yoga/yoga/Yoga.c b/ReactCommon/yoga/yoga/Yoga.c
index 65a3ba46f98707..75e2348ccf46a6 100644
--- a/ReactCommon/yoga/yoga/Yoga.c
+++ b/ReactCommon/yoga/yoga/Yoga.c
@@ -1811,6 +1811,7 @@ static void YGZeroOutLayoutRecursivly(const YGNodeRef node) {
   node->layout.cachedLayout.widthMeasureMode = YGMeasureModeExactly;
   node->layout.cachedLayout.computedWidth = 0;
   node->layout.cachedLayout.computedHeight = 0;
+  node->hasNewLayout = true;
   const uint32_t childCount = YGNodeGetChildCount(node);
   for (uint32_t i = 0; i < childCount; i++) {
     const YGNodeRef child = YGNodeListGet(node->children, i);

From 63035a4c083807efce3ad0bb08e318811fa7558b Mon Sep 17 00:00:00 2001
From: Danny Liu <eureka@fb.com>
Date: Tue, 28 Mar 2017 16:08:28 -0700
Subject: [PATCH 217/366] replace string comparison with enum

Summary:
This change change the interface of reactmarker to use enum type and ReactMarker would still support logMarker(string, string) with addtional support for logMarker(ReactMarkerConstants, string).
Also moved some markers into the enum.

Reviewed By: fkgozali

Differential Revision: D4773600

fbshipit-source-id: 336ba79bb9514d3146bdda177861743ae51424ab
---
 .../facebook/react/bridge/ReactMarker.java    |  16 ++-
 .../react/bridge/ReactMarkerConstants.java    | 123 +++++++++---------
 2 files changed, 72 insertions(+), 67 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarker.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarker.java
index 49e479fe74360d..5dc1dc9fd3b090 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarker.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarker.java
@@ -13,7 +13,7 @@
 public class ReactMarker {
 
   public interface MarkerListener {
-    void logMarker(String name, @Nullable String tag);
+    void logMarker(ReactMarkerConstants name, @Nullable String tag);
   };
 
   private static @Nullable MarkerListener sMarkerListener = null;
@@ -31,7 +31,19 @@ public static void logMarker(String name) {
   }
 
   @DoNotStrip
-  public static void logMarker(String name, String tag) {
+  public static void logMarker(String name, @Nullable String tag) {
+    if (sMarkerListener != null) {
+      sMarkerListener.logMarker(ReactMarkerConstants.valueOf(name), tag);
+    }
+  }
+
+  @DoNotStrip
+  public static void logMarker(ReactMarkerConstants name) {
+    logMarker(name, null);
+  }
+
+  @DoNotStrip
+  public static void logMarker(ReactMarkerConstants name, @Nullable String tag) {
     if (sMarkerListener != null) {
       sMarkerListener.logMarker(name, tag);
     }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java
index 70f868d9072e35..78e0cec6cf06aa 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java
@@ -5,69 +5,62 @@
 /**
  * Constants used by ReactMarker.
  */
-public class ReactMarkerConstants {
-
-  // TODO convert to ints so we don't have to do String compares
-  public static final String CREATE_REACT_CONTEXT_START = "CREATE_REACT_CONTEXT_START";
-  public static final String CREATE_REACT_CONTEXT_END = "CREATE_REACT_CONTEXT_END";
-  public static final String PROCESS_PACKAGES_START = "PROCESS_PACKAGES_START";
-  public static final String PROCESS_PACKAGES_END = "PROCESS_PACKAGES_END";
-  public static final String BUILD_NATIVE_MODULE_REGISTRY_START =
-      "BUILD_NATIVE_MODULE_REGISTRY_START";
-  public static final String BUILD_NATIVE_MODULE_REGISTRY_END =
-      "BUILD_NATIVE_MODULE_REGISTRY_END";
-  public static final String BUILD_JS_MODULE_CONFIG_START = "BUILD_JS_MODULE_CONFIG_START";
-  public static final String BUILD_JS_MODULE_CONFIG_END = "BUILD_JS_MODULE_CONFIG_END";
-  public static final String CREATE_CATALYST_INSTANCE_START = "CREATE_CATALYST_INSTANCE_START";
-  public static final String CREATE_CATALYST_INSTANCE_END = "CREATE_CATALYST_INSTANCE_END";
-  public static final String RUN_JS_BUNDLE_START = "RUN_JS_BUNDLE_START";
-  public static final String RUN_JS_BUNDLE_END = "RUN_JS_BUNDLE_END";
-  public static final String NATIVE_MODULE_INITIALIZE_START = "NativeModule_start";
-  public static final String NATIVE_MODULE_INITIALIZE_END = "NativeModule_end";
-  public static final String SETUP_REACT_CONTEXT_START = "SETUP_REACT_CONTEXT_START";
-  public static final String SETUP_REACT_CONTEXT_END = "SETUP_REACT_CONTEXT_END";
-  public static final String CREATE_UI_MANAGER_MODULE_START = "CREATE_UI_MANAGER_MODULE_START";
-  public static final String CREATE_UI_MANAGER_MODULE_END = "CREATE_UI_MANAGER_MODULE_END";
-  public static final String CREATE_VIEW_MANAGERS_START = "CREATE_VIEW_MANAGERS_START";
-  public static final String CREATE_VIEW_MANAGERS_END = "CREATE_VIEW_MANAGERS_END";
-  public static final String CREATE_UI_MANAGER_MODULE_CONSTANTS_START =
-    "CREATE_UI_MANAGER_MODULE_CONSTANTS_START";
-  public static final String CREATE_UI_MANAGER_MODULE_CONSTANTS_END =
-    "CREATE_UI_MANAGER_MODULE_CONSTANTS_END";
-  public static final String CREATE_MODULE_START = "CREATE_MODULE_START";
-  public static final String CREATE_MODULE_END = "CREATE_MODULE_END";
-  public static final String PROCESS_CORE_REACT_PACKAGE_START = "PROCESS_CORE_REACT_PACKAGE_START";
-  public static final String PROCESS_CORE_REACT_PACKAGE_END = "PROCESS_CORE_REACT_PACKAGE_END";
-  public static final String CORE_REACT_PACKAGE_GET_REACT_MODULE_INFO_PROVIDER_START =
-    "CORE_REACT_PACKAGE_GET_REACT_MODULE_INFO_PROVIDER_START";
-  public static final String CORE_REACT_PACKAGE_GET_REACT_MODULE_INFO_PROVIDER_END =
-    "CORE_REACT_PACKAGE_GET_REACT_MODULE_INFO_PROVIDER_END";
-  public static final String UI_MANAGER_MODULE_CONSTANTS_CONVERT_START =
-    "UI_MANAGER_MODULE_CONSTANTS_CONVERT_START";
-  public static final String UI_MANAGER_MODULE_CONSTANTS_CONVERT_END =
-    "UI_MANAGER_MODULE_CONSTANTS_CONVERT_END";
-  public static final String CREATE_I18N_MODULE_CONSTANTS_START =
-    "CREATE_I18N_MODULE_CONSTANTS_START";
-  public static final String CREATE_I18N_MODULE_CONSTANTS_END =
-    "CREATE_I18N_MODULE_CONSTANTS_END";
-  public static final String I18N_MODULE_CONSTANTS_CONVERT_START =
-    "I18N_MODULE_CONSTANTS_CONVERT_START";
-  public static final String I18N_MODULE_CONSTANTS_CONVERT_END =
-    "I18N_MODULE_CONSTANTS_CONVERT_END";
-  public static final String CREATE_I18N_ASSETS_MODULE_START =
-    "CREATE_I18N_ASSETS_MODULE_START";
-  public static final String CREATE_I18N_ASSETS_MODULE_END =
-    "CREATE_I18N_ASSETS_MODULE_END";
-  public static final String GET_CONSTANTS_START = "GET_CONSTANTS_START";
-  public static final String GET_CONSTANTS_END = "GET_CONSTANTS_END";
-  public static final String INITIALIZE_MODULE_START = "INITIALIZE_MODULE_START";
-  public static final String INITIALIZE_MODULE_END = "INITIALIZE_MODULE_END";
-  public static final String ON_HOST_RESUME_START = "ON_HOST_RESUME_START";
-  public static final String ON_HOST_RESUME_END = "ON_HOST_RESUME_END";
-  public static final String ON_HOST_PAUSE_START = "ON_HOST_PAUSE_START";
-  public static final String ON_HOST_PAUSE_END = "ON_HOST_PAUSE_END";
-  public static final String CONVERT_CONSTANTS_START = "CONVERT_CONSTANTS_START";
-  public static final String CONVERT_CONSTANTS_END = "CONVERT_CONSTANTS_END";
-  public static final String PRE_SETUP_REACT_CONTEXT_START = "PRE_SETUP_REACT_CONTEXT_START";
-  public static final String PRE_SETUP_REACT_CONTEXT_END = "PRE_SETUP_REACT_CONTEXT_END";
+public enum ReactMarkerConstants {
+  CREATE_REACT_CONTEXT_START,
+  CREATE_REACT_CONTEXT_END,
+  PROCESS_PACKAGES_START,
+  PROCESS_PACKAGES_END,
+  BUILD_NATIVE_MODULE_REGISTRY_START,
+  BUILD_NATIVE_MODULE_REGISTRY_END,
+  BUILD_JS_MODULE_CONFIG_START,
+  BUILD_JS_MODULE_CONFIG_END,
+  CREATE_CATALYST_INSTANCE_START,
+  CREATE_CATALYST_INSTANCE_END,
+  RUN_JS_BUNDLE_START,
+  RUN_JS_BUNDLE_END,
+  NATIVE_MODULE_INITIALIZE_START,
+  NATIVE_MODULE_INITIALIZE_END,
+  SETUP_REACT_CONTEXT_START,
+  SETUP_REACT_CONTEXT_END,
+  CREATE_UI_MANAGER_MODULE_START,
+  CREATE_UI_MANAGER_MODULE_END,
+  CREATE_VIEW_MANAGERS_START,
+  CREATE_VIEW_MANAGERS_END,
+  CREATE_UI_MANAGER_MODULE_CONSTANTS_START,
+  CREATE_UI_MANAGER_MODULE_CONSTANTS_END,
+  CREATE_MODULE_START,
+  CREATE_MODULE_END,
+  PROCESS_CORE_REACT_PACKAGE_START,
+  PROCESS_CORE_REACT_PACKAGE_END,
+  CORE_REACT_PACKAGE_GET_REACT_MODULE_INFO_PROVIDER_START,
+  CORE_REACT_PACKAGE_GET_REACT_MODULE_INFO_PROVIDER_END,
+  UI_MANAGER_MODULE_CONSTANTS_CONVERT_START,
+  UI_MANAGER_MODULE_CONSTANTS_CONVERT_END,
+  CREATE_I18N_MODULE_CONSTANTS_START,
+  CREATE_I18N_MODULE_CONSTANTS_END,
+  I18N_MODULE_CONSTANTS_CONVERT_START,
+  I18N_MODULE_CONSTANTS_CONVERT_END,
+  CREATE_I18N_ASSETS_MODULE_START,
+  CREATE_I18N_ASSETS_MODULE_END,
+  GET_CONSTANTS_START,
+  GET_CONSTANTS_END,
+  INITIALIZE_MODULE_START,
+  INITIALIZE_MODULE_END,
+  ON_HOST_RESUME_START,
+  ON_HOST_RESUME_END,
+  ON_HOST_PAUSE_START,
+  ON_HOST_PAUSE_END,
+  CONVERT_CONSTANTS_START,
+  CONVERT_CONSTANTS_END,
+  PRE_REACT_CONTEXT_END,
+  UNPACKER_CHECK_START,
+  UNPACKER_CHECK_END,
+  UNPACKER_BUNDLE_EXTRACTED,
+  UNPACKING_JS_BUNDLE_LOADER_CHECK_START,
+  UNPACKING_JS_BUNDLE_LOADER_CHECK_END,
+  UNPACKING_JS_BUNDLE_LOADER_EXTRACTED,
+  loadApplicationScript_startStringConvert,
+  loadApplicationScript_endStringConvert,
+  PRE_SETUP_REACT_CONTEXT_START,
+  PRE_SETUP_REACT_CONTEXT_END,
 }

From fd6f22253a28c86f3234c63d7891598bceec153b Mon Sep 17 00:00:00 2001
From: jrodiger <jonathan@rodiger.net>
Date: Tue, 28 Mar 2017 17:14:55 -0700
Subject: [PATCH 218/366] Update GettingStarted.md (Windows Packager)

Summary:
After pull request #12755 it is no longer necessary to manually start the packager on Windows using `react-native start`. I've updated the documentation to reflect this change, and match the Mac OS - Android instructions (same commands used to launch a project now).
Closes https://github.com/facebook/react-native/pull/13186

Differential Revision: D4790827

Pulled By: hramos

fbshipit-source-id: 5fe5f7ed20ac4b3ee537c95a9b6d7b91fd578c41
---
 docs/GettingStarted.md | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/docs/GettingStarted.md b/docs/GettingStarted.md
index 5a7868eb993be4..ba8d1e380b6555 100644
--- a/docs/GettingStarted.md
+++ b/docs/GettingStarted.md
@@ -366,17 +366,11 @@ Congratulations! You've successfully run and modified your first React Native ap
 
 ## Testing your React Native Installation
 
-Use the React Native command line interface to generate a new React Native project called "AwesomeProject", then run `react-native start` inside the newly created folder to start the packager.
+Use the React Native command line interface to generate a new React Native project called "AwesomeProject", then run `react-native run-android` inside the newly created folder:
 
 ```
 react-native init AwesomeProject
 cd AwesomeProject
-react-native start
-```
-
-Open a new command prompt and run `react-native run-android` inside the same folder to launch the app on your Android emulator.
-
-```
 react-native run-android
 ```
 

From 436a9a5bf74536ab356460701ecfb7933cf2d9a6 Mon Sep 17 00:00:00 2001
From: Emil Sjolander <emilsj@fb.com>
Date: Tue, 28 Mar 2017 17:41:59 -0700
Subject: [PATCH 219/366] Optimize ReactShadowNode by more manually converting
 between string and enums

Reviewed By: astreet

Differential Revision: D4778954

fbshipit-source-id: ee96415e6787ccfd8eb7a560d76d206db3eaee1d
---
 .../react/uimanager/LayoutShadowNode.java     | 301 ++++++++++++++++--
 1 file changed, 275 insertions(+), 26 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java
index 3f5020e3ad4157..3d765969e44f66 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java
@@ -4,9 +4,9 @@
 
 import javax.annotation.Nullable;
 
-import java.util.Locale;
 
 import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
 import com.facebook.react.bridge.ReadableType;
 
 import com.facebook.yoga.YogaAlign;
@@ -246,9 +246,34 @@ public void setFlexDirection(@Nullable String flexDirection) {
     if (isVirtual()) {
       return;
     }
-    setFlexDirection(
-        flexDirection == null ? YogaFlexDirection.COLUMN : YogaFlexDirection.valueOf(
-            flexDirection.toUpperCase(Locale.US).replace("-", "_")));
+
+    if (flexDirection == null) {
+      setFlexDirection(YogaFlexDirection.COLUMN);
+      return;
+    }
+
+    switch (flexDirection) {
+      case "column": {
+        setFlexDirection(YogaFlexDirection.COLUMN);
+        break;
+      }
+      case "column-reverse": {
+        setFlexDirection(YogaFlexDirection.COLUMN_REVERSE);
+        break;
+      }
+      case "row": {
+        setFlexDirection(YogaFlexDirection.ROW);
+        break;
+      }
+      case "row-reverse": {
+        setFlexDirection(YogaFlexDirection.ROW_REVERSE);
+        break;
+      }
+      default: {
+        throw new JSApplicationIllegalArgumentException(
+            "invalid value for flexDirection: " + flexDirection);
+      }
+    }
   }
 
   @ReactProp(name = ViewProps.FLEX_WRAP)
@@ -256,12 +281,25 @@ public void setFlexWrap(@Nullable String flexWrap) {
     if (isVirtual()) {
       return;
     }
-    if (flexWrap == null || flexWrap.equals("nowrap")) {
+
+    if (flexWrap == null) {
       setFlexWrap(YogaWrap.NO_WRAP);
-    } else if (flexWrap.equals("wrap")) {
-      setFlexWrap(YogaWrap.WRAP);
-    } else {
-      throw new IllegalArgumentException("Unknown flexWrap value: " + flexWrap);
+      return;
+    }
+
+    switch (flexWrap) {
+      case "nowrap": {
+        setFlexWrap(YogaWrap.NO_WRAP);
+        break;
+      }
+      case "wrap": {
+        setFlexWrap(YogaWrap.WRAP);
+        break;
+      }
+      default: {
+        throw new JSApplicationIllegalArgumentException(
+            "invalid value for flexWrap: " + flexWrap);
+      }
     }
   }
 
@@ -270,8 +308,50 @@ public void setAlignSelf(@Nullable String alignSelf) {
     if (isVirtual()) {
       return;
     }
-    setAlignSelf(alignSelf == null ? YogaAlign.AUTO : YogaAlign.valueOf(
-            alignSelf.toUpperCase(Locale.US).replace("-", "_")));
+
+    if (alignSelf == null) {
+      setAlignSelf(YogaAlign.AUTO);
+      return;
+    }
+
+    switch (alignSelf) {
+      case "auto": {
+        setAlignSelf(YogaAlign.AUTO);
+        return;
+      }
+      case "flex-start": {
+        setAlignSelf(YogaAlign.FLEX_START);
+        return;
+      }
+      case "center": {
+        setAlignSelf(YogaAlign.CENTER);
+        return;
+      }
+      case "flex-end": {
+        setAlignSelf(YogaAlign.FLEX_END);
+        return;
+      }
+      case "stretch": {
+        setAlignSelf(YogaAlign.STRETCH);
+        return;
+      }
+      case "baseline": {
+        setAlignSelf(YogaAlign.BASELINE);
+        return;
+      }
+      case "space-between": {
+        setAlignSelf(YogaAlign.SPACE_BETWEEN);
+        return;
+      }
+      case "space-around": {
+        setAlignSelf(YogaAlign.SPACE_AROUND);
+        return;
+      }
+      default: {
+        throw new JSApplicationIllegalArgumentException(
+            "invalid value for alignSelf: " + alignSelf);
+      }
+    }
   }
 
   @ReactProp(name = ViewProps.ALIGN_ITEMS)
@@ -279,9 +359,50 @@ public void setAlignItems(@Nullable String alignItems) {
     if (isVirtual()) {
       return;
     }
-    setAlignItems(
-        alignItems == null ? YogaAlign.STRETCH : YogaAlign.valueOf(
-            alignItems.toUpperCase(Locale.US).replace("-", "_")));
+
+    if (alignItems == null) {
+      setAlignItems(YogaAlign.STRETCH);
+      return;
+    }
+
+    switch (alignItems) {
+      case "auto": {
+        setAlignItems(YogaAlign.AUTO);
+        return;
+      }
+      case "flex-start": {
+        setAlignItems(YogaAlign.FLEX_START);
+        return;
+      }
+      case "center": {
+        setAlignItems(YogaAlign.CENTER);
+        return;
+      }
+      case "flex-end": {
+        setAlignItems(YogaAlign.FLEX_END);
+        return;
+      }
+      case "stretch": {
+        setAlignItems(YogaAlign.STRETCH);
+        return;
+      }
+      case "baseline": {
+        setAlignItems(YogaAlign.BASELINE);
+        return;
+      }
+      case "space-between": {
+        setAlignItems(YogaAlign.SPACE_BETWEEN);
+        return;
+      }
+      case "space-around": {
+        setAlignItems(YogaAlign.SPACE_AROUND);
+        return;
+      }
+      default: {
+        throw new JSApplicationIllegalArgumentException(
+            "invalid value for alignItems: " + alignItems);
+      }
+    }
   }
 
   @ReactProp(name = ViewProps.ALIGN_CONTENT)
@@ -289,9 +410,50 @@ public void setAlignContent(@Nullable String alignContent) {
     if (isVirtual()) {
       return;
     }
-    setAlignContent(
-        alignContent == null ? YogaAlign.FLEX_START : YogaAlign.valueOf(
-            alignContent.toUpperCase(Locale.US).replace("-", "_")));
+
+    if (alignContent == null) {
+      setAlignContent(YogaAlign.FLEX_START);
+      return;
+    }
+
+    switch (alignContent) {
+      case "auto": {
+        setAlignContent(YogaAlign.AUTO);
+        return;
+      }
+      case "flex-start": {
+        setAlignContent(YogaAlign.FLEX_START);
+        return;
+      }
+      case "center": {
+        setAlignContent(YogaAlign.CENTER);
+        return;
+      }
+      case "flex-end": {
+        setAlignContent(YogaAlign.FLEX_END);
+        return;
+      }
+      case "stretch": {
+        setAlignContent(YogaAlign.STRETCH);
+        return;
+      }
+      case "baseline": {
+        setAlignContent(YogaAlign.BASELINE);
+        return;
+      }
+      case "space-between": {
+        setAlignContent(YogaAlign.SPACE_BETWEEN);
+        return;
+      }
+      case "space-around": {
+        setAlignContent(YogaAlign.SPACE_AROUND);
+        return;
+      }
+      default: {
+        throw new JSApplicationIllegalArgumentException(
+            "invalid value for alignContent: " + alignContent);
+      }
+    }
   }
 
   @ReactProp(name = ViewProps.JUSTIFY_CONTENT)
@@ -299,8 +461,38 @@ public void setJustifyContent(@Nullable String justifyContent) {
     if (isVirtual()) {
       return;
     }
-    setJustifyContent(justifyContent == null ? YogaJustify.FLEX_START : YogaJustify.valueOf(
-            justifyContent.toUpperCase(Locale.US).replace("-", "_")));
+
+    if (justifyContent == null) {
+      setJustifyContent(YogaJustify.FLEX_START);
+      return;
+    }
+
+    switch (justifyContent) {
+      case "flex-start": {
+        setJustifyContent(YogaJustify.FLEX_START);
+        break;
+      }
+      case "center": {
+        setJustifyContent(YogaJustify.CENTER);
+        break;
+      }
+      case "flex-end": {
+        setJustifyContent(YogaJustify.FLEX_END);
+        break;
+      }
+      case "space-between": {
+        setJustifyContent(YogaJustify.SPACE_BETWEEN);
+        break;
+      }
+      case "space-around": {
+        setJustifyContent(YogaJustify.SPACE_AROUND);
+        break;
+      }
+      default: {
+        throw new JSApplicationIllegalArgumentException(
+            "invalid value for justifyContent: " + justifyContent);
+      }
+    }
   }
 
   @ReactProp(name = ViewProps.OVERFLOW)
@@ -308,8 +500,30 @@ public void setOverflow(@Nullable String overflow) {
     if (isVirtual()) {
       return;
     }
-    setOverflow(overflow == null ? YogaOverflow.VISIBLE : YogaOverflow.valueOf(
-            overflow.toUpperCase(Locale.US).replace("-", "_")));
+
+    if (overflow == null) {
+      setOverflow(YogaOverflow.VISIBLE);
+      return;
+    }
+
+    switch (overflow) {
+      case "visible": {
+        setOverflow(YogaOverflow.VISIBLE);
+        break;
+      }
+      case "hidden": {
+        setOverflow(YogaOverflow.HIDDEN);
+        break;
+      }
+      case "scroll": {
+        setOverflow(YogaOverflow.SCROLL);
+        break;
+      }
+      default: {
+        throw new JSApplicationIllegalArgumentException(
+            "invalid value for overflow: " + overflow);
+      }
+    }
   }
 
   @ReactProp(name = ViewProps.DISPLAY)
@@ -317,8 +531,26 @@ public void setDisplay(@Nullable String display) {
     if (isVirtual()) {
       return;
     }
-    setDisplay(display == null ? YogaDisplay.FLEX : YogaDisplay.valueOf(
-            display.toUpperCase(Locale.US).replace("-", "_")));
+
+    if (display == null) {
+      setDisplay(YogaDisplay.FLEX);
+      return;
+    }
+
+    switch (display) {
+      case "flex": {
+        setDisplay(YogaDisplay.FLEX);
+        break;
+      }
+      case "none": {
+        setDisplay(YogaDisplay.NONE);
+        break;
+      }
+      default: {
+        throw new JSApplicationIllegalArgumentException(
+            "invalid value for display: " + display);
+      }
+    }
   }
 
   @ReactPropGroup(names = {
@@ -424,9 +656,26 @@ public void setPosition(@Nullable String position) {
     if (isVirtual()) {
       return;
     }
-    YogaPositionType positionType = position == null ?
-        YogaPositionType.RELATIVE : YogaPositionType.valueOf(position.toUpperCase(Locale.US));
-    setPositionType(positionType);
+
+    if (position == null) {
+      setPositionType(YogaPositionType.RELATIVE);
+      return;
+    }
+
+    switch (position) {
+      case "relative": {
+        setPositionType(YogaPositionType.RELATIVE);
+        break;
+      }
+      case "absolute": {
+        setPositionType(YogaPositionType.ABSOLUTE);
+        break;
+      }
+      default: {
+        throw new JSApplicationIllegalArgumentException(
+            "invalid value for position: " + position);
+      }
+    }
   }
 
   @Override

From 696b49e3b875ad9349b42bb9a354c8dfe4beb382 Mon Sep 17 00:00:00 2001
From: Tim Yung <yungsters@fb.com>
Date: Tue, 28 Mar 2017 18:50:16 -0700
Subject: [PATCH 220/366] RN: Refactor Chrome Debugger JS

Summary:
Refactors JavaScript in the `debugger.html` used to operate the Chrome Debugger.

- Pull out all view-related logic into a global `Page` object.
- Persist the dark theme across debug sessions using `localStorage`.

Reviewed By: kassens

Differential Revision: D4786235

fbshipit-source-id: ab959d1c95465a10b4538b14d9c87a51ae3b7078
---
 local-cli/server/util/debugger.html | 260 ++++++++++++++++------------
 1 file changed, 150 insertions(+), 110 deletions(-)

diff --git a/local-cli/server/util/debugger.html b/local-cli/server/util/debugger.html
index 9e8bca4cbc6529..d03ea76765aa11 100644
--- a/local-cli/server/util/debugger.html
+++ b/local-cli/server/util/debugger.html
@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 <!--
   Copyright (c) 2015-present, Facebook, Inc.
   All rights reserved.
@@ -7,142 +7,179 @@
   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.
 -->
-
 <html>
 <head>
 <meta charset=utf-8>
-<!-- Base 64 encoded favicon, to avoid extra request to server -->
 <link rel="icon" href="data:;base64,iVBORw0KGgo=">
 <title>React Native Debugger</title>
 <script>
 /* eslint-env browser */
+'use strict';
 (function() {
 
-function setStatus(status) {
-  document.getElementById('status').innerHTML = status;
-}
+  const isMacLike = /(Mac|iPhone|iPod|iPad)/i.test(navigator.platform);
+  const refreshShortcut = isMacLike ? '⌘R' : 'Ctrl R';
+  window.onload = function() {
+    if (!isMacLike) {
+      document.getElementById('shortcut').innerHTML = 'Ctrl⇧J';
+    }
+    Page.render();
+  };
 
-const RUNNING_ICON = 'iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAABAJJREFUWMPNV0tIlFEU/nsaPSCrhVFZBBFRFkXvKCpCw6BFtagkWoS1CApp0YMKclHRYxNpj0UUQWUavYmeEi2MsFVS/s7oqOPo6DjqzKjpzOjpnDl35s7MP/8/vyUxFy7c/5x7z/nued5fUcwOgLGKBXIUFYqUaijHqeL0iamGaMSjPbR32IYNMpQaKEbhHlQCpibtpTN09q+HBdJQSCEK7DatWDu7QzJI1pBvrULFPyiOt0iFeWtUw2I8YB825RKEXamFLDM31yifqAIcbwO40QmQ3wIwXtUqmFwDcNQJcKeL96apOiB0LUF+0jH7u26AwUEA3wCERmsAYF+z5B9CUF1B5rmDvPeBx8AdCWOCA05zYEEdCz6JtxqB3xsbACp/M+0WWuR+F6+/9ACsqOczV90AQQSRYdEBQbo0pteJ9p1NrCAsnOYYnNc7IDIuocJRUWdyGpm+qcEgO2JcQTmrEzxkahpZdbH0aABX3LG89Q1M3243CErSGalwBkVmi7gN3SpM2+uQLrgrXLCjSfJ3Cautqk9SrEIVk0qnQfrMtrKwtxiIj70A33vZvwGcA2IGxKxE3j0E9MLHZ6ZZkqQm6Ra1XcOcjofPtwO4AtLULbhuD7DSpwjmspvNTwop8tuQ5wnK/U1+gNMYvFNqdK1QpIjGEsPY7eC0IqFvUPgrHys90MKCz7p43xy0TqaV1xSINPaLmHmNZz73yLTdljgeyhXRySLEXDsr/tYrA29tPQtqxhtZ+zkLnnjlTcns41S+sd3PtCU2Prsaz1b1AfgHOTjjAKiKaKcR4kf0dS0qmRBXyYhGg4rOLCtoBvm7oJXXP/u0VZLc98yrAeDTAHiPAGx+LQCLAJCPJp6ZAMBUVFLg5PWvOADpyHMG2GpxALwaF1C6kb+/ogvm1zJtjXABCSEgo5H20COV3+5kF5D5G4ULVooUpAL2AwH1o8x1Oi7QBOEeB0czpVYpoi71cFwcFEF4RgThDCtnC60vtDMvz8F7X/rYmrQ2DkKdNCQ/X+uQDYgE1fSzMLJQiYeVXsRZ5mUaWSg6bem70GVQD0JpmKQQzauVzYZSsrqPlVExCo+g+K7CJvUIgT0XGTLXaqYQJSnF2aIUZ0eV4jxRim+ihYpETyC3hflb7Uzb3GimFCdpRuHCsiiuGRVHNSPqCdG8ZTYtKP1mlKQdhxvLcpuk0bvgnEsCoDgYGXVmg+iGuXaz7djgQbJQPEhOtPE3AfkkSizldYlIx3KkLbXJjKCgzbSafZAkeZJ96ObAc4tG48XMOOKU/MNOmS3UkEh5mXeoTzKDR+kklbsaPTjp4ZmeoLtRxzvWyn3hVBsXpqE9SlPiWZ4SPyYp8WuWEj+n/+n3/A8emj1HwPlGOgAAAABJRU5ErkJggg==';
-const SLOW_ICON = 'iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAABGZJREFUWMPNV+tvFFUU30/4L/i9K0gQImoiQTQmGtEQQAWCoSGgJiZqojZCYsoHQkNIwAcJppWgHwjqLi1SHrVP2m4tfdAULKUW2NLSx0ILbGsf293ZeR7OOXc72+nM7GwbQjrJze7eufeex+/3O+euz5flAyUrliSL/esTAX9hIugPJYI5YfyMicHfQ/SO1tBa35N68LBnpaC/KB7wT8YDOZDd8E/SHtq7cMMV/mfiwZwCjGo6e8PWwXvxDDpr3lFjSlsXatjmCJ6VdTbkwLJV6HnkSRmflY2IXPL8Su/InYyXrAS54zAoPX9Csi0f4sUr7EbOvAjy1QJQ+87w2vjp5Y5OuGaCcHJLuzZ8GQzDAEOZBnoMaRSSLd+a7+W2fWDIU+JdcpzXqv0X3eFw4gSRxXHD3+/wwfL17/m3VLsD9LEunlPuBEG9W8rftUftIFW9z2uUW7+BoWsQL33VGRK05ZR6R7YnG79gAzOHiwOWgRI+BTOPcvMEzj1nvpfqd4s9tbmu6rBAIXTuTB5KNT2J8vcs81YHfrW8ky5t5/nkP5+5kpJsmhUuU5GR6naKaDAq06nmb3hOJQj6zgpjjZ+n31/+Uuyp/jBjseKKSaUzo3wuvC6MDTeCOlgO2mgXkkxDjFX81MXQNR7a6A3kxFlQI7W8J/7XKxmlSbZ9VL8dF5SuAeW/ImT1mJlqI/EIf//PRtVIDWNP6Vfv1TLzdWkMlTJlrtfjIyB3/oiOvOTGhUIfNRGbZ01fsazoUO1+AxqoZ6PJK98JRXQeTWXnDUicXyc4gc4wFC17Rcbuh0B72GbKVmr41EmSIR91MgvmoU+E4dFOk3hSzbZURA9BnxpgFahDVWaklHYqPBQxDSZtxQaxt3oL6ONhhEhhclodyAlTBmKWojPSAnpsEKvdC5bFNMcRYtGhqOc+hLd87aCoCRN3bFWS4CPY5mQg5uBAExqL2BzQMHLhQD4kzr3m4MDLpgP6ZO8cB1ajA1HO2hwOTNkhQLkR3lq0AxJlb6fSuDVFwihC0I8QLAV1oCwNAcpRQDDMQxSuD8ReLGAMgSYzlE4Q2EnY/DWzmaSmDlbwIF5Q9IKEP4kDzq1ltTAJu38RhpvzRC+4V8fZ5B6SkYQuMiScldsn0w2IZIbRG1KUM6QMlLNRpfs4KEOVPKdjhqyyjYLS9bNrPWAZehaii2+ZzYYkqU/0mgXINESFCYc+3sPQqJFLQgkX3vQuRJ6luH5XqhTvmgVRnugBPQEcvwtyImxpKX8s9tTlepdiz2bUuifVjN61NqOeP6wknJ21yk02p1ybkWc7nmksVZutDtw4lu6GyAOMaFY3/EjswaKWVTvOeCHByJn5HUdSstoM2oMWETnqWkUyMkcetGLkG01FEGlnyrTnhcTzSjbSLIiH1y0mnRLD+9+B9JWsfb/lusYyRGXM60qW+VK6irsaXzjx4kmVzbYGO5787yHuC/L1H+Z/KV0U1/JF8cdkUfw1WxR/Tp/W3/PHSyH/l51SdaoAAAAASUVORK5CYII=';
-const STOPPED_ICON = 'iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAA9VJREFUWMPNV+dKJEEQnl93r3Avcfcavpe/zHlXzDmLYlZU1oSrYEDFsGZdVDBvUBTUuv6K6aZ34ioiW1BMT1dPdXWFr3oMI03q7u7+lZOTk5WbmxsQz5DgiOCEyRiHTFkW1hrfRXl5eX+E0qDgmGBKk7E2iG+/vHFZWdlvcaJswclPbJzC+BY6oOvTpxYfhr+6sYMh4bS9kZ+f/098EP2uzTUjoPNvOie3bV5YWEihUIjW1tZobGyMCgoKbBsUFxfT5OQkbWxs8FpxEEcjXD1hxtzR7cfHx/Tx8UGvr68ESiaTNDQ0pOTj4+P08vLCsufnZ167vb3tGg7HnECyOH1QU1PDimdmZvi9ra2Nrq6ueG59fZ22trZ4HI1GqbGxkdcsLy/T+/s7lZeXuxmR7eR6x2zv6+vjDaRysFhPq6urJGlpaQlKlbyrq4vn29vbXasjJRRmnTsuhqtBdXV1KfO6ATixLmttbeX53t5er8QM6gjnCjIdHR2sDKeSc4ODgyoEm5ubPIanpLy/v5/nmpqaPMGKERPQ6VU+wWCQlSERd3d3Of6ILxjJBpbvl5eXnBP7+/v8TWlpqV95ZhkmftuESKDFxUV6enpSrk4kEirLI5EIxx7ux4aYw1pZDaB4PE6zs7NUUlLilgsBw2wsKYKBgQFWBKVHR0d0cHDA45GREVY8NzenvAPGGMaAhoeH+Xl4eEjn5+eqbHt6epyMCBlmJ1OTIi68GdwpE6+lpUWd6P7+nqtgb29PnRRuB/BADtaTtrm5ma6vr+nt7Y2T02JAxDDbqZo8PT2lh4cHRj99HnMgIGEgECArId5TU1M8vrm5saEkwodQWQxI2Aw4OTmhx8dHmwE4OWh0dNTRAMRZGnB7e2szAGGA1yw5ELeFAOWGEFxcXFB1dbVyo4wlDAHoAGoloRwRglgsxqyXIABMhgChdAqBaxKitFB6YBgF9+tJWFFRoeA2HA6zDBiBtUhceBNjzyR0K0O4eWVlRTUgKLq7u2NlGO/s7PCmYGkgZHrZ4n1hYcEVD2QZegJRVVUVK0NJoSSRYBJ8JEkggqthmASiyspKfyDyg+LOzk5WhqcVinE/kD0BYUu3GaVAsV8zksBSW1ubMo/N9STUZQ0NDTajXJuRXzuWjUVvx+D5+XllAPLAqRsC1NJqx14XEpxcv5DAEIAVCHWNmIPOzs6ovr5eVQTyRMK074XE70omywmNCIQSxf1PyicmJlS1oAqw1go6vlcyr0tpUVERdzVcOLExkM26Bkg4PT3NfQHe+vSlNCOu5RnxY5IRv2YZ8XP6U7/n/wFyU6HBPUWxjAAAAABJRU5ErkJggg==';
+  const Assets = {
+    blueIcon: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAABAJJREFUWMPNV0tIlFEU/nsaPSCrhVFZBBFRFkXvKCpCw6BFtagkWoS1CApp0YMKclHRYxNpj0UUQWUavYmeEi2MsFVS/s7oqOPo6DjqzKjpzOjpnDl35s7MP/8/vyUxFy7c/5x7z/nued5fUcwOgLGKBXIUFYqUaijHqeL0iamGaMSjPbR32IYNMpQaKEbhHlQCpibtpTN09q+HBdJQSCEK7DatWDu7QzJI1pBvrULFPyiOt0iFeWtUw2I8YB825RKEXamFLDM31yifqAIcbwO40QmQ3wIwXtUqmFwDcNQJcKeL96apOiB0LUF+0jH7u26AwUEA3wCERmsAYF+z5B9CUF1B5rmDvPeBx8AdCWOCA05zYEEdCz6JtxqB3xsbACp/M+0WWuR+F6+/9ACsqOczV90AQQSRYdEBQbo0pteJ9p1NrCAsnOYYnNc7IDIuocJRUWdyGpm+qcEgO2JcQTmrEzxkahpZdbH0aABX3LG89Q1M3243CErSGalwBkVmi7gN3SpM2+uQLrgrXLCjSfJ3Cautqk9SrEIVk0qnQfrMtrKwtxiIj70A33vZvwGcA2IGxKxE3j0E9MLHZ6ZZkqQm6Ra1XcOcjofPtwO4AtLULbhuD7DSpwjmspvNTwop8tuQ5wnK/U1+gNMYvFNqdK1QpIjGEsPY7eC0IqFvUPgrHys90MKCz7p43xy0TqaV1xSINPaLmHmNZz73yLTdljgeyhXRySLEXDsr/tYrA29tPQtqxhtZ+zkLnnjlTcns41S+sd3PtCU2Prsaz1b1AfgHOTjjAKiKaKcR4kf0dS0qmRBXyYhGg4rOLCtoBvm7oJXXP/u0VZLc98yrAeDTAHiPAGx+LQCLAJCPJp6ZAMBUVFLg5PWvOADpyHMG2GpxALwaF1C6kb+/ogvm1zJtjXABCSEgo5H20COV3+5kF5D5G4ULVooUpAL2AwH1o8x1Oi7QBOEeB0czpVYpoi71cFwcFEF4RgThDCtnC60vtDMvz8F7X/rYmrQ2DkKdNCQ/X+uQDYgE1fSzMLJQiYeVXsRZ5mUaWSg6bem70GVQD0JpmKQQzauVzYZSsrqPlVExCo+g+K7CJvUIgT0XGTLXaqYQJSnF2aIUZ0eV4jxRim+ihYpETyC3hflb7Uzb3GimFCdpRuHCsiiuGRVHNSPqCdG8ZTYtKP1mlKQdhxvLcpuk0bvgnEsCoDgYGXVmg+iGuXaz7djgQbJQPEhOtPE3AfkkSizldYlIx3KkLbXJjKCgzbSafZAkeZJ96ObAc4tG48XMOOKU/MNOmS3UkEh5mXeoTzKDR+kklbsaPTjp4ZmeoLtRxzvWyn3hVBsXpqE9SlPiWZ4SPyYp8WuWEj+n/+n3/A8emj1HwPlGOgAAAABJRU5ErkJggg==',
+    grayIcon: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAA9VJREFUWMPNV+dKJEEQnl93r3Avcfcavpe/zHlXzDmLYlZU1oSrYEDFsGZdVDBvUBTUuv6K6aZ34ioiW1BMT1dPdXWFr3oMI03q7u7+lZOTk5WbmxsQz5DgiOCEyRiHTFkW1hrfRXl5eX+E0qDgmGBKk7E2iG+/vHFZWdlvcaJswclPbJzC+BY6oOvTpxYfhr+6sYMh4bS9kZ+f/098EP2uzTUjoPNvOie3bV5YWEihUIjW1tZobGyMCgoKbBsUFxfT5OQkbWxs8FpxEEcjXD1hxtzR7cfHx/Tx8UGvr68ESiaTNDQ0pOTj4+P08vLCsufnZ167vb3tGg7HnECyOH1QU1PDimdmZvi9ra2Nrq6ueG59fZ22trZ4HI1GqbGxkdcsLy/T+/s7lZeXuxmR7eR6x2zv6+vjDaRysFhPq6urJGlpaQlKlbyrq4vn29vbXasjJRRmnTsuhqtBdXV1KfO6ATixLmttbeX53t5er8QM6gjnCjIdHR2sDKeSc4ODgyoEm5ubPIanpLy/v5/nmpqaPMGKERPQ6VU+wWCQlSERd3d3Of6ILxjJBpbvl5eXnBP7+/v8TWlpqV95ZhkmftuESKDFxUV6enpSrk4kEirLI5EIxx7ux4aYw1pZDaB4PE6zs7NUUlLilgsBw2wsKYKBgQFWBKVHR0d0cHDA45GREVY8NzenvAPGGMaAhoeH+Xl4eEjn5+eqbHt6epyMCBlmJ1OTIi68GdwpE6+lpUWd6P7+nqtgb29PnRRuB/BADtaTtrm5ma6vr+nt7Y2T02JAxDDbqZo8PT2lh4cHRj99HnMgIGEgECArId5TU1M8vrm5saEkwodQWQxI2Aw4OTmhx8dHmwE4OWh0dNTRAMRZGnB7e2szAGGA1yw5ELeFAOWGEFxcXFB1dbVyo4wlDAHoAGoloRwRglgsxqyXIABMhgChdAqBaxKitFB6YBgF9+tJWFFRoeA2HA6zDBiBtUhceBNjzyR0K0O4eWVlRTUgKLq7u2NlGO/s7PCmYGkgZHrZ4n1hYcEVD2QZegJRVVUVK0NJoSSRYBJ8JEkggqthmASiyspKfyDyg+LOzk5WhqcVinE/kD0BYUu3GaVAsV8zksBSW1ubMo/N9STUZQ0NDTajXJuRXzuWjUVvx+D5+XllAPLAqRsC1NJqx14XEpxcv5DAEIAVCHWNmIPOzs6ovr5eVQTyRMK074XE70omywmNCIQSxf1PyicmJlS1oAqw1go6vlcyr0tpUVERdzVcOLExkM26Bkg4PT3NfQHe+vSlNCOu5RnxY5IRv2YZ8XP6U7/n/wFyU6HBPUWxjAAAAABJRU5ErkJggg==',
+    orangeIcon: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAABGZJREFUWMPNV+tvFFUU30/4L/i9K0gQImoiQTQmGtEQQAWCoSGgJiZqojZCYsoHQkNIwAcJppWgHwjqLi1SHrVP2m4tfdAULKUW2NLSx0ILbGsf293ZeR7OOXc72+nM7GwbQjrJze7eufeex+/3O+euz5flAyUrliSL/esTAX9hIugPJYI5YfyMicHfQ/SO1tBa35N68LBnpaC/KB7wT8YDOZDd8E/SHtq7cMMV/mfiwZwCjGo6e8PWwXvxDDpr3lFjSlsXatjmCJ6VdTbkwLJV6HnkSRmflY2IXPL8Su/InYyXrAS54zAoPX9Csi0f4sUr7EbOvAjy1QJQ+87w2vjp5Y5OuGaCcHJLuzZ8GQzDAEOZBnoMaRSSLd+a7+W2fWDIU+JdcpzXqv0X3eFw4gSRxXHD3+/wwfL17/m3VLsD9LEunlPuBEG9W8rftUftIFW9z2uUW7+BoWsQL33VGRK05ZR6R7YnG79gAzOHiwOWgRI+BTOPcvMEzj1nvpfqd4s9tbmu6rBAIXTuTB5KNT2J8vcs81YHfrW8ky5t5/nkP5+5kpJsmhUuU5GR6naKaDAq06nmb3hOJQj6zgpjjZ+n31/+Uuyp/jBjseKKSaUzo3wuvC6MDTeCOlgO2mgXkkxDjFX81MXQNR7a6A3kxFlQI7W8J/7XKxmlSbZ9VL8dF5SuAeW/ImT1mJlqI/EIf//PRtVIDWNP6Vfv1TLzdWkMlTJlrtfjIyB3/oiOvOTGhUIfNRGbZ01fsazoUO1+AxqoZ6PJK98JRXQeTWXnDUicXyc4gc4wFC17Rcbuh0B72GbKVmr41EmSIR91MgvmoU+E4dFOk3hSzbZURA9BnxpgFahDVWaklHYqPBQxDSZtxQaxt3oL6ONhhEhhclodyAlTBmKWojPSAnpsEKvdC5bFNMcRYtGhqOc+hLd87aCoCRN3bFWS4CPY5mQg5uBAExqL2BzQMHLhQD4kzr3m4MDLpgP6ZO8cB1ajA1HO2hwOTNkhQLkR3lq0AxJlb6fSuDVFwihC0I8QLAV1oCwNAcpRQDDMQxSuD8ReLGAMgSYzlE4Q2EnY/DWzmaSmDlbwIF5Q9IKEP4kDzq1ltTAJu38RhpvzRC+4V8fZ5B6SkYQuMiScldsn0w2IZIbRG1KUM6QMlLNRpfs4KEOVPKdjhqyyjYLS9bNrPWAZehaii2+ZzYYkqU/0mgXINESFCYc+3sPQqJFLQgkX3vQuRJ6luH5XqhTvmgVRnugBPQEcvwtyImxpKX8s9tTlepdiz2bUuifVjN61NqOeP6wknJ21yk02p1ybkWc7nmksVZutDtw4lu6GyAOMaFY3/EjswaKWVTvOeCHByJn5HUdSstoM2oMWETnqWkUyMkcetGLkG01FEGlnyrTnhcTzSjbSLIiH1y0mnRLD+9+B9JWsfb/lusYyRGXM60qW+VK6irsaXzjx4kmVzbYGO5787yHuC/L1H+Z/KV0U1/JF8cdkUfw1WxR/Tp/W3/PHSyH/l51SdaoAAAAASUVORK5CYII=',
+  };
 
-function setFavicon(base64) {
-  document.querySelector('link[rel=icon]').href = 'data:image/png;base64,' + base64;
-}
+  const Page = window.Page = {
+
+    state: {
+      isDark: localStorage.getItem('darkTheme') === 'on',
+      status: {type: 'disconnected'},
+      visibilityState: document.visibilityState,
+    },
+
+    setState(partialState) {
+      Page.state = Object.assign({}, Page.state, partialState);
+      Page.render();
+    },
+
+    render() {
+      const {
+        isDark,
+        status,
+        visibilityState,
+      } = Page.state;
+
+      const statusNode = document.getElementById('status');
+      switch (status.type) {
+        case 'connected':
+          statusNode.innerHTML = 'Debugger session #' + status.id + ' active.';
+          break;
+        case 'error':
+          statusNode.innerHTML = status.error.reason || 'Disconnected from proxy. Attempting reconnection. Is node server running?';
+          break;
+        case 'connecting':
+        case 'disconnected':
+          // Fall through.
+        default:
+          statusNode.innerHTML = 'Waiting, press <span class="shortcut">' + refreshShortcut + '</span> in simulator to reload and connect.';
+          break;
+      }
 
-var isMacLike = /(Mac|iPhone|iPod|iPad)/i.test(navigator.platform);
-var refresh_shortcut = isMacLike ? '⌘R' : 'Ctrl R';
-window.onload = function() {
-  if (!isMacLike) {
-    document.getElementById('dev_tools_shortcut').innerHTML = 'Ctrl⇧J';
-  }
-};
+      const linkNode = document.querySelector('link[rel=icon]');
+      if (status.type === 'disconnected' ||
+          status.type === 'error') {
+        linkNode.href = Assets.grayIcon;
+      } else {
+        if (visibilityState === 'visible') {
+          linkNode.href = Assets.blueIcon;
+        } else {
+          linkNode.href = Assets.orangeIcon;
+        }
+      }
 
-var INITIAL_MESSAGE = 'Waiting, press <span class="shortcut">' + refresh_shortcut + '</span> in simulator to reload and connect.';
+      const darkCheckbox = document.getElementById('dark');
+      document.body.classList.toggle('dark', isDark);
+      darkCheckbox.checked = isDark;
+      localStorage.setItem('darkTheme', isDark ? 'on' : '');
+    },
 
-function connectToDebuggerProxy() {
-  var worker;
-  var ws = new WebSocket('ws://' + window.location.host + '/debugger-proxy?role=debugger&name=Chrome');
+    toggleDarkTheme() {
+      Page.setState({isDark: !Page.state.isDark});
+    },
 
-  function createJSRuntime() {
-    // This worker will run the application javascript code,
-    // making sure that it's run in an environment without a global
-    // document, to make it consistent with the JSC executor environment.
-    worker = new Worker('debuggerWorker.js');
-    worker.onmessage = function(message) {
-      ws.send(JSON.stringify(message.data));
-    };
-    window.onbeforeunload = function() {
-      return 'If you reload this page, it is going to break the debugging session. ' +
-        'You should press' + refresh_shortcut + 'in simulator to reload.';
-    };
-    updateVisibility();
-    updateFavicon();
-  }
+  };
 
-  function shutdownJSRuntime() {
-    if (worker) {
-      worker.terminate();
-      worker = null;
-      window.onbeforeunload = null;
-      updateFavicon();
+  function connectToDebuggerProxy() {
+    const ws = new WebSocket('ws://' + window.location.host + '/debugger-proxy?role=debugger&name=Chrome');
+    let worker;
+
+    function createJSRuntime() {
+      // This worker will run the application JavaScript code,
+      // making sure that it's run in an environment without a global
+      // document, to make it consistent with the JSC executor environment.
+      worker = new Worker('debuggerWorker.js');
+      worker.onmessage = function(message) {
+        ws.send(JSON.stringify(message.data));
+      };
+      window.onbeforeunload = function() {
+        return 'If you reload this page, it is going to break the debugging session. ' +
+          'You should press' + refreshShortcut + 'in simulator to reload.';
+      };
+      updateVisibility();
     }
-  }
 
-  function updateVisibility() {
-    if (worker) {
-      worker.postMessage({
-        method: 'setDebuggerVisibility',
-        visibilityState: document.visibilityState,
-      });
+    function shutdownJSRuntime() {
+      if (worker) {
+        worker.terminate();
+        worker = null;
+        window.onbeforeunload = null;
+      }
     }
-    updateFavicon();
-  }
 
-  function updateFavicon() {
-    if (worker) {
-      if (document.visibilityState === 'visible') {
-        setFavicon(RUNNING_ICON);
-      } else {
-        setFavicon(SLOW_ICON);
+    function updateVisibility() {
+      if (worker) {
+        worker.postMessage({
+          method: 'setDebuggerVisibility',
+          visibilityState: document.visibilityState,
+        });
       }
-    } else {
-      setFavicon(STOPPED_ICON);
+      Page.setState({visibilityState: document.visibilityState});
     }
-  }
 
-  ws.onopen = function() {
-    setStatus(INITIAL_MESSAGE);
-  };
+    ws.onopen = function() {
+      Page.setState({status: {type: 'connecting'}});
+    };
 
-  ws.onmessage = function(message) {
-    if (!message.data) {
-      return;
-    }
-    var object = JSON.parse(message.data);
+    ws.onmessage = function(message) {
+      if (!message.data) {
+        return;
+      }
+      const object = JSON.parse(message.data);
 
-    if (object.$event === 'client-disconnected') {
-      shutdownJSRuntime();
-      setStatus('Waiting, press <span class="shortcut">' + refresh_shortcut + '</span> in simulator to reload and connect.');
-      return;
-    }
+      if (object.$event === 'client-disconnected') {
+        shutdownJSRuntime();
+        Page.setState({status: {type: 'disconnected'}});
+        return;
+      }
 
-    if (!object.method) {
-      return;
-    }
+      if (!object.method) {
+        return;
+      }
 
-    // Special message that asks for a new JS runtime
-    if (object.method === 'prepareJSRuntime') {
-      shutdownJSRuntime();
-      console.clear();
-      createJSRuntime();
-      ws.send(JSON.stringify({replyID: object.id}));
-      setStatus('Debugger session #' + object.id + ' active.');
-    } else if (object.method === '$disconnected') {
-      shutdownJSRuntime();
-      setStatus(INITIAL_MESSAGE);
-    } else {
-      // Otherwise, pass through to the worker.
-      worker.postMessage(object);
-    }
-  };
+      // Special message that asks for a new JS runtime
+      if (object.method === 'prepareJSRuntime') {
+        shutdownJSRuntime();
+        console.clear();
+        createJSRuntime();
+        ws.send(JSON.stringify({replyID: object.id}));
+        Page.setState({status: {type: 'connected', id: object.id}});
+      } else if (object.method === '$disconnected') {
+        shutdownJSRuntime();
+        Page.setState({status: {type: 'disconnected'}});
+      } else {
+        // Otherwise, pass through to the worker.
+        worker.postMessage(object);
+      }
+    };
 
-  ws.onclose = function(e) {
-    shutdownJSRuntime();
-    setStatus('Disconnected from proxy. Attempting reconnection. Is node server running?');
-    if (e.reason) {
-      setStatus(e.reason);
-      console.warn(e.reason);
-    }
-    setTimeout(connectToDebuggerProxy, 500);
-  };
+    ws.onclose = function(error) {
+      shutdownJSRuntime();
+      Page.setState({status: {type: 'error', error}});
+      if (error.reason) {
+        console.warn(error.reason);
+      }
+      setTimeout(connectToDebuggerProxy, 500);
+    };
 
-  // Let debuggerWorker.js know when we're not visible so that we can warn about
-  // poor performance when using remote debugging.
-  document.addEventListener('visibilitychange', updateVisibility, false);
-}
+    // Let debuggerWorker.js know when we're not visible so that we can warn about
+    // poor performance when using remote debugging.
+    document.addEventListener('visibilitychange', updateVisibility, false);
+  }
 
-connectToDebuggerProxy();
+  connectToDebuggerProxy();
 
 })();
 </script>
@@ -178,17 +215,20 @@
   .dark a {
     color: #3b99fc;
   }
+  input[type=checkbox] {
+    vertical-align: middle;
+  }
 </style>
 </head>
 <body>
   <div class="content">
     <label for="dark">
-      <input type="checkbox" id="dark" onclick="document.body.classList.toggle('dark')"> Dark background
+      <input type="checkbox" id="dark" onclick="Page.toggleDarkTheme()"> Dark Theme
     </label>
     <p>
-      React Native JS code runs inside this Chrome tab.
+      React Native JS code runs as a web worker inside this tab.
     </p>
-    <p>Press <kbd id='dev_tools_shortcut' class="shortcut">⌘⌥J</kbd> to open Developer Tools. Enable <a href="https://stackoverflow.com/a/17324511/232122" target="_blank">Pause On Caught Exceptions</a> for a better debugging experience.</p>
+    <p>Press <kbd id="shortcut" class="shortcut">⌘⌥J</kbd> to open Developer Tools. Enable <a href="https://stackoverflow.com/a/17324511/232122" target="_blank">Pause On Caught Exceptions</a> for a better debugging experience.</p>
     <p>Status: <span id="status">Loading...</span></p>
   </div>
 </body>

From 5643bbc11d4fadfeec989327b63377f4a56d8c47 Mon Sep 17 00:00:00 2001
From: Tim Yung <yungsters@fb.com>
Date: Tue, 28 Mar 2017 18:50:23 -0700
Subject: [PATCH 221/366] RN: Add "Maintain Priority" Checkbox

Summary:
Adds a new checkbox to the Chrome Debugger page that prevents the tab from being deprioritized by Google Chrome.

This is accomplished by embedding an inaudible sound byte (in 10Hz range) that loops on a low volume.

Reviewed By: kassens

Differential Revision: D4786288

fbshipit-source-id: 949d96ed3c0eac92ad56cdd119418df9ec6d0846
---
 local-cli/server/util/debugger.html | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/local-cli/server/util/debugger.html b/local-cli/server/util/debugger.html
index d03ea76765aa11..7d6bf02a101999 100644
--- a/local-cli/server/util/debugger.html
+++ b/local-cli/server/util/debugger.html
@@ -36,6 +36,7 @@
 
     state: {
       isDark: localStorage.getItem('darkTheme') === 'on',
+      isPriorityMaintained: localStorage.getItem('maintainPriority') === 'on',
       status: {type: 'disconnected'},
       visibilityState: document.visibilityState,
     },
@@ -48,6 +49,7 @@
     render() {
       const {
         isDark,
+        isPriorityMaintained,
         status,
         visibilityState,
       } = Page.state;
@@ -73,7 +75,7 @@
           status.type === 'error') {
         linkNode.href = Assets.grayIcon;
       } else {
-        if (visibilityState === 'visible') {
+        if (visibilityState === 'visible' || isPriorityMaintained) {
           linkNode.href = Assets.blueIcon;
         } else {
           linkNode.href = Assets.orangeIcon;
@@ -84,12 +86,27 @@
       document.body.classList.toggle('dark', isDark);
       darkCheckbox.checked = isDark;
       localStorage.setItem('darkTheme', isDark ? 'on' : '');
+
+      const maintainPriorityCheckbox = document.getElementById('maintain-priority');
+      const silence = document.getElementById('silence');
+      silence.volume = 0.001;
+      if (isPriorityMaintained) {
+        silence.play();
+      } else {
+        silence.pause();
+      }
+      maintainPriorityCheckbox.checked = isPriorityMaintained;
+      localStorage.setItem('maintainPriority', isPriorityMaintained ? 'on' : '');
     },
 
     toggleDarkTheme() {
       Page.setState({isDark: !Page.state.isDark});
     },
 
+    togglePriorityMaintenance() {
+      Page.setState({isPriorityMaintained: !Page.state.isPriorityMaintained});
+    },
+
   };
 
   function connectToDebuggerProxy() {
@@ -120,7 +137,7 @@
     }
 
     function updateVisibility() {
-      if (worker) {
+      if (worker && !Page.state.isPriorityMaintained) {
         worker.postMessage({
           method: 'setDebuggerVisibility',
           visibilityState: document.visibilityState,
@@ -225,11 +242,15 @@
     <label for="dark">
       <input type="checkbox" id="dark" onclick="Page.toggleDarkTheme()"> Dark Theme
     </label>
+    <label for="maintain-priority">
+      <input type="checkbox" id="maintain-priority" onclick="Page.togglePriorityMaintenance()"> Maintain Priority
+    </label>
     <p>
       React Native JS code runs as a web worker inside this tab.
     </p>
     <p>Press <kbd id="shortcut" class="shortcut">⌘⌥J</kbd> to open Developer Tools. Enable <a href="https://stackoverflow.com/a/17324511/232122" target="_blank">Pause On Caught Exceptions</a> for a better debugging experience.</p>
     <p>Status: <span id="status">Loading...</span></p>
   </div>
+  <audio id="silence" loop src="data:audio/wav;base64,UklGRjKQAQBXQVZFZm10IBIAAAABAAEAIlYAAESsAAACABAAAABkYXRhAHsBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAEAAAABAAAAAQACAAEAAgACAAEAAgADAAIAAwACAAMABAAEAAMABAAFAAQABAAFAAYABQAFAAYABwAGAAcACAAHAAgACQAIAAkACgAJAAoACwALAAwACwAMAAwADQAOAA0ADgAOAA8ADwAQABAAEQARABIAEgATABMAFAAUABUAFQAWABYAFwAYABgAGQAZABoAGwAbABwAHAAdAB0AHgAfACAAIAAhACEAIgAjACQAJAAlACUAJgAnACgAKAApACoAKwArACwALQAuAC4ALwAwADEAMQAyADMANAA0ADUANgA3ADgAOQA6ADoAOwA8AD0APgA/AEAAQABBAEIAQwBEAEUARgBHAEgASQBKAEsATABNAE0ATgBPAFAAUQBSAFMAVABVAFYAVwBYAFoAWwBcAF0AXgBfAGAAYQBiAGMAZABlAGYAZwBpAGoAawBsAG0AbgBvAHAAcQBzAHQAdQB2AHcAeAB6AHsAfAB9AH4AfwCBAIIAgwCEAIUAhwCIAIkAigCMAI0AjgCPAJEAkgCTAJQAlgCXAJkAmgCbAJwAnQCfAKAAogCjAKQApgCnAKgAqQCrAKwArgCvALAAsQCzALQAtgC3ALgAugC7AL0AvgC/AMEAwgDEAMUAxgDIAMkAywDMAM4AzwDQANIA0wDVANYA2ADZANsA3ADdAN8A4ADiAOMA5QDmAOgA6QDrAOwA7gDvAPEA8gD0APUA9gD5APoA+wD9AP4AAAEBAQMBBAEGAQcBCQELAQwBDQEPARABEwEUARUBFwEYARoBGwEeAR8BIQEiASMBJQEmASkBKgEsAS0BLgEwATEBNAE1ATcBOAE5ATwBPQE+AUABQQFEAUUBRwFIAUkBTAFNAU4BUAFRAVQBVQFWAVkBWgFbAV0BXgFhAWIBYwFlAWYBaQFqAWsBbgFvAXABcgFzAXYBdwF4AXsBfAF9AX8BgAGDAYQBhQGIAYkBigGNAY4BkAGRAZIBlQGWAZcBmgGbAZ0BngGfAaIBowGkAaYBpwGqAasBrAGvAbABsQGzAbQBtwG4AbkBuwG8Ab8BwAHBAcQBxQHGAcgByQHMAc0BzwHQAdEB0wHUAdcB2AHZAdsB3AHfAeAB4gHjAeQB5gHnAeoB6wHtAe4B8AHxAfIB9QH2AfgB+QH7AfwB/gH/AQECAgIEAgUCBwIIAgkCDAINAg4CEAIRAhMCFAIWAhcCGQIaAhwCHQIfAiACIgIjAiUCJgIoAikCKgIsAi0CLwIwAjICMwI1AjYCOAI5AjoCPAI9Aj8CQAJBAkMCRAJGAkcCSAJKAksCTQJOAk8CUAJSAlMCVQJWAlcCWAJaAlsCXQJeAl8CYQJiAmMCZAJmAmcCaAJpAmsCbAJuAm8CcAJxAnMCdAJ1AnYCdwJ4AnoCewJ8An0CfwKAAoECggKDAoUChgKHAogCiQKKAowCjQKOAo8CkAKRApICkwKUApUClwKYApkCmgKbApwCnQKeAp8CoAKhAqICowKkAqUCpgKnAqgCqQKqAqsCrAKtAq4CrwKwArECsgKyArMCtAK1ArYCtwK4ArkCuQK6ArsCvAK9Ar4CvwK/AsACwQLCAsICwwLEAsUCxQLGAscCyALIAskCygLLAssCzALNAs4CzgLPAs8C0ALRAtEC0gLTAtMC1ALUAtUC1gLWAtcC1wLYAtgC2QLZAtoC2gLbAtsC3ALcAt0C3QLeAt8C3wLgAt8C4ALhAuEC4gLhAuIC4wLiAuMC5ALjAuQC5QLkAuUC5gLlAuYC5gLnAuYC5wLoAugC5wLnAugC6QLoAukC6ALpAuoC6QLqAukC6gLpAuoC6QLqAusC6gLqAusC6gLrAuoC6wLqAuoC6wLqAusC6gLrAuoC6QLqAukC6gLpAuoC6QLqAukC6ALpAugC6ALpAugC5wLoAugC5wLmAucC5wLmAuUC5gLlAuQC5QLkAuMC5ALjAuIC4wLiAuIC4QLhAuAC3wLgAt8C3gLeAt0C3QLcAtwC2wLbAtoC2gLZAtkC2ALXAtcC1gLWAtUC1ALTAtMC0gLRAtEC0ALQAs8CzgLNAs0CzALLAsoCyQLIAsgCxwLGAsUCxALDAsMCwgLBAsACvwK+Ar0CvAK7AroCuQK4ArcCtgK1ArQCswKyArECsAKvAq4CrQKsAqoCqQKoAqcCpgKlAqMCogKhAqACnwKeApwCmwKZApgClwKWApQCkwKSApECjwKOAowCiwKKAogChwKFAoQCgwKBAoACfgJ9AnsCegJ4AncCdQJ0AnICcQJvAm4CawJqAmkCZgJlAmQCYQJgAl8CXAJbAloCVwJWAlUCUgJRAk4CTQJMAkkCSAJFAkQCQwJAAj8CPAI7AjgCNwI0AjMCMgIvAi4CKwIqAicCJQIkAiECIAIeAhsCGgIXAhQC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8gH5AQECCAIRAhgCHwIoAi8CNgI/AkYCTgJVAlwCZQJsAnMCfAKDAooCkwKaAqECqgKxArgCwQLIAs8C2ALfAuYC7wL2Av0CBgMNAxQDHQMkAysDNAM7A0IDSwNSA1kDYgNpA3ADeQOAA4cDkAOXA54DpwOuA7UDvQPEA80D1APbA+QD6wPyA/sDAgQKBBEEGAQhBCgELwQ4BD8ERgROBFUEXgRlBG0EdAR7BIMEigSTBJoEogSpBLEEuAS/BMgEzwTWBN4E5QTtBPQE/AQDBQsFEgUaBSEFKQUwBTgFPwVHBU4FVgVdBWUFbAV0BXsFgwWKBZEFmQWgBagFrwW2Bb4FxQXNBdQF2wXiBeoF8QX5BQAGBwYOBhYGHQYkBisGMwY6BkEGSAZQBlcGXgZlBm0GdAZ7BoIGiQaRBpgGnwamBq0GtAa7BsIGygbRBtgG3wbmBu0G9Ab7BgIHCQcQBxcHHgclBywHMwc6B0EHSAdPB1YHXQdjB2oHcQd4B38HhgeMB5MHmgehB6gHrwe1B7wHwwfKB9AH1wfdB+QH6wfyB/gH/wcFCAwIEwgZCCAIJggtCDMIOghACEcITghTCFoIYQhnCG4IdAh7CIAIhwiOCJMImgihCKYIrQi0CLkIwAjFCMwI0wjYCN8I5AjqCPEI+Aj9CAQJCQkQCRUJHAkhCScJLgkzCToJQAlFCUwJUQlWCV0JYgloCW8JdAl5CYAJhgmLCZAJlwmcCaEJqAmtCbIJuQm+CcMJyQnOCdQJ2QnfCeQJ6gnvCfUJ+gn/CQUKCgoQChUKGgofCiQKKgovCjQKOQo+CkQKSQpOClMKWApdCmIKZwpsCnEKdgp7CoAKhQqKCo8KkwqYCp0KogqnCqwKsAq1CrkKvgrDCsgKzArRCtUK2greCuMK5wrsCvEK9Ar5Cv4KAgsHCwoLDwsTCxgLGwsgCyULKQssCzELNAs5CzwLQQtGC0kLTgtRC1QLWQtdC2ALZQtoC20LcAtzC3gLfAt/C4ILhwuKC40LkguVC5gLnAufC6MLpguqC60LsQu0C7gLuwu+C8ELxQvIC8sLzgvRC9UL2AvbC94L4QvkC+cL6gvtC/AL8wv2C/kL/Av+CwEMBAwHDAkMDAwPDBEMFAwXDBkMHAweDCEMIwwmDCkMKgwtDDAMMQw0DDcMOAw7DD4MPwxBDEQMRQxIDEkMTAxNDFAMUQxTDFYMVwxaDFsMXgxfDGAMYgxlDGYMZwxqDGsMbQxuDHAMcQxyDHQMdQx3DHgMegx7DHwMfQx/DIAMgQyCDIQMhQyGDIcMiAyJDIoMiwyMDI0MjgyPDI8MkAyRDJIMkgyTDJQMlQyVDJYMlgyXDJcMmAyYDJkMmgyZDJoMmwyaDJsMnAybDJwMmwycDJ0MnAydDJwMnAydDJwMnAydDJwMmwycDJsMnAybDJoMmwyaDJkMmgyZDJgMmAyXDJcMlgyWDJUMlQyUDJMMkgySDJEMkAyPDI4MjQyNDIwMiwyKDIkMhwyGDIUMhAyDDIIMgAx/DH4MfQx8DHoMeQx3DHYMdAxzDHEMcAxvDGwMawxqDGcMZgxlDGIMYAxfDFwMWwxaDFcMVgxTDFEMUAxNDEoMSQxGDEUMQwxADD0MPAw5DDYMNQwyDDAMLQwqDCgMJQwjDCAMHgwbDBgMFgwTDBAMDQwKDAgMBQwCDP8L/Av5C/YL8wvwC+0L6QvmC+ML4AvdC9oL1gvTC88LzAvJC8ULwgu/C7oLtwu0C7ALrQuoC6ULogueC5kLlguTC44LiwuGC4MLfgt7C3YLcwtuC2sLZwtiC18LWgtVC1ELTgtJC0ULQAs7CzgLMwsuCyoLJQshCxwLGAsTCw8LCgsFCwAL/Ar3CvIK7QroCuMK3grZCtQKzwrKCsUKwAq7CrYKsQqsCqcKoQqcCpYKkQqMCocKgQp8CnYKcQprCmYKYQpaClUKUApJCkQKPwo4CjMKLgooCiEKHAoVChAKCQoECv4J+AnxCewJ5QngCdkJ0wnOCccJwAm7CbUJrgmnCaIJmwmVCY4JhwmBCXoJdAltCWcJYAlaCVMJTAlFCT8JOAkxCSoJJAkdCRYJDwkICQEJ+gjzCOwI5QjeCNcI0AjJCMIIugizCKwIpQieCJYIjwiHCIAIeQhxCGoIYghbCFQITAhFCD0INggtCCYIHwgWCA8ICAj/B/gH8QfoB+EH2AfRB8kHwAe5B7IHqQeiB5oHkQeIB4EHeAdxB2gHYQdYB08HRwdABzcHLgcnBx4HFQcOBwUH/Qb0BuwG4wbbBtIGygbBBrgGsAanBp4GlgaNBoUGfAZzBmsGYgZZBlAGRwY+BjYGLQYkBhsGEgYJBgAG9wXuBeUF3AXTBcoFwAW3Ba4FpQWcBZMFigWABXcFbgVlBVsFUgVIBT8FNgUsBSMFGgUQBQcF/QT0BOsE4ATXBM4ExAS7BLEEqASdBJQEiwSABHcEbQRkBFkEUARHBDwEMwQoBB8EFgQLBAIE9wPuA+MD2gPPA8YDvAOxA6gDnQOUA4kDgAN1A2wDYQNYA00DRAM5Ay4DJQMaAxEDBgP7AvEC6ALdAtICyQK/ArQCqQKgApUCigKAAnUCbAJhAlcCTAJCAjcCLAIjAhgCDQIDAvgB7gHjAdkBzgHEAbkBrgGkAZkBjwGEAXkBbgFkAVkBTwFEATkBLgEkARkBDgEDAfkA7gDjANgAzgDDALgArQCjAJgAjQCCAHcAbABhAFcATABBADYAKwAgABUACgAAAPb/6//g/9X/yv+//7T/qf+e/5P/iP99/3L/Z/9c/1H/Rv87/zD/Jf8a/w//BP/5/u7+4/7X/sz+wf62/qv+oP6V/or+f/50/mn+Xv5S/kf+PP4x/ib+G/4Q/gX++v3u/eP92P3N/cL9t/2r/aD9lf2K/X/9dP1p/V39Uv1H/Tz9Mf0m/Rv9D/0E/fn87vzj/Nj8zPzB/Lb8q/yg/JX8ivx+/HP8aPxd/FL8R/w8/DD8Jfwa/A/8BPz5++774/vX+8z7wfu2+6v7oPuV+4r7fvtz+2j7XftS+0f7PPsx+yb7G/sQ+wX7+fru+uP62PrN+sL6t/qs+qH6lvqL+oD6dfpq+l/6VPpJ+j76M/oo+h36EvoH+vz58vnn+dz50fnG+bv5sPml+Zr5j/mF+Xr5b/lk+Vn5TvlE+Tn5Lvkj+Rn5DvkD+fj47fjj+Nj4zfjC+Lj4rfij+Jj4jfiC+Hj4bfhj+Fj4TfhD+Dj4Lvgj+Bn4DvgE+Pn37/fk99r3z/fE97v3sPel95v3kPeH93z3cvdn91z3U/dI9z33M/cq9x/3FPcL9wD39/bs9uH22PbN9sT2ufaw9qX2mvaR9ob2ffZy9mn2XvZV9kr2QfY29i32JPYZ9hD2Bfb89fH16PXf9dX1yvXB9bj1rvWj9Zr1kfWG9X31c/Vq9WD1V/VO9UP1OvUx9Sf1HvUU9Qv1AfX49O/05vTc9NP0yfTA9Lf0rvSk9Jv0kvSJ9ID0d/Ru9GX0XPRS9En0QPQ39C/0JvQd9BT0C/QC9Pnz8PPn89/z1vPN88TzvPOz86vzovOZ85HziPOA83fzb/Nm813zVvNN80TzPPMz8yzzJPMb8xLzC/MD8/ry8fLq8uLy2fLS8snywvK58rLyqvKh8prykfKK8oPyevJy8mryY/Jc8lPyTPJE8j3yNvIt8ibyH/IX8hDyCPIB8vnx8vHr8ePx3PHV8c7xx/HA8bjxsfGq8aPxnPGV8Y7xh/GA8XnxcvFs8WXxXvFX8VHxSvFD8TzxNvEv8SnxIvEc8RXxD/EI8QHx/PD18O7w6fDj8Nzw1fDQ8MnwxPC98LjwsfCs8Kbwn/Ca8JPwjvCH8ILwfPB38HDwa/Bl8GDwW/BU8E/wSvBE8D/wOfA08C/wKvAk8B/wGvAV8A/wCvAF8ADw++/27/Hv7O/n7+Lv3u/Z79Tvz+/K78bvwe+977jvs++v76rvpu+h753vmO+V75Dvi++I74PvgO9773bvc+9u72vvZ+9i71/vXO9X71TvT+9M70nvRO9B7z3vOu827zPvL+8s7ynvJe8i7x/vG+8Y7xXvEu8O7wvvCO8F7wLv/+787vru9+707vHu7u7r7unu5u7k7uHu3+7c7tru1+7U7tPu0O7N7szuye7I7sXuwu7B7r7uve667rnutu617rTusu6v7q7ure6q7qnuqO6l7qTuo+6h7qDunu6d7pzum+6Z7pjul+6W7pXulO6T7pLuke6Q7o/uju6O7o3ujO6L7ovuiu6K7onuie6I7ofuiO6H7obuh+6G7obuhe6G7oXuhu6F7obuhe6G7oXuhu6G7ofuhu6H7ojuh+6I7onuie6K7orui+6L7ozuje6O7o7uj+6Q7pHuku6T7pTule6W7pfumO6a7pvunO6d7p/uoO6i7qPupe6m7qfuqu6r7qzur+6w7rLus+627rfuuu687r3uwO7B7sTux+7J7sruze7Q7tHu1O7W7tnu3O7e7uHu4+7m7uju6+7u7vHu9O737vru/e4A7wPvBu8J7wzvD+8S7xXvGe8c7yDvI+8n7yrvLu8x7zTvOe887z/vRO9I70vvTu9T71bvW+9e72PvZu9r73Dvc+9473vvgO+E74nvju+R75bvm++f76Tvqe+t77Lvt++878Dvxe/K78/v1O/Z797v4+/o7+3v8+/47/3vAvAI8A3wEvAY8B3wI/Ao8C7wM/A68D/wRPBL8FHwVvBb8GLwZ/Bu8HPwevB/8IbwjfCS8JnwnvCl8KvwsvC58L7wxfDM8NLw2fDf8Obw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wum36azpoumX6Y3pgul46W3pYulZ6U7pQ+k66S/pJOkb6RHpB+n86PPo6eje6NXozOjB6Ljor+ik6JvokuiI6H/odehs6GPoWuhR6EfoPug16CzoI+ga6BLoCegA6Pfn7+fm597n1efM58Tnu+e056vnoueb55Lni+eC53vnc+dr52LnW+dU50vnROc85zXnLecm5x/nF+cQ5wnnAuf65vPm7Obl5t7m1+bR5srmw+a85rbmr+ap5qLmm+aW5o/miOaD5nzmd+Zw5mvmZOZf5ljmU+ZM5kfmQuY75jbmMeYr5ibmIOYb5hbmEeYM5gfmAub95fjl8+Xu5enl5OXg5dvl1+XS5c3lyuXF5cDlveW45bXlsOWt5ajlpeWg5Z3lmOWV5ZHljuWL5YflhOWA5X3leeV25XPlcOVt5WrlZ+Vk5WLlX+Vc5VnlV+VU5VHlUOVN5UrlSeVG5UPlQeVA5T3lPOU55TjlN+U05TPlMeUw5S7lLeUs5SrlKeUo5SflJeUk5SPlIuUi5SHlIOUf5R/lHuUe5R3lHOUc5RvlHOUb5RzlG+Uc5RvlHOUb5RzlG+Uc5R3lHOUd5R7lHuUf5SDlIeUh5SLlI+Uk5SXlJuUn5SjlKuUr5S3lLuUw5THlMuU05TXlOOU55TzlPuU/5ULlQ+VG5UflSuVN5U7lUeVU5VblWeVb5V7lYeVk5WflauVt5XDlc+V25XnlfeWA5YTlh+WK5Y7lkeWW5ZnlnOWg5aXlqOWt5bDltOW55b7lweXG5crlz+XT5djl3eXh5ebl6+Xw5fXl+uX/5QTmCeYO5hPmGeYe5iTmKeYu5jXmOuY/5kXmTOZR5lbmXOZj5mrmb+Z25nvmguaJ5o/mluac5qPmqeaw5rbmvebE5svm0ubZ5uDm5+bu5vbm/eYF5wznFOcb5yLnKucx5zrnQedK51HnWudh52rnced654HniueT55rno+es57TnvefF587n1+fg5+nn8ef65wPoDegW6B/oKOgx6DvoROhO6FfoYOhr6HTofeiI6JLom+ik6K/ouOjD6M7o1+ji6Ovo9ugA6QvpFekg6SvpNelA6UvpVulg6WvpdumB6Yzpl+mi6a3puenE6dDp2+nm6fHp/ukJ6hTqIeos6jfqROpP6lzqZ+p06n/qjOqX6qTqseq86snq1eri6u7q++oI6xTrIesu6zvr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99/s3+Hf1t/L38Dftd+q35/flN+J33/fdN9p32DfVd9K30HfNt8t3yLfGd8O3wXf+97w3ufe3t7U3svewd643q/ept6c3pPeit6C3nnecN5n3l/eVt5O3kXePN413izeJd4c3hTeDd4E3v3d9N3t3eXd3t3X3c/dyN3B3bndst2r3aTdnd2X3ZDdid2C3Xzddd1v3WjdY91c3VbdT91K3UTdP9043TLdLd0o3SLdHd0X3RLdDd0I3QPd/tz53PTc79zr3Obc4dzd3Njc1dzQ3MvcyNzD3L/cvNy33LTcsNyt3Krcptyj3J/cnNyZ3Jbck9yQ3I3cityH3IXcgtyA3H3cetx53Hbcddxy3HHcbtxt3Grcadxo3GbcZNxj3GHcYNxf3F7cXdxc3FvcWtxZ3FncWNxY3FfcV9xW3FfcVtxX3FfcVtxX3FbcV9xX3FjcWdxZ3FrcWtxb3FzcXdxe3GDcYdxi3GPcZdxm3Gfcadxs3G3cbtxx3HPcdNx33Hrce9x+3IHcg9yG3Ijci9yO3JHclNyX3Jrcndyh3KTcp9yr3K7cs9y23LncvtzB3MbcydzO3NPc1tzb3N/c5Nzp3O3c8tz33PzcAd0G3QvdEN0W3RvdIN0m3SvdMt033TzdQ91I3U/dVN1b3WLdZ91u3XTde92C3Yjdj92W3Z3dpN2r3bLdud3A3cjdz93W3d/d5t3t3fbd/d0G3g7eFd4e3iXeLt423j/eR95Q3ljeYd5q3nPefN6F3o7el96g3qres9693sbez97a3uPe7N733gDfC98U3x/fKt8z3z7fSN9T317faN9z333fiN+T357fqd+038Dfy9/X3+Lf7d/53wTgEeAc4CfgNOA/4EzgV+Bk4HHgfOCJ4JXgouCv4LvgyODV4OLg7uD74AjhFuEj4TDhPuFL4VnhZuFz4YHhjuGd4arhuOHH4dTh4+Hw4f/hDuIb4iriOeJH4lbiZeJ04oLikeKg4q/ivuLN4t3i7OL84gvjG+Mq4znjSeNY42njeOOJ45njqOO548jj2ePq4/njCuQb5CvkPORM5F3kbuR/5JDkoeSy5MPk1OTl5PbkCOUZ5SvlPOVN5WDlceWC5ZXlpuW55cvl3OXv5QDmE+Ym5jfmSuZd5m/mguaU5qfmuebM5t/m8uYF5xjnK+c+51LnZed454vnn+ey58bn2eft5wDoFego6DvoUOhk6HjojOif6LToyejc6PHoBukZ6S7pQ+lX6WzpgOmV6arpv+nU6enp/ukT6ijqPepS6mfqfOqS6qfqverS6ufq/uoT6yjrP+tU62nrgOuW66zrwuvY6+7rA+wa7DHsRuxd7HTsieyg7Lfszezk7PrsEe0o7T/tVe1s7YPtmu2x7cjt3+327Q7uJe487lPua+6C7pnuse7I7uDu9+4P7ybvP+9W723vhe+e77Xvzu/m7/3vFvAt8EbwXfB28I7wp/C+8Nfw8PAI8SDxOfFR8WrxgvGb8bPxzPHl8f7xF/Iw8kjyYfJ68pPyrPLF8t7y9/IR8yrzQ/Nc83XzjvOo88Hz2/P08w70J/RB9Fr0c/SN9Kb0wfTa9PP0DfUo9UH1WvV19Y71qfXD9dz19/UQ9iv2RfZe9nn2k/as9sf24vb79hb3MPdL92T3f/eZ97P3zvfp9wP4Hvg4+FP4bfiI+KL4vfjX+PL4Dfkn+UL5Xfl4+ZL5rfnI+eP5/vkZ+jP6Tvpp+oT6n/q6+tX68PoL+yb7Qftc+3f7kvut+8j75Pv/+xr8NfxQ/Gz8h/yi/L382fz0/A/9Kv1G/WH9fP2X/bP9zv3q/QX+IP48/lf+cv6O/qn+xf7g/vv+F/8y/07/af+F/6D/vP/X//P/DgApAEQAYAB7AJcAsgDOAOkABQEgATwBVwF0AY8BqgHGAeEB/QEYAjQCTwJsAocCowK+AtkC9QIQAy0DSANkA38DmwO2A9ED7gMJBCUEQARbBHcEkgSuBMoE5QQBBRwFOAVTBW8FigWmBcEF3QX4BRMGLwZKBmYGgQadBrgG0wbvBgoHJQdBB1wHeAeTB64HyQflBwAIHAg3CFIIbQiJCKQIvwjaCPUIEAksCUcJYgl9CZgJswnOCekJBAofCjoKVQpwCosKpgrBCtwK9woSCywLRwtiC30LmAuzC80L6AsCDB0MOAxTDG0MiAyiDL0M1wzyDAwNJw1CDVwNdw2QDasNxg3fDfoNFQ4vDkgOYw58DpcOsg7LDuYO/w4ZDzMPTg9nD4IPmw+0D88P6A8DEBwQNRBQEGkQgxCcELYQzxDpEAIRHBE1EU8RaBGBEZoRtBHNEeYR/xEYEjESShJjEnwSlRKuEscS4BL5EhITKhNDE1wTdBONE6UTvhPWE+8TCBQfFDgUURRoFIEUmRSyFMkU4hT5FBEVKhVBFVoVcRWJFaAVuRXQFecVABYXFi4WRhZdFnUWjBajFroW0hbpFgAXFxcuF0UXXBdzF4oXoRe4F84X5Rf7FxIYKBg/GFYYbBiDGJgYrxjGGNsY8hgHGR4ZMxlKGV8ZdhmLGaAZtxnMGeEZ+BkNGiIaNxpNGmIaeBqNGqIatxrMGuEa9hoLGyAbNBtJG10bchuHG5wbrxvEG9kb7BsBHBYcKRw+HFEcZhx5HI4coRy0HMkc3BzvHAMdFh0qHT0dUR1kHXcdih2dHbAdwx3WHekd/B0OHiEeMx5GHlkeah59HpAeoR60HsUe2B7pHvweDR8fHzIfQx9VH2Yfdx+JH5ofqx+9H84f3x/wHwEgEiAjIDQgRSBVIGYgdiCHIJcgqCC3IMgg2SDpIPggCSEYISchOCFIIVchZiF2IYUhlSGkIbMhwiHRIeAh7yH+IQ0iHCIqIjkiRyJWImUiciKBIpAinSKrIroixyLWIuMi8CL/IgwjGSMnIzQjQiNPI1wjaSN2I4MjjyOcI6kjtSPCI88j2yPoI/MjACQNJBgkJSQwJDskSCRUJF8kaiR2JIEkjSSYJKMkriS5JMQkzyTaJOUk7yT6JAUlDiUZJSQlLSU4JUElTCVVJWAlaSVyJX0lhiWPJZkloiWrJbQlvSXGJc8l2CXhJekl8iX6JQMmDCYTJhsmJCYtJjQmOyZDJkwmUyZaJmImaSZxJngmfyaGJo0mlCabJqImqSavJrYmvSbCJskm0CbVJtwm4SbnJu4m8yb4Jv8mBCcJJw8nFCcZJx4nIycoJy0nMic2JzsnQCdEJ0knTCdRJ1YnWiddJ2InZSdoJ20ncCdzJ3cneid9J4AnhCeHJ4knjCePJ5InlCeXJ5knnCedJ6AnoielJ6YnpyepJ6wnrSeuJ7AnsSezJ7QntSe2J7cnuCe4J7knuSe6J7snuye8J7snvCe7J7wnuye8J7snuie6J7knuSe4J7cntie1J7QnsyeyJ7EnryeuJ60nqiepJ6gnpSekJ6EnoCedJ5onmSeWJ5MnkSeOJ4sniCeFJ4Infyd8J3kndSdyJ28naidnJ2QnXydcJ1cnVCdQJ0snRidCJz0nOSc0Jy8nKycmJyEnGycWJxEnDCcHJwAn+yb2Ju8m6ibjJt4m2CbRJswmxSa/JrgmsSarJqQmnSaWJo8miCaBJnom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n9aW1ovWgtZ41m/WZtZc1lPWStZB1jjWL9Ym1h3WFdYM1gTW+9Xz1erV49Xa1dPVytXD1bzVs9Ws1aXVndWW1Y/ViNWB1XrVc9Vs1WbVX9VY1VPVTNVF1UDVOdU01S3VKNUj1RzVF9US1QzVB9UC1f3U+NTz1O7U6tTl1OHU3NTX1NTUz9TM1MfUxNS/1LzUudS01LHUrtSr1KfUpNSh1J7UnNSZ1JbUk9SS1I/UjNSL1IjUh9SE1IPUgNR/1H7UfNR71HnUeNR31HbUddR01HPUc9Ry1HLUcdRy1HHUcdRw1HHUctRx1HHUctRz1HPUdNR11HbUd9R41HnUetR81H3Uf9SA1IHUhNSG1IfUitSL1I7UkdST1JXUmNSa1J3UoNSj1KbUqtSt1LDUs9S31LrUv9TC1MbUydTO1NPU1tTa1N/U5NTo1O3U8tT31PzUAdUG1QvVEdUW1RvVIdUm1S3VMtU51T7VRdVK1VHVV9Ve1WXVa9Vy1XnVgNWH1Y7VldWd1aTVq9Wz1brVw9XK1dPV2tXj1erV8tX71QTWDNYV1h3WJtYv1jjWQdZK1lTWXdZn1nDWedaD1o7Wl9ai1qvWtta/1srW1Nbf1urW9Nb/1grXFdcg1yvXNtdB103XWNdk12/XeteG15PXnter17bXwtfP19zX6Nf11wHYDtgb2CjYNdhC2E/YXNhq2HfYhdiS2J/Yrti72MrY2Njl2PTYAdkQ2R/ZLdk82UrZWdlo2XfZhtmV2aTZs9nD2dLZ4tnx2QDaEdoh2jDaQdpQ2mHacNqB2pHaotqz2sPa1Nrl2vXaBtsX2yjbOdtL21zbbtt/25Dbo9u028Xb2Nvq2/vbDtwh3DLcRNxX3GrcfNyP3KLctdzH3Nrc7dwB3RTdJ9073U7dYd113Yjdnd2x3cTd193s3QDeFd4o3j3eUd5m3nrej96j3rjezd7i3vfeDN8h3zbfS99h33bfjN+i37ffzN/j3/jfD+Ak4DvgUOBn4Hzgk+Cq4L/g1uDt4APhGuEx4UjhX+F24Y3hpOG74dLh6uEB4hniMOJH4mDid+KO4qfivuLW4u/iBuMf4zjjT+Nn44DjmeOx48rj4uP74xTkLeRG5F/keOSR5KrkxOTd5PbkEOUp5ULlXOV15ZDlquXD5dzl9uUR5irmReZf5nrmk+au5sjm4+b95hjnM+dN52jn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4yb+JhcnMidNJ2cngCebJ7QnzSfoJwEoGig0KE0oZih/KJkosijLKOMo/CgVKS0pRilfKXcpjimnKb8p2CnvKQYqHio3Kk4qZSp9KpQqqyrCKtoq8CoHKx4rNStLK2IreSuOK6UrvCvRK+cr/isTLCgsPyxULGksfyyULKksvizTLOgs/SwSLSYtOy1QLWQteS2MLaAttS3ILd0t8C0ELhcuKi4+LlEuZC53LoounS6wLsIu1S7oLvouDS8eLzEvQy9UL2cveC+KL5svrC++L88v4C/xLwIwEzAkMDQwRTBWMGUwdjCHMJYwpzC2MMUw1jDlMPQwBDETMSIxMTFAMU8xXjFsMXsxijGYMaUxtDHDMdAx3THsMfkxBjIUMiEyLzI8MkkyVjJiMm8yezKIMpUyoDKsMrkyxTLQMt0y6DL0Mv8yCzMWMyEzLDM3M0IzTDNXM2EzazN2M4EzijOVM54zpzOyM7szxDPOM9cz4DPpM/Iz+zMDNAw0FTQcNCU0LjQ1ND40RTRMNFU0XDRjNGo0cTR5NH80hjSNNJQ0mzSgNKc0rjSzNLo0vzTENMs00DTVNNs04DTlNOo07zT0NPg0/TQBNQY1CTUONRE1FjUZNR41ITUkNSg1KzUuNTE1NDU3NTk1PDU/NUA1QjVENUY1SDVKNU01TjVPNVE1UjVTNVQ1VTVWNVc1VzVYNVc1WDVYNVk1WDVXNVg1VzVWNVY1VTVUNVM1UjVRNU81TjVMNUs1SjVINUU1RDVBNT41PTU6NTc1NDUxNS41KzUoNSU1ITUeNRs1FjUSNQ81CjUHNQI1/TT5NPQ08DTrNOY04TTbNNY00DTLNMY0vzS6NLM0rjSnNKI0mzSUNI40hzSANHk0cjRrNGM0XDRVNE00RjQ9NDY0LTQmNB00FTQMNAM0+zPyM+kz4DPXM80zxDO7M7IzpzOdM5MzijN/M3YzazNgM1YzSzNAMzYzKzMgMxQzCTP+MvIy5zLaMs8ywjK3MqoynzKSMoUyeTJsMl8yUzJFMjgyKzIeMhAyAzL2Mecx2THMMb0xsDGhMZMxhDF1MWcxWDFJMToxKzEcMQwx/TDtMN4wzzC+MK8wnjCPMH4wbTBdMEwwPDArMBowCTD4L+cv1i/EL7Mvoi+QL30vbC9bL0gvNS8kLxEv/y7sLtkuxy60LqEuji57LmcuVC5ALi0u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dzaMNqE2tjbLNuA29TYINx03MjdFN1k3bjeBN5Q3qDe7N8834jf1Nwg4GzgtOEA4UzhlOHg4iTibOK44vzjQOOI48zgFORY5Jzk4OUk5WTlqOXs5izmcOas5uznMOds56jn6OQk6GTooOjc6RjpVOmM6cjqBOo46nTqrOro6xzrUOuI67zr9Ogo7FzskOzE7PjtKO1c7ZDtvO3w7hzuTO6A7qzu2O8I7zTvYO+M77jv5OwM8DjwZPCI8LTw2PEA8SzxUPF08ZzxwPHk8gjyLPJQ8nDylPK48tTy+PMU8zTzWPN085DzsPPM8+jwBPQg9Dz0VPRw9Iz0oPS89ND06PUE9Rj1LPVE9Vj1bPWA9ZT1pPW49cj13PXw9fz2EPYc9ij2OPZE9lT2YPZs9nj2hPaM9pj2pPao9rD2vPbA9sz20PbU9tz24Pbk9uj27Pbw9vD29Pb49vT2+Pb09vj29Pb09vD28Pbs9uj25Pbg9tj21PbM9sj2vPa49qz2qPac9pD2iPZ89nD2ZPZY9kz2QPYw9iT2EPYE9fD14PXU9cD1rPWc9Yj1dPVg9Uz1OPUg9Qj09PTg9MT0sPSU9Hj0YPRI9Cz0EPf089jzvPOc84DzYPNE8yTzCPLk8sDypPKA8lzyPPIY8fTx0PGs8YTxYPE48RTw6PDA8JzwcPBI8Bzz8O/I75zvcO9E7xju7O687pDuXO4w7fztzO2g7WztOO0I7NTsoOxs7DjsBO/M65jrZOso6vTqwOqE6kjqFOnY6ZzpZOko6OzosOh06DTr+Oe853jnPOcA5rzmeOY85fjltOV05TDk7OSo5GTkIOfc45jjTOMI4sTieOI04ejhnOFY4QzgwOB04Cjj3N+Q30Te9N6o3lzeDN3A3WzdINzM3HjcLN/Y24TbMNrg2ozaNNng2YzZNNjg2IzYMNvY14TXKNbU1njWHNXE1WjVDNS01FTX+NOc00DS5NKA0iTRyNFo0QTQqNBE0+DPhM8gzrzOWM34zZTNLMzIzGTP/MuYyzTKzMpgyfzJkMksyMTIWMvsx4THGMasxkTF2MVoxPzEkMQgx7TDSMLUwmTB+MGEwRTAqMA0w8S/UL7cvmy9+L2EvRC8nLwov7C7PLrIuky52LlkuOi4dLv8t4C3BLaMthC1mLUctKS0KLesszCytLI0sbixOLC8sECzvK9ArryuQK28r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pzu4O8k72DvoO/c7CDwXPCY8NTxFPFQ8YjxxPH88jjydPKo8uTzGPNQ84zzwPP08Cz0YPSU9Mj0/PUw9WT1kPXE9fj2JPZY9oT2tPbg9xD3PPdo95T3wPfs9Bj4RPho+JT4wPjk+RD5NPlc+YD5pPnM+fD6FPo0+lj6fPqc+sD63PsA+yD7PPtg+3z7mPu4+9T78PgM/CT8QPxc/HT8kPyk/Lz82Pzs/QT9GP0s/UT9WP1s/Xz9kP2g/bT9yP3Y/eT9+P4E/hT+IP4s/jz+SP5U/lz+aP50/nz+iP6M/pj+nP6o/qz+sP64/rz+wP7E/sj+yP7M/sz+0P7Q/tT+0P7M/tD+zP7I/sj+xP7A/rz+tP6w/qj+pP6Y/pT+iP6E/nj+bP5k/lj+TP5A/jT+KP4Y/gz+AP3s/eD9zP3A/az9mP2I/XT9YP1M/Tj9JP0Q/Pj85PzI/LT8mPyE/Gz8UPw0/Bz8AP/k+8j7qPuM+3D7UPs0+xD68PrU+rD6kPps+kj6KPoE+eD5uPmU+XD5SPkk+Pj41Pio+IT4WPgs+AT72Pes94D3VPco9vz2zPag9mz2QPYM9dz1sPV89Uj1GPTk9LD0fPRI9BT33POo82zzOPME8sjyjPJY8hzx5PGo8WzxMPD08LjwePA88ADzvO+A7zzu/O687oDuPO347bjtdO0w7OzsqOxg7Bzv2OuM60Tq/Oq06mzqKOnc6ZDpSOj86LDoZOgY68znfOcw5uTmkOZE5fDloOVU5QDkrORc5AjntONg4wziuOJk4gzhuOFk4QjgsOBc4ADjrN9Q3vTenN5A3eTdiN0s3NDcdNwU37jbXNr42pjaONnc2XjZHNi42FTb9NeQ1yzWyNZk1gDVnNU01NDUZNQA15zTNNLI0lzR+NGM0SDQuNBM0+DPdM8IzpzOMM3AzVTM6Mx0zATPmMskyrTKSMnUyWDI8Mh8yAzLmMckxrDGOMXExUzE2MRkx+jDdMMAwojCDMGQwRzAoMAow6y/ML60vji9vL1AvMS8SL/Mu0i6zLpQucy5ULjQuEy70LdMtsi2TLXItUS0wLQ8t7izNLKwsiyxqLEksJiwFLOQrwSugK30rXCs5Kxgr9SrTKrAqjSprKkgqJSoCKt8pvCmZKXUpUikvKQsp6CjDKKAoeyhXKDQoDyjsJ8cnoyd+J1knNScQJ+smxiahJnwmVyYyJg0m5yXCJZ0ldiVRJSwlBSXgJLkkkyRuJEckIST6I9MjrSOGI2AjOSMSI+sixCKdInYiTyInIgAi2SGyIYkhYiE7IRIh6yDCIJsgciBLICIg+x/SH6ofgR9ZHzAfCB/fHrYejR5kHjseEh7pHcAdlx1uHUQdGx3xHMgcnhx1HEocIRz4G80bpBt5G1AbJRv6GtAapxp8GlIaJxr9GdIZqBl9GVIZJxn9GNIYpxh8GFEYJRj6F88XpBd5F00XIhf2FssWnxZ0FkkWHBbwFcUVmhVtFUIVFRXpFL4UkRRmFDkUDBTgE7UTiBNcEy8TAxPWEqoSfRJQEiQS9xHKEZ4RcRFEERcR6hC9EJAQYxA2EAkQ3A+vD4IPVA8nD/oOzQ6fDnIORA4XDukNvA2PDWANMw0GDdgMqwx8DE4MIQz0C8ULmAtpCzwLDQvgCrMKhApXCigK+wnMCZ0JcAlBCRQJ5Qi4CIkIWggsCP8H0AehB3QHRQcWB+kGugaLBl4GLwYBBtIFpAV1BUcFGAXqBLsEjQReBDAEAQTTA6QDdQNHAxgD6gK7AowCXgIvAgAC0gGjAXUBRgEXAekAugCLAF0ALgAAANL/o/90/0b/F//o/rr+i/5d/i7+//3R/aL9c/1F/Rb96Py5/Ir8XPwt/P/70Pui+3P7RfsW++f6ufqK+lz6Lfr/+dD5ovlz+Ub5F/np+Lr4i/he+C/4APjT96T3dfdI9xn37Pa99o72YfYy9gX21vWp9Xv1TPUf9fD0w/SU9Gf0OPQK9N3zrvOB81TzJvP38srynfJu8kHyFPLm8bnxi/Fe8TDxA/HV8Kjwe/BO8CDw8+/G75nva+8+7xHv5O637oruXe4x7gTu1+2q7X3tUe0k7fjsy+yf7HLsRewZ7OzrweuU62frPOsP6+Tqt+qM6l/qNOoH6tzpr+mE6VnpLOkB6dXoquh/6FPoKOj859Hnpud751DnJOf55s7mpOZ55k7mI+b45c7lo+V55U7lI+X65M/kpOR75FDkJ+T849PjqON+41XjKuMB49firuKF4lviMuII4t/htuGN4WThO+ES4engwOCX4G/gRuAe4PXfzN+k33vfVN8r3wTf29603oveZN473hTe7d3F3Z7ddt1P3SfdAN3Z3LLci9xk3D3cF9zw28rbo9t821fbMNsJ2+TavdqY2nLaS9om2gDa29m12ZDZa9lF2SDZ+9jW2LHYjNhn2ELYHtj519XXsNeN12jXRNcg1/vW2Na11pDWbdZK1ibWA9bf1bzVmdV21VPVMNUO1evUyNSm1IPUYtRA1B3U+tPZ07jTldN001LTMdMQ0+7SzdKs0ovSatJJ0inSCNLn0cfRptGH0WbRR9Em0QfR5tDH0KfQiNBp0EnQKtAL0OzPzc+uz5DPcc9TzzTPF8/4ztnOvM6fzoDOY85FzijOCs7tzdDNs82WzXnNXc1AzSPNB83qzM/MssyXzHrMX8xEzCfMDMzxy9bLu8ugy4XLastPyzTLG8sAy+XKzMqxypjKfcpkykvKMcoYyv7J5cnMybTJm8mCyWnJUck4ySHJCMnxyNjIwMipyJLIeshjyEzINcgeyAfI8Mfax8PHrMeXx4DHa8dVxz/HKccTx/7G6MbTxr7GqcaUxoDGa8ZWxkPGLsYZxgXG8sXfxcrFt8WkxZDFfcVqxVfFRMUyxR/FDcX6xOnE1sTFxLLEocSPxH7EbcRbxErEOcQpxBjEB8T3w+bD18PGw7fDpsOXw4fDeMNow1nDSsM7wyzDHsMPwwHD8sLlwtbCycK6wq3Cn8KSwoXCd8Jqwl3CUcJEwjfCLMIfwhLCB8L6we/B5MHYwc3BwcG2wavBoMGWwYvBgcF2wW3BYsFZwU/BRME7wTLBKMEfwRbBDcEFwfzA88DswOPA2sDTwMvAxMC8wLXArcCmwJ/AmMCRwIvAhMB9wHjAccBswGbAX8BawFXAT8BKwEXAQMA7wDfAMsAtwCrAJcAiwB7AGcAWwBPAD8AMwAnABsADwAHA/r/7v/q/97/0v/O/8r/vv+6/7b/sv+u/6r/pv+i/57/ov+e/5r/nv+a/57/ov+i/6b/pv+q/67/tv+6/8L/xv/O/9L/3v/i/+7/9vwDAA8AFwAjAC8AOwBLAFcAZwBzAIcAkwCnALMAxwDbAOsA/wETAScBOwFTAWcBewGXAasBxwHbAfcCCwInAkMCXwJ7ApcCswLPAu8DCwMnA0sDZwOLA6cDywPvAA8EMwRXBHsEnwTDBOsFDwUzBV8FgwWvBdMF/wYnBlMGfwanBtMG/wcvB1sHiwe3B+MEFwhHCHMIpwjXCQsJOwlvCaMJ1woLCkMKdwqrCucLGwtPC4sLwwv/CDcMcwyrDOcNIw1fDZsN1w4TDlcOkw7PD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t9OW03XTVNMz0xLT8dLQ0q/SjtJt0k7SLdIM0u3RzNGs0Y3RbNFN0S7RDdHu0M/QsNCR0HLQU9A00BXQ9s/Yz7nPnM99z17PQM8jzwbP587Kzq3Oj85yzlTON84azv3N4c3EzajNi81uzVPNN80azf/M48zGzKvMkMx0zFnMPswjzAjM7cvSy7jLncuCy2nLTsszyxnLAMvnyszKs8qZyoDKZ8pOyjXKHMoDyuvJ0sm5yaLJiclyyVrJQskpyRLJ+8jjyMzItcieyIfIcMhZyEPILMgVyADI6cfUx77Hp8eSx33HZ8dSxz3HKMcTx/7G6cbVxsDGq8aYxoTGb8ZcxkfGNMYhxg3G+sXnxdTFwcWuxZzFicV2xWXFU8VBxS/FHcUKxfnE6MTWxMXEtMSjxJLEgsRxxGDEUcRBxDHEIMQRxADE8cPiw9LDw8O0w6XDlsOHw3nDasNdw07DP8MywyXDFsMJw/vC7sLhwtTCx8K6wq7CocKUwonCfcJwwmXCWMJNwkHCNsIrwiDCFcIKwv/B9cHqwd/B1sHLwcLBt8GuwaTBm8GSwYjBf8F2wW7BZcFcwVTBS8FEwTzBM8EswSTBHcEWwQ7BB8EAwfnA88DswOXA38DawNPAzsDHwMLAvMC3wLLArcCowKPAnsCawJXAkMCNwIjAhcCAwH3AesB2wHPAcMBtwGrAZ8BlwGLAX8BewFvAWsBXwFbAVMBTwFHAUMBPwE7ATsBNwEzATcBMwEvATMBMwE3ATcBOwE7AT8BQwFHAUsBUwFXAVsBZwFrAXcBewGHAY8BmwGnAa8BuwHHAdcB4wHvAf8CCwIfAisCOwJPAmMCcwKHApcCqwK/AtcC6wL/AxcDKwNHA18DcwOPA6cDwwPfA/cAEwQvBEsEawSHBKMExwTjBQMFJwVDBWcFhwWrBc8F7wYTBjcGXwaDBqcGzwbzBx8HQwdvB5sHvwfrBBcIQwhvCJsIxwjzCSMJTwl/CasJ3woLCj8KcwqfCtMLBws7C28LowvXCA8MQwx3DLMM6w0fDVsNjw3LDgcOPw57DrMO7w8vD2sPpw/jDCcQYxCjEN8RIxFnEaMR5xIrEmsSrxLzEzcTfxPDEAcUTxSTFN8VIxVvFbMV/xZLFpMW3xcnF3MXvxQPGFsYqxj3GUMZlxnnGjMahxrTGycbexvLGB8ccxzDHRsdbx3DH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n8+Cz2fPS88uzxPP+M7czsHOps6Kzm/OVc46zh/OBc7qzc/Ntc2czYHNaM1NzTPNGs0BzefMzsy1zJvMgsxqzFHMOMwfzAjM78vWy7/LpsuOy3fLYMtHyzDLGcsCy+vK08q9yqbKj8p5ymLKS8o2yh/KCsr0yd3JyMmzyZ3JiMlzyV3JSMk0yR/JCsn1yOLIzci4yKXIkMh9yGnIVshDyC/IHMgJyPbH48fQx73HqseZx4bHc8dix0/HPsctxxrHCcf4xufG1sbFxrTGo8aTxoLGccZixlHGQMYxxiLGEcYCxvPF48XUxcXFtsWnxZnFisV7xW7FX8VQxUPFNsUnxRrFDcX/xPLE5cTYxMvEvsSyxKXEmMSNxIHEdMRpxFzEUcRFxDrEL8QkxBnEDsQExPnD7sPkw9nD0MPGw7vDssOow5/DlcOMw4PDesNxw2nDYMNXw1DDR8M+wzfDL8MowyDDGcMRwwrDA8P8wvXC7sLowuLC28LUws/CyMLDwr7CuMKywq3CqMKjwp7CmcKVwpDCi8KIwoTCf8J8wnfCdMJwwm3CasJnwmTCYcJewlzCWcJWwlXCUsJRwk7CTcJLwkrCSMJHwkbCRcJEwkTCQ8JDwkLCQ8JCwkPCQsJDwkTCRMJFwkbCR8JIwknCS8JMwk3CUMJRwlTCVsJXwlrCXcJfwmLCZcJowmvCb8JywnbCecJ8woHChMKJwo7CksKXwpvCoMKlwqrCr8K1wrrCv8LGwszC0cLYwt3C5MLrwvHC+ML/wgbDDcMUwxzDI8MqwzPDO8NCw0vDUsNbw2TDbMN1w37Dh8OQw5nDo8Osw7XDwMPKw9PD3sPnw/LD/cMHxBLEHcQoxDPEPsRKxFXEYMRtxHnEhMSRxJzEqcS2xMLEz8TcxOnE9sQDxRHFHsUsxTnFRsVVxWPFcsV/xY7FncWrxbrFycXYxefF98UGxhbGJcY0xkXGVcZkxnXGhcaWxqfGt8bIxtnG6sb7xg3HHscwx0HHUsdlx3fHiMebx63HwMfTx+XH+McLyB7IMchFyFjIbMh/yJLIp8i7yM7I48j4yAvJIMk1yUrJX8l0yYnJnsmzycjJ38n0yQnKIMo2ykvKYsp5yo7Kpcq8ytPK6soByxjLL8tGy13LdsuNy6TLvcvUy+3LBMwdzDXMTsxnzH/MmMyxzMrM48z9zBbNL81JzWLN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9c3gzcrNtc2fzYrNdc1fzUrNNc0gzQzN98zizM/MusylzJLMfsxpzFbMQ8wuzBvMCMz1y+HLzsu8y6nLlsuEy3HLXstNyzvLKMsXywTL88rhytDKv8qtypzKi8p6ymrKWcpIyjjKJ8oYygfK98noydfJyMm4yanJmsmKyXvJbMldyU/JQMkyySPJFckGyfnI6sjdyM/Iwsi0yKfImciMyH/Ic8hmyFnITchAyDPIKMgbyBDIA8j4x+zH4cfWx8rHv8e0x6nHnseUx4nHfsd1x2rHYcdWx03HQsc5xzDHJscdxxTHC8cCx/nG8cboxt/G2MbPxsbGv8a4xq/GqMahxpnGksaLxoTGfcZ2xnDGacZixl3GV8ZQxkvGRMY/xjrGNMYvxirGJcYgxhvGFsYSxg3GCMYFxgDG/cX4xfXF8sXuxevF58XkxeHF3sXcxdnF18XUxdHF0MXOxcvFysXJxcfFxcXExcPFwsXBxcDFv8W/xb/FvsW9xb7FvcW+xb7Fv8W/xcDFwMXBxcLFw8XFxcbFyMXJxcrFzMXPxdDF08XWxdjF28XdxeDF48XmxenF7cXwxfPF98X6xf/FAsYGxgvGEMYUxhnGHcYixifGLMYyxjfGPMZCxkfGTsZTxlrGX8Zmxm3Gc8Z6xoDGh8aOxpXGncakxqvGtMa7xsLGy8bSxtvG48bsxvXG/cYGxw/HGMchxyrHNMc9x0bHUMdbx2THb8d4x4PHjceYx6PHrse4x8PHzsfax+XH8cf8xwjIE8ggyCvIOMhFyFDIXchqyHfIg8iQyJ7Iq8i4yMbI08jgyO/I/MgLyRjJJ8k2yUPJUslhyXDJf8mOyZ3JrMm8ycvJ2snryfrJCcoayivKOspLylvKbMp8yo3KnsqvysDK0srjyvXKBssXyyrLPMtNy2DLccuEy5fLqcu8y8/L4sv0ywjMG8wuzELMVcxozH3MkMylzLjMzczgzPXMCc0ezTPNR81czXHNhs2bzbHNxs3bzfLNB84czjPOSM5fznbOi86izrjOz87mzv3OE88qz0LPWc9wz4jPn8+2z8/P58//zxbQL9BG0F/QeNCQ0KnQwdDa0PPQDNEl0T7RV9Fx0YrRpNG90djR8dEK0iXSQNJa0nPSjtKp0sPS3tL50hTTLtNK02XTgNOb07fT0tPu0wnUJtRB1FzUedSW1LHUztTq1AfV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5BsDHCIcQRxfHH4cnRy8HNoc+RwYHTUdVB1zHZAdrx3MHesdCB4nHkQeYx6AHp4eux7ZHvYeEx8xH04fax+IH6Ufwh/fH/wfGSA1IFIgbiCLIKggwyDfIPwgGSE0IVEhbCGHIaQhwCHbIfYhEiItIkkiZCJ/IpoitSLQIusiBiMgIzsjVSNwI4sjpSO+I9kj9CMNJCgkQSRaJHUkjiSoJMEk2yT0JA0lJiU/JVglcSWKJaMluyXUJe0lBCYdJjYmTSZmJn4mlSauJsUm3Cb1JgwnIyc7J1InaSeAJ5cnrifFJ9wn8icJKCAoNShMKGMoeCiPKKQouyjRKOYo+ygRKSYpPClRKWYpeymQKaUpuinPKeMp+CkMKiEqNipKKl0qciqFKpoqrSrBKtQq5yr7Kg4rISs1K0grWytuK4ArkyulK7gryyvcK+8rACwTLCQsNyxILFksbCx9LI4snyywLMEs0izjLPQsBS0WLSUtNi1HLVYtZi13LYYtly2mLbUtxi3VLeQt8y0CLhEuIC4vLj4uTC5bLmkueC6HLpQuoi6xLr4uyy7aLucu9C4CLw8vHC8pLzYvQy9QL1wvaS91L4Ivjy+aL6cvsi+/L8ov1i/hL+wv+C8DMA4wGTAkMC8wOjBEME8wWTBkMG8weDCCMI0wljCfMKowszC8MMYwzzDYMOEw6jDzMPswBDENMRUxHjElMS4xNTE+MUUxTDFVMVwxYzFrMXIxeTF/MYYxjTGUMZsxoDGnMa4xszG5McAxxTHKMdEx1jHbMeEx5jHrMfAx9TH5Mf4xAjIHMgwyEDITMhgyGzIgMiMyJzIqMi0yMTI0MjcyOjI9MkAyQjJFMkgySTJMMk8yUDJTMlQyVTJYMlkyWjJbMl0yXjJfMmAyYDJhMmEyYjJjMmIyYzJiMmMyYjJjMmIyYTJhMmAyXzJeMl0yXDJbMloyWTJWMlUyVDJRMlAyTTJMMkkyRzJEMkEyPzI8MjkyNjIzMjAyLDIpMiYyIjIfMhoyFzISMg8yCzIGMgEy/TH4MfMx7jHqMeQx3zHaMdQxzzHKMcQxvzG4MbIxrTGmMaAxmTGSMYwxhTF+MXgxcDFpMWIxWzFTMUwxRTE9MTQxLTEkMR0xFDEMMQMx+zDyMOow4TDYMM8wxjC8MLMwqTCgMJcwjTCCMHkwbjBlMFswUDBFMDswMDAmMBsw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nNiZ2JbYkdiO2IvYh9iE2IHYfth72HjYddhy2G/Ybdhq2GfYZthj2GDYX9hc2FvYWNhX2FbYU9hS2FHYT9hO2E3YTNhL2ErYSdhI2EfYR9hG2EbYRdhE2EXYRNhF2ETYRdhE2EXYRdhG2EfYR9hI2EjYSdhK2EvYTNhN2E/YUNhS2FPYVNhX2FnYWthb2F7YYNhj2GTYZ9hp2GzYbthx2HTYd9h52HzYgNiD2IbYidiN2JDYk9iY2JvYntij2KbYqtiv2LTYt9i82MDYxdjK2M7Y09jY2N3Y4tjn2OzY8dj32PzYAdkI2Q3ZEtkZ2R/ZJNkr2TDZN9k+2UPZStlR2VfZXtll2WzZc9l62YHZiNmP2ZfZntmm2a3ZtNm92cXZzNnT2dzZ5dnt2fTZ/dkG2g7aF9of2ijaMdo62kPaTNpV2l7aZ9px2nrag9qO2pfaoNqr2rTav9rI2tPa3Nrn2vLa+9oG2xHbG9sm2zHbPNtH21LbXdto23Pbf9uK25bbodus27jbxdvQ29vb6Nvz2wDcDdwY3CXcMdw+3EvcV9xk3HHcfdyK3JfcpNyx3L7czNzZ3Ofc9NwB3RDdHd0q3TndRt1V3WPdcN1/3Y7dm92q3bndx93W3eTd890C3hHeIN4v3j7eTd5c3mvee96K3preqd643sje2d7o3vfeCN8X3yffON9J31jfad9534rfmt+r37vfzN/d3+7f/98Q4CHgMuBD4FXgZuB34IngmuCr4L3gzuDh4PPgBOEX4SjhO+FM4V/hcOGD4Zbhp+G64c3h3+Hy4QTiF+Iq4j3iUOJj4nbiieKc4q/iw+LW4uri/eIR4yTjN+NM41/jcuOH45rjr+PC49fj6uP/4xTkJ+Q85FHkZOR55I7ko+S35Mzk4OT15ArlH+U05UnlXuVz5YjlnuWz5cnl3uXz5QjmH+Y05knmYOZ15ormoea25s3m4ub55g7nJec651HnaOd955TnqufB59jn7ucF6BvoMuhI6F/oduiN6KTou+jS6OnoAOkX6S7pRuld6XTpi+mj6brp0unp6QDqGeow6kfqYOp36o/qpuq/6tbq7+oH6x7rN+tO62frf+uY66/ryOvh6/jrEewq7ELsW+xz7IzspOy97Nbs7uwH7SDtOe1S7WvthO2d7bbtz+3o7QHuGu4z7kzuZu5/7pjuse7L7uTu/u4X7zHvSu9k733vl++w78vv5O/97xjwMfBM8GXwfvCZ8LLwzfDn8AHxGvE18U7xafGE8Z3xuPHR8evxBvIh8jryVfJw8onypPK+8tny9PIO8ynzQ/Ne83jzk/Ot88jz4/P+8xj0M/RN9Gj0g/Se9Ln01PTu9An1JPU/9Vr1dfWQ9av1xvXh9fz1F/Yy9k32aPaD9p72ufbU9vD2C/cm90H3XPd395P3rvfJ9+T3APgb+Df4Uvht+Ij4pPi/+Nv49vgR+S35SPlj+X/5mvm2+dH57fkI+iP6P/pa+nb6kfqt+sj65Pr/+hv7NvtS+277iful+8D72/v3+xL8L/xK/GX8gfyc/Lj80/zw/Av9J/1C/V39ef2U/bH9zP3o/QP+H/46/lb+cf6M/qn+xP7g/vv+F/8y/07/af+F/6D/vP/X//L/DQApAEQAYAB7AJcAsgDOAOkABQEgATsBVwFyAY4BqQHEAeAB+wEWAjICTQJpAoQCnwK6AtYC8QIMAycDQwNeA3kDlAOwA8sD5gMBBBwEOARTBG4EiQSkBL8E2gT1BBAFKwVGBWEFfAWXBbIFzQXnBQIGHQY4BlMGbgaIBqMGvgbZBvMGDgcpB0MHXgd4B5MHrQfIB+IH/QcXCDIITQhnCIEInAi1CNAI6ggFCR4JOQlUCW0JhwmiCbsJ1QnwCQkKJAo9ClcKcgqLCqYKvwrYCvMKDQsmCz8LWgtzC40Lpgu/C9kL8gsMDCUMPwxYDHIMiwykDL0M1gzvDAkNIg07DVQNbQ2GDZ8NuA3QDekNAg4bDjQOTQ5lDn4Olg6vDscO4A74DhAPKQ9CD1kPcg+KD6MPug/TD+oPAxAaEDIQSxBiEHsQkxCqEMEQ2hDxEAkRIBE4EU8RZxF+EZURrRHEEdsR8hEKEiESOBJPEmYSfRKUEqsSwRLYEu8SBhMcEzMTSRNgE3cTjBOjE7oTzxPmE/0TEhQoFD4UVBRqFIAUlxSsFMEU2BTtFAIVGRUuFUMVWRVuFYQVmRWuFcMV2BXtFQIWFxYsFkEWVhZrFoAWlBapFr0W0hbnFvoWDxckFzcXTBdhF3QXiBecF7AXxRfYF+sXABgTGCcYOhhOGGEYdRiIGJsYrhjCGNUY6Bj7GA4ZIRk0GUcZWRlsGX4ZkRmjGbYZyRnaGe0ZABoRGiQaNRpHGloaaxp+Go8aoBqzGsQa1RrnGvgaChsbGywbPRtOG18bcBuBG5Iboxu0G8Qb1RvlG/YbBxwWHCccOBxHHFgcZxx3HIgclxyoHLccxxzWHOUc9RwEHRQdIx0zHUIdUR1gHW8dfh2MHZsdqh25Hccd1h3lHfIdAR4QHh0eLB45HkgeVh5jHnIefx6NHpoepx61HsIe0B7dHuoe+B4FHxIfHh8rHzgfRR9RH14fax93H4Qfjx+cH6kftB/BH8wf2R/kH+8f/B8HIBMgHiApIDUgQCBMIFcgYiBtIHgggyCNIJggoiCtILggwiDNINYg4SDsIPUgACEJIRQhHSEmITEhOiFDIU0hViFgIWkhciF7IYQhjSGWIZ8hqCGwIbkhwSHKIdIh2yHiIesh8iH6IQMiCiITIhoiISIqIjEiOCJAIkciTiJVIlwiYyJqInEieCJ+IoUijCKSIpkiniKlIqwisSK4Ir0ixCLJIs4i1SLaIuAi5SLqIvAi9SL6Iv8iBCMJIw4jEyMXIxwjISMlIyojLSMyIzcjOiM/I0IjRyNKI00jUiNVI1kjXCNfI2MjZiNpI2wjbyNyI3UjeCN6I30jfyOCI4UjhiOJI4wjjSOPI5IjkyOUI5cjmSOaI5sjnSOeI58joCOiI6MjpCOlI6YjpiOnI6cjqCOpI6kjqiOpI6ojqSOpI6ojqSOqI6kjqSOoI6gjpyOnI6YjpSOkI6MjoiOhI6AjnyOdI5wjmiOYI5cjliOTI5IjjyOOI4sjiiOHI4YjgyOAI34jeyN5I3YjcyNwI20jaiNnI2QjYSNdI1ojViNTI1AjTCNJI0QjQSM9IzgjNSMwIysjKCMjIx8jGiMVIxEjDCMHIwIj/SL4IvMi7iLpIuMi3iLYItMiziLIIsEivCK2IrEiqiKkIp0imCKRIosihCJ+IncicCJpImMiXCJVIk4iRyI/IjgiMSIpIiIiGyITIgwiAyL8IfMh7CHkIdsh1CHLIcQhuyGyIaohoSGZIZAhhyF+IXYhbSFkIVohUSFIIT8hNSEsISIhGSEQIQUh+yDyIOcg3iDTIMogvyC2IKsgoCCXIIwggSB3IGwgYSBWIEsgQCA1ICogHyAUIAkg/R/yH+Yf2x/QH8Qftx+sH6EflR+IH30fcB9jH1cfTB8/HzMfJh8ZHw0fAB/0Huce2h7NHsAesx6mHpgeix5+HnEeYx5WHkgeOh4tHiAeER4EHvUd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tRbAFssW1RbgFusW9RYAFwoXFRceFykXMhc9F0gXURdcF2UXbhd4F4MXjBeVF6AXqReyF7wXxRfPF9gX4RfqF/MX/RcGGA8YFxggGCkYMhg7GEMYTBhUGF0YZhhtGHYYfxiGGI8YlhifGKYYrxi2GL8YxhjPGNYY3hjlGOwY9Bj7GAMZChkSGRkZIBknGS4ZNRk8GUMZShlQGVcZXRlkGWoZcRl3GX4ZhRmKGZEZlhmdGaQZqhmvGbQZuxnBGcYZyxnSGdcZ3BniGecZ7RnyGfcZ/BkBGgYaCxoQGhUaGhofGiMaKBotGjEaNho6Gj8aQhpHGkwaUBpTGlgaWxpgGmQaZxpqGm8achp2GnkafBqAGoMahxqKGo0akBqTGpYamRqcGp8aohqlGqcaqhqsGq8ashqzGrYauRq6Gr0avhrBGsIaxBrHGsgayxrMGs4azxrQGtIa0xrVGtYa2BrZGtoa2xrcGt0a3hrfGt8a4BrhGuIa4hrjGuQa4xrkGuUa5BrlGuQa5RrkGuUa5BrlGuQa5RrkGuQa4xriGuIa4RrhGuAa3xreGt4a3RrcGtsa2RrYGtca1hrUGtMa0hrQGs8azRrMGskayBrHGsQawxrAGr8avRq6GrcathqzGrAarxqsGqkapxqkGqEanhqcGpkalhqTGpAajRqKGocagxqAGnwaeRp1GnIabxprGmgaYxpgGlsaWBpTGlAaSxpIGkMaQBo7GjYaMxouGikaJRogGhwaFxoSGg0aCBoDGv4Z+Rn0Ge8Z6hnlGeAZ2hnVGc8ZyhnFGb4ZuRm0Ga0ZqBmhGZwZlRmQGYkZhBl9GXgZcRlqGWUZXhlXGVEZShlEGT0ZNhkvGSkZIhkbGRQZDRkGGf4Y9xjwGOkY4RjaGNMYyxjEGLwYtRisGKUYnhiVGI0YhRh+GHUYbhhlGF4YVRhMGEUYPBg0GCsYIhgaGBEYCRgAGPcX7hfmF90X1BfLF8IXuRevF6YXnReUF4sXgRd4F24XZRdcF1EXSBc/FzQXKxciFxcXDRcEF/kW7xblFtwW0RbGFr0WshanFp4WkxaIFn4WcxZpFl4WVBZJFj4WMxYoFh0WEhYHFvwV8RXmFdsVzxXEFbkVrhWiFZcVixWAFXUVaBVdFVIVRRU6FS4VIxUWFQsV/hTzFOYU2xTOFMMUthSpFJ0UkhSFFHkUbBRfFFMU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U/9a/2L/af9x/3j/f/+H/47/lv+d/6T/rP+z/7v/wv/J/9H/2P/g/+f/7v/2//3/AwAKABIAGQAhACgALwA2AD4ARQBMAFMAWwBiAGkAcAB3AH4AhgCNAJQAmwCjAKoAsQC4AL8AxgDNANQA2wDiAOoA8QD4AP8ABgENARQBGwEiASkBMAE3AT4BRQFMAVMBWgFhAWcBbgF1AXwBgwGKAZEBmAGfAaUBrAGzAboBwQHIAc4B1QHcAeMB6QHwAfYB/QEEAgsCEQIYAh8CJQIsAjICOQJAAkYCTQJTAloCYAJnAm0CdAJ6AoEChwKOApUCmgKhAqgCrgK1AroCwQLIAs0C1ALbAuAC5wLuAvMC+QIAAwcDDAMTAxgDHwMmAysDMgM3Az4DQwNKA08DVgNdA2IDaQNuA3UDegOBA4YDiwORA5gDnQOkA6kDrwO2A7sDwAPHA8wD0wPYA90D5APpA+8D9AP7AwAEBgQLBBAEFwQcBCIEJwQtBDIEOAQ9BEMESAROBFMEWAReBGMEaQRuBHMEeQR+BIQEiQSOBJMEmQSeBKMEqAStBLIEuAS9BMIExwTMBNEE1gTbBOAE5QTqBO8E9AT5BP4EAwUIBQ0FEgUXBRsFIAUlBSoFLwU0BTgFPQVBBUYFSwVPBVQFWQVeBWIFZwVrBXAFdAV5BX0FggWHBYoFjwWUBZgFnQWgBaUFqgWtBbIFtgW7Bb4FwwXIBcwFzwXUBdcF3AXhBeQF6AXtBfAF9QX4Bf0FAAYFBggGDQYQBhMGFwYcBh8GJAYnBioGLgYzBjYGOQY+BkEGRAZJBkwGTwZUBlcGWgZeBmEGZQZoBmwGbwZzBnYGegZ9BoAGgwaHBooGjgaRBpQGlwaaBp4GoQakBqcGqgatBrAGswa2BrkGvAa/BsIGxQbIBssGzgbRBtQG1wbaBtwG3wbiBuUG6AbqBu0G7wbyBvUG+Ab6Bv0G/wYCBwQHBwcJBwwHDwcQBxMHFgcYBxsHHAcfByIHIwcmBykHKgctBy4HMQc0BzUHOAc5BzwHPQdAB0EHQwdGB0cHSgdLB04HTwdSB1MHVQdYB1kHWgdcB18HYAdhB2MHZgdnB2gHagdrB24HbwdxB3IHcwd1B3YHeAd5B3sHfAd+B38HgQeCB4MHhQeGB4cHiAeKB4sHjAeNB44HjweRB5IHkweUB5UHlgeXB5gHmQeaB5sHnAedB54HngefB6AHoQeiB6MHowekB6UHpgemB6cHpweoB6kHqQeqB6oHqwerB6wHrAetB60HrgevB64HrwewB68HsAexB7AHsQeyB7EHsQeyB7MHsgezB7IHsweyB7MHtAezB7QHswe0B7QHswe0B7MHsgezB7IHsweyB7MHsgeyB7EHsgexB7AHsAexB7AHrwewB68HrweuB64HrQesB6wHrAerB6sHqgeqB6kHqAeoB6cHpgemB6UHpQekB6MHoweiB6EHoAefB54HngedB5wHmweaB5kHmAeXB5YHlQeUB5MHkgeRB5AHjweOB40HjAeLB4kHiAeHB4YHhQeEB4IHgQd/B34HfQd8B3oHeQd4B3YHdQdzB3IHcAdvB24HbAdrB2kHaAdmB2UHYgdhB18HXgddB1oHWQdYB1YHUwdSB1EHTgdMB0sHSgdHB0YHRAdBB0AHPwc8BzsHOAc2BzUHMgcxBy4HLAcrBygHJwckByIHIQceBxsHGgcXBxYHFAcRBw4HDQcLBwgHBQcEBwIH/wb8BvsG+Ab1BvQG8QbvBuwG6QboBuUG4gbgBt0G2wbYBtYG0wbRBs4GzAbJBscGxAbBBr8GvAa6BrcGtAayBq8GrAapBqYGpAahBp4GmwaZBpYGkwaQBo0GiwaIBoUGggZ/BnwGeQZ2BnMGcAZtBmoGZwZkBmEGXgZbBlgGVQZSBk8GTAZJBkYGQwZABj0GOgY2BjMGMAYtBioGJgYjBiAGHQYZBhYGEwYQBg0GCQYGBgMG/wX8BfgF9QXyBe8F6wXoBeQF4QXeBdoF1wXTBdAFzAXJBcUFwgW+BbsFtwW0BbAFrQWpBaYFowWeBZsFmAWUBZEFjAWJBYUFggV/BXoFdwV0BW8FbAVpBWQFYQVeBVoFVQVSBU8FSgVGBUMFQAU7BTcFNAUxBSwFKQUkBSEFHgUZBRUFEgUNBQoFBwUCBf8E+wT2BPME7wTqBOcE5ATfBNwE1wTUBM8EzATHBMQEvwS7BLgEswSwBKsEqASjBKAEmwSYBJMEkASLBIcEhAR/BHwEdwR0BG8EbARnBGIEXwRbBFYEUwROBEsERgRDBD4EOQQ2BDEELgQqBCUEIgQdBBgEFQQQBA0ECQQEBP8D/AP3A/QD7wPqA+cD4gPfA9oD1QPSA80DygPFA8ADvQO4A7UDsAOrA6cDpAOfA5oDlgOTA44DiQOFA4IDfQN4A3QDcQNsA2cDYwNgA1sDVgNTA08DSgNFA0IDPQM4AzQDMQMsAycDJAMfAxoDFwMTAw4DCQMGAwED/AL5AvUC8ALrAugC4wLeAtoC1wLSAs0CygLFAsACvQK4ArMCrwKsAqcCogKfApoClQKSAo4CiQKEAoECfAJ3AnQCcAJrAmYCYwJeAloCVQJSAk0CSAJFAkECPAI3AjQCLwIrAiYCIwIeAhoCFQISAg0CCQIEAgEC/AH3AfQB7wHsAecB4gHfAdsB1gHRAc4ByQHGAcEBvAG5AbQBsQGsAacBpAGfAZwBlwGSAY8BiwGGAYMBfgF5AXYBcQFuAWkBZgFhAVwBWQFUAVEBTAFJAUUBQAE7ATgBMwEwASsBKAEjASABHAEXARQBDwEKAQcBAgH/APoA9wDyAO8A6gDnAOIA3wDbANYA0wDOAMsAxgDDAL4AuwC2ALMArgCrAKgAowCgAJsAmACTAJAAiwCIAIMAgAB9AHgAdQBwAG0AaABlAGIAXQBZAFYAUQBOAEsARgBDAD4AOwA4ADMAMAAsACkAJAAhAB0AGgAVABIADwAKAAcABAAAAP3/+v/1//L/7//q/+f/5P/f/9z/2P/V/9L/zf/K/8b/w/+//7z/uP+1/7H/rv+q/6f/o/+g/5z/mf+V/5L/jv+L/4j/hP+B/33/ev93/3P/cP9s/2n/Zv9j/1//XP9Y/1X/Uv9P/0v/SP9F/0L/Pv87/zj/Nf8x/y7/K/8o/yT/If8e/xv/GP8U/xH/Dv8L/wj/Bf8C///+/P74/vX+8v7v/uz+6f7m/uP+4P7d/tr+1/7U/tH+zv7L/sj+xv7D/sD+vf66/rf+tP6x/q/+rP6p/qb+o/6g/p7+m/6Y/pX+k/6Q/o3+iv6H/oX+gv5//n3+ev54/nX+cv5v/m3+av5o/mX+Yv5g/l3+W/5Y/lb+U/5R/k7+TP5J/kf+RP5C/j/+PP46/jf+Nv4z/jD+Lv4r/ir+J/4k/iP+IP4d/hz+Gf4W/hX+E/4Q/g3+DP4K/gf+BP4D/gD+/v39/fr99/32/fT98f3w/e397P3p/eb95f3i/eD93/3c/dv92f3W/dX90v3R/c79zf3M/cn9yP3F/cT9wf3A/b39vP27/bj9t/20/bP9sv2v/a79q/2q/an9pv2l/aT9of2g/Z/9nP2b/Zr9l/2W/ZX9kv2R/Y/9jv2M/Yv9if2I/Yb9hf2D/YL9gP1//X39fP17/Xn9eP12/XX9dP1y/XH9b/1u/W39bP1q/Wn9aP1n/WX9ZP1i/WH9YP1f/V79Xf1b/Vr9Wf1Y/Vf9Vv1U/VP9Uv1R/VD9T/1O/U39TP1L/Ur9Sf1I/Uf9Rv1F/UT9Q/1C/UH9QP0//T79Pf09/Tz9O/06/Tn9OP04/Tf9Nv01/TT9M/0z/TL9Mf0w/TD9L/0v/S79Lf0t/Sz9K/0q/Sr9Kf0p/Sj9J/0n/Sb9Jv0l/SX9JP0k/SP9I/0i/SL9If0g/SH9IP0f/R/9Hv0e/R39Hv0d/Rz9Hf0c/Rv9HP0b/Rr9G/0a/Rn9Gf0a/Rn9GP0Y/Rn9GP0X/Rj9GP0X/Rj9F/0W/Rf9Fv0X/Rb9F/0W/Rf9Fv0V/Rb9Ff0W/RX9Fv0W/RX9Fv0V/Rb9Ff0W/Rb9Ff0W/Rf9Fv0X/Rb9F/0W/Rf9Fv0X/Rj9F/0Y/Rf9GP0Z/Rn9GP0Y/Rn9Gv0Z/Rr9Gv0b/Rr9G/0c/Rv9HP0d/Rz9Hf0e/R39Hv0f/R79H/0f/SD9If0g/SH9If0i/SP9I/0k/ST9Jf0l/Sb9Jv0n/Sf9KP0o/Sn9Kf0q/Sr9K/0s/Sz9Lf0t/S79L/0v/TD9Mf0x/TL9Mv0z/TT9Nf01/Tb9N/04/Tj9Of06/Tv9O/08/T39Pv0+/T/9QP1B/UH9Qv1D/UT9Rf1G/Uf9R/1I/Un9Sv1L/Uz9Tf1O/U79T/1Q/VH9Uv1T/VT9Vf1W/Vf9WP1Z/Vr9W/1c/V39Xv1f/WD9Yf1i/WP9ZP1l/Wb9Z/1o/Wn9a/1s/W39bv1v/XD9cf1y/XP9dP12/Xf9eP15/Xr9e/19/X79f/2A/YH9g/2E/YX9hv2I/Yn9iv2L/Yz9jf2P/ZD9kf2S/ZT9lf2X/Zj9mf2a/Zz9nf2e/Z/9of2i/aP9pf2m/aj9qf2q/av9rf2u/bD9sf2y/bP9tf22/bj9uf26/bz9vf2//cD9wf3D/cT9xv3H/cj9yv3L/c39zv3Q/dH90/3U/db91/3Y/dr92/3d/d794P3h/eP95P3m/ef96f3q/ez97f3v/fD98v3z/fT99/34/fn9+/38/f79//0B/gL+BP4F/gf+CP4K/gv+Dv4P/hD+Ev4T/hX+Fv4Z/hr+HP4d/h7+IP4h/iT+Jf4n/ij+Kf4s/i3+L/4w/jH+M/40/jf+OP46/jv+PP4//kD+Qf5E/kX+R/5I/kn+TP5N/k/+UP5R/lT+Vf5W/ln+Wv5c/l3+Xv5h/mL+Y/5l/mb+af5q/mv+bv5v/nD+cv5z/nb+d/54/nv+fP59/oD+gf6D/oT+hf6I/on+iv6N/o7+kP6R/pL+lf6W/pf+mv6b/p3+nv6f/qL+o/6l/qb+p/6q/qv+rP6v/rD+sv6z/rT+t/64/rn+u/68/r/+wP7C/sP+xP7H/sj+yf7L/sz+z/7Q/tL+0/7U/tb+1/7a/tv+3f7e/t/+4f7i/uX+5v7o/un+6/7s/u3+8P7x/vP+9P71/vf++f76/vz+/f7//gD/Av8D/wX/Bv8H/wr/C/8M/w7/D/8R/xL/FP8V/xf/GP8a/xv/Hf8e/yD/If8j/yT/Jf8n/yj/Kv8r/y3/Lv8w/zH/Mv80/zX/N/84/zr/O/88/z7/P/9B/0L/Q/9F/0b/SP9J/0r/TP9N/0//UP9R/1L/VP9V/1f/WP9Z/1r/XP9d/17/YP9h/2P/ZP9l/2b/Z/9p/2r/bP9t/27/b/9x/3L/c/90/3b/d/94/3n/e/98/33/fv9//4H/gv+D/4T/hf+G/4j/if+K/4v/jP+N/4//kP+R/5L/k/+U/5X/lv+X/5n/mv+b/5z/nf+e/5//oP+h/6L/o/+k/6X/pv+o/6n/qv+r/6z/rf+u/6//sP+x/7L/s/+z/7T/tf+2/7f/uP+5/7r/u/+8/73/vv+//8D/wP/B/8L/w//E/8X/xv/G/8f/yP/J/8r/y//M/8z/zf/O/8//z//Q/9H/0v/S/9P/1P/V/9X/1v/X/9j/2P/Z/9r/2//b/9z/3P/d/97/3//f/+D/4P/h/+L/4//j/+T/5P/l/+X/5v/n/+f/6P/o/+n/6v/q/+v/6//s/+z/7f/t/+7/7v/v/+//8P/w//H/8f/y//L/8//y//P/9P/0//X/9P/1//X/9v/3//b/9//4//f/+P/5//j/+f/6//n/+v/7//v/+v/7//z//P/7//z//f/8//z//f/+//3//v/9//7////+//7////+////AAD//wAA//8AAP//AAD//wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABfUE1YBBUAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+Cjx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6eG1wRE09Imh0dHA6Ly9ucy5hZG9iZS5jb20veG1wLzEuMC9EeW5hbWljTWVkaWEvIj4KICAgICAgICAgPHhtcERNOlRyYWNrcz4KICAgICAgICAgICAgPHJkZjpCYWc+CiAgICAgICAgICAgICAgIDxyZGY6bGkgcmRmOnBhcnNlVHlwZT0iUmVzb3VyY2UiPgogICAgICAgICAgICAgICAgICA8eG1wRE06dHJhY2tOYW1lPkN1ZVBvaW50IE1hcmtlcnM8L3htcERNOnRyYWNrTmFtZT4KICAgICAgICAgICAgICAgICAgPHhtcERNOnRyYWNrVHlwZT5DdWU8L3htcERNOnRyYWNrVHlwZT4KICAgICAgICAgICAgICAgICAgPHhtcERNOmZyYW1lUmF0ZT5mNDQxMDA8L3htcERNOmZyYW1lUmF0ZT4KICAgICAgICAgICAgICAgPC9yZGY6bGk+CiAgICAgICAgICAgICAgIDxyZGY6bGkgcmRmOnBhcnNlVHlwZT0iUmVzb3VyY2UiPgogICAgICAgICAgICAgICAgICA8eG1wRE06dHJhY2tOYW1lPlN1YmNsaXAgTWFya2VyczwveG1wRE06dHJhY2tOYW1lPgogICAgICAgICAgICAgICAgICA8eG1wRE06dHJhY2tUeXBlPkluT3V0PC94bXBETTp0cmFja1R5cGU+CiAgICAgICAgICAgICAgICAgIDx4bXBETTpmcmFtZVJhdGU+ZjQ0MTAwPC94bXBETTpmcmFtZVJhdGU+CiAgICAgICAgICAgICAgIDwvcmRmOmxpPgogICAgICAgICAgICA8L3JkZjpCYWc+CiAgICAgICAgIDwveG1wRE06VHJhY2tzPgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIj4KICAgICAgICAgPHhtcDpNZXRhZGF0YURhdGU+MjAxMy0wNC0yOFQxMTowNToxMiswMjowMDwveG1wOk1ldGFkYXRhRGF0ZT4KICAgICAgICAgPHhtcDpNb2RpZnlEYXRlPjIwMTMtMDQtMjhUMTE6MDU6MTIrMDI6MDA8L3htcDpNb2RpZnlEYXRlPgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iCiAgICAgICAgICAgIHhtbG5zOnN0RXZ0PSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VFdmVudCMiCiAgICAgICAgICAgIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIj4KICAgICAgICAgPHhtcE1NOkluc3RhbmNlSUQ+eG1wLmlpZDowNjA0RDA3NDA3MjA2ODExODIyQUU1MkVDOTMxODY1MjwveG1wTU06SW5zdGFuY2VJRD4KICAgICAgICAgPHhtcE1NOkRvY3VtZW50SUQ+eG1wLmRpZDowNjA0RDA3NDA3MjA2ODExODIyQUU1MkVDOTMxODY1MjwveG1wTU06RG9jdW1lbnRJRD4KICAgICAgICAgPHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD54bXAuZGlkOjA1MDREMDc0MDcyMDY4MTE4MjJBRTUyRUM5MzE4NjUyPC94bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ+CiAgICAgICAgIDx4bXBNTTpIaXN0b3J5PgogICAgICAgICAgICA8cmRmOlNlcT4KICAgICAgICAgICAgICAgPHJkZjpsaSByZGY6cGFyc2VUeXBlPSJSZXNvdXJjZSI+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDphY3Rpb24+c2F2ZWQ8L3N0RXZ0OmFjdGlvbj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0Omluc3RhbmNlSUQ+eG1wLmlpZDowNTA0RDA3NDA3MjA2ODExODIyQUU1MkVDOTMxODY1Mjwvc3RFdnQ6aW5zdGFuY2VJRD4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OndoZW4+MjAxMy0wNC0yOFQxMTowNToxMiswMjowMDwvc3RFdnQ6d2hlbj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OnNvZnR3YXJlQWdlbnQ+QWRvYmUgQXVkaXRpb24gQ1M2IChNYWNpbnRvc2gpPC9zdEV2dDpzb2Z0d2FyZUFnZW50PgogICAgICAgICAgICAgICAgICA8c3RFdnQ6Y2hhbmdlZD4vbWV0YWRhdGE8L3N0RXZ0OmNoYW5nZWQ+CiAgICAgICAgICAgICAgIDwvcmRmOmxpPgogICAgICAgICAgICAgICA8cmRmOmxpIHJkZjpwYXJzZVR5cGU9IlJlc291cmNlIj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OmFjdGlvbj5zYXZlZDwvc3RFdnQ6YWN0aW9uPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6aW5zdGFuY2VJRD54bXAuaWlkOjA2MDREMDc0MDcyMDY4MTE4MjJBRTUyRUM5MzE4NjUyPC9zdEV2dDppbnN0YW5jZUlEPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6d2hlbj4yMDEzLTA0LTI4VDExOjA1OjEyKzAyOjAwPC9zdEV2dDp3aGVuPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6c29mdHdhcmVBZ2VudD5BZG9iZSBBdWRpdGlvbiBDUzYgKE1hY2ludG9zaCk8L3N0RXZ0OnNvZnR3YXJlQWdlbnQ+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDpjaGFuZ2VkPi88L3N0RXZ0OmNoYW5nZWQ+CiAgICAgICAgICAgICAgIDwvcmRmOmxpPgogICAgICAgICAgICA8L3JkZjpTZXE+CiAgICAgICAgIDwveG1wTU06SGlzdG9yeT4KICAgICAgICAgPHhtcE1NOkRlcml2ZWRGcm9tIHJkZjpwYXJzZVR5cGU9IlJlc291cmNlIj4KICAgICAgICAgICAgPHN0UmVmOmluc3RhbmNlSUQ+eG1wLmlpZDowNTA0RDA3NDA3MjA2ODExODIyQUU1MkVDOTMxODY1Mjwvc3RSZWY6aW5zdGFuY2VJRD4KICAgICAgICAgICAgPHN0UmVmOmRvY3VtZW50SUQ+eG1wLmRpZDowNTA0RDA3NDA3MjA2ODExODIyQUU1MkVDOTMxODY1Mjwvc3RSZWY6ZG9jdW1lbnRJRD4KICAgICAgICAgICAgPHN0UmVmOm9yaWdpbmFsRG9jdW1lbnRJRD54bXAuZGlkOjA1MDREMDc0MDcyMDY4MTE4MjJBRTUyRUM5MzE4NjUyPC9zdFJlZjpvcmlnaW5hbERvY3VtZW50SUQ+CiAgICAgICAgIDwveG1wTU06RGVyaXZlZEZyb20+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iPgogICAgICAgICA8ZGM6Zm9ybWF0PmF1ZGlvL3gtd2F2PC9kYzpmb3JtYXQ+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgCjw/eHBhY2tldCBlbmQ9InciPz4=">
 </body>
 </html>

From 22a4205bdd63d60c7d7290693aaccfe47e84ebb3 Mon Sep 17 00:00:00 2001
From: Spencer Ahrens <sahrens@fb.com>
Date: Tue, 28 Mar 2017 19:59:20 -0700
Subject: [PATCH 222/366] onEndReached should clear when data changes

Summary: it's possible to update data and not have the content length change, which could prevent onEndReached from ever firing again, so fix that.

Reviewed By: bvaughn, yungsters

Differential Revision: D4783818

fbshipit-source-id: ec4640f4b8cf820165b045eaafee6fb41c0b0499
---
 Libraries/Lists/FlatList.js        |  4 ++--
 Libraries/Lists/SectionList.js     |  6 ++++++
 Libraries/Lists/VirtualizedList.js | 20 +++++++++++++-------
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/Libraries/Lists/FlatList.js b/Libraries/Lists/FlatList.js
index 15cbcc437409cb..f2a7fc52404473 100644
--- a/Libraries/Lists/FlatList.js
+++ b/Libraries/Lists/FlatList.js
@@ -63,8 +63,8 @@ type OptionalProps<ItemT> = {
   columnWrapperStyle?: StyleObj,
   /**
    * A marker property for telling the list to re-render (since it implements `PureComponent`). If
-   * your `renderItem` function depends on anything outside of the `data` prop, stick it here and
-   * treat it immutably.
+   * any of your `renderItem`, Header, Footer, etc. functions depend on anything outside of the
+   * `data` prop, stick it here and treat it immutably.
    */
   extraData?: any,
   /**
diff --git a/Libraries/Lists/SectionList.js b/Libraries/Lists/SectionList.js
index cb875b3dd2d3e1..f40c978d53ec30 100644
--- a/Libraries/Lists/SectionList.js
+++ b/Libraries/Lists/SectionList.js
@@ -60,6 +60,12 @@ type OptionalProps<SectionT: SectionBase<any>> = {
    * Rendered in between each section.
    */
   SectionSeparatorComponent?: ?ReactClass<any>,
+  /**
+   * A marker property for telling the list to re-render (since it implements `PureComponent`). If
+   * any of your `renderItem`, Header, Footer, etc. functions depend on anything outside of the
+   * `data` prop, stick it here and treat it immutably.
+   */
+  extraData?: any,
   /**
    * How many items to render in the initial batch. This should be enough to fill the screen but not
    * much more. Note these items will never be unmounted as part of the windowed rendering in order
diff --git a/Libraries/Lists/VirtualizedList.js b/Libraries/Lists/VirtualizedList.js
index 509971609debac..4e039729d6c182 100644
--- a/Libraries/Lists/VirtualizedList.js
+++ b/Libraries/Lists/VirtualizedList.js
@@ -51,8 +51,8 @@ type OptionalProps = {
   disableVirtualization: boolean,
   /**
    * A marker property for telling the list to re-render (since it implements `PureComponent`). If
-   * your `renderItem` function depends on anything outside of the `data` prop, stick it here and
-   * treat it immutably.
+   * any of your `renderItem`, Header, Footer, etc. functions depend on anything outside of the
+   * `data` prop, stick it here and treat it immutably.
    */
   extraData?: any,
   /**
@@ -307,13 +307,16 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
   }
 
   componentWillReceiveProps(newProps: Props) {
-    const {data, getItemCount, maxToRenderPerBatch} = newProps;
+    const {data, extraData, getItemCount, maxToRenderPerBatch} = newProps;
     // first and last could be stale (e.g. if a new, shorter items props is passed in), so we make
     // sure we're rendering a reasonable range here.
     this.setState({
       first: Math.max(0, Math.min(this.state.first, getItemCount(data) - 1 - maxToRenderPerBatch)),
       last: Math.max(0, Math.min(this.state.last, getItemCount(data) - 1)),
     });
+    if (data !== this.props.data || extraData !== this.props.extraData) {
+      this._hasDataChangedSinceEndReached = true;
+    }
     this._updateCellsToRenderBatcher.schedule();
   }
 
@@ -462,6 +465,7 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
   }
 
   _averageCellLength = 0;
+  _hasDataChangedSinceEndReached = true;
   _hasWarned = {};
   _highestMeasuredFrameIndex = 0;
   _headerLength = 0;
@@ -619,10 +623,12 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
     }
     const distanceFromEnd = contentLength - visibleLength - offset;
     const itemCount = getItemCount(data);
-    if (distanceFromEnd < onEndReachedThreshold * visibleLength &&
-        this._scrollMetrics.contentLength !== this._sentEndForContentLength &&
-        this.state.last === itemCount - 1) {
-      // Only call onEndReached for a given content length once.
+    if (this.state.last === itemCount - 1 &&
+        distanceFromEnd < onEndReachedThreshold * visibleLength &&
+        (this._hasDataChangedSinceEndReached ||
+         this._scrollMetrics.contentLength !== this._sentEndForContentLength)) {
+      // Only call onEndReached once for a given dataset + content length.
+      this._hasDataChangedSinceEndReached = false;
       this._sentEndForContentLength = this._scrollMetrics.contentLength;
       onEndReached({distanceFromEnd});
     }

From a85a86bd8d69a6464651e0054b15bb754031758a Mon Sep 17 00:00:00 2001
From: Janic Duplessis <janicduplessis@gmail.com>
Date: Wed, 29 Mar 2017 02:20:08 -0700
Subject: [PATCH 223/366] Fix tvOS build

Summary:
Not sure if this is the proper fix but changing PRODUCT_NAME to RCTAnimation did the trick. Also using `#import "RCTValueAnimatedNode.h"` instead of `#import <RCTAnimation/RCTValueAnimatedNode.h>` in `RCTNativeAnimatedNodesManager.h` can work too.
Closes https://github.com/facebook/react-native/pull/13190

Differential Revision: D4794401

Pulled By: javache

fbshipit-source-id: c33232a676131644afa80e34ca7a1516a2c89f7e
---
 .../RCTAnimation.xcodeproj/project.pbxproj             | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Libraries/NativeAnimation/RCTAnimation.xcodeproj/project.pbxproj b/Libraries/NativeAnimation/RCTAnimation.xcodeproj/project.pbxproj
index ec4fe97d2ac490..3aff42447c1460 100644
--- a/Libraries/NativeAnimation/RCTAnimation.xcodeproj/project.pbxproj
+++ b/Libraries/NativeAnimation/RCTAnimation.xcodeproj/project.pbxproj
@@ -198,7 +198,7 @@
 		193F64F31D776EC6004D1CAA /* RCTDiffClampAnimatedNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTDiffClampAnimatedNode.m; sourceTree = "<group>"; };
 		19F00F201DC8847500113FEE /* RCTEventAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTEventAnimation.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		19F00F211DC8847500113FEE /* RCTEventAnimation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTEventAnimation.m; sourceTree = "<group>"; };
-		2D2A28201D9B03D100D4039D /* libRCTAnimation-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libRCTAnimation-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		2D2A28201D9B03D100D4039D /* libRCTAnimation.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTAnimation.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		5C9894931D999639008027DB /* RCTDivisionAnimatedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTDivisionAnimatedNode.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		5C9894941D999639008027DB /* RCTDivisionAnimatedNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTDivisionAnimatedNode.m; sourceTree = "<group>"; };
 		94C1294A1D4069170025F25C /* RCTAnimationDriver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTAnimationDriver.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
@@ -262,7 +262,7 @@
 				94C129491D4069170025F25C /* Drivers */,
 				13E501D51D07A6C9005F35D8 /* Nodes */,
 				134814211AA4EA7D00B7C361 /* Products */,
-				2D2A28201D9B03D100D4039D /* libRCTAnimation-tvOS.a */,
+				2D2A28201D9B03D100D4039D /* libRCTAnimation.a */,
 			);
 			sourceTree = "<group>";
 		};
@@ -350,7 +350,7 @@
 			);
 			name = "RCTAnimation-tvOS";
 			productName = "RCTAnimation-tvOS";
-			productReference = 2D2A28201D9B03D100D4039D /* libRCTAnimation-tvOS.a */;
+			productReference = 2D2A28201D9B03D100D4039D /* libRCTAnimation.a */;
 			productType = "com.apple.product-type.library.static";
 		};
 		58B511DA1A9E6C8500147676 /* RCTAnimation */ = {
@@ -467,7 +467,7 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				GCC_NO_COMMON_BLOCKS = YES;
 				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_NAME = RCTAnimation;
 				SDKROOT = appletvos;
 			};
 			name = Debug;
@@ -482,7 +482,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_NO_COMMON_BLOCKS = YES;
 				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_NAME = RCTAnimation;
 				SDKROOT = appletvos;
 			};
 			name = Release;

From f804af27c237e30eb22d496783046f23e7156477 Mon Sep 17 00:00:00 2001
From: Kathy Gray <kathryngray@fb.com>
Date: Wed, 29 Mar 2017 02:32:35 -0700
Subject: [PATCH 224/366] Make bridge load module lazy

Reviewed By: javache

Differential Revision: D4762575

fbshipit-source-id: fc3be786640b8c42664d7b357ab0fe197006b28b
---
 .../facebook/react/bridge/BaseJavaModule.java | 51 ++++++++++++++-----
 .../src/main/jni/xreact/jni/MethodInvoker.cpp |  8 +--
 .../src/main/jni/xreact/jni/MethodInvoker.h   |  2 +-
 3 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseJavaModule.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseJavaModule.java
index f911938b400975..41a0d65eeb8d07 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseJavaModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseJavaModule.java
@@ -168,31 +168,45 @@ public Promise extractArgument(
 
   public class JavaMethod implements NativeMethod {
 
-    private Method mMethod;
-    private final ArgumentExtractor[] mArgumentExtractors;
-    private final String mSignature;
-    private final Object[] mArguments;
+    private final Method mMethod;
+    private final Class[] mParameterTypes;
+    private final int mParamLength;
+    private boolean mArgumentsProcessed = false;
+    private @Nullable ArgumentExtractor[] mArgumentExtractors;
+    private @Nullable String mSignature;
+    private @Nullable Object[] mArguments;
     private String mType = METHOD_TYPE_ASYNC;
-    private final int mJSArgumentsNeeded;
-    private final String mTraceName;
+    private @Nullable int mJSArgumentsNeeded;
+    private String mTraceName;
 
     public JavaMethod(Method method, boolean isSync) {
       mMethod = method;
       mMethod.setAccessible(true);
+      Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "callGetParameterTypes");
+      mParameterTypes = mMethod.getParameterTypes();
+      Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
+      mParamLength = mParameterTypes.length;
 
       if (isSync) {
         mType = METHOD_TYPE_SYNC;
+      } else if (mParamLength > 0 && (mParameterTypes[mParamLength - 1] == Promise.class)) {
+        mType = METHOD_TYPE_PROMISE;
       }
+      mTraceName = BaseJavaModule.this.getName() + "." + mMethod.getName();
 
-      // TODO: create these lazily
-      Class[] parameterTypes = method.getParameterTypes();
-      mArgumentExtractors = buildArgumentExtractors(parameterTypes);
-      mSignature = buildSignature(mMethod, parameterTypes, isSync);
+    }
+
+    private void processArguments() {
+      if (mArgumentsProcessed) {
+        return;
+      }
+      mArgumentsProcessed = true;
+      mArgumentExtractors = buildArgumentExtractors(mParameterTypes);
+      mSignature = buildSignature(mMethod, mParameterTypes, (mType.equals(METHOD_TYPE_SYNC)));
       // Since native methods are invoked from a message queue executed on a single thread, it is
-      // save to allocate only one arguments object per method that can be reused across calls
-      mArguments = new Object[parameterTypes.length];
+      // safe to allocate only one arguments object per method that can be reused across calls
+      mArguments = new Object[mParameterTypes.length];
       mJSArgumentsNeeded = calculateJSArgumentsNeeded();
-      mTraceName = BaseJavaModule.this.getName() + "." + mMethod.getName();
     }
 
     public Method getMethod() {
@@ -200,7 +214,10 @@ public Method getMethod() {
     }
 
     public String getSignature() {
-      return mSignature;
+      if (!mArgumentsProcessed) {
+        processArguments();
+      }
+      return assertNotNull(mSignature);
     }
 
     private String buildSignature(Method method, Class[] paramTypes, boolean isSync) {
@@ -312,6 +329,12 @@ public void invoke(JSInstance jsInstance, ExecutorToken executorToken, ReadableN
           .arg("method", mTraceName)
           .flush();
       try {
+        if (!mArgumentsProcessed) {
+          processArguments();
+        }
+        if (mArguments == null || mArgumentExtractors == null) {
+          throw new Error("processArguments failed");
+        }
         if (mJSArgumentsNeeded != parameters.size()) {
           throw new NativeArgumentsParseException(
               BaseJavaModule.this.getName() + "." + mMethod.getName() + " got " +
diff --git a/ReactAndroid/src/main/jni/xreact/jni/MethodInvoker.cpp b/ReactAndroid/src/main/jni/xreact/jni/MethodInvoker.cpp
index e93567899b6af9..e5790acea01d7a 100644
--- a/ReactAndroid/src/main/jni/xreact/jni/MethodInvoker.cpp
+++ b/ReactAndroid/src/main/jni/xreact/jni/MethodInvoker.cpp
@@ -155,12 +155,12 @@ std::size_t countJsArgs(const std::string& signature) {
 
 MethodInvoker::MethodInvoker(jni::alias_ref<JReflectMethod::javaobject> method, std::string signature, std::string traceName, bool isSync)
  : method_(method->getMethodID()),
- jsArgCount_(countJsArgs(signature) - 2),
- signature_(std::move(signature)),
+ signature_(signature),
+ jsArgCount_(countJsArgs(signature) -2),
  traceName_(std::move(traceName)),
  isSync_(isSync) {
-   CHECK(signature_.at(1) == '.') << "Improper module method signature";
-   CHECK(isSync || signature_.at(0) == 'v') << "Non-sync hooks cannot have a non-void return type";
+     CHECK(signature_.at(1) == '.') << "Improper module method signature";
+     CHECK(isSync_ || signature_.at(0) == 'v') << "Non-sync hooks cannot have a non-void return type";
  }
 
 MethodCallResult MethodInvoker::invoke(std::weak_ptr<Instance>& instance, jni::alias_ref<JBaseJavaModule::javaobject> module, ExecutorToken token, const folly::dynamic& params) {
diff --git a/ReactAndroid/src/main/jni/xreact/jni/MethodInvoker.h b/ReactAndroid/src/main/jni/xreact/jni/MethodInvoker.h
index 170273e28ebdcd..75dc91ebd58e3c 100644
--- a/ReactAndroid/src/main/jni/xreact/jni/MethodInvoker.h
+++ b/ReactAndroid/src/main/jni/xreact/jni/MethodInvoker.h
@@ -38,8 +38,8 @@ class MethodInvoker {
   }
 private:
   jmethodID method_;
-  std::size_t jsArgCount_;
   std::string signature_;
+  std::size_t jsArgCount_;
   std::string traceName_;
   bool isSync_;
 };

From 50a6c4933e284b13bf2453c51a5084e4a27415ea Mon Sep 17 00:00:00 2001
From: Emil Sjolander <emilsj@fb.com>
Date: Wed, 29 Mar 2017 03:06:17 -0700
Subject: [PATCH 225/366] Expose UseWebDefaults to java

Reviewed By: astreet

Differential Revision: D4779743

fbshipit-source-id: 65a4184af6fb959fefff5c2014522c551ca440d5
---
 .../src/main/java/com/facebook/yoga/YogaConfig.java         | 5 +++++
 ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaConfig.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaConfig.java
index 716a212e76d515..80dfa4313186bd 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaConfig.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaConfig.java
@@ -46,4 +46,9 @@ private native void jni_YGConfigSetExperimentalFeatureEnabled(
   public void setExperimentalFeatureEnabled(YogaExperimentalFeature feature, boolean enabled) {
     jni_YGConfigSetExperimentalFeatureEnabled(mNativePointer, feature.intValue(), enabled);
   }
+
+  private native void jni_YGConfigSetUseWebDefaults(long nativePointer, boolean useWebDefaults);
+  public void setUseWebDefaults(boolean useWebDefaults) {
+    jni_YGConfigSetUseWebDefaults(mNativePointer, useWebDefaults);
+  }
 }
diff --git a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
index 72e704c8c82e81..5e3c0b56cc0db7 100644
--- a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
+++ b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
@@ -381,6 +381,11 @@ void jni_YGConfigSetExperimentalFeatureEnabled(alias_ref<jobject>, jlong nativeP
   YGConfigSetExperimentalFeatureEnabled(config, static_cast<YGExperimentalFeature>(feature), enabled);
 }
 
+void jni_YGConfigSetUseWebDefaults(alias_ref<jobject>, jlong nativePointer, jboolean useWebDefaults) {
+  const YGConfigRef config = _jlong2YGConfigRef(nativePointer);
+  YGConfigSetUseWebDefaults(config, useWebDefaults);
+}
+
 jint jni_YGNodeGetInstanceCount(alias_ref<jclass> clazz) {
   return YGNodeGetInstanceCount();
 }
@@ -476,6 +481,7 @@ jint JNI_OnLoad(JavaVM *vm, void *) {
                         YGMakeNativeMethod(jni_YGConfigNew),
                         YGMakeNativeMethod(jni_YGConfigFree),
                         YGMakeNativeMethod(jni_YGConfigSetExperimentalFeatureEnabled),
+                        YGMakeNativeMethod(jni_YGConfigSetUseWebDefaults),
                     });
   });
 }

From 673093eed075f8292101b7244fd9fe641a0d0ad9 Mon Sep 17 00:00:00 2001
From: Emil Sjolander <emilsj@fb.com>
Date: Wed, 29 Mar 2017 03:06:19 -0700
Subject: [PATCH 226/366] Set web defaults when resetting

Reviewed By: astreet

Differential Revision: D4779742

fbshipit-source-id: 5b8c5d7bd432a12984e4ebfd3187da3d680272cd
---
 ReactCommon/yoga/yoga/Yoga.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ReactCommon/yoga/yoga/Yoga.c b/ReactCommon/yoga/yoga/Yoga.c
index 75e2348ccf46a6..52999d2b5140fc 100644
--- a/ReactCommon/yoga/yoga/Yoga.c
+++ b/ReactCommon/yoga/yoga/Yoga.c
@@ -362,6 +362,10 @@ void YGNodeReset(const YGNodeRef node) {
 
   const YGConfigRef config = node->config;
   memcpy(node, &gYGNodeDefaults, sizeof(YGNode));
+  if (config->useWebDefaults) {
+    node->style.flexDirection = YGFlexDirectionRow;
+    node->style.alignContent = YGAlignStretch;
+  }
   node->config = config;
 }
 

From c233191485ef733aa7a8d4ea5c758b9e6a06964c Mon Sep 17 00:00:00 2001
From: Janic Duplessis <janicduplessis@gmail.com>
Date: Wed, 29 Mar 2017 03:59:58 -0700
Subject: [PATCH 227/366] Animated - Add missing super calls to fix native
 animated crash

Summary:
There was some missing super.__detach calls in some Animated nodes, we rely on the base class being called to drop the node in the native implementation, not doing so will cause some nodes to leak. It also resulted in a crash when removing certain nodes because they would get updated after being detached.

**Test plan**
Reproduced the crash by unmounting a view that uses a DiffClamp node and made sure this fixes it. Also tested that other native animations still worked properly.

Fixes #11317
Closes https://github.com/facebook/react-native/pull/12910

Differential Revision: D4718188

Pulled By: javache

fbshipit-source-id: 179ec1334532152c124a9c0f447f488311925d0a
---
 Libraries/Animated/src/AnimatedImplementation.js        | 4 ++++
 Libraries/Animated/src/__tests__/AnimatedNative-test.js | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Libraries/Animated/src/AnimatedImplementation.js b/Libraries/Animated/src/AnimatedImplementation.js
index 141bde1cb99ccb..51420039ee065e 100644
--- a/Libraries/Animated/src/AnimatedImplementation.js
+++ b/Libraries/Animated/src/AnimatedImplementation.js
@@ -1327,6 +1327,7 @@ class AnimatedModulo extends AnimatedWithChildren {
 
   __detach(): void {
     this._a.__removeChild(this);
+    super.__detach();
   }
 
   __getNativeConfig(): any {
@@ -1377,6 +1378,7 @@ class AnimatedDiffClamp extends AnimatedWithChildren {
 
   __detach(): void {
     this._a.__removeChild(this);
+    super.__detach();
   }
 
   __getNativeConfig(): any {
@@ -1460,6 +1462,7 @@ class AnimatedTransform extends AnimatedWithChildren {
         }
       }
     });
+    super.__detach();
   }
 
   __getNativeConfig(): any {
@@ -1567,6 +1570,7 @@ class AnimatedStyle extends AnimatedWithChildren {
         value.__removeChild(this);
       }
     }
+    super.__detach();
   }
 
   __makeNative() {
diff --git a/Libraries/Animated/src/__tests__/AnimatedNative-test.js b/Libraries/Animated/src/__tests__/AnimatedNative-test.js
index 4631eae43f749f..1d46f647476255 100644
--- a/Libraries/Animated/src/__tests__/AnimatedNative-test.js
+++ b/Libraries/Animated/src/__tests__/AnimatedNative-test.js
@@ -281,7 +281,7 @@ describe('Native Animated', () => {
       );
 
       expect(nativeAnimatedModule.disconnectAnimatedNodes).toHaveBeenCalledTimes(2);
-      expect(nativeAnimatedModule.dropAnimatedNode).toHaveBeenCalledTimes(2);
+      expect(nativeAnimatedModule.dropAnimatedNode).toHaveBeenCalledTimes(3);
     });
 
     it('sends a valid description for value, style and props nodes', () => {

From 1d367004e903c3a4695386d067edda1203132523 Mon Sep 17 00:00:00 2001
From: Ben Alpert <balpert@fb.com>
Date: Wed, 29 Mar 2017 06:59:45 -0700
Subject: [PATCH 228/366] Improve feel of scroll snapping behavior on iOS

Reviewed By: sahrens, shergin

Differential Revision: D4768384

fbshipit-source-id: 6319d058292be6ba38c059d8d1a1bf70bac603e2
---
 React/Views/RCTScrollView.m | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/React/Views/RCTScrollView.m b/React/Views/RCTScrollView.m
index 32bcaeacc94d1d..42f49ba7243fe8 100644
--- a/React/Views/RCTScrollView.m
+++ b/React/Views/RCTScrollView.m
@@ -326,10 +326,6 @@ @implementation RCTScrollView
   uint16_t _coalescingKey;
   NSString *_lastEmittedEventName;
   NSHashTable *_scrollListeners;
-  // The last non-zero value of translationAlongAxis from scrollViewWillEndDragging.
-  // Tells if user was scrolling forward or backward and is used to determine a correct
-  // snap index when the user stops scrolling with a tap on the scroll view.
-  CGFloat _lastNonZeroTranslationAlongAxis;
 }
 
 - (instancetype)initWithEventDispatcher:(RCTEventDispatcher *)eventDispatcher
@@ -667,32 +663,27 @@ - (void)scrollViewWillEndDragging:(UIScrollView *)scrollView withVelocity:(CGPoi
     BOOL isHorizontal = [self isHorizontal:scrollView];
 
     // What is the current offset?
+    CGFloat velocityAlongAxis = isHorizontal ? velocity.x : velocity.y;
     CGFloat targetContentOffsetAlongAxis = isHorizontal ? targetContentOffset->x : targetContentOffset->y;
 
-    // Which direction is the scroll travelling?
-    CGPoint translation = [scrollView.panGestureRecognizer translationInView:scrollView];
-    CGFloat translationAlongAxis = isHorizontal ? translation.x : translation.y;
-
     // Offset based on desired alignment
     CGFloat frameLength = isHorizontal ? self.frame.size.width : self.frame.size.height;
     CGFloat alignmentOffset = 0.0f;
-    if ([self.snapToAlignment  isEqualToString: @"center"]) {
+    if ([self.snapToAlignment isEqualToString: @"center"]) {
       alignmentOffset = (frameLength * 0.5f) + (snapToIntervalF * 0.5f);
-    } else if ([self.snapToAlignment  isEqualToString: @"end"]) {
+    } else if ([self.snapToAlignment isEqualToString: @"end"]) {
       alignmentOffset = frameLength;
     }
 
     // Pick snap point based on direction and proximity
-    NSInteger snapIndex = floor((targetContentOffsetAlongAxis + alignmentOffset) / snapToIntervalF);
-    BOOL isScrollingForward = translationAlongAxis < 0;
-    BOOL wasScrollingForward = translationAlongAxis == 0 && _lastNonZeroTranslationAlongAxis < 0;
-    if (isScrollingForward || wasScrollingForward) {
-      snapIndex = snapIndex + 1;
-    }
-    if (translationAlongAxis != 0) {
-      _lastNonZeroTranslationAlongAxis = translationAlongAxis;
-    }
-    CGFloat newTargetContentOffset = ( snapIndex * snapToIntervalF ) - alignmentOffset;
+    CGFloat fractionalIndex = (targetContentOffsetAlongAxis + alignmentOffset) / snapToIntervalF;
+    NSInteger snapIndex =
+      velocityAlongAxis > 0.0 ?
+        ceil(fractionalIndex) :
+      velocityAlongAxis < 0.0 ?
+        floor(fractionalIndex) :
+        round(fractionalIndex);
+    CGFloat newTargetContentOffset = (snapIndex * snapToIntervalF) - alignmentOffset;
 
     // Set new targetContentOffset
     if (isHorizontal) {

From c3110963f2517b3ef8b80f5d510b8dd41a67350d Mon Sep 17 00:00:00 2001
From: hoangpham95 <hoangpham@Hoangs-MacBook-Pro.local>
Date: Wed, 29 Mar 2017 11:05:26 -0700
Subject: [PATCH 229/366] The width and height should be in the revsersed
 order.

Summary:
Inspired by #13191

Creating a test app with spannable `TextView`, and observe the text width/height
Closes https://github.com/facebook/react-native/pull/13203

Differential Revision: D4795809

Pulled By: hramos

fbshipit-source-id: a7c6845abe7472dc7ad2f1f978a20d02fe49eda8
---
 .../FrescoBasedReactTextInlineImageShadowNode.java            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java
index bd0d61ecd570f6..d662c79c9382f0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java
@@ -135,8 +135,8 @@ public boolean isVirtual() {
   @Override
   public TextInlineImageSpan buildInlineImageSpan() {
     Resources resources = getThemedContext().getResources();
-    int height = (int) Math.ceil(mWidth);
-    int width = (int) Math.ceil(mHeight);
+    int width = (int) Math.ceil(mWidth);
+    int height = (int) Math.ceil(mHeight);
     return new FrescoBasedReactTextInlineImageSpan(
       resources,
       height,

From 56a4538b315e600962415aaf6a779c583bb9e58e Mon Sep 17 00:00:00 2001
From: Elie Teyssedou <elieteyssedou@gmail.com>
Date: Wed, 29 Mar 2017 11:20:27 -0700
Subject: [PATCH 230/366] Update documentation for Modal's prop animationType

Summary:
I was using Modal component and I didn't knew what was the default for animationType prop. After reading the code, I saw that it was `none`.

I did not tell that the "default" is `slide` if animated is set to `true`, because it is not a default but an implementation of `animated` prop effect and because of the deprecation of `animated`.

Thanks.
Closes https://github.com/facebook/react-native/pull/13196

Differential Revision: D4795765

Pulled By: hramos

fbshipit-source-id: 25d62ac7eeb20fc5557918c3d75709f44f5d4972
---
 Libraries/Modal/Modal.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Libraries/Modal/Modal.js b/Libraries/Modal/Modal.js
index 064d6481cf8434..c601f6fce31245 100644
--- a/Libraries/Modal/Modal.js
+++ b/Libraries/Modal/Modal.js
@@ -87,6 +87,8 @@ class Modal extends React.Component {
      * - `slide` slides in from the bottom
      * - `fade` fades into view
      * - `none` appears without an animation
+     *
+     * Default is set to `none`.
      */
     animationType: PropTypes.oneOf(['none', 'slide', 'fade']),
     /**

From 140c5f657cab6a8ddcf4e219282a0c144addd44c Mon Sep 17 00:00:00 2001
From: Benjamin Eckel <bhelx@simst.im>
Date: Wed, 29 Mar 2017 11:31:05 -0700
Subject: [PATCH 231/366] Make run-ios --device example copy-pastable

Summary:
This changes the single quotes to double quotes so this command can be copy-pasted.

If a user copy pastes the run-on-device example in bash they will be presented with a confusing prompt because bash expects another terminating single quote.

```
~ben (master *) ~/code/transit: react-native run-ios --device 'Max's iPhone'
>
>
```

It seems minor but this could be just confusing enough to frustrate a beginner or someone not familiar with bash.

This can be tested by running:

```
react-native run-ios --help
```

and verifying that the "run on device" example is changed:

```diff
- react-native run-ios --device 'Max's iPhone'
+ react-native run-ios --device "Max's iPhone"
```
Closes https://github.com/facebook/react-native/pull/13145

Differential Revision: D4776305

Pulled By: hramos

fbshipit-source-id: 9500551bfc106cd1687468f7ecc4c91089e1f703
---
 local-cli/runIOS/runIOS.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/local-cli/runIOS/runIOS.js b/local-cli/runIOS/runIOS.js
index e890d643b1317c..8463687bd0a1d5 100644
--- a/local-cli/runIOS/runIOS.js
+++ b/local-cli/runIOS/runIOS.js
@@ -222,7 +222,7 @@ module.exports = {
   },
   {
     desc: "Run on a connected device, e.g. Max's iPhone",
-    cmd: "react-native run-ios --device 'Max's iPhone'",
+    cmd: 'react-native run-ios --device "Max\'s iPhone"',
   },
   ],
   options: [{

From 704b6624374dab395d8f46ffbf72bcad576796f3 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <bvaughn@fb.com>
Date: Wed, 29 Mar 2017 13:27:18 -0700
Subject: [PATCH 232/366] Update ReactNative site docgen to handle
 ViewPropTypes

Reviewed By: hramos

Differential Revision: D4795300

fbshipit-source-id: 5ed1dccd94dbefd661532a5a412b9dbecbc8fc93
---
 website/server/docsList.js    |  3 ++
 website/server/extractDocs.js | 72 ++++++++++++++++++++++++++++++++---
 2 files changed, 70 insertions(+), 5 deletions(-)

diff --git a/website/server/docsList.js b/website/server/docsList.js
index 01759ce9b69ceb..ef4fb9ac4a4cb7 100644
--- a/website/server/docsList.js
+++ b/website/server/docsList.js
@@ -103,9 +103,12 @@ const stylesForEmbed = [
   '../Libraries/Image/ImageStylePropTypes.js',
 ];
 
+const viewPropTypes = '../Libraries/Components/View/ViewPropTypes.js';
+
 module.exports = {
   components,
   apis,
   stylesWithPermalink,
   stylesForEmbed,
+  viewPropTypes,
 };
diff --git a/website/server/extractDocs.js b/website/server/extractDocs.js
index 5a9df680f4c105..0dcce20e3bb95a 100644
--- a/website/server/extractDocs.js
+++ b/website/server/extractDocs.js
@@ -18,6 +18,7 @@ const fs = require('fs');
 const jsDocs = require('../jsdocs/jsdocs.js');
 const jsdocApi = require('jsdoc-api');
 const path = require('path');
+const recast = require('recast');
 const slugify = require('../core/slugify');
 
 const ANDROID_SUFFIX = 'android';
@@ -260,20 +261,81 @@ function getTypedef(filepath, fileContent, json) {
   return typedef;
 }
 
+/**
+ * Load and parse ViewPropTypes data.
+ * This method returns a Documentation object that's empty except for 'props'.
+ * It should be merged with a component Documentation object.
+ */
+function getViewPropTypes() {
+  // Finds default export of ViewPropTypes (the propTypes object expression).
+  function viewPropTypesResolver(ast, recast) {
+    let definition;
+    recast.visit(ast, {
+      visitAssignmentExpression: function(astPath) {
+        if (!definition && docgen.utils.isExportsOrModuleAssignment(astPath)) {
+          definition = docgen.utils.resolveToValue(astPath.get('right'));
+        }
+        return false;
+      }
+    });
+    return definition;
+  }
+
+  // Wrap ViewPropTypes export in a propTypes property inside of a fake class.
+  // This way the default docgen handlers will parse the properties and docs.
+  // The alternative would be to duplicate more of the parsing logic here.
+  function viewPropTypesConversionHandler(documentation, astPath) {
+    const builders = recast.types.builders;
+    const FauxView = builders.classDeclaration(
+      builders.identifier('View'),
+      builders.classBody(
+        [builders.classProperty(
+          builders.identifier('propTypes'),
+          builders.objectExpression(
+            astPath.get('properties').value
+          ),
+          null, // TypeAnnotation
+          true // static
+        )]
+      )
+    );
+    astPath.replace(FauxView);
+  }
+
+  return docgen.parse(
+    fs.readFileSync(docsList.viewPropTypes),
+    viewPropTypesResolver,
+    [
+      viewPropTypesConversionHandler,
+      ...docgen.defaultHandlers,
+    ]
+  );
+}
+
 function renderComponent(filepath) {
   try {
     const fileContent = fs.readFileSync(filepath);
+    const handlers = docgen.defaultHandlers.concat([
+      docgenHelpers.stylePropTypeHandler,
+      docgenHelpers.deprecatedPropTypeHandler,
+      docgenHelpers.jsDocFormatHandler,
+    ]);
+
     const json = docgen.parse(
       fileContent,
       docgenHelpers.findExportedOrFirst,
-      docgen.defaultHandlers.concat([
-        docgenHelpers.stylePropTypeHandler,
-        docgenHelpers.deprecatedPropTypeHandler,
-        docgenHelpers.jsDocFormatHandler,
-      ])
+      handlers
     );
     json.typedef = getTypedef(filepath, fileContent);
 
+    // ReactNative View component imports its propTypes from ViewPropTypes.
+    // This trips up docgen though since it expects them to be defined on View.
+    // We need to wire them up by manually importing and parsing ViewPropTypes.
+    if (filepath.match(/View\/View\.js/)) {
+      const viewPropTypesJSON = getViewPropTypes();
+      json.props = viewPropTypesJSON.props;
+    }
+
     return componentsToMarkdown('component', json, filepath, componentCount++, styleDocs);
   } catch (e) {
     console.log('error in renderComponent for', filepath);

From a7633afa0870ace6afe37bd8788b678def1b7d6e Mon Sep 17 00:00:00 2001
From: Spencer Ahrens <sahrens@fb.com>
Date: Wed, 29 Mar 2017 16:12:39 -0700
Subject: [PATCH 233/366] Add UIExplorer to manual testing script.

Summary:
Encourage a little more testing coverage and make it a little easier to do.
Closes https://github.com/facebook/react-native/pull/13040

Reviewed By: shergin

Differential Revision: D4742701

Pulled By: sahrens

fbshipit-source-id: 4398c3b737b09c4113e965725585efc038936515
---
 scripts/test-manual-e2e.sh | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/scripts/test-manual-e2e.sh b/scripts/test-manual-e2e.sh
index 8cbe5fa27a5a50..241dcbbe7f7951 100755
--- a/scripts/test-manual-e2e.sh
+++ b/scripts/test-manual-e2e.sh
@@ -36,6 +36,37 @@ rm -rf android
 
 success "Generated artifacts for Maven"
 
+npm install
+
+success "Killing any running packagers"
+lsof -i :8081 | grep LISTEN
+lsof -i :8081 | grep LISTEN | /usr/bin/awk '{print $2}' | xargs kill
+
+info "Start the packager in another terminal by running 'npm start' from the root"
+info "and then press any key."
+info ""
+read -n 1
+
+./gradlew :Examples:UIExplorer:android:app:installDebug || error "Couln't build UIExplorer Android"
+
+info "Press any key to run UIExplorer in an already running Android emulator/device"
+info ""
+read -n 1
+adb shell am start -n com.facebook.react.uiapp/.UIExplorerActivity
+
+info "Press any key to open the project in Xcode, then build and test manually."
+info ""
+read -n 1
+open "Examples/UIExplorer/UIExplorer.xcodeproj"
+
+info "When done testing UIExplorer app on iOS and Android press any key to continue."
+info ""
+read -n 1
+
+success "Killing packager"
+lsof -i :8081 | grep LISTEN
+lsof -i :8081 | grep LISTEN | /usr/bin/awk '{print $2}' | xargs kill
+
 npm pack
 
 PACKAGE=$(pwd)/react-native-$PACKAGE_VERSION.tgz

From 759b8ccf71ccf9a017be186327eb8701e760b21a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20W=C3=B6hrl?= <lukas@woehrl.net>
Date: Wed, 29 Mar 2017 16:39:24 -0700
Subject: [PATCH 234/366] Don't transfer layout outputs to java for nodes which
 don't have a new layout

Summary:
As suggested in facebook/yoga#484. This is the PR which only adds the part of using a local bool field for storing the hasLayoutFlag, to be able to pass the layout only if it has really changed.
Closes https://github.com/facebook/yoga/pull/492

Reviewed By: astreet

Differential Revision: D4786961

Pulled By: emilsjolander

fbshipit-source-id: cf3d354b93f6dcc3ef817ef73a47bd29e37d1848
---
 .../main/java/com/facebook/yoga/YogaNode.java |  17 +--
 .../jni/first-party/yogajni/jni/YGJNI.cpp     | 109 +++++++++---------
 2 files changed, 61 insertions(+), 65 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java
index 3772c4f11d1084..b34524a98eb657 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java
@@ -81,6 +81,8 @@ public static void setLogger(YogaLogger logger) {
   private float mBorderBottom = 0;
   @DoNotStrip
   private int mLayoutDirection = 0;
+  @DoNotStrip
+  private boolean mHasNewLayout = true;
 
   private native long jni_YGNodeNew();
   public YogaNode() {
@@ -115,6 +117,7 @@ public void reset() {
     mHasSetMargin = false;
     mHasSetBorder = false;
     mHasSetPosition = false;
+    mHasNewLayout = true;
 
     mWidth = YogaConstants.UNDEFINED;
     mHeight = YogaConstants.UNDEFINED;
@@ -180,10 +183,9 @@ public void calculateLayout(float width, float height) {
     jni_YGNodeCalculateLayout(mNativePointer, width, height);
   }
 
-  private native boolean jni_YGNodeHasNewLayout(long nativePointer);
   @Override
   public boolean hasNewLayout() {
-    return jni_YGNodeHasNewLayout(mNativePointer);
+    return mHasNewLayout;
   }
 
   private native void jni_YGNodeMarkDirty(long nativePointer);
@@ -198,18 +200,17 @@ public boolean isDirty() {
     return jni_YGNodeIsDirty(mNativePointer);
   }
 
-  private native void jni_YGNodeMarkLayoutSeen(long nativePointer);
-  @Override
-  public void markLayoutSeen() {
-    jni_YGNodeMarkLayoutSeen(mNativePointer);
-  }
-
   private native void jni_YGNodeCopyStyle(long dstNativePointer, long srcNativePointer);
   @Override
   public void copyStyle(YogaNode srcNode) {
     jni_YGNodeCopyStyle(mNativePointer, srcNode.mNativePointer);
   }
 
+  @Override
+  public void markLayoutSeen() {
+    mHasNewLayout = false;
+  }
+
   private native int jni_YGNodeStyleGetDirection(long nativePointer);
   @Override
   public YogaDirection getStyleDirection() {
diff --git a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
index 5e3c0b56cc0db7..9a376861ea4cb4 100644
--- a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
+++ b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
@@ -24,54 +24,59 @@ static void YGTransferLayoutDirection(YGNodeRef node, alias_ref<jobject> javaNod
 }
 
 static void YGTransferLayoutOutputsRecursive(YGNodeRef root) {
-  if (auto obj = YGNodeJobject(root)->lockLocal()) {
-    static auto widthField = obj->getClass()->getField<jfloat>("mWidth");
-    static auto heightField = obj->getClass()->getField<jfloat>("mHeight");
-    static auto leftField = obj->getClass()->getField<jfloat>("mLeft");
-    static auto topField = obj->getClass()->getField<jfloat>("mTop");
-
-    static auto marginLeftField = obj->getClass()->getField<jfloat>("mMarginLeft");
-    static auto marginTopField = obj->getClass()->getField<jfloat>("mMarginTop");
-    static auto marginRightField = obj->getClass()->getField<jfloat>("mMarginRight");
-    static auto marginBottomField = obj->getClass()->getField<jfloat>("mMarginBottom");
-
-    static auto paddingLeftField = obj->getClass()->getField<jfloat>("mPaddingLeft");
-    static auto paddingTopField = obj->getClass()->getField<jfloat>("mPaddingTop");
-    static auto paddingRightField = obj->getClass()->getField<jfloat>("mPaddingRight");
-    static auto paddingBottomField = obj->getClass()->getField<jfloat>("mPaddingBottom");
-
-    static auto borderLeftField = obj->getClass()->getField<jfloat>("mBorderLeft");
-    static auto borderTopField = obj->getClass()->getField<jfloat>("mBorderTop");
-    static auto borderRightField = obj->getClass()->getField<jfloat>("mBorderRight");
-    static auto borderBottomField = obj->getClass()->getField<jfloat>("mBorderBottom");
-
-    obj->setFieldValue(widthField, YGNodeLayoutGetWidth(root));
-    obj->setFieldValue(heightField, YGNodeLayoutGetHeight(root));
-    obj->setFieldValue(leftField, YGNodeLayoutGetLeft(root));
-    obj->setFieldValue(topField, YGNodeLayoutGetTop(root));
-
-    obj->setFieldValue(marginLeftField, YGNodeLayoutGetMargin(root, YGEdgeLeft));
-    obj->setFieldValue(marginTopField, YGNodeLayoutGetMargin(root, YGEdgeTop));
-    obj->setFieldValue(marginRightField, YGNodeLayoutGetMargin(root, YGEdgeRight));
-    obj->setFieldValue(marginBottomField, YGNodeLayoutGetMargin(root, YGEdgeBottom));
-
-    obj->setFieldValue(paddingLeftField, YGNodeLayoutGetPadding(root, YGEdgeLeft));
-    obj->setFieldValue(paddingTopField, YGNodeLayoutGetPadding(root, YGEdgeTop));
-    obj->setFieldValue(paddingRightField, YGNodeLayoutGetPadding(root, YGEdgeRight));
-    obj->setFieldValue(paddingBottomField, YGNodeLayoutGetPadding(root, YGEdgeBottom));
-
-    obj->setFieldValue(borderLeftField, YGNodeLayoutGetBorder(root, YGEdgeLeft));
-    obj->setFieldValue(borderTopField, YGNodeLayoutGetBorder(root, YGEdgeTop));
-    obj->setFieldValue(borderRightField, YGNodeLayoutGetBorder(root, YGEdgeRight));
-    obj->setFieldValue(borderBottomField, YGNodeLayoutGetBorder(root, YGEdgeBottom));
-
-    YGTransferLayoutDirection(root, obj);
-
-    for (uint32_t i = 0; i < YGNodeGetChildCount(root); i++) {
-      YGTransferLayoutOutputsRecursive(YGNodeGetChild(root, i));
+  if(YGNodeGetHasNewLayout(root)){
+    if (auto obj = YGNodeJobject(root)->lockLocal()) {
+      static auto widthField = obj->getClass()->getField<jfloat>("mWidth");
+      static auto heightField = obj->getClass()->getField<jfloat>("mHeight");
+      static auto leftField = obj->getClass()->getField<jfloat>("mLeft");
+      static auto topField = obj->getClass()->getField<jfloat>("mTop");
+
+      static auto marginLeftField = obj->getClass()->getField<jfloat>("mMarginLeft");
+      static auto marginTopField = obj->getClass()->getField<jfloat>("mMarginTop");
+      static auto marginRightField = obj->getClass()->getField<jfloat>("mMarginRight");
+      static auto marginBottomField = obj->getClass()->getField<jfloat>("mMarginBottom");
+
+      static auto paddingLeftField = obj->getClass()->getField<jfloat>("mPaddingLeft");
+      static auto paddingTopField = obj->getClass()->getField<jfloat>("mPaddingTop");
+      static auto paddingRightField = obj->getClass()->getField<jfloat>("mPaddingRight");
+      static auto paddingBottomField = obj->getClass()->getField<jfloat>("mPaddingBottom");
+
+      static auto borderLeftField = obj->getClass()->getField<jfloat>("mBorderLeft");
+      static auto borderTopField = obj->getClass()->getField<jfloat>("mBorderTop");
+      static auto borderRightField = obj->getClass()->getField<jfloat>("mBorderRight");
+      static auto borderBottomField = obj->getClass()->getField<jfloat>("mBorderBottom");
+
+      static auto hasNewLayoutField = obj->getClass()->getField<jboolean>("mHasNewLayout");
+
+      obj->setFieldValue(widthField, YGNodeLayoutGetWidth(root));
+      obj->setFieldValue(heightField, YGNodeLayoutGetHeight(root));
+      obj->setFieldValue(leftField, YGNodeLayoutGetLeft(root));
+      obj->setFieldValue(topField, YGNodeLayoutGetTop(root));
+
+      obj->setFieldValue(marginLeftField, YGNodeLayoutGetMargin(root, YGEdgeLeft));
+      obj->setFieldValue(marginTopField, YGNodeLayoutGetMargin(root, YGEdgeTop));
+      obj->setFieldValue(marginRightField, YGNodeLayoutGetMargin(root, YGEdgeRight));
+      obj->setFieldValue(marginBottomField, YGNodeLayoutGetMargin(root, YGEdgeBottom));
+
+      obj->setFieldValue(paddingLeftField, YGNodeLayoutGetPadding(root, YGEdgeLeft));
+      obj->setFieldValue(paddingTopField, YGNodeLayoutGetPadding(root, YGEdgeTop));
+      obj->setFieldValue(paddingRightField, YGNodeLayoutGetPadding(root, YGEdgeRight));
+      obj->setFieldValue(paddingBottomField, YGNodeLayoutGetPadding(root, YGEdgeBottom));
+
+      obj->setFieldValue(borderLeftField, YGNodeLayoutGetBorder(root, YGEdgeLeft));
+      obj->setFieldValue(borderTopField, YGNodeLayoutGetBorder(root, YGEdgeTop));
+      obj->setFieldValue(borderRightField, YGNodeLayoutGetBorder(root, YGEdgeRight));
+      obj->setFieldValue(borderBottomField, YGNodeLayoutGetBorder(root, YGEdgeBottom));
+
+      obj->setFieldValue<jboolean>(hasNewLayoutField, true);
+      YGTransferLayoutDirection(root, obj);
+      YGNodeSetHasNewLayout(root, false);
+      for (uint32_t i = 0; i < YGNodeGetChildCount(root); i++) {
+        YGTransferLayoutOutputsRecursive(YGNodeGetChild(root, i));
+      }
+    } else {
+      YGLog(YGLogLevelError, "Java YGNode was GCed during layout calculation\n");
     }
-  } else {
-    YGLog(YGLogLevelError, "Java YGNode was GCed during layout calculation\n");
   }
 }
 
@@ -242,14 +247,6 @@ void jni_YGNodeSetHasBaselineFunc(alias_ref<jobject>,
                         hasBaselineFunc ? YGJNIBaselineFunc : NULL);
 }
 
-jboolean jni_YGNodeHasNewLayout(alias_ref<jobject>, jlong nativePointer) {
-  return (jboolean) YGNodeGetHasNewLayout(_jlong2YGNodeRef(nativePointer));
-}
-
-void jni_YGNodeMarkLayoutSeen(alias_ref<jobject>, jlong nativePointer) {
-  YGNodeSetHasNewLayout(_jlong2YGNodeRef(nativePointer), false);
-}
-
 void jni_YGNodeCopyStyle(alias_ref<jobject>, jlong dstNativePointer, jlong srcNativePointer) {
   YGNodeCopyStyle(_jlong2YGNodeRef(dstNativePointer), _jlong2YGNodeRef(srcNativePointer));
 }
@@ -403,10 +400,8 @@ jint JNI_OnLoad(JavaVM *vm, void *) {
                         YGMakeNativeMethod(jni_YGNodeInsertChild),
                         YGMakeNativeMethod(jni_YGNodeRemoveChild),
                         YGMakeNativeMethod(jni_YGNodeCalculateLayout),
-                        YGMakeNativeMethod(jni_YGNodeHasNewLayout),
                         YGMakeNativeMethod(jni_YGNodeMarkDirty),
                         YGMakeNativeMethod(jni_YGNodeIsDirty),
-                        YGMakeNativeMethod(jni_YGNodeMarkLayoutSeen),
                         YGMakeNativeMethod(jni_YGNodeSetHasMeasureFunc),
                         YGMakeNativeMethod(jni_YGNodeSetHasBaselineFunc),
                         YGMakeNativeMethod(jni_YGNodeCopyStyle),

From 7f346973d145d50349a6c4590f0dcdd60b16a9fb Mon Sep 17 00:00:00 2001
From: Build Service <svcscm@fb.com>
Date: Wed, 29 Mar 2017 16:55:44 -0700
Subject: [PATCH 235/366] @allow-large-files @ignore-conflict-markers[i18n]
 translation auto-update for i18n/adsmanager.config.json on master

fbshipit-source-id: 156680756e04fc7ef69017c49324ff0b7acd030f
---
 .../android/app/src/main/res/values-ar/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-cs/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-da/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-de/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-el/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-en-rGB/strings.xml    | 7 +++++++
 .../android/app/src/main/res/values-es-rES/strings.xml    | 7 +++++++
 .../android/app/src/main/res/values-es/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-fb-rLS/strings.xml    | 8 ++++++++
 .../android/app/src/main/res/values-fb/strings.xml        | 8 ++++++++
 .../android/app/src/main/res/values-fi/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-fr/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-hu/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-in/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-it/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-iw/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-ja/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-ko/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-nb/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-nl/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-pl/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-pt-rPT/strings.xml    | 7 +++++++
 .../android/app/src/main/res/values-pt/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-ro/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-ru/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-sv/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-th/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-tr/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-vi/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-zh-rCN/strings.xml    | 7 +++++++
 .../android/app/src/main/res/values-zh-rHK/strings.xml    | 7 +++++++
 .../android/app/src/main/res/values-zh-rTW/strings.xml    | 7 +++++++
 32 files changed, 226 insertions(+)
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-ar/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-cs/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-da/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-de/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-el/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-en-rGB/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-es-rES/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-es/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-fb-rLS/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-fb/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-fi/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-fr/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-hu/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-in/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-it/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-iw/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-ja/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-ko/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-nb/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-nl/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-pl/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-pt-rPT/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-pt/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-ro/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-ru/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-sv/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-th/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-tr/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-vi/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rCN/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rHK/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rTW/strings.xml

diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ar/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ar/strings.xml
new file mode 100644
index 00000000000000..f493c38e051890
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ar/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: ar_AR -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-cs/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-cs/strings.xml
new file mode 100644
index 00000000000000..1d7a37be546f94
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-cs/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: cs_CZ -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-da/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-da/strings.xml
new file mode 100644
index 00000000000000..ee825766595051
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-da/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: da_DK -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-de/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-de/strings.xml
new file mode 100644
index 00000000000000..e1b0f2a0868948
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-de/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: de_DE -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-el/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-el/strings.xml
new file mode 100644
index 00000000000000..53281c136f91aa
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-el/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: el_GR -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-en-rGB/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-en-rGB/strings.xml
new file mode 100644
index 00000000000000..4ce9e91aec791f
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-en-rGB/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: en_GB -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-es-rES/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-es-rES/strings.xml
new file mode 100644
index 00000000000000..ee27f4a0f34130
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-es-rES/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: es_ES -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-es/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-es/strings.xml
new file mode 100644
index 00000000000000..228d615198d11e
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-es/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: es_LA -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-fb-rLS/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-fb-rLS/strings.xml
new file mode 100644
index 00000000000000..2ace337e37af5d
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-fb-rLS/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: fb_LS -->
+
+<resources exclude-from-buck-resource-map="true">
+    <string name="app_name" gender="unknown">Hello App Display Name \@\@\@ \@\@\@ \@\@\@</string>
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-fb/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-fb/strings.xml
new file mode 100644
index 00000000000000..79ea4f725f0b4a
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-fb/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: fb_HA -->
+
+<resources exclude-from-buck-resource-map="true">
+    <string name="app_name" gender="unknown">[Hello App Display Name#eab3e1f9068d3147cc00bd042932f2a6:1]</string>
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-fi/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-fi/strings.xml
new file mode 100644
index 00000000000000..621122257609d8
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-fi/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: fi_FI -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-fr/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-fr/strings.xml
new file mode 100644
index 00000000000000..56588926319f67
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-fr/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: fr_FR -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-hu/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-hu/strings.xml
new file mode 100644
index 00000000000000..ca3ba7246645d7
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-hu/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: hu_HU -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-in/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-in/strings.xml
new file mode 100644
index 00000000000000..dee75b1336ba11
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-in/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: id_ID -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-it/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-it/strings.xml
new file mode 100644
index 00000000000000..eb0618ab43872e
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-it/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: it_IT -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-iw/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-iw/strings.xml
new file mode 100644
index 00000000000000..2ee633a590b3d4
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-iw/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: he_IL -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ja/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ja/strings.xml
new file mode 100644
index 00000000000000..afe0efd6bc18c7
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ja/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: ja_JP -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ko/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ko/strings.xml
new file mode 100644
index 00000000000000..a06e326655cb42
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ko/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: ko_KR -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-nb/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-nb/strings.xml
new file mode 100644
index 00000000000000..ab5d7818ff708a
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-nb/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: nb_NO -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-nl/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-nl/strings.xml
new file mode 100644
index 00000000000000..dc4c14ae831434
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-nl/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: nl_NL -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-pl/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-pl/strings.xml
new file mode 100644
index 00000000000000..1f396b72c3f19f
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-pl/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: pl_PL -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-pt-rPT/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-pt-rPT/strings.xml
new file mode 100644
index 00000000000000..2081dde129f293
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-pt-rPT/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: pt_PT -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-pt/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-pt/strings.xml
new file mode 100644
index 00000000000000..ebe70acac7e0b2
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-pt/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: pt_BR -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ro/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ro/strings.xml
new file mode 100644
index 00000000000000..551623e97e361d
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ro/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: ro_RO -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ru/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ru/strings.xml
new file mode 100644
index 00000000000000..38e533eaf81cab
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ru/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: ru_RU -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-sv/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-sv/strings.xml
new file mode 100644
index 00000000000000..3b69b622d30a89
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-sv/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: sv_SE -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-th/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-th/strings.xml
new file mode 100644
index 00000000000000..21c5c6becd58e6
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-th/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: th_TH -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-tr/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-tr/strings.xml
new file mode 100644
index 00000000000000..4b59dbd4bcbc8b
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-tr/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: tr_TR -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-vi/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-vi/strings.xml
new file mode 100644
index 00000000000000..d6f0df91310d87
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-vi/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: vi_VN -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rCN/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 00000000000000..d3c30bf0c25374
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: zh_CN -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rHK/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rHK/strings.xml
new file mode 100644
index 00000000000000..29bd2a96566a3e
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rHK/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: zh_HK -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rTW/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rTW/strings.xml
new file mode 100644
index 00000000000000..2e57ad05c5952e
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: zh_TW -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>

From 5012f8938e8faf4e498c262d74bff41b91f77de5 Mon Sep 17 00:00:00 2001
From: Build Service <svcscm@fb.com>
Date: Wed, 29 Mar 2017 16:55:47 -0700
Subject: [PATCH 236/366] @allow-large-files @ignore-conflict-markers[i18n]
 translation auto-update for i18n/fb4a.config.json on master

fbshipit-source-id: 2d84aa83e9efaaa89838da7c8d9595692b6bccdd
---
 .../android/app/src/main/res/values-af/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-bg/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-bn/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-gu/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-hi/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-hr/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-kn/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-lt/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-ml/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-mr/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-ms/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-my/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-pa/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-qz/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-sk/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-sq/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-sr/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-sw/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-ta/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-te/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-tl/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-ur/strings.xml         | 7 +++++++
 22 files changed, 154 insertions(+)
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-af/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-bg/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-bn/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-gu/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-hi/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-hr/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-kn/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-lt/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-ml/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-mr/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-ms/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-my/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-pa/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-qz/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-sk/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-sq/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-sr/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-sw/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-ta/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-te/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-tl/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-ur/strings.xml

diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-af/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-af/strings.xml
new file mode 100644
index 00000000000000..2ac5f222d3ddcf
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-af/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: af_ZA -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-bg/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-bg/strings.xml
new file mode 100644
index 00000000000000..0dbf0001273d9d
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-bg/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: bg_BG -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-bn/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-bn/strings.xml
new file mode 100644
index 00000000000000..4af0c011730c03
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-bn/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: bn_IN -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-gu/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-gu/strings.xml
new file mode 100644
index 00000000000000..f3174fd2091212
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-gu/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: gu_IN -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-hi/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-hi/strings.xml
new file mode 100644
index 00000000000000..41f3ba790ab367
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-hi/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: hi_IN -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-hr/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-hr/strings.xml
new file mode 100644
index 00000000000000..0112dc17382391
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-hr/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: hr_HR -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-kn/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-kn/strings.xml
new file mode 100644
index 00000000000000..249740599094f2
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-kn/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: kn_IN -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-lt/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-lt/strings.xml
new file mode 100644
index 00000000000000..0a9ee397a3d843
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-lt/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: lt_LT -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ml/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ml/strings.xml
new file mode 100644
index 00000000000000..0421596adc473a
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ml/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: ml_IN -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-mr/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-mr/strings.xml
new file mode 100644
index 00000000000000..06650b35cde3bf
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-mr/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: mr_IN -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ms/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ms/strings.xml
new file mode 100644
index 00000000000000..3254e7a4de1852
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ms/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: ms_MY -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-my/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-my/strings.xml
new file mode 100644
index 00000000000000..35aed12121980e
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-my/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: my_MM -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-pa/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-pa/strings.xml
new file mode 100644
index 00000000000000..f1994ddd214354
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-pa/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: pa_IN -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-qz/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-qz/strings.xml
new file mode 100644
index 00000000000000..2bad18d0dfe269
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-qz/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: qz_MM -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-sk/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-sk/strings.xml
new file mode 100644
index 00000000000000..a7b69ad9337c3d
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-sk/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: sk_SK -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-sq/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-sq/strings.xml
new file mode 100644
index 00000000000000..0004bf85b658a4
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-sq/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: sq_AL -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-sr/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-sr/strings.xml
new file mode 100644
index 00000000000000..44a106992d3ed8
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-sr/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: sr_RS -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-sw/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-sw/strings.xml
new file mode 100644
index 00000000000000..9a632fd5131307
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-sw/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: sw_KE -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ta/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ta/strings.xml
new file mode 100644
index 00000000000000..4f2782cb2ea799
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ta/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: ta_IN -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-te/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-te/strings.xml
new file mode 100644
index 00000000000000..87a19868db8e0f
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-te/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: te_IN -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-tl/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-tl/strings.xml
new file mode 100644
index 00000000000000..83fab2e66d3e6d
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-tl/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: tl_PH -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ur/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ur/strings.xml
new file mode 100644
index 00000000000000..20afa4784dcead
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ur/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: ur_PK -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>

From 9a596018f8574887e4b6e65b8dc4dbbb1e9dfac9 Mon Sep 17 00:00:00 2001
From: Build Service <svcscm@fb.com>
Date: Wed, 29 Mar 2017 16:55:50 -0700
Subject: [PATCH 237/366] @allow-large-files @ignore-conflict-markers[i18n]
 translation auto-update for i18n/instagram.config.json on master

fbshipit-source-id: 951f549645f4010bd01ab6486a2b3b617a901b04
---
 .../android/app/src/main/res/values-fr-rCA/strings.xml     | 7 +++++++
 .../android/app/src/main/res/values-uk/strings.xml         | 7 +++++++
 2 files changed, 14 insertions(+)
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-fr-rCA/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-uk/strings.xml

diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-fr-rCA/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-fr-rCA/strings.xml
new file mode 100644
index 00000000000000..a91bb8ab1152b6
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-fr-rCA/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: fr_CA -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-uk/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-uk/strings.xml
new file mode 100644
index 00000000000000..ba21f8c7e73053
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-uk/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: uk_UA -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>

From 944adb76d1ca851b6b97bbd710d7a5c14e954342 Mon Sep 17 00:00:00 2001
From: Build Service <svcscm@fb.com>
Date: Wed, 29 Mar 2017 16:55:57 -0700
Subject: [PATCH 238/366] @allow-large-files [i18n] remove unused generated
 strings.xml files on master

fbshipit-source-id: 8efabef352fa71b3c18c1a8e318d66850fdd5e56
---
 .../android/app/src/main/res/values-af/strings.xml        | 7 -------
 .../android/app/src/main/res/values-ar/strings.xml        | 7 -------
 .../android/app/src/main/res/values-bg/strings.xml        | 7 -------
 .../android/app/src/main/res/values-bn/strings.xml        | 7 -------
 .../android/app/src/main/res/values-cs/strings.xml        | 7 -------
 .../android/app/src/main/res/values-da/strings.xml        | 7 -------
 .../android/app/src/main/res/values-de/strings.xml        | 7 -------
 .../android/app/src/main/res/values-el/strings.xml        | 7 -------
 .../android/app/src/main/res/values-en-rGB/strings.xml    | 7 -------
 .../android/app/src/main/res/values-es-rES/strings.xml    | 7 -------
 .../android/app/src/main/res/values-es/strings.xml        | 7 -------
 .../android/app/src/main/res/values-fb-rLS/strings.xml    | 8 --------
 .../android/app/src/main/res/values-fb/strings.xml        | 8 --------
 .../android/app/src/main/res/values-fi/strings.xml        | 7 -------
 .../android/app/src/main/res/values-fr-rCA/strings.xml    | 7 -------
 .../android/app/src/main/res/values-fr/strings.xml        | 7 -------
 .../android/app/src/main/res/values-gu/strings.xml        | 7 -------
 .../android/app/src/main/res/values-hi/strings.xml        | 7 -------
 .../android/app/src/main/res/values-hr/strings.xml        | 7 -------
 .../android/app/src/main/res/values-hu/strings.xml        | 7 -------
 .../android/app/src/main/res/values-in/strings.xml        | 7 -------
 .../android/app/src/main/res/values-it/strings.xml        | 7 -------
 .../android/app/src/main/res/values-iw/strings.xml        | 7 -------
 .../android/app/src/main/res/values-ja/strings.xml        | 7 -------
 .../android/app/src/main/res/values-kn/strings.xml        | 7 -------
 .../android/app/src/main/res/values-ko/strings.xml        | 7 -------
 .../android/app/src/main/res/values-lt/strings.xml        | 7 -------
 .../android/app/src/main/res/values-ml/strings.xml        | 7 -------
 .../android/app/src/main/res/values-mr/strings.xml        | 7 -------
 .../android/app/src/main/res/values-ms/strings.xml        | 7 -------
 .../android/app/src/main/res/values-my/strings.xml        | 7 -------
 .../android/app/src/main/res/values-nb/strings.xml        | 7 -------
 .../android/app/src/main/res/values-nl/strings.xml        | 7 -------
 .../android/app/src/main/res/values-pa/strings.xml        | 7 -------
 .../android/app/src/main/res/values-pl/strings.xml        | 7 -------
 .../android/app/src/main/res/values-pt-rPT/strings.xml    | 7 -------
 .../android/app/src/main/res/values-pt/strings.xml        | 7 -------
 .../android/app/src/main/res/values-qz/strings.xml        | 7 -------
 .../android/app/src/main/res/values-ro/strings.xml        | 7 -------
 .../android/app/src/main/res/values-ru/strings.xml        | 7 -------
 .../android/app/src/main/res/values-sk/strings.xml        | 7 -------
 .../android/app/src/main/res/values-sq/strings.xml        | 7 -------
 .../android/app/src/main/res/values-sr/strings.xml        | 7 -------
 .../android/app/src/main/res/values-sv/strings.xml        | 7 -------
 .../android/app/src/main/res/values-sw/strings.xml        | 7 -------
 .../android/app/src/main/res/values-ta/strings.xml        | 7 -------
 .../android/app/src/main/res/values-te/strings.xml        | 7 -------
 .../android/app/src/main/res/values-th/strings.xml        | 7 -------
 .../android/app/src/main/res/values-tl/strings.xml        | 7 -------
 .../android/app/src/main/res/values-tr/strings.xml        | 7 -------
 .../android/app/src/main/res/values-uk/strings.xml        | 7 -------
 .../android/app/src/main/res/values-ur/strings.xml        | 7 -------
 .../android/app/src/main/res/values-vi/strings.xml        | 7 -------
 .../android/app/src/main/res/values-zh-rCN/strings.xml    | 7 -------
 .../android/app/src/main/res/values-zh-rHK/strings.xml    | 7 -------
 .../android/app/src/main/res/values-zh-rTW/strings.xml    | 7 -------
 56 files changed, 394 deletions(-)
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-af/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-ar/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-bg/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-bn/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-cs/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-da/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-de/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-el/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-en-rGB/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-es-rES/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-es/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-fb-rLS/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-fb/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-fi/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-fr-rCA/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-fr/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-gu/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-hi/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-hr/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-hu/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-in/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-it/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-iw/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-ja/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-kn/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-ko/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-lt/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-ml/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-mr/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-ms/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-my/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-nb/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-nl/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-pa/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-pl/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-pt-rPT/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-pt/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-qz/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-ro/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-ru/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-sk/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-sq/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-sr/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-sv/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-sw/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-ta/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-te/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-th/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-tl/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-tr/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-uk/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-ur/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-vi/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rCN/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rHK/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rTW/strings.xml

diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-af/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-af/strings.xml
deleted file mode 100644
index 2ac5f222d3ddcf..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-af/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: af_ZA -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ar/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ar/strings.xml
deleted file mode 100644
index f493c38e051890..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ar/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: ar_AR -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-bg/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-bg/strings.xml
deleted file mode 100644
index 0dbf0001273d9d..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-bg/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: bg_BG -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-bn/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-bn/strings.xml
deleted file mode 100644
index 4af0c011730c03..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-bn/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: bn_IN -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-cs/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-cs/strings.xml
deleted file mode 100644
index 1d7a37be546f94..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-cs/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: cs_CZ -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-da/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-da/strings.xml
deleted file mode 100644
index ee825766595051..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-da/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: da_DK -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-de/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-de/strings.xml
deleted file mode 100644
index e1b0f2a0868948..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-de/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: de_DE -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-el/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-el/strings.xml
deleted file mode 100644
index 53281c136f91aa..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-el/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: el_GR -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-en-rGB/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-en-rGB/strings.xml
deleted file mode 100644
index 4ce9e91aec791f..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-en-rGB/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: en_GB -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-es-rES/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-es-rES/strings.xml
deleted file mode 100644
index ee27f4a0f34130..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-es-rES/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: es_ES -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-es/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-es/strings.xml
deleted file mode 100644
index 228d615198d11e..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-es/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: es_LA -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-fb-rLS/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-fb-rLS/strings.xml
deleted file mode 100644
index 2ace337e37af5d..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-fb-rLS/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: fb_LS -->
-
-<resources exclude-from-buck-resource-map="true">
-    <string name="app_name" gender="unknown">Hello App Display Name \@\@\@ \@\@\@ \@\@\@</string>
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-fb/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-fb/strings.xml
deleted file mode 100644
index 79ea4f725f0b4a..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-fb/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: fb_HA -->
-
-<resources exclude-from-buck-resource-map="true">
-    <string name="app_name" gender="unknown">[Hello App Display Name#eab3e1f9068d3147cc00bd042932f2a6:1]</string>
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-fi/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-fi/strings.xml
deleted file mode 100644
index 621122257609d8..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-fi/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: fi_FI -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-fr-rCA/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-fr-rCA/strings.xml
deleted file mode 100644
index a91bb8ab1152b6..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-fr-rCA/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: fr_CA -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-fr/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-fr/strings.xml
deleted file mode 100644
index 56588926319f67..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-fr/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: fr_FR -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-gu/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-gu/strings.xml
deleted file mode 100644
index f3174fd2091212..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-gu/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: gu_IN -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-hi/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-hi/strings.xml
deleted file mode 100644
index 41f3ba790ab367..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-hi/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: hi_IN -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-hr/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-hr/strings.xml
deleted file mode 100644
index 0112dc17382391..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-hr/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: hr_HR -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-hu/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-hu/strings.xml
deleted file mode 100644
index ca3ba7246645d7..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-hu/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: hu_HU -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-in/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-in/strings.xml
deleted file mode 100644
index dee75b1336ba11..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-in/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: id_ID -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-it/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-it/strings.xml
deleted file mode 100644
index eb0618ab43872e..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-it/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: it_IT -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-iw/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-iw/strings.xml
deleted file mode 100644
index 2ee633a590b3d4..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-iw/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: he_IL -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ja/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ja/strings.xml
deleted file mode 100644
index afe0efd6bc18c7..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ja/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: ja_JP -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-kn/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-kn/strings.xml
deleted file mode 100644
index 249740599094f2..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-kn/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: kn_IN -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ko/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ko/strings.xml
deleted file mode 100644
index a06e326655cb42..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ko/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: ko_KR -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-lt/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-lt/strings.xml
deleted file mode 100644
index 0a9ee397a3d843..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-lt/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: lt_LT -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ml/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ml/strings.xml
deleted file mode 100644
index 0421596adc473a..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ml/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: ml_IN -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-mr/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-mr/strings.xml
deleted file mode 100644
index 06650b35cde3bf..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-mr/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: mr_IN -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ms/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ms/strings.xml
deleted file mode 100644
index 3254e7a4de1852..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ms/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: ms_MY -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-my/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-my/strings.xml
deleted file mode 100644
index 35aed12121980e..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-my/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: my_MM -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-nb/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-nb/strings.xml
deleted file mode 100644
index ab5d7818ff708a..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-nb/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: nb_NO -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-nl/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-nl/strings.xml
deleted file mode 100644
index dc4c14ae831434..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-nl/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: nl_NL -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-pa/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-pa/strings.xml
deleted file mode 100644
index f1994ddd214354..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-pa/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: pa_IN -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-pl/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-pl/strings.xml
deleted file mode 100644
index 1f396b72c3f19f..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-pl/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: pl_PL -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-pt-rPT/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-pt-rPT/strings.xml
deleted file mode 100644
index 2081dde129f293..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-pt-rPT/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: pt_PT -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-pt/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-pt/strings.xml
deleted file mode 100644
index ebe70acac7e0b2..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-pt/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: pt_BR -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-qz/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-qz/strings.xml
deleted file mode 100644
index 2bad18d0dfe269..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-qz/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: qz_MM -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ro/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ro/strings.xml
deleted file mode 100644
index 551623e97e361d..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ro/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: ro_RO -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ru/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ru/strings.xml
deleted file mode 100644
index 38e533eaf81cab..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ru/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: ru_RU -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-sk/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-sk/strings.xml
deleted file mode 100644
index a7b69ad9337c3d..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-sk/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: sk_SK -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-sq/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-sq/strings.xml
deleted file mode 100644
index 0004bf85b658a4..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-sq/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: sq_AL -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-sr/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-sr/strings.xml
deleted file mode 100644
index 44a106992d3ed8..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-sr/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: sr_RS -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-sv/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-sv/strings.xml
deleted file mode 100644
index 3b69b622d30a89..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-sv/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: sv_SE -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-sw/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-sw/strings.xml
deleted file mode 100644
index 9a632fd5131307..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-sw/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: sw_KE -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ta/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ta/strings.xml
deleted file mode 100644
index 4f2782cb2ea799..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ta/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: ta_IN -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-te/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-te/strings.xml
deleted file mode 100644
index 87a19868db8e0f..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-te/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: te_IN -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-th/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-th/strings.xml
deleted file mode 100644
index 21c5c6becd58e6..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-th/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: th_TH -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-tl/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-tl/strings.xml
deleted file mode 100644
index 83fab2e66d3e6d..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-tl/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: tl_PH -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-tr/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-tr/strings.xml
deleted file mode 100644
index 4b59dbd4bcbc8b..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-tr/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: tr_TR -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-uk/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-uk/strings.xml
deleted file mode 100644
index ba21f8c7e73053..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-uk/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: uk_UA -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ur/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ur/strings.xml
deleted file mode 100644
index 20afa4784dcead..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ur/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: ur_PK -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-vi/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-vi/strings.xml
deleted file mode 100644
index d6f0df91310d87..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-vi/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: vi_VN -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rCN/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rCN/strings.xml
deleted file mode 100644
index d3c30bf0c25374..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rCN/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: zh_CN -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rHK/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rHK/strings.xml
deleted file mode 100644
index 29bd2a96566a3e..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rHK/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: zh_HK -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rTW/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rTW/strings.xml
deleted file mode 100644
index 2e57ad05c5952e..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rTW/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: zh_TW -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>

From 8c7b32d5f1da34613628b4b8e0474bc1e185a618 Mon Sep 17 00:00:00 2001
From: Nicholas Tate <ntate22@gmail.com>
Date: Wed, 29 Mar 2017 17:54:11 -0700
Subject: [PATCH 239/366] Container Testing Updates

Summary:
ericvicenti - Here are necessary updates for the the testing container workflow.

normanjoyner

Temporarily disabled E2E tests on the Containership Jenkins pipeline because they seemed to be sporadically failing and slow down the run rate of CI tests.

* Run all stages and parallel branches in testing suite even if one
fails (just mark the overall job as failed)
* Added update to docker tag name to convert spaces to hyphens to cover
edge case where the project name may have spaces
* Updated buck to more recent version in the base image
* Remove duplicate module provider from `.flowconfig`
* Correctly exit with status code from failed instrumentation tests
* Add JSCHeaders to prepare for testing on stage branches
* Fix bug in filtering of failed instrumentation tests
* Turn down retry count to 1 for E2E tests and temporarily disable
* Add retry3 count to the apk install from buck
* Updated base image to install android SDKs through grepping since the
IDs update frequ
Closes https://github.com/facebook/react-native/pull/13032

Differential Revision: D4799015

Pulled By: ericvicenti

fbshipit-source-id: bbac9303e8ca4fe8be0e8b230a2f863c71c3366c
---
 ContainerShip/Dockerfile.android              |  2 +-
 ContainerShip/Dockerfile.android-base         | 41 ++++++++----
 .../run-android-ci-instrumentation-tests.js   | 10 ++-
 ...un-android-docker-instrumentation-tests.sh |  3 +-
 ContainerShip/scripts/run-ci-e2e-tests.sh     |  2 +-
 Jenkinsfile                                   | 67 ++++++++++++-------
 6 files changed, 84 insertions(+), 41 deletions(-)

diff --git a/ContainerShip/Dockerfile.android b/ContainerShip/Dockerfile.android
index 9feadf159c0d09..63bfd8a46e563f 100644
--- a/ContainerShip/Dockerfile.android
+++ b/ContainerShip/Dockerfile.android
@@ -33,7 +33,7 @@ ADD build.gradle /app/build.gradle
 ADD react.gradle /app/react.gradle
 
 # run gradle downloads
-RUN ./gradlew :ReactAndroid:downloadBoost :ReactAndroid:downloadDoubleConversion :ReactAndroid:downloadFolly :ReactAndroid:downloadGlog
+RUN ./gradlew :ReactAndroid:downloadBoost :ReactAndroid:downloadDoubleConversion :ReactAndroid:downloadFolly :ReactAndroid:downloadGlog :ReactAndroid:downloadJSCHeaders
 
 # compile native libs with Gradle script, we need bridge for unit and integration tests
 RUN ./gradlew :ReactAndroid:packageReactNdkLibsForBuck -Pjobs=1 -Pcom.android.build.threadPoolSize=1
diff --git a/ContainerShip/Dockerfile.android-base b/ContainerShip/Dockerfile.android-base
index 47475078b76014..b1897445f19fe0 100644
--- a/ContainerShip/Dockerfile.android-base
+++ b/ContainerShip/Dockerfile.android-base
@@ -2,7 +2,7 @@ FROM library/ubuntu:16.04
 
 # set default build arguments
 ARG ANDROID_VERSION=25.2.3
-ARG BUCK_VERSION=2016.11.11.01
+ARG BUCK_VERSION=f3452a6a7ab15a60e94c962e686293acbe677473
 ARG NDK_VERSION=10e
 ARG NODE_VERSION=6.2.0
 ARG WATCHMAN_VERSION=4.7.0
@@ -30,7 +30,7 @@ RUN n $NODE_VERSION
 # download buck
 RUN git clone https://github.com/facebook/buck.git /opt/buck
 WORKDIR /opt/buck
-RUN git checkout v$BUCK_VERSION
+RUN git checkout $BUCK_VERSION
 
 # build buck
 RUN ant
@@ -62,16 +62,33 @@ RUN unzip ndk.zip
 # cleanup NDK
 RUN rm ndk.zip
 
-# add android SDK tools
-# 2 - Android SDK Platform-tools, revision 25.0.3
-# 12 - Android SDK Build-tools, revision 23.0.1
-# 35 - SDK Platform Android 6.0, API 23, revision 3
-# 39 - SDK Platform Android 4.4.2, API 19, revision 4
-# 102 - ARM EABI v7a System Image, Android API 19, revision 5
-# 103 - Intel x86 Atom System Image, Android API 19, revision 5
-# 131 - Google APIs, Android API 23, revision 1
-# 166 - Android Support Repository, revision 41
-RUN echo "y" | android update sdk -u -a -t 2,12,35,39,102,103,131,166
+# Add android SDK tools
+
+# Android SDK Platform-tools, revision 25.0.4
+RUN echo "y" | android update sdk -u -a -t $(android list sdk -a | grep "Android SDK Platform-tools, revision 25.0.4" | awk '{ print $1 }' | sed 's/.$//')
+
+# Android SDK Build-tools, revision 23.0.1
+RUN echo "y" | android update sdk -u -a -t $(android list sdk -a | grep "Android SDK Build-tools, revision 23.0.1" | awk '{ print $1 }' | sed 's/.$//')
+
+# SDK Platform Android 6.0, API 23, revision 3
+RUN echo "y" | android update sdk -u -a -t $(android list sdk -a | grep "SDK Platform Android 6.0, API 23" | awk '{ print $1 }' | sed 's/.$//')
+
+# SDK Platform Android 4.4.2, API 19, revision 4
+RUN echo "y" | android update sdk -u -a -t $(android list sdk -a | grep "SDK Platform Android 4.4.2, API 19, revision 4" | awk '{ print $1 }' | sed 's/.$//')
+
+# ARM EABI v7a System Image, Android API 19, revision 5
+RUN echo "y" | android update sdk -u -a -t $(android list sdk -a | grep "ARM EABI v7a System Image, Android API 19, revision 5" | awk '{ print $1 }' | sed 's/.$//')
+
+# Intel x86 Atom System Image, Android API 19, revision 5
+RUN echo "y" | android update sdk -u -a -t $(android list sdk -a | grep "Intel x86 Atom System Image, Android API 19, revision 5" | awk '{ print $1 }' | sed 's/.$//')
+
+# Google APIs, Android API 23, revision 1
+RUN echo "y" | android update sdk -u -a -t $(android list sdk -a | grep "Google APIs, Android API 23, revision 1" | awk '{ print $1 }' | sed 's/.$//')
+
+# Android Support Repository, revision 45
+RUN echo "y" | android update sdk -u -a -t $(android list sdk -a | grep "Android Support Repository, revision 45" | awk '{ print $1 }' | sed 's/.$//')
+
+# Link adb executable
 RUN ln -s /opt/android/platform-tools/adb /usr/bin/adb
 
 # clean up unnecessary directories
diff --git a/ContainerShip/scripts/run-android-ci-instrumentation-tests.js b/ContainerShip/scripts/run-android-ci-instrumentation-tests.js
index fe29cbac1bec17..7017c021eb9049 100644
--- a/ContainerShip/scripts/run-android-ci-instrumentation-tests.js
+++ b/ContainerShip/scripts/run-android-ci-instrumentation-tests.js
@@ -28,6 +28,12 @@ const child_process = require('child_process');
 const fs = require('fs');
 const path = require('path');
 
+// Flaky tests ignored on Circle CI. They still run internally at fb.
+const ignoredTests = [
+  'ReactScrollViewTestCase',
+  'ReactHorizontalScrollViewTestCase'
+];
+
 const colors = {
     GREEN: '\x1b[32m',
     RED: '\x1b[31m',
@@ -53,6 +59,8 @@ let testClasses = fs.readdirSync(path.resolve(process.cwd(), test_opts.PATH))
         return file.endsWith('.java');
     }).map((clazz) => {
         return path.basename(clazz, '.java');
+    }).filter(className => {
+        return ignoredTests.indexOf(className) === -1;
     }).map((clazz) => {
         return test_opts.PACKAGE + '.' + clazz;
     }).filter((clazz) => {
@@ -112,7 +120,7 @@ return async.mapSeries(testClasses, (clazz, callback) => {
     print_test_suite_results(results);
 
     const failures = results.filter((test) => {
-        test.status === 'failure';
+        return test.status === 'failure';
     });
 
     return failures.length === 0 ? process.exit(0) : process.exit(1);
diff --git a/ContainerShip/scripts/run-android-docker-instrumentation-tests.sh b/ContainerShip/scripts/run-android-docker-instrumentation-tests.sh
index 9d3f768f4f9721..c7806c7f055aae 100644
--- a/ContainerShip/scripts/run-android-docker-instrumentation-tests.sh
+++ b/ContainerShip/scripts/run-android-docker-instrumentation-tests.sh
@@ -28,7 +28,8 @@ watchman shutdown-server
 node local-cli/cli.js bundle --platform android --dev true --entry-file ReactAndroid/src/androidTest/js/TestBundle.js --bundle-output ReactAndroid/src/androidTest/assets/AndroidTestBundle.js
 
 # build test APK
-buck install ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=1
+source ./scripts/circle-ci-android-setup.sh && NO_BUCKD=1 retry3 buck install ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=1
 
 # run installed apk with tests
 node ./ContainerShip/scripts/run-android-ci-instrumentation-tests.js $*
+exit $?
diff --git a/ContainerShip/scripts/run-ci-e2e-tests.sh b/ContainerShip/scripts/run-ci-e2e-tests.sh
index e6739dfe9028a8..9416012dbe1ce4 100755
--- a/ContainerShip/scripts/run-ci-e2e-tests.sh
+++ b/ContainerShip/scripts/run-ci-e2e-tests.sh
@@ -11,7 +11,7 @@ RUN_CLI_INSTALL=1
 RUN_IOS=0
 RUN_JS=0
 
-RETRY_COUNT=${RETRY_COUNT:-3}
+RETRY_COUNT=${RETRY_COUNT:-1}
 AVD_UUID=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 8 | head -n 1)
 
 ANDROID_NPM_DEPS="appium@1.5.1 mocha@2.4.5 wd@0.3.11 colors@1.0.3 pretty-data2@0.40.1"
diff --git a/Jenkinsfile b/Jenkinsfile
index 3563e6bbb3ddf2..3242aef058a843 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -99,14 +99,14 @@ def runStages() {
                 buildInfo.scm.sha = githubInfo.sha
                 buildInfo.scm.tag = githubInfo.tag
                 buildInfo.scm.isPR = githubInfo.isPR
-                buildInfo.image.tag = "${buildInfo.scm.sha}-${env.BUILD_TAG.replace("/", "-").replace("%2F", "-")}"
+                buildInfo.image.tag = "${buildInfo.scm.sha}-${env.BUILD_TAG.replace(" ", "-").replace("/", "-").replace("%2F", "-")}"
 
                 jsTag = "${buildInfo.image.tag}"
                 androidTag = "${buildInfo.image.tag}"
                 jsImageName = "${buildInfo.image.name}-js:${jsTag}"
                 androidImageName = "${buildInfo.image.name}-android:${androidTag}"
 
-                parallelInstrumentationTests = getParallelInstrumentationTests('./ReactAndroid/src/androidTest/java/com/facebook/react/tests', 3, androidImageName)
+                parallelInstrumentationTests = getParallelInstrumentationTests('./ReactAndroid/src/androidTest/java/com/facebook/react/tests', 1, androidImageName)
 
                 parallel(
                     'javascript build': {
@@ -120,36 +120,53 @@ def runStages() {
             }
 
             stage('Tests JS') {
-                parallel(
-                    'javascript flow': {
-                        runCmdOnDockerImage(jsImageName, 'yarn run flow -- check', '--rm')
-                    },
-                    'javascript tests': {
-                        runCmdOnDockerImage(jsImageName, 'yarn test --maxWorkers=4', '--rm')
-                    },
-                    'documentation tests': {
-                        runCmdOnDockerImage(jsImageName, 'cd website && yarn test', '--rm')
-                    },
-                    'documentation generation': {
-                        runCmdOnDockerImage(jsImageName, 'cd website && node ./server/generate.js', '--rm')
-                    }
-                )
+                try {
+                    parallel(
+                        'javascript flow': {
+                            runCmdOnDockerImage(jsImageName, 'yarn run flow -- check', '--rm')
+                        },
+                        'javascript tests': {
+                            runCmdOnDockerImage(jsImageName, 'yarn test --maxWorkers=4', '--rm')
+                        },
+                        'documentation tests': {
+                            runCmdOnDockerImage(jsImageName, 'cd website && yarn test', '--rm')
+                        },
+                        'documentation generation': {
+                            runCmdOnDockerImage(jsImageName, 'cd website && node ./server/generate.js', '--rm')
+                        }
+                    )
+                } catch(e) {
+                    currentBuild.result = "FAILED"
+                    echo "Test JS Stage Error: ${e}"
+                }
             }
 
             stage('Tests Android') {
-                parallel(
-                    'android unit tests': {
-                        runCmdOnDockerImage(androidImageName, 'bash /app/ContainerShip/scripts/run-android-docker-unit-tests.sh', '--privileged --rm')
-                    },
-                    'android e2e tests': {
-                        runCmdOnDockerImage(androidImageName, 'bash /app/ContainerShip/scripts/run-ci-e2e-tests.sh --android --js', '--rm')
-                    }
-                )
+                try {
+                    parallel(
+                        'android unit tests': {
+                            runCmdOnDockerImage(androidImageName, 'bash /app/ContainerShip/scripts/run-android-docker-unit-tests.sh', '--privileged --rm')
+                        },
+                        'android e2e tests': {
+                            // temporarily disable e2e tests, they have a high transient failure rate
+                            // runCmdOnDockerImage(androidImageName, 'bash /app/ContainerShip/scripts/run-ci-e2e-tests.sh --android --js', '--rm')
+                            echo "Android E2E tests have been temporarily disabled"
+                        }
+                    )
+                } catch(e) {
+                    currentBuild.result = "FAILED"
+                    echo "Tests Android Stage Error: ${e}"
+                }
             }
 
             stage('Tests Android Instrumentation') {
                 // run all tests in parallel
-                parallel(parallelInstrumentationTests)
+                try {
+                    parallel(parallelInstrumentationTests)
+                } catch(e) {
+                    currentBuild.result = "FAILED"
+                    echo "Tests Android Instrumentation Stage Error: ${e}"
+                }
             }
 
             stage('Cleanup') {

From b6f1a3b6d77300b261faf576b7775529de94cefc Mon Sep 17 00:00:00 2001
From: Build Service <svcscm@fb.com>
Date: Wed, 29 Mar 2017 20:56:17 -0700
Subject: [PATCH 240/366] @allow-large-files @ignore-conflict-markers[i18n]
 translation auto-update for i18n/adsmanager.config.json on master

fbshipit-source-id: f52efb222ea7385f8d291395b2edef5f28dea713
---
 .../android/app/src/main/res/values-ar/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-cs/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-da/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-de/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-el/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-en-rGB/strings.xml    | 7 +++++++
 .../android/app/src/main/res/values-es-rES/strings.xml    | 7 +++++++
 .../android/app/src/main/res/values-es/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-fb-rLS/strings.xml    | 8 ++++++++
 .../android/app/src/main/res/values-fb/strings.xml        | 8 ++++++++
 .../android/app/src/main/res/values-fi/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-fr/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-hu/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-in/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-it/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-iw/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-ja/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-ko/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-nb/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-nl/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-pl/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-pt-rPT/strings.xml    | 7 +++++++
 .../android/app/src/main/res/values-pt/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-ro/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-ru/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-sv/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-th/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-tr/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-vi/strings.xml        | 7 +++++++
 .../android/app/src/main/res/values-zh-rCN/strings.xml    | 7 +++++++
 .../android/app/src/main/res/values-zh-rHK/strings.xml    | 7 +++++++
 .../android/app/src/main/res/values-zh-rTW/strings.xml    | 7 +++++++
 32 files changed, 226 insertions(+)
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-ar/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-cs/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-da/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-de/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-el/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-en-rGB/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-es-rES/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-es/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-fb-rLS/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-fb/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-fi/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-fr/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-hu/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-in/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-it/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-iw/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-ja/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-ko/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-nb/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-nl/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-pl/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-pt-rPT/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-pt/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-ro/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-ru/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-sv/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-th/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-tr/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-vi/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rCN/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rHK/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rTW/strings.xml

diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ar/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ar/strings.xml
new file mode 100644
index 00000000000000..f493c38e051890
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ar/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: ar_AR -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-cs/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-cs/strings.xml
new file mode 100644
index 00000000000000..1d7a37be546f94
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-cs/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: cs_CZ -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-da/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-da/strings.xml
new file mode 100644
index 00000000000000..ee825766595051
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-da/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: da_DK -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-de/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-de/strings.xml
new file mode 100644
index 00000000000000..e1b0f2a0868948
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-de/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: de_DE -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-el/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-el/strings.xml
new file mode 100644
index 00000000000000..53281c136f91aa
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-el/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: el_GR -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-en-rGB/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-en-rGB/strings.xml
new file mode 100644
index 00000000000000..4ce9e91aec791f
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-en-rGB/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: en_GB -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-es-rES/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-es-rES/strings.xml
new file mode 100644
index 00000000000000..ee27f4a0f34130
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-es-rES/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: es_ES -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-es/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-es/strings.xml
new file mode 100644
index 00000000000000..228d615198d11e
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-es/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: es_LA -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-fb-rLS/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-fb-rLS/strings.xml
new file mode 100644
index 00000000000000..2ace337e37af5d
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-fb-rLS/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: fb_LS -->
+
+<resources exclude-from-buck-resource-map="true">
+    <string name="app_name" gender="unknown">Hello App Display Name \@\@\@ \@\@\@ \@\@\@</string>
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-fb/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-fb/strings.xml
new file mode 100644
index 00000000000000..79ea4f725f0b4a
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-fb/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: fb_HA -->
+
+<resources exclude-from-buck-resource-map="true">
+    <string name="app_name" gender="unknown">[Hello App Display Name#eab3e1f9068d3147cc00bd042932f2a6:1]</string>
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-fi/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-fi/strings.xml
new file mode 100644
index 00000000000000..621122257609d8
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-fi/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: fi_FI -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-fr/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-fr/strings.xml
new file mode 100644
index 00000000000000..56588926319f67
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-fr/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: fr_FR -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-hu/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-hu/strings.xml
new file mode 100644
index 00000000000000..ca3ba7246645d7
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-hu/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: hu_HU -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-in/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-in/strings.xml
new file mode 100644
index 00000000000000..dee75b1336ba11
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-in/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: id_ID -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-it/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-it/strings.xml
new file mode 100644
index 00000000000000..eb0618ab43872e
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-it/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: it_IT -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-iw/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-iw/strings.xml
new file mode 100644
index 00000000000000..2ee633a590b3d4
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-iw/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: he_IL -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ja/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ja/strings.xml
new file mode 100644
index 00000000000000..afe0efd6bc18c7
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ja/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: ja_JP -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ko/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ko/strings.xml
new file mode 100644
index 00000000000000..a06e326655cb42
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ko/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: ko_KR -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-nb/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-nb/strings.xml
new file mode 100644
index 00000000000000..ab5d7818ff708a
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-nb/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: nb_NO -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-nl/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-nl/strings.xml
new file mode 100644
index 00000000000000..dc4c14ae831434
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-nl/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: nl_NL -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-pl/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-pl/strings.xml
new file mode 100644
index 00000000000000..1f396b72c3f19f
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-pl/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: pl_PL -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-pt-rPT/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-pt-rPT/strings.xml
new file mode 100644
index 00000000000000..2081dde129f293
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-pt-rPT/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: pt_PT -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-pt/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-pt/strings.xml
new file mode 100644
index 00000000000000..ebe70acac7e0b2
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-pt/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: pt_BR -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ro/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ro/strings.xml
new file mode 100644
index 00000000000000..551623e97e361d
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ro/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: ro_RO -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ru/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ru/strings.xml
new file mode 100644
index 00000000000000..38e533eaf81cab
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ru/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: ru_RU -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-sv/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-sv/strings.xml
new file mode 100644
index 00000000000000..3b69b622d30a89
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-sv/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: sv_SE -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-th/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-th/strings.xml
new file mode 100644
index 00000000000000..21c5c6becd58e6
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-th/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: th_TH -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-tr/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-tr/strings.xml
new file mode 100644
index 00000000000000..4b59dbd4bcbc8b
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-tr/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: tr_TR -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-vi/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-vi/strings.xml
new file mode 100644
index 00000000000000..d6f0df91310d87
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-vi/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: vi_VN -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rCN/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 00000000000000..d3c30bf0c25374
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: zh_CN -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rHK/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rHK/strings.xml
new file mode 100644
index 00000000000000..29bd2a96566a3e
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rHK/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: zh_HK -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rTW/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rTW/strings.xml
new file mode 100644
index 00000000000000..2e57ad05c5952e
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: zh_TW -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>

From c21760af4f00840388b4528a96fb303a35db38fa Mon Sep 17 00:00:00 2001
From: Build Service <svcscm@fb.com>
Date: Wed, 29 Mar 2017 20:56:20 -0700
Subject: [PATCH 241/366] @allow-large-files @ignore-conflict-markers[i18n]
 translation auto-update for i18n/fb4a.config.json on master

fbshipit-source-id: e973b0d453b88fc9f6cf54e1fd97ef7780cafe87
---
 .../android/app/src/main/res/values-af/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-bg/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-bn/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-gu/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-hi/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-hr/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-kn/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-lt/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-ml/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-mr/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-ms/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-my/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-pa/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-qz/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-sk/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-sq/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-sr/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-sw/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-ta/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-te/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-tl/strings.xml         | 7 +++++++
 .../android/app/src/main/res/values-ur/strings.xml         | 7 +++++++
 22 files changed, 154 insertions(+)
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-af/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-bg/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-bn/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-gu/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-hi/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-hr/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-kn/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-lt/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-ml/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-mr/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-ms/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-my/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-pa/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-qz/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-sk/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-sq/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-sr/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-sw/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-ta/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-te/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-tl/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-ur/strings.xml

diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-af/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-af/strings.xml
new file mode 100644
index 00000000000000..2ac5f222d3ddcf
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-af/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: af_ZA -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-bg/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-bg/strings.xml
new file mode 100644
index 00000000000000..0dbf0001273d9d
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-bg/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: bg_BG -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-bn/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-bn/strings.xml
new file mode 100644
index 00000000000000..4af0c011730c03
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-bn/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: bn_IN -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-gu/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-gu/strings.xml
new file mode 100644
index 00000000000000..f3174fd2091212
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-gu/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: gu_IN -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-hi/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-hi/strings.xml
new file mode 100644
index 00000000000000..41f3ba790ab367
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-hi/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: hi_IN -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-hr/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-hr/strings.xml
new file mode 100644
index 00000000000000..0112dc17382391
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-hr/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: hr_HR -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-kn/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-kn/strings.xml
new file mode 100644
index 00000000000000..249740599094f2
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-kn/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: kn_IN -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-lt/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-lt/strings.xml
new file mode 100644
index 00000000000000..0a9ee397a3d843
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-lt/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: lt_LT -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ml/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ml/strings.xml
new file mode 100644
index 00000000000000..0421596adc473a
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ml/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: ml_IN -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-mr/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-mr/strings.xml
new file mode 100644
index 00000000000000..06650b35cde3bf
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-mr/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: mr_IN -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ms/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ms/strings.xml
new file mode 100644
index 00000000000000..3254e7a4de1852
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ms/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: ms_MY -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-my/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-my/strings.xml
new file mode 100644
index 00000000000000..35aed12121980e
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-my/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: my_MM -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-pa/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-pa/strings.xml
new file mode 100644
index 00000000000000..f1994ddd214354
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-pa/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: pa_IN -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-qz/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-qz/strings.xml
new file mode 100644
index 00000000000000..2bad18d0dfe269
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-qz/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: qz_MM -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-sk/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-sk/strings.xml
new file mode 100644
index 00000000000000..a7b69ad9337c3d
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-sk/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: sk_SK -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-sq/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-sq/strings.xml
new file mode 100644
index 00000000000000..0004bf85b658a4
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-sq/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: sq_AL -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-sr/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-sr/strings.xml
new file mode 100644
index 00000000000000..44a106992d3ed8
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-sr/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: sr_RS -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-sw/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-sw/strings.xml
new file mode 100644
index 00000000000000..9a632fd5131307
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-sw/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: sw_KE -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ta/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ta/strings.xml
new file mode 100644
index 00000000000000..4f2782cb2ea799
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ta/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: ta_IN -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-te/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-te/strings.xml
new file mode 100644
index 00000000000000..87a19868db8e0f
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-te/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: te_IN -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-tl/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-tl/strings.xml
new file mode 100644
index 00000000000000..83fab2e66d3e6d
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-tl/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: tl_PH -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ur/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ur/strings.xml
new file mode 100644
index 00000000000000..20afa4784dcead
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ur/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: ur_PK -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>

From 7f35abb26a0c618f6ac2f83d6ac0ed0480a96579 Mon Sep 17 00:00:00 2001
From: Build Service <svcscm@fb.com>
Date: Wed, 29 Mar 2017 20:56:24 -0700
Subject: [PATCH 242/366] @allow-large-files @ignore-conflict-markers[i18n]
 translation auto-update for i18n/instagram.config.json on master

fbshipit-source-id: 680e36c342abcc80279979ca461eb08449d535bb
---
 .../android/app/src/main/res/values-fr-rCA/strings.xml     | 7 +++++++
 .../android/app/src/main/res/values-uk/strings.xml         | 7 +++++++
 2 files changed, 14 insertions(+)
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-fr-rCA/strings.xml
 create mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-uk/strings.xml

diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-fr-rCA/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-fr-rCA/strings.xml
new file mode 100644
index 00000000000000..a91bb8ab1152b6
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-fr-rCA/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: fr_CA -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-uk/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-uk/strings.xml
new file mode 100644
index 00000000000000..ba21f8c7e73053
--- /dev/null
+++ b/local-cli/templates/HelloWorld/android/app/src/main/res/values-uk/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See fburl.com/140690840 for information about i18n on Android -->
+<!-- @generated -->
+<!-- FB Locale: uk_UA -->
+
+<resources exclude-from-buck-resource-map="true">
+</resources>

From 12de9729bd7217bac225b274b8475d8c36334cb8 Mon Sep 17 00:00:00 2001
From: Build Service <svcscm@fb.com>
Date: Wed, 29 Mar 2017 20:56:38 -0700
Subject: [PATCH 243/366] @allow-large-files [i18n] remove unused generated
 strings.xml files on master

fbshipit-source-id: c3151e7f8c346b1ece67ea37b88110b16e1a9107
---
 .../android/app/src/main/res/values-af/strings.xml        | 7 -------
 .../android/app/src/main/res/values-ar/strings.xml        | 7 -------
 .../android/app/src/main/res/values-bg/strings.xml        | 7 -------
 .../android/app/src/main/res/values-bn/strings.xml        | 7 -------
 .../android/app/src/main/res/values-cs/strings.xml        | 7 -------
 .../android/app/src/main/res/values-da/strings.xml        | 7 -------
 .../android/app/src/main/res/values-de/strings.xml        | 7 -------
 .../android/app/src/main/res/values-el/strings.xml        | 7 -------
 .../android/app/src/main/res/values-en-rGB/strings.xml    | 7 -------
 .../android/app/src/main/res/values-es-rES/strings.xml    | 7 -------
 .../android/app/src/main/res/values-es/strings.xml        | 7 -------
 .../android/app/src/main/res/values-fb-rLS/strings.xml    | 8 --------
 .../android/app/src/main/res/values-fb/strings.xml        | 8 --------
 .../android/app/src/main/res/values-fi/strings.xml        | 7 -------
 .../android/app/src/main/res/values-fr-rCA/strings.xml    | 7 -------
 .../android/app/src/main/res/values-fr/strings.xml        | 7 -------
 .../android/app/src/main/res/values-gu/strings.xml        | 7 -------
 .../android/app/src/main/res/values-hi/strings.xml        | 7 -------
 .../android/app/src/main/res/values-hr/strings.xml        | 7 -------
 .../android/app/src/main/res/values-hu/strings.xml        | 7 -------
 .../android/app/src/main/res/values-in/strings.xml        | 7 -------
 .../android/app/src/main/res/values-it/strings.xml        | 7 -------
 .../android/app/src/main/res/values-iw/strings.xml        | 7 -------
 .../android/app/src/main/res/values-ja/strings.xml        | 7 -------
 .../android/app/src/main/res/values-kn/strings.xml        | 7 -------
 .../android/app/src/main/res/values-ko/strings.xml        | 7 -------
 .../android/app/src/main/res/values-lt/strings.xml        | 7 -------
 .../android/app/src/main/res/values-ml/strings.xml        | 7 -------
 .../android/app/src/main/res/values-mr/strings.xml        | 7 -------
 .../android/app/src/main/res/values-ms/strings.xml        | 7 -------
 .../android/app/src/main/res/values-my/strings.xml        | 7 -------
 .../android/app/src/main/res/values-nb/strings.xml        | 7 -------
 .../android/app/src/main/res/values-nl/strings.xml        | 7 -------
 .../android/app/src/main/res/values-pa/strings.xml        | 7 -------
 .../android/app/src/main/res/values-pl/strings.xml        | 7 -------
 .../android/app/src/main/res/values-pt-rPT/strings.xml    | 7 -------
 .../android/app/src/main/res/values-pt/strings.xml        | 7 -------
 .../android/app/src/main/res/values-qz/strings.xml        | 7 -------
 .../android/app/src/main/res/values-ro/strings.xml        | 7 -------
 .../android/app/src/main/res/values-ru/strings.xml        | 7 -------
 .../android/app/src/main/res/values-sk/strings.xml        | 7 -------
 .../android/app/src/main/res/values-sq/strings.xml        | 7 -------
 .../android/app/src/main/res/values-sr/strings.xml        | 7 -------
 .../android/app/src/main/res/values-sv/strings.xml        | 7 -------
 .../android/app/src/main/res/values-sw/strings.xml        | 7 -------
 .../android/app/src/main/res/values-ta/strings.xml        | 7 -------
 .../android/app/src/main/res/values-te/strings.xml        | 7 -------
 .../android/app/src/main/res/values-th/strings.xml        | 7 -------
 .../android/app/src/main/res/values-tl/strings.xml        | 7 -------
 .../android/app/src/main/res/values-tr/strings.xml        | 7 -------
 .../android/app/src/main/res/values-uk/strings.xml        | 7 -------
 .../android/app/src/main/res/values-ur/strings.xml        | 7 -------
 .../android/app/src/main/res/values-vi/strings.xml        | 7 -------
 .../android/app/src/main/res/values-zh-rCN/strings.xml    | 7 -------
 .../android/app/src/main/res/values-zh-rHK/strings.xml    | 7 -------
 .../android/app/src/main/res/values-zh-rTW/strings.xml    | 7 -------
 56 files changed, 394 deletions(-)
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-af/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-ar/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-bg/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-bn/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-cs/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-da/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-de/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-el/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-en-rGB/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-es-rES/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-es/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-fb-rLS/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-fb/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-fi/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-fr-rCA/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-fr/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-gu/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-hi/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-hr/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-hu/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-in/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-it/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-iw/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-ja/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-kn/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-ko/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-lt/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-ml/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-mr/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-ms/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-my/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-nb/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-nl/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-pa/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-pl/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-pt-rPT/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-pt/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-qz/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-ro/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-ru/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-sk/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-sq/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-sr/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-sv/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-sw/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-ta/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-te/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-th/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-tl/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-tr/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-uk/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-ur/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-vi/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rCN/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rHK/strings.xml
 delete mode 100644 local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rTW/strings.xml

diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-af/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-af/strings.xml
deleted file mode 100644
index 2ac5f222d3ddcf..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-af/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: af_ZA -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ar/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ar/strings.xml
deleted file mode 100644
index f493c38e051890..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ar/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: ar_AR -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-bg/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-bg/strings.xml
deleted file mode 100644
index 0dbf0001273d9d..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-bg/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: bg_BG -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-bn/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-bn/strings.xml
deleted file mode 100644
index 4af0c011730c03..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-bn/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: bn_IN -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-cs/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-cs/strings.xml
deleted file mode 100644
index 1d7a37be546f94..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-cs/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: cs_CZ -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-da/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-da/strings.xml
deleted file mode 100644
index ee825766595051..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-da/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: da_DK -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-de/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-de/strings.xml
deleted file mode 100644
index e1b0f2a0868948..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-de/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: de_DE -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-el/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-el/strings.xml
deleted file mode 100644
index 53281c136f91aa..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-el/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: el_GR -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-en-rGB/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-en-rGB/strings.xml
deleted file mode 100644
index 4ce9e91aec791f..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-en-rGB/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: en_GB -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-es-rES/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-es-rES/strings.xml
deleted file mode 100644
index ee27f4a0f34130..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-es-rES/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: es_ES -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-es/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-es/strings.xml
deleted file mode 100644
index 228d615198d11e..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-es/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: es_LA -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-fb-rLS/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-fb-rLS/strings.xml
deleted file mode 100644
index 2ace337e37af5d..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-fb-rLS/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: fb_LS -->
-
-<resources exclude-from-buck-resource-map="true">
-    <string name="app_name" gender="unknown">Hello App Display Name \@\@\@ \@\@\@ \@\@\@</string>
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-fb/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-fb/strings.xml
deleted file mode 100644
index 79ea4f725f0b4a..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-fb/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: fb_HA -->
-
-<resources exclude-from-buck-resource-map="true">
-    <string name="app_name" gender="unknown">[Hello App Display Name#eab3e1f9068d3147cc00bd042932f2a6:1]</string>
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-fi/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-fi/strings.xml
deleted file mode 100644
index 621122257609d8..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-fi/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: fi_FI -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-fr-rCA/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-fr-rCA/strings.xml
deleted file mode 100644
index a91bb8ab1152b6..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-fr-rCA/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: fr_CA -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-fr/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-fr/strings.xml
deleted file mode 100644
index 56588926319f67..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-fr/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: fr_FR -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-gu/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-gu/strings.xml
deleted file mode 100644
index f3174fd2091212..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-gu/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: gu_IN -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-hi/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-hi/strings.xml
deleted file mode 100644
index 41f3ba790ab367..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-hi/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: hi_IN -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-hr/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-hr/strings.xml
deleted file mode 100644
index 0112dc17382391..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-hr/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: hr_HR -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-hu/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-hu/strings.xml
deleted file mode 100644
index ca3ba7246645d7..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-hu/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: hu_HU -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-in/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-in/strings.xml
deleted file mode 100644
index dee75b1336ba11..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-in/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: id_ID -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-it/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-it/strings.xml
deleted file mode 100644
index eb0618ab43872e..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-it/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: it_IT -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-iw/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-iw/strings.xml
deleted file mode 100644
index 2ee633a590b3d4..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-iw/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: he_IL -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ja/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ja/strings.xml
deleted file mode 100644
index afe0efd6bc18c7..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ja/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: ja_JP -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-kn/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-kn/strings.xml
deleted file mode 100644
index 249740599094f2..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-kn/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: kn_IN -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ko/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ko/strings.xml
deleted file mode 100644
index a06e326655cb42..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ko/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: ko_KR -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-lt/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-lt/strings.xml
deleted file mode 100644
index 0a9ee397a3d843..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-lt/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: lt_LT -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ml/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ml/strings.xml
deleted file mode 100644
index 0421596adc473a..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ml/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: ml_IN -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-mr/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-mr/strings.xml
deleted file mode 100644
index 06650b35cde3bf..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-mr/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: mr_IN -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ms/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ms/strings.xml
deleted file mode 100644
index 3254e7a4de1852..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ms/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: ms_MY -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-my/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-my/strings.xml
deleted file mode 100644
index 35aed12121980e..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-my/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: my_MM -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-nb/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-nb/strings.xml
deleted file mode 100644
index ab5d7818ff708a..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-nb/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: nb_NO -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-nl/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-nl/strings.xml
deleted file mode 100644
index dc4c14ae831434..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-nl/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: nl_NL -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-pa/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-pa/strings.xml
deleted file mode 100644
index f1994ddd214354..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-pa/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: pa_IN -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-pl/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-pl/strings.xml
deleted file mode 100644
index 1f396b72c3f19f..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-pl/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: pl_PL -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-pt-rPT/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-pt-rPT/strings.xml
deleted file mode 100644
index 2081dde129f293..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-pt-rPT/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: pt_PT -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-pt/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-pt/strings.xml
deleted file mode 100644
index ebe70acac7e0b2..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-pt/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: pt_BR -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-qz/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-qz/strings.xml
deleted file mode 100644
index 2bad18d0dfe269..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-qz/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: qz_MM -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ro/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ro/strings.xml
deleted file mode 100644
index 551623e97e361d..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ro/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: ro_RO -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ru/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ru/strings.xml
deleted file mode 100644
index 38e533eaf81cab..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ru/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: ru_RU -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-sk/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-sk/strings.xml
deleted file mode 100644
index a7b69ad9337c3d..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-sk/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: sk_SK -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-sq/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-sq/strings.xml
deleted file mode 100644
index 0004bf85b658a4..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-sq/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: sq_AL -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-sr/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-sr/strings.xml
deleted file mode 100644
index 44a106992d3ed8..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-sr/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: sr_RS -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-sv/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-sv/strings.xml
deleted file mode 100644
index 3b69b622d30a89..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-sv/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: sv_SE -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-sw/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-sw/strings.xml
deleted file mode 100644
index 9a632fd5131307..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-sw/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: sw_KE -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ta/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ta/strings.xml
deleted file mode 100644
index 4f2782cb2ea799..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ta/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: ta_IN -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-te/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-te/strings.xml
deleted file mode 100644
index 87a19868db8e0f..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-te/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: te_IN -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-th/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-th/strings.xml
deleted file mode 100644
index 21c5c6becd58e6..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-th/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: th_TH -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-tl/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-tl/strings.xml
deleted file mode 100644
index 83fab2e66d3e6d..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-tl/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: tl_PH -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-tr/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-tr/strings.xml
deleted file mode 100644
index 4b59dbd4bcbc8b..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-tr/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: tr_TR -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-uk/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-uk/strings.xml
deleted file mode 100644
index ba21f8c7e73053..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-uk/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: uk_UA -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ur/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-ur/strings.xml
deleted file mode 100644
index 20afa4784dcead..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-ur/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: ur_PK -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-vi/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-vi/strings.xml
deleted file mode 100644
index d6f0df91310d87..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-vi/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: vi_VN -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rCN/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rCN/strings.xml
deleted file mode 100644
index d3c30bf0c25374..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rCN/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: zh_CN -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rHK/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rHK/strings.xml
deleted file mode 100644
index 29bd2a96566a3e..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rHK/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: zh_HK -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>
diff --git a/local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rTW/strings.xml b/local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rTW/strings.xml
deleted file mode 100644
index 2e57ad05c5952e..00000000000000
--- a/local-cli/templates/HelloWorld/android/app/src/main/res/values-zh-rTW/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See fburl.com/140690840 for information about i18n on Android -->
-<!-- @generated -->
-<!-- FB Locale: zh_TW -->
-
-<resources exclude-from-buck-resource-map="true">
-</resources>

From 5af30382d528f43f8f7b6d6220c9891b53a05725 Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieterdb@fb.com>
Date: Thu, 30 Mar 2017 06:36:21 -0700
Subject: [PATCH 244/366] Improve fbsystrace support

Reviewed By: mhorowitz

Differential Revision: D4756318

fbshipit-source-id: 7811f680a7ad044b5ae028ee9b2fed5f46ce2a63
---
 React/Base/RCTBridge.m          |  9 ---------
 React/CxxBridge/RCTCxxBridge.mm |  6 ++++++
 React/Profiler/RCTProfile.h     |  2 +-
 React/Profiler/RCTProfile.m     | 11 +++++------
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/React/Base/RCTBridge.m b/React/Base/RCTBridge.m
index 51074272337c55..b7d8bb83931ba1 100644
--- a/React/Base/RCTBridge.m
+++ b/React/Base/RCTBridge.m
@@ -301,15 +301,6 @@ - (Class)bridgeClass
   }
 
   RCTAssert(implClass != nil, @"No bridge implementation is available, giving up.");
-
-#ifdef WITH_FBSYSTRACE
-  if (implClass == cxxBridgeClass) {
-    [RCTFBSystrace registerCallbacks];
-  } else {
-    [RCTFBSystrace unregisterCallbacks];
-  }
-#endif
-
   return implClass;
 }
 
diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm
index d266d02037029d..ba429f6a06637b 100644
--- a/React/CxxBridge/RCTCxxBridge.mm
+++ b/React/CxxBridge/RCTCxxBridge.mm
@@ -1139,6 +1139,9 @@ - (void)startProfiling
   RCTAssertMainQueue();
 
   [self executeBlockOnJavaScriptThread:^{
+    #if WITH_FBSYSTRACE
+    [RCTFBSystrace registerCallbacks];
+    #endif
     RCTProfileInit(self);
   }];
 }
@@ -1151,6 +1154,9 @@ - (void)stopProfiling:(void (^)(NSData *))callback
     RCTProfileEnd(self, ^(NSString *log) {
       NSData *logData = [log dataUsingEncoding:NSUTF8StringEncoding];
       callback(logData);
+      #if WITH_FBSYSTRACE
+      [RCTFBSystrace unregisterCallbacks];
+      #endif
     });
   }];
 }
diff --git a/React/Profiler/RCTProfile.h b/React/Profiler/RCTProfile.h
index 08836964f26ab9..73cb3e8694cafd 100644
--- a/React/Profiler/RCTProfile.h
+++ b/React/Profiler/RCTProfile.h
@@ -175,7 +175,7 @@ typedef struct {
 } systrace_arg_t;
 
 typedef struct {
-  void (*start)(uint64_t enabledTags, char *buffer, size_t bufferSize);
+  char *(*start)(void);
   void (*stop)(void);
 
   void (*begin_section)(uint64_t tag, const char *name, size_t numArgs, systrace_arg_t *args);
diff --git a/React/Profiler/RCTProfile.m b/React/Profiler/RCTProfile.m
index 47f5eb87431fea..b81a439dbf1467 100644
--- a/React/Profiler/RCTProfile.m
+++ b/React/Profiler/RCTProfile.m
@@ -455,9 +455,7 @@ void RCTProfileInit(RCTBridge *bridge)
   OSAtomicOr32Barrier(1, &RCTProfileProfiling);
 
   if (callbacks != NULL) {
-    size_t buffer_size = 1 << 22;
-    systrace_buffer = calloc(1, buffer_size);
-    callbacks->start(~((uint64_t)0), systrace_buffer, buffer_size);
+    systrace_buffer = callbacks->start();
   } else {
     NSTimeInterval time = CACurrentMediaTime();
     dispatch_async(RCTProfileGetQueue(), ^{
@@ -514,9 +512,10 @@ void RCTProfileEnd(RCTBridge *bridge, void (^callback)(NSString *))
   RCTProfileUnhookModules(bridge);
 
   if (callbacks != NULL) {
-    callbacks->stop();
-
-    callback(@(systrace_buffer));
+    if (systrace_buffer) {
+      callbacks->stop();
+      callback(@(systrace_buffer));
+    }
   } else {
     dispatch_async(RCTProfileGetQueue(), ^{
       NSString *log = RCTJSONStringify(RCTProfileInfo, NULL);

From f6754348be617e9e6d79865e24894af0bd027ee0 Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieterdb@fb.com>
Date: Thu, 30 Mar 2017 09:53:51 -0700
Subject: [PATCH 245/366] Merge RCTPlatform.isTesting and
 RCTRunningInTestEnvironment

Reviewed By: fkgozali

Differential Revision: D4802834

fbshipit-source-id: 76bb98877f2fc427c01806b192d8dc71489a1c4a
---
 React/Base/RCTPlatform.m | 7 +------
 React/Base/RCTUtils.m    | 9 +++++----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/React/Base/RCTPlatform.m b/React/Base/RCTPlatform.m
index f082a215e68546..122d4231b80745 100644
--- a/React/Base/RCTPlatform.m
+++ b/React/Base/RCTPlatform.m
@@ -30,11 +30,6 @@ @implementation RCTPlatform
   }
 }
 
-static BOOL isTestingEnvironment(void) {
-  NSDictionary *environment = [[NSProcessInfo processInfo] environment];
-  return [environment[@"IS_TESTING"] boolValue];
-}
-
 RCT_EXPORT_MODULE(PlatformConstants)
 
 - (NSDictionary<NSString *, id> *)constantsToExport
@@ -45,7 +40,7 @@ static BOOL isTestingEnvironment(void) {
     @"osVersion": [device systemVersion],
     @"systemName": [device systemName],
     @"interfaceIdiom": interfaceIdiom([device userInterfaceIdiom]),
-    @"isTesting": @(isTestingEnvironment()),
+    @"isTesting": @(RCTRunningInTestEnvironment()),
   };
 }
 
diff --git a/React/Base/RCTUtils.m b/React/Base/RCTUtils.m
index 4cf287359e66d6..4e2ed4623c7a89 100644
--- a/React/Base/RCTUtils.m
+++ b/React/Base/RCTUtils.m
@@ -9,17 +9,16 @@
 
 #import "RCTUtils.h"
 
+#import <dlfcn.h>
 #import <mach/mach_time.h>
 #import <objc/message.h>
 #import <objc/runtime.h>
+#import <zlib.h>
 
 #import <UIKit/UIKit.h>
 
 #import <CommonCrypto/CommonCrypto.h>
 
-#import <zlib.h>
-#import <dlfcn.h>
-
 #import "RCTAssert.h"
 #import "RCTLog.h"
 
@@ -445,7 +444,9 @@ BOOL RCTRunningInTestEnvironment(void)
   static BOOL isTestEnvironment = NO;
   static dispatch_once_t onceToken;
   dispatch_once(&onceToken, ^{
-    isTestEnvironment = objc_lookUpClass("SenTestCase") || objc_lookUpClass("XCTest");
+    NSDictionary *environment = [[NSProcessInfo processInfo] environment];
+    isTestEnvironment = objc_lookUpClass("SenTestCase") || objc_lookUpClass("XCTest") ||
+      [environment[@"IS_TESTING"] boolValue];
   });
   return isTestEnvironment;
 }

From c31a65669e80c455757509ab494ac3fa46e96c92 Mon Sep 17 00:00:00 2001
From: Sam Corcos <sam@corcos.io>
Date: Thu, 30 Mar 2017 10:16:23 -0700
Subject: [PATCH 246/366] Add comma to prevent build error when react.gradle is
 uncommented

Summary:
Thanks for submitting a PR! Please read these instructions carefully:

- [ ] Explain the **motivation** for making this change.
- [ ] Provide a **test plan** demonstrating that the code is solid.
- [ ] Match the **code formatting** of the rest of the codebase.
- [ ] Target the `master` branch, NOT a "stable" branch.

At the moment, if you uncomment the react specific code in `build.gradle` you'll get a compilation error. Adding a comma prevents this error.

No tests are necessary. This is a simple fix.

Sign the [CLA][2], if you haven't already.

Small pull requests are much easier to review and more likely to get merged. Make sure the PR does only one thing, otherwise please split it.

Make sure all **tests pass** on both [Travis][3] and [Circle CI][4]. PRs that break tests are unlikely to be merged.

For more info, see the ["Pull Requests"][5] section of our "Contributing" guidelines.

[1]: https://medium.com/martink
Closes https://github.com/facebook/react-native/pull/13212

Differential Revision: D4802065

Pulled By: javache

fbshipit-source-id: 0ddfe16241381d7e4ac0e48be1bada21d9df2068
---
 local-cli/templates/HelloWorld/android/app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/local-cli/templates/HelloWorld/android/app/build.gradle b/local-cli/templates/HelloWorld/android/app/build.gradle
index 59340fad81e56f..5a6bc9bafa9271 100644
--- a/local-cli/templates/HelloWorld/android/app/build.gradle
+++ b/local-cli/templates/HelloWorld/android/app/build.gradle
@@ -58,7 +58,7 @@ import com.android.build.OutputFile
  *   inputExcludes: ["android/**", "ios/**"],
  *
  *   // override which node gets called and with what additional arguments
- *   nodeExecutableAndArgs: ["node"]
+ *   nodeExecutableAndArgs: ["node"],
  *
  *   // supply additional arguments to the packager
  *   extraPackagerArgs: []

From e82c2fbbe5ad808609e4e7f477223b655750f8d0 Mon Sep 17 00:00:00 2001
From: Martin Konicek <mkonicek@fb.com>
Date: Thu, 30 Mar 2017 15:25:22 -0700
Subject: [PATCH 247/366] Add OSS website test, clean up test names, remove
 website dependency on sass

Reviewed By: ericvicenti

Differential Revision: D4726864

fbshipit-source-id: 38c13a08d42d11533a02c14a9acd5a05bbce307f
---
 scripts/validate-android-test-env.sh         |    2 +-
 website/package.json                         |    3 +-
 website/server/server.js                     |    9 -
 website/styles/_blog.scss                    |  186 ---
 website/styles/_footer.scss                  |  109 --
 website/styles/_help.scss                    |   56 -
 website/styles/_hero.scss                    |   39 -
 website/styles/_showcase.scss                |   83 -
 website/styles/_webplayer.scss               |   13 -
 website/styles/lib/multisite/_mixins.scss    |    7 -
 website/styles/lib/multisite/_variables.scss |   25 -
 website/styles/lib/vendor/_algolia.scss      |   86 --
 website/styles/lib/vendor/_prism.scss        |   30 -
 website/styles/lib/vendor/normalize.css      |  461 ------
 website/styles/react-native.scss             | 1445 ------------------
 15 files changed, 2 insertions(+), 2552 deletions(-)
 delete mode 100644 website/styles/_blog.scss
 delete mode 100644 website/styles/_footer.scss
 delete mode 100644 website/styles/_help.scss
 delete mode 100644 website/styles/_hero.scss
 delete mode 100644 website/styles/_showcase.scss
 delete mode 100644 website/styles/_webplayer.scss
 delete mode 100644 website/styles/lib/multisite/_mixins.scss
 delete mode 100644 website/styles/lib/multisite/_variables.scss
 delete mode 100644 website/styles/lib/vendor/_algolia.scss
 delete mode 100644 website/styles/lib/vendor/_prism.scss
 delete mode 100644 website/styles/lib/vendor/normalize.css
 delete mode 100644 website/styles/react-native.scss

diff --git a/scripts/validate-android-test-env.sh b/scripts/validate-android-test-env.sh
index eebcd6ab5c0592..8197d76e50b4f6 100755
--- a/scripts/validate-android-test-env.sh
+++ b/scripts/validate-android-test-env.sh
@@ -18,7 +18,7 @@ if [ -z "$(buck --version)" ]; then
   echo "Your Buck install is broken."
 
   if [ -d "/opt/facebook" ]; then
-    SUGGESTED="ff27d5270ecaa92727cd5a19954e62298fa78f09"
+    SUGGESTED="b9b76a3a5a086eb440a26d1db9b0731875975099"
     echo "FB laptops ship with a Buck config that is not compatible with open "
     echo "source. FB Buck requires the environment to set a buck version, but "
     echo "the open source version of Buck forbids that."
diff --git a/website/package.json b/website/package.json
index 9e15ca756fc492..840186050952ba 100644
--- a/website/package.json
+++ b/website/package.json
@@ -22,11 +22,10 @@
     "jstransform": "11.0.3",
     "memory-cache": "^0.1.6",
     "mkdirp": "^0.5.1",
-    "node-sass-middleware": "^0.11.0",
     "optimist": "0.6.0",
     "react": "~0.13.0",
     "react-docgen": "^2.9.0",
-    "react-page-middleware": "git://github.com/facebook/react-page-middleware.git",
+    "react-page-middleware": "0.4.1",
     "remove-markdown": "^0.1.0",
     "request": "^2.69.0",
     "semver-compare": "^1.0.0"
diff --git a/website/server/server.js b/website/server/server.js
index f6511d4c7ab921..4faa8c7bdd6f70 100644
--- a/website/server/server.js
+++ b/website/server/server.js
@@ -14,7 +14,6 @@ const http = require('http');
 const optimist = require('optimist');
 const path = require('path');
 const reactMiddleware = require('react-page-middleware');
-const sassMiddleware = require('node-sass-middleware');
 
 const argv = optimist.argv;
 
@@ -43,14 +42,6 @@ const buildOptions = {
 };
 
 const app = connect()
-  .use(sassMiddleware({
-    /* Options */
-    src: path.join(PROJECT_ROOT,'styles'),
-    dest: path.join(FILE_SERVE_ROOT,'react-native','css'),
-    response: false,
-    outputStyle: 'extended',
-    prefix: '/react-native/css',
-  }))
   .use(function(req, res, next) {
     // convert all the md files on every request. This is not optimal
     // but fast enough that we don't really need to care right now.
diff --git a/website/styles/_blog.scss b/website/styles/_blog.scss
deleted file mode 100644
index 684bd1e4aa3c15..00000000000000
--- a/website/styles/_blog.scss
+++ /dev/null
@@ -1,186 +0,0 @@
-/** Blog **/
-
-.entry-header {
-  margin: 0;
-}
-
-.entry-header h1 {
-  margin: 0;
-  font-size: 33px;
-  line-height: 36px;
-  line-height: 1;
-}
-
-.entry-header h4 {
-  margin: 0 0 10px;
-  line-height: 16px;
-  font-size: 14px;
-  line-height: 1;
-}
-
-.entry-header .author {
-  color: #5A6b77;
-  font-weight: 700;
-}
-
-.entry-header .date {
-  color: rgba(102,99,122,.5);
-}
-
-.entry-readmore {
-  margin: 12px 0 0;
-}
-
-.entry-share {
-  padding: 36px 0;
-  display: block;
-  text-align: left;
-}
-
-.entry-excerpt {
-  min-width: 320px;
-  max-width: 640px;
-  margin: 0 auto 40px;
-  padding-bottom: 40px;
-  border-bottom: 1px solid #EDEDED;
-}
-
-.entry-body {
-  min-width: 320px;
-  max-width: 640px;
-  margin: 0 auto;
-}
-
-.small-title {
-  font-size: 10px;
-  color: #66637A;
-  letter-spacing: .4rem;
-  text-transform: uppercase;
-  font-weight: 400;
-  line-height: 12px;
-}
-
-.entry-share .small-title {
-  float: left;
-  width: 50%;
-}
-
-.social-buttons {
-  padding-top: 7px;
-  float: left;
-  width: 50%;
-}
-
-article {
-  margin: 0 0 40px 0;
-}
-
-article h2 {
-  font-size: 26px;
-  line-height: 1;
-}
-
-article li {
-  line-height: 28px;
-}
-
-.author-info {
-  margin-top: 26px;
-  text-align: center;
-  border-bottom: 1px solid #f1f1f1;
-  padding-bottom: 20px
-}
-
-.the-image {
-  position: relative;
-  display: block;
-  width: 64px;
-  height: 64px;
-  margin: 0 auto;
-  border-radius: 50%;
-  background-position: center center;
-  background-color: #fff;
-  background-size: cover;
-}
-
-.author-image {
-  position: relative;
-}
-
-.author-image:before {
-  content: "";
-  display: block;
-  position: absolute;
-  width: 100%;
-  height: 1px;
-  top: 50%;
-  left: 0;
-  background-color: #F1F1F1;
-}
-
-.posted-on {
-  font-size: 12px;
-  color: rgba(102,99,122,.29);
-  margin-bottom: 0;
-  margin-top: 15px;
-}
-
-.name-title {
-  margin-top: 2px;
-  font-size: 22px;
-  font-weight: 400;
-  margin: 3px 0 5px;
-  color: #5A6B77;
-}
-
-.name-title a {
-  color: #5A6B77;
-}
-
-.name-title .title {
-  color: rgba(102,99,122,.44);
-}
-
-.btn {
-    background: 0 0;
-    color: $color-react-native-blue;
-    min-width: 0;
-    border: 1px solid $color-react-native-blue;
-    display: inline-block;
-    padding: 9px 18px;
-    border-radius: 4px;
-    text-align: center;
-    font-size: 12px;
-}
-
-.btn a {
-  text-decoration: none !important;
-}
-
-.btn:hover {
-  text-decoration: none !important;
-}
-
-.video-container {
-  border-radius: 4px;
-  background-clip: padding-box;
-  margin: 0 0 18px;
-  height: 180px;
-  width: 100%;
-  background-size: cover;
-  background-position: center center;
-  position: relative;
-  height: 0;
-  overflow: hidden;
-}
-
-@media (min-width: 760px) {
-  .video-container {
-    height: 345px;
-  }
-}
-
-#mc_embed_signup {
-  clear:left;
-  width:100%;
-}
diff --git a/website/styles/_footer.scss b/website/styles/_footer.scss
deleted file mode 100644
index 4d3bfe2bb9c325..00000000000000
--- a/website/styles/_footer.scss
+++ /dev/null
@@ -1,109 +0,0 @@
-/** Footer **/
-
-footer.nav-footer {
-  box-sizing: border-box;
-  border: none;
-  font-weight: 300;
-  color: #202020;
-  font-size: 15px;
-  line-height: 24px;
-  background: #012129;
-  box-shadow: inset 0 10px 10px -5px rgba(0,0,0,0.2);
-  padding-top: 2em;
-  padding-bottom: 2em;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-footer .sitemap {
-  display: flex;
-  justify-content: space-between;
-  max-width: 1080px;
-  margin: 0 auto 1em;
-}
-footer .sitemap div {
-  flex: 1;
-}
-footer .sitemap .nav-home {
-  display: table;
-  margin: -12px 20px 0 0;
-  padding: 10px;
-  width: 50px;
-  height: 50px;
-  opacity: 0.4;
-  transition: opacity 0.15s ease-in-out;
-}
-footer .sitemap .nav-home:hover,
-footer .sitemap .nav-home:focus {
-  opacity: 1.0;
-}
-@media screen and (max-width: 768px) {
-  footer .sitemap {
-    display: none;
-  }
-
-  footer .newsletter {
-    display: none;
-  }
-
-  #mc_embed_signup {
-    display: none;
-  }
-}
-
-footer .sitemap a {
-  color: white;
-  display: table;
-  margin: 2px -10px;
-  padding: 3px 10px;
-}
-footer .sitemap a:hover,
-footer .sitemap a:focus {
-  color: $color-react-native-blue;
-  text-decoration: none;
-}
-footer .sitemap h5 > a:hover,
-footer .sitemap h5 > a:focus {
-  color: white;
-  text-decoration: none;
-}
-footer .sitemap h5,
-footer .sitemap h6 {
-  margin: 0 0 10px;
-}
-footer .sitemap h5,
-footer .sitemap h6,
-footer .sitemap h5 > a,
-footer .sitemap h6 > a {
-  color: $color-react-native-blue;
-  font-weight: 900;
-}
-footer .sitemap h5 > a,
-footer .sitemap h6 > a {
-  margin: 0 -10px;
-}
-footer .fbOpenSource {
-  display: block;
-  margin: 1em auto;
-  opacity: 0.4;
-  transition: opacity 0.15s ease-in-out;
-  width: 170px;
-}
-footer .fbOpenSource:hover {
-  opacity: 1.0;
-}
-footer .copyright {
-  color: rgba(255, 255, 255, 0.4);
-  text-align: center;
-}
-
-footer .newsletter {
-  display: flex;
-  justify-content: space-between;
-  max-width: 640px;
-  margin: 0 auto 1em;
-}
-
-footer .newsletter h5 {
-  color: $color-react-native-blue;
-  margin: 0 0 10px;
-}
diff --git a/website/styles/_help.scss b/website/styles/_help.scss
deleted file mode 100644
index 21dd0c990aba13..00000000000000
--- a/website/styles/_help.scss
+++ /dev/null
@@ -1,56 +0,0 @@
-/** Help **/
-.helpSection h2 {
-  font-size: 24px;
-}
-
-.help-row {
-  margin: 50px 0;
-}
-
-.help-row:after {
-  content: "";
-  display: table;
-  clear: both;
-}
-
-.help-col {
-  float: left;
-}
-
-.help-col p {
-  font-size: 16px;
-}
-
-.help-col h3 {
-  color: #2d2d2d;
-  font-size: 18px;
-  line-height: 28px;
-  font-weight: normal;
-}
-
-@media (min-width: 600px) {
-  .help-col {
-    float: left;
-    margin-left: 40px;
-    width: 240px;
-  }
-
-  .help-col:first-child {
-    margin-left: 0;
-  }
-}
-
-.help-list {
-  padding: 0;
-  list-style: none;
-  margin: 1.25em 0 1em 0;
-}
-
-.entry ul, li {
-  margin: 0;
-}
-
-.help-list .help-list-entry {
-  padding: 16px 0;
-  border-top: 1px solid #f1eff0;
-}
diff --git a/website/styles/_hero.scss b/website/styles/_hero.scss
deleted file mode 100644
index 525564cbce020b..00000000000000
--- a/website/styles/_hero.scss
+++ /dev/null
@@ -1,39 +0,0 @@
-.hero {
-  background: $color-hero-bg;
-  padding: 50px 0;
-  color: #FDF3E7;
-  font-weight: 300;
-}
-
-.hero .text {
-  font-size: 300%;
-  text-align: center;
-}
-
-.hero .minitext {
-  font-size: 24px;
-  text-align: center;
-}
-
-.buttons-unit {
-  margin-top: 40px;
-  text-align: center;
-}
-
-.buttons-unit a {
-  color: #FA6900;
-}
-
-.buttons-unit .button {
-  font-size: 24px;
-  background: $color-react-native-blue;
-  color: #fafafa;
-}
-
-.buttons-unit .button:active {
-  background: #0485A9;
-}
-
-.buttons-unit.downloads {
-  margin: 30px 0;
-}
diff --git a/website/styles/_showcase.scss b/website/styles/_showcase.scss
deleted file mode 100644
index 6ef3a46a7858bd..00000000000000
--- a/website/styles/_showcase.scss
+++ /dev/null
@@ -1,83 +0,0 @@
-/** Showcase **/
-
-.home-showcase-section {
-  max-width: 800px;
-  margin: 20px auto 100px auto;
-  text-align: center;
-}
-
-
-.home-showcase-section p {
-  max-width: 540px;
-  margin: 0 auto;
-}
-
-.footnote {
-  font-size: 12px;
-  color: rgba(0, 0, 0, 0.4);
-}
-
-.home-showcase-section .showcase img {
-  width: 100px;
-  height: 100px;
-  border-radius: 20px;
-}
-
-.showcaseHeader {
-  padding-bottom: 15px;
-  padding-top: 15px;
-  text-align: center;
-}
-
-.showcase {
-  margin: 30px auto 30px auto;
-  width: 100%;
-  display: inline-block;
-  text-align: center;
-  vertical-align: top;
-}
-
-@media only screen
-  and (min-device-width: 768px)
-  and (max-device-width: 1024px) {
-  .showcase {
-    width: 50%;
-  }
-}
-
-@media only screen
-  and (min-device-width: 1024px) {
-  .showcase {
-    width: 25%;
-  }
-}
-
-.showcase h3 {
-  margin-bottom: 0px;
-  line-height: 20px;
-  padding-left: 5px;
-  padding-right: 5px;
-  font-size: 16px;
-}
-
-.showcase p {
-  margin-top: 5px;
-}
-
-.showcase a {
-}
-
-.showcase h3, .showcase p {
-  color: rgb(72, 72, 72);
-}
-
-.showcase img {
-  width: 100px;
-  height: 100px;
-  border-radius: 20px;
-}
-
-.pinned img {
-  width: 150px;
-  border-radius: 20px;
-}
diff --git a/website/styles/_webplayer.scss b/website/styles/_webplayer.scss
deleted file mode 100644
index d7001e314b9a61..00000000000000
--- a/website/styles/_webplayer.scss
+++ /dev/null
@@ -1,13 +0,0 @@
-/** Web player **/
-
-.web-player > iframe, .web-player > .prism {
-  display: none;
-}
-
-.web-player.desktop > iframe {
-  display: block;
-}
-
-.web-player.mobile > .prism {
-  display: block;
-}
diff --git a/website/styles/lib/multisite/_mixins.scss b/website/styles/lib/multisite/_mixins.scss
deleted file mode 100644
index 89eaa5a09733e4..00000000000000
--- a/website/styles/lib/multisite/_mixins.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-@mixin vendorize($property, $value) {
-  -moz-#{$property}: $value;
-  -ms-#{$property}: $value;
-  -o-#{$property}: $value;
-  -webkit-#{$property}: $value;
-  #{$property}: $value;
-}
diff --git a/website/styles/lib/multisite/_variables.scss b/website/styles/lib/multisite/_variables.scss
deleted file mode 100644
index 5a61b1288be045..00000000000000
--- a/website/styles/lib/multisite/_variables.scss
+++ /dev/null
@@ -1,25 +0,0 @@
-$color-react-native-blue: #05A5D1 !default;
-$color-react-native-blue-light: #F5FCFF !default;
-$color-react-native-blue-dark: #0484A7 !default;
-$color-react-native-blue-darker: #025268 !default;
-$color-react-native-gray: #3B3738 !default;
-$color-react-native-gray-dark: #2D2D2D !default;
-$color-react-native-gray-darkest: #222 !default;
-
-$color-nav-bg: $color-react-native-gray-darkest;
-$color-hero-bg: $color-react-native-gray-dark;
-$color-body-bg: $color-react-native-blue-light;
-$color-sidenav-header-bg: $color-react-native-gray-darkest;
-$color-sidenav-contents-bg: rgba($color-react-native-gray, 0.05);
-$color-sidenav-title: $color-react-native-blue-darker;
-$color-sidenav-title-active: $color-react-native-blue;
-$color-h1: $color-react-native-blue-darker;
-
-$color-reference-title: $color-react-native-blue-darker;
-
-$color-algolia-search: lighten($color-nav-bg,5%);
-
-$font-proxima-nova: proxima-nova;
-$font-helvetica-neue: "Helvetica Neue";
-
-$font-default: $font-proxima-nova, $font-helvetica-neue, Helvetica, Arial, sans-serif;
diff --git a/website/styles/lib/vendor/_algolia.scss b/website/styles/lib/vendor/_algolia.scss
deleted file mode 100644
index da68b0f13692c7..00000000000000
--- a/website/styles/lib/vendor/_algolia.scss
+++ /dev/null
@@ -1,86 +0,0 @@
-/** Algolia Doc Search **/
-
-div.algolia-search-wrapper {
-  display: inline-block;
-  vertical-align: top;
-  margin-left: 15px;
-}
-
-@media screen and (max-width: 960px) {
-  div.algolia-search-wrapper {
-    display: none;
-  }
-}
-
-input#algolia-doc-search {
-  background: transparent url('../img/search.png') no-repeat 10px center;
-  background-size: 16px 16px;
-  font-family: inherit;
-  padding: 0 10px;
-  padding-left: 35px;
-  margin-top: 10px;
-  height: 30px;
-  font-size: 16px;
-  line-height: 20px;
-  background-color: $color-algolia-search;
-  border-radius: 4px;
-  color: inherit;
-  outline: none;
-  border: none;
-  width: 170px;
-  @include vendorize(transition, .5s width ease);
-}
-
-input#algolia-doc-search::placeholder {
-  color: rgba(white, 0.8);
-}
-input#algolia-doc-search::-moz-placeholder {
-  color: rgba(white, 0.8);
-}
-input#algolia-doc-search:-ms-input-placeholder {
-  color: rgba(white, 0.8);
-}
-input#algolia-doc-search::-webkit-input-placeholder {
-  color: rgba(white, 0.8);
-}
-
-input#algolia-doc-search:focus {
-  width: 220px;
-}
-
-.algolia-autocomplete {
-  vertical-align: top;
-  height: 53px;
-
-  .aa-dropdown-menu {
-    margin-left: -210px;
-    margin-top: -4px;
-  }
-}
-.algolia-docsearch-suggestion--category-header .algolia-docsearch-suggestion--highlight  {
-  background-color: $color-react-native-blue;
-}
-.aa-cursor .algolia-docsearch-suggestion--content {
-  color: $color-react-native-blue;
-}
-.aa-cursor .algolia-docsearch-suggestion {
-  background: hsl(198, 100%, 96%);
-}
-.algolia-docsearch-suggestion {
-  border-bottom-color: hsl(198, 100%, 94%);
-
-  &--category-header {
-    background-color: #3B3738;
-  }
-
-  &--highlight {
-    color: $color-react-native-blue;
-  }
-
-  &--subcategory-column {
-
-    border-right-color: hsl(198, 100%, 94%);
-    background-color: hsl(198, 100%, 96%);
-    color: #3B3738;
-  }
-}
diff --git a/website/styles/lib/vendor/_prism.scss b/website/styles/lib/vendor/_prism.scss
deleted file mode 100644
index a70a15e94c6ab0..00000000000000
--- a/website/styles/lib/vendor/_prism.scss
+++ /dev/null
@@ -1,30 +0,0 @@
-.prism {
-  white-space: pre-wrap;
-  font-family: 'source-code-pro', Menlo, 'Courier New', Consolas, monospace;
-  font-size: 13px;
-  line-height: 20px;
-  border-left: 4px solid $color-react-native-blue;
-  padding: 5px 10px;
-  background-color: rgba(5, 165, 209, 0.05);
-  overflow: auto;
-}
-
-.prism + .prism {
-  margin-top: 10px;
-}
-
-.token.keyword {
-  color: #1990B8;
-}
-
-.token.string, .token.regex {
-  color: #2F9C0A;
-}
-
-.token.boolean, .token.number {
-  color: #C92C2C;
-}
-
-.token.comment {
-  color: #7D8B99;
-}
diff --git a/website/styles/lib/vendor/normalize.css b/website/styles/lib/vendor/normalize.css
deleted file mode 100644
index f1644731cf10a1..00000000000000
--- a/website/styles/lib/vendor/normalize.css
+++ /dev/null
@@ -1,461 +0,0 @@
-/*! normalize.css v5.0.0 | MIT License | github.com/necolas/normalize.css */
-
-/* Document
-   ========================================================================== */
-
-/**
- * 1. Change the default font family in all browsers (opinionated).
- * 2. Correct the line height in all browsers.
- * 3. Prevent adjustments of font size after orientation changes in
- *    IE on Windows Phone and in iOS.
- */
-
-html {
-  font-family: sans-serif; /* 1 */
-  line-height: 1.15; /* 2 */
-  -ms-text-size-adjust: 100%; /* 3 */
-  -webkit-text-size-adjust: 100%; /* 3 */
-}
-
-/* Sections
-   ========================================================================== */
-
-/**
- * Remove the margin in all browsers (opinionated).
- */
-
-body {
-  margin: 0;
-}
-
-/**
- * Add the correct display in IE 9-.
- */
-
-article,
-aside,
-footer,
-header,
-nav,
-section {
-  display: block;
-}
-
-/**
- * Correct the font size and margin on `h1` elements within `section` and
- * `article` contexts in Chrome, Firefox, and Safari.
- */
-
-h1 {
-  font-size: 2em;
-  margin: 0.67em 0;
-}
-
-/* Grouping content
-   ========================================================================== */
-
-/**
- * Add the correct display in IE 9-.
- * 1. Add the correct display in IE.
- */
-
-figcaption,
-figure,
-main { /* 1 */
-  display: block;
-}
-
-/**
- * Add the correct margin in IE 8.
- */
-
-figure {
-  margin: 1em 40px;
-}
-
-/**
- * 1. Add the correct box sizing in Firefox.
- * 2. Show the overflow in Edge and IE.
- */
-
-hr {
-  box-sizing: content-box; /* 1 */
-  height: 0; /* 1 */
-  overflow: visible; /* 2 */
-}
-
-/**
- * 1. Correct the inheritance and scaling of font size in all browsers.
- * 2. Correct the odd `em` font sizing in all browsers.
- */
-
-pre {
-  font-family: monospace, monospace; /* 1 */
-  font-size: 1em; /* 2 */
-}
-
-/* Text-level semantics
-   ========================================================================== */
-
-/**
- * 1. Remove the gray background on active links in IE 10.
- * 2. Remove gaps in links underline in iOS 8+ and Safari 8+.
- */
-
-a {
-  background-color: transparent; /* 1 */
-  -webkit-text-decoration-skip: objects; /* 2 */
-}
-
-/**
- * Remove the outline on focused links when they are also active or hovered
- * in all browsers (opinionated).
- */
-
-a:active,
-a:hover {
-  outline-width: 0;
-}
-
-/**
- * 1. Remove the bottom border in Firefox 39-.
- * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
- */
-
-abbr[title] {
-  border-bottom: none; /* 1 */
-  text-decoration: underline; /* 2 */
-  text-decoration: underline dotted; /* 2 */
-}
-
-/**
- * Prevent the duplicate application of `bolder` by the next rule in Safari 6.
- */
-
-b,
-strong {
-  font-weight: inherit;
-}
-
-/**
- * Add the correct font weight in Chrome, Edge, and Safari.
- */
-
-b,
-strong {
-  font-weight: bolder;
-}
-
-/**
- * 1. Correct the inheritance and scaling of font size in all browsers.
- * 2. Correct the odd `em` font sizing in all browsers.
- */
-
-code,
-kbd,
-samp {
-  font-family: monospace, monospace; /* 1 */
-  font-size: 1em; /* 2 */
-}
-
-/**
- * Add the correct font style in Android 4.3-.
- */
-
-dfn {
-  font-style: italic;
-}
-
-/**
- * Add the correct background and color in IE 9-.
- */
-
-mark {
-  background-color: #ff0;
-  color: #000;
-}
-
-/**
- * Add the correct font size in all browsers.
- */
-
-small {
-  font-size: 80%;
-}
-
-/**
- * Prevent `sub` and `sup` elements from affecting the line height in
- * all browsers.
- */
-
-sub,
-sup {
-  font-size: 75%;
-  line-height: 0;
-  position: relative;
-  vertical-align: baseline;
-}
-
-sub {
-  bottom: -0.25em;
-}
-
-sup {
-  top: -0.5em;
-}
-
-/* Embedded content
-   ========================================================================== */
-
-/**
- * Add the correct display in IE 9-.
- */
-
-audio,
-video {
-  display: inline-block;
-}
-
-/**
- * Add the correct display in iOS 4-7.
- */
-
-audio:not([controls]) {
-  display: none;
-  height: 0;
-}
-
-/**
- * Remove the border on images inside links in IE 10-.
- */
-
-img {
-  border-style: none;
-}
-
-/**
- * Hide the overflow in IE.
- */
-
-svg:not(:root) {
-  overflow: hidden;
-}
-
-/* Forms
-   ========================================================================== */
-
-/**
- * 1. Change the font styles in all browsers (opinionated).
- * 2. Remove the margin in Firefox and Safari.
- */
-
-button,
-input,
-optgroup,
-select,
-textarea {
-  font-family: sans-serif; /* 1 */
-  font-size: 100%; /* 1 */
-  line-height: 1.15; /* 1 */
-  margin: 0; /* 2 */
-}
-
-/**
- * Show the overflow in IE.
- * 1. Show the overflow in Edge.
- */
-
-button,
-input { /* 1 */
-  overflow: visible;
-}
-
-/**
- * Remove the inheritance of text transform in Edge, Firefox, and IE.
- * 1. Remove the inheritance of text transform in Firefox.
- */
-
-button,
-select { /* 1 */
-  text-transform: none;
-}
-
-/**
- * 1. Prevent a WebKit bug where (2) destroys native `audio` and `video`
- *    controls in Android 4.
- * 2. Correct the inability to style clickable types in iOS and Safari.
- */
-
-button,
-html [type="button"], /* 1 */
-[type="reset"],
-[type="submit"] {
-  -webkit-appearance: button; /* 2 */
-}
-
-/**
- * Remove the inner border and padding in Firefox.
- */
-
-button::-moz-focus-inner,
-[type="button"]::-moz-focus-inner,
-[type="reset"]::-moz-focus-inner,
-[type="submit"]::-moz-focus-inner {
-  border-style: none;
-  padding: 0;
-}
-
-/**
- * Restore the focus styles unset by the previous rule.
- */
-
-button:-moz-focusring,
-[type="button"]:-moz-focusring,
-[type="reset"]:-moz-focusring,
-[type="submit"]:-moz-focusring {
-  outline: 1px dotted ButtonText;
-}
-
-/**
- * Change the border, margin, and padding in all browsers (opinionated).
- */
-
-fieldset {
-  border: 1px solid #c0c0c0;
-  margin: 0 2px;
-  padding: 0.35em 0.625em 0.75em;
-}
-
-/**
- * 1. Correct the text wrapping in Edge and IE.
- * 2. Correct the color inheritance from `fieldset` elements in IE.
- * 3. Remove the padding so developers are not caught out when they zero out
- *    `fieldset` elements in all browsers.
- */
-
-legend {
-  box-sizing: border-box; /* 1 */
-  color: inherit; /* 2 */
-  display: table; /* 1 */
-  max-width: 100%; /* 1 */
-  padding: 0; /* 3 */
-  white-space: normal; /* 1 */
-}
-
-/**
- * 1. Add the correct display in IE 9-.
- * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera.
- */
-
-progress {
-  display: inline-block; /* 1 */
-  vertical-align: baseline; /* 2 */
-}
-
-/**
- * Remove the default vertical scrollbar in IE.
- */
-
-textarea {
-  overflow: auto;
-}
-
-/**
- * 1. Add the correct box sizing in IE 10-.
- * 2. Remove the padding in IE 10-.
- */
-
-[type="checkbox"],
-[type="radio"] {
-  box-sizing: border-box; /* 1 */
-  padding: 0; /* 2 */
-}
-
-/**
- * Correct the cursor style of increment and decrement buttons in Chrome.
- */
-
-[type="number"]::-webkit-inner-spin-button,
-[type="number"]::-webkit-outer-spin-button {
-  height: auto;
-}
-
-/**
- * 1. Correct the odd appearance in Chrome and Safari.
- * 2. Correct the outline style in Safari.
- */
-
-[type="search"] {
-  -webkit-appearance: textfield; /* 1 */
-  outline-offset: -2px; /* 2 */
-}
-
-/**
- * Remove the inner padding and cancel buttons in Chrome and Safari on macOS.
- */
-
-[type="search"]::-webkit-search-cancel-button,
-[type="search"]::-webkit-search-decoration {
-  -webkit-appearance: none;
-}
-
-/**
- * 1. Correct the inability to style clickable types in iOS and Safari.
- * 2. Change font properties to `inherit` in Safari.
- */
-
-::-webkit-file-upload-button {
-  -webkit-appearance: button; /* 1 */
-  font: inherit; /* 2 */
-}
-
-/* Interactive
-   ========================================================================== */
-
-/*
- * Add the correct display in IE 9-.
- * 1. Add the correct display in Edge, IE, and Firefox.
- */
-
-details, /* 1 */
-menu {
-  display: block;
-}
-
-/*
- * Add the correct display in all browsers.
- */
-
-summary {
-  display: list-item;
-}
-
-/* Scripting
-   ========================================================================== */
-
-/**
- * Add the correct display in IE 9-.
- */
-
-canvas {
-  display: inline-block;
-}
-
-/**
- * Add the correct display in IE.
- */
-
-template {
-  display: none;
-}
-
-/* Hidden
-   ========================================================================== */
-
-/**
- * Add the correct display in IE 10-.
- */
-
-[hidden] {
-  display: none;
-}
diff --git a/website/styles/react-native.scss b/website/styles/react-native.scss
deleted file mode 100644
index dcb765bd8e70be..00000000000000
--- a/website/styles/react-native.scss
+++ /dev/null
@@ -1,1445 +0,0 @@
-@import "lib/vendor/normalize";
-@import "lib/multisite/variables";
-@import "lib/multisite/mixins";
-
-html {
-  font-family: $font-default;
-  color: #484848;
-  line-height: 1.28;
-}
-
-body {
-  background-color: $color-body-bg;
-}
-
-* {
-  @include vendorize(box-sizing, border-box);
-  border: none;
-  margin: 0;
-  padding: 0;
-}
-
-p {
-  margin: 0 0 16px;
-  line-height: 1.4;
- }
-
-em {
-  font-style: italic;
-}
-
-h1, h2, h3, h4, h5, h6 {
-  margin: 10px 0;
-  font-family: inherit;
-  font-weight: 400;
-  line-height: 20px;
-  color: $color-h1;
-  text-rendering: optimizelegibility;
-}
-
-h1 small, h2 small, h3 small, h4 small, h5 small, h6 small {
-  font-weight: normal;
-  color: #7b7b7b;
-}
-
-h1, h2, h3, h4 {
-  line-height: 40px;
-}
-
-h1 {
-  font-size: 39px;
-}
-
-h2 {
-  font-size: 31px;
-}
-
-h3 {
-  font-size: 23px;
-}
-
-h4 {
-  font-size: 17px;
-}
-
-h5 {
-  font-size: 14px;
-}
-
-h6 {
-  font-size: 11px;
-}
-
-h1 small {
-  font-size: 24px;
-}
-
-h2 small {
-  font-size: 18px;
-}
-
-h3 small {
-  font-size: 16px;
-}
-
-h4 small {
-  font-size: 14px;
-}
-
-img {
-  max-width: 100%;
-  height: auto;
-}
-
-ul, ol {
-  margin: 0 0 10px 25px;
-  padding: 0;
-}
-
-ul ul, ul ol, ol ol, ol ul {
-  margin-bottom: 0;
-}
-
-li {
-  line-height: 20px;
-}
-
-a {
-  color: $color-react-native-blue;
-  text-decoration: none;
-}
-
-a:hover, a:focus {
-  color: darken($color-react-native-blue, 10%);
-  text-decoration: underline;
-}
-
-a:focus {
-  outline: thin dotted #333;
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
-}
-
-.center {
-  text-align: center;
-}
-
-html * {
-  color-profile: sRGB;
-  rendering-intent: auto;
-}
-
-.subHeader {
-  font-size: 21px;
-  font-weight: 300;
-  line-height: 30px;
-  margin-bottom: 10px;
-}
-
-.example-container {
-  position: relative;
-}
-
-.embedded-simulator, .embedded-simulator * {
-  box-sizing: border-box;
-}
-
-.embedded-simulator p {
-  text-align: center;
-  color: #999;
-}
-
-.embedded-simulator {
-  width: 210px;
-  position: absolute;
-  right: -200px;
-  top: 0;
-}
-
-@media screen and (max-width: 680px) {
-  .embedded-simulator {
-    position: relative;
-    right: 0;
-  }
-}
-
-.side-by-side {
-  overflow: hidden;
-}
-
-.side-by-side > div {
-  width: 460;
-  margin-left: 0;
-  float: left;
-}
-
-.left {
-  float: left;
-}
-
-.right {
-  float: right;
-}
-
-.container {
-  padding-top: 50px;
-  min-width: 1160px;
-}
-
-.wrap {
-  max-width: 1260px;
-  margin: 0 auto;
-  padding: 0 20px;
-}
-
-.skinnyWrap {
-  width: 690px;
-  margin-left: auto;
-  margin-right: auto;
-  padding-left: 20px;
-  padding-right: 20px;
-}
-
-hr {
-  height: 0;
-  border-top: 1px solid #ccc;
-  border-bottom: 1px solid #eee;
-}
-
-ul, li {
-  margin-left: 20px;
-}
-
-h1 .anchor, h2 .anchor, h3 .anchor, h4 .anchor, h5 .anchor, h6 .anchor {
-  margin-top: -50px;
-  position: absolute;
-}
-
-h1:hover .hash-link, h2:hover .hash-link, h3:hover .hash-link, h4:hover .hash-link, h5:hover .hash-link, h6:hover .hash-link {
-  visibility: visible;
-}
-
-.hash-link {
-  color: #aaa;
-  visibility: hidden;
-}
-
-.nav-main {
-  *zoom: 1;
-  background: $color-nav-bg;
-  color: #fafafa;
-  position: fixed;
-  top: 0;
-  min-height: 50px;
-  width: 100%;
-  z-index: 100;
-  box-shadow: 0 0 5px rgba(black, 0.5);
-}
-
-.nav-main:before, .nav-main:after {
-  content: " ";
-  display: table;
-}
-
-.nav-main:after {
-  clear: both;
-}
-
-.nav-main a {
-  color: #e9e9e9;
-  text-decoration: none;
-}
-
-.nav-main .nav-site-wrapper {
-  display: inline;
-}
-
-.nav-main .nav-site-internal {
-  margin: 0 0 0 20px;
-}
-
-.nav-main .nav-site-external {
-  float: right;
-  margin: 0 12px 0 0;
-}
-
-.nav-main .nav-site li {
-  margin: 0;
-}
-
-.nav-main .nav-site a {
-  box-sizing: content-box;
-  padding: 0 10px;
-  line-height: 50px;
-  display: inline-block;
-  height: 50px;
-}
-
-.nav-site-wrapper a:hover {
-  color: #fff;
-}
-
-.nav-site-wrapper a.active {
-  color: #fff;
-  border-bottom: 3px solid $color-react-native-blue;
-  background-color: $color-react-native-gray-dark;
-}
-
-.nav-main .nav-home {
-  font-size: 24px;
-  font-weight: 300;
-  line-height: 50px;
-}
-
-.nav-home img {
-  vertical-align: -9px;
-  margin-right: 8px;
-  margin-left: 1px;
-  width: 34px;
-}
-
-.nav-main a.nav-home {
-  color: white;
-}
-
-.nav-main ul {
-  display: inline-block;
-  vertical-align: top;
-}
-
-.nav-main li {
-  display: inline;
-}
-
-.nav-main a.nav-version {
-  font-size: 16px;
-  font-weight: 300;
-  margin-left: 8px;
-  text-decoration: underline;
-}
-
-@media screen and (max-width: 680px) {
-  .nav-main .nav-home {
-    font-size: 20px;
-  }
-
-  .nav-main a.nav-version {
-    font-size: 14px;
-  }
-
-  .nav-main .nav-site-wrapper {
-    display: block;
-    overflow: hidden;
-  }
-
-  .nav-main ul {
-    display: -webkit-flex;
-    display: flex;
-    overflow: hidden;
-  }
-
-  .nav-main li {
-    -webkit-flex: 1;
-    flex: 1;
-  }
-
-  .nav-main .nav-site li a {
-    width: 100%;
-    padding: 0;
-    text-align: center;
-    font-size: 14px;
-  }
-
-  .nav-main .nav-site a.active {
-    color: $color-sidenav-title-active;
-    font-weight: 300;
-    background-color: transparent;
-  }
-
-  .nav-main .nav-site-internal {
-    margin: 0;
-    width: 100%;
-  }
-
-  .nav-main .nav-site-external {
-    position: absolute;
-    top: 0;
-    right: 0;
-    float: none;
-  }
-
-  .nav-main .nav-site-external li a {
-    padding: 0 6px;
-  }
-}
-
-.nav-docs {
-  font-size: 14px;
-  float: left;
-  width: 210px;
-  margin: 0 48px 0 0;
-
-  ul {
-    list-style: none;
-    margin: 0;
-    margin-left: 1px;
-
-    ul {
-      margin-left: 20px;
-    }
-  }
-
-  li {
-    margin: 0;
-  }
-
-  a:hover {
-    text-decoration: none;
-    color: $color-react-native-blue-darker;
-  }
-
-  a.active {
-    color: $color-sidenav-title-active;
-    font-weight: bold;
-  }
-}
-
-.nav-docs-section {
-  background-color: $color-sidenav-contents-bg;
-  padding-bottom: 0;
-
-  h3 {
-    color: white;
-    font-size: 16px;
-    font-weight: 400;
-    line-height: 20px;
-    margin-top: 0;
-    margin-bottom: 5px;
-    padding: 10px;
-    background-color: $color-sidenav-header-bg;
-    text-transform: capitalize;
-  }
-
-  ul {
-    display: block;
-    padding-bottom: 10px;
-    padding-top: 10px;
-  }
-
-  a {
-    color: $color-sidenav-title;
-    display: block;
-    margin: 2px 10px 5px;
-  }
-
-  .nav-docs-section:first-child h3 {
-    margin-top: 0;
-  }
-
-  .nav-docs-section:first-child {
-    padding-top: 0;
-    border-top: 0;
-  }
-
-  .nav-docs-section:last-child {
-    padding-bottom: 0;
-    border-bottom: 0;
-  }
-}
-
-@media only screen and (max-device-width: 1024px) {
-  @-webkit-keyframes slide-in {
-    0% { top: -30px; opacity: 0; }
-    100% { top: 0; opacity: 1; }
-  }
-  @-moz-keyframes slide-in {
-    0% { top: -30px; opacity: 0; }
-    100% { top: 0; opacity: 1; }
-  }
-  @-o-keyframes slide-in {
-    0% { top: -30px; opacity: 0; }
-    100% { top: 0; opacity: 1; }
-  }
-  @keyframes slide-in {
-    0% { top: -30px; opacity: 0; }
-    100% { top: 0; opacity: 1; }
-  }
-
-  .nav-docs {
-    position: fixed;
-    z-index: 90;
-    top: -100%;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    margin: 0;
-    padding: 53px 0 0 0;
-    background: #3B3738;
-  }
-
-  .nav-docs-viewport {
-    border-top: 1px solid rgb(5, 165, 209);
-    padding: 25px;
-    overflow: scroll;
-    -webkit-overflow-scrolling: touch;
-    position: relative;
-    width: 100%;
-    height: 100%;
-  }
-
-  /* Active state */
-  .nav-docs.in {
-    top: 0;
-    @include vendorize(animation, slide-in 0.3s forwards);
-  }
-
-  .nav-docs * {
-    -webkit-font-smoothing: antialiased;
-  }
-
-  .nav-docs-section + .nav-docs-section {
-    margin-top: 50px;
-  }
-
-  .nav-docs-section li {
-    margin: 5px 0;
-  }
-
-  .nav-docs-section h3,
-  .nav-docs-section a {
-    color: white;
-  }
-
-  .nav-docs-section h3 {
-    border-bottom: 1px solid white;
-    margin-bottom: 10px;
-    opacity: 0.3;
-  }
-
-  .nav-docs-section a {
-    margin-right: 25px;
-    font-size: 120%;
-    padding: 5px 0;
-  }
-
-  .nav-docs-section a.active {
-    border-bottom-style: solid;
-    border-bottom-width: 1px;
-    color: $color-sidenav-title-active;
-  }
-}
-
-/**
- * Multicolumn layout for phone (landscape only) & tablet (regardless its screen orientation)/
- */
-@media only screen and (min-device-width : 375px) and (max-device-width : 1024px) {
-  .nav-docs-section ul {
-    display: flex;
-    flex-wrap: wrap;
-  }
-
-  .nav-docs-section li {
-    width: 100%;
-  }
-}
-
-/* 2 columns layout */
-@media
-  /*Phone, landscape screen orientation*/
-  only screen and (min-device-width : 375px) and (max-device-width : 1024px) and (orientation : landscape),
-  /*Tablet, portrait screen orientation*/
-  only screen and (min-device-width : 768px) and (max-device-width : 1024px) and (orientation : portrait) {
-  .nav-docs-section li {
-    width: 50%;
-  }
-}
-
-/* 3 columns layout on tablet (landscape screen orientation) */
-@media only screen and (min-device-width : 768px) and (max-device-width : 1024px) and (orientation : landscape) {
-  .nav-docs-section li {
-    width: 33%;
-  }
-}
-
-.home-section {
-  margin: 50px 0;
-}
-
-.home-section ol {
-  margin-left: 0;
-}
-
-.home-divider {
-  border-top-color: #bbb;
-  margin: 0 auto;
-  width: 400px;
-}
-
-.marketing-row {
-  *zoom: 1;
-  margin: 50px 0;
-}
-
-.marketing-row:before, .marketing-row:after {
-  content: " ";
-  display: table;
-}
-
-.marketing-row:after {
-  clear: both;
-}
-
-.marketing-col {
-  float: left;
-  margin-left: 40px;
-  width: 280px;
-}
-
-.marketing-col h3 {
-  color: #2d2d2d;
-  font-size: 24px;
-  font-weight: normal;
-  text-transform: uppercase;
-}
-
-.marketing-col p {
-  font-size: 16px;
-}
-
-.marketing-col:first-child {
-  margin-left: 0;
-}
-
-.tutorial-mock {
-  text-align: center;
-}
-.tutorial-mock img {
-  border: 1px solid #ccc;
-  box-shadow: 5px 5px 5px #888888;
-}
-
-#examples h3, .home-presentation h3 {
-  color: #2d2d2d;
-  font-size: 24px;
-  font-weight: normal;
-  margin-bottom: 5px;
-}
-
-#examples p {
-  margin: 0 0 25px 0;
-  max-width: 600px;
-}
-
-#examples .example {
-  margin-top: 60px;
-}
-
-#examples #todoExample {
-  font-size: 14px;
-}
-
-#examples #todoExample ul {
-  list-style-type: square;
-  margin: 0 0 10px 0;
-}
-
-#examples #todoExample input {
-  border: 1px solid #ccc;
-  font-size: 14px;
-  padding: 3px;
-  width: 150px;
-}
-
-#examples #todoExample button {
-  font-size: 14px;
-  margin-left: 5px;
-  padding: 4px 10px;
-}
-
-#examples #markdownExample textarea {
-  border: 1px solid #ccc;
-  font-size: 14px;
-  margin-bottom: 10px;
-  padding: 5px;
-}
-
-.home-get-started-section {
-  margin-bottom: 60px;
-}
-
-.docs-nextprev {
-  *zoom: 1;
-}
-
-.docs-nextprev:before, .docs-nextprev:after {
-  content: " ";
-  display: table;
-}
-
-.docs-nextprev:after {
-  clear: both;
-}
-
-.docs-prev {
-  float: left;
-}
-
-.docs-next {
-  float: right;
-}
-
-section.black content {
-  padding-bottom: 18px;
-}
-
-.blogContent {
-  *zoom: 1;
-  padding-top: 20px;
-}
-
-.blogContent:before, .blogContent:after {
-  content: " ";
-  display: table;
-}
-
-.blogContent:after {
-  clear: both;
-}
-
-.blogContent blockquote {
-  padding: 5px 15px;
-  margin: 20px 0;
-  background-color: #f8f5ec;
-  border-left: 5px solid #f7ebc6;
-}
-
-.documentationContent {
-  *zoom: 1;
-  padding-top: 20px;
-  padding-bottom: 80px;
-}
-
-.documentationContent:before, .documentationContent:after {
-  content: " ";
-  display: table;
-}
-
-.documentationContent:after {
-  clear: both;
-}
-
-.documentationContent .subHeader {
-  font-size: 24px;
-}
-
-h2 {
-  margin-top: 30px;
-}
-
-.documentationContent blockquote {
-  padding: 15px 30px 15px 15px;
-  margin: 20px 0;
-  background-color: rgba(248, 245, 236, 0.1);
-  border-left: 5px solid rgba(191, 87, 73, 0.2);
-}
-
-.documentationContent blockquote h4 {
-  margin-top: 0;
-}
-
-.documentationContent blockquote p {
-  margin-bottom: 0;
-}
-
-.documentationContent blockquote p:first-child {
-  font-size: 14px;
-  line-height: 20px;
-  margin-top: 0;
-  text-rendering: optimizelegibility;
-}
-
-.docs-prevnext {
-  min-width: 320px;
-  max-width: 640px;
-  margin: 0 auto 40px;
-  padding-bottom: 20px;
-}
-
-.button {
-  background: -webkit-linear-gradient( #9a9a9a, #646464);
-  background: linear-gradient( #9a9a9a, #646464);
-  border-radius: 4px;
-  padding: 8px 16px;
-  font-size: 18px;
-  font-weight: 300;
-  margin: 0 12px;
-  display: inline-block;
-  color: #fafafa;
-  text-decoration: none;
-  text-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
-  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-}
-
-.button:hover {
-  text-decoration: none;
-}
-
-.button:active {
-  box-shadow: none;
-}
-
-.hero .button {
-  box-shadow: 1px 3px 3px rgba(0, 0, 0, 0.3);
-}
-
-.button.blue {
-  background: -webkit-linear-gradient( #77a3d2, #4783c2);
-  background: linear-gradient( #77a3d2, #4783c2);
-}
-
-.row {
-  padding-bottom: 4px;
-}
-
-.row .span4 {
-  width: 33.33%;
-  display: table-cell;
-}
-
-.row .span8 {
-  width: 66.66%;
-  display: table-cell;
-}
-
-.row .span6 {
-  width: 50%;
-  display: table-cell;
-}
-
-p {
-  margin: 16px 0;
-}
-
-.highlight {
-  padding: 10px;
-  margin-bottom: 20px;
-}
-
-figure {
-  text-align: center;
-}
-
-.inner-content {
-  float: left;
-  width: 650px;
-}
-
-.showcaseSection .inner-content {
-  width: 800px;
-}
-
-.helpSection .inner-content {
-  width: 800px;
-}
-
-.nosidebar .inner-content {
-  float: none;
-  margin: 0 auto;
-}
-
-.post-list-item+.post-list-item {
-  margin-top: 60px;
-}
-
-small code, li code, p code {
-  color: #555;
-  background-color: rgba(0, 0, 0, 0.04);
-  padding: 1px 3px;
-}
-
-.playground {
-  *zoom: 1;
-}
-
-.playground:before, .playground:after {
-  content: " ";
-  display: table;
-}
-
-.playground:after {
-  clear: both;
-}
-
-.playground-tab {
-  border-bottom: none !important;
-  border-radius: 3px 3px 0 0;
-  padding: 6px 8px;
-  font-size: 12px;
-  font-weight: bold;
-  color: #c2c0bc;
-  background-color: #f1ede4;
-  display: inline-block;
-  cursor: pointer;
-}
-
-.playgroundCode, .playground-tab, .playgroundPreview {
-  border: 1px solid rgba(16, 16, 16, 0.1);
-}
-
-.playground-tab-active {
-  color: #222;
-}
-
-.playgroundCode {
-  border-radius: 0 3px 3px 3px;
-  float: left;
-  overflow: hidden;
-  width: 600px;
-}
-
-.playgroundPreview {
-  background-color: white;
-  border-radius: 3px;
-  float: right;
-  padding: 15px 20px;
-  width: 280px;
-}
-
-.playgroundError {
-  color: #c5695c;
-  font-size: 15px;
-}
-
-.MarkdownEditor textarea {
-  width: 100%;
-  height: 100px;
-}
-
-.hll {
-  background-color: #f7ebc6;
-  border-left: 5px solid #f7d87c;
-  display: block;
-  margin-left: -14px;
-  margin-right: -14px;
-  padding-left: 9px;
-}
-
-.highlight .javascript .err {
-  background-color: transparent;
-  color: inherit;
-}
-
-.highlight {
-  position: relative;
-  margin-bottom: 14px;
-  padding: 30px 14px 14px;
-  border: none;
-  border-radius: 0;
-  overflow: auto;
-}
-
-.highlight pre {
-  padding: 0;
-  margin-top: 0;
-  margin-bottom: 0;
-  background-color: transparent;
-  border: 0;
-}
-
-.highlight pre code {
-  background: none;
-  font-size: inherit;
-  padding: 0;
-}
-
-.highlight pre .lineno {
-  display: inline-block;
-  width: 22px;
-  padding-right: 5px;
-  margin-right: 10px;
-  color: #bebec5;
-  text-align: right;
-}
-
-.highlight:after {
-  position: absolute;
-  top: 0;
-  right: 0;
-  left: 0;
-  padding: 3px 7px;
-  font-size: 12px;
-  font-weight: bold;
-  color: #c2c0bc;
-  background-color: #f1ede4;
-  content: "Code";
-}
-
-.downloadCenter {
-  text-align: center;
-  margin-top: 20px;
-  margin-bottom: 25px;
-}
-
-.downloadSection:hover {
-  text-decoration: none !important;
-}
-
-/* Modal */
-.modal-backdrop {
-  background: rgba(0,0,0,.4);
-  display: none;
-  height: 100%;
-  left: 0;
-  overflow: auto;
-  position: fixed;
-  top: 0;
-  width: 100%;
-  z-index: 9900;
-}
-
-.modal {
-  background: #F6F6F6;
-  bottom: 0;
-  box-shadow: 2px 2px 4px 0 rgba(0,0,0,.11);
-  display: none;
-  border-radius: 10px;
-  height: 95%;
-  left: 0;
-  margin: auto;
-  max-height: 648px;
-  max-width: 460px;
-  overflow: auto;
-  position: fixed;
-  right: 0;
-  top: 0;
-  width: 80%;
-  z-index: 9999;
-}
-
-.modal-open { display: block; }
-
-.modal-content {
-  padding: 40px 24px 8px 24px;
-  position: relative;
-}
-
-.modal-content iframe { margin: 0 auto; }
-
-.modal-button-open {
-  cursor: pointer;
-  text-align: center;
-}
-
-.modal-button-open-img {
-  height: 358px;
-}
-
-.modal-button-open-img:hover img { opacity: 0.9; }
-
-.modal-button-close {
-  background: transparent;
-  border-radius: 0 0 0 4px;
-  border: 0;
-  color: #555;
-  font-size: 1.2em;
-  font-weight: bolder;
-  line-height: 32px;
-  margin: 0;
-  padding: 0 12px;
-  position: absolute;
-  right: 0;
-  top: 0;
-}
-
-.modal-button-close:active,
-.modal-button-close:focus,
-.modal-button-close:hover {
-  background: #EAF8FD;
-  outline: none;
-}
-
-@media screen and (max-width: 680px) {
-  .container {
-    padding-top: 100px;
-  }
-
-  .nav-docs {
-    padding-top: 103px;
-  }
-}
-
-.post {
-  margin-bottom: 30px;
-}
-
-.pagination {
-  margin-bottom: 30px;
-  width: 100%;
-  overflow: hidden;
-}
-
-.pagination .next {
-  float: right;
-}
-
-div[data-twttr-id] iframe {
-  margin: 10px auto !important;
-}
-
-.three-column {
-  *zoom: 1;
-}
-
-.three-column:before, .three-column:after {
-  content: " ";
-  display: table;
-}
-
-.three-column:after {
-  clear: both;
-}
-
-.three-column>ul {
-  float: left;
-  margin-left: 30px;
-  width: 190px;
-}
-
-.three-column > ul:first-child {
-  margin-left: 20px;
-}
-
-.home-why {
-  margin-top: 25px;
-}
-
-.home-why h3 {
-  text-align: center;
-}
-
-.home-why .blurb {
-  margin-bottom: 20px;
-  text-align: center;
-}
-
-.home-why .list {
-  margin: 0 auto;
-  max-width: 460px;
-}
-
-.home-getting-started {
-  width: 500px;
-  margin: 20px auto 40px auto;
-}
-
-.home-getting-started h3 {
-  text-align: center;
-}
-
-
-.props {
-  background-color: hsl(198, 100%, 96%);
-}
-
-.compactProps {
-  border-left: 2px solid hsl(198, 100%, 94%);
-  margin-left: 20px;
-  padding-left: 5px;
-}
-
-.props > .prop:nth-child(2n) {
-  background-color: hsl(198, 100%, 94%);
-}
-
-.propTitle {
-  font-weight: bold;
-  font-size: 16px;
-}
-
-.compactProps .propTitle {
-  font-size: 14px;
-  margin-bottom: 0;
-  margin-top: 0;
-}
-
-.compactProps .propTitle div {
-  font-weight: normal;
-  margin-left: 20px;
-}
-
-.methodTitle {
-  font-weight: bold;
-  font-size: 24px;
-  color: $color-reference-title;
-}
-
-.compactProps .methodTitle {
-  font-size: 14px;
-  margin-bottom: 0;
-  margin-top: 0;
-}
-
-.compactProps .methodTitle div {
-  font-weight: normal;
-  margin-left: 20px;
-}
-
-.prop {
-  padding: 5px 10px;
-}
-
-.compactProps .prop {
-  padding: 3px 10px;
-}
-
-.propType {
-  font-family: 'source-code-pro', Menlo, 'Courier New', Consolas, monospace;
-  font-weight: normal;
-  font-size: 15px;
-  white-space: pre-wrap;
-}
-
-.compactProps .propType {
-  font-weight: normal;
-  font-size: 13px;
-}
-
-.methodType {
-  font-weight: normal;
-  font-size: 24px;
-}
-
-.compactProps .methodType {
-  font-weight: normal;
-  font-size: 13px;
-}
-
-.platform {
-  background-color: hsl(198, 100%, 87%);
-  border-radius: 5px;
-  margin-right: 5px;
-  padding: 0 5px;
-  font-size: 13px;
-  font-weight: normal;
-  @include vendorize(user-select, none);
-}
-
-.color {
-  display: inline-block;
-  width: 20px;
-  height: 20px;
-  margin-right: 5px;
-  position: relative;
-  top: 5px;
-}
-
-.color::before {
-  content: '';
-  display: block;
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  border: 1px solid rgba(0, 0, 0, 0.2);
-}
-
-.deprecated {
-  margin-bottom: 24px;
-}
-
-.deprecatedTitle {
-  margin-bottom: 6px;
-  line-height: 18px;
-  font-weight: bold;
-  color: #ffa500;
-}
-
-.deprecatedIcon {
-  width: 18px;
-  height: 18px;
-  margin-right: 8px;
-  vertical-align: top;
-}
-
-.deprecatedMessage {
-  margin-left: 26px;
-}
-
-#content {
-  display: none;
-}
-
-
-
-
-table.versions  {
-  width: 60%;
-}
-
-.versions th {
-  width: 20%;
-}
-
-.versions td, .versions th {
-  padding: 2px 5px;
-}
-
-.versions tr:nth-child(2n+1) {
-  background-color: hsl(198, 100%, 94%);
-}
-
-@media only screen
-  and (max-device-width: 1024px) {
-  #content {
-    display: inline;
-  }
-
-  .container {
-    min-width: 0;
-    overflow: auto;
-  }
-  .wrap {
-    width: auto;
-  }
-  .home-getting-started {
-    width: auto;
-  }
-  .inner-content {
-    width: auto;
-    float: none;
-  }
-  .marketing-col {
-    margin-left: 0;
-    float: none;
-    margin-bottom: 30px;
-    text-align: center;
-  }
-  .home-section, .marketing-row {
-    margin: 0;
-  }
-  .nav-main .nav-site a {
-    padding: 0 8px;
-  }
-  .nav-main .nav-home {
-    margin-left: 8px;
-  }
-  .nav-main .wrap {
-    padding: 0;
-  }
-  .home-divider {
-    display: none;
-  }
-  .hero {
-    padding: 10px 0 30px 0;
-  }
-  .prism {
-    padding: 4px 8px;
-    margin-left: -12px;
-    font-size: 11px;
-  }
-  .nav-docs .nav-docs-section {
-    border: none;
-    padding: 0;
-  }
-  h1 {
-    font-size: 30px;
-    line-height: 30px;
-  }
-  ol {
-    margin: 0;
-  }
-}
-
-@media only screen and (max-device-width: 840px) {
-  .showcaseSection .inner-content {
-    width: 100%;
-  }
-
-  .helpSection .inner-content {
-    width: 100%;
-  }
-}
-
-.params, .props {
-  border-spacing: 0;
-  border: 0;
-  border-collapse: collapse;
-}
-
-.params .name, .props .name, .name code {
-  color: #4D4E53;
-}
-
-.params td, .params th, .props td, .props th {
-  border: 1px solid #ddd;
-  margin: 0px;
-  text-align: left;
-  vertical-align: top;
-  padding: 4px 6px;
-  display: table-cell;
-}
-
-.params thead tr, .props thead tr {
-  background-color: hsl(198, 75%, 88%);
-  font-weight: bold;
-}
-
-.params .params thead tr, .props .props thead tr {
-  background-color: #fff;
-  font-weight: bold;
-}
-
-.params th, .props th { border-right: 1px solid #aaa; }
-.params thead .last, .props thead .last { border-right: 1px solid #ddd; }
-
-.params td.description > div > p:first-child,
-.props td.description > div > p:first-child {
-  margin-top: 0;
-  padding-top: 0;
-}
-
-.params td.description > p:last-child,
-.props td.description > p:last-child {
-  margin-bottom: 0;
-  padding-bottom: 0;
-}
-
-.edit-page-block {
-  padding: 5px;
-  margin-bottom: 40px;
-  font-size: 12px;
-  color: #887766;
-  text-align: center;
-  background-color: rgba(5, 165, 209, 0.05);
-}
-
-.banner-crna-ejected {
-  border: 1px solid $color-react-native-blue;
-  border-radius: 3px;
-  margin-bottom: 40px;
-
-  h3 {
-    font-size: 16px;
-    margin: 0;
-    padding: 0 10px;
-    background-color: $color-react-native-blue;
-    color: white;
-  }
-
-  p {
-    padding: 10px;
-    margin: 2px;
-    text-decoration: none !important;
-    background-color: white;
-  }
-}
-
-@import "lib/vendor/prism";
-@import "lib/vendor/algolia";
-@import "hero";
-@import "showcase";
-@import "webplayer";
-@import "help";
-@import "blog";
-@import "footer";

From f36664f7fe17a9282361af775b901e64ca360c5c Mon Sep 17 00:00:00 2001
From: Hawken Rives <hawkrives@gmail.com>
Date: Thu, 30 Mar 2017 16:12:01 -0700
Subject: [PATCH 248/366] Upgrade glob to v7.1.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Summary:
> Explain the **motivation** for making this change. What existing problem does the pull request solve?

Of the three dependencies I have that rely on `glob`, react-native is the only one not on 7.x. If react-native can upgrade, then npm can deduplicate the glob dependency.

```console
$ npm ls glob
├─┬ eslint@3.13.1
│ └── glob@7.1.1
├─┬ jest@18.1.0
│ └─┬ jest-cli@18.1.0
│   └─┬ istanbul-api@1.1.0
│     ├─┬ fileset@2.0.3
│     │ └── glob@7.1.1
│     ├─┬ istanbul-lib-report@1.0.0-alpha.3
│     │ └─┬ rimraf@2.5.4
│     │   └── glob@7.1.1
│     └─┬ istanbul-lib-source-maps@1.1.0
│       └─┬ rimraf@2.5.4
│         └── glob@7.1.1
└─┬ react-native@0.39.2
  ├── glob@5.0.15
  └─┬ rimraf@2.5.4
    └── glob@7.1.1
```

**Test plan (required)**

> Demonstrate the code is solid. Example: The exact commands you ran and their output, screenshots / videos if the pull req
Closes https://github.com/facebook/react-native/pull/11893

Differential Revision: D4796721

Pulled By: javache

fbshipit-source-id: 6e7424dd731329f982c2f6c05b40dec8febf2e57
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 43b74612e52ae7..06452ff6f2a025 100644
--- a/package.json
+++ b/package.json
@@ -164,7 +164,7 @@
     "fbjs-scripts": "^0.7.0",
     "form-data": "^2.1.1",
     "fs-extra": "^1.0.0",
-    "glob": "^5.0.15",
+    "glob": "^7.1.1",
     "graceful-fs": "^4.1.3",
     "image-size": "^0.3.5",
     "immutable": "~3.7.6",

From 5be8d5f63e9e5a5f855a33a320bc39186ae70401 Mon Sep 17 00:00:00 2001
From: Joon Ho Cho <joonho1101@gmail.com>
Date: Thu, 30 Mar 2017 16:12:02 -0700
Subject: [PATCH 249/366] Update xcode dependency from 0.8.9 -> 0.9.1

Summary:
This should resolve the following npm deprecation warning:
```
 WARN deprecated node-uuid@1.4.7: Use uuid module instead
```

Existing tests should cover this already.
Closes https://github.com/facebook/react-native/pull/13194

Differential Revision: D4796723

Pulled By: javache

fbshipit-source-id: 2783f5d04c696b887de2ab2d32805e4661484a83
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 06452ff6f2a025..68513e09f3a4e1 100644
--- a/package.json
+++ b/package.json
@@ -211,7 +211,7 @@
     "worker-farm": "^1.3.1",
     "write-file-atomic": "^1.2.0",
     "ws": "^1.1.0",
-    "xcode": "^0.8.9",
+    "xcode": "^0.9.1",
     "xmldoc": "^0.4.0",
     "xpipe": "^1.0.5",
     "yargs": "^6.4.0"

From 7773f25756b08cd249bbc9e9dd93201fbe1db492 Mon Sep 17 00:00:00 2001
From: Aaron Chiu <aaronechiu@fb.com>
Date: Thu, 30 Mar 2017 16:18:39 -0700
Subject: [PATCH 250/366] move us off AsyncTask

Reviewed By: achen1

Differential Revision: D4795134

fbshipit-source-id: 70979e3fae6dcd63d535290659c87de82f9617c3
---
 .../facebook/react/ReactInstanceManager.java  | 87 ++++++++++++++++---
 .../react/ReactInstanceManagerBuilder.java    |  9 +-
 2 files changed, 81 insertions(+), 15 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
index 3f97a282838622..97f6f5142d5f5a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
@@ -125,6 +125,7 @@ public interface ReactInstanceEventListener {
   private LifecycleState mLifecycleState;
   private @Nullable ReactContextInitParams mPendingReactContextInitParams;
   private @Nullable ReactContextInitAsyncTask mReactContextInitAsyncTask;
+  private @Nullable Thread mCreateReactContextThread;
 
   /* accessed from any thread */
   private final @Nullable JSBundleLoader mBundleLoader; /* path to JS bundle on file system */
@@ -146,6 +147,7 @@ public interface ReactInstanceEventListener {
   private final JSCConfig mJSCConfig;
   private final boolean mLazyNativeModulesEnabled;
   private final boolean mLazyViewManagersEnabled;
+  private final boolean mUseStartupThread;
 
   private final ReactInstanceDevCommandsHandler mDevInterface =
       new ReactInstanceDevCommandsHandler() {
@@ -199,7 +201,7 @@ public JSBundleLoader getJsBundleLoader() {
    * be executing one at time, see {@link #recreateReactContextInBackground()}.
    */
   private final class ReactContextInitAsyncTask extends
-      AsyncTask<ReactContextInitParams, Void, Result<ReactApplicationContext>> {
+    AsyncTask<ReactContextInitParams, Void, Result<ReactApplicationContext>> {
     @Override
     protected void onPreExecute() {
       if (mCurrentReactContext != null) {
@@ -242,8 +244,8 @@ protected void onPostExecute(Result<ReactApplicationContext> result) {
       // Handle enqueued request to re-initialize react context.
       if (mPendingReactContextInitParams != null) {
         recreateReactContextInBackground(
-            mPendingReactContextInitParams.getJsExecutorFactory(),
-            mPendingReactContextInitParams.getJsBundleLoader());
+          mPendingReactContextInitParams.getJsExecutorFactory(),
+          mPendingReactContextInitParams.getJsBundleLoader());
         mPendingReactContextInitParams = null;
       }
     }
@@ -315,7 +317,8 @@ public static ReactInstanceManagerBuilder builder() {
     JSCConfig jscConfig,
     @Nullable RedBoxHandler redBoxHandler,
     boolean lazyNativeModulesEnabled,
-    boolean lazyViewManagersEnabled) {
+    boolean lazyViewManagersEnabled,
+    boolean useStartupThread) {
 
     initializeSoLoaderIfNecessary(applicationContext);
 
@@ -344,6 +347,7 @@ public static ReactInstanceManagerBuilder builder() {
     mJSCConfig = jscConfig;
     mLazyNativeModulesEnabled = lazyNativeModulesEnabled;
     mLazyViewManagersEnabled = lazyViewManagersEnabled;
+    mUseStartupThread = useStartupThread;
   }
 
   public DevSupportManager getDevSupportManager() {
@@ -612,6 +616,11 @@ public void destroy() {
       mReactContextInitAsyncTask.cancel(true);
     }
 
+    if (mCreateReactContextThread != null) {
+      mCreateReactContextThread.interrupt();
+      mCreateReactContextThread = null;
+    }
+
     mMemoryPressureRouter.destroy(mApplicationContext);
 
     if (mCurrentReactContext != null) {
@@ -686,7 +695,9 @@ public void attachMeasuredRootView(ReactRootView rootView) {
 
     // If react context is being created in the background, JS application will be started
     // automatically when creation completes, as root view is part of the attached root view list.
-    if (mReactContextInitAsyncTask == null && mCurrentReactContext != null) {
+    if (mReactContextInitAsyncTask == null &&
+      mCreateReactContextThread == null &&
+      mCurrentReactContext != null) {
       attachMeasuredRootViewToInstance(rootView, mCurrentReactContext.getCatalystInstance());
     }
   }
@@ -768,19 +779,67 @@ private void recreateReactContextInBackground(
       JSBundleLoader jsBundleLoader) {
     UiThreadUtil.assertOnUiThread();
 
-    ReactContextInitParams initParams =
-        new ReactContextInitParams(jsExecutorFactory, jsBundleLoader);
-    if (mReactContextInitAsyncTask == null) {
-      // No background task to create react context is currently running, create and execute one.
-      mReactContextInitAsyncTask = new ReactContextInitAsyncTask();
-      mReactContextInitAsyncTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, initParams);
+    final ReactContextInitParams initParams = new ReactContextInitParams(
+      jsExecutorFactory,
+      jsBundleLoader);
+    if (mUseStartupThread) {
+      if (mCreateReactContextThread == null) {
+        runCreateReactContextOnNewThread(initParams);
+      } else {
+        mPendingReactContextInitParams = initParams;
+      }
     } else {
-      // Background task is currently running, queue up most recent init params to recreate context
-      // once task completes.
-      mPendingReactContextInitParams = initParams;
+      if (mReactContextInitAsyncTask == null) {
+        // No background task to create react context is currently running, create and execute one.
+        mReactContextInitAsyncTask = new ReactContextInitAsyncTask();
+        mReactContextInitAsyncTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, initParams);
+      } else {
+        // Background task is currently running, queue up most recent init params to recreate context
+        // once task completes.
+        mPendingReactContextInitParams = initParams;
+      }
     }
   }
 
+  private void runCreateReactContextOnNewThread(final ReactContextInitParams initParams) {
+    if (mCurrentReactContext != null) {
+      tearDownReactContext(mCurrentReactContext);
+      mCurrentReactContext = null;
+    }
+
+    mCreateReactContextThread = new Thread(new Runnable() {
+      @Override
+      public void run() {
+        try {
+          final ReactApplicationContext reactApplicationContext = createReactContext(
+            initParams.getJsExecutorFactory().create(),
+            initParams.getJsBundleLoader());
+          ReactMarker.logMarker(PRE_SETUP_REACT_CONTEXT_START);
+          UiThreadUtil.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+              mCreateReactContextThread = null;
+              try {
+                setupReactContext(reactApplicationContext);
+              } catch (Exception e) {
+                mDevSupportManager.handleException(e);
+              }
+
+              if (mPendingReactContextInitParams != null) {
+                runCreateReactContextOnNewThread(mPendingReactContextInitParams);
+                mPendingReactContextInitParams = null;
+              }
+            }
+          });
+        } catch (Exception e) {
+          mDevSupportManager.handleException(e);
+        }
+      }
+    });
+    mCreateReactContextThread.setPriority(Thread.MAX_PRIORITY);
+    mCreateReactContextThread.start();
+  }
+
   private void setupReactContext(ReactApplicationContext reactContext) {
     ReactMarker.logMarker(PRE_SETUP_REACT_CONTEXT_END);
     ReactMarker.logMarker(SETUP_REACT_CONTEXT_START);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java
index d77020bb4615e1..4acf65dd0978b7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java
@@ -42,6 +42,7 @@ public class ReactInstanceManagerBuilder {
   protected @Nullable RedBoxHandler mRedBoxHandler;
   protected boolean mLazyNativeModulesEnabled;
   protected boolean mLazyViewManagersEnabled;
+  protected boolean mUseStartupThread;
 
   /* package protected */ ReactInstanceManagerBuilder() {
   }
@@ -186,6 +187,11 @@ public ReactInstanceManagerBuilder setLazyViewManagersEnabled(boolean lazyViewMa
     return this;
   }
 
+  public ReactInstanceManagerBuilder setUseStartupThread(boolean useStartupThread) {
+    mUseStartupThread = useStartupThread;
+    return this;
+  }
+
   /**
    * Instantiates a new {@link ReactInstanceManager}.
    * Before calling {@code build}, the following must be called:
@@ -230,6 +236,7 @@ public ReactInstanceManager build() {
       mJSCConfig,
       mRedBoxHandler,
       mLazyNativeModulesEnabled,
-      mLazyViewManagersEnabled);
+      mLazyViewManagersEnabled,
+      mUseStartupThread);
   }
 }

From 7db16a4020035a5528a7acc5209d67603ee0a6e6 Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieterdb@fb.com>
Date: Thu, 30 Mar 2017 16:35:21 -0700
Subject: [PATCH 251/366] Remove RelayFBPreloadedModules, error on overlapping
 modules

Reviewed By: davidaurelio

Differential Revision: D4779671

fbshipit-source-id: f2dfeb696baab457769c22ca7ab28972270e5fc0
---
 packager/src/Bundler/Bundle.js                |  2 +-
 packager/src/Bundler/__tests__/Bundle-test.js | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/packager/src/Bundler/Bundle.js b/packager/src/Bundler/Bundle.js
index b6bedf22a30574..2823e7ed21a113 100644
--- a/packager/src/Bundler/Bundle.js
+++ b/packager/src/Bundler/Bundle.js
@@ -420,7 +420,7 @@ function createGroups(ramGroups: Array<string>, lazyModules) {
       // print a warning for each removed module
       const parentNames = parents.map(byId.get, byId);
       const lastName = parentNames.pop();
-      console.warn(
+      throw new Error(
         /* $FlowFixMe: this assumes the element exists. */
         `Module ${byId.get(moduleId)} belongs to groups ${
           parentNames.join(', ')}, and ${lastName
diff --git a/packager/src/Bundler/__tests__/Bundle-test.js b/packager/src/Bundler/__tests__/Bundle-test.js
index a35770cd8786b4..134abf6da1c523 100644
--- a/packager/src/Bundler/__tests__/Bundle-test.js
+++ b/packager/src/Bundler/__tests__/Bundle-test.js
@@ -330,13 +330,10 @@ describe('Bundle', () => {
 
     it('omits modules that are contained by more than one group', () => {
       bundle = createBundle([fsLocation('React'), fsLocation('OtherFramework')]);
-      const {groups} = bundle.getUnbundle();
-      expect(groups).toEqual(new Map([
-        [idFor('React'),
-          new Set(['ReactFoo', 'ReactBar', 'cx'].map(idFor))],
-        [idFor('OtherFramework'),
-          new Set(['OtherFrameworkFoo', 'OtherFrameworkBar', 'crc32'].map(idFor))],
-      ]));
+      expect(() => {
+        const {groups} = bundle.getUnbundle(); //eslint-disable-line no-unused-vars
+      }).toThrow(new Error(`Module ${fsLocation('invariant')} belongs to groups ${fsLocation('React')}` +
+        `, and ${fsLocation('OtherFramework')}. Removing it from all groups.`));
     });
 
     it('ignores missing dependencies', () => {

From d4aa42a4ac6f1d6e45eea27a6f8ab37d6e80b78e Mon Sep 17 00:00:00 2001
From: Brian Vaughn <bvaughn@fb.com>
Date: Thu, 30 Mar 2017 17:06:51 -0700
Subject: [PATCH 252/366] Show more meaningful error stack in ReactNative
 redbox

Reviewed By: yungsters

Differential Revision: D4797372

fbshipit-source-id: 069c013bcc3d58dd38a25979f4a04aed5fc1dde6
---
 .../src/renderers/native/ReactNativeFiber.js  |  9 +++
 .../native/ReactNativeFiberErrorDialog.js     | 57 +++++++++++++++++++
 .../shared/fiber/ReactFiberErrorLogger.js     | 23 ++++++--
 .../shared/fiber/ReactFiberScheduler.js       |  3 +
 4 files changed, 86 insertions(+), 6 deletions(-)
 create mode 100644 Libraries/Renderer/src/renderers/native/ReactNativeFiberErrorDialog.js

diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeFiber.js b/Libraries/Renderer/src/renderers/native/ReactNativeFiber.js
index a43e51f2088c35..0b05e0d32a54fa 100644
--- a/Libraries/Renderer/src/renderers/native/ReactNativeFiber.js
+++ b/Libraries/Renderer/src/renderers/native/ReactNativeFiber.js
@@ -12,10 +12,12 @@
 
 'use strict';
 
+const ReactFiberErrorLogger = require('ReactFiberErrorLogger');
 const ReactFiberReconciler = require('ReactFiberReconciler');
 const ReactGenericBatching = require('ReactGenericBatching');
 const ReactNativeAttributePayload = require('ReactNativeAttributePayload');
 const ReactNativeComponentTree = require('ReactNativeComponentTree');
+const ReactNativeFiberErrorDialog = require('ReactNativeFiberErrorDialog');
 const ReactNativeFiberHostComponent = require('ReactNativeFiberHostComponent');
 const ReactNativeInjection = require('ReactNativeInjection');
 const ReactNativeTagHandles = require('ReactNativeTagHandles');
@@ -377,6 +379,13 @@ findNodeHandle.injection.injectFindNode((fiber: Fiber) =>
   NativeRenderer.findHostInstance(fiber));
 findNodeHandle.injection.injectFindRootNodeID(instance => instance);
 
+
+// Intercept lifecycle errors and ensure they are shown with the correct stack
+// trace within the native redbox component.
+ReactFiberErrorLogger.injection.injectDialog(
+  ReactNativeFiberErrorDialog.showDialog,
+);
+
 const ReactNative = {
   // External users of findNodeHandle() expect the host tag number return type.
   // The injected findNodeHandle() strategy returns the instance wrapper though.
diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeFiberErrorDialog.js b/Libraries/Renderer/src/renderers/native/ReactNativeFiberErrorDialog.js
new file mode 100644
index 00000000000000..3d65ac46630396
--- /dev/null
+++ b/Libraries/Renderer/src/renderers/native/ReactNativeFiberErrorDialog.js
@@ -0,0 +1,57 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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 ReactNativeFiberErrorDialog
+ * @flow
+ */
+
+'use strict';
+
+const ExceptionsManager = require('ExceptionsManager');
+
+import type {CapturedError} from 'ReactFiberScheduler';
+
+/**
+ * Intercept lifecycle errors and ensure they are shown with the correct stack
+ * trace within the native redbox component.
+ */
+function ReactNativeFiberErrorDialog(capturedError: CapturedError): boolean {
+  const {componentStack, error} = capturedError;
+
+  let errorMessage: string;
+  let errorStack: string;
+  let errorType: Class<Error>;
+
+  // Typically Errors are thrown but eg strings or null can be thrown as well.
+  if (error && typeof error === 'object') {
+    const {message, name} = error;
+
+    const summary = message ? `${name}: ${message}` : name;
+
+    errorMessage = `${summary}\n\nThis error is located at:${componentStack}`;
+    errorStack = error.stack;
+    errorType = error.constructor;
+  } else {
+    errorMessage = `Unspecified error at:${componentStack}`;
+    errorStack = '';
+    errorType = Error;
+  }
+
+  const newError = new errorType(errorMessage);
+  newError.stack = errorStack;
+
+  ExceptionsManager.handleException(newError, false);
+
+  // Return false here to prevent ReactFiberErrorLogger default behavior of
+  // logging error details to console.error. Calls to console.error are
+  // automatically routed to the native redbox controller, which we've already
+  // done above by calling ExceptionsManager.
+  return false;
+}
+
+module.exports.showDialog = ReactNativeFiberErrorDialog;
diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberErrorLogger.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberErrorLogger.js
index 4deb6549322a72..7eb1f746b1e608 100644
--- a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberErrorLogger.js
+++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberErrorLogger.js
@@ -12,14 +12,23 @@
 
 'use strict';
 
-const emptyFunction = require('fbjs/lib/emptyFunction');
 const invariant = require('fbjs/lib/invariant');
 
 import type {CapturedError} from 'ReactFiberScheduler';
 
-let showDialog = emptyFunction;
+const defaultShowDialog = () => true;
+
+let showDialog = defaultShowDialog;
 
 function logCapturedError(capturedError: CapturedError): void {
+  const logError = showDialog(capturedError);
+
+  // Allow injected showDialog() to prevent default console.error logging.
+  // This enables renderers like ReactNative to better manage redbox behavior.
+  if (logError === false) {
+    return;
+  }
+
   if (__DEV__) {
     const {
       componentName,
@@ -85,14 +94,16 @@ function logCapturedError(capturedError: CapturedError): void {
       `React caught an error thrown by one of your components.\n\n${error.stack}`,
     );
   }
-
-  showDialog(capturedError);
 }
 
 exports.injection = {
-  injectDialog(fn: (e: CapturedError) => void) {
+  /**
+   * Display custom dialog for lifecycle errors.
+   * Return false to prevent default behavior of logging to console.error.
+   */
+  injectDialog(fn: (e: CapturedError) => boolean) {
     invariant(
-      showDialog === emptyFunction,
+      showDialog === defaultShowDialog,
       'The custom dialog was already injected.',
     );
     invariant(
diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberScheduler.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberScheduler.js
index 29b74134ec3831..2ffc72f74b8eaa 100644
--- a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberScheduler.js
+++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberScheduler.js
@@ -684,6 +684,9 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
         return null;
       }
     }
+
+    // Without this explicit null return Flow complains of invalid return type
+    return null;
   }
 
   function performUnitOfWork(workInProgress: Fiber): Fiber | null {

From 5f5da4e12298f6d71445aeccfe1e488d26b79cec Mon Sep 17 00:00:00 2001
From: Brent Vatne <brentvatne@gmail.com>
Date: Thu, 30 Mar 2017 18:14:28 -0700
Subject: [PATCH 253/366] Add support for custom log reporter cli option for
 local server

Summary:
In Expo tools such as XDE, exp we listen listen to stdout from the packager process and print it in our own buffer. In the case of XDE, an electron app, our log pane is DOM-based, and before printing each log chunk we need to remove special tty characters and sometimes parse it to get information that we need (eg: progress bar). By using a custom reporter, we can take the raw events and pass them along in a format that is easy to consume by XDE and exp. This same motivation applies to create-react-native-app, where we currently don't show a progress bar in the terminal, but we can with this change.

Create `LogReporter.js` in the root of a project with the CLI changes included in this PR.

```
class LogReporter {
  update(event) {
    console.log(JSON.stringify(event));
  }
}

module.exports = LogReporter;
```

Now, run `react-native start --customLogReporterPath=LogReporter.js` -- all of the raw events will be output as JSON (while the logs
Closes https://github.com/facebook/react-native/pull/13172

Differential Revision: D4795760

Pulled By: hramos

fbshipit-source-id: 80164b2f30e33a3f9965f4865a8404f8640a52c1
---
 local-cli/server/runServer.js | 18 ++++++++++++++++--
 local-cli/server/server.js    |  3 +++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/local-cli/server/runServer.js b/local-cli/server/runServer.js
index 5cc924a3bd4946..595ae927d9de62 100644
--- a/local-cli/server/runServer.js
+++ b/local-cli/server/runServer.js
@@ -10,7 +10,6 @@
 
 const InspectorProxy = require('./util/inspectorProxy.js');
 const ReactPackager = require('../../packager/react-packager');
-const TerminalReporter = require('../../packager/src/lib/TerminalReporter');
 
 const attachHMRServer = require('./util/attachHMRServer');
 const connect = require('connect');
@@ -86,6 +85,21 @@ function getPackagerServer(args, config) {
   const providesModuleNodeModules =
     args.providesModuleNodeModules || defaultProvidesModuleNodeModules;
 
+  let LogReporter;
+  if (args.customLogReporterPath) {
+    try {
+      // First we let require resolve it, so we can require packages in node_modules
+      // as expected. eg: require('my-package/reporter');
+      LogReporter = require(args.customLogReporterPath);
+    } catch(e) {
+      // If that doesn't work, then we next try relative to the cwd, eg:
+      // require('./reporter');
+      LogReporter = require(path.resolve(args.customLogReporterPath));
+    }
+  } else {
+    LogReporter = require('../../packager/src/lib/TerminalReporter');
+  }
+
   return ReactPackager.createServer({
     assetExts: defaultAssetExts.concat(args.assetExts),
     blacklistRE: config.getBlacklistRE(),
@@ -96,7 +110,7 @@ function getPackagerServer(args, config) {
     platforms: defaultPlatforms.concat(args.platforms),
     projectRoots: args.projectRoots,
     providesModuleNodeModules: providesModuleNodeModules,
-    reporter: new TerminalReporter(),
+    reporter: new LogReporter(),
     resetCache: args.resetCache,
     transformModulePath: transformModulePath,
     verbose: args.verbose,
diff --git a/local-cli/server/server.js b/local-cli/server/server.js
index 3d72c8d771bf9c..c09bc7c0bb96cd 100644
--- a/local-cli/server/server.js
+++ b/local-cli/server/server.js
@@ -118,6 +118,9 @@ module.exports = {
   }, {
     command: '--reset-cache, --resetCache',
     description: 'Removes cached files',
+  }, {
+    command: '--custom-log-reporter-path, --customLogReporterPath [string]',
+    description: 'Path to a JavaScript file that exports a log reporter as a replacement for TerminalReporter',
   }, {
     command: '--verbose',
     description: 'Enables logging',

From 0b2ac0ada87598ec650087870bdcc3acd79a2502 Mon Sep 17 00:00:00 2001
From: Marc Horowitz <mhorowitz@fb.com>
Date: Fri, 31 Mar 2017 00:46:13 -0700
Subject: [PATCH 254/366] Support narrower module dependencies

Reviewed By: javache

Differential Revision: D4772632

fbshipit-source-id: 615bf8998a3817364d0f8bd435c95c2c1f1bebed
---
 .../react/bridge/ContextBaseJavaModule.java   | 32 +++++++++++++++++++
 .../modules/clipboard/ClipboardModule.java    | 13 ++++----
 .../jni/xreact/jni/ModuleRegistryBuilder.cpp  | 16 ++++++----
 .../clipboard/ClipboardModuleTest.java        |  2 +-
 4 files changed, 49 insertions(+), 14 deletions(-)
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/bridge/ContextBaseJavaModule.java

diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ContextBaseJavaModule.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ContextBaseJavaModule.java
new file mode 100644
index 00000000000000..8f3471819294f9
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ContextBaseJavaModule.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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.
+ */
+
+package com.facebook.react.bridge;
+
+import android.content.Context;
+
+/**
+ * Base class for React native modules that require access to an Android
+ * {@link Context} instance.
+ */
+public abstract class ContextBaseJavaModule extends BaseJavaModule {
+
+  private final Context mContext;
+
+  public ContextBaseJavaModule(Context context) {
+    mContext = context;
+  }
+
+  /**
+   * Subclasses can use this method to access Android context passed as a constructor
+   */
+  protected final Context getContext() {
+    return mContext;
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/ClipboardModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/ClipboardModule.java
index 52001079580407..62187356b814c6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/ClipboardModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/ClipboardModule.java
@@ -12,10 +12,10 @@
 import android.annotation.SuppressLint;
 import android.content.ClipboardManager;
 import android.content.ClipData;
+import android.content.Context;
 import android.os.Build;
 
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.module.annotations.ReactModule;
@@ -24,10 +24,10 @@
  * A module that allows JS to get/set clipboard contents.
  */
 @ReactModule(name = "Clipboard")
-public class ClipboardModule extends ReactContextBaseJavaModule {
+public class ClipboardModule extends ContextBaseJavaModule {
 
-  public ClipboardModule(ReactApplicationContext reactContext) {
-    super(reactContext);
+  public ClipboardModule(Context context) {
+    super(context);
   }
 
   @Override
@@ -36,7 +36,7 @@ public String getName() {
   }
 
   private ClipboardManager getClipboardService() {
-    return (ClipboardManager) getReactApplicationContext().getSystemService(getReactApplicationContext().CLIPBOARD_SERVICE);
+    return (ClipboardManager) getContext().getSystemService(getContext().CLIPBOARD_SERVICE);
   }
 
   @ReactMethod
@@ -60,7 +60,6 @@ public void getString(Promise promise) {
   @SuppressLint("DeprecatedMethod")
   @ReactMethod
   public void setString(String text) {
-    ReactApplicationContext reactContext = getReactApplicationContext();
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
       ClipData clipdata = ClipData.newPlainText(null, text);
       ClipboardManager clipboard = getClipboardService();
diff --git a/ReactAndroid/src/main/jni/xreact/jni/ModuleRegistryBuilder.cpp b/ReactAndroid/src/main/jni/xreact/jni/ModuleRegistryBuilder.cpp
index 0dd0c4836260ba..95e33b71410e93 100644
--- a/ReactAndroid/src/main/jni/xreact/jni/ModuleRegistryBuilder.cpp
+++ b/ReactAndroid/src/main/jni/xreact/jni/ModuleRegistryBuilder.cpp
@@ -35,13 +35,17 @@ std::unique_ptr<ModuleRegistry> buildModuleRegistry(
     jni::alias_ref<jni::JCollection<ModuleHolder::javaobject>::javaobject> cxxModules,
     std::shared_ptr<MessageQueueThread> moduleMessageQueue) {
   std::vector<std::unique_ptr<NativeModule>> modules;
-  for (const auto& jm : *javaModules) {
-    modules.emplace_back(folly::make_unique<JavaNativeModule>(
-      winstance, jm, moduleMessageQueue));
+  if (javaModules) {
+    for (const auto& jm : *javaModules) {
+      modules.emplace_back(folly::make_unique<JavaNativeModule>(
+                             winstance, jm, moduleMessageQueue));
+    }
   }
-  for (const auto& cm : *cxxModules) {
-    modules.emplace_back(folly::make_unique<CxxNativeModule>(
-      winstance, cm->getName(), cm->getProvider(), moduleMessageQueue));
+  if (cxxModules) {
+    for (const auto& cm : *cxxModules) {
+      modules.emplace_back(folly::make_unique<CxxNativeModule>(
+                             winstance, cm->getName(), cm->getProvider(), moduleMessageQueue));
+    }
   }
   if (modules.empty()) {
     return nullptr;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/clipboard/ClipboardModuleTest.java b/ReactAndroid/src/test/java/com/facebook/react/modules/clipboard/ClipboardModuleTest.java
index 0486ae79f82f5b..adfa1e2eac1a21 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/clipboard/ClipboardModuleTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/clipboard/ClipboardModuleTest.java
@@ -39,7 +39,7 @@ public class ClipboardModuleTest {
 
   @Before
   public void setUp() {
-    mClipboardModule = new ClipboardModule(ReactTestHelper.createCatalystContextForTest());
+    mClipboardModule = new ClipboardModule(RuntimeEnvironment.application);
     mClipboardManager =
         (ClipboardManager) RuntimeEnvironment.application.getSystemService(Context.CLIPBOARD_SERVICE);
   }

From 1916b38a658d335cbe666fe837c9fb5884918cdb Mon Sep 17 00:00:00 2001
From: Marc Horowitz <mhorowitz@fb.com>
Date: Fri, 31 Mar 2017 00:46:14 -0700
Subject: [PATCH 255/366] Support passing a collection of native modules to
 JSContext

Reviewed By: javache

Differential Revision: D4772649

fbshipit-source-id: dd9353edb0c2c013a3b7fe772231db12cdd8cdae
---
 Libraries/BatchedBridge/MessageQueue.js                      | 5 +++--
 ReactAndroid/src/main/java/com/facebook/react/cxxbridge/BUCK | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Libraries/BatchedBridge/MessageQueue.js b/Libraries/BatchedBridge/MessageQueue.js
index 80c27443b2c0c9..ac4c2a2bc32ada 100644
--- a/Libraries/BatchedBridge/MessageQueue.js
+++ b/Libraries/BatchedBridge/MessageQueue.js
@@ -182,10 +182,11 @@ class MessageQueue {
     const now = new Date().getTime();
     if (global.nativeFlushQueueImmediate &&
         (now - this._lastFlush >= MIN_TIME_BETWEEN_FLUSHES_MS ||
-        this._inCall === 0)) {
-      global.nativeFlushQueueImmediate(this._queue);
+         this._inCall === 0)) {
+      var queue = this._queue;
       this._queue = [[], [], [], this._callID];
       this._lastFlush = now;
+      global.nativeFlushQueueImmediate(queue);
     }
     Systrace.counterEvent('pending_js_to_native_queue', this._queue[0].length);
     if (__DEV__ && this.__spy && isFinite(moduleID)) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/BUCK b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/BUCK
index 2016d67eaae345..42c40aa1e981fc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/BUCK
@@ -6,6 +6,7 @@ android_library(
     exported_deps = [
         react_native_dep("java/com/facebook/jni:jni"),
         react_native_dep("java/com/facebook/proguard/annotations:annotations"),
+        react_native_target("java/com/facebook/react/bridge:bridge"),
     ],
     proguard_config = "bridge.pro",
     visibility = [
@@ -26,7 +27,6 @@ android_library(
         #    '//native/react/jni:jni-internal',
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
-        react_native_target("java/com/facebook/react/bridge:bridge"),
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/devsupport:devsupport"),
         react_native_target("java/com/facebook/react/module/model:model"),

From ec4b85467db3a354e26f03d33ff0d703cf1b1585 Mon Sep 17 00:00:00 2001
From: Marc Horowitz <mhorowitz@fb.com>
Date: Fri, 31 Mar 2017 00:46:17 -0700
Subject: [PATCH 256/366] Allow DeviceInfoModule to be instantiated with only
 an android Context

Reviewed By: javache

Differential Revision: D4772673

fbshipit-source-id: 80894faa076ccfddf0fe28bd4d7b6aaeba6c38a5
---
 .../modules/deviceinfo/DeviceInfoModule.java  | 30 ++++++++++++++-----
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java
index c7b5324145225b..e768259e34a784 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java
@@ -14,12 +14,13 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import android.content.Context;
 import android.util.DisplayMetrics;
 
 import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.BaseJavaModule;
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
@@ -29,16 +30,21 @@
  * Module that exposes Android Constants to JS.
  */
 @ReactModule(name = "DeviceInfo")
-public class DeviceInfoModule extends ReactContextBaseJavaModule implements
+public class DeviceInfoModule extends BaseJavaModule implements
     LifecycleEventListener {
 
+  private @Nullable ReactApplicationContext mReactApplicationContext;
   private float mFontScale;
 
-  public DeviceInfoModule(
-      ReactApplicationContext reactContext) {
-    super(reactContext);
+  public DeviceInfoModule(ReactApplicationContext reactContext) {
+    this((Context) reactContext);
+    mReactApplicationContext = reactContext;
+  }
 
-    mFontScale = getReactApplicationContext().getResources().getConfiguration().fontScale;
+  public DeviceInfoModule(Context context) {
+    mReactApplicationContext = null;
+    DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(context);
+    mFontScale = context.getResources().getConfiguration().fontScale;
   }
 
   @Override
@@ -57,7 +63,11 @@ public String getName() {
 
   @Override
   public void onHostResume() {
-    float fontScale = getReactApplicationContext().getResources().getConfiguration().fontScale;
+    if (mReactApplicationContext == null) {
+      return;
+    }
+
+    float fontScale = mReactApplicationContext.getResources().getConfiguration().fontScale;
     if (mFontScale != fontScale) {
       mFontScale = fontScale;
       emitUpdateDimensionsEvent();
@@ -73,7 +83,11 @@ public void onHostDestroy() {
   }
 
   public void emitUpdateDimensionsEvent() {
-    getReactApplicationContext()
+    if (mReactApplicationContext == null) {
+      return;
+    }
+
+    mReactApplicationContext
         .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
         .emit("didUpdateDimensions", getDimensionsConstants());
   }

From b80e2c8799cc2ef76c77752bbf00be849b0be6b1 Mon Sep 17 00:00:00 2001
From: Brent Vatne <brentvatne@gmail.com>
Date: Fri, 31 Mar 2017 02:10:00 -0700
Subject: [PATCH 257/366] Move packager initialization events to reporter

Summary:
This PR depends on #13172

Packager events are mostly logged through the TerminalReporter by default (#13172 makes this configurable). But there are a few things that aren't passed through TerminalReporter.

- We [log a banner with some information about the port and what's going on](https://github.com/facebook/react-native/blob/8c7b32d5f1da34613628b4b8e0474bc1e185a618/local-cli/server/server.js#L22-L32)
- Also [a message about looking for JS files](https://github.com/facebook/react-native/blob/8c7b32d5f1da34613628b4b8e0474bc1e185a618/local-cli/server/server.js#L34-L38) (not sure what that is for / if it is useful beyond telling the user what directory root they started the packager in, but that's another thing).
- If the packager fails to start, then [we log an error message](https://github.com/facebook/react-native/blob/8c7b32d5f1da34613628b4b8e0474bc1e185a618/local-cli/server/server.js#L41-L61).

This pull request changes those log messages to be handled by TerminalReporter. I tri
Closes https://github.com/facebook/react-native/pull/13209

Differential Revision: D4809759

Pulled By: davidaurelio

fbshipit-source-id: 2c427ec0c1accaf54bf6b2d1da882cd6bfaa7829
---
 local-cli/server/runServer.js        |  6 ++-
 local-cli/server/server.js           | 65 ++++++++++------------------
 packager/src/lib/TerminalReporter.js | 60 +++++++++++++++++++++++++
 packager/src/lib/reporting.js        | 10 +++++
 4 files changed, 96 insertions(+), 45 deletions(-)

diff --git a/local-cli/server/runServer.js b/local-cli/server/runServer.js
index 595ae927d9de62..a9cccbf35da51d 100644
--- a/local-cli/server/runServer.js
+++ b/local-cli/server/runServer.js
@@ -30,10 +30,12 @@ const systraceProfileMiddleware = require('./middleware/systraceProfileMiddlewar
 const unless = require('./middleware/unless');
 const webSocketProxy = require('./util/webSocketProxy.js');
 
-function runServer(args, config, readyCallback) {
+function runServer(args, config, startedCallback, readyCallback) {
   var wsProxy = null;
   var ms = null;
   const packagerServer = getPackagerServer(args, config);
+  startedCallback(packagerServer._reporter);
+
   const inspectorProxy = new InspectorProxy();
   const app = connect()
     .use(loadRawBodyMiddleware)
@@ -67,7 +69,7 @@ function runServer(args, config, readyCallback) {
       wsProxy = webSocketProxy.attachToServer(serverInstance, '/debugger-proxy');
       ms = messageSocket.attachToServer(serverInstance, '/message');
       inspectorProxy.attachToServer(serverInstance, '/inspector');
-      readyCallback();
+      readyCallback(packagerServer._reporter);
     }
   );
   // Disable any kind of automatic timeout behavior for incoming
diff --git a/local-cli/server/server.js b/local-cli/server/server.js
index c09bc7c0bb96cd..4825fc9a02bccb 100644
--- a/local-cli/server/server.js
+++ b/local-cli/server/server.js
@@ -8,8 +8,6 @@
  */
 'use strict';
 
-const chalk = require('chalk');
-const formatBanner = require('./formatBanner');
 const path = require('path');
 const runServer = require('./runServer');
 
@@ -19,50 +17,31 @@ const runServer = require('./runServer');
 function server(argv, config, args) {
   args.projectRoots = args.projectRoots.concat(args.root);
 
-  console.log(formatBanner(
-    'Running packager on port ' + args.port + '.\n\n' +
-    'Keep this packager running while developing on any JS projects. ' +
-    'Feel free to close this tab and run your own packager instance if you ' +
-    'prefer.\n\n' +
-    'https://github.com/facebook/react-native', {
-      marginLeft: 1,
-      marginRight: 1,
-      paddingBottom: 1,
-    })
-  );
+  const startedCallback = logReporter => {
+    logReporter.update({
+      type: 'initialize_packager_started',
+      port: args.port,
+      projectRoots: args.projectRoots,
+    });
 
-  console.log(
-    'Looking for JS files in\n  ',
-    chalk.dim(args.projectRoots.join('\n   ')),
-    '\n'
-  );
+    process.on('uncaughtException', error => {
+      logReporter.update({
+        type: 'initialize_packager_failed',
+        port: args.port,
+        error,
+      });
 
-  process.on('uncaughtException', error => {
-    if (error.code === 'EADDRINUSE') {
-      console.log(
-        chalk.bgRed.bold(' ERROR '),
-        chalk.red('Packager can\'t listen on port', chalk.bold(args.port))
-      );
-      console.log('Most likely another process is already using this port');
-      console.log('Run the following command to find out which process:');
-      console.log('\n  ', chalk.bold('lsof -i :' + args.port), '\n');
-      console.log('Then, you can either shut down the other process:');
-      console.log('\n  ', chalk.bold('kill -9 <PID>'), '\n');
-      console.log('or run packager on different port.');
-    } else {
-      console.log(chalk.bgRed.bold(' ERROR '), chalk.red(error.message));
-      const errorAttributes = JSON.stringify(error);
-      if (errorAttributes !== '{}') {
-        console.error(chalk.red(errorAttributes));
-      }
-      console.error(chalk.red(error.stack));
-    }
-    console.log('\nSee', chalk.underline('http://facebook.github.io/react-native/docs/troubleshooting.html'));
-    console.log('for common problems and solutions.');
-    process.exit(11);
-  });
+      process.exit(11);
+    });
+  };
+
+  const readyCallback = logReporter => {
+    logReporter.update({
+      type: 'initialize_packager_done',
+    });
+  };
 
-  runServer(args, config, () => console.log('\nReact packager ready.\n'));
+  runServer(args, config, startedCallback, readyCallback);
 }
 
 module.exports = {
diff --git a/packager/src/lib/TerminalReporter.js b/packager/src/lib/TerminalReporter.js
index 7f63d3b7049cae..40ed87392c6617 100644
--- a/packager/src/lib/TerminalReporter.js
+++ b/packager/src/lib/TerminalReporter.js
@@ -11,11 +11,13 @@
 
 'use strict';
 
+const chalk = require('chalk');
 const path = require('path');
 const reporting = require('./reporting');
 const terminal = require('./terminal');
 const throttle = require('lodash/throttle');
 const util = require('util');
+const formatBanner = require('../../../local-cli/server/formatBanner');
 
 import type {ReportableEvent, GlobalCacheDisabledReason} from './reporting';
 
@@ -133,12 +135,70 @@ class TerminalReporter {
     }
   }
 
+
+  _logPackagerInitializing(port: number, projectRoots: Array<string>) {
+    terminal.log(
+      formatBanner(
+        'Running packager on port ' +
+          port +
+          '.\n\n' +
+          'Keep this packager running while developing on any JS projects. ' +
+          'Feel free to close this tab and run your own packager instance if you ' +
+          'prefer.\n\n' +
+          'https://github.com/facebook/react-native',
+        {
+          marginLeft: 1,
+          marginRight: 1,
+          paddingBottom: 1,
+        }
+      )
+    );
+
+    terminal.log(
+      'Looking for JS files in\n  ',
+      chalk.dim(projectRoots.join('\n   ')),
+      '\n'
+    );
+  }
+
+  _logPackagerInitializingFailed(port: number, error: Error) {
+    if (error.code === 'EADDRINUSE') {
+      terminal.log(
+        chalk.bgRed.bold(' ERROR '),
+        chalk.red("Packager can't listen on port", chalk.bold(port))
+      );
+      terminal.log('Most likely another process is already using this port');
+      terminal.log('Run the following command to find out which process:');
+      terminal.log('\n  ', chalk.bold('lsof -i :' + port), '\n');
+      terminal.log('Then, you can either shut down the other process:');
+      terminal.log('\n  ', chalk.bold('kill -9 <PID>'), '\n');
+      terminal.log('or run packager on different port.');
+    } else {
+      terminal.log(chalk.bgRed.bold(' ERROR '), chalk.red(error.message));
+      const errorAttributes = JSON.stringify(error);
+      if (errorAttributes !== '{}') {
+        terminal.log(chalk.red(errorAttributes));
+      }
+      terminal.log(chalk.red(error.stack));
+    }
+  }
+
+
   /**
    * This function is only concerned with logging and should not do state
    * or terminal status updates.
    */
   _log(event: TerminalReportableEvent): void {
     switch (event.type) {
+      case 'initialize_packager_started':
+        this._logPackagerInitializing(event.port, event.projectRoots);
+        break;
+      case 'initialize_packager_done':
+        terminal.log('\nReact packager ready.\n');
+        break;
+      case 'initialize_packager_failed':
+        this._logPackagerInitializingFailed(event.port, event.error);
+        break;
       case 'bundle_build_done':
         this._logBundleBuildDone(event.entryFilePath);
         break;
diff --git a/packager/src/lib/reporting.js b/packager/src/lib/reporting.js
index d7f92fe81c9742..29994435f580f6 100644
--- a/packager/src/lib/reporting.js
+++ b/packager/src/lib/reporting.js
@@ -23,6 +23,16 @@ export type GlobalCacheDisabledReason = 'too_many_errors' | 'too_many_misses';
  * report to the tool user.
  */
 export type ReportableEvent = {
+  port: number,
+  projectRoots: Array<string>,
+  type: 'initialize_packager_started',
+} | {
+  type: 'initialize_packager_done',
+} | {
+  type: 'initialize_packager_failed',
+  port: number,
+  error: Error,
+} | {
   entryFilePath: string,
   type: 'bundle_build_done',
 } | {

From 01a0e1002633021aafcb69fd2c10f1e893fb2dd8 Mon Sep 17 00:00:00 2001
From: Kirwan Lyster <kirwanlyster@fb.com>
Date: Fri, 31 Mar 2017 02:49:47 -0700
Subject: [PATCH 258/366] Make SystraceRequestListener extend
 BaseRequestListener

Summary: Instead of `SystraceRequestListener` implementing `RequestListener`, this diff instead extends the base implementation.

Reviewed By: massimocarli

Differential Revision: D4796679

fbshipit-source-id: 0c9a0b755f4beff69007688962682989e5af72e0
---
 .../react/modules/fresco/SystraceRequestListener.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/SystraceRequestListener.java b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/SystraceRequestListener.java
index 314a4dffa04d1d..253a361f658e93 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/SystraceRequestListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/SystraceRequestListener.java
@@ -7,14 +7,14 @@
 
 import android.util.Pair;
 
-import com.facebook.imagepipeline.listener.RequestListener;
+import com.facebook.imagepipeline.listener.BaseRequestListener;
 import com.facebook.imagepipeline.request.ImageRequest;
 import com.facebook.systrace.Systrace;
 
 /**
  * Logs requests to Systrace
  */
-public class SystraceRequestListener implements RequestListener {
+public class SystraceRequestListener extends BaseRequestListener {
 
   int mCurrentID = 0;
   Map<String, Pair<Integer,String>> mProducerID = new HashMap<>();

From 8daf985fc321abd3fc08ca059c40d649e0bb919b Mon Sep 17 00:00:00 2001
From: Koen Punt <koen@koenpunt.nl>
Date: Fri, 31 Mar 2017 02:58:02 -0700
Subject: [PATCH 259/366] match plist indentation with xcode format

Summary:
xcode has its own way of indentation of the plist.

fixes #11668
Closes https://github.com/facebook/react-native/pull/11670

Differential Revision: D4410865

fbshipit-source-id: 8c65e7719d228b07f58b1ccb86b369e319067f02
---
 local-cli/link/__fixtures__/Info.plist        | 12 +++++
 .../link/__tests__/ios/writePlist.spec.js     | 52 +++++++++++++++++++
 local-cli/link/ios/copyAssets.js              |  8 +--
 local-cli/link/ios/unlinkAssets.js            |  8 +--
 local-cli/link/ios/writePlist.js              | 24 +++++++++
 5 files changed, 92 insertions(+), 12 deletions(-)
 create mode 100644 local-cli/link/__fixtures__/Info.plist
 create mode 100644 local-cli/link/__tests__/ios/writePlist.spec.js
 create mode 100644 local-cli/link/ios/writePlist.js

diff --git a/local-cli/link/__fixtures__/Info.plist b/local-cli/link/__fixtures__/Info.plist
new file mode 100644
index 00000000000000..b2e7b96ea03d4e
--- /dev/null
+++ b/local-cli/link/__fixtures__/Info.plist
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+	</array>
+</dict>
+</plist>
diff --git a/local-cli/link/__tests__/ios/writePlist.spec.js b/local-cli/link/__tests__/ios/writePlist.spec.js
new file mode 100644
index 00000000000000..a109d56d603a98
--- /dev/null
+++ b/local-cli/link/__tests__/ios/writePlist.spec.js
@@ -0,0 +1,52 @@
+'use strict';
+
+jest.autoMockOff();
+jest.mock('fs');
+
+let plistPath = null;
+jest.mock('../../ios/getPlistPath', () => () => plistPath);
+
+const { readFileSync } = require.requireActual('fs')
+const fs = require('fs');
+
+const xcode = require('xcode');
+const path = require('path');
+const writePlist = require('../../ios/writePlist');
+
+const projectPath = path.join(__dirname, '../../__fixtures__/project.pbxproj');
+const infoPlistPath = path.join(__dirname, '../../__fixtures__/Info.plist');
+
+fs.__setMockFilesystem({
+  'Basic': {
+    'project.pbxproj': readFileSync(projectPath).toString(),
+  }
+});
+
+const project = xcode.project('/Basic/project.pbxproj');
+
+const plist = {
+  CFBundleDevelopmentRegion: 'en',
+  UISupportedInterfaceOrientations: [
+    'UIInterfaceOrientationPortrait'
+  ]
+};
+
+describe('ios::writePlist', () => {
+  beforeEach(() => {
+    project.parseSync();
+    fs.writeFileSync.mockReset();
+  });
+
+  it('should write a `.plist` file', () => {
+    plistPath = '/Basic/Info.plist';
+    const result = writePlist(project, '/', plist);
+    const infoPlist = readFileSync(infoPlistPath).toString();
+    expect(fs.writeFileSync).toHaveBeenCalledWith(plistPath, infoPlist);
+  });
+
+  it('when plistPath is null it should return null', () => {
+    plistPath = null;
+    expect(writePlist(project, '/', plist)).toBeNull();
+    expect(fs.writeFileSync).not.toHaveBeenCalled();
+  });
+});
diff --git a/local-cli/link/ios/copyAssets.js b/local-cli/link/ios/copyAssets.js
index d2865cbd11fb7e..cc271991fbf3e4 100644
--- a/local-cli/link/ios/copyAssets.js
+++ b/local-cli/link/ios/copyAssets.js
@@ -2,11 +2,10 @@ const fs = require('fs-extra');
 const path = require('path');
 const xcode = require('xcode');
 const log = require('npmlog');
-const plistParser = require('plist');
 const groupFilesByType = require('../groupFilesByType');
 const createGroupWithMessage = require('./createGroupWithMessage');
 const getPlist = require('./getPlist');
-const getPlistPath = require('./getPlistPath');
+const writePlist = require('./writePlist');
 
 /**
  * This function works in a similar manner to its Android version,
@@ -38,8 +37,5 @@ module.exports = function linkAssetsIOS(files, projectConfig) {
     project.writeSync()
   );
 
-  fs.writeFileSync(
-    getPlistPath(project, projectConfig.sourceDir),
-    plistParser.build(plist)
-  );
+  writePlist(project, projectConfig.sourceDir, plist);
 };
diff --git a/local-cli/link/ios/unlinkAssets.js b/local-cli/link/ios/unlinkAssets.js
index 2acad3e2190209..ab31a1b9c7e625 100644
--- a/local-cli/link/ios/unlinkAssets.js
+++ b/local-cli/link/ios/unlinkAssets.js
@@ -2,10 +2,9 @@ const fs = require('fs-extra');
 const path = require('path');
 const xcode = require('xcode');
 const log = require('npmlog');
-const plistParser = require('plist');
 const groupFilesByType = require('../groupFilesByType');
 const getPlist = require('./getPlist');
-const getPlistPath = require('./getPlistPath');
+const writePlist = require('./writePlist');
 const difference = require('lodash').difference;
 
 /**
@@ -47,8 +46,5 @@ module.exports = function unlinkAssetsIOS(files, projectConfig) {
     project.writeSync()
   );
 
-  fs.writeFileSync(
-    getPlistPath(project, projectConfig.sourceDir),
-    plistParser.build(plist)
-  );
+  writePlist(project, projectConfig.sourceDir, plist);
 };
diff --git a/local-cli/link/ios/writePlist.js b/local-cli/link/ios/writePlist.js
new file mode 100644
index 00000000000000..e8fe6715af3071
--- /dev/null
+++ b/local-cli/link/ios/writePlist.js
@@ -0,0 +1,24 @@
+const plistParser = require('plist');
+const getPlistPath = require('./getPlistPath');
+const fs = require('fs');
+
+/**
+ * Writes to Info.plist located in the iOS project
+ *
+ * Returns `null` if INFOPLIST_FILE is not specified or file is non-existent.
+ */
+module.exports = function writePlist(project, sourceDir, plist) {
+  const plistPath = getPlistPath(project, sourceDir);
+
+  if (!plistPath) {
+    return null;
+  }
+
+  // We start with an offset of -1, because Xcode maintains a custom
+  // indentation of the plist.
+  // Ref: https://github.com/facebook/react-native/issues/11668
+  return fs.writeFileSync(
+    plistPath,
+    plistParser.build(plist, { indent: '\t', offset: -1 }) + '\n'
+  );
+};

From e12e57eb77a22497c9616791056b29f2cbf0c0e7 Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieterdb@fb.com>
Date: Fri, 31 Mar 2017 05:21:17 -0700
Subject: [PATCH 260/366] Move bindKeys to RCTBridge setUp

Reviewed By: shergin

Differential Revision: D4794788

fbshipit-source-id: 0839829f4ed010bf2fb2574092a8f68f4c95341a
---
 React/Base/RCTBatchedBridge.m   |  1 -
 React/Base/RCTBridge.m          | 21 ++++++++-------------
 React/Base/RCTModuleMethod.m    | 14 +++++++-------
 React/CxxBridge/RCTCxxBridge.mm |  1 -
 4 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/React/Base/RCTBatchedBridge.m b/React/Base/RCTBatchedBridge.m
index 56c5a6db05e355..f2554c84cbf863 100644
--- a/React/Base/RCTBatchedBridge.m
+++ b/React/Base/RCTBatchedBridge.m
@@ -596,7 +596,6 @@ - (void)stopLoadingWithError:(NSError *)error
  * Prevent super from calling setUp (that'd create another batchedBridge)
  */
 - (void)setUp {}
-- (void)bindKeys {}
 
 - (void)reload
 {
diff --git a/React/Base/RCTBridge.m b/React/Base/RCTBridge.m
index b7d8bb83931ba1..3939fb618d1581 100644
--- a/React/Base/RCTBridge.m
+++ b/React/Base/RCTBridge.m
@@ -190,8 +190,6 @@ - (instancetype)initWithDelegate:(id<RCTBridgeDelegate>)delegate
     _launchOptions = [launchOptions copy];
 
     [self setUp];
-
-    RCTExecuteOnMainQueue(^{ [self bindKeys]; });
   }
   return self;
 }
@@ -207,15 +205,6 @@ - (void)dealloc
   [self invalidate];
 }
 
-- (void)bindKeys
-{
-  RCTAssertMainQueue();
-
-#if TARGET_IPHONE_SIMULATOR
-  RCTRegisterReloadCommandListener(self);
-#endif
-}
-
 - (void)didReceiveReloadCommand
 {
   [self reload];
@@ -306,14 +295,20 @@ - (Class)bridgeClass
 
 - (void)setUp
 {
-  Class bridgeClass = self.bridgeClass;
-
   RCT_PROFILE_BEGIN_EVENT(0, @"-[RCTBridge setUp]", nil);
 
   _performanceLogger = [RCTPerformanceLogger new];
   [_performanceLogger markStartForTag:RCTPLBridgeStartup];
   [_performanceLogger markStartForTag:RCTPLTTI];
 
+  Class bridgeClass = self.bridgeClass;
+
+  #if RCT_DEV
+  RCTExecuteOnMainQueue(^{
+    RCTRegisterReloadCommandListener(self);
+  });
+  #endif
+
   // Only update bundleURL from delegate if delegate bundleURL has changed
   NSURL *previousDelegateURL = _delegateBundleURL;
   _delegateBundleURL = [self.delegate sourceURLForBridge:self];
diff --git a/React/Base/RCTModuleMethod.m b/React/Base/RCTModuleMethod.m
index aa85fa50c5b065..f598ace7787131 100644
--- a/React/Base/RCTModuleMethod.m
+++ b/React/Base/RCTModuleMethod.m
@@ -104,13 +104,13 @@ static RCTNullability RCTParseNullabilityPostfix(const char **input)
 
 // returns YES if execution is safe to proceed (enqueue callback invocation), NO if callback has already been invoked
 static BOOL RCTCheckCallbackMultipleInvocations(BOOL *didInvoke) {
-    if (*didInvoke) {
-        RCTFatal(RCTErrorWithMessage(@"Illegal callback invocation from native module. This callback type only permits a single invocation from native code."));
-        return NO;
-    } else {
-        *didInvoke = YES;
-        return YES;
-    }
+  if (*didInvoke) {
+      RCTFatal(RCTErrorWithMessage(@"Illegal callback invocation from native module. This callback type only permits a single invocation from native code."));
+      return NO;
+  } else {
+      *didInvoke = YES;
+      return YES;
+  }
 }
 
 SEL RCTParseMethodSignature(NSString *, NSArray<RCTMethodArgument *> **);
diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm
index ba429f6a06637b..86bd33b8a68ac1 100644
--- a/React/CxxBridge/RCTCxxBridge.mm
+++ b/React/CxxBridge/RCTCxxBridge.mm
@@ -766,7 +766,6 @@ - (void)handleError:(NSError *)error
  * Prevent super from calling setUp (that'd create another batchedBridge)
  */
 - (void)setUp {}
-- (void)bindKeys {}
 
 - (void)reload
 {

From b133d060575ba831021f30ac1ba36205f631d4f4 Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieterdb@fb.com>
Date: Fri, 31 Mar 2017 08:53:00 -0700
Subject: [PATCH 261/366] Disable flaky PropertiesUpdateTest

Reviewed By: AaaChiuuu

Differential Revision: D4810246

fbshipit-source-id: 76b38522eea9332217b515b7ff225c0073381da9
---
 .../RCTRootViewIntegrationTests.m                    | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/Examples/UIExplorer/UIExplorerIntegrationTests/RCTRootViewIntegrationTests.m b/Examples/UIExplorer/UIExplorerIntegrationTests/RCTRootViewIntegrationTests.m
index 1ff6f6555f2af1..a32cee7540a4ea 100644
--- a/Examples/UIExplorer/UIExplorerIntegrationTests/RCTRootViewIntegrationTests.m
+++ b/Examples/UIExplorer/UIExplorerIntegrationTests/RCTRootViewIntegrationTests.m
@@ -121,13 +121,6 @@ static ControlBlock reactContentSizeUpdateBlock(RCTRootViewSizeFlexibility sizeF
   };
 }
 
-static ControlBlock propertiesUpdateBlock()
-{
-  return ^(RCTRootView *rootView){
-    rootView.appProperties = @{@"markTestPassed":@YES};
-  };
-}
-
 @interface RCTRootViewIntegrationTests : XCTestCase
 
 @end
@@ -162,6 +155,9 @@ - (void)setUp
 RCT_TEST_CONFIGURATION_BLOCK(ReactContentSizeUpdateTest, reactContentSizeUpdateBlock(RCTBoth))
 
 // Test if setting 'appProperties' property updates the RN app
-RCT_TEST_CONFIGURATION_BLOCK(PropertiesUpdateTest, propertiesUpdateBlock())
+// Disabled since it's occassionally crashing
+// RCT_TEST_CONFIGURATION_BLOCK(PropertiesUpdateTest, ^(RCTRootView *rootView) {
+//   rootView.appProperties = @{@"markTestPassed":@YES};
+// })
 
 @end

From 8e925d578b3d8fe221c4df94835d186ce755cc16 Mon Sep 17 00:00:00 2001
From: vivaxy <xyxuye2007@126.com>
Date: Fri, 31 Mar 2017 08:58:31 -0700
Subject: [PATCH 262/366] Update Images.md

Summary:
Remove redundant `\`` mark

Thanks for submitting a PR! Please read these instructions carefully:

- [x] Explain the **motivation** for making this change.
- [x] Provide a **test plan** demonstrating that the code is solid.
- [x] Match the **code formatting** of the rest of the codebase.
- [x] Target the `master` branch, NOT a "stable" branch.

This PR fixes Documentation typo.

No need for test.
Closes https://github.com/facebook/react-native/pull/13228

Differential Revision: D4810457

Pulled By: hramos

fbshipit-source-id: 5c475a5d8b51d4a926e0fc737e2a12805e3bf70b
---
 docs/Images.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Images.md b/docs/Images.md
index 3a3e4456b9bd05..481b160e23071e 100644
--- a/docs/Images.md
+++ b/docs/Images.md
@@ -113,7 +113,7 @@ and the load is considered to have failed.
 ```javascript
 <Image source={{uri: 'https://facebook.github.io/react/img/logo_og.png', cache: 'only-if-cached'}}
        style={{width: 400, height: 400}} />
-````
+```
 
 ## Local Filesystem Images
 

From 7664c276db3819f87aa09e3088ad7d9172957b50 Mon Sep 17 00:00:00 2001
From: Hector Ramos <hramos@fb.com>
Date: Fri, 31 Mar 2017 10:05:03 -0700
Subject: [PATCH 263/366] Temporarily disable Android instrumentation tests

Summary:
Android instrumentation tests keep failing due to `java.lang.RuntimeException: java.lang.RuntimeException: Timed out waiting for JS thread`.

An [earlier job](https://circleci.com/gh/facebook/react-native/17064) based off commit [c31a65](https://github.com/facebook/react-native/commit/c31a65669e80c455757509ab494ac3fa46e96c92) finished successfully, yet [this job](https://circleci.com/gh/facebook/react-native/17070), triggered by the very [next commit](https://github.com/facebook/react-native/commit/e82c2fbbe5ad808609e4e7f477223b655750f8d0), failed Android instrumentation tests even though that commit touches no Android code.

You can see from the [Circle history](https://circleci.com/gh/facebook/react-native/tree/master) that this test has been consistently failing for the same time out reason.

I am disabling Android instrumentation tests as they are not providing any useful signal a this point in time.

Debug and fix instrumentation tests, and re-enable them.
Closes https://github.com/facebook/react-native/pull/13239

Differential Revision: D4810775

Pulled By: hramos

fbshipit-source-id: 8866f9208ec3b5ac5f0ed2f6c2cf58c5b5825830
---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 00cad8d46afdfb..384c2de4590921 100644
--- a/circle.yml
+++ b/circle.yml
@@ -73,7 +73,7 @@ test:
     # build test APK
     - buck install ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=1
     # run installed apk with tests
-    - node ./scripts/run-android-ci-instrumentation-tests.js --retries 3 --path ./ReactAndroid/src/androidTest/java/com/facebook/react/tests --package com.facebook.react.tests
+    # - node ./scripts/run-android-ci-instrumentation-tests.js --retries 3 --path ./ReactAndroid/src/androidTest/java/com/facebook/react/tests --package com.facebook.react.tests
 
     # Android e2e test
     - source scripts/circle-ci-android-setup.sh && retry3 node ./scripts/run-ci-e2e-tests.js --android --js --retries 2

From 3ef2055ee9c04c44a7b3f3465021743fd6fb4425 Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Fri, 31 Mar 2017 10:09:31 -0700
Subject: [PATCH 264/366] packager: sync Module#read()

Reviewed By: davidaurelio

Differential Revision: D4802783

fbshipit-source-id: c6309bcae6ad48bea2350de04353f694be6eea2f
---
 packager/src/node-haste/AssetModule.js        |  12 +-
 .../DependencyGraph/ResolutionRequest.js      |  19 ++-
 packager/src/node-haste/Module.js             | 108 +++++++++++++-----
 3 files changed, 97 insertions(+), 42 deletions(-)

diff --git a/packager/src/node-haste/AssetModule.js b/packager/src/node-haste/AssetModule.js
index 9306ba03559b87..4d0687876a49a5 100644
--- a/packager/src/node-haste/AssetModule.js
+++ b/packager/src/node-haste/AssetModule.js
@@ -37,14 +37,14 @@ class AssetModule extends Module {
     return Promise.resolve(false);
   }
 
-  getDependencies() {
-    return Promise.resolve(this._dependencies);
-  }
-
-  read(): Promise<ReadResult> {
+  readCached(): ReadResult {
     /** $FlowFixMe: improper OOP design. AssetModule, being different from a
      * normal Module, shouldn't inherit it in the first place. */
-    return Promise.resolve({});
+    return {dependencies: this._dependencies};
+  }
+
+  readFresh(): Promise<ReadResult> {
+    return Promise.resolve(this.readCached());
   }
 
   getName() {
diff --git a/packager/src/node-haste/DependencyGraph/ResolutionRequest.js b/packager/src/node-haste/DependencyGraph/ResolutionRequest.js
index b2433fb6ce1577..8cf2d2e517588a 100644
--- a/packager/src/node-haste/DependencyGraph/ResolutionRequest.js
+++ b/packager/src/node-haste/DependencyGraph/ResolutionRequest.js
@@ -141,6 +141,11 @@ class ResolutionRequest {
     return cacheResult(this._resolveNodeDependency(fromModule, toModuleName));
   }
 
+  resolveModuleDependencies(module: Module, dependencyNames: Array<string>): [Array<string>, Array<Module>] {
+    const dependencies = dependencyNames.map(name => this.resolveDependency(module, name));
+    return [dependencyNames, dependencies];
+  }
+
   getOrderedDependencies({
     response,
     transformOptions,
@@ -158,12 +163,14 @@ class ResolutionRequest {
     let totalModules = 1;
     let finishedModules = 0;
 
-    const resolveDependencies = module =>
-      module.getDependencies(transformOptions)
-        .then(dependencyNames => {
-          const dependencies = dependencyNames.map(name => this.resolveDependency(module, name));
-          return [dependencyNames, dependencies];
-        });
+    const resolveDependencies = module => Promise.resolve().then(() => {
+      const result = module.readCached(transformOptions);
+      if (result != null) {
+        return this.resolveModuleDependencies(module, result.dependencies);
+      }
+      return module.read(transformOptions)
+        .then(({dependencies}) => this.resolveModuleDependencies(module, dependencies));
+    });
 
     const collectedDependencies = new MapWithDefaults(module => collect(module));
     const crawlDependencies = (mod, [depNames, dependencies]) => {
diff --git a/packager/src/node-haste/Module.js b/packager/src/node-haste/Module.js
index 6b5102f8beed6d..fa45c76251b5c8 100644
--- a/packager/src/node-haste/Module.js
+++ b/packager/src/node-haste/Module.js
@@ -95,6 +95,8 @@ class Module {
   _sourceCode: ?string;
   _readPromises: Map<string, Promise<ReadResult>>;
 
+  _readResultsByOptionsKey: Map<string, ?ReadResult>;
+
   constructor({
     cache,
     depGraphHelpers,
@@ -123,6 +125,7 @@ class Module {
     this._globalCache = globalTransformCache;
 
     this._readPromises = new Map();
+    this._readResultsByOptionsKey = new Map();
   }
 
   isHaste(): Promise<boolean> {
@@ -186,6 +189,7 @@ class Module {
   invalidate() {
     this._cache.invalidate(this.path);
     this._readPromises.clear();
+    this._readResultsByOptionsKey.clear();
     this._sourceCode = null;
     this._docBlock = null;
     this._hasteNameCache = null;
@@ -250,10 +254,9 @@ class Module {
    */
   _finalizeReadResult(
     source: string,
-    id: ?string,
-    extern: boolean,
     result: TransformedCode,
   ): ReadResult {
+    const id = this._getHasteName();
     if (this._options.cacheTransformResults === false) {
       const {dependencies} = result;
       /* $FlowFixMe: this code path is dead, remove. */
@@ -334,41 +337,61 @@ class Module {
   }
 
   /**
-   * Read everything about a module: source code, transformed code,
-   * dependencies, etc. The overall process is to read the cache first, and if
-   * it's a miss, we let the worker write to the cache and read it again.
+   * Shorthand for reading both from cache or from fresh for all call sites that
+   * are asynchronous by default.
    */
   read(transformOptions: TransformOptions): Promise<ReadResult> {
+    return Promise.resolve().then(() => {
+      const cached = this.readCached(transformOptions);
+      if (cached != null) {
+        return cached;
+      }
+      return this.readFresh(transformOptions);
+    });
+  }
+
+  /**
+   * Same as `readFresh`, but reads from the cache instead of transforming
+   * the file from source. This has the benefit of being synchronous. As a
+   * result it is possible to read many cached Module in a row, synchronously.
+   */
+  readCached(transformOptions: TransformOptions): ?ReadResult {
+    const key = stableObjectHash(transformOptions || {});
+    if (this._readResultsByOptionsKey.has(key)) {
+      return this._readResultsByOptionsKey.get(key);
+    }
+    const result = this._readFromTransformCache(transformOptions);
+    this._readResultsByOptionsKey.set(key, result);
+    return result;
+  }
+
+  /**
+   * Read again from the TransformCache, on disk. `readCached` should be favored
+   * so it's faster in case the results are already in memory.
+   */
+  _readFromTransformCache(transformOptions: TransformOptions): ?ReadResult {
+    const cacheProps = this._getCacheProps(transformOptions);
+    const cachedResult = TransformCache.readSync(cacheProps);
+    if (cachedResult) {
+      return this._finalizeReadResult(cacheProps.sourceCode, cachedResult);
+    }
+    return null;
+  }
+
+  /**
+   * Gathers relevant data about a module: source code, transformed code,
+   * dependencies, etc. This function reads and transforms the source from
+   * scratch. We don't repeat the same work as `readCached` because we assume
+   * call sites have called it already.
+   */
+  readFresh(transformOptions: TransformOptions): Promise<ReadResult> {
     const key = stableObjectHash(transformOptions || {});
     const promise = this._readPromises.get(key);
     if (promise != null) {
       return promise;
     }
     const freshPromise = Promise.resolve().then(() => {
-      const sourceCode = this._readSourceCode();
-      const moduleDocBlock = this._readDocBlock();
-      const id = this._getHasteName();
-      // Ignore requires in JSON files or generated code. An example of this
-      // is prebuilt files like the SourceMap library.
-      const extern = this.isJSON() || 'extern' in moduleDocBlock;
-      if (extern) {
-        transformOptions = {...transformOptions, extern};
-      }
-      const getTransformCacheKey = this._getTransformCacheKey;
-      const cacheProps = {
-        filePath: this.path,
-        sourceCode,
-        getTransformCacheKey,
-        transformOptions,
-        cacheOptions: {
-          resetCache: this._options.resetCache,
-          reporter: this._reporter,
-        },
-      };
-      const cachedResult = TransformCache.readSync(cacheProps);
-      if (cachedResult) {
-        return Promise.resolve(this._finalizeReadResult(sourceCode, id, extern, cachedResult));
-      }
+      const cacheProps = this._getCacheProps(transformOptions);
       return new Promise((resolve, reject) => {
         this._getAndCacheTransformedCode(
           cacheProps,
@@ -378,15 +401,40 @@ class Module {
               return;
             }
             invariant(freshResult != null, 'inconsistent state');
-            resolve(this._finalizeReadResult(sourceCode, id, extern, freshResult));
+            resolve(this._finalizeReadResult(cacheProps.sourceCode, freshResult));
           },
         );
+      }).then(result => {
+        this._readResultsByOptionsKey.set(key, result);
+        return result;
       });
     });
     this._readPromises.set(key, freshPromise);
     return freshPromise;
   }
 
+  _getCacheProps(transformOptions: TransformOptions) {
+    const sourceCode = this._readSourceCode();
+    const moduleDocBlock = this._readDocBlock();
+    const getTransformCacheKey = this._getTransformCacheKey;
+    // Ignore requires in JSON files or generated code. An example of this
+    // is prebuilt files like the SourceMap library.
+    const extern = this.isJSON() || 'extern' in moduleDocBlock;
+    if (extern) {
+      transformOptions = {...transformOptions, extern};
+    }
+    return {
+      filePath: this.path,
+      sourceCode,
+      getTransformCacheKey,
+      transformOptions,
+      cacheOptions: {
+        resetCache: this._options.resetCache,
+        reporter: this._reporter,
+      },
+    };
+  }
+
   hash() {
     return `Module : ${this.path}`;
   }

From ec68c97d72030cab6e3aef991dee8413d5a95c00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Viktor=20Se=C4=8D?= <hey@viktorsec.com>
Date: Fri, 31 Mar 2017 10:35:52 -0700
Subject: [PATCH 265/366] Add iOS Linking location example to docs

Summary:
Hi, the docs make it seem like `geo:${latitude},${longitude}` is the cross-platform way to link locations on Google/Apple Maps. This is Android-only though.

I did no changes to code.

I noticed that the Appetize.io embed tries to run the [Linking example](https://facebook.github.io/react-native/docs/linking.html) code on iOS, although the example uses Android location scheme. This results in errors. I'd like to fix this as well, but I have no idea how to tell the demo to run on Android.
Closes https://github.com/facebook/react-native/pull/13220

Differential Revision: D4804123

Pulled By: hramos

fbshipit-source-id: 2de85d56476933ec54ea423d76a0fe98ed5132d3
---
 Libraries/Linking/Linking.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Libraries/Linking/Linking.js b/Libraries/Linking/Linking.js
index 0f50b15bd5ee19..46318a0eed7f72 100644
--- a/Libraries/Linking/Linking.js
+++ b/Libraries/Linking/Linking.js
@@ -138,7 +138,8 @@ class Linking extends NativeEventEmitter {
   /**
    * Try to open the given `url` with any of the installed apps.
    *
-   * You can use other URLs, like a location (e.g. "geo:37.484847,-122.148386"), a contact,
+   * You can use other URLs, like a location (e.g. "geo:37.484847,-122.148386" on Android
+   * or "http://maps.apple.com/?ll=37.484847,-122.148386" on iOS), a contact,
    * or any other URL that can be opened with the installed apps.
    *
    * NOTE: This method will fail if the system doesn't know how to open the specified URL.

From 175e77d0041f1ca8a7020710b7c3e11281360899 Mon Sep 17 00:00:00 2001
From: Charles Dick <cwdick@fb.com>
Date: Fri, 31 Mar 2017 10:59:34 -0700
Subject: [PATCH 266/366] break dependency between
 JSPackagerClient.RequestHandler and WebSocketListener

Reviewed By: amnn

Differential Revision: D4810406

fbshipit-source-id: a447bc15c6619921edd7adf0b3d1d93ae04e2e43
---
 .../react/devsupport/DevServerHelper.java     | 23 ++++++-----
 .../devsupport/DevSupportManagerImpl.java     |  9 +++--
 .../packagerconnection/FileIoHandler.java     | 16 ++++----
 .../packagerconnection/JSPackagerClient.java  | 31 ++------------
 .../NotificationOnlyHandler.java              | 23 +++++++++++
 .../packagerconnection/RequestHandler.java    | 16 ++++++++
 .../RequestOnlyHandler.java                   | 22 ++++++++++
 .../react/packagerconnection/Responder.java   | 14 +++++++
 .../JSPackagerClientTest.java                 | 40 +++++++++----------
 9 files changed, 125 insertions(+), 69 deletions(-)
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/packagerconnection/NotificationOnlyHandler.java
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/packagerconnection/RequestHandler.java
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/packagerconnection/RequestOnlyHandler.java
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/packagerconnection/Responder.java

diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
index b102002d8a0eb8..ce934bc7b5fd38 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
@@ -23,7 +23,6 @@
 import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Handler;
-import android.text.TextUtils;
 
 import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
@@ -34,6 +33,10 @@
 import com.facebook.react.modules.systeminfo.AndroidInfoHelpers;
 import com.facebook.react.packagerconnection.FileIoHandler;
 import com.facebook.react.packagerconnection.JSPackagerClient;
+import com.facebook.react.packagerconnection.RequestHandler;
+import com.facebook.react.packagerconnection.NotificationOnlyHandler;
+import com.facebook.react.packagerconnection.RequestOnlyHandler;
+import com.facebook.react.packagerconnection.Responder;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -95,8 +98,8 @@ public interface OnServerContentChangeListener {
 
   public interface PackagerCommandListener {
     void onPackagerReloadCommand();
-    void onCaptureHeapCommand(@Nullable final JSPackagerClient.Responder responder);
-    void onPokeSamplingProfilerCommand(@Nullable final JSPackagerClient.Responder responder);
+    void onCaptureHeapCommand(@Nullable final Responder responder);
+    void onPokeSamplingProfilerCommand(@Nullable final Responder responder);
   }
 
   private final DevInternalSettings mSettings;
@@ -129,23 +132,23 @@ public void openPackagerConnection(final PackagerCommandListener commandListener
     new AsyncTask<Void, Void, Void>() {
       @Override
       protected Void doInBackground(Void... backgroundParams) {
-        Map<String, JSPackagerClient.RequestHandler> handlers =
-          new HashMap<String, JSPackagerClient.RequestHandler>();
-        handlers.put("reload", new JSPackagerClient.NotificationOnlyHandler() {
+        Map<String, RequestHandler> handlers =
+          new HashMap<String, RequestHandler>();
+        handlers.put("reload", new NotificationOnlyHandler() {
           @Override
           public void onNotification(@Nullable Object params) {
             commandListener.onPackagerReloadCommand();
           }
         });
-        handlers.put("captureHeap", new JSPackagerClient.RequestOnlyHandler() {
+        handlers.put("captureHeap", new RequestOnlyHandler() {
           @Override
-          public void onRequest(@Nullable Object params, JSPackagerClient.Responder responder) {
+          public void onRequest(@Nullable Object params, Responder responder) {
             commandListener.onCaptureHeapCommand(responder);
           }
         });
-        handlers.put("pokeSamplingProfiler", new JSPackagerClient.RequestOnlyHandler() {
+        handlers.put("pokeSamplingProfiler", new RequestOnlyHandler() {
           @Override
-          public void onRequest(@Nullable Object params, JSPackagerClient.Responder responder) {
+          public void onRequest(@Nullable Object params, Responder responder) {
             commandListener.onPokeSamplingProfilerCommand(responder);
           }
         });
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java
index d141dc9325b585..6d8e32448bdee5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java
@@ -44,6 +44,7 @@
 import com.facebook.react.devsupport.interfaces.StackFrame;
 import com.facebook.react.modules.debug.interfaces.DeveloperSettings;
 import com.facebook.react.packagerconnection.JSPackagerClient;
+import com.facebook.react.packagerconnection.Responder;
 
 import java.io.File;
 import java.io.IOException;
@@ -674,7 +675,7 @@ public void run() {
   }
 
   @Override
-  public void onCaptureHeapCommand(final JSPackagerClient.Responder responder) {
+  public void onCaptureHeapCommand(final Responder responder) {
     UiThreadUtil.runOnUiThread(new Runnable() {
       @Override
       public void run() {
@@ -684,7 +685,7 @@ public void run() {
   }
 
   @Override
-  public void onPokeSamplingProfilerCommand(@Nullable final JSPackagerClient.Responder responder) {
+  public void onPokeSamplingProfilerCommand(@Nullable final Responder responder) {
     UiThreadUtil.runOnUiThread(new Runnable() {
       @Override
       public void run() {
@@ -693,7 +694,7 @@ public void run() {
     });
   }
 
-  private void handleCaptureHeap(final JSPackagerClient.Responder responder) {
+  private void handleCaptureHeap(final Responder responder) {
     if (mCurrentContext == null) {
       return;
     }
@@ -713,7 +714,7 @@ public void onFailure(JSCHeapCapture.CaptureException error) {
       });
   }
 
-  private void handlePokeSamplingProfiler(@Nullable final JSPackagerClient.Responder responder) {
+  private void handlePokeSamplingProfiler(@Nullable final Responder responder) {
     try {
       List<String> pokeResults = JSCSamplingProfiler.poke(60000);
       for (String result : pokeResults) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/FileIoHandler.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/FileIoHandler.java
index 5a0adb1dd6b6aa..5f55f03d8cc6f0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/FileIoHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/FileIoHandler.java
@@ -62,17 +62,17 @@ public void close() throws IOException {
   private int mNextHandle;
   private final Handler mHandler;
   private final Map<Integer, TtlFileInputStream> mOpenFiles;
-  private final Map<String, JSPackagerClient.RequestHandler> mRequestHandlers;
+  private final Map<String, RequestHandler> mRequestHandlers;
 
   public FileIoHandler() {
     mNextHandle = 1;
     mHandler = new Handler(Looper.getMainLooper());
     mOpenFiles = new HashMap<>();
     mRequestHandlers = new HashMap<>();
-    mRequestHandlers.put("fopen", new JSPackagerClient.RequestOnlyHandler() {
+    mRequestHandlers.put("fopen", new RequestOnlyHandler() {
       @Override
       public void onRequest(
-          @Nullable Object params, JSPackagerClient.Responder responder) {
+          @Nullable Object params, Responder responder) {
         synchronized (mOpenFiles) {
           try {
             JSONObject paramsObj = (JSONObject)params;
@@ -98,10 +98,10 @@ public void onRequest(
         }
       }
     });
-    mRequestHandlers.put("fclose", new JSPackagerClient.RequestOnlyHandler() {
+    mRequestHandlers.put("fclose", new RequestOnlyHandler() {
       @Override
       public void onRequest(
-          @Nullable Object params, JSPackagerClient.Responder responder) {
+          @Nullable Object params, Responder responder) {
         synchronized (mOpenFiles) {
           try {
             if (!(params instanceof Number)) {
@@ -121,10 +121,10 @@ public void onRequest(
         }
       }
     });
-    mRequestHandlers.put("fread", new JSPackagerClient.RequestOnlyHandler() {
+    mRequestHandlers.put("fread", new RequestOnlyHandler() {
       @Override
       public void onRequest(
-          @Nullable Object params, JSPackagerClient.Responder responder) {
+          @Nullable Object params, Responder responder) {
         synchronized (mOpenFiles) {
           try {
             JSONObject paramsObj = (JSONObject)params;
@@ -153,7 +153,7 @@ public void onRequest(
     });
   }
 
-  public Map<String, JSPackagerClient.RequestHandler> handlers() {
+  public Map<String, RequestHandler> handlers() {
     return mRequestHandlers;
   }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/JSPackagerClient.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/JSPackagerClient.java
index 2568ca9eacea0d..6160152b09bb5b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/JSPackagerClient.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/JSPackagerClient.java
@@ -8,9 +8,6 @@
 
 package com.facebook.react.packagerconnection;
 
-import javax.annotation.Nullable;
-
-import java.util.HashMap;
 import java.util.Map;
 
 import android.net.Uri;
@@ -32,10 +29,10 @@ final public class JSPackagerClient implements ReconnectingWebSocket.MessageCall
   private static final String PACKAGER_CONNECTION_URL_FORMAT = "ws://%s/message?device=%s&app=%s&context=%s";
   private static final int PROTOCOL_VERSION = 2;
 
-  public class Responder {
+  private class ResponderImpl implements Responder {
     private Object mId;
 
-    public Responder(Object id) {
+    public ResponderImpl(Object id) {
       mId = id;
     }
 
@@ -64,26 +61,6 @@ public void error(Object error) {
     }
   }
 
-  public interface RequestHandler {
-    public void onRequest(@Nullable Object params, Responder responder);
-    public void onNotification(@Nullable Object params);
-  }
-
-  public static abstract class NotificationOnlyHandler implements RequestHandler {
-    final public void onRequest(@Nullable Object params, Responder responder) {
-      responder.error("Request is not supported");
-      FLog.e(TAG, "Request is not supported");
-    }
-    abstract public void onNotification(@Nullable Object params);
-  }
-
-  public static abstract class RequestOnlyHandler implements RequestHandler {
-    abstract public void onRequest(@Nullable Object params, Responder responder);
-    final public void onNotification(@Nullable Object params) {
-      FLog.e(TAG, "Notification is not supported");
-    }
-  }
-
   private ReconnectingWebSocket mWebSocket;
   private Map<String, RequestHandler> mRequestHandlers;
 
@@ -149,7 +126,7 @@ public void onMessage(ResponseBody response) {
       if (id == null) {
         handler.onNotification(params);
       } else {
-        handler.onRequest(params, new Responder(id));
+        handler.onRequest(params, new ResponderImpl(id));
       }
     } catch (Exception e) {
       FLog.e(TAG, "Handling the message failed", e);
@@ -160,7 +137,7 @@ public void onMessage(ResponseBody response) {
 
   private void abortOnMessage(Object id, String reason) {
     if (id != null) {
-      (new Responder(id)).error(reason);
+      (new ResponderImpl(id)).error(reason);
     }
 
     FLog.e(TAG, "Handling the message failed with reason: " + reason);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/NotificationOnlyHandler.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/NotificationOnlyHandler.java
new file mode 100644
index 00000000000000..dc337019cb99b3
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/NotificationOnlyHandler.java
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the 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.
+ */
+
+package com.facebook.react.packagerconnection;
+
+import javax.annotation.Nullable;
+
+import com.facebook.common.logging.FLog;
+
+public abstract class NotificationOnlyHandler implements RequestHandler {
+  private static final String TAG = JSPackagerClient.class.getSimpleName();
+
+  final public void onRequest(@Nullable Object params, Responder responder) {
+    responder.error("Request is not supported");
+    FLog.e(TAG, "Request is not supported");
+  }
+  abstract public void onNotification(@Nullable Object params);
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/RequestHandler.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/RequestHandler.java
new file mode 100644
index 00000000000000..4d7a25231ee72b
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/RequestHandler.java
@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the 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.
+ */
+
+package com.facebook.react.packagerconnection;
+
+import javax.annotation.Nullable;
+
+public interface RequestHandler {
+  void onRequest(@Nullable Object params, Responder responder);
+  void onNotification(@Nullable Object params);
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/RequestOnlyHandler.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/RequestOnlyHandler.java
new file mode 100644
index 00000000000000..9e617bee728bf9
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/RequestOnlyHandler.java
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the 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.
+ */
+
+package com.facebook.react.packagerconnection;
+
+import javax.annotation.Nullable;
+
+import com.facebook.common.logging.FLog;
+
+public abstract class RequestOnlyHandler implements RequestHandler {
+  private static final String TAG = JSPackagerClient.class.getSimpleName();
+
+  abstract public void onRequest(@Nullable Object params, Responder responder);
+  final public void onNotification(@Nullable Object params) {
+    FLog.e(TAG, "Notification is not supported");
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/Responder.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/Responder.java
new file mode 100644
index 00000000000000..b91a0a7d1d8a08
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/Responder.java
@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the 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.
+ */
+
+package com.facebook.react.packagerconnection;
+
+public interface Responder {
+  void respond(Object result);
+  void error(Object error);
+}
diff --git a/ReactAndroid/src/test/java/com/facebook/react/packagerconnection/JSPackagerClientTest.java b/ReactAndroid/src/test/java/com/facebook/react/packagerconnection/JSPackagerClientTest.java
index d930384a3bb6e3..165ab5e82a9928 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/packagerconnection/JSPackagerClientTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/packagerconnection/JSPackagerClientTest.java
@@ -25,10 +25,10 @@
 
 @RunWith(RobolectricTestRunner.class)
 public class JSPackagerClientTest {
-  private static Map<String, JSPackagerClient.RequestHandler> createRH(
-      String action, JSPackagerClient.RequestHandler handler) {
-    Map<String, JSPackagerClient.RequestHandler> m =
-      new HashMap<String, JSPackagerClient.RequestHandler>();
+  private static Map<String, RequestHandler> createRH(
+      String action, RequestHandler handler) {
+    Map<String, RequestHandler> m =
+      new HashMap<String, RequestHandler>();
     m.put(action, handler);
     return m;
   }
@@ -44,7 +44,7 @@ public void setUp() {
 
   @Test
   public void test_onMessage_ShouldTriggerNotification() throws IOException {
-    JSPackagerClient.RequestHandler handler = mock(JSPackagerClient.RequestHandler.class);
+    RequestHandler handler = mock(RequestHandler.class);
     final JSPackagerClient client = new JSPackagerClient("test_client", mSettings, createRH("methodValue", handler));
 
     client.onMessage(
@@ -52,12 +52,12 @@ public void test_onMessage_ShouldTriggerNotification() throws IOException {
           WebSocket.TEXT,
           "{\"version\": 2, \"method\": \"methodValue\", \"params\": \"paramsValue\"}"));
     verify(handler).onNotification(eq("paramsValue"));
-    verify(handler, never()).onRequest(any(), any(JSPackagerClient.Responder.class));
+    verify(handler, never()).onRequest(any(), any(Responder.class));
   }
 
   @Test
   public void test_onMessage_ShouldTriggerRequest() throws IOException {
-    JSPackagerClient.RequestHandler handler = mock(JSPackagerClient.RequestHandler.class);
+    RequestHandler handler = mock(RequestHandler.class);
     final JSPackagerClient client = new JSPackagerClient("test_client", mSettings, createRH("methodValue", handler));
 
     client.onMessage(
@@ -65,12 +65,12 @@ public void test_onMessage_ShouldTriggerRequest() throws IOException {
           WebSocket.TEXT,
           "{\"version\": 2, \"id\": \"idValue\", \"method\": \"methodValue\", \"params\": \"paramsValue\"}"));
     verify(handler, never()).onNotification(any());
-    verify(handler).onRequest(eq("paramsValue"), any(JSPackagerClient.Responder.class));
+    verify(handler).onRequest(eq("paramsValue"), any(Responder.class));
   }
 
   @Test
   public void test_onMessage_WithoutParams_ShouldTriggerNotification() throws IOException {
-    JSPackagerClient.RequestHandler handler = mock(JSPackagerClient.RequestHandler.class);
+    RequestHandler handler = mock(RequestHandler.class);
     final JSPackagerClient client = new JSPackagerClient("test_client", mSettings, createRH("methodValue", handler));
 
     client.onMessage(
@@ -78,12 +78,12 @@ public void test_onMessage_WithoutParams_ShouldTriggerNotification() throws IOEx
           WebSocket.TEXT,
           "{\"version\": 2, \"method\": \"methodValue\"}"));
     verify(handler).onNotification(eq(null));
-    verify(handler, never()).onRequest(any(), any(JSPackagerClient.Responder.class));
+    verify(handler, never()).onRequest(any(), any(Responder.class));
   }
 
   @Test
   public void test_onMessage_WithInvalidContentType_ShouldNotTriggerCallback() throws IOException {
-    JSPackagerClient.RequestHandler handler = mock(JSPackagerClient.RequestHandler.class);
+    RequestHandler handler = mock(RequestHandler.class);
     final JSPackagerClient client = new JSPackagerClient("test_client", mSettings, createRH("methodValue", handler));
 
     client.onMessage(
@@ -91,12 +91,12 @@ public void test_onMessage_WithInvalidContentType_ShouldNotTriggerCallback() thr
           WebSocket.BINARY,
           "{\"version\": 2, \"method\": \"methodValue\"}"));
     verify(handler, never()).onNotification(any());
-    verify(handler, never()).onRequest(any(), any(JSPackagerClient.Responder.class));
+    verify(handler, never()).onRequest(any(), any(Responder.class));
   }
 
   @Test
   public void test_onMessage_WithoutMethod_ShouldNotTriggerCallback() throws IOException {
-    JSPackagerClient.RequestHandler handler = mock(JSPackagerClient.RequestHandler.class);
+    RequestHandler handler = mock(RequestHandler.class);
     final JSPackagerClient client = new JSPackagerClient("test_client", mSettings, createRH("methodValue", handler));
 
     client.onMessage(
@@ -104,12 +104,12 @@ public void test_onMessage_WithoutMethod_ShouldNotTriggerCallback() throws IOExc
           WebSocket.TEXT,
           "{\"version\": 2}"));
     verify(handler, never()).onNotification(any());
-    verify(handler, never()).onRequest(any(), any(JSPackagerClient.Responder.class));
+    verify(handler, never()).onRequest(any(), any(Responder.class));
   }
 
   @Test
   public void test_onMessage_With_Null_Action_ShouldNotTriggerCallback() throws IOException {
-    JSPackagerClient.RequestHandler handler = mock(JSPackagerClient.RequestHandler.class);
+    RequestHandler handler = mock(RequestHandler.class);
     final JSPackagerClient client = new JSPackagerClient("test_client", mSettings, createRH("methodValue", handler));
 
     client.onMessage(
@@ -117,12 +117,12 @@ public void test_onMessage_With_Null_Action_ShouldNotTriggerCallback() throws IO
           WebSocket.TEXT,
           "{\"version\": 2, \"method\": null}"));
     verify(handler, never()).onNotification(any());
-    verify(handler, never()).onRequest(any(), any(JSPackagerClient.Responder.class));
+    verify(handler, never()).onRequest(any(), any(Responder.class));
   }
 
   @Test
   public void test_onMessage_WithInvalidMethod_ShouldNotTriggerCallback() throws IOException {
-    JSPackagerClient.RequestHandler handler = mock(JSPackagerClient.RequestHandler.class);
+    RequestHandler handler = mock(RequestHandler.class);
     final JSPackagerClient client = new JSPackagerClient("test_client", mSettings, createRH("methodValue", handler));
 
     client.onMessage(
@@ -130,12 +130,12 @@ public void test_onMessage_WithInvalidMethod_ShouldNotTriggerCallback() throws I
           WebSocket.BINARY,
           "{\"version\": 2, \"method\": \"methodValue2\"}"));
     verify(handler, never()).onNotification(any());
-    verify(handler, never()).onRequest(any(), any(JSPackagerClient.Responder.class));
+    verify(handler, never()).onRequest(any(), any(Responder.class));
   }
 
   @Test
   public void test_onMessage_WrongVersion_ShouldNotTriggerCallback() throws IOException {
-    JSPackagerClient.RequestHandler handler = mock(JSPackagerClient.RequestHandler.class);
+    RequestHandler handler = mock(RequestHandler.class);
     final JSPackagerClient client = new JSPackagerClient("test_client", mSettings, createRH("methodValue", handler));
 
     client.onMessage(
@@ -143,6 +143,6 @@ public void test_onMessage_WrongVersion_ShouldNotTriggerCallback() throws IOExce
           WebSocket.TEXT,
           "{\"version\": 1, \"method\": \"methodValue\"}"));
     verify(handler, never()).onNotification(any());
-    verify(handler, never()).onRequest(any(), any(JSPackagerClient.Responder.class));
+    verify(handler, never()).onRequest(any(), any(Responder.class));
   }
 }

From 92190727d151a306192f9e791e6c7ece7e7d025e Mon Sep 17 00:00:00 2001
From: dlowder-salesforce <dlowder@salesforce.com>
Date: Fri, 31 Mar 2017 12:40:36 -0700
Subject: [PATCH 267/366] Clean up and remove duplicate code in Travis iOS/tvOS
 test scripts

Summary:
**Motivation**

Remove duplicated lines in objc-test-ios.sh and objc-test-tvos.sh

**Test plan**

Travis CI should continue to work as before.
Closes https://github.com/facebook/react-native/pull/13173

Differential Revision: D4812177

Pulled By: hramos

fbshipit-source-id: 40afe0beab896d741f607f4841df7e9b42f4c17d
---
 scripts/objc-test-ios.sh  | 84 +++------------------------------------
 scripts/objc-test-tvos.sh | 67 ++++---------------------------
 scripts/objc-test.sh      | 62 +++++++++++++++++++++++++++++
 3 files changed, 75 insertions(+), 138 deletions(-)
 create mode 100755 scripts/objc-test.sh

diff --git a/scripts/objc-test-ios.sh b/scripts/objc-test-ios.sh
index 3f909f7a23a0c4..c4534e67c9f53e 100755
--- a/scripts/objc-test-ios.sh
+++ b/scripts/objc-test-ios.sh
@@ -6,84 +6,10 @@ ROOT=$(dirname "$SCRIPTS")
 
 cd "$ROOT"
 
-# Create cleanup handler
-function cleanup {
-  EXIT_CODE=$?
-  set +e
+SCHEME="UIExplorer"
+SDK="iphonesimulator"
+DESTINATION="platform=iOS Simulator,name=iPhone 5s,OS=10.1"
+TEST="test"
 
-  if [ $EXIT_CODE -ne 0 ];
-  then
-    WATCHMAN_LOGS=/usr/local/Cellar/watchman/3.1/var/run/watchman/$USER.log
-    [ -f "$WATCHMAN_LOGS" ] && cat "$WATCHMAN_LOGS"
-  fi
-  # kill backgrounded jobs
-  # shellcheck disable=SC2046
-  kill $(jobs -p)
-  # kill whatever is occupying port 8081 (packager)
-  lsof -i tcp:8081 | awk 'NR!=1 {print $2}' | xargs kill
-  # kill whatever is occupying port 5555 (web socket server)
-  lsof -i tcp:5555 | awk 'NR!=1 {print $2}' | xargs kill
-}
-trap cleanup INT TERM EXIT
+. ./scripts/objc-test.sh
 
-# If first argument is "test", actually start the packager and run tests.
-# Otherwise, just build UIExplorer for tvOS and exit
-
-if [ "$1" = "test" ];
-then
-
-# Start the packager
-(exec "./packager/launchPackager.command" || echo "Can't start packager automatically") &
-(exec "./IntegrationTests/launchWebSocketServer.command" || echo "Can't start web socket server automatically") &
-
-# wait until packager is ready
-PACKAGER_IS_RUNNING="packager-status:running"
-SECONDS=0
-STATUS=
-
-sleep 2
-test "$SECONDS" -ne 0 # Make sure the magic $SECONDS variable works
-
-set +ex
-while [ "$STATUS" != "$PACKAGER_IS_RUNNING" ] && [ "$SECONDS" -lt 60 ]; do
-  STATUS=$(curl --silent 'http://localhost:8081/status')
-  sleep 1
-done
-set -ex
-
-if [ "$STATUS" != "$PACKAGER_IS_RUNNING" ]; then
-  echo "Could not startup packager within $SECONDS seconds"
-  false
-fi
-
-# Preload the UIExplorerApp bundle for better performance in integration tests
-curl 'http://localhost:8081/Examples/UIExplorer/js/UIExplorerApp.ios.bundle?platform=ios&dev=true' -o temp.bundle
-rm temp.bundle
-curl 'http://localhost:8081/Examples/UIExplorer/js/UIExplorerApp.ios.bundle?platform=ios&dev=true&minify=false' -o temp.bundle
-rm temp.bundle
-curl 'http://localhost:8081/IntegrationTests/IntegrationTestsApp.bundle?platform=ios&dev=true' -o temp.bundle
-rm temp.bundle
-curl 'http://localhost:8081/IntegrationTests/RCTRootViewIntegrationTestApp.bundle?platform=ios&dev=true' -o temp.bundle
-rm temp.bundle
-
-# Build and test for iOS
-# TODO: We use xcodebuild because xctool would stall when collecting info about
-# the tests before running them. Switch back when this issue with xctool has
-# been resolved.
-xcodebuild \
-  -project "Examples/UIExplorer/UIExplorer.xcodeproj" \
-  -scheme "UIExplorer" \
-  -sdk "iphonesimulator" \
-  -destination "platform=iOS Simulator,name=iPhone 5s,OS=10.1" \
-  build test
-
-else
-
-# Only build for iOS (check there are no missing files in the Xcode project)
-xcodebuild \
-  -project "Examples/UIExplorer/UIExplorer.xcodeproj" \
-  -scheme "UIExplorer" \
-  -sdk "iphonesimulator" \
-  build
-
-fi
diff --git a/scripts/objc-test-tvos.sh b/scripts/objc-test-tvos.sh
index 943d510914eece..849f121c58d146 100755
--- a/scripts/objc-test-tvos.sh
+++ b/scripts/objc-test-tvos.sh
@@ -2,66 +2,15 @@
 set -ex
 
 SCRIPTS=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-ROOT=$(dirname $SCRIPTS)
+ROOT=$(dirname "$SCRIPTS")
 
-cd $ROOT
+cd "$ROOT"
 
-# Create cleanup handler
-function cleanup {
-  EXIT_CODE=$?
-  set +e
+SCHEME="UIExplorer-tvOS"
+SDK="appletvsimulator"
+DESTINATION="platform=tvOS Simulator,name=Apple TV 1080p,OS=10.1"
+# Uncomment the line below to enable tvOS testing
+#TEST="test"
 
-  if [ $EXIT_CODE -ne 0 ];
-  then
-    WATCHMAN_LOGS=/usr/local/Cellar/watchman/3.1/var/run/watchman/$USER.log
-    [ -f $WATCHMAN_LOGS ] && cat $WATCHMAN_LOGS
-  fi
-  # kill whatever is occupying port 8081 (packager)
-  lsof -i tcp:8081 | awk 'NR!=1 {print $2}' | xargs kill
-  # kill whatever is occupying port 5555 (web socket server)
-  lsof -i tcp:5555 | awk 'NR!=1 {print $2}' | xargs kill
-}
-trap cleanup EXIT
+. ./scripts/objc-test.sh
 
-# If first argument is "test", actually start the packager and run tests.
-# Otherwise, just build UIExplorer for tvOS and exit
-
-if [ "$1" = "test" ];
-then
-
-# Start the packager 
-open "./packager/launchPackager.command" || echo "Can't start packager automatically"
-open "./IntegrationTests/launchWebSocketServer.command" || echo "Can't start web socket server automatically"
-
-# Preload the UIExplorerApp bundle for better performance in integration tests
-sleep 20
-curl 'http://localhost:8081/Examples/UIExplorer/js/UIExplorerApp.ios.bundle?platform=ios&dev=true' -o temp.bundle
-rm temp.bundle
-curl 'http://localhost:8081/Examples/UIExplorer/js/UIExplorerApp.ios.bundle?platform=ios&dev=true&minify=false' -o temp.bundle
-rm temp.bundle
-curl 'http://localhost:8081/IntegrationTests/IntegrationTestsApp.bundle?platform=ios&dev=true' -o temp.bundle
-rm temp.bundle
-curl 'http://localhost:8081/IntegrationTests/RCTRootViewIntegrationTestApp.bundle?platform=ios&dev=true' -o temp.bundle
-rm temp.bundle
-
-# Build and test for tvOS
-# TODO: We use xcodebuild because xctool would stall when collecting info about
-# the tests before running them. Switch back when this issue with xctool has
-# been resolved.
-xcodebuild \
-  -project "Examples/UIExplorer/UIExplorer.xcodeproj" \
-  -scheme "UIExplorer-tvOS" \
-  -sdk "appletvsimulator" \
-  -destination "platform=tvOS Simulator,name=Apple TV 1080p,OS=10.1" \
-  build test
-
-else
-
-# Only build for tvOS (check there are no missing files in the Xcode project)
-xcodebuild \
-  -project "Examples/UIExplorer/UIExplorer.xcodeproj" \
-  -scheme "UIExplorer-tvOS" \
-  -sdk "appletvsimulator" \
-  build
-
-fi 
diff --git a/scripts/objc-test.sh b/scripts/objc-test.sh
new file mode 100755
index 00000000000000..a09b4fbdf8b736
--- /dev/null
+++ b/scripts/objc-test.sh
@@ -0,0 +1,62 @@
+#!/bin/bash
+set -ex
+
+SCRIPTS=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+ROOT=$(dirname $SCRIPTS)
+
+cd $ROOT
+
+# Create cleanup handler
+function cleanup {
+  EXIT_CODE=$?
+  set +e
+
+  if [ $EXIT_CODE -ne 0 ];
+  then
+    WATCHMAN_LOGS=/usr/local/Cellar/watchman/3.1/var/run/watchman/$USER.log
+    [ -f $WATCHMAN_LOGS ] && cat $WATCHMAN_LOGS
+  fi
+  # kill whatever is occupying port 8081 (packager)
+  lsof -i tcp:8081 | awk 'NR!=1 {print $2}' | xargs kill
+  # kill whatever is occupying port 5555 (web socket server)
+  lsof -i tcp:5555 | awk 'NR!=1 {print $2}' | xargs kill
+}
+trap cleanup EXIT
+
+# If first argument is "test", actually start the packager and run tests.
+# Otherwise, just build UIExplorer for tvOS and exit
+
+if [ "$TEST" = "test" ];
+then
+
+# Start the packager 
+open "./packager/launchPackager.command" || echo "Can't start packager automatically"
+# Start the WebSocket test server
+open "./IntegrationTests/launchWebSocketServer.command" || echo "Can't start web socket server automatically"
+
+# Preload the UIExplorerApp bundle for better performance in integration tests
+sleep 20
+curl 'http://localhost:8081/Examples/UIExplorer/js/UIExplorerApp.ios.bundle?platform=ios&dev=true' -o temp.bundle
+rm temp.bundle
+curl 'http://localhost:8081/Examples/UIExplorer/js/UIExplorerApp.ios.bundle?platform=ios&dev=true&minify=false' -o temp.bundle
+rm temp.bundle
+curl 'http://localhost:8081/IntegrationTests/IntegrationTestsApp.bundle?platform=ios&dev=true' -o temp.bundle
+rm temp.bundle
+curl 'http://localhost:8081/IntegrationTests/RCTRootViewIntegrationTestApp.bundle?platform=ios&dev=true' -o temp.bundle
+rm temp.bundle
+
+else
+
+TEST=""
+
+fi
+ 
+# TODO: We use xcodebuild because xctool would stall when collecting info about
+# the tests before running them. Switch back when this issue with xctool has
+# been resolved.
+xcodebuild \
+  -project "Examples/UIExplorer/UIExplorer.xcodeproj" \
+  -scheme $SCHEME \
+  -sdk $SDK \
+  -destination "$DESTINATION" \
+  build $TEST

From 9075fe06189a5d0cf237b1118bc8437d92968fd0 Mon Sep 17 00:00:00 2001
From: Ben Roth <spongebucket@gmail.com>
Date: Fri, 31 Mar 2017 13:19:00 -0700
Subject: [PATCH 268/366] Fix crash in
 `RCTJSStackFrame::stackFrameWithDictionary:`

Summary:
Motivation: When logging to RCTRedBox, if any of the stack frames lacks a line number or a column, the application will crash with `[NSNull integerValue]: unrecognized selector sent to instance`.
Closes https://github.com/facebook/react-native/pull/13242

Differential Revision: D4812185

Pulled By: hramos

fbshipit-source-id: 4b1c3c38f67cf59034a383c95d4280d1b6380300
---
 React/Base/RCTJSStackFrame.m | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/React/Base/RCTJSStackFrame.m b/React/Base/RCTJSStackFrame.m
index 3f718326afd197..e102ed059ba0dc 100644
--- a/React/Base/RCTJSStackFrame.m
+++ b/React/Base/RCTJSStackFrame.m
@@ -70,8 +70,8 @@ + (instancetype)stackFrameWithDictionary:(NSDictionary *)dict
 {
   return [[self alloc] initWithMethodName:dict[@"methodName"]
                                      file:dict[@"file"]
-                               lineNumber:[dict[@"lineNumber"] integerValue]
-                                   column:[dict[@"column"] integerValue]];
+                               lineNumber:[RCTNilIfNull(dict[@"lineNumber"]) integerValue]
+                                   column:[RCTNilIfNull(dict[@"column"]) integerValue]];
 }
 
 + (NSArray<RCTJSStackFrame *> *)stackFramesWithLines:(NSString *)lines

From 7ff18f290b1fbc980990ec0088aafc58cfd2ea56 Mon Sep 17 00:00:00 2001
From: Spencer Ahrens <sahrens@fb.com>
Date: Fri, 31 Mar 2017 18:02:29 -0700
Subject: [PATCH 269/366] Fix Warning/Yellow Box so it does not mess up app
 layout when opened.

Reviewed By: fkgozali

Differential Revision: D4808601

fbshipit-source-id: c15a7aa4514ea21798ceabca075189478596e0a2
---
 Libraries/ReactNative/YellowBox.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Libraries/ReactNative/YellowBox.js b/Libraries/ReactNative/YellowBox.js
index 2042431c3f4824..ec30f1a84bfacd 100644
--- a/Libraries/ReactNative/YellowBox.js
+++ b/Libraries/ReactNative/YellowBox.js
@@ -403,7 +403,9 @@ const elevation = Platform.OS === 'android' ? Number.MAX_SAFE_INTEGER : undefine
 var styles = StyleSheet.create({
   fullScreen: {
     height: '100%',
-    elevation: elevation
+    width: '100%',
+    elevation: elevation,
+    position: 'absolute',
   },
   inspector: {
     backgroundColor: backgroundColor(0.95),

From edbb48c67a039eebf18a385ccbbcf42031580ee6 Mon Sep 17 00:00:00 2001
From: Shruti Malugu <shrutic@microsoft.com>
Date: Sat, 1 Apr 2017 03:16:52 -0700
Subject: [PATCH 270/366] =?UTF-8?q?Replacing=20all=20instances=20of=20[UIA?=
 =?UTF-8?q?pplication=20sharedApplication]=20wi=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Summary:
…th RCTSharedApplication()

Thanks for submitting a PR! Please read these instructions carefully:

- [ ] Explain the **motivation** for making this change.
          Using React Native latest version with Cocoapods 1.2.0 causes the following error inside iOS app extensions

> /react-native/React/Modules/RCTAccessibilityManager.m:67:70: ‘sharedApplication’ is unavailable: not available on iOS (App Extension) — Use view controller based solutions where appropriate instead.

Moving the use of [UIApplication sharedApplication] to RCTSharedApplication() which is safe on app extension

- [ ] Provide a **test plan** demonstrating that the code is solid.
        I am not sure how to test such that all the features which touch the modified code are tested.

- [ ] Match the **code formatting** of the rest of the codebase.
- [ ] Target the `master` branch, NOT a "stable" branch.

What existing problem does the pull request solve?
    Using React Native latest v
Closes https://github.com/facebook/react-native/pull/13227

Differential Revision: D4816338

Pulled By: javache

fbshipit-source-id: e3e3c77882990ad1817b0b633521cff52571ecd0
---
 .../PushNotificationIOS/RCTPushNotificationManager.m      | 8 ++++----
 Libraries/RCTTest/RCTTestRunner.m                         | 2 +-
 React/Base/RCTLog.h                                       | 1 +
 React/Base/RCTLog.mm                                      | 2 +-
 React/Modules/RCTAccessibilityManager.m                   | 4 ++--
 React/Modules/RCTStatusBarManager.m                       | 2 +-
 React/Profiler/RCTPerfMonitor.m                           | 3 ++-
 React/Profiler/RCTProfile.m                               | 2 +-
 React/Views/RCTModalHostView.m                            | 3 ++-
 React/Views/RCTModalHostViewController.m                  | 6 +++---
 .../HelloWorld/ios/HelloWorldTests/HelloWorldTests.m      | 2 +-
 11 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/Libraries/PushNotificationIOS/RCTPushNotificationManager.m b/Libraries/PushNotificationIOS/RCTPushNotificationManager.m
index 4b8988413a877b..97f26edabcb722 100644
--- a/Libraries/PushNotificationIOS/RCTPushNotificationManager.m
+++ b/Libraries/PushNotificationIOS/RCTPushNotificationManager.m
@@ -172,7 +172,7 @@ - (void)stopObserving
 + (void)didRegisterUserNotificationSettings:(__unused UIUserNotificationSettings *)notificationSettings
 {
   if ([UIApplication instancesRespondToSelector:@selector(registerForRemoteNotifications)]) {
-    [[UIApplication sharedApplication] registerForRemoteNotifications];
+    [RCTSharedApplication() registerForRemoteNotifications];
     [[NSNotificationCenter defaultCenter] postNotificationName:RCTRegisterUserNotificationSettings
                                                         object:self
                                                       userInfo:@{@"notificationSettings": notificationSettings}];
@@ -378,7 +378,7 @@ - (void)handleRegisterUserNotificationSettings:(NSNotification *)notification
 
 RCT_EXPORT_METHOD(cancelLocalNotifications:(NSDictionary<NSString *, id> *)userInfo)
 {
-  for (UILocalNotification *notification in [UIApplication sharedApplication].scheduledLocalNotifications) {
+  for (UILocalNotification *notification in RCTSharedApplication().scheduledLocalNotifications) {
     __block BOOL matchesAll = YES;
     NSDictionary<NSString *, id> *notificationInfo = notification.userInfo;
     // Note: we do this with a loop instead of just `isEqualToDictionary:`
@@ -392,7 +392,7 @@ - (void)handleRegisterUserNotificationSettings:(NSNotification *)notification
       }
     }];
     if (matchesAll) {
-      [[UIApplication sharedApplication] cancelLocalNotification:notification];
+      [RCTSharedApplication() cancelLocalNotification:notification];
     }
   }
 }
@@ -418,7 +418,7 @@ - (void)handleRegisterUserNotificationSettings:(NSNotification *)notification
 
 RCT_EXPORT_METHOD(getScheduledLocalNotifications:(RCTResponseSenderBlock)callback)
 {
-  NSArray<UILocalNotification *> *scheduledLocalNotifications = [UIApplication sharedApplication].scheduledLocalNotifications;
+  NSArray<UILocalNotification *> *scheduledLocalNotifications = RCTSharedApplication().scheduledLocalNotifications;
   NSMutableArray<NSDictionary *> *formattedScheduledLocalNotifications = [NSMutableArray new];
   for (UILocalNotification *notification in scheduledLocalNotifications) {
     [formattedScheduledLocalNotifications addObject:RCTFormatLocalNotification(notification)];
diff --git a/Libraries/RCTTest/RCTTestRunner.m b/Libraries/RCTTest/RCTTestRunner.m
index ff90ac2ea0e7f6..25538d8161a191 100644
--- a/Libraries/RCTTest/RCTTestRunner.m
+++ b/Libraries/RCTTest/RCTTestRunner.m
@@ -121,7 +121,7 @@ - (void)runTest:(SEL)test module:(NSString *)moduleName
     testModule.testSuffix = _testSuffix;
     testModule.view = rootView;
 
-    UIViewController *vc = [UIApplication sharedApplication].delegate.window.rootViewController;
+    UIViewController *vc = RCTSharedApplication().delegate.window.rootViewController;
     vc.view = [UIView new];
     [vc.view addSubview:rootView]; // Add as subview so it doesn't get resized
 
diff --git a/React/Base/RCTLog.h b/React/Base/RCTLog.h
index 644adf6c94fde4..0c6e2a048482bb 100644
--- a/React/Base/RCTLog.h
+++ b/React/Base/RCTLog.h
@@ -11,6 +11,7 @@
 
 #import <React/RCTAssert.h>
 #import <React/RCTDefines.h>
+#import <React/RCTUtils.h>
 
 #ifndef RCTLOG_ENABLED
 #define RCTLOG_ENABLED 1
diff --git a/React/Base/RCTLog.mm b/React/Base/RCTLog.mm
index 517175e5c600df..fd6c6b80d3f869 100644
--- a/React/Base/RCTLog.mm
+++ b/React/Base/RCTLog.mm
@@ -218,7 +218,7 @@ void _RCTLogNativeInternal(RCTLogLevel level, const char *fileName, int lineNumb
 #if RCT_DEBUG
 
     // Log to red box in debug mode.
-    if ([UIApplication sharedApplication] && level >= RCTLOG_REDBOX_LEVEL) {
+    if (RCTSharedApplication() && level >= RCTLOG_REDBOX_LEVEL) {
       NSArray<NSString *> *stackSymbols = [NSThread callStackSymbols];
       NSMutableArray<NSDictionary *> *stack =
         [NSMutableArray arrayWithCapacity:(stackSymbols.count - 1)];
diff --git a/React/Modules/RCTAccessibilityManager.m b/React/Modules/RCTAccessibilityManager.m
index 3fcef1e5d3aa49..a9c341aaaed3a3 100644
--- a/React/Modules/RCTAccessibilityManager.m
+++ b/React/Modules/RCTAccessibilityManager.m
@@ -64,14 +64,14 @@ - (instancetype)init
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(didReceiveNewContentSizeCategory:)
                                                  name:UIContentSizeCategoryDidChangeNotification
-                                               object:[UIApplication sharedApplication]];
+                                               object:RCTSharedApplication()];
 
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(didReceiveNewVoiceOverStatus:)
                                                  name:UIAccessibilityVoiceOverStatusChanged
                                                object:nil];
 
-    self.contentSizeCategory = [UIApplication sharedApplication].preferredContentSizeCategory;
+    self.contentSizeCategory = RCTSharedApplication().preferredContentSizeCategory;
     _isVoiceOverEnabled = UIAccessibilityIsVoiceOverRunning();
   }
   return self;
diff --git a/React/Modules/RCTStatusBarManager.m b/React/Modules/RCTStatusBarManager.m
index 849d09436bd911..82a4fd9f9965d5 100644
--- a/React/Modules/RCTStatusBarManager.m
+++ b/React/Modules/RCTStatusBarManager.m
@@ -99,7 +99,7 @@ - (void)applicationWillChangeStatusBarFrame:(NSNotification *)notification
 RCT_EXPORT_METHOD(getHeight:(RCTResponseSenderBlock)callback)
 {
   callback(@[@{
-    @"height": @([UIApplication sharedApplication].statusBarFrame.size.height),
+    @"height": @(RCTSharedApplication().statusBarFrame.size.height),
   }]);
 }
 
diff --git a/React/Profiler/RCTPerfMonitor.m b/React/Profiler/RCTPerfMonitor.m
index 52efbcf267f6ab..16d3ae7b6b7c68 100644
--- a/React/Profiler/RCTPerfMonitor.m
+++ b/React/Profiler/RCTPerfMonitor.m
@@ -24,6 +24,7 @@
 #import "RCTRootView.h"
 #import "RCTUIManager.h"
 #import "RCTBridge+Private.h"
+#import "RCTUtils.h"
 
 #if __has_include("RCTDevMenu.h")
 #import "RCTDevMenu.h"
@@ -321,7 +322,7 @@ - (void)show
 
   [self updateStats];
 
-  UIWindow *window = [UIApplication sharedApplication].delegate.window;
+  UIWindow *window = RCTSharedApplication().delegate.window;
   [window addSubview:self.container];
 
 
diff --git a/React/Profiler/RCTProfile.m b/React/Profiler/RCTProfile.m
index b81a439dbf1467..a7d5ca853c1b93 100644
--- a/React/Profiler/RCTProfile.m
+++ b/React/Profiler/RCTProfile.m
@@ -404,7 +404,7 @@ + (void)toggle:(UIButton *)target
       };
       RCTProfileControlsWindow.hidden = YES;
       dispatch_async(dispatch_get_main_queue(), ^{
-        [[[[[UIApplication sharedApplication] delegate] window] rootViewController] presentViewController:activityViewController
+        [[[[RCTSharedApplication() delegate] window] rootViewController] presentViewController:activityViewController
                                                                                                  animated:YES
                                                                                                completion:nil];
       });
diff --git a/React/Views/RCTModalHostView.m b/React/Views/RCTModalHostView.m
index b06a310885c165..687352e1624bc6 100644
--- a/React/Views/RCTModalHostView.m
+++ b/React/Views/RCTModalHostView.m
@@ -16,6 +16,7 @@
 #import "RCTModalHostViewController.h"
 #import "RCTTouchHandler.h"
 #import "RCTUIManager.h"
+#import "RCTUtils.h"
 #import "UIView+React.h"
 
 @implementation RCTModalHostView
@@ -68,7 +69,7 @@ - (void)notifyForOrientationChange
     return;
   }
 
-  UIInterfaceOrientation currentOrientation = [[UIApplication sharedApplication] statusBarOrientation];
+  UIInterfaceOrientation currentOrientation = [RCTSharedApplication() statusBarOrientation];
   if (currentOrientation == _lastKnownOrientation) {
     return;
   }
diff --git a/React/Views/RCTModalHostViewController.m b/React/Views/RCTModalHostViewController.m
index 6b1e8dcb45c028..8b57356c3a77c4 100644
--- a/React/Views/RCTModalHostViewController.m
+++ b/React/Views/RCTModalHostViewController.m
@@ -28,8 +28,8 @@ - (instancetype)init
   }
 
 #if !TARGET_OS_TV
-  _preferredStatusBarStyle = [[UIApplication sharedApplication] statusBarStyle];
-  _preferredStatusBarHidden = [[UIApplication sharedApplication] isStatusBarHidden];
+  _preferredStatusBarStyle = [RCTSharedApplication() statusBarStyle];
+  _preferredStatusBarHidden = [RCTSharedApplication() isStatusBarHidden];
 #endif
 
   return self;
@@ -59,7 +59,7 @@ - (BOOL)prefersStatusBarHidden
 #if RCT_DEV
 - (UIInterfaceOrientationMask)supportedInterfaceOrientations
 {
-  UIInterfaceOrientationMask appSupportedOrientationsMask = [[UIApplication sharedApplication] supportedInterfaceOrientationsForWindow:[[UIApplication sharedApplication] keyWindow]];
+  UIInterfaceOrientationMask appSupportedOrientationsMask = [RCTSharedApplication() supportedInterfaceOrientationsForWindow:[RCTSharedApplication() keyWindow]];
   if (!(_supportedInterfaceOrientations & appSupportedOrientationsMask)) {
     RCTLogError(@"Modal was presented with 0x%x orientations mask but the application only supports 0x%x."
                 @"Add more interface orientations to your app's Info.plist to fix this."
diff --git a/local-cli/templates/HelloWorld/ios/HelloWorldTests/HelloWorldTests.m b/local-cli/templates/HelloWorld/ios/HelloWorldTests/HelloWorldTests.m
index fa1f1683afa58d..161aba80468287 100644
--- a/local-cli/templates/HelloWorld/ios/HelloWorldTests/HelloWorldTests.m
+++ b/local-cli/templates/HelloWorld/ios/HelloWorldTests/HelloWorldTests.m
@@ -37,7 +37,7 @@ - (BOOL)findSubviewInView:(UIView *)view matching:(BOOL(^)(UIView *view))test
 
 - (void)testRendersWelcomeScreen
 {
-  UIViewController *vc = [[[[UIApplication sharedApplication] delegate] window] rootViewController];
+  UIViewController *vc = [[[RCTSharedApplication() delegate] window] rootViewController];
   NSDate *date = [NSDate dateWithTimeIntervalSinceNow:TIMEOUT_SECONDS];
   BOOL foundElement = NO;
 

From f1371ec24c7fbe66ec80690f8dc7636dd30dbb3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20W=C3=B6hrl?= <lukas@woehrl.net>
Date: Sat, 1 Apr 2017 04:29:05 -0700
Subject: [PATCH 271/366] Don't transfer layout outputs to java for unset edges

Summary:
See facebook/yoga#483. We should not transfer the layout if the layout didn't change. (using ```hasNewLayout```). This also changes that the lock on the java node is only aquired if needed, and it holds the lock only for the time the values are set and not for the time all it's children are set.
Closes https://github.com/facebook/yoga/pull/484

Reviewed By: astreet

Differential Revision: D4802966

Pulled By: emilsjolander

fbshipit-source-id: e8a8f2280ad6b25b98fc68b07eac68e0ec80fe3e
---
 .../main/java/com/facebook/yoga/YogaNode.java | 45 ++++++++++++-------
 .../jni/first-party/yogajni/jni/YGJNI.cpp     | 39 +++++++++++-----
 2 files changed, 57 insertions(+), 27 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java
index b34524a98eb657..a0770e9a025fa3 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java
@@ -42,9 +42,14 @@ public static void setLogger(YogaLogger logger) {
   private long mNativePointer;
   private Object mData;
 
-  private boolean mHasSetPadding = false;
-  private boolean mHasSetMargin = false;
-  private boolean mHasSetBorder = false;
+  /* Those flags needs be in sync with YGJNI.cpp */
+  private final static int MARGIN = 1;
+  private final static int PADDING = 2;
+  private final static int BORDER = 4;
+
+  @DoNotStrip
+  private int mEdgeSetFlag = 0;
+
   private boolean mHasSetPosition = false;
 
   @DoNotStrip
@@ -113,9 +118,7 @@ protected void finalize() throws Throwable {
   private native void jni_YGNodeReset(long nativePointer);
   @Override
   public void reset() {
-    mHasSetPadding = false;
-    mHasSetMargin = false;
-    mHasSetBorder = false;
+    mEdgeSetFlag = 0;
     mHasSetPosition = false;
     mHasNewLayout = true;
 
@@ -123,6 +126,18 @@ public void reset() {
     mHeight = YogaConstants.UNDEFINED;
     mTop = YogaConstants.UNDEFINED;
     mLeft = YogaConstants.UNDEFINED;
+    mMarginLeft = 0;
+    mMarginTop = 0;
+    mMarginRight = 0;
+    mMarginBottom = 0;
+    mPaddingLeft = 0;
+    mPaddingTop = 0;
+    mPaddingRight = 0;
+    mPaddingBottom = 0;
+    mBorderLeft = 0;
+    mBorderTop = 0;
+    mBorderRight = 0;
+    mBorderBottom = 0;
     mLayoutDirection = 0;
 
     mMeasureFunction = null;
@@ -382,7 +397,7 @@ public void setFlexBasisAuto() {
   private native Object jni_YGNodeStyleGetMargin(long nativePointer, int edge);
   @Override
   public YogaValue getMargin(YogaEdge edge) {
-    if (!mHasSetMargin) {
+    if (!((mEdgeSetFlag & MARGIN) == MARGIN)) {
       return YogaValue.UNDEFINED;
     }
     return (YogaValue) jni_YGNodeStyleGetMargin(mNativePointer, edge.intValue());
@@ -391,28 +406,28 @@ public YogaValue getMargin(YogaEdge edge) {
   private native void jni_YGNodeStyleSetMargin(long nativePointer, int edge, float margin);
   @Override
   public void setMargin(YogaEdge edge, float margin) {
-    mHasSetMargin = true;
+    mEdgeSetFlag |= MARGIN;
     jni_YGNodeStyleSetMargin(mNativePointer, edge.intValue(), margin);
   }
 
   private native void jni_YGNodeStyleSetMarginPercent(long nativePointer, int edge, float percent);
   @Override
   public void setMarginPercent(YogaEdge edge, float percent) {
-    mHasSetMargin = true;
+    mEdgeSetFlag |= MARGIN;
     jni_YGNodeStyleSetMarginPercent(mNativePointer, edge.intValue(), percent);
   }
 
   private native void jni_YGNodeStyleSetMarginAuto(long nativePointer, int edge);
   @Override
   public void setMarginAuto(YogaEdge edge) {
-    mHasSetMargin = true;
+    mEdgeSetFlag |= MARGIN;
     jni_YGNodeStyleSetMarginAuto(mNativePointer, edge.intValue());
   }
 
   private native Object jni_YGNodeStyleGetPadding(long nativePointer, int edge);
   @Override
   public YogaValue getPadding(YogaEdge edge) {
-    if (!mHasSetPadding) {
+    if (!((mEdgeSetFlag & PADDING) == PADDING)) {
       return YogaValue.UNDEFINED;
     }
     return (YogaValue) jni_YGNodeStyleGetPadding(mNativePointer, edge.intValue());
@@ -421,21 +436,21 @@ public YogaValue getPadding(YogaEdge edge) {
   private native void jni_YGNodeStyleSetPadding(long nativePointer, int edge, float padding);
   @Override
   public void setPadding(YogaEdge edge, float padding) {
-    mHasSetPadding = true;
+    mEdgeSetFlag |= PADDING;
     jni_YGNodeStyleSetPadding(mNativePointer, edge.intValue(), padding);
   }
 
   private native void jni_YGNodeStyleSetPaddingPercent(long nativePointer, int edge, float percent);
   @Override
   public void setPaddingPercent(YogaEdge edge, float percent) {
-    mHasSetPadding = true;
+    mEdgeSetFlag |= PADDING;
     jni_YGNodeStyleSetPaddingPercent(mNativePointer, edge.intValue(), percent);
   }
 
   private native float jni_YGNodeStyleGetBorder(long nativePointer, int edge);
   @Override
   public float getBorder(YogaEdge edge) {
-    if (!mHasSetBorder) {
+    if (!((mEdgeSetFlag & BORDER) == BORDER)) {
       return YogaConstants.UNDEFINED;
     }
     return jni_YGNodeStyleGetBorder(mNativePointer, edge.intValue());
@@ -444,7 +459,7 @@ public float getBorder(YogaEdge edge) {
   private native void jni_YGNodeStyleSetBorder(long nativePointer, int edge, float border);
   @Override
   public void setBorder(YogaEdge edge, float border) {
-    mHasSetBorder = true;
+    mEdgeSetFlag |= BORDER;
     jni_YGNodeStyleSetBorder(mNativePointer, edge.intValue(), border);
   }
 
diff --git a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
index 9a376861ea4cb4..476a8387b9d636 100644
--- a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
+++ b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
@@ -46,31 +46,46 @@ static void YGTransferLayoutOutputsRecursive(YGNodeRef root) {
       static auto borderRightField = obj->getClass()->getField<jfloat>("mBorderRight");
       static auto borderBottomField = obj->getClass()->getField<jfloat>("mBorderBottom");
 
+      static auto edgeSetFlagField = obj->getClass()->getField<jint>("mEdgeSetFlag");
       static auto hasNewLayoutField = obj->getClass()->getField<jboolean>("mHasNewLayout");
 
+      /* Those flags needs be in sync with YogaNode.java */
+      const int MARGIN = 1;
+      const int PADDING = 2;
+      const int BORDER = 4;
+
+      int hasEdgeSetFlag = (int)obj->getFieldValue(edgeSetFlagField);
+
       obj->setFieldValue(widthField, YGNodeLayoutGetWidth(root));
       obj->setFieldValue(heightField, YGNodeLayoutGetHeight(root));
       obj->setFieldValue(leftField, YGNodeLayoutGetLeft(root));
       obj->setFieldValue(topField, YGNodeLayoutGetTop(root));
 
-      obj->setFieldValue(marginLeftField, YGNodeLayoutGetMargin(root, YGEdgeLeft));
-      obj->setFieldValue(marginTopField, YGNodeLayoutGetMargin(root, YGEdgeTop));
-      obj->setFieldValue(marginRightField, YGNodeLayoutGetMargin(root, YGEdgeRight));
-      obj->setFieldValue(marginBottomField, YGNodeLayoutGetMargin(root, YGEdgeBottom));
+      if((hasEdgeSetFlag & MARGIN) == MARGIN){
+        obj->setFieldValue(marginLeftField, YGNodeLayoutGetMargin(root, YGEdgeLeft));
+        obj->setFieldValue(marginTopField, YGNodeLayoutGetMargin(root, YGEdgeTop));
+        obj->setFieldValue(marginRightField, YGNodeLayoutGetMargin(root, YGEdgeRight));
+        obj->setFieldValue(marginBottomField, YGNodeLayoutGetMargin(root, YGEdgeBottom));
+      }
 
-      obj->setFieldValue(paddingLeftField, YGNodeLayoutGetPadding(root, YGEdgeLeft));
-      obj->setFieldValue(paddingTopField, YGNodeLayoutGetPadding(root, YGEdgeTop));
-      obj->setFieldValue(paddingRightField, YGNodeLayoutGetPadding(root, YGEdgeRight));
-      obj->setFieldValue(paddingBottomField, YGNodeLayoutGetPadding(root, YGEdgeBottom));
+      if((hasEdgeSetFlag & PADDING) == PADDING){
+        obj->setFieldValue(paddingLeftField, YGNodeLayoutGetPadding(root, YGEdgeLeft));
+        obj->setFieldValue(paddingTopField, YGNodeLayoutGetPadding(root, YGEdgeTop));
+        obj->setFieldValue(paddingRightField, YGNodeLayoutGetPadding(root, YGEdgeRight));
+        obj->setFieldValue(paddingBottomField, YGNodeLayoutGetPadding(root, YGEdgeBottom));
+      }
 
-      obj->setFieldValue(borderLeftField, YGNodeLayoutGetBorder(root, YGEdgeLeft));
-      obj->setFieldValue(borderTopField, YGNodeLayoutGetBorder(root, YGEdgeTop));
-      obj->setFieldValue(borderRightField, YGNodeLayoutGetBorder(root, YGEdgeRight));
-      obj->setFieldValue(borderBottomField, YGNodeLayoutGetBorder(root, YGEdgeBottom));
+      if((hasEdgeSetFlag & BORDER) == BORDER){
+        obj->setFieldValue(borderLeftField, YGNodeLayoutGetBorder(root, YGEdgeLeft));
+        obj->setFieldValue(borderTopField, YGNodeLayoutGetBorder(root, YGEdgeTop));
+        obj->setFieldValue(borderRightField, YGNodeLayoutGetBorder(root, YGEdgeRight));
+        obj->setFieldValue(borderBottomField, YGNodeLayoutGetBorder(root, YGEdgeBottom));
+      }
 
       obj->setFieldValue<jboolean>(hasNewLayoutField, true);
       YGTransferLayoutDirection(root, obj);
       YGNodeSetHasNewLayout(root, false);
+
       for (uint32_t i = 0; i < YGNodeGetChildCount(root); i++) {
         YGTransferLayoutOutputsRecursive(YGNodeGetChild(root, i));
       }

From e1466da1ebf4383b447b36e903e2a4ff88a615b2 Mon Sep 17 00:00:00 2001
From: Tim Yung <yungsters@fb.com>
Date: Sun, 2 Apr 2017 08:38:12 -0700
Subject: [PATCH 272/366] RN: Options to Preload Bundles on Startup

Reviewed By: achen1

Differential Revision: D4809513

fbshipit-source-id: a9a4196b72b241faf7c788e26b9e6880cecebb3e
---
 packager/src/Server/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packager/src/Server/index.js b/packager/src/Server/index.js
index 0750e6aa6a2343..2e93047103be4c 100644
--- a/packager/src/Server/index.js
+++ b/packager/src/Server/index.js
@@ -518,7 +518,7 @@ class Server {
     });
   }
 
-  _useCachedOrUpdateOrCreateBundle(options: BundleOptions): Promise<Bundle> {
+  useCachedOrUpdateOrCreateBundle(options: BundleOptions): Promise<Bundle> {
     const optionsJson = this.optionsHash(options);
     const bundleFromScratch = () => {
       const building = this.buildBundle(options);
@@ -683,7 +683,7 @@ class Server {
     };
 
     debug('Getting bundle for request');
-    const building = this._useCachedOrUpdateOrCreateBundle(options);
+    const building = this.useCachedOrUpdateOrCreateBundle(options);
     building.then(
       p => {
         if (requestType === 'bundle') {
@@ -784,7 +784,7 @@ class Server {
 
   _sourceMapForURL(reqUrl: string): Promise<SourceMap> {
     const options = this._getOptionsFromUrl(reqUrl);
-    const building = this._useCachedOrUpdateOrCreateBundle(options);
+    const building = this.useCachedOrUpdateOrCreateBundle(options);
     return building.then(p => p.getSourceMap({
       minify: options.minify,
       dev: options.dev,

From 4bd7dc003520425b64a4922bbb16786b68c6e858 Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Mon, 3 Apr 2017 04:40:27 -0700
Subject: [PATCH 273/366] packager: TransformCache: do not rehash
 transformOptions every single time

Reviewed By: davidaurelio

Differential Revision: D4809963

fbshipit-source-id: 9d3ac907e822596567ee7af4427bcd24f1bac73f
---
 packager/src/lib/TransformCache.js                |  8 +++++---
 packager/src/lib/__tests__/TransformCache-test.js |  8 +++++++-
 packager/src/node-haste/Module.js                 | 14 +++++++++-----
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/packager/src/lib/TransformCache.js b/packager/src/lib/TransformCache.js
index 3dabddfd668a14..ffcfb5c4cd03ae 100644
--- a/packager/src/lib/TransformCache.js
+++ b/packager/src/lib/TransformCache.js
@@ -19,7 +19,6 @@ const fs = require('fs');
  * this particular use case.
  */
 const imurmurhash = require('imurmurhash');
-const jsonStableStringify = require('json-stable-stringify');
 const mkdirp = require('mkdirp');
 const path = require('path');
 const rimraf = require('rimraf');
@@ -64,6 +63,7 @@ function hashSourceCode(props: {
   sourceCode: string,
   getTransformCacheKey: GetTransformCacheKey,
   transformOptions: TransformOptions,
+  transformOptionsKey: string,
 }): string {
   return imurmurhash(props.getTransformCacheKey(
     props.sourceCode,
@@ -79,11 +79,11 @@ function hashSourceCode(props: {
  */
 function getCacheFilePaths(props: {
   filePath: string,
-  transformOptions: TransformOptions,
+  transformOptionsKey: string,
 }): CacheFilePaths {
   const hasher = imurmurhash()
     .hash(props.filePath)
-    .hash(jsonStableStringify(props.transformOptions) || '');
+    .hash(props.transformOptionsKey);
   const hash = toFixedHex(8, hasher.result());
   const prefix = hash.substr(0, 2);
   const fileName = `${hash.substr(2)}${path.basename(props.filePath)}`;
@@ -135,6 +135,7 @@ function writeSync(props: {
   sourceCode: string,
   getTransformCacheKey: GetTransformCacheKey,
   transformOptions: TransformOptions,
+  transformOptionsKey: string,
   result: CachedResult,
 }): void {
   const cacheFilePath = getCacheFilePaths(props);
@@ -296,6 +297,7 @@ export type ReadTransformProps = {
   filePath: string,
   sourceCode: string,
   transformOptions: TransformOptions,
+  transformOptionsKey: string,
   getTransformCacheKey: GetTransformCacheKey,
   cacheOptions: CacheOptions,
 };
diff --git a/packager/src/lib/__tests__/TransformCache-test.js b/packager/src/lib/__tests__/TransformCache-test.js
index 9de6c9477f79d2..c20923429ae8d4 100644
--- a/packager/src/lib/__tests__/TransformCache-test.js
+++ b/packager/src/lib/__tests__/TransformCache-test.js
@@ -15,9 +15,12 @@ jest
   .dontMock('../TransformCache')
   .dontMock('../toFixedHex')
   .dontMock('left-pad')
-  .dontMock('lodash/throttle');
+  .dontMock('lodash/throttle')
+  .dontMock('crypto');
 
 const imurmurhash = require('imurmurhash');
+const crypto = require('crypto');
+const jsonStableStringify = require('json-stable-stringify');
 
 const memoryFS = new Map();
 
@@ -66,6 +69,8 @@ describe('TransformCache', () => {
         getTransformCacheKey: () => 'abcdef',
         filePath,
         transformOptions,
+        transformOptionsKey: crypto.createHash('md5')
+          .update(jsonStableStringify(transformOptions)).digest('hex'),
         result: {
           code: `/* result for ${key} */`,
           dependencies: ['foo', `dep of ${key}`],
@@ -100,6 +105,7 @@ describe('TransformCache', () => {
         getTransformCacheKey: () => transformCacheKey,
         filePath: 'test.js',
         transformOptions: {foo: 1},
+        transformOptionsKey: 'boo!',
         result: {
           code: `/* result for ${key} */`,
           dependencies: ['foo', `dep of ${key}`],
diff --git a/packager/src/node-haste/Module.js b/packager/src/node-haste/Module.js
index fa45c76251b5c8..8fb916a8cacde8 100644
--- a/packager/src/node-haste/Module.js
+++ b/packager/src/node-haste/Module.js
@@ -360,7 +360,7 @@ class Module {
     if (this._readResultsByOptionsKey.has(key)) {
       return this._readResultsByOptionsKey.get(key);
     }
-    const result = this._readFromTransformCache(transformOptions);
+    const result = this._readFromTransformCache(transformOptions, key);
     this._readResultsByOptionsKey.set(key, result);
     return result;
   }
@@ -369,8 +369,11 @@ class Module {
    * Read again from the TransformCache, on disk. `readCached` should be favored
    * so it's faster in case the results are already in memory.
    */
-  _readFromTransformCache(transformOptions: TransformOptions): ?ReadResult {
-    const cacheProps = this._getCacheProps(transformOptions);
+  _readFromTransformCache(
+    transformOptions: TransformOptions,
+    transformOptionsKey: string,
+  ): ?ReadResult {
+    const cacheProps = this._getCacheProps(transformOptions, transformOptionsKey);
     const cachedResult = TransformCache.readSync(cacheProps);
     if (cachedResult) {
       return this._finalizeReadResult(cacheProps.sourceCode, cachedResult);
@@ -391,7 +394,7 @@ class Module {
       return promise;
     }
     const freshPromise = Promise.resolve().then(() => {
-      const cacheProps = this._getCacheProps(transformOptions);
+      const cacheProps = this._getCacheProps(transformOptions, key);
       return new Promise((resolve, reject) => {
         this._getAndCacheTransformedCode(
           cacheProps,
@@ -413,7 +416,7 @@ class Module {
     return freshPromise;
   }
 
-  _getCacheProps(transformOptions: TransformOptions) {
+  _getCacheProps(transformOptions: TransformOptions, transformOptionsKey: string) {
     const sourceCode = this._readSourceCode();
     const moduleDocBlock = this._readDocBlock();
     const getTransformCacheKey = this._getTransformCacheKey;
@@ -428,6 +431,7 @@ class Module {
       sourceCode,
       getTransformCacheKey,
       transformOptions,
+      transformOptionsKey,
       cacheOptions: {
         resetCache: this._options.resetCache,
         reporter: this._reporter,

From cc2ec6ff0739a6f2a59b6eb62288790136b6983d Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Mon, 3 Apr 2017 05:49:40 -0700
Subject: [PATCH 274/366] packager: TransformCache: use sha1 instead of
 murmurhash

Reviewed By: davidaurelio

Differential Revision: D4809941

fbshipit-source-id: 33b6c56b4c48eca88d8c1922f52ed29a728d1173
---
 packager/src/lib/TransformCache.js            | 46 +++++++++----------
 .../src/lib/__tests__/TransformCache-test.js  |  1 -
 packager/src/lib/toFixedHex.js                | 20 --------
 3 files changed, 22 insertions(+), 45 deletions(-)
 delete mode 100644 packager/src/lib/toFixedHex.js

diff --git a/packager/src/lib/TransformCache.js b/packager/src/lib/TransformCache.js
index ffcfb5c4cd03ae..1e5ac907c00db3 100644
--- a/packager/src/lib/TransformCache.js
+++ b/packager/src/lib/TransformCache.js
@@ -11,19 +11,13 @@
 
 'use strict';
 
+const crypto = require('crypto');
 const debugRead = require('debug')('RNP:TransformCache:Read');
 const fs = require('fs');
-/**
- * We get the package "for free" with "write-file-atomic". MurmurHash3 is a
- * faster hash, but non-cryptographic and insecure, that seems reasonnable for
- * this particular use case.
- */
-const imurmurhash = require('imurmurhash');
 const mkdirp = require('mkdirp');
 const path = require('path');
 const rimraf = require('rimraf');
 const terminal = require('../lib/terminal');
-const toFixedHex = require('./toFixedHex');
 const writeFileAtomicSync = require('write-file-atomic').sync;
 
 const CACHE_NAME = 'react-native-packager-cache';
@@ -47,9 +41,9 @@ const getCacheDirPath = (function() {
     if (dirPath == null) {
       dirPath = path.join(
         require('os').tmpdir(),
-        CACHE_NAME + '-' + imurmurhash(__dirname).result().toString(16),
+        CACHE_NAME + '-' + crypto.createHash('sha1')
+          .update(__dirname).digest('base64'),
       );
-
       require('debug')('RNP:TransformCache:Dir')(
         `transform cache directory: ${dirPath}`
       );
@@ -65,11 +59,14 @@ function hashSourceCode(props: {
   transformOptions: TransformOptions,
   transformOptionsKey: string,
 }): string {
-  return imurmurhash(props.getTransformCacheKey(
-    props.sourceCode,
-    props.filePath,
-    props.transformOptions,
-  )).hash(props.sourceCode).result();
+  return crypto.createHash('sha1')
+    .update(props.getTransformCacheKey(
+      props.sourceCode,
+      props.filePath,
+      props.transformOptions,
+    ))
+    .update(props.sourceCode)
+    .digest('hex');
 }
 
 /**
@@ -81,10 +78,10 @@ function getCacheFilePaths(props: {
   filePath: string,
   transformOptionsKey: string,
 }): CacheFilePaths {
-  const hasher = imurmurhash()
-    .hash(props.filePath)
-    .hash(props.transformOptionsKey);
-  const hash = toFixedHex(8, hasher.result());
+  const hasher = crypto.createHash('sha1')
+    .update(props.filePath)
+    .update(props.transformOptionsKey);
+  const hash = hasher.digest('hex');
   const prefix = hash.substr(0, 2);
   const fileName = `${hash.substr(2)}${path.basename(props.filePath)}`;
   const base = path.join(getCacheDirPath(), prefix, fileName);
@@ -145,7 +142,7 @@ function writeSync(props: {
   unlinkIfExistsSync(cacheFilePath.metadata);
   writeFileAtomicSync(cacheFilePath.transformedCode, result.code);
   writeFileAtomicSync(cacheFilePath.metadata, JSON.stringify([
-    imurmurhash(result.code).result(),
+    crypto.createHash('sha1').update(result.code).digest('hex'),
     hashSourceCode(props),
     result.dependencies,
     result.dependencyOffsets,
@@ -243,8 +240,8 @@ const GARBAGE_COLLECTOR = new (class GarbageCollector {
 function readMetadataFileSync(
   metadataFilePath: string,
 ): ?{
-  cachedResultHash: number,
-  cachedSourceHash: number,
+  cachedResultHash: string,
+  cachedSourceHash: string,
   dependencies: Array<string>,
   dependencyOffsets: Array<number>,
   sourceMap: ?SourceMap,
@@ -270,8 +267,8 @@ function readMetadataFileSync(
     sourceMap,
   ] = metadata;
   if (
-    typeof cachedResultHash !== 'number' ||
-    typeof cachedSourceHash !== 'number' ||
+    typeof cachedResultHash !== 'string' ||
+    typeof cachedSourceHash !== 'string' ||
     !(
       Array.isArray(dependencies) &&
       dependencies.every(dep => typeof dep === 'string')
@@ -329,7 +326,8 @@ function readSync(props: ReadTransformProps): ?CachedResult {
       return null;
     }
     transformedCode = fs.readFileSync(cacheFilePaths.transformedCode, 'utf8');
-    if (metadata.cachedResultHash !== imurmurhash(transformedCode).result()) {
+    const codeHash = crypto.createHash('sha1').update(transformedCode).digest('hex');
+    if (metadata.cachedResultHash !== codeHash) {
       return null;
     }
   } catch (error) {
diff --git a/packager/src/lib/__tests__/TransformCache-test.js b/packager/src/lib/__tests__/TransformCache-test.js
index c20923429ae8d4..9f34c483d25b47 100644
--- a/packager/src/lib/__tests__/TransformCache-test.js
+++ b/packager/src/lib/__tests__/TransformCache-test.js
@@ -13,7 +13,6 @@ jest
   .dontMock('imurmurhash')
   .dontMock('json-stable-stringify')
   .dontMock('../TransformCache')
-  .dontMock('../toFixedHex')
   .dontMock('left-pad')
   .dontMock('lodash/throttle')
   .dontMock('crypto');
diff --git a/packager/src/lib/toFixedHex.js b/packager/src/lib/toFixedHex.js
deleted file mode 100644
index 3952e15a1005ae..00000000000000
--- a/packager/src/lib/toFixedHex.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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.
- *
- * @flow
- */
-
-'use strict';
-
-const leftPad = require('left-pad');
-
-function toFixedHex(length: number, number: number): string {
-  return leftPad(number.toString(16), length, '0');
-}
-
-module.exports = toFixedHex;

From dcecfa3189d7a71f57f908cc008e26c20a7cb2f5 Mon Sep 17 00:00:00 2001
From: Mike Grabowski <grabbou@gmail.com>
Date: Mon, 3 Apr 2017 08:33:13 -0700
Subject: [PATCH 275/366] Make CLI executable configurable

Summary:
Follow up to #13248 for iOS.

This pull request allows changing the default path to `cli` when running from Xcode environment. That is especially useful when debugging from a different location or... running `Haul`.

Set `export CLI_PATH=./node_modules/react-native/local-cli/cli.js` and run. Should use new path provided.
Closes https://github.com/facebook/react-native/pull/13264

Differential Revision: D4819059

Pulled By: ericvicenti

fbshipit-source-id: 4a6241823c0bc8f1fa16869bc872bdbe04df510f
---
 packager/react-native-xcode.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packager/react-native-xcode.sh b/packager/react-native-xcode.sh
index d136282fdd683d..6ef8f3e01297aa 100755
--- a/packager/react-native-xcode.sh
+++ b/packager/react-native-xcode.sh
@@ -55,6 +55,8 @@ fi
 
 [ -z "$NODE_BINARY" ] && export NODE_BINARY="node"
 
+[ -z "$CLI_PATH" ] && export CLI_PATH="$REACT_NATIVE_DIR/local-cli/cli.js"
+
 nodejs_not_found()
 {
   echo "error: Can't find '$NODE_BINARY' binary to build React Native bundle" >&2
@@ -85,7 +87,7 @@ fi
 
 BUNDLE_FILE="$DEST/main.jsbundle"
 
-$NODE_BINARY "$REACT_NATIVE_DIR/local-cli/cli.js" bundle \
+$NODE_BINARY $CLI_PATH bundle \
   --entry-file "$ENTRY_FILE" \
   --platform ios \
   --dev $DEV \

From b4da59e9c288fb503be6bf8042ef3979a7b094c9 Mon Sep 17 00:00:00 2001
From: David Aurelio <davidaurelio@fb.com>
Date: Mon, 3 Apr 2017 08:46:32 -0700
Subject: [PATCH 276/366] Fix file indentation

Reviewed By: jeanlauliac

Differential Revision: D4819078

fbshipit-source-id: 76bdc2381e479396ef11144236817ffd590f1039
---
 .../src/ModuleGraph/node-haste/node-haste.js  | 78 +++++++++----------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/packager/src/ModuleGraph/node-haste/node-haste.js b/packager/src/ModuleGraph/node-haste/node-haste.js
index ed23fc822a6028..042e8c438e02e4 100644
--- a/packager/src/ModuleGraph/node-haste/node-haste.js
+++ b/packager/src/ModuleGraph/node-haste/node-haste.js
@@ -62,58 +62,58 @@ exports.createResolveFn = function(options: ResolveOptions): ResolveFn {
     extraNodeModules,
     transformedFiles,
   } = options;
-   const files = Object.keys(transformedFiles);
-   const getTransformedFile =
+  const files = Object.keys(transformedFiles);
+  const getTransformedFile =
     path => Promise.resolve(
       transformedFiles[path] || Promise.reject(new Error(`"${path} does not exist`))
     );
 
-   const helpers = new DependencyGraphHelpers({
-     assetExts,
-     providesModuleNodeModules: defaults.providesModuleNodeModules,
-   });
+  const helpers = new DependencyGraphHelpers({
+    assetExts,
+    providesModuleNodeModules: defaults.providesModuleNodeModules,
+  });
 
-   const hasteFS = new HasteFS(files);
-   const moduleCache = new ModuleCache(
+  const hasteFS = new HasteFS(files);
+  const moduleCache = new ModuleCache(
     filePath => hasteFS.closest(filePath, 'package.json'),
     getTransformedFile,
   );
-   const hasteMap = new HasteMap({
-     extensions: ['js', 'json'],
-     files,
-     helpers,
-     moduleCache,
-     platforms,
-     preferNativePlatform: true,
-   });
+  const hasteMap = new HasteMap({
+    extensions: ['js', 'json'],
+    files,
+    helpers,
+    moduleCache,
+    platforms,
+    preferNativePlatform: true,
+  });
 
-   const hasteMapBuilt = hasteMap.build();
-   const resolutionRequests = {};
-   return (id, source, platform, _, callback) => {
-     let resolutionRequest = resolutionRequests[platform];
-     if (!resolutionRequest) {
-       resolutionRequest = resolutionRequests[platform] = new ResolutionRequest({
-         dirExists: filePath => hasteFS.dirExists(filePath),
-         entryPath: '',
-         extraNodeModules,
-         hasteFS,
-         hasteMap,
-         helpers,
-         moduleCache,
-         moduleMap: getFakeModuleMap(hasteMap),
-         platform,
-         platforms,
-         preferNativePlatform: true,
-       });
-     }
+  const hasteMapBuilt = hasteMap.build();
+  const resolutionRequests = {};
+  return (id, source, platform, _, callback) => {
+    let resolutionRequest = resolutionRequests[platform];
+    if (!resolutionRequest) {
+      resolutionRequest = resolutionRequests[platform] = new ResolutionRequest({
+        dirExists: filePath => hasteFS.dirExists(filePath),
+        entryPath: '',
+        extraNodeModules,
+        hasteFS,
+        hasteMap,
+        helpers,
+        moduleCache,
+        moduleMap: getFakeModuleMap(hasteMap),
+        platform,
+        platforms,
+        preferNativePlatform: true,
+      });
+    }
 
-     const from = new Module(source, moduleCache, getTransformedFile(source));
-     hasteMapBuilt
+    const from = new Module(source, moduleCache, getTransformedFile(source));
+    hasteMapBuilt
       .then(() => resolutionRequest.resolveDependency(from, id))
       .then(
         // nextTick to escape promise error handling
         module => process.nextTick(callback, null, module.path),
         error => process.nextTick(callback, error),
       );
-   };
- };
+  };
+};

From d38644eee53e81c70978ba48ef9dcd2e78fd5b80 Mon Sep 17 00:00:00 2001
From: Jhen <developer@jhen.me>
Date: Mon, 3 Apr 2017 09:06:27 -0700
Subject: [PATCH 277/366] Add Atom Beta to launchEditor

Summary:
Support [the pre-release of Atom](https://github.com/atom/atom/releases/tag/v1.16.0-beta0) for launchEditor in RN packager.

Open the pre-release of Atom and use the following code: (use the built-in [openFileInEditor](https://github.com/facebook/react-native/blob/292cc82d0ebc437a6f1cdd2e972b3917b7ee05a4/Libraries/Core/Devtools/openFileInEditor.js) module)

```js
import openFileInEditor from 'openFileInEditor'

openFileInEditor(file, lineNumber)
```
Closes https://github.com/facebook/react-native/pull/13255

Differential Revision: D4819130

Pulled By: ericvicenti

fbshipit-source-id: eb542295ee9489dad0fe9084e51c4141d33f1fbf
---
 local-cli/server/util/launchEditor.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/local-cli/server/util/launchEditor.js b/local-cli/server/util/launchEditor.js
index 6b7adb6abc5545..db23750a8b7dab 100644
--- a/local-cli/server/util/launchEditor.js
+++ b/local-cli/server/util/launchEditor.js
@@ -30,6 +30,8 @@ function isTerminalEditor(editor) {
 // of the app every time
 var COMMON_EDITORS = {
   '/Applications/Atom.app/Contents/MacOS/Atom': 'atom',
+  '/Applications/Atom Beta.app/Contents/MacOS/Atom Beta':
+    '/Applications/Atom Beta.app/Contents/MacOS/Atom Beta',
   '/Applications/Sublime Text.app/Contents/MacOS/Sublime Text':
     '/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl',
   '/Applications/Sublime Text 2.app/Contents/MacOS/Sublime Text 2':
@@ -57,7 +59,7 @@ function getArgumentsForLineNumber(editor, fileName, lineNumber, workspace) {
     case 'wstorm':
     case 'appcode':
     case 'charm':
-    case 'idea':  
+    case 'idea':
       return [fileName + ':' + lineNumber];
     case 'joe':
     case 'emacs':

From dfaa03e1cb12b349152ca10f997ac198ab995d1e Mon Sep 17 00:00:00 2001
From: Andrew Ingram <andy@andrewingram.net>
Date: Mon, 3 Apr 2017 09:11:43 -0700
Subject: [PATCH 278/366] Fixes "guesture" typo in PanResponser docs

Summary:
Simple typo fix in docs.
Closes https://github.com/facebook/react-native/pull/13247

Differential Revision: D4819135

Pulled By: ericvicenti

fbshipit-source-id: 64bc597133a31276fdff8f1ef2ee061f2a9bb17d
---
 Libraries/Interaction/PanResponder.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Libraries/Interaction/PanResponder.js b/Libraries/Interaction/PanResponder.js
index ee5c0edb08282b..fe217b8b74f914 100644
--- a/Libraries/Interaction/PanResponder.js
+++ b/Libraries/Interaction/PanResponder.js
@@ -77,7 +77,7 @@ const currentCentroidY = TouchHistoryMath.currentCentroidY;
  *       onMoveShouldSetPanResponderCapture: (evt, gestureState) => true,
  *
  *       onPanResponderGrant: (evt, gestureState) => {
- *         // The guesture has started. Show visual feedback so the user knows
+ *         // The gesture has started. Show visual feedback so the user knows
  *         // what is happening!
  *
  *         // gestureState.d{x,y} will be set to zero now

From 0ec984e69a60ee98e18cb6081bd97ba7cc9b377a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20W=C3=B6hrl?= <lukas@woehrl.net>
Date: Mon, 3 Apr 2017 09:34:42 -0700
Subject: [PATCH 279/366] Optimize log print by using html format

Summary:
See facebook/yoga#453. Optimizes the node log print by generating some enum text via ```enum.py``` and moving printing to new functions to reduce boilerplate code.

Changes the log output to format the nodes in html to be able to copy paste it  into browsers for quick debugging.

Hides all default values.
Closes https://github.com/facebook/yoga/pull/479

Reviewed By: gkassabli

Differential Revision: D4802184

Pulled By: emilsjolander

fbshipit-source-id: 143bd63cbc31fb0755d711062cb4e6a448049ba3
---
 ReactCommon/yoga/yoga/YGEnums.c | 219 +++++++++++++++++++++++++
 ReactCommon/yoga/yoga/YGEnums.h |  15 ++
 ReactCommon/yoga/yoga/Yoga.c    | 276 ++++++++++++++------------------
 3 files changed, 351 insertions(+), 159 deletions(-)
 create mode 100644 ReactCommon/yoga/yoga/YGEnums.c

diff --git a/ReactCommon/yoga/yoga/YGEnums.c b/ReactCommon/yoga/yoga/YGEnums.c
new file mode 100644
index 00000000000000..0108e6a616cfa3
--- /dev/null
+++ b/ReactCommon/yoga/yoga/YGEnums.c
@@ -0,0 +1,219 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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.
+ */
+
+#include "YGEnums.h"
+
+const char *YGAlignToString(const YGAlign value){
+  switch(value){
+    case YGAlignAuto:
+      return "auto";
+    case YGAlignFlexStart:
+      return "flex-start";
+    case YGAlignCenter:
+      return "center";
+    case YGAlignFlexEnd:
+      return "flex-end";
+    case YGAlignStretch:
+      return "stretch";
+    case YGAlignBaseline:
+      return "baseline";
+    case YGAlignSpaceBetween:
+      return "space-between";
+    case YGAlignSpaceAround:
+      return "space-around";
+  }
+  return "unknown";
+}
+
+const char *YGDimensionToString(const YGDimension value){
+  switch(value){
+    case YGDimensionWidth:
+      return "width";
+    case YGDimensionHeight:
+      return "height";
+  }
+  return "unknown";
+}
+
+const char *YGDirectionToString(const YGDirection value){
+  switch(value){
+    case YGDirectionInherit:
+      return "inherit";
+    case YGDirectionLTR:
+      return "ltr";
+    case YGDirectionRTL:
+      return "rtl";
+  }
+  return "unknown";
+}
+
+const char *YGDisplayToString(const YGDisplay value){
+  switch(value){
+    case YGDisplayFlex:
+      return "flex";
+    case YGDisplayNone:
+      return "none";
+  }
+  return "unknown";
+}
+
+const char *YGEdgeToString(const YGEdge value){
+  switch(value){
+    case YGEdgeLeft:
+      return "left";
+    case YGEdgeTop:
+      return "top";
+    case YGEdgeRight:
+      return "right";
+    case YGEdgeBottom:
+      return "bottom";
+    case YGEdgeStart:
+      return "start";
+    case YGEdgeEnd:
+      return "end";
+    case YGEdgeHorizontal:
+      return "horizontal";
+    case YGEdgeVertical:
+      return "vertical";
+    case YGEdgeAll:
+      return "all";
+  }
+  return "unknown";
+}
+
+const char *YGExperimentalFeatureToString(const YGExperimentalFeature value){
+  switch(value){
+    case YGExperimentalFeatureRounding:
+      return "rounding";
+    case YGExperimentalFeatureWebFlexBasis:
+      return "web-flex-basis";
+    case YGExperimentalFeatureMinFlexFix:
+      return "min-flex-fix";
+  }
+  return "unknown";
+}
+
+const char *YGFlexDirectionToString(const YGFlexDirection value){
+  switch(value){
+    case YGFlexDirectionColumn:
+      return "column";
+    case YGFlexDirectionColumnReverse:
+      return "column-reverse";
+    case YGFlexDirectionRow:
+      return "row";
+    case YGFlexDirectionRowReverse:
+      return "row-reverse";
+  }
+  return "unknown";
+}
+
+const char *YGJustifyToString(const YGJustify value){
+  switch(value){
+    case YGJustifyFlexStart:
+      return "flex-start";
+    case YGJustifyCenter:
+      return "center";
+    case YGJustifyFlexEnd:
+      return "flex-end";
+    case YGJustifySpaceBetween:
+      return "space-between";
+    case YGJustifySpaceAround:
+      return "space-around";
+  }
+  return "unknown";
+}
+
+const char *YGLogLevelToString(const YGLogLevel value){
+  switch(value){
+    case YGLogLevelError:
+      return "error";
+    case YGLogLevelWarn:
+      return "warn";
+    case YGLogLevelInfo:
+      return "info";
+    case YGLogLevelDebug:
+      return "debug";
+    case YGLogLevelVerbose:
+      return "verbose";
+  }
+  return "unknown";
+}
+
+const char *YGMeasureModeToString(const YGMeasureMode value){
+  switch(value){
+    case YGMeasureModeUndefined:
+      return "undefined";
+    case YGMeasureModeExactly:
+      return "exactly";
+    case YGMeasureModeAtMost:
+      return "at-most";
+  }
+  return "unknown";
+}
+
+const char *YGOverflowToString(const YGOverflow value){
+  switch(value){
+    case YGOverflowVisible:
+      return "visible";
+    case YGOverflowHidden:
+      return "hidden";
+    case YGOverflowScroll:
+      return "scroll";
+  }
+  return "unknown";
+}
+
+const char *YGPositionTypeToString(const YGPositionType value){
+  switch(value){
+    case YGPositionTypeRelative:
+      return "relative";
+    case YGPositionTypeAbsolute:
+      return "absolute";
+  }
+  return "unknown";
+}
+
+const char *YGPrintOptionsToString(const YGPrintOptions value){
+  switch(value){
+    case YGPrintOptionsLayout:
+      return "layout";
+    case YGPrintOptionsStyle:
+      return "style";
+    case YGPrintOptionsChildren:
+      return "children";
+  }
+  return "unknown";
+}
+
+const char *YGUnitToString(const YGUnit value){
+  switch(value){
+    case YGUnitUndefined:
+      return "undefined";
+    case YGUnitPoint:
+      return "point";
+    case YGUnitPercent:
+      return "percent";
+    case YGUnitAuto:
+      return "auto";
+  }
+  return "unknown";
+}
+
+const char *YGWrapToString(const YGWrap value){
+  switch(value){
+    case YGWrapNoWrap:
+      return "no-wrap";
+    case YGWrapWrap:
+      return "wrap";
+    case YGWrapWrapReverse:
+      return "wrap-reverse";
+  }
+  return "unknown";
+}
+
diff --git a/ReactCommon/yoga/yoga/YGEnums.h b/ReactCommon/yoga/yoga/YGEnums.h
index 6022f5587dbb17..8a929b9e7ad9a9 100644
--- a/ReactCommon/yoga/yoga/YGEnums.h
+++ b/ReactCommon/yoga/yoga/YGEnums.h
@@ -24,12 +24,14 @@ typedef YG_ENUM_BEGIN(YGAlign) {
   YGAlignSpaceBetween,
   YGAlignSpaceAround,
 } YG_ENUM_END(YGAlign);
+WIN_EXPORT const char *YGAlignToString(const YGAlign value);
 
 #define YGDimensionCount 2
 typedef YG_ENUM_BEGIN(YGDimension) {
   YGDimensionWidth,
   YGDimensionHeight,
 } YG_ENUM_END(YGDimension);
+WIN_EXPORT const char *YGDimensionToString(const YGDimension value);
 
 #define YGDirectionCount 3
 typedef YG_ENUM_BEGIN(YGDirection) {
@@ -37,12 +39,14 @@ typedef YG_ENUM_BEGIN(YGDirection) {
   YGDirectionLTR,
   YGDirectionRTL,
 } YG_ENUM_END(YGDirection);
+WIN_EXPORT const char *YGDirectionToString(const YGDirection value);
 
 #define YGDisplayCount 2
 typedef YG_ENUM_BEGIN(YGDisplay) {
   YGDisplayFlex,
   YGDisplayNone,
 } YG_ENUM_END(YGDisplay);
+WIN_EXPORT const char *YGDisplayToString(const YGDisplay value);
 
 #define YGEdgeCount 9
 typedef YG_ENUM_BEGIN(YGEdge) {
@@ -56,6 +60,7 @@ typedef YG_ENUM_BEGIN(YGEdge) {
   YGEdgeVertical,
   YGEdgeAll,
 } YG_ENUM_END(YGEdge);
+WIN_EXPORT const char *YGEdgeToString(const YGEdge value);
 
 #define YGExperimentalFeatureCount 3
 typedef YG_ENUM_BEGIN(YGExperimentalFeature) {
@@ -63,6 +68,7 @@ typedef YG_ENUM_BEGIN(YGExperimentalFeature) {
   YGExperimentalFeatureWebFlexBasis,
   YGExperimentalFeatureMinFlexFix,
 } YG_ENUM_END(YGExperimentalFeature);
+WIN_EXPORT const char *YGExperimentalFeatureToString(const YGExperimentalFeature value);
 
 #define YGFlexDirectionCount 4
 typedef YG_ENUM_BEGIN(YGFlexDirection) {
@@ -71,6 +77,7 @@ typedef YG_ENUM_BEGIN(YGFlexDirection) {
   YGFlexDirectionRow,
   YGFlexDirectionRowReverse,
 } YG_ENUM_END(YGFlexDirection);
+WIN_EXPORT const char *YGFlexDirectionToString(const YGFlexDirection value);
 
 #define YGJustifyCount 5
 typedef YG_ENUM_BEGIN(YGJustify) {
@@ -80,6 +87,7 @@ typedef YG_ENUM_BEGIN(YGJustify) {
   YGJustifySpaceBetween,
   YGJustifySpaceAround,
 } YG_ENUM_END(YGJustify);
+WIN_EXPORT const char *YGJustifyToString(const YGJustify value);
 
 #define YGLogLevelCount 5
 typedef YG_ENUM_BEGIN(YGLogLevel) {
@@ -89,6 +97,7 @@ typedef YG_ENUM_BEGIN(YGLogLevel) {
   YGLogLevelDebug,
   YGLogLevelVerbose,
 } YG_ENUM_END(YGLogLevel);
+WIN_EXPORT const char *YGLogLevelToString(const YGLogLevel value);
 
 #define YGMeasureModeCount 3
 typedef YG_ENUM_BEGIN(YGMeasureMode) {
@@ -96,6 +105,7 @@ typedef YG_ENUM_BEGIN(YGMeasureMode) {
   YGMeasureModeExactly,
   YGMeasureModeAtMost,
 } YG_ENUM_END(YGMeasureMode);
+WIN_EXPORT const char *YGMeasureModeToString(const YGMeasureMode value);
 
 #define YGOverflowCount 3
 typedef YG_ENUM_BEGIN(YGOverflow) {
@@ -103,12 +113,14 @@ typedef YG_ENUM_BEGIN(YGOverflow) {
   YGOverflowHidden,
   YGOverflowScroll,
 } YG_ENUM_END(YGOverflow);
+WIN_EXPORT const char *YGOverflowToString(const YGOverflow value);
 
 #define YGPositionTypeCount 2
 typedef YG_ENUM_BEGIN(YGPositionType) {
   YGPositionTypeRelative,
   YGPositionTypeAbsolute,
 } YG_ENUM_END(YGPositionType);
+WIN_EXPORT const char *YGPositionTypeToString(const YGPositionType value);
 
 #define YGPrintOptionsCount 3
 typedef YG_ENUM_BEGIN(YGPrintOptions) {
@@ -116,6 +128,7 @@ typedef YG_ENUM_BEGIN(YGPrintOptions) {
   YGPrintOptionsStyle = 2,
   YGPrintOptionsChildren = 4,
 } YG_ENUM_END(YGPrintOptions);
+WIN_EXPORT const char *YGPrintOptionsToString(const YGPrintOptions value);
 
 #define YGUnitCount 4
 typedef YG_ENUM_BEGIN(YGUnit) {
@@ -124,6 +137,7 @@ typedef YG_ENUM_BEGIN(YGUnit) {
   YGUnitPercent,
   YGUnitAuto,
 } YG_ENUM_END(YGUnit);
+WIN_EXPORT const char *YGUnitToString(const YGUnit value);
 
 #define YGWrapCount 3
 typedef YG_ENUM_BEGIN(YGWrap) {
@@ -131,5 +145,6 @@ typedef YG_ENUM_BEGIN(YGWrap) {
   YGWrapWrap,
   YGWrapWrapReverse,
 } YG_ENUM_END(YGWrap);
+WIN_EXPORT const char *YGWrapToString(const YGWrap value);
 
 YG_EXTERN_C_END
diff --git a/ReactCommon/yoga/yoga/Yoga.c b/ReactCommon/yoga/yoga/Yoga.c
index 52999d2b5140fc..4222c230cd52ef 100644
--- a/ReactCommon/yoga/yoga/Yoga.c
+++ b/ReactCommon/yoga/yoga/Yoga.c
@@ -768,29 +768,36 @@ static void YGIndent(const uint32_t n) {
   }
 }
 
-static void YGPrintNumberIfNotZero(const char *str, const YGValue *const number) {
-  if (!YGFloatsEqual(number->value, 0)) {
-    YGLog(YGLogLevelDebug,
-          "%s: %g%s, ",
-          str,
-          number->value,
-          number->unit == YGUnitPoint ? "pt" : "%");
-  }
-}
-
 static void YGPrintNumberIfNotUndefinedf(const char *str, const float number) {
   if (!YGFloatIsUndefined(number)) {
-    YGLog(YGLogLevelDebug, "%s: %g, ", str, number);
+    YGLog(YGLogLevelDebug, "%s: %g; ", str, number);
   }
 }
 
 static void YGPrintNumberIfNotUndefined(const char *str, const YGValue *const number) {
   if (number->unit != YGUnitUndefined) {
-    YGLog(YGLogLevelDebug,
-          "%s: %g%s, ",
-          str,
-          number->value,
-          number->unit == YGUnitPoint ? "pt" : "%");
+    if (number->unit == YGUnitAuto) {
+      YGLog(YGLogLevelDebug, "%s: auto; ", str);
+    } else {
+      const char *unit = number->unit == YGUnitPoint ? "px" : "%";
+      YGLog(YGLogLevelDebug, "%s: %g%s; ", str, number->value, unit);
+    }
+  }
+}
+
+static void YGPrintNumberIfNotAuto(const char *str, const YGValue *const number) {
+  if (number->unit != YGUnitAuto) {
+    YGPrintNumberIfNotUndefined(str, number);
+  }
+}
+
+static void YGPrintEdgeIfNotUndefined(const char *str, const YGValue *edges, const YGEdge edge) {
+  YGPrintNumberIfNotUndefined(str, YGComputedEdgeValue(edges, YGEdgeLeft, &YGValueUndefined));
+}
+
+static void YGPrintNumberIfNotZero(const char *str, const YGValue *const number) {
+  if (!YGFloatsEqual(number->value, 0)) {
+    YGPrintNumberIfNotUndefined(str, number);
   }
 }
 
@@ -799,170 +806,113 @@ static bool YGFourValuesEqual(const YGValue four[4]) {
          YGValueEqual(four[0], four[3]);
 }
 
+static void YGPrintEdges(const char *str, const YGValue *edges) {
+  if (YGFourValuesEqual(edges)) {
+    YGPrintNumberIfNotZero(str, &edges[YGEdgeLeft]);
+  } else {
+    for (YGEdge edge = YGEdgeLeft; edge < YGEdgeCount; edge++) {
+      char buf[30];
+      snprintf(buf, sizeof(buf), "%s-%s", str, YGEdgeToString(edge));
+      YGPrintNumberIfNotZero(buf, &edges[edge]);
+    }
+  }
+}
+
 static void YGNodePrintInternal(const YGNodeRef node,
                                 const YGPrintOptions options,
                                 const uint32_t level) {
   YGIndent(level);
-  YGLog(YGLogLevelDebug, "{");
+  YGLog(YGLogLevelDebug, "<div ");
 
   if (node->print) {
     node->print(node);
   }
 
   if (options & YGPrintOptionsLayout) {
-    YGLog(YGLogLevelDebug, "layout: {");
-    YGLog(YGLogLevelDebug, "width: %g, ", node->layout.dimensions[YGDimensionWidth]);
-    YGLog(YGLogLevelDebug, "height: %g, ", node->layout.dimensions[YGDimensionHeight]);
-    YGLog(YGLogLevelDebug, "top: %g, ", node->layout.position[YGEdgeTop]);
-    YGLog(YGLogLevelDebug, "left: %g", node->layout.position[YGEdgeLeft]);
-    YGLog(YGLogLevelDebug, "}, ");
+    YGLog(YGLogLevelDebug, "layout=\"");
+    YGLog(YGLogLevelDebug, "width: %g; ", node->layout.dimensions[YGDimensionWidth]);
+    YGLog(YGLogLevelDebug, "height: %g; ", node->layout.dimensions[YGDimensionHeight]);
+    YGLog(YGLogLevelDebug, "top: %g; ", node->layout.position[YGEdgeTop]);
+    YGLog(YGLogLevelDebug, "left: %g;", node->layout.position[YGEdgeLeft]);
+    YGLog(YGLogLevelDebug, "\" ");
   }
 
   if (options & YGPrintOptionsStyle) {
-    if (node->style.flexDirection == YGFlexDirectionColumn) {
-      YGLog(YGLogLevelDebug, "flexDirection: 'column', ");
-    } else if (node->style.flexDirection == YGFlexDirectionColumnReverse) {
-      YGLog(YGLogLevelDebug, "flexDirection: 'column-reverse', ");
-    } else if (node->style.flexDirection == YGFlexDirectionRow) {
-      YGLog(YGLogLevelDebug, "flexDirection: 'row', ");
-    } else if (node->style.flexDirection == YGFlexDirectionRowReverse) {
-      YGLog(YGLogLevelDebug, "flexDirection: 'row-reverse', ");
-    }
-
-    if (node->style.justifyContent == YGJustifyCenter) {
-      YGLog(YGLogLevelDebug, "justifyContent: 'center', ");
-    } else if (node->style.justifyContent == YGJustifyFlexEnd) {
-      YGLog(YGLogLevelDebug, "justifyContent: 'flex-end', ");
-    } else if (node->style.justifyContent == YGJustifySpaceAround) {
-      YGLog(YGLogLevelDebug, "justifyContent: 'space-around', ");
-    } else if (node->style.justifyContent == YGJustifySpaceBetween) {
-      YGLog(YGLogLevelDebug, "justifyContent: 'space-between', ");
-    }
-
-    if (node->style.alignItems == YGAlignCenter) {
-      YGLog(YGLogLevelDebug, "alignItems: 'center', ");
-    } else if (node->style.alignItems == YGAlignFlexEnd) {
-      YGLog(YGLogLevelDebug, "alignItems: 'flex-end', ");
-    } else if (node->style.alignItems == YGAlignStretch) {
-      YGLog(YGLogLevelDebug, "alignItems: 'stretch', ");
-    }
-
-    if (node->style.alignContent == YGAlignCenter) {
-      YGLog(YGLogLevelDebug, "alignContent: 'center', ");
-    } else if (node->style.alignContent == YGAlignFlexEnd) {
-      YGLog(YGLogLevelDebug, "alignContent: 'flex-end', ");
-    } else if (node->style.alignContent == YGAlignStretch) {
-      YGLog(YGLogLevelDebug, "alignContent: 'stretch', ");
-    }
-
-    if (node->style.alignSelf == YGAlignFlexStart) {
-      YGLog(YGLogLevelDebug, "alignSelf: 'flex-start', ");
-    } else if (node->style.alignSelf == YGAlignCenter) {
-      YGLog(YGLogLevelDebug, "alignSelf: 'center', ");
-    } else if (node->style.alignSelf == YGAlignFlexEnd) {
-      YGLog(YGLogLevelDebug, "alignSelf: 'flex-end', ");
-    } else if (node->style.alignSelf == YGAlignStretch) {
-      YGLog(YGLogLevelDebug, "alignSelf: 'stretch', ");
-    }
-
-    YGPrintNumberIfNotUndefinedf("flexGrow", YGResolveFlexGrow(node));
-    YGPrintNumberIfNotUndefinedf("flexShrink", YGNodeResolveFlexShrink(node));
-    YGPrintNumberIfNotUndefined("flexBasis", YGNodeResolveFlexBasisPtr(node));
-
-    if (node->style.overflow == YGOverflowHidden) {
-      YGLog(YGLogLevelDebug, "overflow: 'hidden', ");
-    } else if (node->style.overflow == YGOverflowVisible) {
-      YGLog(YGLogLevelDebug, "overflow: 'visible', ");
-    } else if (node->style.overflow == YGOverflowScroll) {
-      YGLog(YGLogLevelDebug, "overflow: 'scroll', ");
-    }
-
-    if (YGFourValuesEqual(node->style.margin)) {
-      YGPrintNumberIfNotZero("margin",
-                             YGComputedEdgeValue(node->style.margin, YGEdgeLeft, &YGValueZero));
-    } else {
-      YGPrintNumberIfNotZero("marginLeft",
-                             YGComputedEdgeValue(node->style.margin, YGEdgeLeft, &YGValueZero));
-      YGPrintNumberIfNotZero("marginRight",
-                             YGComputedEdgeValue(node->style.margin, YGEdgeRight, &YGValueZero));
-      YGPrintNumberIfNotZero("marginTop",
-                             YGComputedEdgeValue(node->style.margin, YGEdgeTop, &YGValueZero));
-      YGPrintNumberIfNotZero("marginBottom",
-                             YGComputedEdgeValue(node->style.margin, YGEdgeBottom, &YGValueZero));
-      YGPrintNumberIfNotZero("marginStart",
-                             YGComputedEdgeValue(node->style.margin, YGEdgeStart, &YGValueZero));
-      YGPrintNumberIfNotZero("marginEnd",
-                             YGComputedEdgeValue(node->style.margin, YGEdgeEnd, &YGValueZero));
-    }
-
-    if (YGFourValuesEqual(node->style.padding)) {
-      YGPrintNumberIfNotZero("padding",
-                             YGComputedEdgeValue(node->style.padding, YGEdgeLeft, &YGValueZero));
-    } else {
-      YGPrintNumberIfNotZero("paddingLeft",
-                             YGComputedEdgeValue(node->style.padding, YGEdgeLeft, &YGValueZero));
-      YGPrintNumberIfNotZero("paddingRight",
-                             YGComputedEdgeValue(node->style.padding, YGEdgeRight, &YGValueZero));
-      YGPrintNumberIfNotZero("paddingTop",
-                             YGComputedEdgeValue(node->style.padding, YGEdgeTop, &YGValueZero));
-      YGPrintNumberIfNotZero("paddingBottom",
-                             YGComputedEdgeValue(node->style.padding, YGEdgeBottom, &YGValueZero));
-      YGPrintNumberIfNotZero("paddingStart",
-                             YGComputedEdgeValue(node->style.padding, YGEdgeStart, &YGValueZero));
-      YGPrintNumberIfNotZero("paddingEnd",
-                             YGComputedEdgeValue(node->style.padding, YGEdgeEnd, &YGValueZero));
-    }
-
-    if (YGFourValuesEqual(node->style.border)) {
-      YGPrintNumberIfNotZero("borderWidth",
-                             YGComputedEdgeValue(node->style.border, YGEdgeLeft, &YGValueZero));
-    } else {
-      YGPrintNumberIfNotZero("borderLeftWidth",
-                             YGComputedEdgeValue(node->style.border, YGEdgeLeft, &YGValueZero));
-      YGPrintNumberIfNotZero("borderRightWidth",
-                             YGComputedEdgeValue(node->style.border, YGEdgeRight, &YGValueZero));
-      YGPrintNumberIfNotZero("borderTopWidth",
-                             YGComputedEdgeValue(node->style.border, YGEdgeTop, &YGValueZero));
-      YGPrintNumberIfNotZero("borderBottomWidth",
-                             YGComputedEdgeValue(node->style.border, YGEdgeBottom, &YGValueZero));
-      YGPrintNumberIfNotZero("borderStartWidth",
-                             YGComputedEdgeValue(node->style.border, YGEdgeStart, &YGValueZero));
-      YGPrintNumberIfNotZero("borderEndWidth",
-                             YGComputedEdgeValue(node->style.border, YGEdgeEnd, &YGValueZero));
-    }
-
-    YGPrintNumberIfNotUndefined("width", &node->style.dimensions[YGDimensionWidth]);
-    YGPrintNumberIfNotUndefined("height", &node->style.dimensions[YGDimensionHeight]);
-    YGPrintNumberIfNotUndefined("maxWidth", &node->style.maxDimensions[YGDimensionWidth]);
-    YGPrintNumberIfNotUndefined("maxHeight", &node->style.maxDimensions[YGDimensionHeight]);
-    YGPrintNumberIfNotUndefined("minWidth", &node->style.minDimensions[YGDimensionWidth]);
-    YGPrintNumberIfNotUndefined("minHeight", &node->style.minDimensions[YGDimensionHeight]);
-
-    if (node->style.positionType == YGPositionTypeAbsolute) {
-      YGLog(YGLogLevelDebug, "position: 'absolute', ");
-    }
-
-    YGPrintNumberIfNotUndefined(
-        "left", YGComputedEdgeValue(node->style.position, YGEdgeLeft, &YGValueUndefined));
-    YGPrintNumberIfNotUndefined(
-        "right", YGComputedEdgeValue(node->style.position, YGEdgeRight, &YGValueUndefined));
-    YGPrintNumberIfNotUndefined(
-        "top", YGComputedEdgeValue(node->style.position, YGEdgeTop, &YGValueUndefined));
-    YGPrintNumberIfNotUndefined(
-        "bottom", YGComputedEdgeValue(node->style.position, YGEdgeBottom, &YGValueUndefined));
+    YGLog(YGLogLevelDebug, "style=\"");
+    if (node->style.flexDirection != gYGNodeDefaults.style.flexDirection) {
+      YGLog(YGLogLevelDebug,
+            "flex-direction: %s; ",
+            YGFlexDirectionToString(node->style.flexDirection));
+    }
+    if (node->style.justifyContent != gYGNodeDefaults.style.justifyContent) {
+      YGLog(YGLogLevelDebug,
+            "justify-content: %s; ",
+            YGJustifyToString(node->style.justifyContent));
+    }
+    if (node->style.alignItems != gYGNodeDefaults.style.alignItems) {
+      YGLog(YGLogLevelDebug, "align-items: %s; ", YGAlignToString(node->style.alignItems));
+    }
+    if (node->style.alignContent != gYGNodeDefaults.style.alignContent) {
+      YGLog(YGLogLevelDebug, "align-content: %s; ", YGAlignToString(node->style.alignContent));
+    }
+    if (node->style.alignSelf != gYGNodeDefaults.style.alignSelf) {
+      YGLog(YGLogLevelDebug, "align-self: %s; ", YGAlignToString(node->style.alignSelf));
+    }
+
+    YGPrintNumberIfNotUndefinedf("flex-grow", node->style.flexGrow);
+    YGPrintNumberIfNotUndefinedf("flex-shrink", node->style.flexShrink);
+    YGPrintNumberIfNotAuto("flex-basis", &node->style.flexBasis);
+    YGPrintNumberIfNotUndefinedf("flex", node->style.flex);
+
+    if (node->style.flexWrap != gYGNodeDefaults.style.flexWrap) {
+      YGLog(YGLogLevelDebug, "flexWrap: %s; ", YGWrapToString(node->style.flexWrap));
+    }
+
+    if (node->style.overflow != gYGNodeDefaults.style.overflow) {
+      YGLog(YGLogLevelDebug, "overflow: %s; ", YGOverflowToString(node->style.overflow));
+    }
+
+    if (node->style.display != gYGNodeDefaults.style.display) {
+      YGLog(YGLogLevelDebug, "display: %s; ", YGDisplayToString(node->style.display));
+    }
+
+    YGPrintEdges("margin", node->style.margin);
+    YGPrintEdges("padding", node->style.padding);
+    YGPrintEdges("border", node->style.border);
+
+    YGPrintNumberIfNotAuto("width", &node->style.dimensions[YGDimensionWidth]);
+    YGPrintNumberIfNotAuto("height", &node->style.dimensions[YGDimensionHeight]);
+    YGPrintNumberIfNotAuto("max-width", &node->style.maxDimensions[YGDimensionWidth]);
+    YGPrintNumberIfNotAuto("max-height", &node->style.maxDimensions[YGDimensionHeight]);
+    YGPrintNumberIfNotAuto("min-width", &node->style.minDimensions[YGDimensionWidth]);
+    YGPrintNumberIfNotAuto("min-height", &node->style.minDimensions[YGDimensionHeight]);
+
+    if (node->style.positionType != gYGNodeDefaults.style.positionType) {
+      YGLog(YGLogLevelDebug, "position: %s; ", YGPositionTypeToString(node->style.positionType));
+    }
+
+    YGPrintEdgeIfNotUndefined("left", node->style.position, YGEdgeLeft);
+    YGPrintEdgeIfNotUndefined("right", node->style.position, YGEdgeRight);
+    YGPrintEdgeIfNotUndefined("top", node->style.position, YGEdgeTop);
+    YGPrintEdgeIfNotUndefined("bottom", node->style.position, YGEdgeBottom);
+    YGLog(YGLogLevelDebug, "\" ");
+
+    if (node->measure != NULL) {
+      YGLog(YGLogLevelDebug, "has-custom-measure=\"true\"");
+    }
   }
+  YGLog(YGLogLevelDebug, ">");
 
   const uint32_t childCount = YGNodeListCount(node->children);
   if (options & YGPrintOptionsChildren && childCount > 0) {
-    YGLog(YGLogLevelDebug, "children: [\n");
     for (uint32_t i = 0; i < childCount; i++) {
+      YGLog(YGLogLevelDebug, "\n");
       YGNodePrintInternal(YGNodeGetChild(node, i), options, level + 1);
     }
     YGIndent(level);
-    YGLog(YGLogLevelDebug, "]},\n");
-  } else {
-    YGLog(YGLogLevelDebug, "},\n");
+    YGLog(YGLogLevelDebug, "\n");
   }
+  YGLog(YGLogLevelDebug, "</div>");
 }
 
 void YGNodePrint(const YGNodeRef node, const YGPrintOptions options) {
@@ -3438,7 +3388,15 @@ void YGNodeCalculateLayout(const YGNodeRef node,
 }
 
 void YGSetLogger(YGLogger logger) {
-  gLogger = logger;
+  if (logger != NULL) {
+    gLogger = logger;
+  } else {
+#ifdef ANDROID
+    gLogger = &YGAndroidLog;
+#else
+    gLogger = &YGDefaultLog;
+#endif
+  }
 }
 
 void YGLog(YGLogLevel level, const char *format, ...) {

From a51e9a0704ecbd1bcfafe9cf87b21270708ba933 Mon Sep 17 00:00:00 2001
From: David Aurelio <davidaurelio@fb.com>
Date: Mon, 3 Apr 2017 09:55:28 -0700
Subject: [PATCH 280/366] Adapt interface of node-haste duplicates

Summary: Adapts mocked / duplicated functionality from `node-haste` to match the new synchronous return types in the original.

Reviewed By: jeanlauliac

Differential Revision: D4819137

fbshipit-source-id: 183316adc3fae161ad9999bf72bccb8218ef8941
---
 packager/src/ModuleGraph/node-haste/Module.js |   4 +-
 .../src/ModuleGraph/node-haste/ModuleCache.js |  20 +--
 .../src/ModuleGraph/node-haste/Package.js     | 116 +++++++++---------
 .../ModuleGraph/node-haste/node-haste.flow.js |   7 +-
 .../src/ModuleGraph/node-haste/node-haste.js  |  11 +-
 5 files changed, 81 insertions(+), 77 deletions(-)

diff --git a/packager/src/ModuleGraph/node-haste/Module.js b/packager/src/ModuleGraph/node-haste/Module.js
index 13719de0c99ffd..0636066a730dc3 100644
--- a/packager/src/ModuleGraph/node-haste/Module.js
+++ b/packager/src/ModuleGraph/node-haste/Module.js
@@ -24,9 +24,9 @@ module.exports = class Module {
   constructor(
     path: string,
     moduleCache: ModuleCache,
-    info: Promise<TransformedFile>,
+    info: TransformedFile,
   ) {
-    this.hasteID = info.then(({hasteID}) => hasteID);
+    this.hasteID = Promise.resolve(info.hasteID);
     this.moduleCache = moduleCache;
     this.name = this.hasteID.then(name => name || getName(path));
     this.path = path;
diff --git a/packager/src/ModuleGraph/node-haste/ModuleCache.js b/packager/src/ModuleGraph/node-haste/ModuleCache.js
index bde9d0df5f0b60..2a483af8fcb8fe 100644
--- a/packager/src/ModuleGraph/node-haste/ModuleCache.js
+++ b/packager/src/ModuleGraph/node-haste/ModuleCache.js
@@ -16,22 +16,20 @@ const Package = require('./Package');
 
 import type {PackageData, TransformedFile} from '../types.flow';
 
-type GetFn<T> = (path: string) => Promise<T>;
 type GetClosestPackageFn = (filePath: string) => ?string;
 
 module.exports = class ModuleCache {
   _getClosestPackage: GetClosestPackageFn;
-  getPackageData: GetFn<PackageData>;
-  getTransformedFile: GetFn<TransformedFile>;
+  getTransformedFile: string => TransformedFile;
   modules: Map<string, Module>;
   packages: Map<string, Package>;
 
-  constructor(getClosestPackage: GetClosestPackageFn, getTransformedFile: GetFn<TransformedFile>) {
+  constructor(
+    getClosestPackage: GetClosestPackageFn,
+    getTransformedFile: string => TransformedFile,
+  ) {
     this._getClosestPackage = getClosestPackage;
     this.getTransformedFile = getTransformedFile;
-    this.getPackageData = path => getTransformedFile(path).then(
-      f => f.package || Promise.reject(new Error(`"${path}" does not exist`))
-    );
     this.modules = new Map();
     this.packages = new Map();
   }
@@ -58,6 +56,14 @@ module.exports = class ModuleCache {
     return p;
   }
 
+  getPackageData(path: string): PackageData {
+    const pkg = this.getTransformedFile(path).package;
+    if (!pkg) {
+        throw new Error(`"${path}" does not exist`);
+    }
+    return pkg;
+  }
+
   getPackageOf(filePath: string) {
     const candidate = this._getClosestPackage(filePath);
     return candidate != null ? this.getPackage(candidate) : null;
diff --git a/packager/src/ModuleGraph/node-haste/Package.js b/packager/src/ModuleGraph/node-haste/Package.js
index 9a3a6d7df4f680..0f8ca64172915c 100644
--- a/packager/src/ModuleGraph/node-haste/Package.js
+++ b/packager/src/ModuleGraph/node-haste/Package.js
@@ -17,12 +17,12 @@ const path = require('path');
 import type {PackageData} from '../types.flow';
 
 module.exports = class Package {
-  data: Promise<PackageData>;
+  data: PackageData;
   path: string;
   root: string;
   type: 'Package';
 
-  constructor(packagePath: string, data: Promise<PackageData>) {
+  constructor(packagePath: string, data: PackageData) {
     this.data = data;
     this.path = packagePath;
     this.root = path.dirname(packagePath);
@@ -31,80 +31,76 @@ module.exports = class Package {
 
   getMain() {
     // Copied from node-haste/Package.js
-    return this.data.then(data => {
-      const replacements = getReplacements(data);
-      if (typeof replacements === 'string') {
-        return path.join(this.root, replacements);
-      }
-
-      let main = getMain(data);
-
-      if (replacements && typeof replacements === 'object') {
-        main = replacements[main] ||
-          replacements[main + '.js'] ||
-          replacements[main + '.json'] ||
-          replacements[main.replace(/(\.js|\.json)$/, '')] ||
-          main;
-      }
-
-      return path.join(this.root, main);
-    });
+    const replacements = getReplacements(this.data);
+    if (typeof replacements === 'string') {
+      return path.join(this.root, replacements);
+    }
+
+    let main = getMain(this.data);
+
+    if (replacements && typeof replacements === 'object') {
+      main = replacements[main] ||
+        replacements[main + '.js'] ||
+        replacements[main + '.json'] ||
+        replacements[main.replace(/(\.js|\.json)$/, '')] ||
+        main;
+    }
+
+    return path.join(this.root, main);
   }
 
   getName() {
-    return this.data.then(p => nullthrows(p.name));
+    return Promise.resolve(nullthrows(this.data.name));
   }
 
   isHaste() {
-    return this.data.then(p => !!p.name);
+    return Promise.resolve(!!this.data.name);
   }
 
   redirectRequire(name: string) {
     // Copied from node-haste/Package.js
-    return this.data.then(data => {
-      const replacements = getReplacements(data);
-
-      if (!replacements || typeof replacements !== 'object') {
-        return name;
-      }
-
-      if (!path.isAbsolute(name)) {
-        const replacement = replacements[name];
-        // support exclude with "someDependency": false
-        return replacement === false
-          ? false
-          : replacement || name;
-      }
-
-      let relPath = './' + path.relative(this.root, name);
-      if (path.sep !== '/') {
-        relPath = relPath.replace(new RegExp('\\' + path.sep, 'g'), '/');
-      }
-
-      let redirect = replacements[relPath];
+    const replacements = getReplacements(this.data);
 
-      // false is a valid value
+    if (!replacements || typeof replacements !== 'object') {
+      return name;
+    }
+
+    if (!path.isAbsolute(name)) {
+      const replacement = replacements[name];
+      // support exclude with "someDependency": false
+      return replacement === false
+        ? false
+        : replacement || name;
+    }
+
+    let relPath = './' + path.relative(this.root, name);
+    if (path.sep !== '/') {
+      relPath = relPath.replace(new RegExp('\\' + path.sep, 'g'), '/');
+    }
+
+    let redirect = replacements[relPath];
+
+    // false is a valid value
+    if (redirect == null) {
+      redirect = replacements[relPath + '.js'];
       if (redirect == null) {
-        redirect = replacements[relPath + '.js'];
-        if (redirect == null) {
-          redirect = replacements[relPath + '.json'];
-        }
+        redirect = replacements[relPath + '.json'];
       }
+    }
 
-      // support exclude with "./someFile": false
-      if (redirect === false) {
-        return false;
-      }
+    // support exclude with "./someFile": false
+    if (redirect === false) {
+      return false;
+    }
 
-      if (redirect) {
-        return path.join(
-          this.root,
-          redirect
-        );
-      }
+    if (redirect) {
+      return path.join(
+        this.root,
+        redirect
+      );
+    }
 
-      return name;
-    });
+    return name;
   }
 };
 
diff --git a/packager/src/ModuleGraph/node-haste/node-haste.flow.js b/packager/src/ModuleGraph/node-haste/node-haste.flow.js
index a420bf6bf29661..ff45d101f9296d 100644
--- a/packager/src/ModuleGraph/node-haste/node-haste.flow.js
+++ b/packager/src/ModuleGraph/node-haste/node-haste.flow.js
@@ -33,14 +33,13 @@ export type Package = {
   path: Path,
   root: Path,
   type: 'Package',
-  getMain(): Promise<Path>,
+  getMain(): Path,
   getName(): Promise<ModuleID>,
   isHaste(): Promise<boolean>,
-  redirectRequire(id: ModuleID): Promise<Path | false>,
+  redirectRequire(id: ModuleID): Path | false,
 };
 
-// when changing this to `type`, the code does not typecheck any more
-export interface ModuleCache {
+export type ModuleCache = {
   getAssetModule(path: Path): Module,
   getModule(path: Path): Module,
   getPackage(path: Path): Package,
diff --git a/packager/src/ModuleGraph/node-haste/node-haste.js b/packager/src/ModuleGraph/node-haste/node-haste.js
index 042e8c438e02e4..e3cbd2248bfcb0 100644
--- a/packager/src/ModuleGraph/node-haste/node-haste.js
+++ b/packager/src/ModuleGraph/node-haste/node-haste.js
@@ -63,10 +63,13 @@ exports.createResolveFn = function(options: ResolveOptions): ResolveFn {
     transformedFiles,
   } = options;
   const files = Object.keys(transformedFiles);
-  const getTransformedFile =
-    path => Promise.resolve(
-      transformedFiles[path] || Promise.reject(new Error(`"${path} does not exist`))
-    );
+  function getTransformedFile(path) {
+    const result = transformedFiles[path];
+    if (!result) {
+      throw new Error(`"${path} does not exist`);
+    }
+    return result;
+  }
 
   const helpers = new DependencyGraphHelpers({
     assetExts,

From 10cb0f9325647757cd13ee6ea7ade23ae3ea29e6 Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieterdb@fb.com>
Date: Mon, 3 Apr 2017 10:18:27 -0700
Subject: [PATCH 281/366] Disable all of RCTRootViewIntegrationTests

Reviewed By: fkgozali

Differential Revision: D4819589

fbshipit-source-id: d23f1892d750ae4e4efaf85a9ec25094009a7a22
---
 .../RCTRootViewIntegrationTests.m                     | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Examples/UIExplorer/UIExplorerIntegrationTests/RCTRootViewIntegrationTests.m b/Examples/UIExplorer/UIExplorerIntegrationTests/RCTRootViewIntegrationTests.m
index a32cee7540a4ea..ca31db98812fec 100644
--- a/Examples/UIExplorer/UIExplorerIntegrationTests/RCTRootViewIntegrationTests.m
+++ b/Examples/UIExplorer/UIExplorerIntegrationTests/RCTRootViewIntegrationTests.m
@@ -32,7 +32,7 @@
 #import <React/RCTRootViewDelegate.h>
 
 #define RCT_TEST_DATA_CONFIGURATION_BLOCK(appName, testType, input, block) \
-- (void)test##appName##_##testType##_##input                               \
+- (void)DISABLED_test##appName##_##testType##_##input                      \
 {                                                                          \
   [_runner runTest:_cmd                                                    \
             module:@#appName                                               \
@@ -41,7 +41,7 @@ - (void)test##appName##_##testType##_##input                               \
 }
 
 #define RCT_TEST_CONFIGURATION_BLOCK(appName, block)  \
-- (void)test##appName                                 \
+- (void)DISABLED_test##appName                        \
 {                                                     \
   [_runner runTest:_cmd                               \
             module:@#appName                          \
@@ -155,9 +155,8 @@ - (void)setUp
 RCT_TEST_CONFIGURATION_BLOCK(ReactContentSizeUpdateTest, reactContentSizeUpdateBlock(RCTBoth))
 
 // Test if setting 'appProperties' property updates the RN app
-// Disabled since it's occassionally crashing
-// RCT_TEST_CONFIGURATION_BLOCK(PropertiesUpdateTest, ^(RCTRootView *rootView) {
-//   rootView.appProperties = @{@"markTestPassed":@YES};
-// })
+RCT_TEST_CONFIGURATION_BLOCK(PropertiesUpdateTest, ^(RCTRootView *rootView) {
+  rootView.appProperties = @{@"markTestPassed":@YES};
+})
 
 @end

From 8a760e0a93aa2bc7a45002ac15a5b951d054d44c Mon Sep 17 00:00:00 2001
From: Tom Clarkson <tom@orangeguava.com>
Date: Mon, 3 Apr 2017 11:08:16 -0700
Subject: [PATCH 282/366] Code analysis bot does not need to comment on merge
 commits

Summary:
This PR fixes a CI issue that came up on #11304 after merging master into the pr branch.

That created a merge commit with over 1000 changed files. That might have created irrelevant comments, but the github commit api is limited to 300 files, with only the first 294 having the expected diffs included.

I can't think of any reasonable scenario where a merge would have changes that aren't either on master or another commit in the PR, so I've updated it to treat merge commits as having no changes.
Closes https://github.com/facebook/react-native/pull/13260

Differential Revision: D4819805

Pulled By: ericvicenti

fbshipit-source-id: 7b6b51b18bb36503a719a3ba5c9163cd6ef00e17
---
 bots/code-analysis-bot.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/bots/code-analysis-bot.js b/bots/code-analysis-bot.js
index d22ffb29a7ffde..0c3a8bdda21585 100644
--- a/bots/code-analysis-bot.js
+++ b/bots/code-analysis-bot.js
@@ -111,6 +111,11 @@ function getFilesFromCommit(user, repo, sha, callback) {
       console.log(error);
       return;
     }
+    // A merge commit should not have any new changes to report
+    if (res.parents && res.parents.length > 1) {
+      return;
+    }
+
     callback(res.files);
   });
 }
@@ -181,6 +186,10 @@ function main(messages, user, repo, number) {
       files
         .filter((file) => messages[file.filename])
         .forEach((file) => {
+          // github api sometimes does not return a patch on large commits
+          if (!file.patch) {
+            return;
+          }
           var lineMap = getLineMapFromPatch(file.patch);
           messages[file.filename].forEach((message) => {
             sendComment(user, repo, number, sha, file.filename, lineMap, message);

From beb559d9cf516c44921be35b6f0b55d5fc38d98b Mon Sep 17 00:00:00 2001
From: Emil Sjolander <emilsj@fb.com>
Date: Mon, 3 Apr 2017 14:23:13 -0700
Subject: [PATCH 283/366] Fix xcode project file

Reviewed By: ericvicenti

Differential Revision: D4821749

fbshipit-source-id: 19730209557c58457e6cc67916e9a8cb944fb963
---
 React/React.xcodeproj/project.pbxproj | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/React/React.xcodeproj/project.pbxproj b/React/React.xcodeproj/project.pbxproj
index 108d55556178c4..ec676d0a665d2f 100644
--- a/React/React.xcodeproj/project.pbxproj
+++ b/React/React.xcodeproj/project.pbxproj
@@ -27,6 +27,7 @@
 		137327E81AA5CF210034F82E /* RCTTabBarItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 137327E21AA5CF210034F82E /* RCTTabBarItem.m */; };
 		137327E91AA5CF210034F82E /* RCTTabBarItemManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 137327E41AA5CF210034F82E /* RCTTabBarItemManager.m */; };
 		137327EA1AA5CF210034F82E /* RCTTabBarManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 137327E61AA5CF210034F82E /* RCTTabBarManager.m */; };
+		138FDE6B1E92EA4F005FEEDD /* YGEnums.c in Sources */ = {isa = PBXBuildFile; fileRef = 138FDE6A1E92EA4F005FEEDD /* YGEnums.c */; };
 		139324FE1E70B069009FD7E0 /* RCTJSCErrorHandling.h in Headers */ = {isa = PBXBuildFile; fileRef = 139324FC1E70B069009FD7E0 /* RCTJSCErrorHandling.h */; };
 		139324FF1E70B069009FD7E0 /* RCTJSCErrorHandling.mm in Sources */ = {isa = PBXBuildFile; fileRef = 139324FD1E70B069009FD7E0 /* RCTJSCErrorHandling.mm */; };
 		13A0C2891B74F71200B29F6F /* RCTDevLoadingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 13A0C2861B74F71200B29F6F /* RCTDevLoadingView.m */; };
@@ -1167,6 +1168,7 @@
 		137327E41AA5CF210034F82E /* RCTTabBarItemManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTabBarItemManager.m; sourceTree = "<group>"; };
 		137327E51AA5CF210034F82E /* RCTTabBarManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTabBarManager.h; sourceTree = "<group>"; };
 		137327E61AA5CF210034F82E /* RCTTabBarManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTabBarManager.m; sourceTree = "<group>"; };
+		138FDE6A1E92EA4F005FEEDD /* YGEnums.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = YGEnums.c; sourceTree = "<group>"; };
 		139324FC1E70B069009FD7E0 /* RCTJSCErrorHandling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTJSCErrorHandling.h; sourceTree = "<group>"; };
 		139324FD1E70B069009FD7E0 /* RCTJSCErrorHandling.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTJSCErrorHandling.mm; sourceTree = "<group>"; };
 		13A0C2851B74F71200B29F6F /* RCTDevLoadingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTDevLoadingView.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
@@ -1415,6 +1417,7 @@
 		130A77021DF767AF001F9587 /* yoga */ = {
 			isa = PBXGroup;
 			children = (
+				138FDE6A1E92EA4F005FEEDD /* YGEnums.c */,
 				130A77031DF767AF001F9587 /* YGEnums.h */,
 				130A77041DF767AF001F9587 /* YGMacros.h */,
 				130A77051DF767AF001F9587 /* YGNodeList.c */,
@@ -2529,6 +2532,7 @@
 			files = (
 				13AB5E011DF777F2001A8C30 /* YGNodeList.c in Sources */,
 				13AB5E021DF777F2001A8C30 /* Yoga.c in Sources */,
+				138FDE6B1E92EA4F005FEEDD /* YGEnums.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

From bc1ea548d0017f131c36a30ce06bf4d512cb2f8c Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Mon, 3 Apr 2017 15:11:02 -0700
Subject: [PATCH 284/366] Better TextInput: Simplified focus/first-responder
 management on iOS

Summary:
Pair `reactWillMakeFirstResponder` and `reactDidMakeFirstResponder` was replaced with just `reactFocus` method
which is supposed to incapsulate all "focus" and "focus-later-if-needed" functionality.

Reviewed By: mmmulani

Differential Revision: D4664626

fbshipit-source-id: 8d3b7935ca26d32ba1d1826a585cce0396fcc885
---
 Libraries/Text/RCTTextField.m  | 31 +++++--------------------------
 Libraries/Text/RCTTextView.m   | 34 +++++++++-------------------------
 Libraries/Text/RCTUITextView.m | 28 ++--------------------------
 React/Modules/RCTUIManager.m   |  7 ++-----
 React/Views/UIView+React.h     |  9 +++++++--
 React/Views/UIView+React.m     | 33 +++++++++++++++++++++++++++++++--
 6 files changed, 56 insertions(+), 86 deletions(-)

diff --git a/Libraries/Text/RCTTextField.m b/Libraries/Text/RCTTextField.m
index 0ea13179bb40d6..a82f55bbae42b6 100644
--- a/Libraries/Text/RCTTextField.m
+++ b/Libraries/Text/RCTTextField.m
@@ -48,7 +48,6 @@ - (BOOL)textFieldShouldEndEditing:(RCTTextField *)textField {
 @implementation RCTTextField
 {
   RCTEventDispatcher *_eventDispatcher;
-  BOOL _jsRequestingFirstResponder;
   NSInteger _nativeEventCount;
   BOOL _submitted;
   UITextRange *_previousSelectionRange;
@@ -94,16 +93,6 @@ - (void)sendKeyValueForString:(NSString *)string
                                eventCount:_nativeEventCount];
 }
 
-- (void)didUpdateFocusInContext:(UIFocusUpdateContext *)context withAnimationCoordinator:(UIFocusAnimationCoordinator *)coordinator
-{
-  [super didUpdateFocusInContext:context withAnimationCoordinator:coordinator];
-  if(context.nextFocusedView == self) {
-    _jsRequestingFirstResponder = YES;
-  } else {
-    _jsRequestingFirstResponder = NO;
-  }
-}
-
 // This method is overridden for `onKeyPress`. The manager
 // will not send a keyPress for text that was pasted.
 - (void)paste:(id)sender
@@ -285,21 +274,6 @@ - (void)sendSelectionEvent
   }
 }
 
-- (BOOL)canBecomeFirstResponder
-{
-  return _jsRequestingFirstResponder;
-}
-
-- (void)reactWillMakeFirstResponder
-{
-  _jsRequestingFirstResponder = YES;
-}
-
-- (void)reactDidMakeFirstResponder
-{
-  _jsRequestingFirstResponder = NO;
-}
-
 - (BOOL)resignFirstResponder
 {
   BOOL result = [super resignFirstResponder];
@@ -314,6 +288,11 @@ - (BOOL)resignFirstResponder
   return result;
 }
 
+- (void)didMoveToWindow
+{
+  [self reactFocusIfNeeded];
+}
+
 #pragma mark - UITextFieldDelegate (Proxied)
 
 - (BOOL)shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string
diff --git a/Libraries/Text/RCTTextView.m b/Libraries/Text/RCTTextView.m
index dc0d289fc22205..f4329d0ef0a2bc 100644
--- a/Libraries/Text/RCTTextView.m
+++ b/Libraries/Text/RCTTextView.m
@@ -332,7 +332,7 @@ - (BOOL)textView:(RCTUITextView *)textView shouldChangeTextInRange:(NSRange)rang
                                          text:self.text
                                           key:nil
                                    eventCount:_nativeEventCount];
-      [self resignFirstResponder];
+      [_textView resignFirstResponder];
       return NO;
     }
   }
@@ -541,40 +541,24 @@ - (void)textViewDidEndEditing:(UITextView *)textView
                                eventCount:_nativeEventCount];
 }
 
-#pragma mark - UIResponder
+#pragma mark - Focus control deledation
 
-- (BOOL)isFirstResponder
+- (void)reactFocus
 {
-  return [_textView isFirstResponder];
+  [_textView reactFocus];
 }
 
-- (BOOL)canBecomeFirstResponder
+- (void)reactBlur
 {
-  return [_textView canBecomeFirstResponder];
+  [_textView reactBlur];
 }
 
-- (void)reactWillMakeFirstResponder
+- (void)didMoveToWindow
 {
-  [_textView reactWillMakeFirstResponder];
+  [_textView reactFocusIfNeeded];
 }
 
-- (BOOL)becomeFirstResponder
-{
-  return [_textView becomeFirstResponder];
-}
-
-- (void)reactDidMakeFirstResponder
-{
-  [_textView reactDidMakeFirstResponder];
-}
-
-- (BOOL)resignFirstResponder
-{
-  [super resignFirstResponder];
-  return [_textView resignFirstResponder];
-}
-
-#pragma mark - Content Size
+#pragma mark - Content size
 
 - (CGSize)contentSize
 {
diff --git a/Libraries/Text/RCTUITextView.m b/Libraries/Text/RCTUITextView.m
index 67ae7e5798ba2f..8288ea71fc8963 100644
--- a/Libraries/Text/RCTUITextView.m
+++ b/Libraries/Text/RCTUITextView.m
@@ -9,9 +9,10 @@
 
 #import "RCTUITextView.h"
 
+#import <React/UIView+React.h>
+
 @implementation RCTUITextView
 {
-  BOOL _jsRequestingFirstResponder;
   UILabel *_placeholderView;
   UITextView *_detachedTextView;
 }
@@ -69,31 +70,6 @@ - (void)textDidChange
   [self invalidatePlaceholderVisibility];
 }
 
-#pragma mark - UIResponder
-
-- (void)reactWillMakeFirstResponder
-{
-  _jsRequestingFirstResponder = YES;
-}
-
-- (BOOL)canBecomeFirstResponder
-{
-  return _jsRequestingFirstResponder;
-}
-
-- (void)reactDidMakeFirstResponder
-{
-  _jsRequestingFirstResponder = NO;
-}
-
-- (void)didMoveToWindow
-{
-  if (_jsRequestingFirstResponder) {
-    [self becomeFirstResponder];
-    [self reactDidMakeFirstResponder];
-  }
-}
-
 #pragma mark - Overrides
 
 - (void)setFont:(UIFont *)font
diff --git a/React/Modules/RCTUIManager.m b/React/Modules/RCTUIManager.m
index bd1e72bb6f4f5f..ea7e59803e0587 100644
--- a/React/Modules/RCTUIManager.m
+++ b/React/Modules/RCTUIManager.m
@@ -1077,10 +1077,7 @@ - (void)synchronouslyUpdateViewOnUIThread:(NSNumber *)reactTag
 {
   [self addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
     UIView *newResponder = viewRegistry[reactTag];
-    [newResponder reactWillMakeFirstResponder];
-    if ([newResponder becomeFirstResponder]) {
-      [newResponder reactDidMakeFirstResponder];
-    }
+    [newResponder reactFocus];
   }];
 }
 
@@ -1088,7 +1085,7 @@ - (void)synchronouslyUpdateViewOnUIThread:(NSNumber *)reactTag
 {
   [self addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry){
     UIView *currentResponder = viewRegistry[reactTag];
-    [currentResponder resignFirstResponder];
+    [currentResponder reactBlur];
   }];
 }
 
diff --git a/React/Views/UIView+React.h b/React/Views/UIView+React.h
index a5950af7bd5be3..899110438224a5 100644
--- a/React/Views/UIView+React.h
+++ b/React/Views/UIView+React.h
@@ -71,11 +71,16 @@
  */
 - (void)reactAddControllerToClosestParent:(UIViewController *)controller;
 
+/**
+ * Focus manipulation.
+ */
+- (void)reactFocus;
+- (void)reactFocusIfNeeded;
+- (void)reactBlur;
+
 /**
  * Responder overrides - to be deprecated.
  */
-- (void)reactWillMakeFirstResponder;
-- (void)reactDidMakeFirstResponder;
 - (BOOL)reactRespondsToTouch:(UITouch *)touch;
 
 #if RCT_DEV
diff --git a/React/Views/UIView+React.m b/React/Views/UIView+React.m
index 43502719f22c17..4489fde306b70c 100644
--- a/React/Views/UIView+React.m
+++ b/React/Views/UIView+React.m
@@ -211,11 +211,40 @@ - (void)reactAddControllerToClosestParent:(UIViewController *)controller
   }
 }
 
+/**
+ * Focus manipulation.
+ */
+- (BOOL)reactIsFocusNeeded
+{
+  return [(NSNumber *)objc_getAssociatedObject(self, @selector(reactIsFocusNeeded)) boolValue];
+}
+
+- (void)setReactIsFocusNeeded:(BOOL)isFocusNeeded
+{
+  objc_setAssociatedObject(self, @selector(reactIsFocusNeeded), @(isFocusNeeded), OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
+
+- (void)reactFocus {
+  if (![self becomeFirstResponder]) {
+    self.reactIsFocusNeeded = YES;
+  }
+}
+
+- (void)reactFocusIfNeeded {
+  if (self.reactIsFocusNeeded) {
+    if ([self becomeFirstResponder]) {
+      self.reactIsFocusNeeded = NO;
+    }
+  }
+}
+
+- (void)reactBlur {
+  [self resignFirstResponder];
+}
+
 /**
  * Responder overrides - to be deprecated.
  */
-- (void)reactWillMakeFirstResponder {};
-- (void)reactDidMakeFirstResponder {};
 - (BOOL)reactRespondsToTouch:(__unused UITouch *)touch
 {
   return YES;

From f186cfb9d657bacafa32588b96de6ddac0786cf8 Mon Sep 17 00:00:00 2001
From: Spencer Ahrens <sahrens@fb.com>
Date: Mon, 3 Apr 2017 18:36:26 -0700
Subject: [PATCH 285/366] Allow override of `scrollEventThrottle` (in case
 `useNativeDriver` is not an option)

Reviewed By: achen1

Differential Revision: D4819635

fbshipit-source-id: 9cc7b32e05bf2c573553b9806a17141f1783a1c6
---
 Libraries/Lists/VirtualizedList.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Libraries/Lists/VirtualizedList.js b/Libraries/Lists/VirtualizedList.js
index 4e039729d6c182..5adabc67199621 100644
--- a/Libraries/Lists/VirtualizedList.js
+++ b/Libraries/Lists/VirtualizedList.js
@@ -272,6 +272,7 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
         return <ScrollView {...props} />;
       }
     },
+    scrollEventThrottle: 50,
     updateCellsBatchingPeriod: 50,
     windowSize: 21, // multiples of length
   };
@@ -448,7 +449,7 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
         onScroll: this._onScroll,
         onScrollBeginDrag: this._onScrollBeginDrag,
         ref: this._captureScrollRef,
-        scrollEventThrottle: 50, // TODO: Android support
+        scrollEventThrottle: this.props.scrollEventThrottle, // TODO: Android support
         stickyHeaderIndices,
       },
       cells,

From e8f9c442d6eb3f503234fd0b55a097db07e36fe1 Mon Sep 17 00:00:00 2001
From: Spencer Ahrens <sahrens@fb.com>
Date: Mon, 3 Apr 2017 18:36:28 -0700
Subject: [PATCH 286/366] Fix separator keys for LayoutAnimation

Summary:
Should key separators with their cells.

**Test Plan**

before/after in this video: https://youtu.be/vid1w5x8-58

Reviewed By: achen1

Differential Revision: D4821708

fbshipit-source-id: 261f1bac34dfa9001297a24a44f11128f338e62b
---
 Libraries/Lists/VirtualizedList.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Libraries/Lists/VirtualizedList.js b/Libraries/Lists/VirtualizedList.js
index 5adabc67199621..51580c79aa4185 100644
--- a/Libraries/Lists/VirtualizedList.js
+++ b/Libraries/Lists/VirtualizedList.js
@@ -351,7 +351,7 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
         />
       );
       if (ItemSeparatorComponent && ii < end) {
-        cells.push(<ItemSeparatorComponent key={'sep' + ii}/>);
+        cells.push(<ItemSeparatorComponent key={'sep' + key}/>);
       }
     }
   }

From 128596b3116639332afdc9eeffe5f506482dd07e Mon Sep 17 00:00:00 2001
From: Spencer Ahrens <sahrens@fb.com>
Date: Mon, 3 Apr 2017 18:36:29 -0700
Subject: [PATCH 287/366] Fixup comments to indicate sticky headers are now
 supported

Reviewed By: achen1

Differential Revision: D4822080

fbshipit-source-id: a0f09eedca40ccc72581b7f6e55a09d9e8f3f61f
---
 Libraries/Lists/FlatList.js        | 11 ++++++++---
 Libraries/Lists/SectionList.js     | 16 ++++++++++------
 Libraries/Lists/VirtualizedList.js | 13 ++++++-------
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/Libraries/Lists/FlatList.js b/Libraries/Lists/FlatList.js
index f2a7fc52404473..1e2af86926fa43 100644
--- a/Libraries/Lists/FlatList.js
+++ b/Libraries/Lists/FlatList.js
@@ -237,15 +237,20 @@ type DefaultProps = typeof defaultProps;
  * - Internal state is not preserved when content scrolls out of the render window. Make sure all
  *   your data is captured in the item data or external stores like Flux, Redux, or Relay.
  * - This is a `PureComponent` which means that it will not re-render if `props` remain shallow-
- *   equal. Make sure that everything your `renderItem` function depends on is passed as a prop that
- *   is not `===` after updates, otherwise your UI may not update on changes. This includes the
- *   `data` prop and parent component state.
+ *   equal. Make sure that everything your `renderItem` function depends on is passed as a prop
+ *   (e.g. `extraData`) that is not `===` after updates, otherwise your UI may not update on
+ *   changes. This includes the `data` prop and parent component state.
  * - In order to constrain memory and enable smooth scrolling, content is rendered asynchronously
  *   offscreen. This means it's possible to scroll faster than the fill rate ands momentarily see
  *   blank content. This is a tradeoff that can be adjusted to suit the needs of each application,
  *   and we are working on improving it behind the scenes.
  * - By default, the list looks for a `key` prop on each item and uses that for the React key.
  *   Alternatively, you can provide a custom `keyExtractor` prop.
+ *
+ * NOTE: `removeClippedSubviews` might not be necessary and may cause bugs. If you see issues with
+ * content not rendering, e.g when using `LayoutAnimation`, try setting
+ * `removeClippedSubviews={false}`, and we may change the default in the future after more
+ * experimentation in production apps.
  */
 class FlatList<ItemT> extends React.PureComponent<DefaultProps, Props<ItemT>, void> {
   static defaultProps: DefaultProps = defaultProps;
diff --git a/Libraries/Lists/SectionList.js b/Libraries/Lists/SectionList.js
index f40c978d53ec30..a0cb06425c3e43 100644
--- a/Libraries/Lists/SectionList.js
+++ b/Libraries/Lists/SectionList.js
@@ -108,7 +108,8 @@ type OptionalProps<SectionT: SectionBase<any>> = {
    */
   refreshing?: ?boolean,
   /**
-   * Rendered at the top of each section. Sticky headers are not yet supported.
+   * Rendered at the top of each section. These stick to the top of the `ScrollView` by default on
+   * iOS. See `stickySectionHeadersEnabled`.
    */
   renderSectionHeader?: ?(info: {section: SectionT}) => ?React.Element<any>,
   /**
@@ -146,8 +147,6 @@ type DefaultProps = typeof defaultProps;
  * If you don't need section support and want a simpler interface, use
  * [`<FlatList>`](/react-native/docs/flatlist.html).
  *
- * If you need _sticky_ section header support, use `ListView` for now.
- *
  * Simple Examples:
  *
  *     <SectionList
@@ -174,15 +173,20 @@ type DefaultProps = typeof defaultProps;
  * - Internal state is not preserved when content scrolls out of the render window. Make sure all
  *   your data is captured in the item data or external stores like Flux, Redux, or Relay.
  * - This is a `PureComponent` which means that it will not re-render if `props` remain shallow-
- *   equal. Make sure that everything your `renderItem` function depends on is passed as a prop that
- *   is not `===` after updates, otherwise your UI may not update on changes. This includes the
- *   `data` prop and parent component state.
+ *   equal. Make sure that everything your `renderItem` function depends on is passed as a prop
+ *   (e.g. `extraData`) that is not `===` after updates, otherwise your UI may not update on
+ *   changes. This includes the `data` prop and parent component state.
  * - In order to constrain memory and enable smooth scrolling, content is rendered asynchronously
  *   offscreen. This means it's possible to scroll faster than the fill rate ands momentarily see
  *   blank content. This is a tradeoff that can be adjusted to suit the needs of each application,
  *   and we are working on improving it behind the scenes.
  * - By default, the list looks for a `key` prop on each item and uses that for the React key.
  *   Alternatively, you can provide a custom `keyExtractor` prop.
+ *
+ * NOTE: `removeClippedSubviews` might not be necessary and may cause bugs. If you see issues with
+ * content not rendering, e.g when using `LayoutAnimation`, try setting
+ * `removeClippedSubviews={false}`, and we may change the default in the future after more
+ * experimentation in production apps.
  */
 class SectionList<SectionT: SectionBase<any>>
   extends React.PureComponent<DefaultProps, Props<SectionT>, void>
diff --git a/Libraries/Lists/VirtualizedList.js b/Libraries/Lists/VirtualizedList.js
index 51580c79aa4185..8e36645039da52 100644
--- a/Libraries/Lists/VirtualizedList.js
+++ b/Libraries/Lists/VirtualizedList.js
@@ -147,9 +147,9 @@ type State = {first: number, last: number};
  * - Internal state is not preserved when content scrolls out of the render window. Make sure all
  *   your data is captured in the item data or external stores like Flux, Redux, or Relay.
  * - This is a `PureComponent` which means that it will not re-render if `props` remain shallow-
- *   equal. Make sure that everything your `renderItem` function depends on is passed as a prop that
- *   is not `===` after updates, otherwise your UI may not update on changes. This includes the
- *   `data` prop and parent component state.
+ *   equal. Make sure that everything your `renderItem` function depends on is passed as a prop
+ *   (e.g. `extraData`) that is not `===` after updates, otherwise your UI may not update on
+ *   changes. This includes the `data` prop and parent component state.
  * - In order to constrain memory and enable smooth scrolling, content is rendered asynchronously
  *   offscreen. This means it's possible to scroll faster than the fill rate ands momentarily see
  *   blank content. This is a tradeoff that can be adjusted to suit the needs of each application,
@@ -157,11 +157,10 @@ type State = {first: number, last: number};
  * - By default, the list looks for a `key` prop on each item and uses that for the React key.
  *   Alternatively, you can provide a custom `keyExtractor` prop.
  *
- * NOTE: `LayoutAnimation` and sticky section headers both have bugs when used with this and are
- * therefore not officially supported yet.
- *
  * NOTE: `removeClippedSubviews` might not be necessary and may cause bugs. If you see issues with
- * content not rendering, try disabling it, and we may change the default there.
+ * content not rendering, e.g when using `LayoutAnimation`, try setting
+ * `removeClippedSubviews={false}`, and we may change the default in the future after more
+ * experimentation in production apps.
  */
 class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
   props: Props;

From 87bdcbde6ac7472461242d86d5a695747a0f9d9e Mon Sep 17 00:00:00 2001
From: Spencer Ahrens <sahrens@fb.com>
Date: Mon, 3 Apr 2017 18:36:31 -0700
Subject: [PATCH 288/366] propagate getScrollResponder, getScrollableNode

Summary:
so users can call `setNativeProps` and do more compositing.

**Test Plan:**

Added this to `onPress` of `SectionListExample` and `FlatListExample`:

    this._listRef.getNode().getScrollResponder().setNativeProps({scrollEnabled: false});

and saw scroll get disabled. Note the call to `getNode` because we are using the `Animated.createComponent` wrapper.

Reviewed By: achen1, bvaughn

Differential Revision: D4821711

fbshipit-source-id: 8d1f3dd7ccc646524f154721c5c7036620d57132
---
 Libraries/Lists/FlatList.js               | 14 +++++++---
 Libraries/Lists/MetroListView.js          |  3 +++
 Libraries/Lists/SectionList.js            | 32 ++++++++++++++++++++++-
 Libraries/Lists/VirtualizedList.js        | 11 ++++++++
 Libraries/Lists/VirtualizedSectionList.js |  9 ++++++-
 5 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/Libraries/Lists/FlatList.js b/Libraries/Lists/FlatList.js
index 1e2af86926fa43..4e9cdb85ffd89d 100644
--- a/Libraries/Lists/FlatList.js
+++ b/Libraries/Lists/FlatList.js
@@ -13,7 +13,6 @@
 
 const MetroListView = require('MetroListView'); // Used as a fallback legacy option
 const React = require('React');
-const ReactNative = require('ReactNative');
 const View = require('View');
 const VirtualizedList = require('VirtualizedList');
 
@@ -297,11 +296,18 @@ class FlatList<ItemT> extends React.PureComponent<DefaultProps, Props<ItemT>, vo
     this._listRef.recordInteraction();
   }
 
+  /**
+   * Provides a handle to the underlying scroll responder.
+   */
+  getScrollResponder() {
+    if (this._listRef) {
+      return this._listRef.getScrollResponder();
+    }
+  }
+
   getScrollableNode() {
-    if (this._listRef && this._listRef.getScrollableNode) {
+    if (this._listRef) {
       return this._listRef.getScrollableNode();
-    } else {
-      return ReactNative.findNodeHandle(this._listRef);
     }
   }
 
diff --git a/Libraries/Lists/MetroListView.js b/Libraries/Lists/MetroListView.js
index 150b27220aa5c0..c961078778e6f4 100644
--- a/Libraries/Lists/MetroListView.js
+++ b/Libraries/Lists/MetroListView.js
@@ -67,6 +67,9 @@ class MetroListView extends React.Component {
       this.props.horizontal ? {x: offset, animated} : {y: offset, animated}
     );
   }
+  getListRef() {
+    return this._listRef;
+  }
   static defaultProps: DefaultProps = {
     keyExtractor: (item, index) => item.key || index,
     renderScrollComponent: (props: Props) => {
diff --git a/Libraries/Lists/SectionList.js b/Libraries/Lists/SectionList.js
index a0cb06425c3e43..dd87a354eaae6a 100644
--- a/Libraries/Lists/SectionList.js
+++ b/Libraries/Lists/SectionList.js
@@ -194,10 +194,40 @@ class SectionList<SectionT: SectionBase<any>>
   props: Props<SectionT>;
   static defaultProps: DefaultProps = defaultProps;
 
+  /**
+   * Tells the list an interaction has occured, which should trigger viewability calculations, e.g.
+   * if `waitForInteractions` is true and the user has not scrolled. This is typically called by
+   * taps on items or by navigation actions.
+   */
+  recordInteraction() {
+    const listRef = this._wrapperListRef && this._wrapperListRef.getListRef();
+    listRef && listRef.recordInteraction();
+  }
+
+  /**
+   * Provides a handle to the underlying scroll responder.
+   */
+  getScrollResponder() {
+    const listRef = this._wrapperListRef && this._wrapperListRef.getListRef();
+    if (listRef) {
+      return listRef.getScrollResponder();
+    }
+  }
+
+  getScrollableNode() {
+    const listRef = this._wrapperListRef && this._wrapperListRef.getListRef();
+    if (listRef) {
+      return listRef.getScrollableNode();
+    }
+  }
+
   render() {
     const List = this.props.legacyImplementation ? MetroListView : VirtualizedSectionList;
-    return <List {...this.props} />;
+    return <List {...this.props} ref={this._captureRef} />;
   }
+
+  _wrapperListRef: MetroListView | VirtualizedSectionList<*>;
+  _captureRef = (ref) => { this._wrapperListRef = ref; };
 }
 
 module.exports = SectionList;
diff --git a/Libraries/Lists/VirtualizedList.js b/Libraries/Lists/VirtualizedList.js
index 8e36645039da52..6bbd7aef0941d7 100644
--- a/Libraries/Lists/VirtualizedList.js
+++ b/Libraries/Lists/VirtualizedList.js
@@ -224,6 +224,17 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
     this._updateViewableItems(this.props.data);
   }
 
+  /**
+   * Provides a handle to the underlying scroll responder.
+   * Note that `this._scrollRef` might not be a `ScrollView`, so we
+   * need to check that it responds to `getScrollResponder` before calling it.
+   */
+  getScrollResponder() {
+    if (this._scrollRef && this._scrollRef.getScrollResponder) {
+      return this._scrollRef.getScrollResponder();
+    }
+  }
+
   getScrollableNode() {
     if (this._scrollRef && this._scrollRef.getScrollableNode) {
       return this._scrollRef.getScrollableNode();
diff --git a/Libraries/Lists/VirtualizedSectionList.js b/Libraries/Lists/VirtualizedSectionList.js
index 9d6752e48265cf..fdf6110fffb438 100644
--- a/Libraries/Lists/VirtualizedSectionList.js
+++ b/Libraries/Lists/VirtualizedSectionList.js
@@ -119,6 +119,10 @@ class VirtualizedSectionList<SectionT: SectionBase>
     data: [],
   };
 
+  getListRef(): VirtualizedList {
+    return this._listRef;
+  }
+
   _keyExtractor = (item: Item, index: number) => {
     const info = this._subExtractor(index);
     return (info && info.key) || String(index);
@@ -257,8 +261,11 @@ class VirtualizedSectionList<SectionT: SectionBase>
   }
 
   render() {
-    return <VirtualizedList {...this.state.childProps} />;
+    return <VirtualizedList {...this.state.childProps} ref={this._captureRef} />;
   }
+
+  _listRef: VirtualizedList;
+  _captureRef = (ref) => { this._listRef = ref; };
 }
 
 function getItem(sections: ?Array<Item>, index: number): ?Item {

From ecf4c48966065c26698120a5a05df22bf6f310d1 Mon Sep 17 00:00:00 2001
From: Spencer Ahrens <sahrens@fb.com>
Date: Mon, 3 Apr 2017 18:36:32 -0700
Subject: [PATCH 289/366] Add `scrollToLocation` for `SectionList`

Summary:
Basic functionality that takes `itemIndex` and `sectionIndex`

**TestPlan**

Added this to onChangeText:

	this._listRef.getNode().scrollToLocation({itemIndex: 6, sectionIndex: 3, viewOffset: 25});

and saw it scroll to the correct position right under the sticky header.

Reviewed By: bvaughn

Differential Revision: D4821714

fbshipit-source-id: 261e373f9c4af384db5a363df5b0fd9274b1bdfe
---
 Libraries/Lists/FlatList.js               | 18 ++++++++++------
 Libraries/Lists/MetroListView.js          |  3 +++
 Libraries/Lists/SectionList.js            | 25 +++++++++++++++++++++--
 Libraries/Lists/VirtualizedList.js        |  8 +++++---
 Libraries/Lists/VirtualizedSectionList.js | 17 +++++++++++++--
 5 files changed, 58 insertions(+), 13 deletions(-)

diff --git a/Libraries/Lists/FlatList.js b/Libraries/Lists/FlatList.js
index 4e9cdb85ffd89d..d5d785e141c3db 100644
--- a/Libraries/Lists/FlatList.js
+++ b/Libraries/Lists/FlatList.js
@@ -231,7 +231,8 @@ type DefaultProps = typeof defaultProps;
  *     }
  *
  * This is a convenience wrapper around [`<VirtualizedList>`](docs/virtualizedlist.html),
- * and thus inherits it's props that aren't explicitly listed here along with the following caveats:
+ * and thus inherits it's props (as well as those of `ScrollView`) that aren't explicitly listed
+ * here, along with the following caveats:
  *
  * - Internal state is not preserved when content scrolls out of the render window. Make sure all
  *   your data is captured in the item data or external stores like Flux, Redux, or Relay.
@@ -264,17 +265,22 @@ class FlatList<ItemT> extends React.PureComponent<DefaultProps, Props<ItemT>, vo
   /**
    * Scrolls to the item at a the specified index such that it is positioned in the viewable area
    * such that `viewPosition` 0 places it at the top, 1 at the bottom, and 0.5 centered in the
-   * middle.
+   * middle. `viewOffset` is a fixed number of pixels to offset the final target position.
    *
-   * May be janky without `getItemLayout` prop.
+   * Note: cannot scroll to locations outside the render window without specifying the
+   * `getItemLayout` prop.
    */
-  scrollToIndex(params: {animated?: ?boolean, index: number, viewPosition?: number}) {
+  scrollToIndex(params: {
+    animated?: ?boolean, index: number, viewOffset?: number, viewPosition?: number,
+  }) {
     this._listRef.scrollToIndex(params);
   }
 
   /**
-   * Requires linear scan through data - use `scrollToIndex` instead if possible. May be janky
-   * without `getItemLayout` prop.
+   * Requires linear scan through data - use `scrollToIndex` instead if possible.
+   *
+   * Note: cannot scroll to locations outside the render window without specifying the
+   * `getItemLayout` prop.
    */
   scrollToItem(params: {animated?: ?boolean, item: ItemT, viewPosition?: number}) {
     this._listRef.scrollToItem(params);
diff --git a/Libraries/Lists/MetroListView.js b/Libraries/Lists/MetroListView.js
index c961078778e6f4..eae4a6f3263959 100644
--- a/Libraries/Lists/MetroListView.js
+++ b/Libraries/Lists/MetroListView.js
@@ -61,6 +61,9 @@ class MetroListView extends React.Component {
   scrollToItem(params: {animated?: ?boolean, item: Item, viewPosition?: number}) {
     throw new Error('scrollToItem not supported in legacy ListView.');
   }
+  scrollToLocation() {
+    throw new Error('scrollToLocation not supported in legacy ListView.');
+  }
   scrollToOffset(params: {animated?: ?boolean, offset: number}) {
     const {animated, offset} = params;
     this._listRef.scrollTo(
diff --git a/Libraries/Lists/SectionList.js b/Libraries/Lists/SectionList.js
index dd87a354eaae6a..651e3508b2a7b4 100644
--- a/Libraries/Lists/SectionList.js
+++ b/Libraries/Lists/SectionList.js
@@ -167,8 +167,9 @@ type DefaultProps = typeof defaultProps;
  *       ]}
  *     />
  *
- * This is a convenience wrapper around [`<VirtualizedList>`](/react-native/docs/virtualizedlist.html),
- * and thus inherits the following caveats:
+ * This is a convenience wrapper around [`<VirtualizedList>`](docs/virtualizedlist.html),
+ * and thus inherits it's props (as well as those of `ScrollView`) that aren't explicitly listed
+ * here, along with the following caveats:
  *
  * - Internal state is not preserved when content scrolls out of the render window. Make sure all
  *   your data is captured in the item data or external stores like Flux, Redux, or Relay.
@@ -194,6 +195,26 @@ class SectionList<SectionT: SectionBase<any>>
   props: Props<SectionT>;
   static defaultProps: DefaultProps = defaultProps;
 
+  /**
+   * Scrolls to the item at the specified `sectionIndex` and `itemIndex` (within the section)
+   * positioned in the viewable area such that `viewPosition` 0 places it at the top (and may be
+   * covered by a sticky header), 1 at the bottom, and 0.5 centered in the middle. `viewOffset` is a
+   * fixed number of pixels to offset the final target position, e.g. to compensate for sticky
+   * headers.
+   *
+   * Note: cannot scroll to locations outside the render window without specifying the
+   * `getItemLayout` prop.
+   */
+  scrollToLocation(params: {
+    animated?: ?boolean,
+    itemIndex: number,
+    sectionIndex: number,
+    viewOffset?: number,
+    viewPosition?: number,
+  }) {
+    this._wrapperListRef.scrollToLocation(params);
+  }
+
   /**
    * Tells the list an interaction has occured, which should trigger viewability calculations, e.g.
    * if `waitForInteractions` is true and the user has not scrolled. This is typically called by
diff --git a/Libraries/Lists/VirtualizedList.js b/Libraries/Lists/VirtualizedList.js
index 6bbd7aef0941d7..49ca40a4a68764 100644
--- a/Libraries/Lists/VirtualizedList.js
+++ b/Libraries/Lists/VirtualizedList.js
@@ -178,9 +178,11 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
   }
 
   // scrollToIndex may be janky without getItemLayout prop
-  scrollToIndex(params: {animated?: ?boolean, index: number, viewPosition?: number}) {
+  scrollToIndex(params: {
+    animated?: ?boolean, index: number, viewOffset?: number, viewPosition?: number
+  }) {
     const {data, horizontal, getItemCount, getItemLayout} = this.props;
-    const {animated, index, viewPosition} = params;
+    const {animated, index, viewOffset, viewPosition} = params;
     invariant(
       index >= 0 && index < getItemCount(data),
       `scrollToIndex out of range: ${index} vs ${getItemCount(data) - 1}`,
@@ -194,7 +196,7 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
     const offset = Math.max(
       0,
       frame.offset - (viewPosition || 0) * (this._scrollMetrics.visibleLength - frame.length),
-    );
+    ) - (viewOffset || 0);
     this._scrollRef.scrollTo(horizontal ? {x: offset, animated} : {y: offset, animated});
   }
 
diff --git a/Libraries/Lists/VirtualizedSectionList.js b/Libraries/Lists/VirtualizedSectionList.js
index fdf6110fffb438..d35eb2bcdc16c1 100644
--- a/Libraries/Lists/VirtualizedSectionList.js
+++ b/Libraries/Lists/VirtualizedSectionList.js
@@ -119,6 +119,20 @@ class VirtualizedSectionList<SectionT: SectionBase>
     data: [],
   };
 
+  scrollToLocation(params: {
+    animated?: ?boolean, itemIndex: number, sectionIndex: number, viewPosition?: number
+  }) {
+    let index = params.itemIndex + 1;
+    for (let ii = 0; ii < params.sectionIndex; ii++) {
+      index += this.props.sections[ii].data.length + 1;
+    }
+    const toIndexParams = {
+      ...params,
+      index,
+    };
+    this._listRef.scrollToIndex(toIndexParams);
+  }
+
   getListRef(): VirtualizedList {
     return this._listRef;
   }
@@ -194,8 +208,7 @@ class VirtualizedSectionList<SectionT: SectionBase>
       const {renderSectionHeader} = this.props;
       return renderSectionHeader ? renderSectionHeader({section: info.section}) : null;
     } else {
-      const renderItem = info.section.renderItem ||
-        this.props.renderItem;
+      const renderItem = info.section.renderItem || this.props.renderItem;
       const SeparatorComponent = this._getSeparatorComponent(index, info);
       invariant(renderItem, 'no renderItem!');
       return (

From e0bd35f76f7f6941b0db164a15a0a3e087204968 Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieterdb@fb.com>
Date: Mon, 3 Apr 2017 18:42:39 -0700
Subject: [PATCH 290/366] Fix order of timers called in the same frame

Reviewed By: mmmulani

Differential Revision: D4802858

fbshipit-source-id: 8d8400c20b7e487aea5a0943f91ac7adc2d23108
---
 IntegrationTests/TimersTest.js | 22 ++++++++++----------
 React/Modules/RCTTiming.m      | 38 +++++++++++++++++++++++-----------
 2 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/IntegrationTests/TimersTest.js b/IntegrationTests/TimersTest.js
index 918576c9eee5c9..25056a892f59c1 100644
--- a/IntegrationTests/TimersTest.js
+++ b/IntegrationTests/TimersTest.js
@@ -82,17 +82,17 @@ var TimersTest = React.createClass({
   },
 
   testClearMulti() {
-    var fails = [this.setTimeout(() => this._fail('testClearMulti-1'), 20)];
+    var fails = [];
+    fails.push(this.setTimeout(() => this._fail('testClearMulti-1'), 20));
     fails.push(this.setTimeout(() => this._fail('testClearMulti-2'), 50));
     var delayClear = this.setTimeout(() => this._fail('testClearMulti-3'), 50);
     fails.push(this.setTimeout(() => this._fail('testClearMulti-4'), 0));
-
-    this.setTimeout(this.testOrdering, 100); // Next test interleaved
-
     fails.push(this.setTimeout(() => this._fail('testClearMulti-5'), 10));
 
     fails.forEach((timeout) => this.clearTimeout(timeout));
     this.setTimeout(() => this.clearTimeout(delayClear), 20);
+
+    this.setTimeout(this.testOrdering, 50);
   },
 
   testOrdering() {
@@ -110,14 +110,14 @@ var TimersTest = React.createClass({
       () => this._fail('testOrdering-Anim, setTimeout 0 should happen before ' +
         'requestAnimationFrame')
     );
-    var fail50;
-    this.setTimeout(() => this.clearTimeout(fail50), 20);
-    fail50 = this.setTimeout(
-      () => this._fail('testOrdering-t50, setTimeout 20 should happen before ' +
-        'setTimeout 50'),
-      50
+    var fail25;
+    this.setTimeout(() => { this.clearTimeout(fail25); }, 20);
+    fail25 = this.setTimeout(
+      () => this._fail('testOrdering-t25, setTimeout 20 should happen before ' +
+        'setTimeout 25'),
+      25
     );
-    this.setTimeout(this.done, 75);
+    this.setTimeout(this.done, 50);
   },
 
   done() {
diff --git a/React/Modules/RCTTiming.m b/React/Modules/RCTTiming.m
index 7028d37084b930..7f5355a1eecf46 100644
--- a/React/Modules/RCTTiming.m
+++ b/React/Modules/RCTTiming.m
@@ -10,8 +10,8 @@
 #import "RCTTiming.h"
 
 #import "RCTAssert.h"
-#import "RCTBridge.h"
 #import "RCTBridge+Private.h"
+#import "RCTBridge.h"
 #import "RCTLog.h"
 #import "RCTUtils.h"
 
@@ -51,16 +51,20 @@ - (instancetype)initWithCallbackID:(NSNumber *)callbackID
 /**
  * Returns `YES` if we should invoke the JS callback.
  */
-- (BOOL)updateFoundNeedsJSUpdate
+- (BOOL)shouldFire:(NSDate *)now
 {
-  if (_target && _target.timeIntervalSinceNow <= 0) {
-    // The JS Timers will do fine grained calculating of expired timeouts.
-    _target = _repeats ? [NSDate dateWithTimeIntervalSinceNow:_interval] : nil;
+  if (_target && [_target timeIntervalSinceDate:now] <= 0) {
     return YES;
   }
   return NO;
 }
 
+- (void)reschedule
+{
+  // The JS Timers will do fine grained calculating of expired timeouts.
+  _target = [NSDate dateWithTimeIntervalSinceNow:_interval];
+}
+
 @end
 
 @interface _RCTTimingProxy : NSObject
@@ -178,13 +182,11 @@ - (BOOL)hasPendingTimers
 - (void)didUpdateFrame:(RCTFrameUpdate *)update
 {
   NSDate *nextScheduledTarget = [NSDate distantFuture];
-  NSMutableArray<NSNumber *> *timersToCall = [NSMutableArray new];
+  NSMutableArray<_RCTTimer *> *timersToCall = [NSMutableArray new];
+  NSDate *now = [NSDate date]; // compare all the timers to the same base time
   for (_RCTTimer *timer in _timers.allValues) {
-    if ([timer updateFoundNeedsJSUpdate]) {
-      [timersToCall addObject:timer.callbackID];
-    }
-    if (!timer.target) {
-      [_timers removeObjectForKey:timer.callbackID];
+    if ([timer shouldFire:now]) {
+      [timersToCall addObject:timer];
     } else {
       nextScheduledTarget = [nextScheduledTarget earlierDate:timer.target];
     }
@@ -192,12 +194,24 @@ - (void)didUpdateFrame:(RCTFrameUpdate *)update
 
   // Call timers that need to be called
   if (timersToCall.count > 0) {
+    NSArray<NSNumber *> *sortedTimers = [[timersToCall sortedArrayUsingComparator:^(_RCTTimer *a, _RCTTimer *b) {
+      return [a.target compare:b.target];
+    }] valueForKey:@"callbackID"];
     [_bridge enqueueJSCall:@"JSTimersExecution"
                     method:@"callTimers"
-                      args:@[timersToCall]
+                      args:@[sortedTimers]
                 completion:NULL];
   }
 
+  for (_RCTTimer *timer in timersToCall) {
+    if (timer.repeats) {
+      [timer reschedule];
+      nextScheduledTarget = [nextScheduledTarget earlierDate:timer.target];
+    } else {
+      [_timers removeObjectForKey:timer.callbackID];
+    }
+  }
+
   if (_sendIdleEvents) {
     NSTimeInterval frameElapsed = (CACurrentMediaTime() - update.timestamp);
     if (kFrameDuration - frameElapsed >= kIdleCallbackFrameDeadline) {

From b12f6db0eff2bfc895e268ffb5f6447c7aa759d7 Mon Sep 17 00:00:00 2001
From: Spencer Ahrens <sahrens@fb.com>
Date: Mon, 3 Apr 2017 19:07:44 -0700
Subject: [PATCH 291/366] fix crash with onEndReached={null}

Reviewed By: bvaughn

Differential Revision: D4815310

fbshipit-source-id: 69d4a5a6fd247bdf877465a7cd07924a0dd6584b
---
 Examples/UIExplorer/js/FlatListExample.js                 | 8 +++++++-
 Examples/UIExplorer/js/ListExampleShared.js               | 4 ++--
 Libraries/Lists/VirtualizedList.js                        | 4 ++--
 .../Lists/__tests__/__snapshots__/FlatList-test.js.snap   | 4 ----
 .../__tests__/__snapshots__/SectionList-test.js.snap      | 3 ---
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/Examples/UIExplorer/js/FlatListExample.js b/Examples/UIExplorer/js/FlatListExample.js
index be147580f9ce6e..cbb307e34f18e0 100644
--- a/Examples/UIExplorer/js/FlatListExample.js
+++ b/Examples/UIExplorer/js/FlatListExample.js
@@ -62,7 +62,7 @@ class FlatListExample extends React.PureComponent {
   static description = 'Performant, scrollable list of data.';
 
   state = {
-    data: genItemData(1000),
+    data: genItemData(100),
     debug: false,
     horizontal: false,
     filterText: '',
@@ -142,6 +142,7 @@ class FlatListExample extends React.PureComponent {
           }
           legacyImplementation={false}
           numColumns={1}
+          onEndReached={this._onEndReached}
           onRefresh={this._onRefresh}
           onScroll={this.state.horizontal ? this._scrollSinkX : this._scrollSinkY}
           onViewableItemsChanged={this._onViewableItemsChanged}
@@ -157,6 +158,11 @@ class FlatListExample extends React.PureComponent {
   _getItemLayout = (data: any, index: number) => {
     return getItemLayout(data, index, this.state.horizontal);
   };
+  _onEndReached = () => {
+    this.setState((state) => ({
+      data: state.data.concat(genItemData(100, state.data.length)),
+    }));
+  };
   _onRefresh = () => alert('onRefresh: nothing to refresh :P');
   _renderItemComponent = ({item}) => {
     return (
diff --git a/Examples/UIExplorer/js/ListExampleShared.js b/Examples/UIExplorer/js/ListExampleShared.js
index abaf10d967527c..6eae3fcb8ce6c0 100644
--- a/Examples/UIExplorer/js/ListExampleShared.js
+++ b/Examples/UIExplorer/js/ListExampleShared.js
@@ -39,9 +39,9 @@ const {
 
 type Item = {title: string, text: string, key: number, pressed: boolean, noImage?: ?boolean};
 
-function genItemData(count: number): Array<Item> {
+function genItemData(count: number, start: number = 0): Array<Item> {
   const dataBlob = [];
-  for (let ii = 0; ii < count; ii++) {
+  for (let ii = start; ii < count + start; ii++) {
     const itemHash = Math.abs(hashCode('Item ' + ii));
     dataBlob.push({
       title: 'Item ' + ii,
diff --git a/Libraries/Lists/VirtualizedList.js b/Libraries/Lists/VirtualizedList.js
index 49ca40a4a68764..13d83ce22f0cbe 100644
--- a/Libraries/Lists/VirtualizedList.js
+++ b/Libraries/Lists/VirtualizedList.js
@@ -259,7 +259,6 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
       return String(index);
     },
     maxToRenderPerBatch: 10,
-    onEndReached: () => {},
     onEndReachedThreshold: 2, // multiples of length
     removeClippedSubviews: true,
     renderScrollComponent: (props: Props) => {
@@ -636,7 +635,8 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
     }
     const distanceFromEnd = contentLength - visibleLength - offset;
     const itemCount = getItemCount(data);
-    if (this.state.last === itemCount - 1 &&
+    if (onEndReached &&
+        this.state.last === itemCount - 1 &&
         distanceFromEnd < onEndReachedThreshold * visibleLength &&
         (this._hasDataChangedSinceEndReached ||
          this._scrollMetrics.contentLength !== this._sentEndForContentLength)) {
diff --git a/Libraries/Lists/__tests__/__snapshots__/FlatList-test.js.snap b/Libraries/Lists/__tests__/__snapshots__/FlatList-test.js.snap
index 19591edab96a02..d96352abd1712c 100644
--- a/Libraries/Lists/__tests__/__snapshots__/FlatList-test.js.snap
+++ b/Libraries/Lists/__tests__/__snapshots__/FlatList-test.js.snap
@@ -34,7 +34,6 @@ exports[`FlatList renders all the bells and whistles 1`] = `
   maxToRenderPerBatch={10}
   numColumns={2}
   onContentSizeChange={[Function]}
-  onEndReached={[Function]}
   onEndReachedThreshold={2}
   onLayout={[Function]}
   onRefresh={[Function]}
@@ -134,7 +133,6 @@ exports[`FlatList renders empty list 1`] = `
   maxToRenderPerBatch={10}
   numColumns={1}
   onContentSizeChange={[Function]}
-  onEndReached={[Function]}
   onEndReachedThreshold={2}
   onLayout={[Function]}
   onScroll={[Function]}
@@ -164,7 +162,6 @@ exports[`FlatList renders null list 1`] = `
   maxToRenderPerBatch={10}
   numColumns={1}
   onContentSizeChange={[Function]}
-  onEndReached={[Function]}
   onEndReachedThreshold={2}
   onLayout={[Function]}
   onScroll={[Function]}
@@ -206,7 +203,6 @@ exports[`FlatList renders simple list 1`] = `
   maxToRenderPerBatch={10}
   numColumns={1}
   onContentSizeChange={[Function]}
-  onEndReached={[Function]}
   onEndReachedThreshold={2}
   onLayout={[Function]}
   onScroll={[Function]}
diff --git a/Libraries/Lists/__tests__/__snapshots__/SectionList-test.js.snap b/Libraries/Lists/__tests__/__snapshots__/SectionList-test.js.snap
index 7ec08054c36f08..f9fb946f358942 100644
--- a/Libraries/Lists/__tests__/__snapshots__/SectionList-test.js.snap
+++ b/Libraries/Lists/__tests__/__snapshots__/SectionList-test.js.snap
@@ -26,7 +26,6 @@ exports[`SectionList rendering empty section headers is fine 1`] = `
   keyExtractor={[Function]}
   maxToRenderPerBatch={10}
   onContentSizeChange={[Function]}
-  onEndReached={[Function]}
   onEndReachedThreshold={2}
   onLayout={[Function]}
   onScroll={[Function]}
@@ -130,7 +129,6 @@ exports[`SectionList renders all the bells and whistles 1`] = `
   keyExtractor={[Function]}
   maxToRenderPerBatch={10}
   onContentSizeChange={[Function]}
-  onEndReached={[Function]}
   onEndReachedThreshold={2}
   onLayout={[Function]}
   onRefresh={[Function]}
@@ -269,7 +267,6 @@ exports[`SectionList renders empty list 1`] = `
   keyExtractor={[Function]}
   maxToRenderPerBatch={10}
   onContentSizeChange={[Function]}
-  onEndReached={[Function]}
   onEndReachedThreshold={2}
   onLayout={[Function]}
   onScroll={[Function]}

From 03892d1036282cb2e93e73cf9f49418607c28cc1 Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Tue, 4 Apr 2017 04:03:48 -0700
Subject: [PATCH 292/366] packager: GlobalTransformCache: retry 502 and 503
 HTTP statuses

Reviewed By: davidaurelio

Differential Revision: D4818997

fbshipit-source-id: b31b004939f9e83c8a3a8c34b07c8b1ae2d4d17e
---
 packager/src/lib/GlobalTransformCache.js | 41 +++++++++++++++++++-----
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/packager/src/lib/GlobalTransformCache.js b/packager/src/lib/GlobalTransformCache.js
index eccf54fbbdd1f3..13de60ebf15f16 100644
--- a/packager/src/lib/GlobalTransformCache.js
+++ b/packager/src/lib/GlobalTransformCache.js
@@ -144,10 +144,17 @@ class TransformProfileSet {
   }
 }
 
+type FetchFailedDetails =
+  {+type: 'unhandled_http_status', +statusCode: number} | {+type: 'unspecified'};
+
 class FetchFailedError extends Error {
-  constructor(message) {
+  /** Separate object for details allows us to have a type union. */
+  +details: FetchFailedDetails;
+
+  constructor(message: string, details: FetchFailedDetails) {
     super();
     this.message = message;
+    (this: any).details = details;
   }
 }
 
@@ -223,31 +230,49 @@ class GlobalTransformCache {
     const response = await fetch(uri, {method: 'GET', timeout: 8000});
     if (response.status !== 200) {
       const msg = `Unexpected HTTP status: ${response.status} ${response.statusText} `;
-      throw new FetchFailedError(msg);
+      throw new FetchFailedError(msg, {
+        type: 'unhandled_http_status',
+        statusCode: response.status,
+      });
     }
     const unvalidatedResult = await response.json();
     const result = validateCachedResult(unvalidatedResult);
     if (result == null) {
-      throw new FetchFailedError('Server returned invalid result.');
+      throw new FetchFailedError('Server returned invalid result.', {type: 'unspecified'});
     }
     return result;
   }
 
   /**
-   * It happens from time to time that a fetch timeouts, we want to try these
-   * again a second time.
+   * It happens from time to time that a fetch fails, we want to try these again
+   * a second time if we expect them to be transient. We might even consider
+   * waiting a little time before retring if experience shows it's useful.
    */
   static fetchResultFromURI(uri: string): Promise<CachedResult> {
     return GlobalTransformCache._fetchResultFromURI(uri).catch(error => {
-      if (!GlobalTransformCache.isTimeoutError(error)) {
+      if (!GlobalTransformCache.shouldRetryAfterThatError(error)) {
         throw error;
       }
       return this._fetchResultFromURI(uri);
     });
   }
 
-  static isTimeoutError(error: Error): boolean {
-    return error instanceof FetchError && error.type === 'request-timeout';
+  /**
+   * We want to retry timeouts as they're likely temporary. We retry 503
+   * (Service Unavailable) and 502 (Bad Gateway) because they may be caused by a
+   * some rogue server, or because of throttling.
+   *
+   * There may be other types of error we'd want to retry for, but these are
+   * the ones we experienced the most in practice.
+   */
+  static shouldRetryAfterThatError(error: Error): boolean {
+    return (
+      error instanceof FetchError && error.type === 'request-timeout' || (
+        error instanceof FetchFailedError &&
+        error.details.type === 'wrong_http_status' &&
+        (error.details.statusCode === 503 || error.details.statusCode === 502)
+      )
+    );
   }
 
   shouldFetch(props: FetchProps): boolean {

From 8755338728d3753c7fbebd965d5ae65f23a69665 Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Tue, 4 Apr 2017 07:06:25 -0700
Subject: [PATCH 293/366] packager: get rid of type `any` in ResolutionRequest

Summary:
One of my changeset broke the "ModuleGraph" code without warning earlier because we are using `any`, that equivalent to having no typing at all. This changeset fixes the types so that `ResolutionRequest` is exactly what it actually is: a class usable for any `Module`-looking class, including the normal one, and the "ModuleGraph" one used for Buck builds. That way, the ModuleGraph's `Module` is typechecked against `Moduleish`.

Concretely this change mostly migrates the `Module` to its generic parameter counterpart `TModule` inside `ResolutionRequest`.

Reviewed By: kentaromiura

Differential Revision: D4826256

fbshipit-source-id: fcd7ca08ac6c35e4e9ca983e2aab260e352bcb4e
---
 local-cli/server/util/attachHMRServer.js      |  5 +-
 packager/src/Bundler/index.js                 |  6 +-
 packager/src/ModuleGraph/node-haste/Module.js |  4 ++
 packager/src/Resolver/index.js                |  6 +-
 packager/src/Server/index.js                  |  2 +-
 .../DependencyGraph/ResolutionRequest.js      | 60 ++++++++++++-------
 .../DependencyGraph/ResolutionResponse.js     | 18 +++---
 packager/src/node-haste/Module.js             |  3 +-
 packager/src/node-haste/ModuleCache.js        |  2 +-
 packager/src/node-haste/Package.js            |  2 +-
 packager/src/node-haste/index.js              |  2 +-
 11 files changed, 67 insertions(+), 43 deletions(-)

diff --git a/local-cli/server/util/attachHMRServer.js b/local-cli/server/util/attachHMRServer.js
index 02c4f45ece80e8..45204e8b10eaf6 100644
--- a/local-cli/server/util/attachHMRServer.js
+++ b/local-cli/server/util/attachHMRServer.js
@@ -18,7 +18,8 @@ const {getInverseDependencies} = require('../../../packager/src//node-haste');
 
 import type HMRBundle from '../../../packager/src/Bundler/HMRBundle';
 import type Server from '../../../packager/src/Server';
-import type ResolutionResponse from '../../../packager/src/node-haste/DependencyGraph/ResolutionResponse';
+import type ResolutionResponse
+  from '../../../packager/src/node-haste/DependencyGraph/ResolutionResponse';
 import type Module from '../../../packager/src/node-haste/Module';
 import type {Server as HTTPServer} from 'http';
 
@@ -53,7 +54,7 @@ function attachHMRServer({httpServer, path, packagerServer}: HMROptions) {
     dependenciesModulesCache: {[mixed]: Module},
     shallowDependencies: {[string]: Array<Module>},
     inverseDependenciesCache: mixed,
-    resolutionResponse: ResolutionResponse,
+    resolutionResponse: ResolutionResponse<Module>,
   }> {
     return packagerServer.getDependencies({
       platform: platform,
diff --git a/packager/src/Bundler/index.js b/packager/src/Bundler/index.js
index 878e39ee26fd4b..8197ff9139797c 100644
--- a/packager/src/Bundler/index.js
+++ b/packager/src/Bundler/index.js
@@ -322,12 +322,12 @@ class Bundler {
     moduleSystemDeps?: Array<Module>,
     onProgress?: () => void,
     platform?: ?string,
-    resolutionResponse?: ResolutionResponse,
+    resolutionResponse?: ResolutionResponse<Module>,
     runBeforeMainModule?: boolean,
     runModule?: boolean,
     unbundle?: boolean,
   }) {
-    const onResolutionResponse = (response: ResolutionResponse) => {
+    const onResolutionResponse = (response: ResolutionResponse<Module>) => {
       /* $FlowFixMe: looks like ResolutionResponse is monkey-patched
        * with `getModuleId`. */
       bundle.setMainModuleId(response.getModuleId(getMainModule(response)));
@@ -342,7 +342,7 @@ class Bundler {
     const finalizeBundle = ({bundle: finalBundle, transformedModules, response, modulesByName}: {
       bundle: Bundle,
       transformedModules: Array<{module: Module, transformed: ModuleTransport}>,
-      response: ResolutionResponse,
+      response: ResolutionResponse<Module>,
       modulesByName: {[name: string]: Module},
     }) =>
       this._resolverPromise.then(resolver => Promise.all(
diff --git a/packager/src/ModuleGraph/node-haste/Module.js b/packager/src/ModuleGraph/node-haste/Module.js
index 0636066a730dc3..6c7e84aec951a8 100644
--- a/packager/src/ModuleGraph/node-haste/Module.js
+++ b/packager/src/ModuleGraph/node-haste/Module.js
@@ -44,6 +44,10 @@ module.exports = class Module {
   isHaste() {
     return this.hasteID.then(Boolean);
   }
+
+  hash() {
+    throw new Error('not implemented');
+  }
 };
 
 function getName(path) {
diff --git a/packager/src/Resolver/index.js b/packager/src/Resolver/index.js
index 55e899a138354a..e564706de70d47 100644
--- a/packager/src/Resolver/index.js
+++ b/packager/src/Resolver/index.js
@@ -101,7 +101,7 @@ class Resolver {
     transformOptions: TransformOptions,
     onProgress?: ?(finishedModules: number, totalModules: number) => mixed,
     getModuleId: mixed,
-  ): Promise<ResolutionResponse> {
+  ): Promise<ResolutionResponse<Module>> {
     const {platform, recursive = true} = options;
     return this._depGraph.getDependencies({
       entryPath,
@@ -151,7 +151,7 @@ class Resolver {
   }
 
   resolveRequires(
-    resolutionResponse: ResolutionResponse,
+    resolutionResponse: ResolutionResponse<Module>,
     module: Module,
     code: string,
     dependencyOffsets: Array<number> = [],
@@ -195,7 +195,7 @@ class Resolver {
     dev = true,
     minify = false,
   }: {
-    resolutionResponse: ResolutionResponse,
+    resolutionResponse: ResolutionResponse<Module>,
     module: Module,
     name: string,
     map: SourceMap,
diff --git a/packager/src/Server/index.js b/packager/src/Server/index.js
index 2e93047103be4c..d7710ad257ebb6 100644
--- a/packager/src/Server/index.js
+++ b/packager/src/Server/index.js
@@ -309,7 +309,7 @@ class Server {
   getDependencies(options: {
     entryFile: string,
     platform: ?string,
-  }): Promise<ResolutionResponse> {
+  }): Promise<ResolutionResponse<Module>> {
     return Promise.resolve().then(() => {
       if (!options.platform) {
         options.platform = getPlatformExtension(options.entryFile);
diff --git a/packager/src/node-haste/DependencyGraph/ResolutionRequest.js b/packager/src/node-haste/DependencyGraph/ResolutionRequest.js
index 8cf2d2e517588a..b4336c933b4da0 100644
--- a/packager/src/node-haste/DependencyGraph/ResolutionRequest.js
+++ b/packager/src/node-haste/DependencyGraph/ResolutionRequest.js
@@ -23,8 +23,6 @@ const getAssetDataFromName = require('../lib/getAssetDataFromName');
 
 import type {HasteFS} from '../types';
 import type DependencyGraphHelpers from './DependencyGraphHelpers';
-import type Module from '../Module';
-import type ModuleCache from '../ModuleCache';
 import type ResolutionResponse from './ResolutionResponse';
 
 type DirExistsFn = (filePath: string) => boolean;
@@ -37,14 +35,31 @@ export type ModuleMap = {
   getPackage(name: string, platform: string, supportsNativePlatform: boolean): ?string,
 };
 
-type Options = {
+type Packageish = {
+  redirectRequire(toModuleName: string): string | false,
+  getMain(): string,
+  +root: string,
+};
+
+type Moduleish = {
+  +path: string,
+  getPackage(): ?Packageish,
+  hash(): string,
+};
+
+type ModuleishCache<TModule, TPackage> = {
+  getPackage(name: string, platform?: string, supportsNativePlatform?: boolean): TPackage,
+  getModule(path: string): TModule,
+  getAssetModule(path: string): TModule,
+};
+
+type Options<TModule, TPackage> = {
   dirExists: DirExistsFn,
   entryPath: string,
   extraNodeModules: ?Object,
   hasteFS: HasteFS,
   helpers: DependencyGraphHelpers,
-  // TODO(cpojer): Remove 'any' type. This is used for ModuleGraph/node-haste
-  moduleCache: ModuleCache | any,
+  moduleCache: ModuleishCache<TModule, TPackage>,
   moduleMap: ModuleMap,
   platform: string,
   platforms: Set<string>,
@@ -67,14 +82,14 @@ function tryResolveSync<T>(action: () => T, secondaryAction: () => T): T {
   }
 }
 
-class ResolutionRequest {
+class ResolutionRequest<TModule: Moduleish, TPackage: Packageish> {
   _dirExists: DirExistsFn;
   _entryPath: string;
   _extraNodeModules: ?Object;
   _hasteFS: HasteFS;
   _helpers: DependencyGraphHelpers;
-  _immediateResolutionCache: {[key: string]: Module};
-  _moduleCache: ModuleCache;
+  _immediateResolutionCache: {[key: string]: TModule};
+  _moduleCache: ModuleishCache<TModule, TPackage>;
   _moduleMap: ModuleMap;
   _platform: string;
   _platforms: Set<string>;
@@ -92,7 +107,7 @@ class ResolutionRequest {
     platform,
     platforms,
     preferNativePlatform,
-  }: Options) {
+  }: Options<TModule, TPackage>) {
     this._dirExists = dirExists;
     this._entryPath = entryPath;
     this._extraNodeModules = extraNodeModules;
@@ -115,8 +130,7 @@ class ResolutionRequest {
     });
   }
 
-  // TODO(cpojer): Remove 'any' type. This is used for ModuleGraph/node-haste
-  resolveDependency(fromModule: Module | any, toModuleName: string): Module {
+  resolveDependency(fromModule: TModule, toModuleName: string): TModule {
     const resHash = resolutionHash(fromModule.path, toModuleName);
 
     const immediateResolution = this._immediateResolutionCache[resHash];
@@ -141,7 +155,10 @@ class ResolutionRequest {
     return cacheResult(this._resolveNodeDependency(fromModule, toModuleName));
   }
 
-  resolveModuleDependencies(module: Module, dependencyNames: Array<string>): [Array<string>, Array<Module>] {
+  resolveModuleDependencies(
+    module: TModule,
+    dependencyNames: Array<string>,
+  ): [Array<string>, Array<TModule>] {
     const dependencies = dependencyNames.map(name => this.resolveDependency(module, name));
     return [dependencyNames, dependencies];
   }
@@ -152,7 +169,7 @@ class ResolutionRequest {
     onProgress,
     recursive = true,
   }: {
-    response: ResolutionResponse,
+    response: ResolutionResponse<TModule>,
     transformOptions: Object,
     onProgress?: ?(finishedModules: number, totalModules: number) => mixed,
     recursive: boolean,
@@ -250,13 +267,14 @@ class ResolutionRequest {
     });
   }
 
-  _resolveHasteDependency(fromModule: Module, toModuleName: string): Module {
+  _resolveHasteDependency(fromModule: TModule, toModuleName: string): TModule {
     toModuleName = normalizePath(toModuleName);
 
     const pck = fromModule.getPackage();
     let realModuleName;
     if (pck) {
-      realModuleName = pck.redirectRequire(toModuleName);
+      /* $FlowFixMe: redirectRequire can actually return `false` for exclusions */
+      realModuleName = (pck.redirectRequire(toModuleName): string);
     } else {
       realModuleName = toModuleName;
     }
@@ -308,7 +326,7 @@ class ResolutionRequest {
     );
   }
 
-  _redirectRequire(fromModule: Module, modulePath: string): string | false {
+  _redirectRequire(fromModule: TModule, modulePath: string): string | false {
     const pck = fromModule.getPackage();
     if (pck) {
       return pck.redirectRequire(modulePath);
@@ -316,7 +334,7 @@ class ResolutionRequest {
     return modulePath;
   }
 
-  _resolveFileOrDir(fromModule: Module, toModuleName: string): Module {
+  _resolveFileOrDir(fromModule: TModule, toModuleName: string): TModule {
     const potentialModulePath = isAbsolutePath(toModuleName) ?
       resolveWindowsPath(toModuleName) :
       path.join(path.dirname(fromModule.path), toModuleName);
@@ -336,7 +354,7 @@ class ResolutionRequest {
     );
   }
 
-  _resolveNodeDependency(fromModule: Module, toModuleName: string): Module {
+  _resolveNodeDependency(fromModule: TModule, toModuleName: string): TModule {
     if (isRelativeImport(toModuleName) || isAbsolutePath(toModuleName)) {
       return this._resolveFileOrDir(fromModule, toModuleName);
     }
@@ -408,7 +426,7 @@ class ResolutionRequest {
    * This is written as a separate function because "try..catch" blocks cause
    * the entire surrounding function to be deoptimized.
    */
-  _tryResolveNodeDep(searchPath: string, fromModule: Module, toModuleName: string): ?Module {
+  _tryResolveNodeDep(searchPath: string, fromModule: TModule, toModuleName: string): ?TModule {
     try {
       return tryResolveSync(
         () => this._loadAsFile(searchPath, fromModule, toModuleName),
@@ -422,7 +440,7 @@ class ResolutionRequest {
     }
   }
 
-  _loadAsFile(potentialModulePath: string, fromModule: Module, toModule: string): Module {
+  _loadAsFile(potentialModulePath: string, fromModule: TModule, toModule: string): TModule {
     if (this._helpers.isAssetFile(potentialModulePath)) {
       let dirname = path.dirname(potentialModulePath);
       if (!this._dirExists(dirname)) {
@@ -480,7 +498,7 @@ class ResolutionRequest {
     return this._moduleCache.getModule(file);
   }
 
-  _loadAsDir(potentialDirPath: string, fromModule: Module, toModule: string): Module {
+  _loadAsDir(potentialDirPath: string, fromModule: TModule, toModule: string): TModule {
     if (!this._dirExists(potentialDirPath)) {
       throw new UnableToResolveError(
         fromModule,
diff --git a/packager/src/node-haste/DependencyGraph/ResolutionResponse.js b/packager/src/node-haste/DependencyGraph/ResolutionResponse.js
index e17b73dda10b92..9d682b8af29c25 100644
--- a/packager/src/node-haste/DependencyGraph/ResolutionResponse.js
+++ b/packager/src/node-haste/DependencyGraph/ResolutionResponse.js
@@ -16,10 +16,10 @@ import type Module from '../Module';
 
 const NO_OPTIONS = {};
 
-class ResolutionResponse {
+class ResolutionResponse<TModule: {hash(): string}> {
 
   transformOptions: TransformOptions;
-  dependencies: Array<Module>;
+  dependencies: Array<TModule>;
   mainModuleId: ?(number | string);
   mocks: mixed;
   numPrependedDependencies: number;
@@ -29,7 +29,7 @@ class ResolutionResponse {
 
   _mappings: {};
   _finalized: boolean;
-  _mainModule: ?Module;
+  _mainModule: ?TModule;
 
   constructor({transformOptions}: {transformOptions: TransformOptions}) {
     this.transformOptions = transformOptions;
@@ -42,10 +42,10 @@ class ResolutionResponse {
   }
 
   copy(properties: {
-    dependencies?: Array<Module>,
+    dependencies?: Array<TModule>,
     mainModuleId?: number,
     mocks?: mixed,
-  }): ResolutionResponse {
+  }): ResolutionResponse<TModule> {
     const {
       dependencies = this.dependencies,
       mainModuleId = this.mainModuleId,
@@ -80,7 +80,7 @@ class ResolutionResponse {
     }
   }
 
-  finalize(): ResolutionResponse {
+  finalize(): ResolutionResponse<TModule> {
     /* $FlowFixMe: _mainModule is not initialized in the constructor. */
     return this._mainModule.getName().then(id => {
       this.mainModuleId = id;
@@ -89,7 +89,7 @@ class ResolutionResponse {
     });
   }
 
-  pushDependency(module: Module) {
+  pushDependency(module: TModule) {
     this._assertNotFinalized();
     if (this.dependencies.length === 0) {
       this._mainModule = module;
@@ -98,7 +98,7 @@ class ResolutionResponse {
     this.dependencies.push(module);
   }
 
-  prependDependency(module: Module) {
+  prependDependency(module: TModule) {
     this._assertNotFinalized();
     this.dependencies.unshift(module);
     this.numPrependedDependencies += 1;
@@ -122,7 +122,7 @@ class ResolutionResponse {
     this.mocks = mocks;
   }
 
-  getResolvedDependencyPairs(module: Module) {
+  getResolvedDependencyPairs(module: TModule) {
     this._assertFinalized();
     return this._mappings[module.hash()];
   }
diff --git a/packager/src/node-haste/Module.js b/packager/src/node-haste/Module.js
index 8fb916a8cacde8..848822bcd86602 100644
--- a/packager/src/node-haste/Module.js
+++ b/packager/src/node-haste/Module.js
@@ -226,7 +226,8 @@ class Module {
     if (hasteImpl !== undefined) {
       const {enforceHasteNameMatches} = hasteImpl;
       if (enforceHasteNameMatches) {
-        /* $FlowFixMe: this rely on the above if being executed, that is fragile. Rework the algo. */
+        /* $FlowFixMe: this rely on the above if being executed, that is fragile.
+         * Rework the algo. */
         enforceHasteNameMatches(this.path, this._hasteNameCache.hasteName);
       }
       this._hasteNameCache = {hasteName: hasteImpl.getHasteName(this.path)};
diff --git a/packager/src/node-haste/ModuleCache.js b/packager/src/node-haste/ModuleCache.js
index f19ce1ac1240ac..316500c51ac30e 100644
--- a/packager/src/node-haste/ModuleCache.js
+++ b/packager/src/node-haste/ModuleCache.js
@@ -114,7 +114,7 @@ class ModuleCache {
     return this._moduleCache[filePath];
   }
 
-  getPackage(filePath: string) {
+  getPackage(filePath: string): Package {
     if (!this._packageCache[filePath]) {
       this._packageCache[filePath] = new Package({
         file: filePath,
diff --git a/packager/src/node-haste/Package.js b/packager/src/node-haste/Package.js
index 34456563f1f5a1..c3ad3eafa87c26 100644
--- a/packager/src/node-haste/Package.js
+++ b/packager/src/node-haste/Package.js
@@ -44,7 +44,7 @@ class Package {
     this._content = null;
   }
 
-  getMain() {
+  getMain(): string {
     const json = this.read();
     var replacements = getReplacements(json);
     if (typeof replacements === 'string') {
diff --git a/packager/src/node-haste/index.js b/packager/src/node-haste/index.js
index 0bf17a9115e192..c0ed382d0d044d 100644
--- a/packager/src/node-haste/index.js
+++ b/packager/src/node-haste/index.js
@@ -211,7 +211,7 @@ class DependencyGraph extends EventEmitter {
     transformOptions: TransformOptions,
     onProgress?: ?(finishedModules: number, totalModules: number) => mixed,
     recursive: boolean,
-  }): Promise<ResolutionResponse> {
+  }): Promise<ResolutionResponse<Module>> {
     platform = this._getRequestPlatform(entryPath, platform);
     const absPath = this._getAbsolutePath(entryPath);
     const dirExists = filePath => {

From e91cd2eff771bd96e1d1c075a46a92c304948e26 Mon Sep 17 00:00:00 2001
From: Beau Smith <beau@beausmith.com>
Date: Tue, 4 Apr 2017 09:38:47 -0700
Subject: [PATCH 294/366] Make clear that onSlidingComplete is called
 regardless whether value changes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Summary:
Documentation didn't clearly state when onSlidingComplete callback is called.

No tests necessary… simply changing docs.
Closes https://github.com/facebook/react-native/pull/13282

Differential Revision: D4823866

Pulled By: ericvicenti

fbshipit-source-id: 1c3be6ee4d52b097b7558067edf0388739d3f52e
---
 Libraries/Components/Slider/Slider.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Libraries/Components/Slider/Slider.js b/Libraries/Components/Slider/Slider.js
index 6ca9e49ae73a1c..a6e03e8e2cd8c7 100644
--- a/Libraries/Components/Slider/Slider.js
+++ b/Libraries/Components/Slider/Slider.js
@@ -126,8 +126,9 @@ var Slider = React.createClass({
     onValueChange: PropTypes.func,
 
     /**
-     * Callback called when the user finishes changing the value (e.g. when
-     * the slider is released).
+     * Callback that is called when the user releases the slider,
+     * regardless if the value has changed. The current value is passed
+     * as an argument to the callback handler.
      */
     onSlidingComplete: PropTypes.func,
 

From 6a81de37d4d6a3077e29604eda5f759c307266ec Mon Sep 17 00:00:00 2001
From: Douglas Lowder <dlowder@salesforce.com>
Date: Tue, 4 Apr 2017 09:50:32 -0700
Subject: [PATCH 295/366] Add YGEnums to tvOS build

Summary:
**Motivation** Fix the Apple TV build, which is broken after a recent commit.

**Test plan** Travis tvOS test script should succeed.
Closes https://github.com/facebook/react-native/pull/13284

Differential Revision: D4827053

Pulled By: ericvicenti

fbshipit-source-id: 380e8f1b32adfeea844bedc11326e5a6a755066a
---
 React/React.xcodeproj/project.pbxproj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/React/React.xcodeproj/project.pbxproj b/React/React.xcodeproj/project.pbxproj
index ec676d0a665d2f..0a03aac539054b 100644
--- a/React/React.xcodeproj/project.pbxproj
+++ b/React/React.xcodeproj/project.pbxproj
@@ -160,6 +160,7 @@
 		2D7FEB891E734B5700D3238C /* systemJSCWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65F3E41D1E73031C009375BD /* systemJSCWrapper.cpp */; };
 		2D8C2E331DA40441000EE098 /* RCTMultipartStreamReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 001BFCCF1D8381DE008E587E /* RCTMultipartStreamReader.m */; };
 		2DD0EFE11DA84F2800B0C975 /* RCTStatusBarManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 13723B4F1A82FD3C00F88898 /* RCTStatusBarManager.m */; };
+		2DDD72161E931C25007C55D1 /* YGEnums.c in Sources */ = {isa = PBXBuildFile; fileRef = 138FDE6A1E92EA4F005FEEDD /* YGEnums.c */; };
 		352DCFF01D19F4C20056D623 /* RCTI18nUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 352DCFEF1D19F4C20056D623 /* RCTI18nUtil.m */; };
 		369123E11DDC75850095B341 /* JSCSamplingProfiler.m in Sources */ = {isa = PBXBuildFile; fileRef = 369123E01DDC75850095B341 /* JSCSamplingProfiler.m */; };
 		391E86A41C623EC800009732 /* RCTTouchEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 391E86A21C623EC800009732 /* RCTTouchEvent.m */; };
@@ -2542,6 +2543,7 @@
 			files = (
 				3DFE0D1D1DF857FF00459392 /* YGNodeList.c in Sources */,
 				3DFE0D1E1DF857FF00459392 /* Yoga.c in Sources */,
+				2DDD72161E931C25007C55D1 /* YGEnums.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

From 058a5406bafc66368297950b4969ccb356c02a44 Mon Sep 17 00:00:00 2001
From: Hector Ramos <hramos@fb.com>
Date: Tue, 4 Apr 2017 10:16:16 -0700
Subject: [PATCH 296/366] Add UberEATS article to showcase

Summary:
Adds UberEATS technical blog post, https://eng.uber.com/ubereats-react-native/, to the showcase.

This is not an ideal entry, as the app in question, the UberEATS Restaurant Dashboard, is not widely available in the app stores for people to download and try out. I still think it's worth adding this to the showcase as a good example of a large, known company leveraging React Native to build a new experience.

Test Plan
=======

Built website and verified everything rendered correctly in the Showcase.
Closes https://github.com/facebook/react-native/pull/13274

Differential Revision: D4823507

Pulled By: ericvicenti

fbshipit-source-id: 7929124dfc17254d1bc5970a20ba393a54e34409
---
 website/showcase.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/website/showcase.json b/website/showcase.json
index 8c2b930033ebf8..4822c4a01672c5 100644
--- a/website/showcase.json
+++ b/website/showcase.json
@@ -190,5 +190,12 @@
     "infoLink": "http://x.co/FlareNews",
     "infoTitle": "Social network that connects entrepreneurs to fellow entrepreneurs, consumers, investors and experts",
     "pinned": false
+  },
+  {
+    "name": "UberEATS",
+    "icon": "http://is5.mzstatic.com/image/thumb/Purple111/v4/5f/e9/00/5fe90072-c9ce-87c3-bdfe-8611f9325f0e/source/175x175bb.jpg",
+    "infoLink": "https://eng.uber.com/ubereats-react-native/",
+    "infoTitle": "Powering UberEATS with React Native and Uber Engineering",
+    "pinned": false
   }
 ]

From 0fe0fc038b1cbc0f3be29f1e3a752c2feb153285 Mon Sep 17 00:00:00 2001
From: Sai Grandhi <sgrndh@gmail.com>
Date: Tue, 4 Apr 2017 10:19:43 -0700
Subject: [PATCH 297/366] Make copy button work on android emulator in Linux
 using xsel

Summary:
Resolves issue [#13165](https://github.com/facebook/react-native/issues/13165). The copy button in the redbox for RN android is not currently supported for Linux. This pull request provides the copy button functionality to Linux RN users.

I have tested the updated code locally.
Firstly, I edited `index.android.js` that caused the following error.
![pasted image at 2017_03_27 10_21 am](https://cloud.githubusercontent.com/assets/22376429/24426834/f567c5dc-13d6-11e7-8e3b-a650e2f6237c.png)
After I clicked the copy button and pasted from the clipboard into the chrome address bar, the message appeared.
![pasted_image_at_2017_03_27_10_21_am](https://cloud.githubusercontent.com/assets/22376429/24426896/2c0d4d64-13d7-11e7-8650-da19c44b177d.png)
Closes https://github.com/facebook/react-native/pull/13188

Differential Revision: D4819796

Pulled By: ericvicenti

fbshipit-source-id: 9adc6e93330f89240a505a403e4913dc10e5a31f
---
 local-cli/server/util/copyToClipBoard.js |   8 ++++++++
 local-cli/server/util/external/xsel      | Bin 0 -> 129416 bytes
 2 files changed, 8 insertions(+)
 create mode 100755 local-cli/server/util/external/xsel

diff --git a/local-cli/server/util/copyToClipBoard.js b/local-cli/server/util/copyToClipBoard.js
index d7016bae7bcaae..c4c134f6679d10 100644
--- a/local-cli/server/util/copyToClipBoard.js
+++ b/local-cli/server/util/copyToClipBoard.js
@@ -10,7 +10,11 @@
 
 var child_process = require('child_process');
 var spawn = child_process.spawn;
+var path = require('path');
+var fs  = require('fs');
 
+const xsel = path.join(__dirname, 'external/xsel');
+fs.chmodSync(xsel, '0755');
 /**
  * Copy the content to host system clipboard.
  * This is only supported on Mac and Windows for now.
@@ -25,6 +29,10 @@ function copyToClipBoard(content) {
     var child = spawn('clip', []);
     child.stdin.end(new Buffer(content, 'utf8'));
     return true;
+  case 'linux':
+    var child = spawn(xsel, ['--clipboard', '--input']);
+    child.stdin.end(new Buffer(content, 'utf8'));
+    return true;
   default:
     return false;
   }
diff --git a/local-cli/server/util/external/xsel b/local-cli/server/util/external/xsel
new file mode 100755
index 0000000000000000000000000000000000000000..a6b2fd3d5937e605e3f3fdb3c9634bad8aa5816f
GIT binary patch
literal 129416
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
Q`Y-&Qm48BXz%u>+1%L4+cmMzZ

literal 0
HcmV?d00001


From c128612c5c6e5dce570eeb132efe52bbe2771c0e Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieterdb@fb.com>
Date: Tue, 4 Apr 2017 10:29:05 -0700
Subject: [PATCH 298/366] A proxy so a singleton CxxModule can be shared by
 multiple ModuleRegistry instances.

Reviewed By: mhorowitz

Differential Revision: D4814438

fbshipit-source-id: db6cdd9e948643bb24a443bd45b7b0843a0a86c2
---
 ReactCommon/cxxreact/BUCK                   |  5 +--
 ReactCommon/cxxreact/SharedProxyCxxModule.h | 35 +++++++++++++++++++++
 2 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 ReactCommon/cxxreact/SharedProxyCxxModule.h

diff --git a/ReactCommon/cxxreact/BUCK b/ReactCommon/cxxreact/BUCK
index 49b2b54e5eca75..65cafc15002d9e 100644
--- a/ReactCommon/cxxreact/BUCK
+++ b/ReactCommon/cxxreact/BUCK
@@ -132,11 +132,11 @@ CXXREACT_PUBLIC_HEADERS = [
     "ExecutorToken.h",
     "ExecutorTokenFactory.h",
     "Instance.h",
+    "JSBigString.h",
+    "JSBundleType.h",
     "JSCExecutor.h",
     "JSCNativeModules.h",
     "JSCWebWorker.h",
-    "JSBigString.h",
-    "JSBundleType.h",
     "JSIndexedRAMBundle.h",
     "JSModulesUnbundle.h",
     "MessageQueueThread.h",
@@ -146,6 +146,7 @@ CXXREACT_PUBLIC_HEADERS = [
     "NativeToJsBridge.h",
     "Platform.h",
     "RecoverableError.h",
+    "SharedProxyCxxModule.h",
     "SystraceSection.h",
 ]
 
diff --git a/ReactCommon/cxxreact/SharedProxyCxxModule.h b/ReactCommon/cxxreact/SharedProxyCxxModule.h
new file mode 100644
index 00000000000000..b8c9769a697281
--- /dev/null
+++ b/ReactCommon/cxxreact/SharedProxyCxxModule.h
@@ -0,0 +1,35 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+#include <memory>
+
+#include <cxxreact/CxxModule.h>
+
+namespace facebook { namespace xplat { namespace module {
+
+// Allows a Cxx-module to be shared or reused across multiple React instances
+// Caveat: the setInstance call is not forwarded, so usages of getInstance inside your
+// module (e.g. dispatching events) will always be nullptr.
+class SharedProxyCxxModule : public CxxModule {
+public:
+  explicit SharedProxyCxxModule(std::shared_ptr<CxxModule> shared)
+    : shared_(shared) {}
+
+  std::string getName() override {
+    return shared_->getName();
+  }
+
+  auto getConstants() -> std::map<std::string, folly::dynamic> override {
+    return shared_->getConstants();
+  }
+
+  auto getMethods() -> std::vector<Method> override {
+    return shared_->getMethods();
+  }
+
+private:
+  std::shared_ptr<CxxModule> shared_;
+};
+
+}
+}
+}

From 67e54f8bdb6eee11b04d615fd04cb368943790d3 Mon Sep 17 00:00:00 2001
From: Eric Vicenti <evv@fb.com>
Date: Tue, 4 Apr 2017 11:57:48 -0700
Subject: [PATCH 299/366] Add YGEnums to fix gradle build

Summary:
Attempt to fix CircleCI build by adding YGEnums to the yoga gradle file
Closes https://github.com/facebook/react-native/pull/13296

Differential Revision: D4827856

Pulled By: ericvicenti

fbshipit-source-id: cb03af77919c811d06352fbe0b77084e97d2e6c1
---
 ReactCommon/yoga/Android.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ReactCommon/yoga/Android.mk b/ReactCommon/yoga/Android.mk
index 6d6219800c7807..e03438cb5970b9 100644
--- a/ReactCommon/yoga/Android.mk
+++ b/ReactCommon/yoga/Android.mk
@@ -6,6 +6,7 @@ LOCAL_MODULE := yogacore
 
 LOCAL_SRC_FILES := \
   yoga/Yoga.c \
+  yoga/YGEnums.c \
   yoga/YGNodeList.c
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)

From 77c19ccf7312dc8c4d3eb1c03e895636c92e6dca Mon Sep 17 00:00:00 2001
From: "Andrew Y. Chen" <ayc@fb.com>
Date: Tue, 4 Apr 2017 12:25:26 -0700
Subject: [PATCH 300/366] Use tag ids for testID

Summary: View tags are currently used for end-to-end test IDs. We'd like to overload the tag field with other information such as nativeID (for native refs) and transitionID (for shared element transitions) in the future. Added a key for testID's tag

Reviewed By: AaaChiuuu

Differential Revision: D4770368

fbshipit-source-id: b76c53a20520aac1b25d435b6d5eb809e8833675
---
 .../src/androidTest/java/com/facebook/react/testing/BUCK | 5 +++--
 .../java/com/facebook/react/testing/ReactTestHelper.java | 7 +++++--
 .../src/main/java/com/facebook/react/uimanager/BUCK      | 1 +
 .../com/facebook/react/uimanager/BaseViewManager.java    | 4 ++++
 ReactAndroid/src/main/res/BUCK                           | 9 +++++++++
 ReactAndroid/src/main/res/views/uimanager/values/ids.xml | 5 +++++
 6 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 ReactAndroid/src/main/res/views/uimanager/values/ids.xml

diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
index bb7c09790294af..57276c344fbe4a 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
@@ -21,6 +21,8 @@ android_library(
         react_native_dep("third-party/java/junit:junit"),
         react_native_dep("third-party/java/mockito:mockito"),
         react_native_dep("third-party/java/testing-support-lib:runner"),
+        react_native_integration_tests_target("java/com/facebook/react/testing/idledetection:idledetection"),
+        react_native_integration_tests_target("java/com/facebook/react/testing/network:network"),
         react_native_target("java/com/facebook/react:react"),
         react_native_target("java/com/facebook/react/bridge:bridge"),
         react_native_target("java/com/facebook/react/common:common"),
@@ -32,7 +34,6 @@ android_library(
         react_native_target("java/com/facebook/react/modules/debug:interfaces"),
         react_native_target("java/com/facebook/react/shell:shell"),
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
-        react_native_integration_tests_target("java/com/facebook/react/testing/idledetection:idledetection"),
-        react_native_integration_tests_target("java/com/facebook/react/testing/network:network"),
+        react_native_target("res:uimanager"),
     ],
 )
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestHelper.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestHelper.java
index 8054dff33d8161..6250d24148e4e1 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestHelper.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestHelper.java
@@ -17,6 +17,7 @@
 import android.view.ViewGroup;
 
 import com.facebook.react.NativeModuleRegistryBuilder;
+import com.facebook.react.R;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactInstanceManagerBuilder;
 import com.facebook.react.bridge.CatalystInstance;
@@ -187,7 +188,9 @@ public static View getViewWithReactTestId(View rootView, String testId) {
   }
 
   public static String getTestId(View view) {
-    return view.getTag() instanceof String ? (String) view.getTag() : null;
+    return view.getTag(R.id.react_test_id) instanceof String
+      ? (String) view.getTag(R.id.react_test_id)
+      : null;
   }
 
   private static View findChild(View root, Predicate<View> predicate) {
@@ -211,7 +214,7 @@ private static Predicate<View> hasTagValue(final String tagValue) {
     return new Predicate<View>() {
       @Override
       public boolean apply(View view) {
-        Object tag = view.getTag();
+        Object tag = getTestId(view);
         return tag != null && tag.equals(tagValue);
       }
     };
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK
index 954f2528f9229a..c75b10b0ddf413 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK
@@ -26,5 +26,6 @@ android_library(
         react_native_target("java/com/facebook/react/modules/i18nmanager:i18nmanager"),
         react_native_target("java/com/facebook/react/touch:touch"),
         react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
+        react_native_target("res:uimanager"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
index 24192175df1232..16c85690a1bdf8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
@@ -5,6 +5,7 @@
 import android.graphics.Color;
 import android.os.Build;
 import android.view.View;
+import com.facebook.react.R;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.uimanager.annotations.ReactProp;
 
@@ -85,6 +86,9 @@ public void setRenderToHardwareTexture(T view, boolean useHWTexture) {
 
   @ReactProp(name = PROP_TEST_ID)
   public void setTestId(T view, String testId) {
+    view.setTag(R.id.react_test_id, testId);
+
+    // temporarily set the tag and keyed tags to avoid end to end test regressions
     view.setTag(testId);
   }
 
diff --git a/ReactAndroid/src/main/res/BUCK b/ReactAndroid/src/main/res/BUCK
index bfe2eaaa300575..cbb610cc217caa 100644
--- a/ReactAndroid/src/main/res/BUCK
+++ b/ReactAndroid/src/main/res/BUCK
@@ -26,3 +26,12 @@ android_resource(
         "PUBLIC",
     ],
 )
+
+android_resource(
+    name = "uimanager",
+    package = "com.facebook.react",
+    res = "views/uimanager",
+    visibility = [
+        "PUBLIC",
+    ],
+)
diff --git a/ReactAndroid/src/main/res/views/uimanager/values/ids.xml b/ReactAndroid/src/main/res/views/uimanager/values/ids.xml
new file mode 100644
index 00000000000000..8744d7cad248db
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values/ids.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!-- tag is used to store the testID tag -->
+  <item type="id" name="react_test_id"/>
+</resources>

From 40eb353487fa5b13ef2a7043da42688427f73193 Mon Sep 17 00:00:00 2001
From: Martin Konicek <mkonicek@fb.com>
Date: Tue, 4 Apr 2017 12:36:05 -0700
Subject: [PATCH 301/366] Minor adjustments to the mobile site

Summary:
I noticed the mobile website did not look as great, specifically the hero and the showcase had some issues.

Before:

![screen shot 2017-04-04 at 11 08 41 am](https://cloud.githubusercontent.com/assets/165856/24671655/2fb45660-1927-11e7-8ee7-bf933f459550.png)
![screen shot 2017-04-04 at 11 08 48 am](https://cloud.githubusercontent.com/assets/165856/24671656/2fb44bc0-1927-11e7-9b2e-eb944e61d778.png)

After:
![screen shot 2017-04-04 at 11 08 54 am](https://cloud.githubusercontent.com/assets/165856/24671666/36de3942-1927-11e7-81ff-eeda74d8e748.png)
![screen shot 2017-04-04 at 11 08 59 am](https://cloud.githubusercontent.com/assets/165856/24671665/36d0be70-1927-11e7-9035-382a0a09b701.png)
Closes https://github.com/facebook/react-native/pull/13298

Differential Revision: D4828679

Pulled By: hramos

fbshipit-source-id: 478ab1c5eefa5292cb2f99a9a91e18d86b3e6192
---
 docs/GettingStarted.md                        |  1 +
 website/src/react-native/css/react-native.css | 30 +++++++++++++------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/docs/GettingStarted.md b/docs/GettingStarted.md
index ba8d1e380b6555..c560dda63a5df3 100644
--- a/docs/GettingStarted.md
+++ b/docs/GettingStarted.md
@@ -47,6 +47,7 @@ one to start with, since the setup is a bit different.
   <span>Mobile OS:</span>
   <a href="javascript:void(0);" class="button-ios" onclick="display('platform', 'ios')">iOS</a>
   <a href="javascript:void(0);" class="button-android" onclick="display('platform', 'android')">Android</a>
+  <br />
   <span>Development OS:</span>
   <a href="javascript:void(0);" class="button-mac" onclick="display('os', 'mac')">macOS</a>
   <a href="javascript:void(0);" class="button-linux" onclick="display('os', 'linux')">Linux</a>
diff --git a/website/src/react-native/css/react-native.css b/website/src/react-native/css/react-native.css
index 7ff24fb0a42110..e65b0ad02fd5f5 100644
--- a/website/src/react-native/css/react-native.css
+++ b/website/src/react-native/css/react-native.css
@@ -1048,7 +1048,7 @@ h2 {
   display: table-cell; }
 
 p {
-  margin: 10px 0; }
+  margin: 16px 0; }
 
 .highlight {
   padding: 10px;
@@ -1668,6 +1668,14 @@ input#algolia-doc-search:focus {
   font-size: 24px;
   text-align: center; }
 
+@media only screen and (max-width: 680px) {
+  .hero .text {
+    font-size: 200%;
+    text-align: center; }
+  .hero .minitext {
+    font-size: 18px;
+    text-align: center; } }
+
 .buttons-unit {
   margin-top: 40px;
   text-align: center; }
@@ -1676,10 +1684,14 @@ input#algolia-doc-search:focus {
   color: #FA6900; }
 
 .buttons-unit .button {
-  font-size: 24px;
   background: #05A5D1;
   color: #fafafa; }
 
+@media screen and (min-width: 600px) {
+  .buttons-unit .button {
+    font-size: 24px; }
+}
+
 .buttons-unit .button:active {
   background: #0485A9; }
 
@@ -1712,15 +1724,11 @@ input#algolia-doc-search:focus {
 
 .showcase {
   margin: 30px auto 30px auto;
-  width: 100%;
+  width: 50%;
   display: inline-block;
   text-align: center;
   vertical-align: top; }
 
-@media only screen and (min-device-width: 768px) and (max-device-width: 1024px) {
-  .showcase {
-    width: 50%; } }
-
 @media only screen and (min-device-width: 1024px) {
   .showcase {
     width: 25%; } }
@@ -1832,6 +1840,10 @@ input#algolia-doc-search:focus {
   display: block;
   text-align: left; }
 
+@media screen and (max-width: 768px) {
+  .entry-share {
+    display: none; } }
+
 .entry-excerpt {
   min-width: 320px;
   max-width: 640px;
@@ -1903,7 +1915,7 @@ article li {
 
 .posted-on {
   font-size: 12px;
-  color: rgba(102, 99, 122, 0.29);
+  color: #9d9b9b;
   margin-bottom: 0;
   margin-top: 15px; }
 
@@ -1918,7 +1930,7 @@ article li {
   color: #5A6B77; }
 
 .name-title .title {
-  color: rgba(102, 99, 122, 0.44); }
+  color: #9d9b9b; }
 
 .btn {
   background: 0 0;

From f8e583b2d01ffdf0f45604bda16b205e2273e790 Mon Sep 17 00:00:00 2001
From: Aaron Chiu <aaronechiu@fb.com>
Date: Tue, 4 Apr 2017 12:44:04 -0700
Subject: [PATCH 302/366] clean out the last used bitmap

Reviewed By: achen1

Differential Revision: D4828134

fbshipit-source-id: bf54f7c9f61016cc0735338f99de7b0378c1234b
---
 .../com/facebook/react/testing/ReactAppTestActivity.java  | 3 +++
 .../facebook/react/testing/ScreenshotingFrameLayout.java  | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java
index 11edda17a429b0..562fdff616c4bb 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java
@@ -100,6 +100,8 @@ protected void onDestroy() {
     if (mReactInstanceManager != null) {
       mReactInstanceManager.destroy();
     }
+
+    mScreenshotingFrameLayout.clean();
   }
 
   public void waitForDestroy(long timeoutMs) throws InterruptedException {
@@ -129,6 +131,7 @@ public void resetRootViewForScreenshotTests() {
     }
     mReactRootView = new ReactRootView(this);
     mScreenshotingFrameLayout.removeAllViews();
+    mScreenshotingFrameLayout.clean();
     mScreenshotingFrameLayout.addView(mReactRootView);
   }
 
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ScreenshotingFrameLayout.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ScreenshotingFrameLayout.java
index ffc648e7915770..8d4da285bf2167 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ScreenshotingFrameLayout.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ScreenshotingFrameLayout.java
@@ -47,6 +47,14 @@ protected void dispatchDraw(Canvas canvas) {
     canvas.drawBitmap(mBitmap, 0, 0, null);
   }
 
+  public void clean() {
+    if (mBitmap != null) {
+      mBitmap.recycle();
+      mBitmap = null;
+    }
+    mCanvas.setBitmap(null);
+  }
+
   private static Bitmap createNewBitmap(Canvas canvas) {
     return Bitmap.createBitmap(canvas.getWidth(), canvas.getHeight(), Bitmap.Config.ARGB_8888);
   }

From 9c5cc145e641410450d1ea2703573ed7e090c342 Mon Sep 17 00:00:00 2001
From: Eric Vicenti <evv@fb.com>
Date: Tue, 4 Apr 2017 13:34:03 -0700
Subject: [PATCH 303/366] Fixwebsite

Summary:
This fixes the website build because docgen was unable to parse this `*`
Closes https://github.com/facebook/react-native/pull/13300

Differential Revision: D4828837

Pulled By: ericvicenti

fbshipit-source-id: 7ebc04241742f7bb5a871e7e438fb23af90a70bd
---
 Libraries/Lists/SectionList.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Libraries/Lists/SectionList.js b/Libraries/Lists/SectionList.js
index 651e3508b2a7b4..d4f9934f9429ea 100644
--- a/Libraries/Lists/SectionList.js
+++ b/Libraries/Lists/SectionList.js
@@ -77,6 +77,7 @@ type OptionalProps<SectionT: SectionBase<any>> = {
    * and as the react key to track item re-ordering. The default extractor checks item.key, then
    * falls back to using the index, like react does.
    */
+
   keyExtractor: (item: Item, index: number) => string,
   /**
    * Called once when the scroll position gets within `onEndReachedThreshold` of the rendered
@@ -247,7 +248,7 @@ class SectionList<SectionT: SectionBase<any>>
     return <List {...this.props} ref={this._captureRef} />;
   }
 
-  _wrapperListRef: MetroListView | VirtualizedSectionList<*>;
+  _wrapperListRef: MetroListView | VirtualizedSectionList<any>;
   _captureRef = (ref) => { this._wrapperListRef = ref; };
 }
 

From c0b64ce519068aa1549f04061b35df34831a2903 Mon Sep 17 00:00:00 2001
From: Aaron Chiu <aaronechiu@fb.com>
Date: Tue, 4 Apr 2017 14:39:00 -0700
Subject: [PATCH 304/366] use Log.d instead of Log.w in
 CatalystInstanceImpl.java

Reviewed By: achen1

Differential Revision: D4829620

fbshipit-source-id: d3648b7b9afdaec30790995e59abe23805fb6b1e
---
 .../com/facebook/react/cxxbridge/CatalystInstanceImpl.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CatalystInstanceImpl.java b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CatalystInstanceImpl.java
index 81f2773befcb34..2db04dff4e893a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CatalystInstanceImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CatalystInstanceImpl.java
@@ -125,7 +125,7 @@ private CatalystInstanceImpl(
     mNativeModulesQueueThread = mReactQueueConfiguration.getNativeModulesQueueThread();
     mTraceListener = new JSProfilerTraceListener(this);
 
-    FLog.w(ReactConstants.TAG, "Initializing React Xplat Bridge before initializeBridge");
+    FLog.d(ReactConstants.TAG, "Initializing React Xplat Bridge before initializeBridge");
     initializeBridge(
       new BridgeCallback(this),
       jsExecutor,
@@ -133,7 +133,7 @@ private CatalystInstanceImpl(
       mNativeModulesQueueThread,
       mJavaRegistry.getJavaModules(this),
       mJavaRegistry.getCxxModules());
-    FLog.w(ReactConstants.TAG, "Initializing React Xplat Bridge after initializeBridge");
+    FLog.d(ReactConstants.TAG, "Initializing React Xplat Bridge after initializeBridge");
     mMainExecutorToken = getMainExecutorToken();
   }
 

From eb300b60f3dd723aa9df4041fb2d7b1ec3446e9a Mon Sep 17 00:00:00 2001
From: "Andrew Y. Chen" <ayc@fb.com>
Date: Tue, 4 Apr 2017 14:58:47 -0700
Subject: [PATCH 305/366] Revert D4770368: [rn] Use tag ids for testID

Differential Revision: D4770368

fbshipit-source-id: 4bf8131a2a2974c8db072f62e8fb26686faa100d
---
 .../src/androidTest/java/com/facebook/react/testing/BUCK | 5 ++---
 .../java/com/facebook/react/testing/ReactTestHelper.java | 7 ++-----
 .../src/main/java/com/facebook/react/uimanager/BUCK      | 1 -
 .../com/facebook/react/uimanager/BaseViewManager.java    | 4 ----
 ReactAndroid/src/main/res/BUCK                           | 9 ---------
 ReactAndroid/src/main/res/views/uimanager/values/ids.xml | 5 -----
 6 files changed, 4 insertions(+), 27 deletions(-)
 delete mode 100644 ReactAndroid/src/main/res/views/uimanager/values/ids.xml

diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
index 57276c344fbe4a..bb7c09790294af 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
@@ -21,8 +21,6 @@ android_library(
         react_native_dep("third-party/java/junit:junit"),
         react_native_dep("third-party/java/mockito:mockito"),
         react_native_dep("third-party/java/testing-support-lib:runner"),
-        react_native_integration_tests_target("java/com/facebook/react/testing/idledetection:idledetection"),
-        react_native_integration_tests_target("java/com/facebook/react/testing/network:network"),
         react_native_target("java/com/facebook/react:react"),
         react_native_target("java/com/facebook/react/bridge:bridge"),
         react_native_target("java/com/facebook/react/common:common"),
@@ -34,6 +32,7 @@ android_library(
         react_native_target("java/com/facebook/react/modules/debug:interfaces"),
         react_native_target("java/com/facebook/react/shell:shell"),
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
-        react_native_target("res:uimanager"),
+        react_native_integration_tests_target("java/com/facebook/react/testing/idledetection:idledetection"),
+        react_native_integration_tests_target("java/com/facebook/react/testing/network:network"),
     ],
 )
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestHelper.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestHelper.java
index 6250d24148e4e1..8054dff33d8161 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestHelper.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestHelper.java
@@ -17,7 +17,6 @@
 import android.view.ViewGroup;
 
 import com.facebook.react.NativeModuleRegistryBuilder;
-import com.facebook.react.R;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactInstanceManagerBuilder;
 import com.facebook.react.bridge.CatalystInstance;
@@ -188,9 +187,7 @@ public static View getViewWithReactTestId(View rootView, String testId) {
   }
 
   public static String getTestId(View view) {
-    return view.getTag(R.id.react_test_id) instanceof String
-      ? (String) view.getTag(R.id.react_test_id)
-      : null;
+    return view.getTag() instanceof String ? (String) view.getTag() : null;
   }
 
   private static View findChild(View root, Predicate<View> predicate) {
@@ -214,7 +211,7 @@ private static Predicate<View> hasTagValue(final String tagValue) {
     return new Predicate<View>() {
       @Override
       public boolean apply(View view) {
-        Object tag = getTestId(view);
+        Object tag = view.getTag();
         return tag != null && tag.equals(tagValue);
       }
     };
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK
index c75b10b0ddf413..954f2528f9229a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK
@@ -26,6 +26,5 @@ android_library(
         react_native_target("java/com/facebook/react/modules/i18nmanager:i18nmanager"),
         react_native_target("java/com/facebook/react/touch:touch"),
         react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
-        react_native_target("res:uimanager"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
index 16c85690a1bdf8..24192175df1232 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
@@ -5,7 +5,6 @@
 import android.graphics.Color;
 import android.os.Build;
 import android.view.View;
-import com.facebook.react.R;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.uimanager.annotations.ReactProp;
 
@@ -86,9 +85,6 @@ public void setRenderToHardwareTexture(T view, boolean useHWTexture) {
 
   @ReactProp(name = PROP_TEST_ID)
   public void setTestId(T view, String testId) {
-    view.setTag(R.id.react_test_id, testId);
-
-    // temporarily set the tag and keyed tags to avoid end to end test regressions
     view.setTag(testId);
   }
 
diff --git a/ReactAndroid/src/main/res/BUCK b/ReactAndroid/src/main/res/BUCK
index cbb610cc217caa..bfe2eaaa300575 100644
--- a/ReactAndroid/src/main/res/BUCK
+++ b/ReactAndroid/src/main/res/BUCK
@@ -26,12 +26,3 @@ android_resource(
         "PUBLIC",
     ],
 )
-
-android_resource(
-    name = "uimanager",
-    package = "com.facebook.react",
-    res = "views/uimanager",
-    visibility = [
-        "PUBLIC",
-    ],
-)
diff --git a/ReactAndroid/src/main/res/views/uimanager/values/ids.xml b/ReactAndroid/src/main/res/views/uimanager/values/ids.xml
deleted file mode 100644
index 8744d7cad248db..00000000000000
--- a/ReactAndroid/src/main/res/views/uimanager/values/ids.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <!-- tag is used to store the testID tag -->
-  <item type="id" name="react_test_id"/>
-</resources>

From ff95805657a4e8c1b48b863fdde75528616b561b Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieter.debaets@gmail.com>
Date: Tue, 4 Apr 2017 15:22:44 -0700
Subject: [PATCH 306/366] Fix YGEnums references in ReactCxx.xcodeproj

Summary:
cc ericvicenti
Closes https://github.com/facebook/react-native/pull/13301

Differential Revision: D4830381

Pulled By: ericvicenti

fbshipit-source-id: 866864ac34f6c873c1646e59cd0245b3f6634d7e
---
 React/ReactCxx.xcodeproj/project.pbxproj | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/React/ReactCxx.xcodeproj/project.pbxproj b/React/ReactCxx.xcodeproj/project.pbxproj
index e39212a8cbffba..7dd721d644fc6a 100644
--- a/React/ReactCxx.xcodeproj/project.pbxproj
+++ b/React/ReactCxx.xcodeproj/project.pbxproj
@@ -910,6 +910,10 @@
 		3DC159E41E83E1AE007B1282 /* RCTRootContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59A7B9FC1E577DBF0068EDBF /* RCTRootContentView.m */; };
 		3DC159E51E83E1E9007B1282 /* JSBigString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27B958731E57587D0096647A /* JSBigString.cpp */; };
 		3DC159E61E83E1FA007B1282 /* JSBigString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27B958731E57587D0096647A /* JSBigString.cpp */; };
+		3DCC92B91E94456500EF89A8 /* YGNodeList.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 130A77061DF767AF001F9587 /* YGNodeList.h */; };
+		3DCC92BC1E94459100EF89A8 /* YGEnums.c in Sources */ = {isa = PBXBuildFile; fileRef = 3DCC92BA1E94458B00EF89A8 /* YGEnums.c */; };
+		3DCC92BD1E94459100EF89A8 /* YGEnums.c in Sources */ = {isa = PBXBuildFile; fileRef = 3DCC92BA1E94458B00EF89A8 /* YGEnums.c */; };
+		3DCC92BE1E9445B100EF89A8 /* YGNodeList.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 130A77061DF767AF001F9587 /* YGNodeList.h */; };
 		3DCD185D1DF978E7007FE5A1 /* RCTReloadCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = A2440AA11DF8D854006E7BFC /* RCTReloadCommand.m */; };
 		3DDEC1521DDCE0CA0020BBDF /* JSCSamplingProfiler.m in Sources */ = {isa = PBXBuildFile; fileRef = 369123E01DDC75850095B341 /* JSCSamplingProfiler.m */; };
 		3DE4F8681DF85D8E00B9E5A0 /* YGEnums.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 130A77031DF767AF001F9587 /* YGEnums.h */; };
@@ -1179,6 +1183,7 @@
 			dstPath = include/yoga;
 			dstSubfolderSpec = 16;
 			files = (
+				3DCC92BE1E9445B100EF89A8 /* YGNodeList.h in Copy Headers */,
 				3DFE0D1A1DF8575800459392 /* YGEnums.h in Copy Headers */,
 				3DFE0D1B1DF8575800459392 /* YGMacros.h in Copy Headers */,
 				3DFE0D1C1DF8575800459392 /* Yoga.h in Copy Headers */,
@@ -1371,6 +1376,7 @@
 			dstPath = include/yoga;
 			dstSubfolderSpec = 16;
 			files = (
+				3DCC92B91E94456500EF89A8 /* YGNodeList.h in Copy Headers */,
 				3DE4F8681DF85D8E00B9E5A0 /* YGEnums.h in Copy Headers */,
 				3DE4F8691DF85D8E00B9E5A0 /* YGMacros.h in Copy Headers */,
 				3DE4F86A1DF85D8E00B9E5A0 /* Yoga.h in Copy Headers */,
@@ -1752,6 +1758,7 @@
 		3D92B10C1E0369AD0018521A /* Value.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Value.cpp; sourceTree = "<group>"; };
 		3D92B10D1E0369AD0018521A /* Value.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Value.h; sourceTree = "<group>"; };
 		3DB910701C74B21600838BBE /* RCTWebSocketObserverProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTWebSocketObserverProtocol.h; sourceTree = "<group>"; };
+		3DCC92BA1E94458B00EF89A8 /* YGEnums.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = YGEnums.c; sourceTree = "<group>"; };
 		3EDCA8A21D3591E700450C31 /* RCTErrorCustomizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTErrorCustomizer.h; sourceTree = "<group>"; };
 		3EDCA8A31D3591E700450C31 /* RCTErrorInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTErrorInfo.h; sourceTree = "<group>"; };
 		3EDCA8A41D3591E700450C31 /* RCTErrorInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTErrorInfo.m; sourceTree = "<group>"; };
@@ -1875,6 +1882,7 @@
 		130A77021DF767AF001F9587 /* yoga */ = {
 			isa = PBXGroup;
 			children = (
+				3DCC92BA1E94458B00EF89A8 /* YGEnums.c */,
 				130A77031DF767AF001F9587 /* YGEnums.h */,
 				130A77041DF767AF001F9587 /* YGMacros.h */,
 				130A77051DF767AF001F9587 /* YGNodeList.c */,
@@ -3327,6 +3335,7 @@
 			files = (
 				13AB5E011DF777F2001A8C30 /* YGNodeList.c in Sources */,
 				13AB5E021DF777F2001A8C30 /* Yoga.c in Sources */,
+				3DCC92BC1E94459100EF89A8 /* YGEnums.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3336,6 +3345,7 @@
 			files = (
 				3DFE0D1D1DF857FF00459392 /* YGNodeList.c in Sources */,
 				3DFE0D1E1DF857FF00459392 /* Yoga.c in Sources */,
+				3DCC92BD1E94459100EF89A8 /* YGEnums.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

From d8f23f79c736812c6da2af5a637eb29bf62510e4 Mon Sep 17 00:00:00 2001
From: Fred Blau <blau@hometeamcare.com>
Date: Tue, 4 Apr 2017 16:37:44 -0700
Subject: [PATCH 307/366] Allow specifying an appIdSuffix to run-android

Summary:
Motivation

Currently react-native run-android instals and starts your app, but if you have more than one variant, it doesn't know which one to start.  This allows developers to pass in the suffix specified in build.gradle, so that the correct app is started.

Test Plan

verify that `react-native run-android` runs properly
verify that `react-native run-android --appIdSuffix validSuffix` runs properly
Closes https://github.com/facebook/react-native/pull/13169

Differential Revision: D4823391

Pulled By: ericvicenti

fbshipit-source-id: 31ed35fd79403804b4781e81eb49f1c4627d7f8e
---
 local-cli/runAndroid/runAndroid.js | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/local-cli/runAndroid/runAndroid.js b/local-cli/runAndroid/runAndroid.js
index 5cc2b13bc9f172..5cf9d8eba1cc28 100644
--- a/local-cli/runAndroid/runAndroid.js
+++ b/local-cli/runAndroid/runAndroid.js
@@ -90,24 +90,26 @@ function buildAndRun(args) {
       'utf8'
     ).match(/package="(.+?)"/)[1];
 
+  const packageNameWithSuffix = args.appIdSuffix ? packageName + '.' + args.appIdSuffix : packageName;
+
   const adbPath = getAdbPath();
   if (args.deviceId) {
     if (isString(args.deviceId)) {
-        runOnSpecificDevice(args, cmd, packageName, adbPath);
+        runOnSpecificDevice(args, cmd, packageNameWithSuffix, packageName, adbPath);
     } else {
       console.log(chalk.red('Argument missing for parameter --deviceId'));
     }
   } else {
-    runOnAllDevices(args, cmd, packageName, adbPath);
+    runOnAllDevices(args, cmd, packageNameWithSuffix, packageName, adbPath);
   }
 }
 
-function runOnSpecificDevice(args, gradlew, packageName, adbPath) {
+function runOnSpecificDevice(args, gradlew, packageNameWithSuffix, packageName, adbPath) {
   let devices = adb.getDevices();
   if (devices && devices.length > 0) {
     if (devices.indexOf(args.deviceId) !== -1) {
       buildApk(gradlew);
-      installAndLaunchOnDevice(args, args.deviceId, packageName, adbPath);
+      installAndLaunchOnDevice(args, args.deviceId, packageNameWithSuffix, packageName, adbPath);
     } else {
       console.log('Could not find device with the id: "' + args.deviceId + '".');
       console.log('Choose one of the following:');
@@ -150,9 +152,9 @@ function tryInstallAppOnDevice(args, device) {
   }
 }
 
-function tryLaunchAppOnDevice(device, packageName, adbPath, mainActivity) {
+function tryLaunchAppOnDevice(device, packageNameWithSuffix, packageName, adbPath, mainActivity) {
   try {
-    const adbArgs = ['-s', device, 'shell', 'am', 'start', '-n', packageName + '/.' + mainActivity];
+    const adbArgs = ['-s', device, 'shell', 'am', 'start', '-n', packageNameWithSuffix + '/' + packageName + '.' + mainActivity];
     console.log(chalk.bold(
       `Starting the app on ${device} (${adbPath} ${adbArgs.join(' ')})...`
     ));
@@ -164,13 +166,13 @@ function tryLaunchAppOnDevice(device, packageName, adbPath, mainActivity) {
   }
 }
 
-function installAndLaunchOnDevice(args, selectedDevice, packageName, adbPath) {
+function installAndLaunchOnDevice(args, selectedDevice, packageNameWithSuffix, packageName, adbPath) {
   tryRunAdbReverse(selectedDevice);
   tryInstallAppOnDevice(args, selectedDevice);
-  tryLaunchAppOnDevice(selectedDevice, packageName, adbPath, args.mainActivity);
+  tryLaunchAppOnDevice(selectedDevice, packageNameWithSuffix, packageName, adbPath, args.mainActivity);
 }
 
-function runOnAllDevices(args, cmd, packageName, adbPath){
+function runOnAllDevices(args, cmd, packageNameWithSuffix, packageName, adbPath){
   try {
     const gradleArgs = [];
     if (args.variant) {
@@ -215,14 +217,14 @@ function runOnAllDevices(args, cmd, packageName, adbPath){
     if (devices && devices.length > 0) {
       devices.forEach((device) => {
         tryRunAdbReverse(device);
-        tryLaunchAppOnDevice(device, packageName, adbPath, args.mainActivity);
+        tryLaunchAppOnDevice(device, packageNameWithSuffix, packageName, adbPath, args.mainActivity);
       });
     } else {
       try {
         // If we cannot execute based on adb devices output, fall back to
         // shell am start
         const fallbackAdbArgs = [
-          'shell', 'am', 'start', '-n', packageName + '/.MainActivity'
+          'shell', 'am', 'start', '-n', packageNameWithSuffix + '/' + packageName + '.MainActivity'
         ];
         console.log(chalk.bold(
           `Starting the app (${adbPath} ${fallbackAdbArgs.join(' ')}...`
@@ -286,6 +288,10 @@ module.exports = {
     description: '--flavor has been deprecated. Use --variant instead',
   }, {
     command: '--variant [string]',
+  }, {
+    command: '--appIdSuffix [string]',
+    description: 'Specify an applicationIdSuffix to launch after build.',
+    default: '',
   }, {
     command: '--main-activity [string]',
     description: 'Name of the activity to start',

From 36c599b2e0c759fcfb1c8fd307e629c51c7318d6 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <bvaughn@fb.com>
Date: Tue, 4 Apr 2017 16:50:59 -0700
Subject: [PATCH 308/366] ReactNativeFiber renderer type-fix for leaf node
 children

Reviewed By: sebmarkbage

Differential Revision: D4830872

fbshipit-source-id: 6e1a476c921ffff8f720fd9b81da65cb1e724eef
---
 .../src/renderers/native/ReactNativeFiber.js    | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeFiber.js b/Libraries/Renderer/src/renderers/native/ReactNativeFiber.js
index 0b05e0d32a54fa..b770c7ae52fda8 100644
--- a/Libraries/Renderer/src/renderers/native/ReactNativeFiber.js
+++ b/Libraries/Renderer/src/renderers/native/ReactNativeFiber.js
@@ -72,11 +72,16 @@ const NativeRenderer = ReactFiberReconciler({
     parentInstance: Instance | Container,
     child: Instance | TextInstance,
   ): void {
+
+    const childTag = typeof child === 'number'
+      ? child
+      : child._nativeTag;
+
     if (typeof parentInstance === 'number') {
       // Root container
       UIManager.setChildren(
         parentInstance, // containerTag
-        [(child: any)._nativeTag], // reactTags
+        [childTag], // reactTags
       );
     } else {
       const children = parentInstance._children;
@@ -87,7 +92,7 @@ const NativeRenderer = ReactFiberReconciler({
         parentInstance._nativeTag, // containerTag
         [], // moveFromIndices
         [], // moveToIndices
-        [(child: any)._nativeTag], // addChildReactTags
+        [childTag], // addChildReactTags
         [children.length - 1], // addAtIndices
         [], // removeAtIndices
       );
@@ -141,7 +146,7 @@ const NativeRenderer = ReactFiberReconciler({
     );
 
     UIManager.updateView(
-      (instance: any)._nativeTag, // reactTag
+      instance._nativeTag, // reactTag
       viewConfig.uiViewClassName, // viewName
       updatePayload, // props
     );
@@ -282,11 +287,15 @@ const NativeRenderer = ReactFiberReconciler({
     } else {
       children.splice(beforeChildIndex, 0, child);
 
+      const childTag = typeof child === 'number'
+        ? child
+        : child._nativeTag;
+
       UIManager.manageChildren(
         (parentInstance: any)._nativeTag, // containerID
         [], // moveFromIndices
         [], // moveToIndices
-        [(child: any)._nativeTag], // addChildReactTags
+        [childTag], // addChildReactTags
         [beforeChildIndex], // addAtIndices
         [], // removeAtIndices
       );

From b31704bcfb5170f7f9acb6b63070f884c9b2063f Mon Sep 17 00:00:00 2001
From: Brent Vatne <brentvatne@gmail.com>
Date: Tue, 4 Apr 2017 22:01:18 -0700
Subject: [PATCH 309/366] Update issue template for Sketch -> Snack rename

Summary:
[We changed the name from Sketch to Snack](https://blog.expo.io/expo-sketch-expo-snack-a444f8dec72b)

It's just some text in the issue template :)

- Make it clear on the Snack website which version of react-native you are using. Right now we make it possible to pick SDK versions but it's not at all obvious which react-native version that maps to.
Closes https://github.com/facebook/react-native/pull/13304

Differential Revision: D4833399

Pulled By: ericvicenti

fbshipit-source-id: 25b1fe8b4b1ac7db6737e1ba8f611ad4d8dc3804
---
 .github/ISSUE_TEMPLATE.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 4359d355b84200..ccdf0f9c51f770 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -14,8 +14,8 @@ Explain what you did, what you expected to happen, and what actually happens.
 
 ### Reproduction Steps and Sample Code
 
-Try to reproduce your bug on https://sketch.expo.io/ and provide a link. 
-If you can't reproduce the bug on Sketch, provide a sample project. At the very least, provide an example of your code.
+Try to reproduce your bug on https://snack.expo.io/ and provide a link. 
+If you can't reproduce the bug on Snack, provide a sample project. At the very least, provide an example of your code.
 
 ### Solution
 

From 2b0282aa69c0bc999aef9444bff7e1dfa54cac48 Mon Sep 17 00:00:00 2001
From: daose <bychen@uwaterloo.ca>
Date: Tue, 4 Apr 2017 22:16:23 -0700
Subject: [PATCH 310/366] #11587 invoke error for getCurrentLocation

Summary:
It started with https://github.com/facebook/react-native/issues/11587, which reported that the error returned by `getCurrentLocation` did not match the spec.

This resulted in PR https://github.com/facebook/react-native/pull/11723, which did not get merged because it was said by ide and mkonicek that simply emitting the error will cause it to hang since the `error` callback was never invoked.

However, it seems like somewhere along the way PR https://github.com/facebook/react-native/pull/13140 got merged in which did exactly that.

Since it now matches the spec, turning off location services on Android then running the below example code from [Geolocation](https://developer.mozilla.org/en-US/docs/Web/API/Geolocation/getCurrentPosition) docs errors out correctly.

```javascript
var options = {
  enableHighAccuracy: true,
  timeout: 5000,
  maximumAge: 0
};

function success(pos) {
  var crd = pos.coords;

  console.log('Your current po
Closes https://github.com/facebook/react-native/pull/13306

Differential Revision: D4833377

Pulled By: ericvicenti

fbshipit-source-id: dbea5948790a3f521751a0cc0a25f0e323b30667
---
 .../com/facebook/react/modules/location/LocationModule.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/location/LocationModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/location/LocationModule.java
index 866309241258f8..a09ebc2368add5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/location/LocationModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/location/LocationModule.java
@@ -123,7 +123,9 @@ public void getCurrentPosition(
           (LocationManager) getReactApplicationContext().getSystemService(Context.LOCATION_SERVICE);
       String provider = getValidProvider(locationManager, locationOptions.highAccuracy);
       if (provider == null) {
-        emitError(PositionError.PERMISSION_DENIED, "No location provider available.");
+        error.invoke(PositionError.buildError(
+                PositionError.PERMISSION_DENIED,
+                "No location provider available."));
         return;
       }
       Location location = locationManager.getLastKnownLocation(provider);

From 0ec9c93eeb88146fe2496492101198f71bd1465f Mon Sep 17 00:00:00 2001
From: "Andrew Y. Chen" <ayc@fb.com>
Date: Tue, 4 Apr 2017 22:51:39 -0700
Subject: [PATCH 311/366] Add comment about adding new resource directories

Reviewed By: ericvicenti

Differential Revision: D4833151

fbshipit-source-id: 64ad77e7c4d277f19d1c545dc1d75ab870ddd49e
---
 ReactAndroid/src/main/res/BUCK | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ReactAndroid/src/main/res/BUCK b/ReactAndroid/src/main/res/BUCK
index bfe2eaaa300575..5a8113ff8cd892 100644
--- a/ReactAndroid/src/main/res/BUCK
+++ b/ReactAndroid/src/main/res/BUCK
@@ -26,3 +26,5 @@ android_resource(
         "PUBLIC",
     ],
 )
+
+# New resource directories must be added to react-native-github/ReactAndroid/build.gradle

From a893d0bb231189d5330a28e9256a6ff5e56e5dab Mon Sep 17 00:00:00 2001
From: Marc Horowitz <mhorowitz@fb.com>
Date: Wed, 5 Apr 2017 00:51:55 -0700
Subject: [PATCH 312/366] Refactor CxxModuleWrapper to support different use
 cases

Reviewed By: javache

Differential Revision: D4807680

fbshipit-source-id: 48eccfb382814a0c4082f56617e0359e61345da7
---
 .../react/cxxbridge/CxxModuleWrapper.java     | 61 +++----------------
 .../react/cxxbridge/CxxModuleWrapperBase.java | 60 ++++++++++++++++++
 .../react/cxxbridge/NativeModuleRegistry.java |  4 +-
 ReactAndroid/src/main/jni/xreact/jni/BUCK     |  2 +
 .../main/jni/xreact/jni/CxxModuleWrapper.cpp  | 23 +++----
 .../main/jni/xreact/jni/CxxModuleWrapper.h    | 36 ++++-------
 .../jni/xreact/jni/CxxModuleWrapperBase.h     | 43 +++++++++++++
 .../jni/xreact/jni/CxxSharedModuleWrapper.h   | 33 ++++++++++
 .../jni/xreact/jni/ModuleRegistryBuilder.cpp  |  4 +-
 .../src/main/jni/xreact/jni/OnLoad.cpp        |  2 +
 .../src/main/jni/xreact/perftests/OnLoad.cpp  |  6 +-
 11 files changed, 176 insertions(+), 98 deletions(-)
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CxxModuleWrapperBase.java
 create mode 100644 ReactAndroid/src/main/jni/xreact/jni/CxxModuleWrapperBase.h
 create mode 100644 ReactAndroid/src/main/jni/xreact/jni/CxxSharedModuleWrapper.h

diff --git a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CxxModuleWrapper.java b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CxxModuleWrapper.java
index 93f8006cefa009..c576290b81c08b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CxxModuleWrapper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CxxModuleWrapper.java
@@ -2,70 +2,25 @@
 
 package com.facebook.react.cxxbridge;
 
-import java.util.Map;
-
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
-import com.facebook.react.bridge.CatalystInstance;
-import com.facebook.react.bridge.ExecutorToken;
-import com.facebook.react.bridge.NativeModule;
-import com.facebook.react.bridge.ReadableNativeArray;
 import com.facebook.soloader.SoLoader;
 
 /**
- * A Java Object which represents a cross-platform C++ module
- *
- * This module implements the NativeModule interface but will never be invoked from Java,
- * instead the underlying Cxx module will be extracted by the bridge and called directly.
+ * This does nothing interesting, except avoid breaking existing code.
  */
 @DoNotStrip
-public class CxxModuleWrapper implements NativeModule
+public class CxxModuleWrapper extends CxxModuleWrapperBase
 {
-  static {
-    SoLoader.loadLibrary(CatalystInstanceImpl.REACT_NATIVE_LIB);
+  protected CxxModuleWrapper(HybridData hd) {
+    super(hd);
   }
 
-  @DoNotStrip
-  private HybridData mHybridData;
+  private static native CxxModuleWrapper makeDsoNative(String soPath, String factory);
 
-  public CxxModuleWrapper(String library, String factory) {
+  public static CxxModuleWrapper makeDso(String library, String factory) {
     SoLoader.loadLibrary(library);
-    mHybridData =
-      initHybrid(SoLoader.unpackLibraryAndDependencies(library).getAbsolutePath(), factory);
-  }
-
-  @Override
-  public native String getName();
-
-  @Override
-  public Map<String, NativeMethod> getMethods() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void initialize() {
-    // do nothing
-  }
-
-  @Override
-  public boolean canOverrideExistingModule() {
-    return false;
+    String soPath = SoLoader.unpackLibraryAndDependencies(library).getAbsolutePath();
+    return makeDsoNative(soPath, factory);
   }
-
-  @Override
-  public boolean supportsWebWorkers() {
-    return false;
-  }
-
-  @Override
-  public void onCatalystInstanceDestroy() {
-    mHybridData.resetNative();
-  }
-
-  // For creating a wrapper from C++, or from a derived class.
-  protected CxxModuleWrapper(HybridData hd) {
-    mHybridData = hd;
-  }
-
-  private native HybridData initHybrid(String soPath, String factory);
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CxxModuleWrapperBase.java b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CxxModuleWrapperBase.java
new file mode 100644
index 00000000000000..acb06c0e0347d1
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CxxModuleWrapperBase.java
@@ -0,0 +1,60 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+package com.facebook.react.cxxbridge;
+
+import java.util.Map;
+
+import com.facebook.jni.HybridData;
+import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.soloader.SoLoader;
+
+/**
+ * A Java Object which represents a cross-platform C++ module
+ *
+ * This module implements the NativeModule interface but will never be invoked from Java,
+ * instead the underlying Cxx module will be extracted by the bridge and called directly.
+ */
+@DoNotStrip
+public class CxxModuleWrapperBase implements NativeModule
+{
+  static {
+    SoLoader.loadLibrary(CatalystInstanceImpl.REACT_NATIVE_LIB);
+  }
+
+  @DoNotStrip
+  private HybridData mHybridData;
+
+  @Override
+  public native String getName();
+
+  @Override
+  public Map<String, NativeMethod> getMethods() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public void initialize() {
+    // do nothing
+  }
+
+  @Override
+  public boolean canOverrideExistingModule() {
+    return false;
+  }
+
+  @Override
+  public boolean supportsWebWorkers() {
+    return false;
+  }
+
+  @Override
+  public void onCatalystInstanceDestroy() {
+    mHybridData.resetNative();
+  }
+
+  // For creating a wrapper from C++, or from a derived class.
+  protected CxxModuleWrapperBase(HybridData hd) {
+    mHybridData = hd;
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/NativeModuleRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/NativeModuleRegistry.java
index 140c4efdb328d2..112f45cb0ad736 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/NativeModuleRegistry.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/NativeModuleRegistry.java
@@ -46,7 +46,7 @@ public NativeModuleRegistry(
     ArrayList<JavaModuleWrapper> javaModules = new ArrayList<>();
     for (Map.Entry<Class<? extends NativeModule>, ModuleHolder> entry : mModules.entrySet()) {
       Class<?> type = entry.getKey();
-      if (!CxxModuleWrapper.class.isAssignableFrom(type)) {
+      if (!CxxModuleWrapperBase.class.isAssignableFrom(type)) {
         javaModules.add(new JavaModuleWrapper(jsInstance, entry.getValue()));
       }
     }
@@ -57,7 +57,7 @@ public NativeModuleRegistry(
     ArrayList<ModuleHolder> cxxModules = new ArrayList<>();
     for (Map.Entry<Class<? extends NativeModule>, ModuleHolder> entry : mModules.entrySet()) {
       Class<?> type = entry.getKey();
-      if (CxxModuleWrapper.class.isAssignableFrom(type)) {
+      if (CxxModuleWrapperBase.class.isAssignableFrom(type)) {
         cxxModules.add(entry.getValue());
       }
     }
diff --git a/ReactAndroid/src/main/jni/xreact/jni/BUCK b/ReactAndroid/src/main/jni/xreact/jni/BUCK
index f58ec9e4b277d1..344814039e0b45 100644
--- a/ReactAndroid/src/main/jni/xreact/jni/BUCK
+++ b/ReactAndroid/src/main/jni/xreact/jni/BUCK
@@ -2,6 +2,8 @@ include_defs("//ReactAndroid/DEFS")
 
 EXPORTED_HEADERS = [
     "CxxModuleWrapper.h",
+    "CxxModuleWrapperBase.h",
+    "CxxSharedModuleWrapper.h",
     "JavaModuleWrapper.h",
     "JExecutorToken.h",
     "JSLoader.h",
diff --git a/ReactAndroid/src/main/jni/xreact/jni/CxxModuleWrapper.cpp b/ReactAndroid/src/main/jni/xreact/jni/CxxModuleWrapper.cpp
index 82c7ada5c4123e..a5650ba76ad0f6 100644
--- a/ReactAndroid/src/main/jni/xreact/jni/CxxModuleWrapper.cpp
+++ b/ReactAndroid/src/main/jni/xreact/jni/CxxModuleWrapper.cpp
@@ -2,27 +2,18 @@
 
 #include "CxxModuleWrapper.h"
 
-#include <fb/fbjni.h>
-#include <fb/Environment.h>
-
 #include <folly/ScopeGuard.h>
 
-#include <cxxreact/CxxModule.h>
-
 #include <dlfcn.h>
 
 using namespace facebook::jni;
 using namespace facebook::xplat::module;
-using namespace facebook::react;
 
-void CxxModuleWrapper::registerNatives() {
-  registerHybrid({
-    makeNativeMethod("initHybrid", CxxModuleWrapper::initHybrid),
-    makeNativeMethod("getName", CxxModuleWrapper::getName)
-  });
-}
+namespace facebook {
+namespace react {
 
-CxxModuleWrapper::CxxModuleWrapper(const std::string& soPath, const std::string& fname) {
+jni::local_ref<CxxModuleWrapper::javaobject> CxxModuleWrapper::makeDsoNative(
+    jni::alias_ref<jclass>, const std::string& soPath, const std::string& fname) {
   // soPath is the path of a library which has already been loaded by
   // java SoLoader.loadLibrary().  So this returns the same handle,
   // and increments the reference counter.  We can't just use
@@ -46,9 +37,9 @@ CxxModuleWrapper::CxxModuleWrapper(const std::string& soPath, const std::string&
                           fname.c_str(), soPath.c_str());
   }
   auto factory = reinterpret_cast<CxxModule* (*)()>(sym);
-  module_.reset((*factory)());
+
+  return CxxModuleWrapper::newObjectCxxArgs(std::unique_ptr<CxxModule>((*factory)()));
 }
 
-std::string CxxModuleWrapper::getName() {
-  return module_->getName();
+}
 }
diff --git a/ReactAndroid/src/main/jni/xreact/jni/CxxModuleWrapper.h b/ReactAndroid/src/main/jni/xreact/jni/CxxModuleWrapper.h
index 1d5e8ed0c43c95..11551e3dfaae7a 100644
--- a/ReactAndroid/src/main/jni/xreact/jni/CxxModuleWrapper.h
+++ b/ReactAndroid/src/main/jni/xreact/jni/CxxModuleWrapper.h
@@ -2,43 +2,31 @@
 
 #pragma once
 
-#include <memory>
-#include <string>
-#include <vector>
-
-#include <cxxreact/CxxModule.h>
-#include <fb/fbjni.h>
+#include "CxxModuleWrapperBase.h"
 
 namespace facebook {
 namespace react {
 
-struct JNativeModule : jni::JavaClass<JNativeModule> {
-  constexpr static const char *const kJavaDescriptor =
-    "Lcom/facebook/react/bridge/NativeModule;";
-};
-
-class CxxModuleWrapper :
-    public jni::HybridClass<CxxModuleWrapper, JNativeModule> {
+class CxxModuleWrapper : public jni::HybridClass<CxxModuleWrapper, CxxModuleWrapperBase> {
 public:
   constexpr static const char *const kJavaDescriptor =
     "Lcom/facebook/react/cxxbridge/CxxModuleWrapper;";
 
-  static void registerNatives();
+  static void registerNatives() {
+    registerHybrid({
+      makeNativeMethod("makeDsoNative", CxxModuleWrapper::makeDsoNative)
+    });
+  }
 
-  CxxModuleWrapper(const std::string& soPath, const std::string& fname);
+  static jni::local_ref<CxxModuleWrapper::javaobject> makeDsoNative(
+    jni::alias_ref<jclass>, const std::string& soPath, const std::string& fname);
 
-  static jni::local_ref<jhybriddata> initHybrid(
-      jni::alias_ref<jhybridobject>, const std::string& soPath, const std::string& fname) {
-    return makeCxxInstance(soPath, fname);
+  std::string getName() override {
+    return module_->getName();
   }
 
-  // JNI methods
-  std::string getName();
-
   // This steals ownership of the underlying module for use by the C++ bridge
-  std::unique_ptr<xplat::module::CxxModule> getModule() {
-    // TODO mhorowitz: remove this (and a lot of other code) once the java
-    // bridge is dead.
+  std::unique_ptr<xplat::module::CxxModule> getModule() override {
     return std::move(module_);
   }
 
diff --git a/ReactAndroid/src/main/jni/xreact/jni/CxxModuleWrapperBase.h b/ReactAndroid/src/main/jni/xreact/jni/CxxModuleWrapperBase.h
new file mode 100644
index 00000000000000..7ae922e4ad9ca3
--- /dev/null
+++ b/ReactAndroid/src/main/jni/xreact/jni/CxxModuleWrapperBase.h
@@ -0,0 +1,43 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+#pragma once
+
+#include <memory>
+#include <string>
+
+#include <cxxreact/CxxModule.h>
+#include <fb/fbjni.h>
+
+namespace facebook {
+namespace react {
+
+struct JNativeModule : jni::JavaClass<JNativeModule> {
+  constexpr static const char *const kJavaDescriptor =
+    "Lcom/facebook/react/bridge/NativeModule;";
+};
+
+/**
+ * The C++ part of a CxxModuleWrapper is not a unique class, but it
+ * must extend this base class.
+ */
+class CxxModuleWrapperBase
+  : public jni::HybridClass<CxxModuleWrapperBase, JNativeModule> {
+public:
+  constexpr static const char *const kJavaDescriptor =
+    "Lcom/facebook/react/cxxbridge/CxxModuleWrapperBase;";
+
+  static void registerNatives() {
+    registerHybrid({
+      makeNativeMethod("getName", CxxModuleWrapperBase::getName)
+    });
+  }
+
+  // JNI method
+  virtual std::string getName() = 0;
+
+  // Called by ModuleRegistryBuilder
+  virtual std::unique_ptr<xplat::module::CxxModule> getModule() = 0;
+};
+
+}
+}
diff --git a/ReactAndroid/src/main/jni/xreact/jni/CxxSharedModuleWrapper.h b/ReactAndroid/src/main/jni/xreact/jni/CxxSharedModuleWrapper.h
new file mode 100644
index 00000000000000..81ca0a200193df
--- /dev/null
+++ b/ReactAndroid/src/main/jni/xreact/jni/CxxSharedModuleWrapper.h
@@ -0,0 +1,33 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+#pragma once
+
+#include <cxxreact/SharedProxyCxxModule.h>
+
+#include "CxxModuleWrapperBase.h"
+
+namespace facebook {
+namespace react {
+
+class CxxSharedModuleWrapper: public CxxModuleWrapperBase {
+ public:
+  std::string getName() override {
+    return shared_->getName();
+  }
+
+  std::unique_ptr<xplat::module::CxxModule> getModule() override {
+    // Instead of just moving out the stored CxxModule, this creates a
+    // proxy which passes calls to the shared stored CxxModule.
+
+    return std::make_unique<xplat::module::SharedProxyCxxModule>(shared_);
+  }
+
+protected:
+  explicit CxxSharedModuleWrapper(std::unique_ptr<xplat::module::CxxModule> module)
+    : shared_(std::move(module)) {}
+
+  std::shared_ptr<xplat::module::CxxModule> shared_;
+};
+
+}
+}
diff --git a/ReactAndroid/src/main/jni/xreact/jni/ModuleRegistryBuilder.cpp b/ReactAndroid/src/main/jni/xreact/jni/ModuleRegistryBuilder.cpp
index 95e33b71410e93..8633f783350036 100644
--- a/ReactAndroid/src/main/jni/xreact/jni/ModuleRegistryBuilder.cpp
+++ b/ReactAndroid/src/main/jni/xreact/jni/ModuleRegistryBuilder.cpp
@@ -21,9 +21,9 @@ xplat::module::CxxModule::Provider ModuleHolder::getProvider() const {
     // This is the call which uses the lazy Java Provider to instantiate the
     // Java CxxModuleWrapper which contains the CxxModule.
     auto module = method(self);
-    CHECK(module->isInstanceOf(CxxModuleWrapper::javaClassStatic()))
+    CHECK(module->isInstanceOf(CxxModuleWrapperBase::javaClassStatic()))
       << "module isn't a C++ module";
-    auto cxxModule = jni::static_ref_cast<CxxModuleWrapper::javaobject>(module);
+    auto cxxModule = jni::static_ref_cast<CxxModuleWrapperBase::javaobject>(module);
     // Then, we grab the CxxModule from the wrapper, which is no longer needed.
     return cxxModule->cthis()->getModule();
   };
diff --git a/ReactAndroid/src/main/jni/xreact/jni/OnLoad.cpp b/ReactAndroid/src/main/jni/xreact/jni/OnLoad.cpp
index dc084b1238d148..7be58ad9fb1744 100644
--- a/ReactAndroid/src/main/jni/xreact/jni/OnLoad.cpp
+++ b/ReactAndroid/src/main/jni/xreact/jni/OnLoad.cpp
@@ -9,6 +9,7 @@
 #include <cxxreact/Platform.h>
 #include <jschelpers/Value.h>
 #include "CatalystInstanceImpl.h"
+#include "CxxModuleWrapper.h"
 #include "JavaScriptExecutorHolder.h"
 #include "JSCPerfLogging.h"
 #include "JSLoader.h"
@@ -167,6 +168,7 @@ extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
     JSCJavaScriptExecutorHolder::registerNatives();
     ProxyJavaScriptExecutorHolder::registerNatives();
     CatalystInstanceImpl::registerNatives();
+    CxxModuleWrapperBase::registerNatives();
     CxxModuleWrapper::registerNatives();
     JCallbackImpl::registerNatives();
     #ifdef WITH_INSPECTOR
diff --git a/ReactAndroid/src/main/jni/xreact/perftests/OnLoad.cpp b/ReactAndroid/src/main/jni/xreact/perftests/OnLoad.cpp
index f6d5c0d7c49cb7..89610b203be033 100644
--- a/ReactAndroid/src/main/jni/xreact/perftests/OnLoad.cpp
+++ b/ReactAndroid/src/main/jni/xreact/perftests/OnLoad.cpp
@@ -16,7 +16,11 @@ using facebook::jni::alias_ref;
 namespace {
 
 // This is a wrapper around the Java proxy to the javascript module. This
-// allows us to call functions on the js module from c++.
+// allows us to call functions on the js module from c++.  Are you seeing
+// crashes in this class?  Android 6+ crashes when you try to call a
+// method on a Proxy.  Switch to an older version of Android.  If you're
+// really desperate, you can fix this by using ToReflectedMethod on the
+// underlying jmethodid and invoking that.
 class JavaJSModule : public jni::JavaClass<JavaJSModule> {
 public:
   static constexpr auto kJavaDescriptor =

From af533ac7f10ae901e7ab456208ee8d7bb9257033 Mon Sep 17 00:00:00 2001
From: Marc Horowitz <mhorowitz@fb.com>
Date: Wed, 5 Apr 2017 00:51:58 -0700
Subject: [PATCH 313/366] Remove the dependency of I18nManagerModule on
 ReactApplicationContext

Reviewed By: javache

Differential Revision: D4809492

fbshipit-source-id: 775c6b95aab734568ea4750804477c04d13502b6
---
 .../i18nmanager/I18nManagerModule.java        | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.java
index 90e27eef703935..b3e2deacc6bc98 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.java
@@ -11,9 +11,9 @@
 
 import android.content.Context;
 
+import com.facebook.react.bridge.ContextBaseJavaModule;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.module.annotations.ReactModule;
@@ -25,12 +25,12 @@
  * {@link NativeModule} that allows JS to set allowRTL and get isRTL status.
  */
 @ReactModule(name = "I18nManager")
-public class I18nManagerModule extends ReactContextBaseJavaModule {
+public class I18nManagerModule extends ContextBaseJavaModule {
 
   private final I18nUtil sharedI18nUtilInstance = I18nUtil.getInstance();
 
-  public I18nManagerModule(ReactApplicationContext reactContext) {
-    super(reactContext);
+  public I18nManagerModule(Context context) {
+    super(context);
   }
 
   @Override
@@ -40,26 +40,22 @@ public String getName() {
 
   @Override
   public Map<String, Object> getConstants() {
-    final Context context = getReactApplicationContext().getBaseContext();
+    final Context context = getContext();
     final Locale locale = context.getResources().getConfiguration().locale;
 
     final Map<String, Object> constants = MapBuilder.newHashMap();
-    constants.put("isRTL", sharedI18nUtilInstance.isRTL(getReactApplicationContext()));
+    constants.put("isRTL", sharedI18nUtilInstance.isRTL(context));
     constants.put("localeIdentifier", locale.toString());
     return constants;
   }
 
   @ReactMethod
   public void allowRTL(boolean value) {
-    sharedI18nUtilInstance.allowRTL(
-      getReactApplicationContext(),
-      value);
+    sharedI18nUtilInstance.allowRTL(getContext(), value);
   }
 
   @ReactMethod
   public void forceRTL(boolean value) {
-    sharedI18nUtilInstance.forceRTL(
-      getReactApplicationContext(),
-      value);
+    sharedI18nUtilInstance.forceRTL(getContext(), value);
   }
 }

From 9a51fa8e15acc052b5d271c369dfa4b227d657c2 Mon Sep 17 00:00:00 2001
From: Janic Duplessis <janicduplessis@gmail.com>
Date: Wed, 5 Apr 2017 09:07:22 -0700
Subject: [PATCH 314/366] Improve z-index implementation on Android

Summary:
Use `getChildDrawingOrder` instead of reordering views. The old implementation didn't work properly when `removeClippedSubviews` was enabled and this one should have better performance since we don't play with the view hierarchy at all.

This fixes weird bugs with sticky headers in `SectionList` and allows removing the hack that disabled `removeClippedSubviews` when using sticky section headers.

**Test plan**
Tested using the SectionList and ListViewPaging examples that use sticky headers which uses z-index.
Closes https://github.com/facebook/react-native/pull/13105

Reviewed By: sahrens

Differential Revision: D4765869

Pulled By: achen1

fbshipit-source-id: be3c824658a3ce965b6e7324ad95c77cbd8a86ae
---
 .../UIExplorer/js/ListViewPagingExample.js    |   1 +
 Examples/UIExplorer/js/SectionListExample.js  |   6 +-
 Libraries/Components/ScrollView/ScrollView.js |   4 +-
 .../ViewGroupDrawingOrderHelper.java          | 103 ++++++++++++++++++
 .../react/uimanager/ViewGroupManager.java     |  53 +--------
 .../react/views/view/ReactViewGroup.java      |  34 ++++++
 .../react/views/view/ReactViewManager.java    |   1 -
 7 files changed, 149 insertions(+), 53 deletions(-)
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupDrawingOrderHelper.java

diff --git a/Examples/UIExplorer/js/ListViewPagingExample.js b/Examples/UIExplorer/js/ListViewPagingExample.js
index 58d7359e5b7f77..f140f29948e765 100644
--- a/Examples/UIExplorer/js/ListViewPagingExample.js
+++ b/Examples/UIExplorer/js/ListViewPagingExample.js
@@ -195,6 +195,7 @@ class ListViewPagingExample extends React.Component {
         initialListSize={10}
         pageSize={4}
         scrollRenderAheadDistance={500}
+        stickySectionHeadersEnabled
       />
     );
   }
diff --git a/Examples/UIExplorer/js/SectionListExample.js b/Examples/UIExplorer/js/SectionListExample.js
index 441aa19cb0dccd..8b795c5bfc2244 100644
--- a/Examples/UIExplorer/js/SectionListExample.js
+++ b/Examples/UIExplorer/js/SectionListExample.js
@@ -59,7 +59,7 @@ const VIEWABILITY_CONFIG = {
 };
 
 const renderSectionHeader = ({section}) => (
-  <View>
+  <View style={styles.header}>
     <Text style={styles.headerText}>SECTION HEADER: {section.key}</Text>
     <SeparatorComponent />
   </View>
@@ -144,6 +144,7 @@ class SectionListExample extends React.PureComponent {
           refreshing={false}
           renderItem={this._renderItemComponent}
           renderSectionHeader={renderSectionHeader}
+          stickySectionHeadersEnabled
           sections={[
             {renderItem: renderStackedItem, key: 's1', data: [
               {title: 'Item In Header Section', text: 'Section s1', key: '0'},
@@ -186,6 +187,9 @@ class SectionListExample extends React.PureComponent {
 }
 
 const styles = StyleSheet.create({
+  header: {
+    backgroundColor: '#e9eaed',
+  },
   headerText: {
     padding: 4,
   },
diff --git a/Libraries/Components/ScrollView/ScrollView.js b/Libraries/Components/ScrollView/ScrollView.js
index aa1f7e376252c0..b0bc86b9d09668 100644
--- a/Libraries/Components/ScrollView/ScrollView.js
+++ b/Libraries/Components/ScrollView/ScrollView.js
@@ -650,9 +650,7 @@ const ScrollView = React.createClass({
         {...contentSizeChangeProps}
         ref={this._setInnerViewRef}
         style={contentContainerStyle}
-        removeClippedSubviews={
-          hasStickyHeaders && Platform.OS === 'android' ? false : this.props.removeClippedSubviews
-        }
+        removeClippedSubviews={this.props.removeClippedSubviews}
         collapsable={false}>
         {children}
       </ScrollContentContainerViewClass>;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupDrawingOrderHelper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupDrawingOrderHelper.java
new file mode 100644
index 00000000000000..da577ae0839ce6
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupDrawingOrderHelper.java
@@ -0,0 +1,103 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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.
+ */
+
+package com.facebook.react.uimanager;
+
+import android.view.View;
+import android.view.ViewGroup;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+
+import javax.annotation.Nullable;
+
+/**
+ * Helper to handle implementing ViewGroups with custom drawing order based on z-index.
+ */
+public class ViewGroupDrawingOrderHelper {
+  private final ViewGroup mViewGroup;
+  private int mNumberOfChildrenWithZIndex = 0;
+  private @Nullable int[] mDrawingOrderIndices;
+
+  public ViewGroupDrawingOrderHelper(ViewGroup viewGroup) {
+    mViewGroup = viewGroup;
+  }
+
+  /**
+   * This should be called every time a view is added to the ViewGroup in {@link ViewGroup#addView}.
+   * @param view The view that is being added
+   */
+  public void handleAddView(View view) {
+    if (ViewGroupManager.getViewZIndex(view) != null) {
+      mNumberOfChildrenWithZIndex++;
+    }
+
+    mDrawingOrderIndices = null;
+  }
+
+  /**
+   * This should be called every time a view is removed from the ViewGroup in {@link ViewGroup#removeView}
+   * and {@link ViewGroup#removeViewAt}.
+   * @param view The view that is being removed.
+   */
+  public void handleRemoveView(View view) {
+    if (ViewGroupManager.getViewZIndex(view) != null) {
+      mNumberOfChildrenWithZIndex--;
+    }
+
+    mDrawingOrderIndices = null;
+  }
+
+  /**
+   * If the ViewGroup should enable drawing order. ViewGroups should call
+   * {@link ViewGroup#setChildrenDrawingOrderEnabled} with the value returned from this method when
+   * a view is added or removed.
+   */
+  public boolean shouldEnableCustomDrawingOrder() {
+    return mNumberOfChildrenWithZIndex > 0;
+  }
+
+  /**
+   * The index of the child view that should be drawn. This should be used in
+   * {@link ViewGroup#getChildDrawingOrder}.
+   */
+  public int getChildDrawingOrder(int childCount, int index) {
+    if (mDrawingOrderIndices == null) {
+      ArrayList<View> viewsToSort = new ArrayList<>();
+      for (int i = 0; i < childCount; i++) {
+        viewsToSort.add(mViewGroup.getChildAt(i));
+      }
+      // Sort the views by zIndex
+      Collections.sort(viewsToSort, new Comparator<View>() {
+        @Override
+        public int compare(View view1, View view2) {
+          Integer view1ZIndex = ViewGroupManager.getViewZIndex(view1);
+          if (view1ZIndex == null) {
+            view1ZIndex = 0;
+          }
+
+          Integer view2ZIndex = ViewGroupManager.getViewZIndex(view2);
+          if (view2ZIndex == null) {
+            view2ZIndex = 0;
+          }
+
+          return view1ZIndex - view2ZIndex;
+        }
+      });
+
+      mDrawingOrderIndices = new int[childCount];
+      for (int i = 0; i < childCount; i++) {
+        View child = viewsToSort.get(i);
+        mDrawingOrderIndices[i] = mViewGroup.indexOfChild(child);
+      }
+    }
+    return mDrawingOrderIndices[index];
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupManager.java
index 6a728db8f98e56..103529a0e96857 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupManager.java
@@ -19,13 +19,15 @@
 import android.view.View;
 import android.view.ViewGroup;
 
+import javax.annotation.Nullable;
+
 /**
  * Class providing children management API for view managers of classes extending ViewGroup.
  */
 public abstract class ViewGroupManager <T extends ViewGroup>
     extends BaseViewManager<T, LayoutShadowNode> {
 
-  public static WeakHashMap<View, Integer> mZIndexHash = new WeakHashMap<>();
+  private static WeakHashMap<View, Integer> mZIndexHash = new WeakHashMap<>();
 
   @Override
   public LayoutShadowNode createShadowNodeInstance() {
@@ -43,7 +45,6 @@ public void updateExtraData(T root, Object extraData) {
 
   public void addView(T parent, View child, int index) {
     parent.addView(child, index);
-    reorderChildrenByZIndex(parent);
   }
 
   /**
@@ -61,54 +62,10 @@ public void addViews(T parent, List<View> views) {
 
   public static void setViewZIndex(View view, int zIndex) {
     mZIndexHash.put(view, zIndex);
-    // zIndex prop gets set BEFORE the view is added, so parent may be null.
-    ViewGroup parent = (ViewGroup) view.getParent();
-    if (parent != null) {
-      reorderChildrenByZIndex(parent);
-    }
   }
 
-  public static void reorderChildrenByZIndex(ViewGroup view) {
-    // Optimization: loop through the zIndexHash to test if there are any non-zero zIndexes
-    // If there aren't any, we can just return out
-    Collection<Integer> zIndexes = mZIndexHash.values();
-    boolean containsZIndexedElement = false;
-    for (Integer zIndex : zIndexes) {
-      if (zIndex != 0) {
-        containsZIndexedElement = true;
-        break;
-      }
-    }
-    if (!containsZIndexedElement) {
-      return;
-    }
-
-    // Add all children to a sortable ArrayList
-    ArrayList<View> viewsToSort = new ArrayList<>();
-    for (int i = 0; i < view.getChildCount(); i++) {
-      viewsToSort.add(view.getChildAt(i));
-    }
-    // Sort the views by zIndex
-    Collections.sort(viewsToSort, new Comparator<View>() {
-      @Override
-      public int compare(View view1, View view2) {
-        Integer view1ZIndex = mZIndexHash.get(view1);
-        if (view1ZIndex == null) {
-          view1ZIndex = 0;
-        }
-
-        Integer view2ZIndex = mZIndexHash.get(view2);
-        if (view2ZIndex == null) {
-          view2ZIndex = 0;
-        }
-        return view1ZIndex - view2ZIndex;
-      }
-    });
-    // Call .bringToFront on the sorted list of views
-    for (int i = 0; i < viewsToSort.size(); i++) {
-      viewsToSort.get(i).bringToFront();
-    }
-    view.invalidate();
+  public static @Nullable Integer getViewZIndex(View view) {
+    return mZIndexHash.get(view);
   }
 
   public int getChildCount(T parent) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java
index f69abaf0252fda..3729b0e8cbeb68 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java
@@ -31,6 +31,7 @@
 import com.facebook.react.uimanager.ReactClippingViewGroup;
 import com.facebook.react.uimanager.ReactClippingViewGroupHelper;
 import com.facebook.react.uimanager.ReactPointerEventsView;
+import com.facebook.react.uimanager.ViewGroupDrawingOrderHelper;
 
 /**
  * Backing for a React View. Has support for borders, but since borders aren't common, lazy
@@ -96,9 +97,12 @@ public void onLayoutChange(
   private @Nullable ReactViewBackgroundDrawable mReactBackgroundDrawable;
   private @Nullable OnInterceptTouchEventListener mOnInterceptTouchEventListener;
   private boolean mNeedsOffscreenAlphaCompositing = false;
+  private final ViewGroupDrawingOrderHelper mDrawingOrderHelper;
 
   public ReactViewGroup(Context context) {
     super(context);
+
+    mDrawingOrderHelper = new ViewGroupDrawingOrderHelper(this);
   }
 
   @Override
@@ -374,6 +378,36 @@ protected void onAttachedToWindow() {
     }
   }
 
+  @Override
+  public void addView(View child, int index, LayoutParams params) {
+    // This will get called for every overload of addView so there is not need to override every method.
+    mDrawingOrderHelper.handleAddView(child);
+    setChildrenDrawingOrderEnabled(mDrawingOrderHelper.shouldEnableCustomDrawingOrder());
+
+    super.addView(child, index, params);
+  }
+
+  @Override
+  public void removeView(View view) {
+    mDrawingOrderHelper.handleRemoveView(view);
+    setChildrenDrawingOrderEnabled(mDrawingOrderHelper.shouldEnableCustomDrawingOrder());
+
+    super.removeView(view);
+  }
+
+  @Override
+  public void removeViewAt(int index) {
+    mDrawingOrderHelper.handleRemoveView(getChildAt(index));
+    setChildrenDrawingOrderEnabled(mDrawingOrderHelper.shouldEnableCustomDrawingOrder());
+
+    super.removeViewAt(index);
+  }
+
+  @Override
+  protected int getChildDrawingOrder(int childCount, int index) {
+    return mDrawingOrderHelper.getChildDrawingOrder(childCount, index);
+  }
+
   @Override
   public PointerEvents getPointerEvents() {
     return mPointerEvents;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java
index d0070359de28eb..3700d201af8970 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java
@@ -208,7 +208,6 @@ public void addView(ReactViewGroup parent, View child, int index) {
     } else {
       parent.addView(child, index);
     }
-    reorderChildrenByZIndex(parent);
   }
 
   @Override

From c7387fefc85fd15dceadfa291857099ed3e848b8 Mon Sep 17 00:00:00 2001
From: Janic Duplessis <janicduplessis@gmail.com>
Date: Wed, 5 Apr 2017 10:16:30 -0700
Subject: [PATCH 315/366] Enable flow in react-native-implementation

Summary:
I noticed I didn't get type defs anymore for react-native. Looks like it is broken since we removed the .flow file in https://github.com/facebook/react-native/commit/3e153b2a5bee943f69621d05e271782e1a3b3edd. To fix it we can now enable flow in react-native-implementation since it now supports properties.

**Test plan**
Tested that I get type hints when using imports from react-native in a project.
Closes https://github.com/facebook/react-native/pull/12917

Differential Revision: D4704753

Pulled By: ericvicenti

fbshipit-source-id: cf882588d7f371931de8d7861a1a6d50f6c425dc
---
 Examples/UIExplorer/js/FlatListExample.js     |  2 +-
 .../UIExplorer/js/NativeAnimationsExample.js  |  2 +-
 Examples/UIExplorer/js/ScrollViewExample.js   |  2 +-
 Libraries/Components/Picker/Picker.js         | 79 ++++++++++---------
 .../SwipeableRow/SwipeableListView.js         |  7 +-
 Libraries/Image/Image.android.js              |  2 +-
 Libraries/Image/Image.ios.js                  |  2 +-
 .../react-native-implementation.js            | 17 +---
 8 files changed, 53 insertions(+), 60 deletions(-)

diff --git a/Examples/UIExplorer/js/FlatListExample.js b/Examples/UIExplorer/js/FlatListExample.js
index cbb307e34f18e0..2dac3dd14490e6 100644
--- a/Examples/UIExplorer/js/FlatListExample.js
+++ b/Examples/UIExplorer/js/FlatListExample.js
@@ -198,7 +198,7 @@ class FlatListExample extends React.PureComponent {
     this._listRef.getNode().recordInteraction();
     pressItem(this, key);
   };
-  _listRef: FlatList<*>;
+  _listRef: AnimatedFlatList;
 }
 
 
diff --git a/Examples/UIExplorer/js/NativeAnimationsExample.js b/Examples/UIExplorer/js/NativeAnimationsExample.js
index cbf0b7b394feb2..d9550530ed85f1 100644
--- a/Examples/UIExplorer/js/NativeAnimationsExample.js
+++ b/Examples/UIExplorer/js/NativeAnimationsExample.js
@@ -49,7 +49,7 @@ class Tester extends React.Component {
       this.current && this.props.reverseConfig ? this.props.reverseConfig : this.props.config
     );
     this.current = this.current ? 0 : 1;
-    const config = {
+    const config: Object = {
       ...animConfig,
       toValue: this.current,
     };
diff --git a/Examples/UIExplorer/js/ScrollViewExample.js b/Examples/UIExplorer/js/ScrollViewExample.js
index 37aa60f5c35473..1435c03192121a 100644
--- a/Examples/UIExplorer/js/ScrollViewExample.js
+++ b/Examples/UIExplorer/js/ScrollViewExample.js
@@ -71,7 +71,7 @@ exports.examples = [
   description: 'You can display <ScrollView>\'s child components horizontally rather than vertically',
   render: function() {
 
-    function renderScrollView(title: string, addtionalStyles: StyleSheet) {
+    function renderScrollView(title: string, addtionalStyles: typeof StyleSheet) {
       var _scrollView: ScrollView;
       return (
         <View style={addtionalStyles}>
diff --git a/Libraries/Components/Picker/Picker.js b/Libraries/Components/Picker/Picker.js
index a85dd7a65cdf50..e5aa6893932062 100644
--- a/Libraries/Components/Picker/Picker.js
+++ b/Libraries/Components/Picker/Picker.js
@@ -33,6 +33,44 @@ var pickerStyleType = StyleSheetPropType({
 var MODE_DIALOG = 'dialog';
 var MODE_DROPDOWN = 'dropdown';
 
+/**
+ * Individual selectable item in a Picker.
+ */
+class PickerItem extends React.Component {
+ props: {
+  label: string,
+  value?: any,
+  color?: ColorPropType,
+  testID?: string,
+ };
+
+ static propTypes = {
+   /**
+    * Text to display for this item.
+    */
+   label: React.PropTypes.string.isRequired,
+   /**
+    * The value to be passed to picker's `onValueChange` callback when
+    * this item is selected. Can be a string or an integer.
+    */
+   value: React.PropTypes.any,
+   /**
+    * Color of this item's text.
+    * @platform android
+    */
+   color: ColorPropType,
+   /**
+    * Used to locate the item in end-to-end tests.
+    */
+   testID: React.PropTypes.string,
+ };
+
+ render() {
+   // The items are not rendered directly
+   throw null;
+ }
+}
+
 /**
  * Renders the native picker component on iOS and Android. Example:
  *
@@ -65,6 +103,8 @@ class Picker extends React.Component {
   */
  static MODE_DROPDOWN = MODE_DROPDOWN;
 
+ static Item = PickerItem;
+
  static defaultProps = {
    mode: MODE_DIALOG,
  };
@@ -127,43 +167,4 @@ class Picker extends React.Component {
  }
 }
 
-/**
- * Individual selectable item in a Picker.
- */
-// $FlowFixMe found when converting React.createClass to ES6
-Picker.Item = class extends React.Component {
- props: {
-  label: string,
-  value?: any,
-  color?: ColorPropType,
-  testID?: string,
- };
-
- static propTypes = {
-   /**
-    * Text to display for this item.
-    */
-   label: React.PropTypes.string.isRequired,
-   /**
-    * The value to be passed to picker's `onValueChange` callback when
-    * this item is selected. Can be a string or an integer.
-    */
-   value: React.PropTypes.any,
-   /**
-    * Color of this item's text.
-    * @platform android
-    */
-   color: ColorPropType,
-   /**
-    * Used to locate the item in end-to-end tests.
-    */
-   testID: React.PropTypes.string,
- };
-
- render() {
-   // The items are not rendered directly
-   throw null;
- }
-};
-
 module.exports = Picker;
diff --git a/Libraries/Experimental/SwipeableRow/SwipeableListView.js b/Libraries/Experimental/SwipeableRow/SwipeableListView.js
index b62addd04f20f0..95381044771544 100644
--- a/Libraries/Experimental/SwipeableRow/SwipeableListView.js
+++ b/Libraries/Experimental/SwipeableRow/SwipeableListView.js
@@ -18,6 +18,11 @@ const SwipeableRow = require('SwipeableRow');
 
 const {PropTypes} = React;
 
+type DefaultProps = {
+  bounceFirstRowOnMount: boolean,
+  renderQuickActions: Function,
+};
+
 type Props = {
   bounceFirstRowOnMount: boolean,
   dataSource: SwipeableListViewDataSource,
@@ -49,7 +54,7 @@ type State = {
  * - It can bounce the 1st row of the list so users know it's swipeable
  * - More to come
  */
-class SwipeableListView extends React.Component {
+class SwipeableListView extends React.Component<DefaultProps, Props, State> {
   props: Props;
   state: State;
 
diff --git a/Libraries/Image/Image.android.js b/Libraries/Image/Image.android.js
index dea4fac5422598..4820d75702eb85 100644
--- a/Libraries/Image/Image.android.js
+++ b/Libraries/Image/Image.android.js
@@ -194,7 +194,7 @@ var Image = React.createClass({
     getSize(
       url: string,
       success: (width: number, height: number) => void,
-      failure: (error: any) => void,
+      failure?: (error: any) => void,
     ) {
       return ImageLoader.getSize(url)
         .then(function(sizes) {
diff --git a/Libraries/Image/Image.ios.js b/Libraries/Image/Image.ios.js
index 3177b1f5e2fcb4..bba7a8999c7523 100644
--- a/Libraries/Image/Image.ios.js
+++ b/Libraries/Image/Image.ios.js
@@ -304,7 +304,7 @@ const Image = React.createClass({
     getSize: function(
       uri: string,
       success: (width: number, height: number) => void,
-      failure: (error: any) => void,
+      failure?: (error: any) => void,
     ) {
       ImageViewManager.getSize(uri, success, failure || function() {
         console.warn('Failed to get size for image: ' + uri);
diff --git a/Libraries/react-native/react-native-implementation.js b/Libraries/react-native/react-native-implementation.js
index d64353492e38c8..8f61726e705489 100644
--- a/Libraries/react-native/react-native-implementation.js
+++ b/Libraries/react-native/react-native-implementation.js
@@ -7,24 +7,11 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  *
  * @providesModule react-native-implementation
- * @noflow - get/set properties not yet supported by flow. also `...require(x)` is broken #6560135
+ * @flow
  */
 'use strict';
 
 const invariant = require('fbjs/lib/invariant');
-const warning = require('fbjs/lib/warning');
-
-if (__DEV__) {
-  var warningDedupe = {};
-  var addonWarn = function(prevName, newPackageName) {
-    warning(
-      warningDedupe[prevName],
-      'React.addons.' + prevName + ' is deprecated. Please import the "' +
-      newPackageName + '" package instead.'
-    );
-    warningDedupe[prevName] = true;
-  };
-}
 
 // Export React, plus some native additions.
 const ReactNative = {
@@ -118,6 +105,7 @@ const ReactNative = {
   get Platform() { return require('Platform'); },
   get processColor() { return require('processColor'); },
   get requireNativeComponent() { return require('requireNativeComponent'); },
+  get takeSnapshot() { return require('takeSnapshot'); },
 
   // Prop Types
   get ColorPropType() { return require('ColorPropType'); },
@@ -133,7 +121,6 @@ const ReactNative = {
       'and imported from `react-native-deprecated-custom-components` instead of `react-native`. ' +
       'Learn about alternative navigation solutions at http://facebook.github.io/react-native/docs/navigation.html'
     );
-    return null;
   },
 };
 

From 269458c613b658a0a3e8e7e86f8394278d5b9e23 Mon Sep 17 00:00:00 2001
From: Robin Chou <chourobin@gmail.com>
Date: Wed, 5 Apr 2017 10:55:02 -0700
Subject: [PATCH 316/366] Update docs to clarify `RCT_REMAP_METHOD` usage.

Summary:
The current docs (iOS) for promises make use of the `RCT_REMAP_METHOD` macro but it's not clear about the proper usage for the macro. Specifically, it points to a selector of `resolver:rejector:` and makes it seem like `findEvents` is assumed as both the alias and method name.

This has led to some confusion (#9070) on how to use `RCT_REMAP_METHOD`.

No tests needed since this is just a small docs update.
Closes https://github.com/facebook/react-native/pull/13302

Differential Revision: D4831755

Pulled By: javache

fbshipit-source-id: e842c16ade27088eafdac7509373cdf7780f9ece
---
 docs/NativeModulesIOS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/NativeModulesIOS.md b/docs/NativeModulesIOS.md
index 2f87678a400193..579fa56fbab742 100644
--- a/docs/NativeModulesIOS.md
+++ b/docs/NativeModulesIOS.md
@@ -195,7 +195,7 @@ Refactoring the above code to use a promise instead of callbacks looks like this
 
 ```objective-c
 RCT_REMAP_METHOD(findEvents,
-                 resolver:(RCTPromiseResolveBlock)resolve
+                 findEventsWithResolver:(RCTPromiseResolveBlock)resolve
                  rejecter:(RCTPromiseRejectBlock)reject)
 {
   NSArray *events = ...

From da43c297f4ee4db68fa88b99e6939dc4ed35691e Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieter.debaets@gmail.com>
Date: Wed, 5 Apr 2017 12:04:02 -0700
Subject: [PATCH 317/366] Update IntegrationWithExistingApps.md

Summary: Closes https://github.com/facebook/react-native/pull/13327

Differential Revision: D4836472

Pulled By: javache

fbshipit-source-id: 377512f8a422c40fc02a3259bccb097c38357c19
---
 docs/IntegrationWithExistingApps.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/IntegrationWithExistingApps.md b/docs/IntegrationWithExistingApps.md
index e4fa55e7f69c0b..57d1b3b996b14d 100644
--- a/docs/IntegrationWithExistingApps.md
+++ b/docs/IntegrationWithExistingApps.md
@@ -379,10 +379,10 @@ We will, for debugging purposes, log that the event handler was invoked. Then, w
 
 <block class="objc" />
 
-First `import` the `RCTRootView` library.
+First `import` the `RCTRootView` header.
 
 ```
-#import "RCTRootView.h"
+#import <React/RCTRootView.h>
 ```
 
 > The `initialProperties` are here for illustration purposes so we have some data for our high score screen. In our React Native component, we will use `this.props` to get access to that data.

From 3bf367cbb77be2d4e7245e26e3b107c8ffb68ddc Mon Sep 17 00:00:00 2001
From: "Andrew Y. Chen" <ayc@fb.com>
Date: Wed, 5 Apr 2017 12:19:50 -0700
Subject: [PATCH 318/366] Use tag ids for testID

Summary: View tags are currently used for end-to-end test IDs. We'd like to overload the tag field with other information such as nativeID (for native refs) and transitionID (for shared element transitions) in the future. Added a key for testID's tag

Reviewed By: AaaChiuuu

Differential Revision: D4833045

fbshipit-source-id: c2f9371c9a3dbb2411e114f4f096f723ac3132c0
---
 ReactAndroid/build.gradle                                | 2 +-
 .../src/androidTest/java/com/facebook/react/testing/BUCK | 5 +++--
 .../java/com/facebook/react/testing/ReactTestHelper.java | 7 +++++--
 .../src/main/java/com/facebook/react/uimanager/BUCK      | 1 +
 .../com/facebook/react/uimanager/BaseViewManager.java    | 4 ++++
 ReactAndroid/src/main/res/BUCK                           | 9 +++++++++
 ReactAndroid/src/main/res/views/uimanager/values/ids.xml | 5 +++++
 7 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 ReactAndroid/src/main/res/views/uimanager/values/ids.xml

diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle
index cebce68f6ed744..783abedc84a731 100644
--- a/ReactAndroid/build.gradle
+++ b/ReactAndroid/build.gradle
@@ -248,7 +248,7 @@ android {
     sourceSets.main {
         jni.srcDirs = []
         jniLibs.srcDir "$buildDir/react-ndk/exported"
-        res.srcDirs = ['src/main/res/devsupport', 'src/main/res/shell', 'src/main/res/views/modal']
+        res.srcDirs = ['src/main/res/devsupport', 'src/main/res/shell', 'src/main/res/views/modal', 'src/main/res/views/uimanager']
         java {
             srcDirs = ['src/main/java', 'src/main/libraries/soloader/java', 'src/main/jni/first-party/fb/jni/java']
             exclude 'com/facebook/react/processing'
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
index bb7c09790294af..57276c344fbe4a 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
@@ -21,6 +21,8 @@ android_library(
         react_native_dep("third-party/java/junit:junit"),
         react_native_dep("third-party/java/mockito:mockito"),
         react_native_dep("third-party/java/testing-support-lib:runner"),
+        react_native_integration_tests_target("java/com/facebook/react/testing/idledetection:idledetection"),
+        react_native_integration_tests_target("java/com/facebook/react/testing/network:network"),
         react_native_target("java/com/facebook/react:react"),
         react_native_target("java/com/facebook/react/bridge:bridge"),
         react_native_target("java/com/facebook/react/common:common"),
@@ -32,7 +34,6 @@ android_library(
         react_native_target("java/com/facebook/react/modules/debug:interfaces"),
         react_native_target("java/com/facebook/react/shell:shell"),
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
-        react_native_integration_tests_target("java/com/facebook/react/testing/idledetection:idledetection"),
-        react_native_integration_tests_target("java/com/facebook/react/testing/network:network"),
+        react_native_target("res:uimanager"),
     ],
 )
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestHelper.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestHelper.java
index 8054dff33d8161..6250d24148e4e1 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestHelper.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestHelper.java
@@ -17,6 +17,7 @@
 import android.view.ViewGroup;
 
 import com.facebook.react.NativeModuleRegistryBuilder;
+import com.facebook.react.R;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactInstanceManagerBuilder;
 import com.facebook.react.bridge.CatalystInstance;
@@ -187,7 +188,9 @@ public static View getViewWithReactTestId(View rootView, String testId) {
   }
 
   public static String getTestId(View view) {
-    return view.getTag() instanceof String ? (String) view.getTag() : null;
+    return view.getTag(R.id.react_test_id) instanceof String
+      ? (String) view.getTag(R.id.react_test_id)
+      : null;
   }
 
   private static View findChild(View root, Predicate<View> predicate) {
@@ -211,7 +214,7 @@ private static Predicate<View> hasTagValue(final String tagValue) {
     return new Predicate<View>() {
       @Override
       public boolean apply(View view) {
-        Object tag = view.getTag();
+        Object tag = getTestId(view);
         return tag != null && tag.equals(tagValue);
       }
     };
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK
index 954f2528f9229a..c75b10b0ddf413 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK
@@ -26,5 +26,6 @@ android_library(
         react_native_target("java/com/facebook/react/modules/i18nmanager:i18nmanager"),
         react_native_target("java/com/facebook/react/touch:touch"),
         react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
+        react_native_target("res:uimanager"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
index 24192175df1232..16c85690a1bdf8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
@@ -5,6 +5,7 @@
 import android.graphics.Color;
 import android.os.Build;
 import android.view.View;
+import com.facebook.react.R;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.uimanager.annotations.ReactProp;
 
@@ -85,6 +86,9 @@ public void setRenderToHardwareTexture(T view, boolean useHWTexture) {
 
   @ReactProp(name = PROP_TEST_ID)
   public void setTestId(T view, String testId) {
+    view.setTag(R.id.react_test_id, testId);
+
+    // temporarily set the tag and keyed tags to avoid end to end test regressions
     view.setTag(testId);
   }
 
diff --git a/ReactAndroid/src/main/res/BUCK b/ReactAndroid/src/main/res/BUCK
index 5a8113ff8cd892..43e7dcabd148b2 100644
--- a/ReactAndroid/src/main/res/BUCK
+++ b/ReactAndroid/src/main/res/BUCK
@@ -27,4 +27,13 @@ android_resource(
     ],
 )
 
+android_resource(
+    name = "uimanager",
+    package = "com.facebook.react",
+    res = "views/uimanager",
+    visibility = [
+        "PUBLIC",
+    ],
+)
+
 # New resource directories must be added to react-native-github/ReactAndroid/build.gradle
diff --git a/ReactAndroid/src/main/res/views/uimanager/values/ids.xml b/ReactAndroid/src/main/res/views/uimanager/values/ids.xml
new file mode 100644
index 00000000000000..8744d7cad248db
--- /dev/null
+++ b/ReactAndroid/src/main/res/views/uimanager/values/ids.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!-- tag is used to store the testID tag -->
+  <item type="id" name="react_test_id"/>
+</resources>

From cd4545f812d0c1404dcc9ce2982babd009f188f9 Mon Sep 17 00:00:00 2001
From: Vojtech Novak <vonovak@gmail.com>
Date: Wed, 5 Apr 2017 12:44:00 -0700
Subject: [PATCH 319/366] configurable devEnabled in React.gradle

Summary:
This PR adds support for configurable devEnabled option when building an android app. This is currently hardcoded.

The reason for making this configurable is this: I have an app that uses code-push and 3 buildConfigs. I want to have a debugging version which has `devEnabled = true`, then a staging version which has `devEnabled = false` (this version of the app is used internally for testing and should behave just like a release version of the app, and when the tests succeed the changes are promoted into the release version to the users out there, using code-push). The last version is a standard release version with `devEnabled = false`.

Currently, `devEnabled` is hardwired like this: `!targetName.toLowerCase().contains("release")` so by default my `staging` buildConfig will have `devEnabled = true` but I'd like it to be false.

With this PR it'd be possible to configure this as follows, while not breaking the current behavior.
`'devDisabledIn${productFlavor}${buildType}'`
`'devDisabledIn${buildType
Closes https://github.com/facebook/react-native/pull/11438

Differential Revision: D4630513

Pulled By: hramos

fbshipit-source-id: b6817cf4c144fc948f76785e9cb5f93a13a6a6a2
---
 local-cli/templates/HelloWorld/android/app/build.gradle | 7 +++++++
 react.gradle                                            | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/local-cli/templates/HelloWorld/android/app/build.gradle b/local-cli/templates/HelloWorld/android/app/build.gradle
index 5a6bc9bafa9271..c46fd943932b37 100644
--- a/local-cli/templates/HelloWorld/android/app/build.gradle
+++ b/local-cli/templates/HelloWorld/android/app/build.gradle
@@ -33,6 +33,13 @@ import com.android.build.OutputFile
  *   // bundleInPaidRelease: true,
  *   // bundleInBeta: true,
  *
+ *   // whether to disable dev mode in custom build variants (by default only disabled in release)
+ *   // for example: to disable dev mode in the staging build type (if configured)
+ *   devDisabledInStaging: true,
+ *   // The configuration property can be in the following formats
+ *   //         'devDisabledIn${productFlavor}${buildType}'
+ *   //         'devDisabledIn${buildType}'
+ *
  *   // the root of your project, i.e. where "package.json" lives
  *   root: "../../",
  *
diff --git a/react.gradle b/react.gradle
index 09c06ca7e54bb0..16c58c2aca7b69 100644
--- a/react.gradle
+++ b/react.gradle
@@ -76,7 +76,8 @@ gradle.projectsEvaluated {
                 workingDir reactRoot
 
                 // Set up dev mode
-                def devEnabled = !targetName.toLowerCase().contains("release")
+                def devEnabled = !(config."devDisabledIn${targetName}"
+                    || targetName.toLowerCase().contains("release"))
                 if (Os.isFamily(Os.FAMILY_WINDOWS)) {
                     commandLine("cmd", "/c", *nodeExecutableAndArgs, "node_modules/react-native/local-cli/cli.js", "bundle", "--platform", "android", "--dev", "${devEnabled}",
                             "--reset-cache", "--entry-file", entryFile, "--bundle-output", jsBundleFile, "--assets-dest", resourcesDir, *extraPackagerArgs)

From d69c85f8788ecf3bd14aad36dc75878d5ebe2e2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <hramos@users.noreply.github.com>
Date: Wed, 5 Apr 2017 15:19:01 -0700
Subject: [PATCH 320/366] Update Keyboard.js

Summary:
What existing problem does the pull request solve?

According to this issue: https://github.com/facebook/react-native/issues/3468 , only `keyboardDidShow`and `keyboardDidHide` events are available on android at this moment.

I think this information should be displayed in the documentation since default `android:windowSoftInputMode` is `adjustResize`.
Closes https://github.com/facebook/react-native/pull/13155

Differential Revision: D4795828

Pulled By: hramos

fbshipit-source-id: 2c114f3040808a5cc3cdeb29b2067877df353620
---
 Libraries/Components/Keyboard/Keyboard.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Libraries/Components/Keyboard/Keyboard.js b/Libraries/Components/Keyboard/Keyboard.js
index 8ec70bb68fc1ec..9e936e6d7804f5 100644
--- a/Libraries/Components/Keyboard/Keyboard.js
+++ b/Libraries/Components/Keyboard/Keyboard.js
@@ -99,6 +99,9 @@ let Keyboard = {
    * - `keyboardWillChangeFrame`
    * - `keyboardDidChangeFrame`
    *
+   * Note that if you set `android:windowSoftInputMode` to `adjustResize`  or `adjustNothing`,
+   * only `keyboardDidShow` and `keyboardDidHide` events will available on Android.
+   *
    * @param {function} callback function to be called when the event fires.
    */
   addListener(eventName: KeyboardEventName, callback: KeyboardEventListener) {

From d18513be7e9bdc4fa45e2ebd5148c5b9c7993f03 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <bvaughn@fb.com>
Date: Wed, 5 Apr 2017 15:24:39 -0700
Subject: [PATCH 321/366] Removed some no-longer-necessary Flow ignores.

Reviewed By: spicyj

Differential Revision: D4836708

fbshipit-source-id: 8e9da5a1f723651b1d6ade60fecdb7801662abfe
---
 .flowconfig | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.flowconfig b/.flowconfig
index 2eb01377dc3fcf..c67716ede5a657 100644
--- a/.flowconfig
+++ b/.flowconfig
@@ -20,11 +20,6 @@
 .*/Libraries/react-native/React.js
 .*/Libraries/react-native/ReactNative.js
 
-; Ignore duplicate ReactErrorUtils in react-dom/lib in React 16 alpha 4.
-; TODO (bvaughn) Remove this once we've synced to React 16 alpha 5.
-; For more info see https://phabricator.intern.facebook.com/D4747529#10
-<PROJECT_ROOT>/node_modules/react-dom/lib/ReactErrorUtils.js
-
 [include]
 
 [libs]

From 4f243f1ecd6a2a2e256a58843085182f73f2835e Mon Sep 17 00:00:00 2001
From: Gabe Levi <gabe@fb.com>
Date: Wed, 5 Apr 2017 18:27:59 -0700
Subject: [PATCH 322/366] Deploy v0.43.0

Reviewed By: zertosh

Differential Revision: D4835081

fbshipit-source-id: a9ab33648320fb19b8cc7ab212e68fada7810b90
---
 .flowconfig                                  | 6 +++---
 Libraries/CameraRoll/CameraRoll.js           | 1 -
 Libraries/LayoutAnimation/LayoutAnimation.js | 1 -
 local-cli/templates/HelloWorld/_flowconfig   | 6 +++---
 package.json                                 | 2 +-
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.flowconfig b/.flowconfig
index c67716ede5a657..62b8c8431e44fa 100644
--- a/.flowconfig
+++ b/.flowconfig
@@ -41,12 +41,12 @@ suppress_type=$FlowIssue
 suppress_type=$FlowFixMe
 suppress_type=$FixMe
 
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(4[0-2]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native_oss[a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(4[0-2]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native_oss[a-z,_]*\\)?)\\)?:? #[0-9]+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(4[0-3]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native_oss[a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(4[0-3]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native_oss[a-z,_]*\\)?)\\)?:? #[0-9]+
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
 
 unsafe.enable_getters_and_setters=true
 
 [version]
-^0.42.0
+^0.43.0
diff --git a/Libraries/CameraRoll/CameraRoll.js b/Libraries/CameraRoll/CameraRoll.js
index 54d9ae708027b4..5d94eb40d89c37 100644
--- a/Libraries/CameraRoll/CameraRoll.js
+++ b/Libraries/CameraRoll/CameraRoll.js
@@ -11,7 +11,6 @@
  */
 'use strict';
 
-// $FlowFixMe `checkPropTypes` is not in Flow's built in React typedefs yet.
 var {PropTypes, checkPropTypes} = require('React');
 var RCTCameraRollManager = require('NativeModules').CameraRollManager;
 
diff --git a/Libraries/LayoutAnimation/LayoutAnimation.js b/Libraries/LayoutAnimation/LayoutAnimation.js
index a6670cab2f253e..ac2525a887067c 100644
--- a/Libraries/LayoutAnimation/LayoutAnimation.js
+++ b/Libraries/LayoutAnimation/LayoutAnimation.js
@@ -15,7 +15,6 @@ var UIManager = require('UIManager');
 
 var keyMirror = require('fbjs/lib/keyMirror');
 
-// $FlowFixMe checkPropTypes not yet landed to Flow
 var {checkPropTypes, PropTypes} = require('react');
 
 var TypesEnum = {
diff --git a/local-cli/templates/HelloWorld/_flowconfig b/local-cli/templates/HelloWorld/_flowconfig
index a76425eb4881f2..de255a47a57c08 100644
--- a/local-cli/templates/HelloWorld/_flowconfig
+++ b/local-cli/templates/HelloWorld/_flowconfig
@@ -36,12 +36,12 @@ suppress_type=$FlowIssue
 suppress_type=$FlowFixMe
 suppress_type=$FixMe
 
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(4[0-2]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(4[0-2]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(4[0-3]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(4[0-3]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
 
 unsafe.enable_getters_and_setters=true
 
 [version]
-^0.42.0
+^0.43.0
diff --git a/package.json b/package.json
index 68513e09f3a4e1..b420622b2368eb 100644
--- a/package.json
+++ b/package.json
@@ -222,7 +222,7 @@
     "eslint-plugin-babel": "^3.3.0",
     "eslint-plugin-flowtype": "^2.20.0",
     "eslint-plugin-react": "^6.4.1",
-    "flow-bin": "^0.42.0",
+    "flow-bin": "^0.43.0",
     "jest": "19.0.2",
     "jest-repl": "19.0.2",
     "jest-runtime": "19.0.2",

From 6dbcb47e4c177837a095c87bf0cd2a8ea671dc65 Mon Sep 17 00:00:00 2001
From: Spencer Ahrens <sahrens@fb.com>
Date: Wed, 5 Apr 2017 18:42:46 -0700
Subject: [PATCH 323/366] use performanceNow instead of Date.now() in
 ScrollResponder

Reviewed By: shergin

Differential Revision: D4833701

fbshipit-source-id: cb127cb6c40ecb188100eeb204412401c7772c9e
---
 Libraries/Components/ScrollResponder.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Libraries/Components/ScrollResponder.js b/Libraries/Components/ScrollResponder.js
index a7c5f4e1cd2cbd..76f58fa69471e4 100644
--- a/Libraries/Components/ScrollResponder.js
+++ b/Libraries/Components/ScrollResponder.js
@@ -25,6 +25,7 @@ var { getInstanceFromNode } = require('ReactNativeComponentTree');
 var { ScrollViewManager } = require('NativeModules');
 
 var invariant = require('fbjs/lib/invariant');
+var performanceNow = require('fbjs/lib/performanceNow');
 
 /**
  * Mixin that can be integrated in order to handle scrolling that plays well
@@ -321,7 +322,7 @@ var ScrollResponderMixin = {
    * Invoke this from an `onMomentumScrollBegin` event.
    */
   scrollResponderHandleMomentumScrollBegin: function(e: Event) {
-    this.state.lastMomentumScrollBeginTime = Date.now();
+    this.state.lastMomentumScrollBeginTime = performanceNow();
     this.props.onMomentumScrollBegin && this.props.onMomentumScrollBegin(e);
   },
 
@@ -330,7 +331,7 @@ var ScrollResponderMixin = {
    */
   scrollResponderHandleMomentumScrollEnd: function(e: Event) {
     FrameRateLogger.endScroll();
-    this.state.lastMomentumScrollEndTime = Date.now();
+    this.state.lastMomentumScrollEndTime = performanceNow();
     this.props.onMomentumScrollEnd && this.props.onMomentumScrollEnd(e);
   },
 
@@ -371,7 +372,7 @@ var ScrollResponderMixin = {
    * a touch has just started or ended.
    */
   scrollResponderIsAnimating: function(): boolean {
-    var now = Date.now();
+    var now = performanceNow();
     var timeSinceLastMomentumScrollEnd = now - this.state.lastMomentumScrollEndTime;
     var isAnimating = timeSinceLastMomentumScrollEnd < IS_ANIMATING_TOUCH_START_THRESHOLD_MS ||
       this.state.lastMomentumScrollEndTime < this.state.lastMomentumScrollBeginTime;

From b8542397cd65a147a5a3ce80beac3203d9b33d8a Mon Sep 17 00:00:00 2001
From: Brent Vatne <brentvatne@gmail.com>
Date: Wed, 5 Apr 2017 18:55:45 -0700
Subject: [PATCH 324/366] Move away from rnplay to snack, with embedded
 examples!

Summary:
React Native Playground has been sunset, so I've replaced the examples that previously used it with examples using [Snack](http://snack.expo.io/).

The examples are directly embedded and can be edited live to see updates. The code itself is also in the docs, so we can easily update the docs in one place and we don't have to actually go to a saved app on Snack and update it there.

Run it locally, go to the `Animations` section and the `Direct Manipulation` section.

![screen shot 2017-04-03 at 6 29 51 pm](https://cloud.githubusercontent.com/assets/90494/24638271/ff3ad044-189b-11e7-845d-24b2fb612d95.png)

Open it on your phone, notice that it falls back to just showing plain code.

<img src="https://cloud.githubusercontent.com/assets/90494/24638547/203ec8fc-189e-11e7-99c8-dfabff949f8d.PNG" width="250">

- Get rid of the Expo new user experience dialog that you see when you open a Snack -- is this a dealbreaker
Closes https://github.com/facebook/react-native/pull/13285

Differential Revision: D4828011

Pulled By: hramos

fbshipit-source-id: 684ad24a14deb72abb8587ffbb726d316f126d75
---
 docs/Animations.md                     | 168 +++++++++----------
 docs/DirectManipulation.md             |  51 +++---
 website/core/Marked.js                 |   7 +
 website/core/Site.js                   | 223 +++++++++++++++++++------
 website/core/SnackPlayer.js            | 115 +++++++++++++
 website/src/react-native/js/scripts.js |  44 ++++-
 6 files changed, 439 insertions(+), 169 deletions(-)
 create mode 100644 website/core/SnackPlayer.js

diff --git a/docs/Animations.md b/docs/Animations.md
index c97fe2b460b077..dfcf64ccecc9e1 100644
--- a/docs/Animations.md
+++ b/docs/Animations.md
@@ -26,34 +26,33 @@ The [`Animated`](docs/animated.html) API is designed to make it very easy to con
 
 For example, a container view that fades in when it is mounted may look like this:
 
-```javascript
-// FadeInView.js
-import React, { Component } from 'react';
-import {
-  Animated,
-} from 'react-native';
+```SnackPlayer
+import React from 'react';
+import { Animated, Text, View } from 'react-native';
 
-class FadeInView extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      fadeAnim: new Animated.Value(0),          // Initial value for opacity: 0
-    };
+class FadeInView extends React.Component {
+  state = {
+    fadeAnim: new Animated.Value(0),  // Initial value for opacity: 0
   }
+
   componentDidMount() {
-    Animated.timing(                            // Animate over time
-      this.state.fadeAnim,                      // The animated value to drive
+    Animated.timing(                  // Animate over time
+      this.state.fadeAnim,            // The animated value to drive
       {
-        toValue: 1,                             // Animate to opacity: 1, or fully opaque
+        toValue: 1,                   // Animate to opacity: 1 (opaque)
+        duration: 10000,              // Make it take a while
       }
-    ).start();                                  // Starts the animation
+    ).start();                        // Starts the animation
   }
+
   render() {
+    let { fadeAnim } = this.state;
+
     return (
-      <Animated.View                            // Special animatable View
+      <Animated.View                 // Special animatable View
         style={{
           ...this.props.style,
-          opacity: this.state.fadeAnim,          // Bind opacity to animated value
+          opacity: fadeAnim,         // Bind opacity to animated value
         }}
       >
         {this.props.children}
@@ -62,23 +61,20 @@ class FadeInView extends Component {
   }
 }
 
-module.exports = FadeInView;
-```
-
-You can then use your `FadeInView` in place of a `View` in your components, like so:
-
-```javascript
-render() {
-  return (
-    <FadeInView style={{width: 250, height: 50, backgroundColor: 'powderblue'}}>
-      <Text style={{fontSize: 28, textAlign: 'center', margin: 10}}>Fading in</Text>
-    </FadeInView>
-  )
+// You can then use your `FadeInView` in place of a `View` in your components:
+export default class App extends React.Component {
+  render() {
+    return (
+      <View style={{flex: 1, alignItems: 'center', justifyContent: 'center'}}>
+        <FadeInView style={{width: 250, height: 50, backgroundColor: 'powderblue'}}>
+          <Text style={{fontSize: 28, textAlign: 'center', margin: 10}}>Fading in</Text>
+        </FadeInView>
+      </View>
+    )
+  }
 }
 ```
 
-![FadeInView](img/AnimatedFadeInView.gif)
-
 Let's break down what's happening here.
 In the `FadeInView` constructor, a new `Animated.Value` called `fadeAnim` is initialized as part of `state`.
 The opacity property on the `View` is mapped to this animated value.
@@ -393,22 +389,29 @@ Note that in order to get this to work on **Android** you need to set the follow
 UIManager.setLayoutAnimationEnabledExperimental && UIManager.setLayoutAnimationEnabledExperimental(true);
 ```
 
-![](img/LayoutAnimationExample.gif)
+```SnackPlayer
+import React from 'react';
+import {
+  NativeModules,
+  LayoutAnimation,
+  Text,
+  TouchableOpacity,
+  StyleSheet,
+  View,
+} from 'react-native';
+
+const { UIManager } = NativeModules;
 
-```javascript
-class App extends React.Component {
-  constructor(props) {
-    super(props);
-    this.state = { w: 100, h: 100 };
-    this._onPress = this._onPress.bind(this);
-  }
+UIManager.setLayoutAnimationEnabledExperimental &&
+  UIManager.setLayoutAnimationEnabledExperimental(true);
 
-  componentWillMount() {
-    // Animate creation
-    LayoutAnimation.spring();
-  }
+export default class App extends React.Component {
+  state = {
+    w: 100,
+    h: 100,
+  };
 
-  _onPress() {
+  _onPress = () => {
     // Animate the update
     LayoutAnimation.spring();
     this.setState({w: this.state.w + 15, h: this.state.h + 15})
@@ -427,8 +430,30 @@ class App extends React.Component {
     );
   }
 }
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+  box: {
+    width: 200,
+    height: 200,
+    backgroundColor: 'red',
+  },
+  button: {
+    backgroundColor: 'black',
+    paddingHorizontal: 20,
+    paddingVertical: 15,
+    marginTop: 15,
+  },
+  buttonText: {
+    color: '#fff',
+    fontWeight: 'bold',
+  },
+});
 ```
-[Run this example](https://rnplay.org/apps/uaQrGQ)
 
 This example uses a preset value, you can customize the animations as
 you need, see [LayoutAnimation.js](https://github.com/facebook/react-native/blob/master/Libraries/LayoutAnimation/LayoutAnimation.js)
@@ -457,45 +482,12 @@ We could use this in the Rebound example to update the scale - this
 might be helpful if the component that we are updating is deeply nested
 and hasn't been optimized with `shouldComponentUpdate`.
 
-```javascript
-// Back inside of the App component, replace the scrollSpring listener
-// in componentWillMount with this:
-this._scrollSpring.addListener({
-  onSpringUpdate: () => {
-    if (!this._photo) { return }
-    var v = this._scrollSpring.getCurrentValue();
-    var newProps = {style: {transform: [{scaleX: v}, {scaleY: v}]}};
-    this._photo.setNativeProps(newProps);
-  },
-});
-
-// Lastly, we update the render function to no longer pass in the
-// transform via style (avoid clashes when re-rendering) and to set the
-// photo ref
-render() {
-  return (
-    <View style={styles.container}>
-      <TouchableWithoutFeedback onPressIn={this._onPressIn} onPressOut={this._onPressOut}>
-        <Image ref={component => this._photo = component}
-               source={{uri: "img/ReboundExample.png"}}
-               style={{width: 250, height: 200}} />
-      </TouchableWithoutFeedback>
-    </View>
-  );
-}
-```
-[Run this example](https://rnplay.org/apps/fUqjAg)
-
-It would not make sense to use `setNativeProps` with react-tween-state
-because the updated tween values are set on the state automatically by
-the library - Rebound on the other hand gives us an updated value for
-each frame with the `onSpringUpdate` function.
-
-If you find your animations with dropping frames (performing below 60
-frames per second), look into using `setNativeProps` or
-`shouldComponentUpdate` to optimize them. You may also want to defer any
-computationally intensive work until after animations are complete,
-using the
-[InteractionManager](docs/interactionmanager.html). You
-can monitor the frame rate by using the In-App Developer Menu "FPS
-Monitor" tool.
+If you find your animations with dropping frames (performing below 60 frames
+per second), look into using `setNativeProps` or `shouldComponentUpdate` to
+optimize them. Or you could run the animations on the UI thread rather than
+the JavaScript thread [with the useNativeDriver
+option](http://facebook.github.io/react-native/blog/2017/02/14/using-native-driver-for-animated.html).
+You may also want to defer any computationally intensive work until after
+animations are complete, using the
+[InteractionManager](docs/interactionmanager.html). You can monitor the
+frame rate by using the In-App Developer Menu "FPS Monitor" tool.
\ No newline at end of file
diff --git a/docs/DirectManipulation.md b/docs/DirectManipulation.md
index 8c692544d5791e..ae0924cde9f388 100644
--- a/docs/DirectManipulation.md
+++ b/docs/DirectManipulation.md
@@ -94,7 +94,10 @@ ReactNativeBaseComponent.js](https://github.com/facebook/react/blob/master/src/r
 Composite components are not backed by a native view, so you cannot call
 `setNativeProps` on them. Consider this example:
 
-```javascript
+```SnackPlayer?name=setNativeProps%20with%20Composite%20Components
+import React from 'react';
+import { Text, TouchableOpacity, View } from 'react-native';
+
 class MyButton extends React.Component {
   render() {
     return (
@@ -105,7 +108,7 @@ class MyButton extends React.Component {
   }
 }
 
-class App extends React.Component {
+export default class App extends React.Component {
   render() {
     return (
       <TouchableOpacity>
@@ -115,7 +118,6 @@ class App extends React.Component {
   }
 }
 ```
-[Run this example](https://rnplay.org/apps/JXkgmQ)
 
 If you run this you will immediately see this error: `Touchable child
 must either be native or forward setNativeProps to a native component`.
@@ -133,9 +135,12 @@ All we need to do is provide a `setNativeProps` method on our component
 that calls `setNativeProps` on the appropriate child with the given
 arguments.
 
-```javascript
+```SnackPlayer?name=Forwarding%20setNativeProps
+import React from 'react';
+import { Text, TouchableOpacity, View } from 'react-native';
+
 class MyButton extends React.Component {
-  setNativeProps(nativeProps) {
+  setNativeProps = (nativeProps) => {
     this._root.setNativeProps(nativeProps);
   }
 
@@ -147,8 +152,17 @@ class MyButton extends React.Component {
     )
   }
 }
+
+export default class App extends React.Component {
+  render() {
+    return (
+      <TouchableOpacity>
+        <MyButton label="Press me!" />
+      </TouchableOpacity>
+    )
+  }
+}
 ```
-[Run this example](https://rnplay.org/apps/YJxnEQ)
 
 You can now use `MyButton` inside of `TouchableOpacity`! A sidenote for
 clarity: we used the [ref callback](https://facebook.github.io/react/docs/more-about-refs.html#the-ref-callback-attribute) syntax here, rather than the traditional string-based ref.
@@ -173,22 +187,22 @@ use `setNativeProps` to directly manipulate the TextInput value when
 necessary. For example, the following code demonstrates clearing the
 input when you tap a button:
 
-```javascript
-class App extends React.Component {
-  constructor(props) {
-    super(props);
-    this.clearText = this.clearText.bind(this);
-  }
+```SnackPlayer?name=Clear%20text
+import React from 'react';
+import { TextInput, Text, TouchableOpacity, View } from 'react-native';
 
-  clearText() {
+export default class App extends React.Component {
+  clearText = () => {
     this._textInput.setNativeProps({text: ''});
   }
 
   render() {
     return (
-      <View style={styles.container}>
-        <TextInput ref={component => this._textInput = component}
-                   style={styles.textInput} />
+      <View style={{flex: 1}}>
+        <TextInput
+          ref={component => this._textInput = component}
+          style={{height: 50, flex: 1, marginHorizontal: 20, borderWidth: 1, borderColor: '#ccc'}}
+        />
         <TouchableOpacity onPress={this.clearText}>
           <Text>Clear text</Text>
         </TouchableOpacity>
@@ -197,7 +211,6 @@ class App extends React.Component {
   }
 }
 ```
-[Run this example](https://rnplay.org/plays/pOI9bA)
 
 ## Avoiding conflicts with the render function
 
@@ -205,9 +218,7 @@ If you update a property that is also managed by the render function,
 you might end up with some unpredictable and confusing bugs because
 anytime the component re-renders and that property changes, whatever
 value was previously set from `setNativeProps` will be completely
-ignored and overridden. [See this example](https://rnplay.org/apps/bp1DvQ)
-for a demonstration of what can happen if these two collide - notice
-the jerky animation each 250ms when `setState` triggers a re-render.
+ignored and overridden.
 
 ## setNativeProps & shouldComponentUpdate
 
diff --git a/website/core/Marked.js b/website/core/Marked.js
index f727315cc06e08..64bc26feba7408 100644
--- a/website/core/Marked.js
+++ b/website/core/Marked.js
@@ -15,6 +15,7 @@ var Header = require('Header');
 var Prism = require('Prism');
 var React = require('React');
 var WebPlayer = require('WebPlayer');
+var SnackPlayer = require('SnackPlayer');
 
 /**
  * Block-Level Grammar
@@ -842,6 +843,12 @@ Parser.prototype.tok = function() {
         );
       }
 
+      if (lang && lang.indexOf('SnackPlayer') === 0) {
+        return (
+          <SnackPlayer params={lang.split('?')[1]}>{text}</SnackPlayer>
+        );
+      }
+
       return <Prism>{text}</Prism>;
     }
     case 'table': {
diff --git a/website/core/Site.js b/website/core/Site.js
index 736b8a7170c2d2..286aa06b05d2c0 100644
--- a/website/core/Site.js
+++ b/website/core/Site.js
@@ -20,9 +20,11 @@ var Site = React.createClass({
     const version = Metadata.config.RN_VERSION;
     const algoliaVersion = version === 'next' ? 'master' : version;
     var basePath = '/react-native/' + (path ? path + '/' : '');
-    var currentYear = (new Date()).getFullYear();
+    var currentYear = new Date().getFullYear();
 
-    var title = this.props.title ? this.props.title : 'React Native | A framework for building native apps using React';
+    var title = this.props.title
+      ? this.props.title
+      : 'React Native | A framework for building native apps using React';
 
     var metaTags = [
       { charSet: 'utf-8' },
@@ -35,8 +37,8 @@ var Site = React.createClass({
         content: 'width=device-width',
       },
       // Facebook
-      { property: 'fb:app_id', content: '1677033832619985', },
-      { property: 'fb:admins', content: '121800083', },
+      { property: 'fb:app_id', content: '1677033832619985' },
+      { property: 'fb:admins', content: '121800083' },
       // Open Graph
       {
         property: 'og:site_name',
@@ -48,15 +50,20 @@ var Site = React.createClass({
       },
       {
         property: 'og:url',
-        content: 'https://facebook.github.io/react-native/' + (this.props.path ? this.props.path : 'index.html'),
+        content: 'https://facebook.github.io/react-native/' +
+          (this.props.path ? this.props.path : 'index.html'),
       },
       {
         property: 'og:image',
-        content: this.props.image ? this.props.image : 'https://facebook.github.io/react-native/img/opengraph.png',
+        content: this.props.image
+          ? this.props.image
+          : 'https://facebook.github.io/react-native/img/opengraph.png',
       },
       {
         property: 'og:description',
-        content: this.props.description ? this.props.description : 'A framework for building native apps using React',
+        content: this.props.description
+          ? this.props.description
+          : 'A framework for building native apps using React',
       },
       // Twitter Cards
       {
@@ -69,18 +76,23 @@ var Site = React.createClass({
       },
     ];
 
-    var typeTags = [{
-      property: 'og:type',
-      content: 'website',
-    }];
-    if (this.props.author) {
-      typeTags = [{
+    var typeTags = [
+      {
         property: 'og:type',
-        content: 'article',
-      }, {
-        property: 'article:author',
-        content: this.props.author,
-      }];
+        content: 'website',
+      },
+    ];
+    if (this.props.author) {
+      typeTags = [
+        {
+          property: 'og:type',
+          content: 'article',
+        },
+        {
+          property: 'article:author',
+          content: this.props.author,
+        },
+      ];
     }
     metaTags.push(...typeTags);
 
@@ -95,27 +107,46 @@ var Site = React.createClass({
       <html>
         <head>
           <title>{title}</title>
-          {
-            metaTags.map((tag, index) =>
-              <meta key={index} {...tag} />)
-          }
+          {metaTags.map((tag, index) => <meta key={index} {...tag} />)}
 
           <base href={basePath} />
 
-          <link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/1/docsearch.min.css" />
+          <link
+            rel="stylesheet"
+            href="https://cdn.jsdelivr.net/docsearch.js/1/docsearch.min.css"
+          />
 
           <link rel="shortcut icon" href="img/favicon.png?2" />
           <link rel="stylesheet" href="css/react-native.css" />
 
-          <link rel="alternate" type="application/rss+xml" title="React Native Blog" href="https://facebook.github.io/react-native/blog/feed.xml" />
-          <link href="//cdn-images.mailchimp.com/embedcode/horizontal-slim-10_7.css" rel="stylesheet" type="text/css" />
+          <link
+            rel="alternate"
+            type="application/rss+xml"
+            title="React Native Blog"
+            href="https://facebook.github.io/react-native/blog/feed.xml"
+          />
+          <link
+            href="//cdn-images.mailchimp.com/embedcode/horizontal-slim-10_7.css"
+            rel="stylesheet"
+            type="text/css"
+          />
 
           <script type="text/javascript" src="//use.typekit.net/vqa1hcx.js" />
-          <script type="text/javascript">{'try{Typekit.load();}catch(e){}'}</script>
+          <script type="text/javascript">
+            {'try{Typekit.load();}catch(e){}'}
+          </script>
         </head>
         <body>
-          <script dangerouslySetInnerHTML={{__html: "window.fbAsyncInit = function() {FB.init({appId:'1677033832619985',xfbml:true,version:'v2.7'});};(function(d, s, id){var js, fjs = d.getElementsByTagName(s)[0];if (d.getElementById(id)) {return;}js = d.createElement(s); js.id = id;js.src = '//connect.facebook.net/en_US/sdk.js';fjs.parentNode.insertBefore(js, fjs);}(document, 'script','facebook-jssdk'));"}} />
-          <script dangerouslySetInnerHTML={{__html: "window.twttr=(function(d,s, id){var js,fjs=d.getElementsByTagName(s)[0],t=window.twttr||{};if(d.getElementById(id))return t;js=d.createElement(s);js.id=id;js.src='https://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js, fjs);t._e = [];t.ready = function(f) {t._e.push(f);};return t;}(document, 'script', 'twitter-wjs'));"}} />
+          <script
+            dangerouslySetInnerHTML={{
+              __html: "window.fbAsyncInit = function() {FB.init({appId:'1677033832619985',xfbml:true,version:'v2.7'});};(function(d, s, id){var js, fjs = d.getElementsByTagName(s)[0];if (d.getElementById(id)) {return;}js = d.createElement(s); js.id = id;js.src = '//connect.facebook.net/en_US/sdk.js';fjs.parentNode.insertBefore(js, fjs);}(document, 'script','facebook-jssdk'));",
+            }}
+          />
+          <script
+            dangerouslySetInnerHTML={{
+              __html: "window.twttr=(function(d,s, id){var js,fjs=d.getElementsByTagName(s)[0],t=window.twttr||{};if(d.getElementById(id))return t;js=d.createElement(s);js.id=id;js.src='https://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js, fjs);t._e = [];t.ready = function(f) {t._e.push(f);};return t;}(document, 'script', 'twitter-wjs'));",
+            }}
+          />
           <div className="container">
             <div className="nav-main">
               <div className="wrap">
@@ -135,57 +166,128 @@ var Site = React.createClass({
             <footer className="nav-footer">
               <section className="sitemap">
                 <a href="/react-native" className="nav-home">
-                  <img src="img/header_logo.png" alt="React Native" width="66" height="58" />
+                  <img
+                    src="img/header_logo.png"
+                    alt="React Native"
+                    width="66"
+                    height="58"
+                  />
                 </a>
                 <div>
                   <h5><a href="docs/">Docs</a></h5>
                   <a href="docs/getting-started.html">Getting Started</a>
                   <a href="docs/tutorial.html">Tutorial</a>
-                  <a href="docs/integration-with-existing-apps.html">Integration With Existing Apps</a>
+                  <a href="docs/integration-with-existing-apps.html">
+                    Integration With Existing Apps
+                  </a>
                   <a href="docs/more-resources.html">More Resources</a>
                 </div>
                 <div>
                   <h5><a href="/react-native/support.html">Community</a></h5>
                   <a href="/react-native/showcase.html">Showcase</a>
-                  <a href="http://www.meetup.com/topics/react-native/" target="_blank">Upcoming Events</a>
-                  <a href="https://www.facebook.com/groups/react.native.community" target="_blank">Facebook Group</a>
-                  <a href="https://twitter.com/reactnative" target="_blank">Twitter</a>
+                  <a
+                    href="http://www.meetup.com/topics/react-native/"
+                    target="_blank">
+                    Upcoming Events
+                  </a>
+                  <a
+                    href="https://www.facebook.com/groups/react.native.community"
+                    target="_blank">
+                    Facebook Group
+                  </a>
+                  <a href="https://twitter.com/reactnative" target="_blank">
+                    Twitter
+                  </a>
                 </div>
                 <div>
                   <h5><a href="/react-native/support.html">Help</a></h5>
-                  <a href="http://stackoverflow.com/questions/tagged/react-native" target="_blank">Stack Overflow</a>
-                  <a href="https://discord.gg/0ZcbPKXt5bZjGY5n">Reactiflux Chat</a>
-                  <a href="/react-native/versions.html" target="_blank">Latest Releases</a>
-                  <a href="https://react-native.canny.io/feature-requests" target="_blank">Feature Requests</a>
+                  <a
+                    href="http://stackoverflow.com/questions/tagged/react-native"
+                    target="_blank">
+                    Stack Overflow
+                  </a>
+                  <a href="https://discord.gg/0ZcbPKXt5bZjGY5n">
+                    Reactiflux Chat
+                  </a>
+                  <a href="/react-native/versions.html" target="_blank">
+                    Latest Releases
+                  </a>
+                  <a
+                    href="https://react-native.canny.io/feature-requests"
+                    target="_blank">
+                    Feature Requests
+                  </a>
                 </div>
                 <div>
                   <h5>More</h5>
                   <a href="/react-native/blog">Blog</a>
-                  <a href="https://github.com/facebook/react-native" target="_blank">GitHub</a>
-                  <a href="http://facebook.github.io/react/" target="_blank">React</a>
+                  <a
+                    href="https://github.com/facebook/react-native"
+                    target="_blank">
+                    GitHub
+                  </a>
+                  <a href="http://facebook.github.io/react/" target="_blank">
+                    React
+                  </a>
                 </div>
               </section>
               <section className="newsletter">
                 <div id="mc_embed_signup">
-                  <form action="//reactnative.us10.list-manage.com/subscribe/post?u=db0dd948e2b729ee62625b1a8&amp;id=47cd41008f" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" className="validate" target="_blank" noValidate>
+                  <form
+                    action="//reactnative.us10.list-manage.com/subscribe/post?u=db0dd948e2b729ee62625b1a8&amp;id=47cd41008f"
+                    method="post"
+                    id="mc-embedded-subscribe-form"
+                    name="mc-embedded-subscribe-form"
+                    className="validate"
+                    target="_blank"
+                    noValidate>
                     <div id="mc_embed_signup_scroll">
                       <label htmlFor="mce-EMAIL">
                         <h5>Get the React Native Newsletter</h5>
                       </label>
-                      <input type="email" value="" name="EMAIL" className="email" id="mce-EMAIL" placeholder="email address" required />
-                      <div style={{position: 'absolute', left: '-5000px'}} aria-hidden="true">
-                        <input type="text" name="b_db0dd948e2b729ee62625b1a8_47cd41008f" tabIndex="-1" value="" />
+                      <input
+                        type="email"
+                        value=""
+                        name="EMAIL"
+                        className="email"
+                        id="mce-EMAIL"
+                        placeholder="email address"
+                        required
+                      />
+                      <div
+                        style={{ position: 'absolute', left: '-5000px' }}
+                        aria-hidden="true">
+                        <input
+                          type="text"
+                          name="b_db0dd948e2b729ee62625b1a8_47cd41008f"
+                          tabIndex="-1"
+                          value=""
+                        />
                       </div>
                       <div className="clear">
-                        <input type="submit" value="Sign up" name="subscribe" id="mc-embedded-subscribe" className="button" />
+                        <input
+                          type="submit"
+                          value="Sign up"
+                          name="subscribe"
+                          id="mc-embedded-subscribe"
+                          className="button"
+                        />
                       </div>
                     </div>
                   </form>
                 </div>
               </section>
 
-              <a href="https://code.facebook.com/projects/" target="_blank" className="fbOpenSource">
-                <img src="img/oss_logo.png" alt="Facebook Open Source" width="170" height="45"/>
+              <a
+                href="https://code.facebook.com/projects/"
+                target="_blank"
+                className="fbOpenSource">
+                <img
+                  src="img/oss_logo.png"
+                  alt="Facebook Open Source"
+                  width="170"
+                  height="45"
+                />
               </a>
               <section className="copyright">
                 Copyright © {currentYear} Facebook Inc.
@@ -194,8 +296,13 @@ var Site = React.createClass({
           </div>
 
           <div id="fb-root" />
-          <script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/1/docsearch.min.js" />
-          <script dangerouslySetInnerHTML={{__html: `
+          <script
+            type="text/javascript"
+            src="https://cdn.jsdelivr.net/docsearch.js/1/docsearch.min.js"
+          />
+          <script
+            dangerouslySetInnerHTML={{
+              __html: `
             (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
             (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
             m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
@@ -213,15 +320,25 @@ var Site = React.createClass({
               inputSelector: '#algolia-doc-search',
               algoliaOptions: { facetFilters: [ "tags:${algoliaVersion}" ], hitsPerPage: 5 }
             });
-          `}} />
+          `,
+            }}
+          />
           <script src="js/scripts.js" />
           {/* Mailchimp Inline form-submission script for the React Native newsletter sign up form */}
-          <script type="text/javascript" src="//s3.amazonaws.com/downloads.mailchimp.com/js/mc-validate.js" />
-          <script type="text/javascript" dangerouslySetInnerHTML={{__html: "(function($) {window.fnames = new Array(); window.ftypes = new Array();fnames[0]='EMAIL';ftypes[0]='email';fnames[1]='FNAME';ftypes[1]='text';fnames[2]='LNAME';ftypes[2]='text';}(jQuery));var $mcj = jQuery.noConflict(true);"}} />
+          <script
+            type="text/javascript"
+            src="//s3.amazonaws.com/downloads.mailchimp.com/js/mc-validate.js"
+          />
+          <script
+            type="text/javascript"
+            dangerouslySetInnerHTML={{
+              __html: "(function($) {window.fnames = new Array(); window.ftypes = new Array();fnames[0]='EMAIL';ftypes[0]='email';fnames[1]='FNAME';ftypes[1]='text';fnames[2]='LNAME';ftypes[2]='text';}(jQuery));var $mcj = jQuery.noConflict(true);",
+            }}
+          />
+          <script type="text/javascript" src="https://snack.expo.io/embed.js" />
         </body>
       </html>
     );
-  }
+  },
 });
-
 module.exports = Site;
diff --git a/website/core/SnackPlayer.js b/website/core/SnackPlayer.js
new file mode 100644
index 00000000000000..18cb262f769a21
--- /dev/null
+++ b/website/core/SnackPlayer.js
@@ -0,0 +1,115 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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 SnackPlayer
+ */
+'use strict';
+
+var Prism = require('Prism');
+var React = require('React');
+
+const LatestSDKVersion = '15.0.0';
+var ReactNativeToExpoSDKVersionMap = {
+  '0.42': '15.0.0',
+  '0.41': '14.0.0',
+};
+
+/**
+ * Use the SnackPlayer by including a ```SnackPlayer``` block in markdown.
+ *
+ * Optionally, include url parameters directly after the block's language.
+ * Valid options are name, description, and platform.
+ *
+ * E.g.
+ * ```SnackPlayer?platform=android&name=Hello%20world!
+ * import React from 'react';
+ * import { Text } from 'react-native';
+ *
+ * export default class App extends React.Component {
+ *   render() {
+ *     return <Text>Hello World!</Text>;
+ *   }
+ * }
+ * ```
+ */
+var SnackPlayer = React.createClass({
+  contextTypes: {
+    version: React.PropTypes.number.isRequired,
+  },
+
+  componentDidMount() {
+    window.ExpoSnack && window.ExpoSnack.initialize();
+  },
+
+  render() {
+    var code = encodeURIComponent(this.props.children);
+    var params = this.parseParams(this.props.params);
+    var platform = params.platform ? params.platform : 'ios';
+    var name = params.name ? decodeURIComponent(params.name) : 'Example';
+    var description = params.description
+      ? decodeURIComponent(params.description)
+      : 'Example usage';
+
+    var optionalProps = {};
+    var { version } = this.context;
+    if (version === 'next') {
+      optionalProps['data-snack-sdk-version'] = LatestSDKVersion;
+    } else {
+      optionalProps['data-snack-sdk-version'] = ReactNativeToExpoSDKVersionMap[
+        version
+      ] || LatestSDKVersion;
+    }
+
+    return (
+      <div className="snack-player">
+        <div className="mobile-friendly-snack" style={{ display: 'none' }}>
+          <Prism>
+            {this.props.children}
+          </Prism>
+        </div>
+
+        <div
+          className="desktop-friendly-snack"
+          style={{ marginTop: 15, marginBottom: 15 }}>
+          <div
+            data-snack-name={name}
+            data-snack-description={description}
+            data-snack-code={code}
+            data-snack-platform={platform}
+            data-snack-preview="true"
+            {...optionalProps}
+            style={{
+              overflow: 'hidden',
+              background: '#fafafa',
+              border: '1px solid rgba(0,0,0,.16)',
+              borderRadius: '4px',
+              height: '514px',
+              width: '880px',
+            }}
+          />
+        </div>
+      </div>
+    );
+  },
+
+  parseParams: function(paramString) {
+    var params = {};
+
+    if (paramString) {
+      var pairs = paramString.split('&');
+      for (var i = 0; i < pairs.length; i++) {
+        var pair = pairs[i].split('=');
+        params[pair[0]] = pair[1];
+      }
+    }
+
+    return params;
+  },
+});
+
+module.exports = SnackPlayer;
diff --git a/website/src/react-native/js/scripts.js b/website/src/react-native/js/scripts.js
index ed2bb3eb695adf..a6294fbbc0faac 100644
--- a/website/src/react-native/js/scripts.js
+++ b/website/src/react-native/js/scripts.js
@@ -23,7 +23,9 @@
     var mobile = isMobile();
 
     if (mobile) {
-      document.querySelector('.nav-site-wrapper a[data-target]').addEventListener('click', toggleTarget);
+      document
+        .querySelector('.nav-site-wrapper a[data-target]')
+        .addEventListener('click', toggleTarget);
     }
 
     var webPlayerList = document.querySelectorAll('.web-player');
@@ -33,13 +35,36 @@
       webPlayerList[i].classList.add(mobile ? 'mobile' : 'desktop');
 
       if (!mobile) {
-
         // Determine location to look up required assets
-        var assetRoot = encodeURIComponent(document.location.origin + '/react-native');
+        var assetRoot = encodeURIComponent(
+          document.location.origin + '/react-native'
+        );
 
         // Set iframe src. Do this dynamically so the iframe never loads on mobile.
         var iframe = webPlayerList[i].querySelector('iframe');
-        iframe.src = iframe.getAttribute('data-src') + '&assetRoot=' + assetRoot;
+        iframe.src = iframe.getAttribute('data-src') +
+          '&assetRoot=' +
+          assetRoot;
+      }
+    }
+
+    var snackPlayerList = document.querySelectorAll('.snack-player');
+
+    // Either show interactive or static code block, depending on desktop or mobile
+    for (var i = 0; i < snackPlayerList.length; ++i) {
+      var snackPlayer = snackPlayerList[i];
+      var snackDesktopPlayer = snackPlayer.querySelectorAll(
+        '.desktop-friendly-snack'
+      )[0];
+      var plainCodeExample = snackPlayer.querySelectorAll(
+        '.mobile-friendly-snack'
+      )[0];
+
+      if (mobile) {
+        snackDesktopPlayer.remove();
+        plainCodeExample.style.display = 'block';
+      } else {
+        plainCodeExample.remove();
       }
     }
 
@@ -86,7 +111,9 @@
 
   var toggledTarget;
   function toggleTarget(event) {
-    var target = document.body.querySelector(event.target.getAttribute('data-target'));
+    var target = document.body.querySelector(
+      event.target.getAttribute('data-target')
+    );
 
     if (target) {
       event.preventDefault();
@@ -104,7 +131,8 @@
 
   // Primitive mobile detection
   function isMobile() {
-    return ( /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent) );
+    return /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(
+      navigator.userAgent
+    );
   }
-
-}());
+})();

From 85d5a0e5be243b8ea7f98c609fe9945fe0a77806 Mon Sep 17 00:00:00 2001
From: Douglas Lowder <dlowder@salesforce.com>
Date: Wed, 5 Apr 2017 18:57:47 -0700
Subject: [PATCH 325/366] Apple TV documentation

Summary:
**Motivation**: Website documentation for the core Apple TV support.
Closes https://github.com/facebook/react-native/pull/13278

Differential Revision: D4839904

Pulled By: hramos

fbshipit-source-id: e8b78f3601915072c0d809b05b4b5ca61828f277
---
 docs/BuildingForAppleTV.md | 95 ++++++++++++++++++++++++++++++++++++++
 docs/CommunicationIOS.md   |  2 +-
 docs/Testing.md            | 11 ++++-
 3 files changed, 106 insertions(+), 2 deletions(-)
 create mode 100644 docs/BuildingForAppleTV.md

diff --git a/docs/BuildingForAppleTV.md b/docs/BuildingForAppleTV.md
new file mode 100644
index 00000000000000..fd7887d7c61ee5
--- /dev/null
+++ b/docs/BuildingForAppleTV.md
@@ -0,0 +1,95 @@
+---
+id: building-for-apple-tv
+title: Building For Apple TV
+layout: docs
+category: Guides (Apple TV)
+permalink: docs/building-for-apple-tv.html
+banner: ejected
+next: native-modules-android
+previous: communication-ios
+---
+
+Apple TV support has been implemented with the intention of making existing React Native iOS applications "just work" on tvOS, with few or no changes needed in the JavaScript code for the applications.
+
+The UIExplorer example project supports Apple TV; use the `UIExplorer-tvOS` build target to build for tvOS.
+
+## Build changes
+
+- *Native layer*: React Native Xcode projects all now have Apple TV build targets, with names ending in the string '-tvOS'.
+
+- *react-native init*: New React Native projects created with `react-native init` will have Apple TV target automatically created in their XCode projects.
+
+- *JavaScript layer*: Support for Apple TV has been added to `Platform.ios.js`.  You can check whether code is running on AppleTV by doing
+
+```js
+var Platform = require('Platform');
+var running_on_apple_tv = Platform.isTVOS;
+```
+
+## Code changes
+
+- *General support for tvOS*: Apple TV specific changes in native code are all wrapped by the TARGET_OS_TV define.  These include changes to suppress APIs that are not supported on tvOS (e.g. web views, sliders, switches, status bar, etc.), and changes to support user input from the TV remote or keyboard.
+
+- *Common codebase*:  Since tvOS and iOS share most Objective-C and JavaScript code in common, most documentation for iOS applies equally to tvOS.
+
+- *Access to touchable controls*: When running on Apple TV, the native view class is `RCTTVView`, which has additional methods to make use of the tvOS focus engine.  The `Touchable` mixin has code added to detect focus changes and use existing methods to style the components properly and initiate the proper actions when the view is selected using the TV remote, so `TouchableHighlight` and `TouchableOpacity` will "just work".  In particular:
+
+  - `touchableHandleActivePressIn` will be executed when the touchable view goes into focus
+  - `touchableHandleActivePressOut` will be executed when the touchable view goes out of focus
+  - `touchableHandlePress` will be executed when the touchable view is actually selected by pressing the "select" button on the TV remote.
+
+- *TV remote/keyboard input*: A new native class, `RCTTVRemoteHandler`, sets up gesture recognizers for TV remote events.  When TV remote events occur, this class fires notifications that are picked up by `RCTTVNavigationEventEmitter` (a subclass of `RCTEventEmitter`), that fires a JS event.  This event will be picked up by instances of the `TVEventHandler` JavaScript object.  Application code that needs to implement custom handling of TV remote events can create an instance of `TVEventHandler` and listen for these events, as in the following code:
+
+```js
+var TVEventHandler = require('TVEventHandler');
+
+.
+.
+.
+
+class Game2048 extends React.Component {
+  _tvEventHandler: any;
+
+  _enableTVEventHandler() {
+    this._tvEventHandler = new TVEventHandler();
+    this._tvEventHandler.enable(this, function(cmp, evt) {
+      if (evt && evt.eventType === 'right') {
+        cmp.setState({board: cmp.state.board.move(2)});
+      } else if(evt && evt.eventType === 'up') {
+        cmp.setState({board: cmp.state.board.move(1)});
+      } else if(evt && evt.eventType === 'left') {
+        cmp.setState({board: cmp.state.board.move(0)});
+      } else if(evt && evt.eventType === 'down') {
+        cmp.setState({board: cmp.state.board.move(3)});
+      } else if(evt && evt.eventType === 'playPause') {
+        cmp.restartGame();
+      }
+    });
+  }
+
+  _disableTVEventHandler() {
+    if (this._tvEventHandler) {
+      this._tvEventHandler.disable();
+      delete this._tvEventHandler;
+    }
+  }
+
+  componentDidMount() {
+    this._enableTVEventHandler();
+  }
+
+  componentWillUnmount() {
+    this._disableTVEventHandler();
+  }
+
+```
+
+- *TV remote animations*: `RCTTVView` native code implements Apple-recommended parallax animations to help guide the eye as the user navigates through views.  The animations can be disabled or adjusted with new optional view properties. 
+
+- *Back navigation with the TV remote menu button*: The `BackHandler` component, originally written to support the Android back button, now also supports back navigation on the Apple TV using the menu button on the TV remote.
+
+- *Known issues*:
+
+  - [ListView scrolling](https://github.com/facebook/react-native/issues/12793).  The issue can be easily worked around by setting `removeClippedSubviews` to false in ListView and similar components.  For more discussion of this issue, see [this PR](https://github.com/facebook/react-native/pull/12944).
+
+
diff --git a/docs/CommunicationIOS.md b/docs/CommunicationIOS.md
index 95b3ea0bed122c..54aea93c97db8f 100644
--- a/docs/CommunicationIOS.md
+++ b/docs/CommunicationIOS.md
@@ -5,7 +5,7 @@ layout: docs
 category: Guides (iOS)
 permalink: docs/communication-ios.html
 banner: ejected
-next: native-modules-android
+next: building-for-apple-tv
 previous: linking-libraries-ios
 ---
 
diff --git a/docs/Testing.md b/docs/Testing.md
index eb7121788fdc80..41b8494875fb43 100644
--- a/docs/Testing.md
+++ b/docs/Testing.md
@@ -97,7 +97,7 @@ See the following for example usage and integration points:
 You can run integration tests locally with cmd+U in the IntegrationTest and UIExplorer apps in Xcode, or by running the following in the command line on macOS:
 
     $ cd react-native
-    $ ./scripts/objc-test-ios.sh test
+    $ ./scripts/objc-test-ios.sh
 
 > Your Xcode install will come with a variety of Simulators running the latest OS. You may need to manually create a new Simulator to match what the `XCODE_DESTINATION` param in the test script.
 
@@ -107,6 +107,15 @@ A common type of integration test is the snapshot test.  These tests render a co
 
 If you make a change that affects a snapshot test in a PR, such as adding a new example case to one of the examples that is snapshotted, you'll need to re-record the snapshot reference image.  To do this, simply change to `_runner.recordMode = YES;` in [UIExplorer/UIExplorerSnapshotTests.m](https://github.com/facebook/react-native/blob/master/Examples/UIExplorer/UIExplorerIntegrationTests/UIExplorerSnapshotTests.m#L42), re-run the failing tests, then flip record back to `NO` and submit/update your PR and wait to see if the Travis build passes.
 
+## Apple TV
+
+The same tests discussed above for iOS will also run on tvOS.  In the UIExplorer Xcode project, select the UIExplorer-tvOS target, and you can follow the same steps above to run the tests in Xcode.
+
+You can run Apple TV unit and integration tests locally by running the following in the command line on macOS:
+
+    $ cd react-native
+    $ ./scripts/objc-test-tvos.sh (make sure the line `TEST="test"` is uncommented)
+
 ## End-to-end tests
 
 Finally, make sure end-to-end tests run successfully by executing the following script:

From 37c1678421c5c8406980da93e0c189e4d65e41fd Mon Sep 17 00:00:00 2001
From: Alex Dvornikov <advornikov@fb.com>
Date: Wed, 5 Apr 2017 19:44:39 -0700
Subject: [PATCH 326/366] Report JS errors in debug console

Reviewed By: javache

Differential Revision: D4835405

fbshipit-source-id: d10658d1b885048ea3495388450208bb0e29ee5b
---
 React/Base/RCTJSStackFrame.m | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/React/Base/RCTJSStackFrame.m b/React/Base/RCTJSStackFrame.m
index e102ed059ba0dc..a199f72e44d516 100644
--- a/React/Base/RCTJSStackFrame.m
+++ b/React/Base/RCTJSStackFrame.m
@@ -8,6 +8,7 @@
  */
 
 #import "RCTJSStackFrame.h"
+
 #import "RCTLog.h"
 #import "RCTUtils.h"
 
@@ -98,4 +99,14 @@ + (instancetype)stackFrameWithDictionary:(NSDictionary *)dict
   return stack;
 }
 
+- (NSString *)description {
+  return [NSString stringWithFormat:@"<%@: %p method name: %@; file name: %@; line: %ld; column: %ld>",
+          self.class,
+          self,
+          self.methodName,
+          self.file,
+          (long)self.lineNumber,
+          (long)self.column];
+}
+
 @end

From fd99330b6caee444616329cab061473740db0d3b Mon Sep 17 00:00:00 2001
From: Theo Yaung <theoy@fb.com>
Date: Thu, 6 Apr 2017 00:01:37 -0700
Subject: [PATCH 327/366] Refactor interfaces

Reviewed By: johnislarry

Differential Revision: D4840716

fbshipit-source-id: 1a82437c81ce5b767efd39ab0716998bab4f5363
---
 ReactAndroid/src/main/jni/xreact/jni/BUCK     |  1 -
 .../src/main/jni/xreact/jni/JInspector.cpp    | 19 ++++---
 .../src/main/jni/xreact/jni/JInspector.h      | 12 ++--
 .../src/main/jni/xreact/jni/OnLoad.cpp        |  4 +-
 ReactCommon/cxxreact/BUCK                     |  1 -
 ReactCommon/cxxreact/JSCExecutor.cpp          | 29 ++++++----
 ReactCommon/jschelpers/BUCK                   |  1 +
 ReactCommon/jschelpers/InspectorInterfaces.h  | 55 +++++++++++++++++++
 ReactCommon/jschelpers/JSCWrapper.h           | 28 +++++++---
 ReactCommon/jschelpers/JavaScriptCore.h       |  4 ++
 ReactCommon/jschelpers/systemJSCWrapper.cpp   |  7 +++
 11 files changed, 126 insertions(+), 35 deletions(-)
 create mode 100644 ReactCommon/jschelpers/InspectorInterfaces.h

diff --git a/ReactAndroid/src/main/jni/xreact/jni/BUCK b/ReactAndroid/src/main/jni/xreact/jni/BUCK
index 344814039e0b45..3f005f5578ab17 100644
--- a/ReactAndroid/src/main/jni/xreact/jni/BUCK
+++ b/ReactAndroid/src/main/jni/xreact/jni/BUCK
@@ -39,7 +39,6 @@ cxx_library(
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNativeJNI\"",
         "-DWITH_FBSYSTRACE=1",
-        "-DWITH_INSPECTOR=1",
     ],
     soname = "libreactnativejnifb.$(ext)",
     visibility = [
diff --git a/ReactAndroid/src/main/jni/xreact/jni/JInspector.cpp b/ReactAndroid/src/main/jni/xreact/jni/JInspector.cpp
index cad09b1cc00562..5da21db08ad1e2 100644
--- a/ReactAndroid/src/main/jni/xreact/jni/JInspector.cpp
+++ b/ReactAndroid/src/main/jni/xreact/jni/JInspector.cpp
@@ -1,24 +1,25 @@
 // Copyright 2004-present Facebook. All Rights Reserved.
 
 #include "JInspector.h"
+#include <jschelpers/JavaScriptCore.h>
 
-#ifdef WITH_INSPECTOR
+#ifdef WITH_FBJSCEXTENSIONS
 
 namespace facebook {
 namespace react {
 
 namespace {
 
-class RemoteConnection : public Inspector::RemoteConnection {
+class RemoteConnection : public IRemoteConnection {
 public:
   RemoteConnection(jni::alias_ref<JRemoteConnection::javaobject> connection)
       : connection_(jni::make_global(connection)) {}
 
-  void onMessage(std::string message) override {
+  virtual void onMessage(std::string message) override {
     connection_->onMessage(message);
   }
 
-  void onDisconnect() override {
+  virtual void onDisconnect() override {
     connection_->onDisconnect();
   }
 private:
@@ -42,7 +43,7 @@ void JRemoteConnection::onDisconnect() const {
   method(self());
 }
 
-JLocalConnection::JLocalConnection(std::unique_ptr<Inspector::LocalConnection> connection)
+JLocalConnection::JLocalConnection(std::unique_ptr<ILocalConnection> connection)
   : connection_(std::move(connection)) {}
 
 void JLocalConnection::sendMessage(std::string message) {
@@ -60,13 +61,17 @@ void JLocalConnection::registerNatives() {
   });
 }
 
+static IInspector* getInspectorInstance() {
+  return JSC_JSInspectorGetInstance(true /*useCustomJSC*/);
+}
+
 jni::global_ref<JInspector::javaobject> JInspector::instance(jni::alias_ref<jclass>) {
-  static auto instance = jni::make_global(newObjectCxxArgs(&Inspector::instance()));
+  static auto instance = jni::make_global(newObjectCxxArgs(getInspectorInstance()/*&Inspector::instance()*/));
   return instance;
 }
 
 jni::local_ref<jni::JArrayClass<JPage::javaobject>> JInspector::getPages() {
-  std::vector<Inspector::Page> pages = inspector_->getPages();
+  std::vector<InspectorPage> pages = inspector_->getPages();
   auto array = jni::JArrayClass<JPage::javaobject>::newArray(pages.size());
   for (size_t i = 0; i < pages.size(); i++) {
     (*array)[i] = JPage::create(pages[i].id, pages[i].title);
diff --git a/ReactAndroid/src/main/jni/xreact/jni/JInspector.h b/ReactAndroid/src/main/jni/xreact/jni/JInspector.h
index 0b9db509a75be8..d28523d09350cc 100644
--- a/ReactAndroid/src/main/jni/xreact/jni/JInspector.h
+++ b/ReactAndroid/src/main/jni/xreact/jni/JInspector.h
@@ -2,9 +2,9 @@
 
 #pragma once
 
-#ifdef WITH_INSPECTOR
+#ifdef WITH_FBJSCEXTENSIONS
 
-#include <inspector/Inspector.h>
+#include <jschelpers/InspectorInterfaces.h>
 
 #include <fb/fbjni.h>
 #include <folly/Memory.h>
@@ -31,14 +31,14 @@ class JLocalConnection : public jni::HybridClass<JLocalConnection> {
 public:
   static constexpr auto kJavaDescriptor = "Lcom/facebook/react/bridge/Inspector$LocalConnection;";
 
-  JLocalConnection(std::unique_ptr<Inspector::LocalConnection> connection);
+  JLocalConnection(std::unique_ptr<ILocalConnection> connection);
 
   void sendMessage(std::string message);
   void disconnect();
 
   static void registerNatives();
 private:
-  std::unique_ptr<Inspector::LocalConnection> connection_;
+  std::unique_ptr<ILocalConnection> connection_;
 };
 
 class JInspector : public jni::HybridClass<JInspector> {
@@ -54,9 +54,9 @@ class JInspector : public jni::HybridClass<JInspector> {
 private:
   friend HybridBase;
 
-  JInspector(Inspector* inspector) : inspector_(inspector) {}
+  JInspector(IInspector* inspector) : inspector_(inspector) {}
 
-  Inspector* inspector_;
+  IInspector* inspector_;
 };
 
 }
diff --git a/ReactAndroid/src/main/jni/xreact/jni/OnLoad.cpp b/ReactAndroid/src/main/jni/xreact/jni/OnLoad.cpp
index 7be58ad9fb1744..6133675dffd3de 100644
--- a/ReactAndroid/src/main/jni/xreact/jni/OnLoad.cpp
+++ b/ReactAndroid/src/main/jni/xreact/jni/OnLoad.cpp
@@ -18,7 +18,7 @@
 #include "JCallback.h"
 #include "JSLogging.h"
 
-#ifdef WITH_INSPECTOR
+#ifdef WITH_FBJSCEXTENSIONS
 #include "JInspector.h"
 #endif
 
@@ -171,7 +171,7 @@ extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
     CxxModuleWrapperBase::registerNatives();
     CxxModuleWrapper::registerNatives();
     JCallbackImpl::registerNatives();
-    #ifdef WITH_INSPECTOR
+    #ifdef WITH_FBJSCEXTENSIONS
     JInspector::registerNatives();
     #endif
 
diff --git a/ReactCommon/cxxreact/BUCK b/ReactCommon/cxxreact/BUCK
index 65cafc15002d9e..127c5e3d677eb8 100644
--- a/ReactCommon/cxxreact/BUCK
+++ b/ReactCommon/cxxreact/BUCK
@@ -39,7 +39,6 @@ if THIS_IS_FBANDROID:
           '-DWITH_JSC_MEMORY_PRESSURE=1',
           '-DWITH_REACT_INTERNAL_SETTINGS=1',
           '-DWITH_FB_MEMORY_PROFILING=1',
-          '-DWITH_INSPECTOR=1',
         ],
         deps = JSC_DEPS,
         visibility = [
diff --git a/ReactCommon/cxxreact/JSCExecutor.cpp b/ReactCommon/cxxreact/JSCExecutor.cpp
index 810d0ecfcf5cb9..3027200d946d9c 100644
--- a/ReactCommon/cxxreact/JSCExecutor.cpp
+++ b/ReactCommon/cxxreact/JSCExecutor.cpp
@@ -18,10 +18,7 @@
 
 #include <jschelpers/JSCHelpers.h>
 #include <jschelpers/Value.h>
-
-#ifdef WITH_INSPECTOR
-#include <inspector/Inspector.h>
-#endif
+#include <jschelpers/InspectorInterfaces.h>
 
 #include "JSBundleType.h"
 #include "Platform.h"
@@ -220,6 +217,16 @@ void JSCExecutor::setContextName(const std::string& name) {
   JSC_JSGlobalContextSetName(m_context, jsName);
 }
 
+static bool canUseInspector(JSContextRef context) {
+#if defined(__APPLE__)
+  return isCustomJSCPtr(context);
+#elif defined(WITH_FBJSCEXTENSIONS)
+  return true;
+#else
+  return false;
+#endif
+}
+
 void JSCExecutor::initOnJSVMThread() throw(JSException) {
   SystraceSection s("JSCExecutor.initOnJSVMThread");
 
@@ -253,9 +260,10 @@ void JSCExecutor::initOnJSVMThread() throw(JSException) {
   // Add a pointer to ourselves so we can retrieve it later in our hooks
   Object::getGlobalObject(m_context).setPrivate(this);
 
-  #ifdef WITH_INSPECTOR
-  Inspector::instance().registerGlobalContext("main", m_context);
-  #endif
+  if (canUseInspector(m_context)) {
+    IInspector* pInspector = JSC_JSInspectorGetInstance(true);
+    pInspector->registerGlobalContext("main", m_context);
+  }
 
   installNativeHook<&JSCExecutor::nativeFlushQueueImmediate>("nativeFlushQueueImmediate");
   installNativeHook<&JSCExecutor::nativeCallSyncHook>("nativeCallSyncHook");
@@ -311,9 +319,10 @@ void JSCExecutor::terminateOnJSVMThread() {
 
   m_nativeModules.reset();
 
-  #ifdef WITH_INSPECTOR
-  Inspector::instance().unregisterGlobalContext(m_context);
-  #endif
+  if (canUseInspector(m_context)) {
+    IInspector* pInspector = JSC_JSInspectorGetInstance(true);
+    pInspector->unregisterGlobalContext(m_context);
+  }
 
   JSC_JSGlobalContextRelease(m_context);
   m_context = nullptr;
diff --git a/ReactCommon/jschelpers/BUCK b/ReactCommon/jschelpers/BUCK
index ef759f4ca02bb6..af29360f75303d 100644
--- a/ReactCommon/jschelpers/BUCK
+++ b/ReactCommon/jschelpers/BUCK
@@ -1,4 +1,5 @@
 EXPORTED_HEADERS = [
+    "InspectorInterfaces.h",
     "JavaScriptCore.h",
     "JSCHelpers.h",
     "JSCWrapper.h",
diff --git a/ReactCommon/jschelpers/InspectorInterfaces.h b/ReactCommon/jschelpers/InspectorInterfaces.h
new file mode 100644
index 00000000000000..e19eae5d92fd10
--- /dev/null
+++ b/ReactCommon/jschelpers/InspectorInterfaces.h
@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) 2016-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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.
+ */
+
+#pragma once
+
+#include <memory>
+#include <string>
+#include <vector>
+#include <JavaScriptCore/JSBase.h>
+
+namespace facebook {
+namespace react {
+
+class IDestructible {
+public:
+  virtual ~IDestructible() = 0;
+};
+
+struct InspectorPage {
+  const int id;
+  const std::string title;
+};
+
+class IRemoteConnection : public IDestructible {
+public:
+  virtual ~IRemoteConnection() = 0;
+  virtual void onMessage(std::string message) = 0;
+  virtual void onDisconnect() = 0;
+};
+
+class ILocalConnection : public IDestructible {
+public:
+  virtual ~ILocalConnection() = 0;
+  virtual void sendMessage(std::string message) = 0;
+  virtual void disconnect() = 0;
+};
+
+// Note: not destructible!
+class IInspector {
+public:
+  virtual void registerGlobalContext(std::string title, JSGlobalContextRef ctx) = 0;
+  virtual void unregisterGlobalContext(JSGlobalContextRef ctx) = 0;
+
+  virtual std::vector<InspectorPage> getPages() const = 0;
+  virtual std::unique_ptr<ILocalConnection> connect(int pageId, std::unique_ptr<IRemoteConnection> remote) = 0;
+};
+
+}
+}
diff --git a/ReactCommon/jschelpers/JSCWrapper.h b/ReactCommon/jschelpers/JSCWrapper.h
index c1a6d0cc12a9c0..736c8407023b58 100644
--- a/ReactCommon/jschelpers/JSCWrapper.h
+++ b/ReactCommon/jschelpers/JSCWrapper.h
@@ -15,19 +15,29 @@
 #include <jsc_stringref.h>
 #endif
 
+#include <jschelpers/InspectorInterfaces.h>
+
+#if JSCINTERNAL || (!defined(__APPLE__))
+#define JSC_IMPORT extern "C"
+#else
+#define JSC_IMPORT extern
+#endif
+
+JSC_IMPORT facebook::react::IInspector* JSInspectorGetInstance();
+
+// This is used to substitute an alternate JSC implementation for
+// testing. These calls must all be ABI compatible with the standard JSC.
+JSC_IMPORT void configureJSCForIOS(std::string); // TODO: replace with folly::dynamic once supported
+JSC_IMPORT JSValueRef JSEvaluateBytecodeBundle(JSContextRef, JSObjectRef, int, JSStringRef, JSValueRef*);
+JSC_IMPORT bool JSSamplingProfilerEnabled();
+JSC_IMPORT void JSStartSamplingProfilingOnMainJSCThread(JSGlobalContextRef);
+JSC_IMPORT JSValueRef JSPokeSamplingProfiler(JSContextRef);
+
 #if defined(__APPLE__)
 #import <objc/objc.h>
 #import <JavaScriptCore/JSStringRefCF.h>
 #import <string>
 
-// This is used to substitute an alternate JSC implementation for
-// testing. These calls must all be ABI compatible with the standard JSC.
-extern void configureJSCForIOS(std::string); // TODO: replace with folly::dynamic once supported
-extern JSValueRef JSEvaluateBytecodeBundle(JSContextRef, JSObjectRef, int, JSStringRef, JSValueRef*);
-extern bool JSSamplingProfilerEnabled();
-extern void JSStartSamplingProfilingOnMainJSCThread(JSGlobalContextRef);
-extern JSValueRef JSPokeSamplingProfiler(JSContextRef);
-
 /**
  * JSNoBytecodeFileFormatVersion
  *
@@ -114,6 +124,8 @@ struct JSCWrapper {
   JSC_WRAPPER_METHOD(JSPokeSamplingProfiler);
   JSC_WRAPPER_METHOD(JSStartSamplingProfilingOnMainJSCThread);
 
+  JSC_WRAPPER_METHOD(JSInspectorGetInstance);
+
   JSC_WRAPPER_METHOD(configureJSCForIOS);
 
   // Objective-C API
diff --git a/ReactCommon/jschelpers/JavaScriptCore.h b/ReactCommon/jschelpers/JavaScriptCore.h
index 4d849883476b9f..f0e4423ff6be5c 100644
--- a/ReactCommon/jschelpers/JavaScriptCore.h
+++ b/ReactCommon/jschelpers/JavaScriptCore.h
@@ -182,6 +182,10 @@ jsc_poison(JSObjectMakeArrayBufferWithBytesNoCopy JSObjectMakeTypedArray
 jsc_poison(JSSamplingProfilerEnabled JSPokeSamplingProfiler
            JSStartSamplingProfilingOnMainJSCThread)
 
+#define JSC_JSInspectorGetInstance(...) __jsc_bool_wrapper(JSInspectorGetInstance, __VA_ARGS__)
+jsc_poison(JSInspectorGetInstance)
+
+
 #define JSC_configureJSCForIOS(...) __jsc_bool_wrapper(configureJSCForIOS, __VA_ARGS__)
 
 jsc_poison(configureJSCForIOS)
diff --git a/ReactCommon/jschelpers/systemJSCWrapper.cpp b/ReactCommon/jschelpers/systemJSCWrapper.cpp
index 80000c3fa9a21e..a36124838925fd 100644
--- a/ReactCommon/jschelpers/systemJSCWrapper.cpp
+++ b/ReactCommon/jschelpers/systemJSCWrapper.cpp
@@ -28,6 +28,9 @@ UNIMPLEMENTED_SYSTEM_JSC_FUNCTION(JSStringCreateWithUTF8CStringExpectAscii)
 #endif
 UNIMPLEMENTED_SYSTEM_JSC_FUNCTION(JSPokeSamplingProfiler)
 UNIMPLEMENTED_SYSTEM_JSC_FUNCTION(JSStartSamplingProfilingOnMainJSCThread)
+
+UNIMPLEMENTED_SYSTEM_JSC_FUNCTION(JSInspectorGetInstance)
+
 UNIMPLEMENTED_SYSTEM_JSC_FUNCTION(configureJSCForIOS)
 
 bool JSSamplingProfilerEnabled() {
@@ -119,6 +122,10 @@ const JSCWrapper* systemJSCWrapper() {
         (decltype(&JSStartSamplingProfilingOnMainJSCThread))
         Unimplemented_JSStartSamplingProfilingOnMainJSCThread,
 
+      .JSInspectorGetInstance =
+        (decltype(&JSInspectorGetInstance))
+        Unimplemented_JSInspectorGetInstance,
+
       .configureJSCForIOS =
         (decltype(&configureJSCForIOS))Unimplemented_configureJSCForIOS,
 

From b3872e807df3a9f92a14ccc2462f3f62bcd5ffc4 Mon Sep 17 00:00:00 2001
From: Alex Dvornikov <advornikov@fb.com>
Date: Thu, 6 Apr 2017 00:40:27 -0700
Subject: [PATCH 328/366] Check that RCTDidInitializeModuleNotification is
 being called with the correct bridge

Reviewed By: javache

Differential Revision: D4800110

fbshipit-source-id: acc8bc512ed17a84abeac74afb91db51ab4c5043
---
 React/Base/RCTBridge+Private.h | 6 ++++++
 React/Base/RCTModuleData.mm    | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/React/Base/RCTBridge+Private.h b/React/Base/RCTBridge+Private.h
index e3f015624356d8..46f735a83da0c2 100644
--- a/React/Base/RCTBridge+Private.h
+++ b/React/Base/RCTBridge+Private.h
@@ -79,6 +79,12 @@ RCT_EXTERN void RCTVerifyAllModulesExported(NSArray *extraModules);
  */
 @property (nonatomic, weak, readonly) id<RCTJavaScriptExecutor> javaScriptExecutor;
 
+/**
+ * Used by RCTModuleData
+ */
+
+@property (nonatomic, weak, readonly) RCTBridge *parentBridge;
+
 /**
  * Used by RCTModuleData
  */
diff --git a/React/Base/RCTModuleData.mm b/React/Base/RCTModuleData.mm
index 69d367f2c1e8a7..4db8ea6dfb4ef8 100644
--- a/React/Base/RCTModuleData.mm
+++ b/React/Base/RCTModuleData.mm
@@ -163,7 +163,7 @@ - (void)finishSetupForInstance
     [_bridge registerModuleForFrameUpdates:_instance withModuleData:self];
     [[NSNotificationCenter defaultCenter] postNotificationName:RCTDidInitializeModuleNotification
                                                         object:_bridge
-                                                      userInfo:@{@"module": _instance}];
+                                                      userInfo:@{@"module": _instance, @"bridge": RCTNullIfNil(_bridge.parentBridge)}];
     RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
   }
 }

From 77bee7589337eaebdd11df30646fa3e85c80ec1b Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Thu, 6 Apr 2017 04:37:31 -0700
Subject: [PATCH 329/366] packager: GlobalTransformCache: make key globalized

Reviewed By: davidaurelio

Differential Revision: D4835217

fbshipit-source-id: b43456e1e1f83c849a887b07f4f01f8ed0e9df4b
---
 packager/react-packager.js                    |   2 +-
 packager/src/Bundler/index.js                 |  10 +-
 packager/src/JSTransformer/worker/worker.js   |   6 +-
 packager/src/Resolver/index.js                |   2 +-
 packager/src/Server/index.js                  |   2 +-
 packager/src/lib/GlobalTransformCache.js      | 194 +++++++++++++-----
 .../__tests__/GlobalTransformCache-test.js    |  30 ++-
 .../GlobalTransformCache-test.js.snap         |   4 +-
 packager/src/node-haste/Module.js             |   2 +-
 packager/src/node-haste/ModuleCache.js        |   2 +-
 packager/src/node-haste/index.js              |   2 +-
 11 files changed, 187 insertions(+), 69 deletions(-)

diff --git a/packager/react-packager.js b/packager/react-packager.js
index e51592303223be..b66418c64c6b97 100644
--- a/packager/react-packager.js
+++ b/packager/react-packager.js
@@ -17,7 +17,7 @@ const debug = require('debug');
 const invariant = require('fbjs/lib/invariant');
 
 import type Server from './src/Server';
-import type GlobalTransformCache from './src/lib/GlobalTransformCache';
+import type {GlobalTransformCache} from './src/lib/GlobalTransformCache';
 import type {Reporter} from './src/lib/reporting';
 import type {HasteImpl} from './src/node-haste/Module';
 
diff --git a/packager/src/Bundler/index.js b/packager/src/Bundler/index.js
index 8197ff9139797c..e2d8fc8fea7285 100644
--- a/packager/src/Bundler/index.js
+++ b/packager/src/Bundler/index.js
@@ -46,13 +46,19 @@ import type {
   TransformOptions,
 } from '../JSTransformer/worker/worker';
 import type {Reporter} from '../lib/reporting';
-import type GlobalTransformCache from '../lib/GlobalTransformCache';
+import type {GlobalTransformCache} from '../lib/GlobalTransformCache';
+
+export type ExtraTransformOptions = {
+  +inlineRequires?: {+blacklist: {[string]: true}} | boolean,
+  +preloadedModules?: Array<string> | false,
+  +ramGroups?: Array<string>,
+};
 
 export type GetTransformOptions = (
   mainModuleName: string,
   options: {},
   getDependencies: string => Promise<Array<string>>,
-) => {} | Promise<{}>;
+) => ExtraTransformOptions | Promise<ExtraTransformOptions>;
 
 type Asset = {
   __packager_asset: boolean,
diff --git a/packager/src/JSTransformer/worker/worker.js b/packager/src/JSTransformer/worker/worker.js
index acd7372606bc60..e77614a2b41a61 100644
--- a/packager/src/JSTransformer/worker/worker.js
+++ b/packager/src/JSTransformer/worker/worker.js
@@ -36,15 +36,19 @@ type Transformer = {
 };
 
 export type TransformOptions = {
+  +dev: boolean,
   generateSourceMaps: boolean,
+  +hot: boolean,
+  +inlineRequires: {+blacklist: {[string]: true}} | boolean,
   platform: string,
-  preloadedModules?: Array<string>,
+  preloadedModules?: Array<string> | false,
   projectRoots: Array<string>,
   ramGroups?: Array<string>,
 } & BabelTransformOptions;
 
 export type Options = {
   +dev: boolean,
+  +extern?: boolean,
   +minify: boolean,
   platform: string,
   transform: TransformOptions,
diff --git a/packager/src/Resolver/index.js b/packager/src/Resolver/index.js
index e564706de70d47..3538524bc9efa6 100644
--- a/packager/src/Resolver/index.js
+++ b/packager/src/Resolver/index.js
@@ -24,7 +24,7 @@ import type {Reporter} from '../lib/reporting';
 import type {TransformCode} from '../node-haste/Module';
 import type Cache from '../node-haste/Cache';
 import type {GetTransformCacheKey} from '../lib/TransformCache';
-import type GlobalTransformCache from '../lib/GlobalTransformCache';
+import type {GlobalTransformCache} from '../lib/GlobalTransformCache';
 
 type MinifyCode = (filePath: string, code: string, map: SourceMap) =>
   Promise<{code: string, map: SourceMap}>;
diff --git a/packager/src/Server/index.js b/packager/src/Server/index.js
index d7710ad257ebb6..a5df8a8ba5ae01 100644
--- a/packager/src/Server/index.js
+++ b/packager/src/Server/index.js
@@ -34,7 +34,7 @@ import type Bundle from '../Bundler/Bundle';
 import type HMRBundle from '../Bundler/HMRBundle';
 import type {Reporter} from '../lib/reporting';
 import type {GetTransformOptions} from '../Bundler';
-import type GlobalTransformCache from '../lib/GlobalTransformCache';
+import type {GlobalTransformCache} from '../lib/GlobalTransformCache';
 import type {SourceMap, Symbolicate} from './symbolicate';
 
 const {
diff --git a/packager/src/lib/GlobalTransformCache.js b/packager/src/lib/GlobalTransformCache.js
index 13de60ebf15f16..962c028d73e3a6 100644
--- a/packager/src/lib/GlobalTransformCache.js
+++ b/packager/src/lib/GlobalTransformCache.js
@@ -16,22 +16,53 @@ const FetchError = require('node-fetch/lib/fetch-error');
 
 const crypto = require('crypto');
 const fetch = require('node-fetch');
-const imurmurhash = require('imurmurhash');
 const jsonStableStringify = require('json-stable-stringify');
 const path = require('path');
 
-import type {Options as TransformOptions} from '../JSTransformer/worker/worker';
+import type {
+  Options as TransformWorkerOptions,
+  TransformOptions,
+} from '../JSTransformer/worker/worker';
 import type {CachedResult, GetTransformCacheKey} from './TransformCache';
 
+/**
+ * The API that a global transform cache must comply with. To implement a
+ * custom cache, implement this interface and pass it as argument to the
+ * application's top-level `Server` class.
+ */
+export type GlobalTransformCache = {
+  /**
+   * Synchronously determine if it is worth trying to fetch a result from the
+   * cache. This can be used, for instance, to exclude sets of options we know
+   * will never be cached.
+   */
+  shouldFetch(props: FetchProps): boolean,
+
+  /**
+   * Try to fetch a result. It doesn't actually need to fetch from a server,
+   * the global cache could be instantiated locally for example.
+   */
+  fetch(props: FetchProps): Promise<?CachedResult>,
+
+  /**
+   * Try to store a result, without waiting for the success or failure of the
+   * operation. Consequently, the actual storage operation could be done at a
+   * much later point if desired. It is recommended to actually have this
+   * function be a no-op in production, and only do the storage operation from
+   * a script running on your Continuous Integration platform.
+   */
+  store(props: FetchProps, result: CachedResult): void,
+};
+
 type FetchResultURIs = (keys: Array<string>) => Promise<Map<string, string>>;
 type FetchResultFromURI = (uri: string) => Promise<?CachedResult>;
 type StoreResults = (resultsByKey: Map<string, CachedResult>) => Promise<void>;
 
-type FetchProps = {
+export type FetchProps = {
   filePath: string,
   sourceCode: string,
   getTransformCacheKey: GetTransformCacheKey,
-  transformOptions: TransformOptions,
+  transformOptions: TransformWorkerOptions,
 };
 
 type URI = string;
@@ -98,29 +129,6 @@ class KeyResultStore {
 
 }
 
-/**
- * The transform options contain absolute paths. This can contain, for example,
- * the username if someone works their home directory (very likely). We get rid
- * of this local data for the global cache, otherwise nobody would share the
- * same cache keys. The project roots should not be needed as part of the cache
- * key as they should not affect the transformation of a single particular file.
- */
-function globalizeTransformOptions(
-  options: TransformOptions,
-): TransformOptions {
-  const {transform} = options;
-  if (transform == null) {
-    return options;
-  }
-  return {
-    ...options,
-    transform: {
-      ...transform,
-      projectRoots: [],
-    },
-  };
-}
-
 export type TransformProfile = {+dev: boolean, +minify: boolean, +platform: string};
 
 function profileKey({dev, minify, platform}: TransformProfile): string {
@@ -177,11 +185,12 @@ function validateCachedResult(cachedResult: mixed): ?CachedResult {
   return null;
 }
 
-class GlobalTransformCache {
+class URIBasedGlobalTransformCache {
 
   _fetcher: KeyURIFetcher;
   _fetchResultFromURI: FetchResultFromURI;
   _profileSet: TransformProfileSet;
+  _optionsHasher: OptionsHasher;
   _store: ?KeyResultStore;
 
   static FetchFailedError;
@@ -194,31 +203,34 @@ class GlobalTransformCache {
    * of returning the content directly allows for independent and parallel
    * fetching of each result, that may be arbitrarily large JSON blobs.
    */
-  constructor(
-    fetchResultURIs: FetchResultURIs,
+  constructor(props: {
     fetchResultFromURI: FetchResultFromURI,
-    storeResults: ?StoreResults,
+    fetchResultURIs: FetchResultURIs,
     profiles: Iterable<TransformProfile>,
-  ) {
-    this._fetcher = new KeyURIFetcher(fetchResultURIs);
-    this._profileSet = new TransformProfileSet(profiles);
-    this._fetchResultFromURI = fetchResultFromURI;
-    if (storeResults != null) {
-      this._store = new KeyResultStore(storeResults);
+    rootPath: string,
+    storeResults: StoreResults | null,
+  }) {
+    this._fetcher = new KeyURIFetcher(props.fetchResultURIs);
+    this._profileSet = new TransformProfileSet(props.profiles);
+    this._fetchResultFromURI = props.fetchResultFromURI;
+    this._optionsHasher = new OptionsHasher(props.rootPath);
+    if (props.storeResults != null) {
+      this._store = new KeyResultStore(props.storeResults);
     }
   }
 
   /**
    * Return a key for identifying uniquely a source file.
    */
-  static keyOf(props: FetchProps) {
-    const stableOptions = globalizeTransformOptions(props.transformOptions);
-    const digest = crypto.createHash('sha1').update([
-      jsonStableStringify(stableOptions),
-      props.getTransformCacheKey(props.sourceCode, props.filePath, props.transformOptions),
-      imurmurhash(props.sourceCode).result().toString(),
-    ].join('$')).digest('hex');
-    return `${digest}-${path.basename(props.filePath)}`;
+  keyOf(props: FetchProps) {
+    const hash = crypto.createHash('sha1');
+    const {sourceCode, filePath, transformOptions} = props;
+    this._optionsHasher.hashTransformWorkerOptions(hash, transformOptions);
+    const cacheKey = props.getTransformCacheKey(sourceCode, filePath, transformOptions);
+    hash.update(JSON.stringify(cacheKey));
+    hash.update(crypto.createHash('sha1').update(sourceCode).digest('hex'));
+    const digest = hash.digest('hex');
+    return `${digest}-${path.basename(filePath)}`;
   }
 
   /**
@@ -249,8 +261,8 @@ class GlobalTransformCache {
    * waiting a little time before retring if experience shows it's useful.
    */
   static fetchResultFromURI(uri: string): Promise<CachedResult> {
-    return GlobalTransformCache._fetchResultFromURI(uri).catch(error => {
-      if (!GlobalTransformCache.shouldRetryAfterThatError(error)) {
+    return URIBasedGlobalTransformCache._fetchResultFromURI(uri).catch(error => {
+      if (!URIBasedGlobalTransformCache.shouldRetryAfterThatError(error)) {
         throw error;
       }
       return this._fetchResultFromURI(uri);
@@ -284,7 +296,7 @@ class GlobalTransformCache {
    * key yet, or an error happened, processed separately.
    */
   async fetch(props: FetchProps): Promise<?CachedResult> {
-    const uri = await this._fetcher.fetch(GlobalTransformCache.keyOf(props));
+    const uri = await this._fetcher.fetch(this.keyOf(props));
     if (uri == null) {
       return null;
     }
@@ -293,12 +305,92 @@ class GlobalTransformCache {
 
   store(props: FetchProps, result: CachedResult) {
     if (this._store != null) {
-      this._store.store(GlobalTransformCache.keyOf(props), result);
+      this._store.store(this.keyOf(props), result);
+    }
+  }
+
+}
+
+class OptionsHasher {
+  _rootPath: string;
+
+  constructor(rootPath: string) {
+    this._rootPath = rootPath;
+  }
+
+  /**
+   * This function is extra-conservative with how it hashes the transform
+   * options. In particular:
+   *
+   *     * we need to hash paths relative to the root, not the absolute paths,
+   *       otherwise everyone would have a different cache, defeating the
+   *       purpose of global cache;
+   *     * we need to reject any additional field we do not know of, because
+   *       they could contain absolute path, and we absolutely want to process
+   *       these.
+   *
+   * Theorically, Flow could help us prevent any other field from being here by
+   * using *exact* object type. In practice, the transform options are a mix of
+   * many different fields including the optional Babel fields, and some serious
+   * cleanup will be necessary to enable rock-solid typing.
+   */
+  hashTransformWorkerOptions(hash: crypto$Hash, options: TransformWorkerOptions): crypto$Hash {
+    const {dev, minify, platform, transform, extern, ...unknowns} = options;
+    const unknownKeys = Object.keys(unknowns);
+    if (unknownKeys.length > 0) {
+      const message = `these worker option fields are unknown: ${JSON.stringify(unknownKeys)}`;
+      throw new CannotHashOptionsError(message);
+    }
+    // eslint-disable-next-line no-undef, no-bitwise
+    hash.update(new Buffer([+dev | +minify << 1 | +!!extern << 2]));
+    hash.update(JSON.stringify(platform));
+    return this.hashTransformOptions(hash, transform);
+  }
+
+  /**
+   * The transform options contain absolute paths. This can contain, for
+   * example, the username if someone works their home directory (very likely).
+   * We get rid of this local data for the global cache, otherwise nobody would
+   * share the same cache keys. The project roots should not be needed as part
+   * of the cache key as they should not affect the transformation of a single
+   * particular file.
+   */
+  hashTransformOptions(hash: crypto$Hash, options: TransformOptions): crypto$Hash {
+    const {generateSourceMaps, dev, hot, inlineRequires, platform,
+      preloadedModules, projectRoots, ramGroups, ...unknowns} = options;
+    const unknownKeys = Object.keys(unknowns);
+    if (unknownKeys.length > 0) {
+      const message = `these transform option fields are unknown: ${JSON.stringify(unknownKeys)}`;
+      throw new CannotHashOptionsError(message);
+    }
+    // eslint-disable-next-line no-undef
+    hash.update(new Buffer([
+      // eslint-disable-next-line no-bitwise
+      +dev | +generateSourceMaps << 1 | +hot << 2 | +!!inlineRequires << 3,
+    ]));
+    hash.update(JSON.stringify(platform));
+    let relativeBlacklist = [];
+    if (typeof inlineRequires === 'object') {
+      relativeBlacklist = this.relativizeFilePaths(Object.keys(inlineRequires.blacklist));
     }
+    const relativeProjectRoots = this.relativizeFilePaths(projectRoots);
+    const optionTuple = [relativeBlacklist, preloadedModules, relativeProjectRoots, ramGroups];
+    hash.update(JSON.stringify(optionTuple));
+    return hash;
   }
 
+  relativizeFilePaths(filePaths: Array<string>): Array<string> {
+    return filePaths.map(filepath => path.relative(this._rootPath, filepath));
+  }
+}
+
+class CannotHashOptionsError extends Error {
+  constructor(message: string) {
+    super();
+    this.message = message;
+  }
 }
 
-GlobalTransformCache.FetchFailedError = FetchFailedError;
+URIBasedGlobalTransformCache.FetchFailedError = FetchFailedError;
 
-module.exports = GlobalTransformCache;
+module.exports = {URIBasedGlobalTransformCache, CannotHashOptionsError};
diff --git a/packager/src/lib/__tests__/GlobalTransformCache-test.js b/packager/src/lib/__tests__/GlobalTransformCache-test.js
index 17fee4a4d45333..94039e8bc3b846 100644
--- a/packager/src/lib/__tests__/GlobalTransformCache-test.js
+++ b/packager/src/lib/__tests__/GlobalTransformCache-test.js
@@ -15,8 +15,9 @@ jest.useRealTimers();
 const fetchMock = jest.fn();
 jest.mock('node-fetch', () => fetchMock);
 
-const GlobalTransformCache = require('../GlobalTransformCache');
+const {URIBasedGlobalTransformCache} = require('../GlobalTransformCache');
 const FetchError = require('node-fetch/lib/fetch-error');
+const path = require('path');
 
 async function fetchResultURIs(keys: Array<string>): Promise<Map<string, string>> {
   return new Map(keys.map(key => [key, `http://globalcache.com/${key}`]));
@@ -33,14 +34,27 @@ async function fetchResultFromURI(uri: string): Promise<?CachedResult> {
 describe('GlobalTransformCache', () => {
 
   it('fetches results', async () => {
-    const cache = new GlobalTransformCache(fetchResultURIs, fetchResultFromURI, null, [
-      {dev: true, minify: false, platform: 'ios'},
-    ]);
+    const cache = new URIBasedGlobalTransformCache({
+      fetchResultFromURI,
+      fetchResultURIs,
+      profiles: [{dev: true, minify: false, platform: 'ios'}],
+      rootPath: __dirname,
+      storeResults: null,
+    });
     const transformOptions = {
       dev: true,
       minify: false,
       platform: 'ios',
-      transform: {},
+      transform: {
+        generateSourceMaps: false,
+        dev: false,
+        hot: false,
+        inlineRequires: false,
+        platform: 'ios',
+        preloadedModules: [],
+        projectRoots: [path.join(__dirname, 'root')],
+        ramGroups: [],
+      },
     };
     const result = await Promise.all([cache.fetch({
       filePath: 'foo.js',
@@ -73,7 +87,8 @@ describe('GlobalTransformCache', () => {
 
     it('fetches result', async () => {
       fetchMock.mockImplementation(defaultFetchMockImpl);
-      const result = await GlobalTransformCache.fetchResultFromURI('http://globalcache.com/foo');
+      const result = await URIBasedGlobalTransformCache
+        .fetchResultFromURI('http://globalcache.com/foo');
       expect(result).toMatchSnapshot();
     });
 
@@ -82,7 +97,8 @@ describe('GlobalTransformCache', () => {
         fetchMock.mockImplementation(defaultFetchMockImpl);
         throw new FetchError('timeout!', 'request-timeout');
       });
-      const result = await GlobalTransformCache.fetchResultFromURI('http://globalcache.com/foo');
+      const result = await URIBasedGlobalTransformCache
+        .fetchResultFromURI('http://globalcache.com/foo');
       expect(result).toMatchSnapshot();
     });
 
diff --git a/packager/src/lib/__tests__/__snapshots__/GlobalTransformCache-test.js.snap b/packager/src/lib/__tests__/__snapshots__/GlobalTransformCache-test.js.snap
index 70472f3afb25cd..ed139b3864216b 100644
--- a/packager/src/lib/__tests__/__snapshots__/GlobalTransformCache-test.js.snap
+++ b/packager/src/lib/__tests__/__snapshots__/GlobalTransformCache-test.js.snap
@@ -19,12 +19,12 @@ Object {
 exports[`GlobalTransformCache fetches results 1`] = `
 Array [
   Object {
-    "code": "/* code from http://globalcache.com/17ce731dadd36402f15abb768843cb5e8ecf9ca7-foo.js */",
+    "code": "/* code from http://globalcache.com/fb94b11256237327e4eef5daa08bad33573b3781-foo.js */",
     "dependencies": Array [],
     "dependencyOffsets": Array [],
   },
   Object {
-    "code": "/* code from http://globalcache.com/d78572916bd877b6ac0e819e99be9fc2954f0e00-bar.js */",
+    "code": "/* code from http://globalcache.com/b902b4a8841fcea2919c2fe9b21e68d96dff59c9-bar.js */",
     "dependencies": Array [],
     "dependencyOffsets": Array [],
   },
diff --git a/packager/src/node-haste/Module.js b/packager/src/node-haste/Module.js
index 848822bcd86602..474d2c360900cc 100644
--- a/packager/src/node-haste/Module.js
+++ b/packager/src/node-haste/Module.js
@@ -23,7 +23,7 @@ const jsonStableStringify = require('json-stable-stringify');
 const {join: joinPath, relative: relativePath, extname} = require('path');
 
 import type {TransformedCode, Options as TransformOptions} from '../JSTransformer/worker/worker';
-import type GlobalTransformCache from '../lib/GlobalTransformCache';
+import type {GlobalTransformCache} from '../lib/GlobalTransformCache';
 import type {SourceMap} from '../lib/SourceMap';
 import type {GetTransformCacheKey} from '../lib/TransformCache';
 import type {ReadTransformProps} from '../lib/TransformCache';
diff --git a/packager/src/node-haste/ModuleCache.js b/packager/src/node-haste/ModuleCache.js
index 316500c51ac30e..3622b6c272f6df 100644
--- a/packager/src/node-haste/ModuleCache.js
+++ b/packager/src/node-haste/ModuleCache.js
@@ -16,7 +16,7 @@ const Module = require('./Module');
 const Package = require('./Package');
 const Polyfill = require('./Polyfill');
 
-import type GlobalTransformCache from '../lib/GlobalTransformCache';
+import type {GlobalTransformCache} from '../lib/GlobalTransformCache';
 import type {GetTransformCacheKey} from '../lib/TransformCache';
 import type {Reporter} from '../lib/reporting';
 import type Cache from './Cache';
diff --git a/packager/src/node-haste/index.js b/packager/src/node-haste/index.js
index c0ed382d0d044d..6f521fbf517c0e 100644
--- a/packager/src/node-haste/index.js
+++ b/packager/src/node-haste/index.js
@@ -38,7 +38,7 @@ const {
 const {EventEmitter} = require('events');
 
 import type {Options as TransformOptions} from '../JSTransformer/worker/worker';
-import type GlobalTransformCache from '../lib/GlobalTransformCache';
+import type {GlobalTransformCache} from '../lib/GlobalTransformCache';
 import type {GetTransformCacheKey} from '../lib/TransformCache';
 import type {Reporter} from '../lib/reporting';
 import type {ModuleMap} from './DependencyGraph/ResolutionRequest';

From 5f37483466b32bb9d09945e25c04b1cb8add9679 Mon Sep 17 00:00:00 2001
From: Martin Kralik <kralik@fb.com>
Date: Thu, 6 Apr 2017 05:50:28 -0700
Subject: [PATCH 330/366] Revert D4840716: Refactor interfaces

Differential Revision: D4840716

fbshipit-source-id: 1b6a6050d78ccbbd3c817621df1c1c989594fdb1
---
 ReactAndroid/src/main/jni/xreact/jni/BUCK     |  1 +
 .../src/main/jni/xreact/jni/JInspector.cpp    | 19 +++----
 .../src/main/jni/xreact/jni/JInspector.h      | 12 ++--
 .../src/main/jni/xreact/jni/OnLoad.cpp        |  4 +-
 ReactCommon/cxxreact/BUCK                     |  1 +
 ReactCommon/cxxreact/JSCExecutor.cpp          | 29 ++++------
 ReactCommon/jschelpers/BUCK                   |  1 -
 ReactCommon/jschelpers/InspectorInterfaces.h  | 55 -------------------
 ReactCommon/jschelpers/JSCWrapper.h           | 28 +++-------
 ReactCommon/jschelpers/JavaScriptCore.h       |  4 --
 ReactCommon/jschelpers/systemJSCWrapper.cpp   |  7 ---
 11 files changed, 35 insertions(+), 126 deletions(-)
 delete mode 100644 ReactCommon/jschelpers/InspectorInterfaces.h

diff --git a/ReactAndroid/src/main/jni/xreact/jni/BUCK b/ReactAndroid/src/main/jni/xreact/jni/BUCK
index 3f005f5578ab17..344814039e0b45 100644
--- a/ReactAndroid/src/main/jni/xreact/jni/BUCK
+++ b/ReactAndroid/src/main/jni/xreact/jni/BUCK
@@ -39,6 +39,7 @@ cxx_library(
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNativeJNI\"",
         "-DWITH_FBSYSTRACE=1",
+        "-DWITH_INSPECTOR=1",
     ],
     soname = "libreactnativejnifb.$(ext)",
     visibility = [
diff --git a/ReactAndroid/src/main/jni/xreact/jni/JInspector.cpp b/ReactAndroid/src/main/jni/xreact/jni/JInspector.cpp
index 5da21db08ad1e2..cad09b1cc00562 100644
--- a/ReactAndroid/src/main/jni/xreact/jni/JInspector.cpp
+++ b/ReactAndroid/src/main/jni/xreact/jni/JInspector.cpp
@@ -1,25 +1,24 @@
 // Copyright 2004-present Facebook. All Rights Reserved.
 
 #include "JInspector.h"
-#include <jschelpers/JavaScriptCore.h>
 
-#ifdef WITH_FBJSCEXTENSIONS
+#ifdef WITH_INSPECTOR
 
 namespace facebook {
 namespace react {
 
 namespace {
 
-class RemoteConnection : public IRemoteConnection {
+class RemoteConnection : public Inspector::RemoteConnection {
 public:
   RemoteConnection(jni::alias_ref<JRemoteConnection::javaobject> connection)
       : connection_(jni::make_global(connection)) {}
 
-  virtual void onMessage(std::string message) override {
+  void onMessage(std::string message) override {
     connection_->onMessage(message);
   }
 
-  virtual void onDisconnect() override {
+  void onDisconnect() override {
     connection_->onDisconnect();
   }
 private:
@@ -43,7 +42,7 @@ void JRemoteConnection::onDisconnect() const {
   method(self());
 }
 
-JLocalConnection::JLocalConnection(std::unique_ptr<ILocalConnection> connection)
+JLocalConnection::JLocalConnection(std::unique_ptr<Inspector::LocalConnection> connection)
   : connection_(std::move(connection)) {}
 
 void JLocalConnection::sendMessage(std::string message) {
@@ -61,17 +60,13 @@ void JLocalConnection::registerNatives() {
   });
 }
 
-static IInspector* getInspectorInstance() {
-  return JSC_JSInspectorGetInstance(true /*useCustomJSC*/);
-}
-
 jni::global_ref<JInspector::javaobject> JInspector::instance(jni::alias_ref<jclass>) {
-  static auto instance = jni::make_global(newObjectCxxArgs(getInspectorInstance()/*&Inspector::instance()*/));
+  static auto instance = jni::make_global(newObjectCxxArgs(&Inspector::instance()));
   return instance;
 }
 
 jni::local_ref<jni::JArrayClass<JPage::javaobject>> JInspector::getPages() {
-  std::vector<InspectorPage> pages = inspector_->getPages();
+  std::vector<Inspector::Page> pages = inspector_->getPages();
   auto array = jni::JArrayClass<JPage::javaobject>::newArray(pages.size());
   for (size_t i = 0; i < pages.size(); i++) {
     (*array)[i] = JPage::create(pages[i].id, pages[i].title);
diff --git a/ReactAndroid/src/main/jni/xreact/jni/JInspector.h b/ReactAndroid/src/main/jni/xreact/jni/JInspector.h
index d28523d09350cc..0b9db509a75be8 100644
--- a/ReactAndroid/src/main/jni/xreact/jni/JInspector.h
+++ b/ReactAndroid/src/main/jni/xreact/jni/JInspector.h
@@ -2,9 +2,9 @@
 
 #pragma once
 
-#ifdef WITH_FBJSCEXTENSIONS
+#ifdef WITH_INSPECTOR
 
-#include <jschelpers/InspectorInterfaces.h>
+#include <inspector/Inspector.h>
 
 #include <fb/fbjni.h>
 #include <folly/Memory.h>
@@ -31,14 +31,14 @@ class JLocalConnection : public jni::HybridClass<JLocalConnection> {
 public:
   static constexpr auto kJavaDescriptor = "Lcom/facebook/react/bridge/Inspector$LocalConnection;";
 
-  JLocalConnection(std::unique_ptr<ILocalConnection> connection);
+  JLocalConnection(std::unique_ptr<Inspector::LocalConnection> connection);
 
   void sendMessage(std::string message);
   void disconnect();
 
   static void registerNatives();
 private:
-  std::unique_ptr<ILocalConnection> connection_;
+  std::unique_ptr<Inspector::LocalConnection> connection_;
 };
 
 class JInspector : public jni::HybridClass<JInspector> {
@@ -54,9 +54,9 @@ class JInspector : public jni::HybridClass<JInspector> {
 private:
   friend HybridBase;
 
-  JInspector(IInspector* inspector) : inspector_(inspector) {}
+  JInspector(Inspector* inspector) : inspector_(inspector) {}
 
-  IInspector* inspector_;
+  Inspector* inspector_;
 };
 
 }
diff --git a/ReactAndroid/src/main/jni/xreact/jni/OnLoad.cpp b/ReactAndroid/src/main/jni/xreact/jni/OnLoad.cpp
index 6133675dffd3de..7be58ad9fb1744 100644
--- a/ReactAndroid/src/main/jni/xreact/jni/OnLoad.cpp
+++ b/ReactAndroid/src/main/jni/xreact/jni/OnLoad.cpp
@@ -18,7 +18,7 @@
 #include "JCallback.h"
 #include "JSLogging.h"
 
-#ifdef WITH_FBJSCEXTENSIONS
+#ifdef WITH_INSPECTOR
 #include "JInspector.h"
 #endif
 
@@ -171,7 +171,7 @@ extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
     CxxModuleWrapperBase::registerNatives();
     CxxModuleWrapper::registerNatives();
     JCallbackImpl::registerNatives();
-    #ifdef WITH_FBJSCEXTENSIONS
+    #ifdef WITH_INSPECTOR
     JInspector::registerNatives();
     #endif
 
diff --git a/ReactCommon/cxxreact/BUCK b/ReactCommon/cxxreact/BUCK
index 127c5e3d677eb8..65cafc15002d9e 100644
--- a/ReactCommon/cxxreact/BUCK
+++ b/ReactCommon/cxxreact/BUCK
@@ -39,6 +39,7 @@ if THIS_IS_FBANDROID:
           '-DWITH_JSC_MEMORY_PRESSURE=1',
           '-DWITH_REACT_INTERNAL_SETTINGS=1',
           '-DWITH_FB_MEMORY_PROFILING=1',
+          '-DWITH_INSPECTOR=1',
         ],
         deps = JSC_DEPS,
         visibility = [
diff --git a/ReactCommon/cxxreact/JSCExecutor.cpp b/ReactCommon/cxxreact/JSCExecutor.cpp
index 3027200d946d9c..810d0ecfcf5cb9 100644
--- a/ReactCommon/cxxreact/JSCExecutor.cpp
+++ b/ReactCommon/cxxreact/JSCExecutor.cpp
@@ -18,7 +18,10 @@
 
 #include <jschelpers/JSCHelpers.h>
 #include <jschelpers/Value.h>
-#include <jschelpers/InspectorInterfaces.h>
+
+#ifdef WITH_INSPECTOR
+#include <inspector/Inspector.h>
+#endif
 
 #include "JSBundleType.h"
 #include "Platform.h"
@@ -217,16 +220,6 @@ void JSCExecutor::setContextName(const std::string& name) {
   JSC_JSGlobalContextSetName(m_context, jsName);
 }
 
-static bool canUseInspector(JSContextRef context) {
-#if defined(__APPLE__)
-  return isCustomJSCPtr(context);
-#elif defined(WITH_FBJSCEXTENSIONS)
-  return true;
-#else
-  return false;
-#endif
-}
-
 void JSCExecutor::initOnJSVMThread() throw(JSException) {
   SystraceSection s("JSCExecutor.initOnJSVMThread");
 
@@ -260,10 +253,9 @@ void JSCExecutor::initOnJSVMThread() throw(JSException) {
   // Add a pointer to ourselves so we can retrieve it later in our hooks
   Object::getGlobalObject(m_context).setPrivate(this);
 
-  if (canUseInspector(m_context)) {
-    IInspector* pInspector = JSC_JSInspectorGetInstance(true);
-    pInspector->registerGlobalContext("main", m_context);
-  }
+  #ifdef WITH_INSPECTOR
+  Inspector::instance().registerGlobalContext("main", m_context);
+  #endif
 
   installNativeHook<&JSCExecutor::nativeFlushQueueImmediate>("nativeFlushQueueImmediate");
   installNativeHook<&JSCExecutor::nativeCallSyncHook>("nativeCallSyncHook");
@@ -319,10 +311,9 @@ void JSCExecutor::terminateOnJSVMThread() {
 
   m_nativeModules.reset();
 
-  if (canUseInspector(m_context)) {
-    IInspector* pInspector = JSC_JSInspectorGetInstance(true);
-    pInspector->unregisterGlobalContext(m_context);
-  }
+  #ifdef WITH_INSPECTOR
+  Inspector::instance().unregisterGlobalContext(m_context);
+  #endif
 
   JSC_JSGlobalContextRelease(m_context);
   m_context = nullptr;
diff --git a/ReactCommon/jschelpers/BUCK b/ReactCommon/jschelpers/BUCK
index af29360f75303d..ef759f4ca02bb6 100644
--- a/ReactCommon/jschelpers/BUCK
+++ b/ReactCommon/jschelpers/BUCK
@@ -1,5 +1,4 @@
 EXPORTED_HEADERS = [
-    "InspectorInterfaces.h",
     "JavaScriptCore.h",
     "JSCHelpers.h",
     "JSCWrapper.h",
diff --git a/ReactCommon/jschelpers/InspectorInterfaces.h b/ReactCommon/jschelpers/InspectorInterfaces.h
deleted file mode 100644
index e19eae5d92fd10..00000000000000
--- a/ReactCommon/jschelpers/InspectorInterfaces.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * 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.
- */
-
-#pragma once
-
-#include <memory>
-#include <string>
-#include <vector>
-#include <JavaScriptCore/JSBase.h>
-
-namespace facebook {
-namespace react {
-
-class IDestructible {
-public:
-  virtual ~IDestructible() = 0;
-};
-
-struct InspectorPage {
-  const int id;
-  const std::string title;
-};
-
-class IRemoteConnection : public IDestructible {
-public:
-  virtual ~IRemoteConnection() = 0;
-  virtual void onMessage(std::string message) = 0;
-  virtual void onDisconnect() = 0;
-};
-
-class ILocalConnection : public IDestructible {
-public:
-  virtual ~ILocalConnection() = 0;
-  virtual void sendMessage(std::string message) = 0;
-  virtual void disconnect() = 0;
-};
-
-// Note: not destructible!
-class IInspector {
-public:
-  virtual void registerGlobalContext(std::string title, JSGlobalContextRef ctx) = 0;
-  virtual void unregisterGlobalContext(JSGlobalContextRef ctx) = 0;
-
-  virtual std::vector<InspectorPage> getPages() const = 0;
-  virtual std::unique_ptr<ILocalConnection> connect(int pageId, std::unique_ptr<IRemoteConnection> remote) = 0;
-};
-
-}
-}
diff --git a/ReactCommon/jschelpers/JSCWrapper.h b/ReactCommon/jschelpers/JSCWrapper.h
index 736c8407023b58..c1a6d0cc12a9c0 100644
--- a/ReactCommon/jschelpers/JSCWrapper.h
+++ b/ReactCommon/jschelpers/JSCWrapper.h
@@ -15,29 +15,19 @@
 #include <jsc_stringref.h>
 #endif
 
-#include <jschelpers/InspectorInterfaces.h>
-
-#if JSCINTERNAL || (!defined(__APPLE__))
-#define JSC_IMPORT extern "C"
-#else
-#define JSC_IMPORT extern
-#endif
-
-JSC_IMPORT facebook::react::IInspector* JSInspectorGetInstance();
-
-// This is used to substitute an alternate JSC implementation for
-// testing. These calls must all be ABI compatible with the standard JSC.
-JSC_IMPORT void configureJSCForIOS(std::string); // TODO: replace with folly::dynamic once supported
-JSC_IMPORT JSValueRef JSEvaluateBytecodeBundle(JSContextRef, JSObjectRef, int, JSStringRef, JSValueRef*);
-JSC_IMPORT bool JSSamplingProfilerEnabled();
-JSC_IMPORT void JSStartSamplingProfilingOnMainJSCThread(JSGlobalContextRef);
-JSC_IMPORT JSValueRef JSPokeSamplingProfiler(JSContextRef);
-
 #if defined(__APPLE__)
 #import <objc/objc.h>
 #import <JavaScriptCore/JSStringRefCF.h>
 #import <string>
 
+// This is used to substitute an alternate JSC implementation for
+// testing. These calls must all be ABI compatible with the standard JSC.
+extern void configureJSCForIOS(std::string); // TODO: replace with folly::dynamic once supported
+extern JSValueRef JSEvaluateBytecodeBundle(JSContextRef, JSObjectRef, int, JSStringRef, JSValueRef*);
+extern bool JSSamplingProfilerEnabled();
+extern void JSStartSamplingProfilingOnMainJSCThread(JSGlobalContextRef);
+extern JSValueRef JSPokeSamplingProfiler(JSContextRef);
+
 /**
  * JSNoBytecodeFileFormatVersion
  *
@@ -124,8 +114,6 @@ struct JSCWrapper {
   JSC_WRAPPER_METHOD(JSPokeSamplingProfiler);
   JSC_WRAPPER_METHOD(JSStartSamplingProfilingOnMainJSCThread);
 
-  JSC_WRAPPER_METHOD(JSInspectorGetInstance);
-
   JSC_WRAPPER_METHOD(configureJSCForIOS);
 
   // Objective-C API
diff --git a/ReactCommon/jschelpers/JavaScriptCore.h b/ReactCommon/jschelpers/JavaScriptCore.h
index f0e4423ff6be5c..4d849883476b9f 100644
--- a/ReactCommon/jschelpers/JavaScriptCore.h
+++ b/ReactCommon/jschelpers/JavaScriptCore.h
@@ -182,10 +182,6 @@ jsc_poison(JSObjectMakeArrayBufferWithBytesNoCopy JSObjectMakeTypedArray
 jsc_poison(JSSamplingProfilerEnabled JSPokeSamplingProfiler
            JSStartSamplingProfilingOnMainJSCThread)
 
-#define JSC_JSInspectorGetInstance(...) __jsc_bool_wrapper(JSInspectorGetInstance, __VA_ARGS__)
-jsc_poison(JSInspectorGetInstance)
-
-
 #define JSC_configureJSCForIOS(...) __jsc_bool_wrapper(configureJSCForIOS, __VA_ARGS__)
 
 jsc_poison(configureJSCForIOS)
diff --git a/ReactCommon/jschelpers/systemJSCWrapper.cpp b/ReactCommon/jschelpers/systemJSCWrapper.cpp
index a36124838925fd..80000c3fa9a21e 100644
--- a/ReactCommon/jschelpers/systemJSCWrapper.cpp
+++ b/ReactCommon/jschelpers/systemJSCWrapper.cpp
@@ -28,9 +28,6 @@ UNIMPLEMENTED_SYSTEM_JSC_FUNCTION(JSStringCreateWithUTF8CStringExpectAscii)
 #endif
 UNIMPLEMENTED_SYSTEM_JSC_FUNCTION(JSPokeSamplingProfiler)
 UNIMPLEMENTED_SYSTEM_JSC_FUNCTION(JSStartSamplingProfilingOnMainJSCThread)
-
-UNIMPLEMENTED_SYSTEM_JSC_FUNCTION(JSInspectorGetInstance)
-
 UNIMPLEMENTED_SYSTEM_JSC_FUNCTION(configureJSCForIOS)
 
 bool JSSamplingProfilerEnabled() {
@@ -122,10 +119,6 @@ const JSCWrapper* systemJSCWrapper() {
         (decltype(&JSStartSamplingProfilingOnMainJSCThread))
         Unimplemented_JSStartSamplingProfilingOnMainJSCThread,
 
-      .JSInspectorGetInstance =
-        (decltype(&JSInspectorGetInstance))
-        Unimplemented_JSInspectorGetInstance,
-
       .configureJSCForIOS =
         (decltype(&configureJSCForIOS))Unimplemented_configureJSCForIOS,
 

From b2101836dc5a185f5ff70f3ffbc67f76e391d405 Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Thu, 6 Apr 2017 07:45:36 -0700
Subject: [PATCH 331/366] packager: index files by dir for fast matching

Summary: This removes the call to `HasteFS#matchFiles()`, that has linear complexity. Instead, we index all the files by directory from `HasteFS` once loaded, a linear operation. Then, we can filter files from a particular directory much quicker.

Reviewed By: davidaurelio

Differential Revision: D4826721

fbshipit-source-id: c31a0ed9a354dbc7f2dcd56179b859e491faa16c
---
 .../src/ModuleGraph/node-haste/node-haste.js  |  3 +
 .../DependencyGraph/ResolutionRequest.js      | 39 ++++++++-----
 .../src/node-haste/FilesByDirNameIndex.js     | 57 +++++++++++++++++++
 packager/src/node-haste/index.js              | 10 ++++
 4 files changed, 96 insertions(+), 13 deletions(-)
 create mode 100644 packager/src/node-haste/FilesByDirNameIndex.js

diff --git a/packager/src/ModuleGraph/node-haste/node-haste.js b/packager/src/ModuleGraph/node-haste/node-haste.js
index e3cbd2248bfcb0..0d643e3e0e8351 100644
--- a/packager/src/ModuleGraph/node-haste/node-haste.js
+++ b/packager/src/ModuleGraph/node-haste/node-haste.js
@@ -22,6 +22,7 @@ import type {
 } from '../types.flow';
 
 const DependencyGraphHelpers = require('../../node-haste/DependencyGraph/DependencyGraphHelpers');
+const FilesByDirNameIndex = require('../../node-haste/FilesByDirNameIndex');
 const HasteFS = require('./HasteFS');
 const HasteMap = require('../../node-haste/DependencyGraph/HasteMap');
 const Module = require('./Module');
@@ -92,6 +93,7 @@ exports.createResolveFn = function(options: ResolveOptions): ResolveFn {
 
   const hasteMapBuilt = hasteMap.build();
   const resolutionRequests = {};
+  const filesByDirNameIndex = new FilesByDirNameIndex(hasteMap.getAllFiles());
   return (id, source, platform, _, callback) => {
     let resolutionRequest = resolutionRequests[platform];
     if (!resolutionRequest) {
@@ -102,6 +104,7 @@ exports.createResolveFn = function(options: ResolveOptions): ResolveFn {
         hasteFS,
         hasteMap,
         helpers,
+        matchFiles: filesByDirNameIndex.match.bind(filesByDirNameIndex),
         moduleCache,
         moduleMap: getFakeModuleMap(hasteMap),
         platform,
diff --git a/packager/src/node-haste/DependencyGraph/ResolutionRequest.js b/packager/src/node-haste/DependencyGraph/ResolutionRequest.js
index b4336c933b4da0..77ec18e097832a 100644
--- a/packager/src/node-haste/DependencyGraph/ResolutionRequest.js
+++ b/packager/src/node-haste/DependencyGraph/ResolutionRequest.js
@@ -53,12 +53,15 @@ type ModuleishCache<TModule, TPackage> = {
   getAssetModule(path: string): TModule,
 };
 
+type MatchFilesByDirAndPattern = (dirName: string, pattern: RegExp) => Array<string>;
+
 type Options<TModule, TPackage> = {
   dirExists: DirExistsFn,
   entryPath: string,
   extraNodeModules: ?Object,
   hasteFS: HasteFS,
   helpers: DependencyGraphHelpers,
+  matchFiles: MatchFilesByDirAndPattern,
   moduleCache: ModuleishCache<TModule, TPackage>,
   moduleMap: ModuleMap,
   platform: string,
@@ -89,6 +92,7 @@ class ResolutionRequest<TModule: Moduleish, TPackage: Packageish> {
   _hasteFS: HasteFS;
   _helpers: DependencyGraphHelpers;
   _immediateResolutionCache: {[key: string]: TModule};
+  _matchFiles: MatchFilesByDirAndPattern;
   _moduleCache: ModuleishCache<TModule, TPackage>;
   _moduleMap: ModuleMap;
   _platform: string;
@@ -102,6 +106,7 @@ class ResolutionRequest<TModule: Moduleish, TPackage: Packageish> {
     extraNodeModules,
     hasteFS,
     helpers,
+    matchFiles,
     moduleCache,
     moduleMap,
     platform,
@@ -113,6 +118,7 @@ class ResolutionRequest<TModule: Moduleish, TPackage: Packageish> {
     this._extraNodeModules = extraNodeModules;
     this._hasteFS = hasteFS;
     this._helpers = helpers;
+    this._matchFiles = matchFiles;
     this._moduleCache = moduleCache;
     this._moduleMap = moduleMap;
     this._platform = platform;
@@ -442,7 +448,7 @@ class ResolutionRequest<TModule: Moduleish, TPackage: Packageish> {
 
   _loadAsFile(potentialModulePath: string, fromModule: TModule, toModule: string): TModule {
     if (this._helpers.isAssetFile(potentialModulePath)) {
-      let dirname = path.dirname(potentialModulePath);
+      const dirname = path.dirname(potentialModulePath);
       if (!this._dirExists(dirname)) {
         throw new UnableToResolveError(
           fromModule,
@@ -453,22 +459,16 @@ class ResolutionRequest<TModule: Moduleish, TPackage: Packageish> {
 
       const {name, type} = getAssetDataFromName(potentialModulePath, this._platforms);
 
-      let pattern = name + '(@[\\d\\.]+x)?';
+      let pattern = '^' + name + '(@[\\d\\.]+x)?';
       if (this._platform != null) {
         pattern += '(\\.' + this._platform + ')?';
       }
-      pattern += '\\.' + type;
-
-      // Escape backslashes in the path to be able to use it in the regex
-      if (path.sep === '\\') {
-        dirname = dirname.replace(/\\/g, '\\\\');
-      }
+      pattern += '\\.' + type + '$';
 
-      // We arbitrarly grab the first one, because scale selection
-      // will happen somewhere
-      const [assetFile] = this._hasteFS.matchFiles(
-        new RegExp(dirname + '(\/|\\\\)' + pattern)
-      );
+      const assetFiles = this._matchFiles(dirname, new RegExp(pattern));
+      // We arbitrarly grab the lowest, because scale selection will happen
+      // somewhere else. Always the lowest so that it's stable between builds.
+      const assetFile = getArrayLowestItem(assetFiles);
       if (assetFile) {
         return this._moduleCache.getAssetModule(assetFile);
       }
@@ -582,6 +582,19 @@ function isRelativeImport(filePath) {
   return /^[.][.]?(?:[/]|$)/.test(filePath);
 }
 
+function getArrayLowestItem(a: Array<string>): string | void {
+  if (a.length === 0) {
+    return undefined;
+  }
+  let lowest = a[0];
+  for (let i = 1; i < a.length; ++i) {
+    if (a[i] < lowest) {
+      lowest = a[i];
+    }
+  }
+  return lowest;
+}
+
 ResolutionRequest.emptyModule = require.resolve('./assets/empty-module.js');
 
 module.exports = ResolutionRequest;
diff --git a/packager/src/node-haste/FilesByDirNameIndex.js b/packager/src/node-haste/FilesByDirNameIndex.js
new file mode 100644
index 00000000000000..0da11bf9041dc9
--- /dev/null
+++ b/packager/src/node-haste/FilesByDirNameIndex.js
@@ -0,0 +1,57 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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.
+ *
+ * @flow
+ */
+
+'use strict';
+
+const path = require('path');
+
+/**
+ * This is a way to find files quickly given a RegExp, in a specific directory.
+ * This is must faster than iterating over all the files and matching both
+ * directory and RegExp at the same time.
+ *
+ * This was first implemented to support finding assets fast, for which we know
+ * the directory, but we want to identify all variants (ex. @2x, @1x, for
+ * a picture's different definition levels).
+ */
+class FilesByDirNameIndex {
+  _filesByDirName: Map<string, Array<string>>;
+
+  constructor(allFilePaths: Array<string>) {
+    this._filesByDirName = new Map();
+    for (let i = 0; i < allFilePaths.length; ++i) {
+      const filePath = allFilePaths[i];
+      const dirName = path.dirname(filePath);
+      let dir = this._filesByDirName.get(dirName);
+      if (dir === undefined) {
+        dir = [];
+        this._filesByDirName.set(dirName, dir);
+      }
+      dir.push(path.basename(filePath));
+    }
+  }
+
+  match(dirName: string, pattern: RegExp): Array<string> {
+    const results = [];
+    const dir = this._filesByDirName.get(dirName);
+    if (dir === undefined) {
+      return [];
+    }
+    for (let i = 0; i < dir.length; ++i) {
+      if (pattern.test(dir[i])) {
+        results.push(path.join(dirName, dir[i]));
+      }
+    }
+    return results;
+  }
+}
+
+module.exports = FilesByDirNameIndex;
diff --git a/packager/src/node-haste/index.js b/packager/src/node-haste/index.js
index 6f521fbf517c0e..66ce84528fc1f2 100644
--- a/packager/src/node-haste/index.js
+++ b/packager/src/node-haste/index.js
@@ -13,6 +13,7 @@
 
 const Cache = require('./Cache');
 const DependencyGraphHelpers = require('./DependencyGraph/DependencyGraphHelpers');
+const FilesByDirNameIndex = require('./FilesByDirNameIndex');
 const JestHasteMap = require('jest-haste-map');
 const Module = require('./Module');
 const ModuleCache = require('./ModuleCache');
@@ -76,6 +77,7 @@ const JEST_HASTE_MAP_CACHE_BREAKER = 1;
 class DependencyGraph extends EventEmitter {
 
   _opts: Options;
+  _filesByDirNameIndex: FilesByDirNameIndex;
   _haste: JestHasteMap;
   _helpers: DependencyGraphHelpers;
   _moduleCache: ModuleCache;
@@ -91,12 +93,14 @@ class DependencyGraph extends EventEmitter {
     super();
     invariant(config.opts.maxWorkerCount >= 1, 'worker count must be greater or equal to 1');
     this._opts = config.opts;
+    this._filesByDirNameIndex = new FilesByDirNameIndex(config.initialHasteFS.getAllFiles());
     this._haste = config.haste;
     this._hasteFS = config.initialHasteFS;
     this._moduleMap = config.initialModuleMap;
     this._helpers = new DependencyGraphHelpers(this._opts);
     this._haste.on('change', this._onHasteChange.bind(this));
     this._moduleCache = this._createModuleCache();
+    (this: any)._matchFilesByDirAndPattern = this._matchFilesByDirAndPattern.bind(this);
   }
 
   static _createHaste(opts: Options): JestHasteMap {
@@ -149,6 +153,7 @@ class DependencyGraph extends EventEmitter {
 
   _onHasteChange({eventsQueue, hasteFS, moduleMap}) {
     this._hasteFS = hasteFS;
+    this._filesByDirNameIndex = new FilesByDirNameIndex(hasteFS.getAllFiles());
     this._moduleMap = moduleMap;
     eventsQueue.forEach(({type, filePath, stat}) =>
       this._moduleCache.processFileChange(type, filePath, stat)
@@ -226,6 +231,7 @@ class DependencyGraph extends EventEmitter {
       extraNodeModules: this._opts.extraNodeModules,
       hasteFS: this._hasteFS,
       helpers: this._helpers,
+      matchFiles: this._matchFilesByDirAndPattern,
       moduleCache: this._moduleCache,
       moduleMap: this._moduleMap,
       platform,
@@ -243,6 +249,10 @@ class DependencyGraph extends EventEmitter {
     }).then(() => response);
   }
 
+  _matchFilesByDirAndPattern(dirName: string, pattern: RegExp) {
+    return this._filesByDirNameIndex.match(dirName, pattern);
+  }
+
   matchFilesByPattern(pattern: RegExp) {
     return Promise.resolve(this._hasteFS.matchFiles(pattern));
   }

From 6fa87134fc68fd447e33a01a538ae0af6710e5d2 Mon Sep 17 00:00:00 2001
From: Max Sherman <jonaldislarry@fb.com>
Date: Thu, 6 Apr 2017 09:21:38 -0700
Subject: [PATCH 332/366] Use the absolute path to the sourcemap in the CS
 bundle

Reviewed By: davidaurelio

Differential Revision: D4831377

fbshipit-source-id: b7da81264a65bea1827237cdd34567b29579acd4
---
 local-cli/bundle/buildBundle.js           | 7 ++++++-
 local-cli/bundle/bundleCommandLineArgs.js | 4 ++++
 local-cli/bundle/types.flow.js            | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/local-cli/bundle/buildBundle.js b/local-cli/bundle/buildBundle.js
index a1ac7c7d1df8cd..26a1d386f02489 100644
--- a/local-cli/bundle/buildBundle.js
+++ b/local-cli/bundle/buildBundle.js
@@ -46,9 +46,14 @@ function buildBundle(
   // have other choice than defining it as an env variable here.
   process.env.NODE_ENV = args.dev ? 'development' : 'production';
 
+  let sourceMapUrl = args.sourcemapOutput;
+  if (sourceMapUrl && !args.sourcemapUseAbsolutePath) {
+    sourceMapUrl = path.basename(sourceMapUrl);
+  }
+
   const requestOpts: RequestOptions = {
     entryFile: args.entryFile,
-    sourceMapUrl: args.sourcemapOutput && path.basename(args.sourcemapOutput),
+    sourceMapUrl,
     dev: args.dev,
     minify: !args.dev,
     platform: args.platform,
diff --git a/local-cli/bundle/bundleCommandLineArgs.js b/local-cli/bundle/bundleCommandLineArgs.js
index 40f6c42ad279bb..15d47de6de28ef 100644
--- a/local-cli/bundle/bundleCommandLineArgs.js
+++ b/local-cli/bundle/bundleCommandLineArgs.js
@@ -37,6 +37,10 @@ module.exports = [
   }, {
     command: '--sourcemap-sources-root [string]',
     description: 'Path to make sourcemap\'s sources entries relative to, ex. /root/dir',
+  }, {
+    command: '--sourcemap-use-absolute-path',
+    description: 'Report SourceMapURL using its full path',
+    default: false,
   }, {
     command: '--assets-dest [string]',
     description: 'Directory name where to store assets referenced in the bundle',
diff --git a/local-cli/bundle/types.flow.js b/local-cli/bundle/types.flow.js
index 1933a7e71f5e40..714c797978e8d6 100644
--- a/local-cli/bundle/types.flow.js
+++ b/local-cli/bundle/types.flow.js
@@ -37,6 +37,7 @@ export type OutputOptions = {
   platform: string,
   sourcemapOutput?: string,
   sourcemapSourcesRoot?: string,
+  sourcemapUseAbsolutePath?: boolean,
 };
 
 export type RequestOptions = {|

From 39eb090906f5851b1759750d20ff1eed88435305 Mon Sep 17 00:00:00 2001
From: Shruti Malugu <shrutic@microsoft.com>
Date: Thu, 6 Apr 2017 12:28:41 -0700
Subject: [PATCH 333/366] Fixing another iOS app extension unsafe API usage in
 react native

Summary:
Thanks for submitting a PR! Please read these instructions carefully:

- [yes] Explain the **motivation** for making this change.
    Using react-native library inside iOS app extension causes a compile error inside react native stating that usage of UIAlertView is not allowed inside iOS app extension and should use UIAlertController instead. I have updated the code to use UIAlertController based on the other instances of the UIAlertController usage in the react-native library

- [ partial ] Provide a **test plan** demonstrating that the code is solid.
This code should be launched when developers start the profiler from the React native debug menu. I am currently in process of upgrading my app from 0.34 to the latest react native ( aka app not in working state). Would appreciate if there is an alternative way for me to test this functionality out.

Just tried to create a new react-native project using "react-native init testproject" and upon running "react-native run-ios", I  hit the following error a
Closes https://github.com/facebook/react-native/pull/13328

Differential Revision: D4844559

Pulled By: javache

fbshipit-source-id: e516ca57cb2abf2b09aa53abecb0fe60a40190b4
---
 React/Profiler/RCTProfile.m | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/React/Profiler/RCTProfile.m b/React/Profiler/RCTProfile.m
index a7d5ca853c1b93..eb5a0b9a5a39f5 100644
--- a/React/Profiler/RCTProfile.m
+++ b/React/Profiler/RCTProfile.m
@@ -772,11 +772,14 @@ void RCTProfileSendResult(RCTBridge *bridge, NSString *route, NSData *data)
        if (message.length) {
 #if !TARGET_OS_TV
          dispatch_async(dispatch_get_main_queue(), ^{
-           [[[UIAlertView alloc] initWithTitle:@"Profile"
-                                       message:message
-                                      delegate:nil
-                             cancelButtonTitle:@"OK"
-                             otherButtonTitles:nil] show];
+            UIAlertController *alertController = [UIAlertController
+                alertControllerWithTitle:@"Profile"
+                message:message
+                preferredStyle:UIAlertControllerStyleAlert];
+            [alertController addAction:[UIAlertAction actionWithTitle:@"OK"
+                                                      style:UIAlertActionStyleCancel
+                                                      handler:nil]];
+            [RCTPresentedViewController() presentViewController:alertController animated:YES completion:nil];
          });
 #endif
        }

From ea30aa0fa4aed0ba17b2a88ef0f6ea2ea871bf06 Mon Sep 17 00:00:00 2001
From: Oleg Lokhvitsky <olegbl@fb.com>
Date: Thu, 6 Apr 2017 13:43:54 -0700
Subject: [PATCH 334/366] Fixed crash when forwarding already existing property
 from ReactNativeInternal to ReactNative

Reviewed By: ericvicenti

Differential Revision: D4843917

fbshipit-source-id: 6cdbac28d8a220a6ac289e8b98d9d50eca35e176
---
 Libraries/react-native/react-native-implementation.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Libraries/react-native/react-native-implementation.js b/Libraries/react-native/react-native-implementation.js
index 8f61726e705489..e38853640ec284 100644
--- a/Libraries/react-native/react-native-implementation.js
+++ b/Libraries/react-native/react-native-implementation.js
@@ -150,6 +150,14 @@ function applyForwarding(key) {
     );
     return;
   }
+    if (ReactNative.hasOwnProperty(key)) {
+      // WARNING! ReactNative has read-only keys. So, if ReactNativeInternal
+      // has any duplicate key that ReactNative already has, this assignment
+      // would fail with "Attempted to assign to readonly property."
+      // So, if the key already exists on ReactNative, we assume that it's the
+      // correct module and skip re-assigning it.
+      return;
+    }
   ReactNative[key] = ReactNativeInternal[key];
 }
 for (const key in ReactNativeInternal) {

From d80f9dfa99a796507ada63cd0a3477476bce050e Mon Sep 17 00:00:00 2001
From: Jan Kassens <jkassens@fb.com>
Date: Thu, 6 Apr 2017 20:29:24 -0700
Subject: [PATCH 335/366] add eslint-config-fbjs to RN package.json

Reviewed By: leebyron

Differential Revision: D4848928

fbshipit-source-id: 9aed6cf13e9ed548cb171c2f8b7f95a30220b6f9
---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index b420622b2368eb..b24f77feda3804 100644
--- a/package.json
+++ b/package.json
@@ -222,6 +222,7 @@
     "eslint-plugin-babel": "^3.3.0",
     "eslint-plugin-flowtype": "^2.20.0",
     "eslint-plugin-react": "^6.4.1",
+    "eslint-config-fbjs": "^1.1.1",
     "flow-bin": "^0.43.0",
     "jest": "19.0.2",
     "jest-repl": "19.0.2",

From b5327dd388239ce94bb9c91b9c8d816e12793acc Mon Sep 17 00:00:00 2001
From: "Andrew Y. Chen" <ayc@fb.com>
Date: Thu, 6 Apr 2017 21:21:45 -0700
Subject: [PATCH 336/366] Set the enabled state on disabled button views

Reviewed By: AaaChiuuu

Differential Revision: D4722513

fbshipit-source-id: f4a4e6304594235b5da4e5be36358331e43bdbee
---
 Libraries/Components/Button.js                              | 2 +-
 .../__tests__/__snapshots__/TouchableHighlight-test.js.snap | 1 +
 Libraries/Text/Text.js                                      | 6 ++++++
 .../com/facebook/react/views/text/ReactTextViewManager.java | 5 +++++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Libraries/Components/Button.js b/Libraries/Components/Button.js
index 8c0fd50429c889..eea0b1ffcd29ae 100644
--- a/Libraries/Components/Button.js
+++ b/Libraries/Components/Button.js
@@ -124,7 +124,7 @@ class Button extends React.Component {
         disabled={disabled}
         onPress={onPress}>
         <View style={buttonStyles}>
-          <Text style={textStyles}>{formattedTitle}</Text>
+          <Text style={textStyles} disabled={disabled}>{formattedTitle}</Text>
         </View>
       </Touchable>
     );
diff --git a/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableHighlight-test.js.snap b/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableHighlight-test.js.snap
index a24b4c1521c0b0..29f7478ffaf8ec 100644
--- a/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableHighlight-test.js.snap
+++ b/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableHighlight-test.js.snap
@@ -30,6 +30,7 @@ exports[`TouchableHighlight renders correctly 1`] = `
   <Text
     accessible={true}
     allowFontScaling={true}
+    disabled={false}
     ellipsizeMode="tail"
   >
     Touchable
diff --git a/Libraries/Text/Text.js b/Libraries/Text/Text.js
index db3a22e878e13d..2401589e9b078c 100644
--- a/Libraries/Text/Text.js
+++ b/Libraries/Text/Text.js
@@ -202,12 +202,18 @@ const Text = React.createClass({
      * @platform ios
      */
     minimumFontScale: PropTypes.number,
+    /**
+     * Specifies the disabled state of the text view for testing purposes
+     * @platform android
+     */
+    disabled: PropTypes.bool,
   },
   getDefaultProps(): Object {
     return {
       accessible: true,
       allowFontScaling: true,
       ellipsizeMode: 'tail',
+      disabled: false,
     };
   },
   getInitialState: function(): Object {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java
index 09515a8fee2c34..77591a8153d49b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java
@@ -157,6 +157,11 @@ public void setIncludeFontPadding(ReactTextView view, boolean includepad) {
     view.setIncludeFontPadding(includepad);
   }
 
+  @ReactProp(name = "disabled", defaultBoolean = false)
+  public void setDisabled(ReactTextView view, boolean disabled) {
+    view.setEnabled(!disabled);
+  }
+
   @Override
   public void updateExtraData(ReactTextView view, Object extraData) {
     ReactTextUpdate update = (ReactTextUpdate) extraData;

From f72d9dd08bcadaa7acc579da1096830348bdc0df Mon Sep 17 00:00:00 2001
From: Spencer Ahrens <sahrens@fb.com>
Date: Fri, 7 Apr 2017 00:48:49 -0700
Subject: [PATCH 337/366] Add option to track when we're showing blankness
 during fast scrolling

Summary:
If tracking is enabled and the sampling check passes on a scroll or layout event,
we compare the scroll offset to the layout of the rendered items. If the items don't cover
the visible area of the list, we fire an `onFillRateExceeded` call with relevant stats for
logging the event through an analytics pipeline.

The measurement methodology is a little jank because everything is async, but it seems directionally
useful for getting ballpark numbers, catching regressions, and tracking improvements.

Benchmark testing shows a ~2014 MotoX starts hitting the fill rate limit at about 2500 px / sec,
which is pretty fast scrolling.

This also reworks our frame rate stuff so we can use a shared `SceneTracking` thing and track blankness
globally.

Reviewed By: bvaughn

Differential Revision: D4806867

fbshipit-source-id: 119bf177463c8c3aa51fa13d1a9d03b1a96042aa
---
 Libraries/Lists/FillRateHelper.js             | 176 ++++++++++++++++++
 Libraries/Lists/VirtualizedList.js            |  27 ++-
 .../Lists/__tests__/FillRateHelper-test.js    | 106 +++++++++++
 Libraries/ReactNative/AppRegistry.js          |  10 +-
 Libraries/Utilities/SceneTracker.js           |  41 ++++
 .../Utilities/__tests__/SceneTracker-test.js  |  30 +++
 6 files changed, 387 insertions(+), 3 deletions(-)
 create mode 100644 Libraries/Lists/FillRateHelper.js
 create mode 100644 Libraries/Lists/__tests__/FillRateHelper-test.js
 create mode 100644 Libraries/Utilities/SceneTracker.js
 create mode 100644 Libraries/Utilities/__tests__/SceneTracker-test.js

diff --git a/Libraries/Lists/FillRateHelper.js b/Libraries/Lists/FillRateHelper.js
new file mode 100644
index 00000000000000..745e21cac96ade
--- /dev/null
+++ b/Libraries/Lists/FillRateHelper.js
@@ -0,0 +1,176 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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 FillRateHelper
+ * @flow
+ */
+
+'use strict';
+
+const performanceNow = require('fbjs/lib/performanceNow');
+const warning = require('fbjs/lib/warning');
+
+export type FillRateExceededInfo = {
+  event: {
+    sample_type: string,
+    blankness: number,
+    blank_pixels_top: number,
+    blank_pixels_bottom: number,
+    scroll_offset: number,
+    visible_length: number,
+    scroll_speed: number,
+    first_frame: Object,
+    last_frame: Object,
+  },
+  aggregate: {
+    avg_blankness: number,
+    min_speed_when_blank: number,
+    avg_speed_when_blank: number,
+    avg_blankness_when_any_blank: number,
+    fraction_any_blank: number,
+    all_samples_timespan_sec: number,
+    fill_rate_sample_counts: {[key: string]: number},
+  },
+};
+
+type FrameMetrics = {inLayout?: boolean, length: number, offset: number};
+
+let _listeners: Array<(FillRateExceededInfo) => void> = [];
+let _sampleRate = null;
+
+/**
+ * A helper class for detecting when the maximem fill rate of `VirtualizedList` is exceeded.
+ * By default the sampling rate is set to zero and this will do nothing. If you want to collect
+ * samples (e.g. to log them), make sure to call `FillRateHelper.setSampleRate(0.0-1.0)`.
+ *
+ * Listeners and sample rate are global for all `VirtualizedList`s - typical usage will combine with
+ * `SceneTracker.getActiveScene` to determine the context of the events.
+ */
+class FillRateHelper {
+  _getFrameMetrics: (index: number) => ?FrameMetrics;
+  _anyBlankCount = 0;
+  _anyBlankMinSpeed = Infinity;
+  _anyBlankSpeedSum = 0;
+  _sampleCounts = {};
+  _fractionBlankSum = 0;
+  _samplesStartTime = 0;
+
+  static addFillRateExceededListener(
+    callback: (FillRateExceededInfo) => void
+  ): {remove: () => void} {
+    warning(
+      _sampleRate !== null,
+      'Call `FillRateHelper.setSampleRate` before `addFillRateExceededListener`.'
+    );
+    _listeners.push(callback);
+    return {
+      remove: () => {
+        _listeners = _listeners.filter((listener) => callback !== listener);
+      },
+    };
+  }
+
+  static setSampleRate(sampleRate: number) {
+    _sampleRate = sampleRate;
+  }
+
+  static enabled(): boolean {
+    return (_sampleRate || 0) > 0.0;
+  }
+
+  constructor(getFrameMetrics: (index: number) => ?FrameMetrics) {
+    this._getFrameMetrics = getFrameMetrics;
+  }
+
+  computeInfoSampled(
+    sampleType: string,
+    props: {
+      data: Array<any>,
+      getItemCount: (data: Array<any>) => number,
+      initialNumToRender: number,
+    },
+    state: {
+      first: number,
+      last: number,
+    },
+    scrollMetrics: {
+      offset: number,
+      velocity: number,
+      visibleLength: number,
+    },
+  ): ?FillRateExceededInfo {
+    if (!FillRateHelper.enabled() || (_sampleRate || 0) <= Math.random()) {
+      return null;
+    }
+    const start = performanceNow();
+    if (!this._samplesStartTime) {
+      this._samplesStartTime = start;
+    }
+    const {offset, velocity, visibleLength} = scrollMetrics;
+    let blankTop = 0;
+    let first = state.first;
+    let firstFrame = this._getFrameMetrics(first);
+    while (first <= state.last && (!firstFrame || !firstFrame.inLayout)) {
+      firstFrame = this._getFrameMetrics(first);
+      first++;
+    }
+    if (firstFrame) {
+      blankTop = Math.min(visibleLength, Math.max(0, firstFrame.offset - offset));
+    }
+    let blankBottom = 0;
+    let last = state.last;
+    let lastFrame = this._getFrameMetrics(last);
+    while (last >= state.first && (!lastFrame || !lastFrame.inLayout)) {
+      lastFrame = this._getFrameMetrics(last);
+      last--;
+    }
+    if (lastFrame) {
+      const bottomEdge = lastFrame.offset + lastFrame.length;
+      blankBottom = Math.min(visibleLength, Math.max(0, offset + visibleLength - bottomEdge));
+    }
+    this._sampleCounts.all = (this._sampleCounts.all || 0) + 1;
+    this._sampleCounts[sampleType] = (this._sampleCounts[sampleType] || 0) + 1;
+    const blankness = (blankTop + blankBottom) / visibleLength;
+    if (blankness > 0) {
+      const scrollSpeed = Math.abs(velocity);
+      if (scrollSpeed && sampleType === 'onScroll') {
+        this._anyBlankMinSpeed = Math.min(this._anyBlankMinSpeed, scrollSpeed);
+      }
+      this._anyBlankSpeedSum += scrollSpeed;
+      this._anyBlankCount++;
+      this._fractionBlankSum += blankness;
+      const event = {
+        sample_type: sampleType,
+        blankness: blankness,
+        blank_pixels_top: blankTop,
+        blank_pixels_bottom: blankBottom,
+        scroll_offset: offset,
+        visible_length: visibleLength,
+        scroll_speed: scrollSpeed,
+        first_frame: {...firstFrame},
+        last_frame: {...lastFrame},
+      };
+      const aggregate = {
+        avg_blankness: this._fractionBlankSum / this._sampleCounts.all,
+        min_speed_when_blank: this._anyBlankMinSpeed,
+        avg_speed_when_blank: this._anyBlankSpeedSum / this._anyBlankCount,
+        avg_blankness_when_any_blank: this._fractionBlankSum / this._anyBlankCount,
+        fraction_any_blank: this._anyBlankCount / this._sampleCounts.all,
+        all_samples_timespan_sec: (performanceNow() - this._samplesStartTime) / 1000.0,
+        fill_rate_sample_counts: {...this._sampleCounts},
+        compute_time: performanceNow() - start,
+      };
+      const info = {event, aggregate};
+      _listeners.forEach((listener) => listener(info));
+      return info;
+    }
+    return null;
+  }
+}
+
+module.exports = FillRateHelper;
diff --git a/Libraries/Lists/VirtualizedList.js b/Libraries/Lists/VirtualizedList.js
index 13d83ce22f0cbe..93205d22033918 100644
--- a/Libraries/Lists/VirtualizedList.js
+++ b/Libraries/Lists/VirtualizedList.js
@@ -12,6 +12,7 @@
 'use strict';
 
 const Batchinator = require('Batchinator');
+const FillRateHelper = require('FillRateHelper');
 const React = require('React');
 const ReactNative = require('ReactNative');
 const RefreshControl = require('RefreshControl');
@@ -27,6 +28,7 @@ const {computeWindowedRenderLimits} = require('VirtualizeUtils');
 import type {ViewabilityConfig, ViewToken} from 'ViewabilityHelper';
 
 type Item = any;
+
 type renderItemType = (info: {item: Item, index: number}) => ?React.Element<any>;
 
 type RequiredProps = {
@@ -301,6 +303,7 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
       'to support native onScroll events with useNativeDriver',
     );
 
+    this._fillRateHelper = new FillRateHelper(this._getFrameMetrics);
     this._updateCellsToRenderBatcher = new Batchinator(
       this._updateCellsToRender,
       this.props.updateCellsBatchingPeriod,
@@ -366,6 +369,7 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
       }
     }
   }
+
   render() {
     const {ListFooterComponent, ListHeaderComponent} = this.props;
     const {data, disableVirtualization, horizontal} = this.props;
@@ -481,6 +485,7 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
   _hasWarned = {};
   _highestMeasuredFrameIndex = 0;
   _headerLength = 0;
+  _fillRateHelper: FillRateHelper;
   _frames = {};
   _footerLength = 0;
   _scrollMetrics = {
@@ -520,6 +525,7 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
     } else {
       this._frames[cellKey].inLayout = true;
     }
+    this._sampleFillRate('onCellLayout');
   }
 
   _onCellUnmount = (cellKey: string) => {
@@ -606,6 +612,15 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
     this._updateCellsToRenderBatcher.schedule();
   };
 
+  _sampleFillRate(sampleType: string) {
+    this._fillRateHelper.computeInfoSampled(
+      sampleType,
+      this.props,
+      this.state,
+      this._scrollMetrics,
+    );
+  }
+
   _onScroll = (e: Object) => {
     if (this.props.onScroll) {
       this.props.onScroll(e);
@@ -629,6 +644,9 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
     const velocity = dOffset / dt;
     this._scrollMetrics = {contentLength, dt, offset, timestamp, velocity, visibleLength};
     const {data, getItemCount, onEndReached, onEndReachedThreshold, windowSize} = this.props;
+
+    this._sampleFillRate('onScroll');
+
     this._updateViewableItems(data);
     if (!data) {
       return;
@@ -667,6 +685,7 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
     this._viewabilityHelper.recordInteraction();
     this.props.onScrollBeginDrag && this.props.onScrollBeginDrag(e);
   };
+
   _updateCellsToRender = () => {
     const {data, disableVirtualization, getItemCount, onEndReachedThreshold} = this.props;
     this._updateViewableItems(data);
@@ -717,7 +736,9 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
     }
   };
 
-  _getFrameMetrics = (index: number): ?{length: number, offset: number, index: number} => {
+  _getFrameMetrics = (
+    index: number,
+  ): ?{length: number, offset: number, index: number, inLayout?: boolean} => {
     const {data, getItem, getItemCount, getItemLayout, keyExtractor} = this.props;
     invariant(getItemCount(data) > index, 'Tried to get frame for out of range index ' + index);
     const item = getItem(data, index);
@@ -767,7 +788,9 @@ class CellRenderer extends React.Component {
     const {renderItem, getItemLayout} = parentProps;
     invariant(renderItem, 'no renderItem!');
     const element = renderItem({item, index});
-    if (getItemLayout && !parentProps.debug) {
+    if (getItemLayout &&
+        !parentProps.debug &&
+        !FillRateHelper.enabled()) {
       return element;
     }
     // NOTE: that when this is a sticky header, `onLayout` will get automatically extracted and
diff --git a/Libraries/Lists/__tests__/FillRateHelper-test.js b/Libraries/Lists/__tests__/FillRateHelper-test.js
new file mode 100644
index 00000000000000..9a0792367e7673
--- /dev/null
+++ b/Libraries/Lists/__tests__/FillRateHelper-test.js
@@ -0,0 +1,106 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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.
+ *
+ */
+'use strict';
+
+jest.unmock('FillRateHelper');
+
+const FillRateHelper = require('FillRateHelper');
+
+let rowFramesGlobal;
+const dataGlobal = [{key: 'a'}, {key: 'b'}, {key: 'c'}, {key: 'd'}];
+function getFrameMetrics(index: number) {
+  const frame = rowFramesGlobal[dataGlobal[index].key];
+  return {length: frame.height, offset: frame.y, inLayout: frame.inLayout};
+}
+
+function computeResult({helper, props, state, scroll}) {
+  return helper.computeInfoSampled(
+    'test',
+    {
+      data: dataGlobal,
+      fillRateTrackingSampleRate: 1,
+      getItemCount: (data2) => data2.length,
+      initialNumToRender: 10,
+      ...(props || {}),
+    },
+    {first: 0, last: 1, ...(state || {})},
+    {offset: 0, visibleLength: 100, ...(scroll || {})},
+  );
+}
+
+describe('computeInfoSampled', function() {
+  beforeEach(() => {
+    FillRateHelper.setSampleRate(1);
+  });
+
+  it('computes correct blankness of viewport', function() {
+    const helper = new FillRateHelper(getFrameMetrics);
+    rowFramesGlobal = {
+      a: {y: 0, height: 50, inLayout: true},
+      b: {y: 50, height: 50, inLayout: true},
+    };
+    let result = computeResult({helper});
+    expect(result).toBeNull();
+    result = computeResult({helper, state: {last: 0}});
+    expect(result.event.blankness).toBe(0.5);
+    result = computeResult({helper, scroll: {offset: 25}});
+    expect(result.event.blankness).toBe(0.25);
+    result = computeResult({helper, scroll: {visibleLength: 400}});
+    expect(result.event.blankness).toBe(0.75);
+    result = computeResult({helper, scroll: {offset: 100}});
+    expect(result.event.blankness).toBe(1);
+    expect(result.aggregate.avg_blankness).toBe(0.5);
+  });
+
+  it('skips frames that are not in layout', function() {
+    const helper = new FillRateHelper(getFrameMetrics);
+    rowFramesGlobal = {
+      a: {y: 0, height: 10, inLayout: false},
+      b: {y: 10, height: 30, inLayout: true},
+      c: {y: 40, height: 40, inLayout: true},
+      d: {y: 80, height: 20, inLayout: false},
+    };
+    const result = computeResult({helper, state: {last: 3}});
+    expect(result.event.blankness).toBe(0.3);
+  });
+
+  it('sampling rate can disable', function() {
+    const helper = new FillRateHelper(getFrameMetrics);
+    rowFramesGlobal = {
+      a: {y: 0, height: 40, inLayout: true},
+      b: {y: 40, height: 40, inLayout: true},
+    };
+    let result = computeResult({helper});
+    expect(result.event.blankness).toBe(0.2);
+
+    FillRateHelper.setSampleRate(0);
+
+    result = computeResult({helper});
+    expect(result).toBeNull();
+  });
+
+  it('can handle multiple listeners and unsubscribe', function() {
+    const listeners = [jest.fn(), jest.fn(), jest.fn()];
+    const subscriptions = listeners.map(
+      (listener) => FillRateHelper.addFillRateExceededListener(listener)
+    );
+    subscriptions[1].remove();
+    const helper = new FillRateHelper(getFrameMetrics);
+    rowFramesGlobal = {
+      a: {y: 0, height: 40, inLayout: true},
+      b: {y: 40, height: 40, inLayout: true},
+    };
+    const result = computeResult({helper});
+    expect(result.event.blankness).toBe(0.2);
+    expect(listeners[0]).toBeCalledWith(result);
+    expect(listeners[1]).not.toBeCalled();
+    expect(listeners[2]).toBeCalledWith(result);
+  });
+});
diff --git a/Libraries/ReactNative/AppRegistry.js b/Libraries/ReactNative/AppRegistry.js
index b68a293b2c1c13..6febc878ba2b9c 100644
--- a/Libraries/ReactNative/AppRegistry.js
+++ b/Libraries/ReactNative/AppRegistry.js
@@ -16,6 +16,7 @@ const BugReporting = require('BugReporting');
 const FrameRateLogger = require('FrameRateLogger');
 const NativeModules = require('NativeModules');
 const ReactNative = require('ReactNative');
+const SceneTracker = require('SceneTracker');
 
 const infoLog = require('infoLog');
 const invariant = require('fbjs/lib/invariant');
@@ -56,6 +57,8 @@ const sections: Runnables = {};
 const tasks: Map<string, TaskProvider> = new Map();
 let componentProviderInstrumentationHook: ComponentProviderInstrumentationHook =
   (component: ComponentProvider) => component();
+let _frameRateLoggerSceneListener = null;
+
 
 /**
  * `AppRegistry` is the JS entry point to running all React Native apps.  App
@@ -173,7 +176,12 @@ const AppRegistry = {
       'This error can also happen due to a require() error during ' +
       'initialization or failure to call AppRegistry.registerComponent.\n\n'
     );
-    FrameRateLogger.setContext(appKey);
+    if (!_frameRateLoggerSceneListener) {
+      _frameRateLoggerSceneListener = SceneTracker.addActiveSceneChangedListener(
+        (scene) => FrameRateLogger.setContext(scene.name)
+      );
+    }
+    SceneTracker.setActiveScene({name: appKey});
     runnables[appKey].run(appParameters);
   },
 
diff --git a/Libraries/Utilities/SceneTracker.js b/Libraries/Utilities/SceneTracker.js
new file mode 100644
index 00000000000000..568bf62aaeece4
--- /dev/null
+++ b/Libraries/Utilities/SceneTracker.js
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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 SceneTracker
+ * @flow
+ */
+
+'use strict';
+
+type Scene = {name: string};
+
+let _listeners: Array<(scene: Scene) => void> = [];
+
+let _activeScene = {name: 'default'};
+
+const SceneTracker = {
+  setActiveScene(scene: Scene) {
+    _activeScene = scene;
+    _listeners.forEach((listener) => listener(_activeScene));
+  },
+
+  getActiveScene(): Scene {
+    return _activeScene;
+  },
+
+  addActiveSceneChangedListener(callback: (scene: Scene) => void): {remove: () => void} {
+    _listeners.push(callback);
+    return {
+      remove: () => {
+        _listeners = _listeners.filter((listener) => callback !== listener);
+      },
+    };
+  },
+};
+
+module.exports = SceneTracker;
diff --git a/Libraries/Utilities/__tests__/SceneTracker-test.js b/Libraries/Utilities/__tests__/SceneTracker-test.js
new file mode 100644
index 00000000000000..c27a1b36617d76
--- /dev/null
+++ b/Libraries/Utilities/__tests__/SceneTracker-test.js
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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.
+ *
+ */
+'use strict';
+
+jest.unmock('SceneTracker');
+
+const SceneTracker = require('SceneTracker');
+
+describe('setActiveScene', function() {
+
+  it('can handle multiple listeners and unsubscribe', function() {
+    const listeners = [jest.fn(), jest.fn(), jest.fn()];
+    const subscriptions = listeners.map(
+      (listener) => SceneTracker.addActiveSceneChangedListener(listener)
+    );
+    subscriptions[1].remove();
+    const newScene = {name: 'scene1'};
+    SceneTracker.setActiveScene(newScene);
+    expect(listeners[0]).toBeCalledWith(newScene);
+    expect(listeners[1]).not.toBeCalled();
+    expect(listeners[2]).toBeCalledWith(newScene);
+  });
+});

From 1b52c2a7abd0dbed1c616bdfcbdccba253cd0218 Mon Sep 17 00:00:00 2001
From: Spencer Ahrens <sahrens@fb.com>
Date: Fri, 7 Apr 2017 00:48:52 -0700
Subject: [PATCH 338/366] Support elements for header/footer

Summary: It can be much more convenient instead of binding and setting `extraData` or what-not.

Reviewed By: blairvanderhoof

Differential Revision: D4829165

fbshipit-source-id: bb781fedc831059e7b5065ea4357955aed79beda
---
 Examples/UIExplorer/js/FlatListExample.js |  2 +-
 Libraries/Lists/FlatList.js               | 10 ++++++----
 Libraries/Lists/SectionList.js            |  4 ++--
 Libraries/Lists/VirtualizedList.js        | 10 ++++++++--
 Libraries/Lists/VirtualizedSectionList.js |  4 ++--
 5 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/Examples/UIExplorer/js/FlatListExample.js b/Examples/UIExplorer/js/FlatListExample.js
index 2dac3dd14490e6..83e754a5633373 100644
--- a/Examples/UIExplorer/js/FlatListExample.js
+++ b/Examples/UIExplorer/js/FlatListExample.js
@@ -127,7 +127,7 @@ class FlatListExample extends React.PureComponent {
         <SeparatorComponent />
         <AnimatedFlatList
           ItemSeparatorComponent={SeparatorComponent}
-          ListHeaderComponent={HeaderComponent}
+          ListHeaderComponent={<HeaderComponent />}
           ListFooterComponent={FooterComponent}
           data={filteredData}
           debug={this.state.debug}
diff --git a/Libraries/Lists/FlatList.js b/Libraries/Lists/FlatList.js
index d5d785e141c3db..17ccf2ce845e54 100644
--- a/Libraries/Lists/FlatList.js
+++ b/Libraries/Lists/FlatList.js
@@ -49,13 +49,15 @@ type OptionalProps<ItemT> = {
    */
   ItemSeparatorComponent?: ?ReactClass<any>,
   /**
-   * Rendered at the bottom of all the items.
+   * Rendered at the bottom of all the items. Can be a React Component Class, a render function, or
+   * a rendered element.
    */
-  ListFooterComponent?: ?ReactClass<any>,
+  ListFooterComponent?: ?(ReactClass<any> | React.Element<any>),
   /**
-   * Rendered at the top of all the items.
+   * Rendered at the top of all the items. Can be a React Component Class, a render function, or
+   * a rendered element.
    */
-  ListHeaderComponent?: ?ReactClass<any>,
+  ListHeaderComponent?: ?(ReactClass<any> | React.Element<any>),
   /**
    * Optional custom style for multi-item rows generated when numColumns > 1.
    */
diff --git a/Libraries/Lists/SectionList.js b/Libraries/Lists/SectionList.js
index d4f9934f9429ea..8b7409d9b1ddd0 100644
--- a/Libraries/Lists/SectionList.js
+++ b/Libraries/Lists/SectionList.js
@@ -51,11 +51,11 @@ type OptionalProps<SectionT: SectionBase<any>> = {
   /**
    * Rendered at the very beginning of the list.
    */
-  ListHeaderComponent?: ?ReactClass<any>,
+  ListHeaderComponent?: ?(ReactClass<any> | React.Element<any>),
   /**
    * Rendered at the very end of the list.
    */
-  ListFooterComponent?: ?ReactClass<any>,
+  ListFooterComponent?: ?(ReactClass<any> | React.Element<any>),
   /**
    * Rendered in between each section.
    */
diff --git a/Libraries/Lists/VirtualizedList.js b/Libraries/Lists/VirtualizedList.js
index 93205d22033918..5b85a54ac3d40c 100644
--- a/Libraries/Lists/VirtualizedList.js
+++ b/Libraries/Lists/VirtualizedList.js
@@ -377,9 +377,12 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
     const stickyIndicesFromProps = new Set(this.props.stickyHeaderIndices);
     const stickyHeaderIndices = [];
     if (ListHeaderComponent) {
+      const element = React.isValidElement(ListHeaderComponent)
+        ? ListHeaderComponent
+        : <ListHeaderComponent />;
       cells.push(
         <View key="$header" onLayout={this._onLayoutHeader}>
-          <ListHeaderComponent />
+          {element}
         </View>
       );
     }
@@ -450,9 +453,12 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
       }
     }
     if (ListFooterComponent) {
+      const element = React.isValidElement(ListFooterComponent)
+        ? ListFooterComponent
+        : <ListFooterComponent />;
       cells.push(
         <View key="$footer" onLayout={this._onLayoutFooter}>
-          <ListFooterComponent />
+          {element}
         </View>
       );
     }
diff --git a/Libraries/Lists/VirtualizedSectionList.js b/Libraries/Lists/VirtualizedSectionList.js
index d35eb2bcdc16c1..d6de9f38d2cf1a 100644
--- a/Libraries/Lists/VirtualizedSectionList.js
+++ b/Libraries/Lists/VirtualizedSectionList.js
@@ -48,11 +48,11 @@ type OptionalProps<SectionT: SectionBase> = {
   /**
    * Rendered after the last item in the last section.
    */
-  ListFooterComponent?: ?ReactClass<*>,
+  ListFooterComponent?: ?(ReactClass<*> | React.Element<*>),
   /**
    * Rendered at the very beginning of the list.
    */
-  ListHeaderComponent?: ?ReactClass<*>,
+  ListHeaderComponent?: ?(ReactClass<*> | React.Element<*>),
   /**
    * Default renderer for every item in every section.
    */

From 568fb403bfb5b4b92ec912812b00095047d18850 Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Fri, 7 Apr 2017 04:56:31 -0700
Subject: [PATCH 339/366] packager: GlobalTransformCache: fix bug in retry
 logic

Reviewed By: bestander

Differential Revision: D4850644

fbshipit-source-id: ede9991eaac3c7bfd045f2a9c3e9d0b10d45af0f
---
 packager/src/lib/GlobalTransformCache.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packager/src/lib/GlobalTransformCache.js b/packager/src/lib/GlobalTransformCache.js
index 962c028d73e3a6..729b99de661eb5 100644
--- a/packager/src/lib/GlobalTransformCache.js
+++ b/packager/src/lib/GlobalTransformCache.js
@@ -281,7 +281,7 @@ class URIBasedGlobalTransformCache {
     return (
       error instanceof FetchError && error.type === 'request-timeout' || (
         error instanceof FetchFailedError &&
-        error.details.type === 'wrong_http_status' &&
+        error.details.type === 'unhandled_http_status' &&
         (error.details.statusCode === 503 || error.details.statusCode === 502)
       )
     );

From b2647ea33543a144000892ad7eeb4329a660507f Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieterdb@fb.com>
Date: Fri, 7 Apr 2017 09:27:05 -0700
Subject: [PATCH 340/366] Allow ModuleRegistry initialization to complete
 lazily

Reviewed By: mhorowitz

Differential Revision: D4794794

fbshipit-source-id: f3b7a5d02587b4cd4e214aa6b0368a0d214fb63f
---
 React/CxxBridge/RCTCxxBridge.mm           |  2 +-
 React/CxxModule/RCTCxxUtils.h             |  3 +--
 React/CxxModule/RCTCxxUtils.mm            |  5 ++---
 ReactCommon/cxxreact/JSCNativeModules.cpp |  4 ----
 ReactCommon/cxxreact/ModuleRegistry.cpp   | 26 +++++++++++++++++++----
 ReactCommon/cxxreact/ModuleRegistry.h     |  2 ++
 6 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm
index 86bd33b8a68ac1..da803299b46919 100644
--- a/React/CxxBridge/RCTCxxBridge.mm
+++ b/React/CxxBridge/RCTCxxBridge.mm
@@ -398,7 +398,7 @@ - (BOOL)moduleIsInitialized:(Class)moduleClass
   [_performanceLogger markStartForTag:RCTPLNativeModulePrepareConfig];
   RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"-[RCTCxxBridge buildModuleRegistry]", nil);
 
-  auto registry = buildModuleRegistry(_moduleDataByID, self, _reactInstance);
+  auto registry = std::make_shared<ModuleRegistry>(createNativeModules(_moduleDataByID, self, _reactInstance));
 
   [_performanceLogger markStopForTag:RCTPLNativeModulePrepareConfig];
   RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
diff --git a/React/CxxModule/RCTCxxUtils.h b/React/CxxModule/RCTCxxUtils.h
index e84032682d154d..41e701dfb7ce44 100644
--- a/React/CxxModule/RCTCxxUtils.h
+++ b/React/CxxModule/RCTCxxUtils.h
@@ -12,7 +12,6 @@
 #import <React/RCTConvert.h>
 #include <JavaScriptCore/JavaScriptCore.h>
 #include <cxxreact/JSCExecutor.h>
-#include <cxxreact/ModuleRegistry.h>
 #include <folly/dynamic.h>
 #include <jschelpers/JavaScriptCore.h>
 
@@ -30,7 +29,7 @@ namespace react {
 
 class Instance;
 
-std::shared_ptr<ModuleRegistry> buildModuleRegistry(NSArray<RCTModuleData *> *modules, RCTBridge *bridge, const std::shared_ptr<Instance> &instance);
+std::vector<std::unique_ptr<NativeModule>> createNativeModules(NSArray<RCTModuleData *> *modules, RCTBridge *bridge, const std::shared_ptr<Instance> &instance);
 
 JSContext *contextForGlobalContextRef(JSGlobalContextRef contextRef);
 
diff --git a/React/CxxModule/RCTCxxUtils.mm b/React/CxxModule/RCTCxxUtils.mm
index 740f5960aa3e96..331e0bfaf55792 100644
--- a/React/CxxModule/RCTCxxUtils.mm
+++ b/React/CxxModule/RCTCxxUtils.mm
@@ -41,7 +41,7 @@ @implementation RCTConvert (folly)
 namespace facebook {
 namespace react {
 
-std::shared_ptr<ModuleRegistry> buildModuleRegistry(NSArray<RCTModuleData *> *modules, RCTBridge *bridge, const std::shared_ptr<Instance> &instance)
+std::vector<std::unique_ptr<NativeModule>> createNativeModules(NSArray<RCTModuleData *> *modules, RCTBridge *bridge, const std::shared_ptr<Instance> &instance)
 {
   std::vector<std::unique_ptr<NativeModule>> nativeModules;
   for (RCTModuleData *moduleData in modules) {
@@ -61,8 +61,7 @@ @implementation RCTConvert (folly)
       nativeModules.emplace_back(std::make_unique<RCTNativeModule>(bridge, moduleData));
     }
   }
-
-  return std::make_shared<ModuleRegistry>(std::move(nativeModules));
+  return nativeModules;
 }
 
 JSContext *contextForGlobalContextRef(JSGlobalContextRef contextRef)
diff --git a/ReactCommon/cxxreact/JSCNativeModules.cpp b/ReactCommon/cxxreact/JSCNativeModules.cpp
index f55e0049736efb..013f6ef13fab5e 100644
--- a/ReactCommon/cxxreact/JSCNativeModules.cpp
+++ b/ReactCommon/cxxreact/JSCNativeModules.cpp
@@ -45,10 +45,6 @@ folly::Optional<Object> JSCNativeModules::createModule(const std::string& name,
     auto global = Object::getGlobalObject(context);
     m_genNativeModuleJS = global.getProperty("__fbGenNativeModule").asObject();
     m_genNativeModuleJS->makeProtected();
-
-    // Initialize the module name list, otherwise getModuleConfig won't work
-    // TODO (pieterdb): fix this in ModuleRegistry
-    m_moduleRegistry->moduleNames();
   }
 
   auto result = m_moduleRegistry->getConfig(name);
diff --git a/ReactCommon/cxxreact/ModuleRegistry.cpp b/ReactCommon/cxxreact/ModuleRegistry.cpp
index 39ef2e0d252af7..4a7dcb80149a5c 100644
--- a/ReactCommon/cxxreact/ModuleRegistry.cpp
+++ b/ReactCommon/cxxreact/ModuleRegistry.cpp
@@ -2,6 +2,8 @@
 
 #include "ModuleRegistry.h"
 
+#include <glog/logging.h>
+
 #include "NativeModule.h"
 #include "SystraceSection.h"
 
@@ -28,6 +30,18 @@ std::string normalizeName(std::string name) {
 ModuleRegistry::ModuleRegistry(std::vector<std::unique_ptr<NativeModule>> modules)
     : modules_(std::move(modules)) {}
 
+void ModuleRegistry::registerModules(std::vector<std::unique_ptr<NativeModule>> modules) {
+  // TODO: consider relaxing this restriction
+  CHECK(modulesByName_.empty()) << "Can only register additional modules before NativeModules have been accessed";
+
+  if (modules_.empty()) {
+    modules_ = std::move(modules);
+  } else {
+    modules_.reserve(modules_.size() + modules.size());
+    std::move(modules.begin(), modules.end(), std::back_inserter(modules_));
+  }
+}
+
 std::vector<std::string> ModuleRegistry::moduleNames() {
   std::vector<std::string> names;
   for (size_t i = 0; i < modules_.size(); i++) {
@@ -40,6 +54,12 @@ std::vector<std::string> ModuleRegistry::moduleNames() {
 
 folly::Optional<ModuleConfig> ModuleRegistry::getConfig(const std::string& name) {
   SystraceSection s("getConfig", "module", name);
+
+  // Initialize modulesByName_
+  if (modulesByName_.empty() && !modules_.empty()) {
+    moduleNames();
+  }
+
   auto it = modulesByName_.find(name);
   if (it == modulesByName_.end()) {
     return nullptr;
@@ -97,8 +117,7 @@ void ModuleRegistry::callNativeMethod(ExecutorToken token, unsigned int moduleId
                                       folly::dynamic&& params, int callId) {
   if (moduleId >= modules_.size()) {
     throw std::runtime_error(
-      folly::to<std::string>("moduleId ", moduleId,
-                             " out of range [0..", modules_.size(), ")"));
+      folly::to<std::string>("moduleId ", moduleId, " out of range [0..", modules_.size(), ")"));
   }
 
 #ifdef WITH_FBSYSTRACE
@@ -113,8 +132,7 @@ void ModuleRegistry::callNativeMethod(ExecutorToken token, unsigned int moduleId
 MethodCallResult ModuleRegistry::callSerializableNativeHook(ExecutorToken token, unsigned int moduleId, unsigned int methodId, folly::dynamic&& params) {
   if (moduleId >= modules_.size()) {
     throw std::runtime_error(
-      folly::to<std::string>("moduleId ", moduleId,
-                             " out of range [0..", modules_.size(), ")"));
+      folly::to<std::string>("moduleId ", moduleId, "out of range [0..", modules_.size(), ")"));
   }
   return modules_[moduleId]->callSerializableNativeHook(token, methodId, std::move(params));
 }
diff --git a/ReactCommon/cxxreact/ModuleRegistry.h b/ReactCommon/cxxreact/ModuleRegistry.h
index ef19d28a674d8a..fd5665c5306d10 100644
--- a/ReactCommon/cxxreact/ModuleRegistry.h
+++ b/ReactCommon/cxxreact/ModuleRegistry.h
@@ -30,6 +30,8 @@ class ModuleRegistry {
   // notifyCatalystInstanceDestroy: use RAII instead
 
   ModuleRegistry(std::vector<std::unique_ptr<NativeModule>> modules);
+  void registerModules(std::vector<std::unique_ptr<NativeModule>> modules);
+
   std::vector<std::string> moduleNames();
 
   folly::Optional<ModuleConfig> getConfig(const std::string& name);

From ceac54ebe988737e1f2b91f9f5ee11f3f94e9051 Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieterdb@fb.com>
Date: Fri, 7 Apr 2017 09:27:08 -0700
Subject: [PATCH 341/366] Use forward declaration in RCTCxxModule

Reviewed By: mhorowitz

Differential Revision: D4821449

fbshipit-source-id: 8e75a7b17e0986bc9416a0afde0d7dfa179d4fed
---
 React/CxxModule/RCTCxxModule.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/React/CxxModule/RCTCxxModule.h b/React/CxxModule/RCTCxxModule.h
index 0f08f3113f816a..6df9836834a444 100644
--- a/React/CxxModule/RCTCxxModule.h
+++ b/React/CxxModule/RCTCxxModule.h
@@ -12,7 +12,14 @@
 #import <Foundation/Foundation.h>
 
 #import <React/RCTBridgeModule.h>
-#import <cxxreact/CxxModule.h>
+
+namespace facebook {
+namespace xplat {
+namespace module {
+class CxxModule;
+}
+}
+}
 
 /**
  * Subclass RCTCxxModule to use cross-platform CxxModule on iOS.

From 7255194d7d127c59d2e7a156b8cd046fc6a9143a Mon Sep 17 00:00:00 2001
From: Hilke Heremans <hilke@thinman.be>
Date: Fri, 7 Apr 2017 18:46:43 +0200
Subject: [PATCH 342/366] Match all loopback addresses

Filters everything starting with `127.`
---
 packager/react-native-xcode.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packager/react-native-xcode.sh b/packager/react-native-xcode.sh
index 2edea86bc35bf8..ca52dbde615edb 100755
--- a/packager/react-native-xcode.sh
+++ b/packager/react-native-xcode.sh
@@ -76,7 +76,7 @@ if [[ "$CONFIGURATION" = "Debug" && ! "$PLATFORM_NAME" == *simulator ]]; then
   PLIST=$TARGET_BUILD_DIR/$INFOPLIST_PATH
   IP=$(ipconfig getifaddr en0)
   if [ -z "$IP" ]; then
-    IP=$(ifconfig | grep 'inet ' | grep -v 127.0.0.1 | grep -v 127.94.0 | cut -d\   -f2  | awk 'NR==1{print $1}')
+    IP=$(ifconfig | grep 'inet ' | grep -v '^127' | cut -d\   -f2  | awk 'NR==1{print $1}')
   fi
   $PLISTBUDDY -c "Add NSAppTransportSecurity:NSExceptionDomains:localhost:NSTemporaryExceptionAllowsInsecureHTTPLoads bool true" "$PLIST"
   $PLISTBUDDY -c "Add NSAppTransportSecurity:NSExceptionDomains:$IP.xip.io:NSTemporaryExceptionAllowsInsecureHTTPLoads bool true" "$PLIST"

From 6115d5a0a68df665bd25d8f44f09dde7f2fa400e Mon Sep 17 00:00:00 2001
From: Hilke Heremans <hilke@thinman.be>
Date: Fri, 7 Apr 2017 18:51:21 +0200
Subject: [PATCH 343/366] Correct incorrect grep

---
 packager/react-native-xcode.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packager/react-native-xcode.sh b/packager/react-native-xcode.sh
index ca52dbde615edb..a76d883050fc0b 100755
--- a/packager/react-native-xcode.sh
+++ b/packager/react-native-xcode.sh
@@ -76,7 +76,7 @@ if [[ "$CONFIGURATION" = "Debug" && ! "$PLATFORM_NAME" == *simulator ]]; then
   PLIST=$TARGET_BUILD_DIR/$INFOPLIST_PATH
   IP=$(ipconfig getifaddr en0)
   if [ -z "$IP" ]; then
-    IP=$(ifconfig | grep 'inet ' | grep -v '^127' | cut -d\   -f2  | awk 'NR==1{print $1}')
+    IP=$(ifconfig | grep 'inet ' | grep -v ' 127.' | cut -d\   -f2 | awk 'NR==1{print $1}')
   fi
   $PLISTBUDDY -c "Add NSAppTransportSecurity:NSExceptionDomains:localhost:NSTemporaryExceptionAllowsInsecureHTTPLoads bool true" "$PLIST"
   $PLISTBUDDY -c "Add NSAppTransportSecurity:NSExceptionDomains:$IP.xip.io:NSTemporaryExceptionAllowsInsecureHTTPLoads bool true" "$PLIST"

From 1fec1cc4d7c78edcf32cc1adb22e0c3944e2a9e2 Mon Sep 17 00:00:00 2001
From: Spencer Ahrens <sahrens@fb.com>
Date: Fri, 7 Apr 2017 10:24:52 -0700
Subject: [PATCH 344/366] fix it

Reviewed By: ericvicenti

Differential Revision: D4851513

fbshipit-source-id: 7ae9d3a8caef1364b3e300bf58db6232e90dc1cf
---
 Libraries/Lists/VirtualizedList.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Libraries/Lists/VirtualizedList.js b/Libraries/Lists/VirtualizedList.js
index 5b85a54ac3d40c..2fa3fd3c029a99 100644
--- a/Libraries/Lists/VirtualizedList.js
+++ b/Libraries/Lists/VirtualizedList.js
@@ -742,9 +742,9 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
     }
   };
 
-  _getFrameMetrics = (
-    index: number,
-  ): ?{length: number, offset: number, index: number, inLayout?: boolean} => {
+  _getFrameMetrics = (index: number): ?{
+    length: number, offset: number, index: number, inLayout?: boolean,
+  } => {
     const {data, getItem, getItemCount, getItemLayout, keyExtractor} = this.props;
     invariant(getItemCount(data) > index, 'Tried to get frame for out of range index ' + index);
     const item = getItem(data, index);

From 01bb095c41563172b0b9649bec5fbf0505855e95 Mon Sep 17 00:00:00 2001
From: Anurag kushwaha <kanurag078@gmail.com>
Date: Fri, 7 Apr 2017 10:34:45 -0700
Subject: [PATCH 345/366] fix issue, closes:
 https://github.com/facebook/react-native/issues/13380

Summary:
Thanks for submitting a PR! Please read these instructions carefully:

- [x] Explain the **motivation** for making this change.
- [x] Provide a **test plan** demonstrating that the code is solid.
- [x] Match the **code formatting** of the rest of the codebase.
- [x] Target the `master` branch, NOT a "stable" branch.

I am just fixing typos in the docs.

proofreading

Sign the [CLA][2], if you haven't already.

Small pull requests are much easier to review and more likely to get merged. Make sure the PR does only one thing, otherwise please split it.

Make sure all **tests pass** on both [Travis][3] and [Circle CI][4]. PRs that break tests are unlikely to be merged.

For more info, see the ["Pull Requests"][5] section of our "Contributing" guidelines.

[1]: https://medium.com/martinkonicek/what-is-a-test-plan-8bfc840ec171#.y9lcuqqi9
[2]: https://code.facebook.com/cla
[3]: https://travis-ci.org/facebook/react-native
[4]
Closes https://github.com/facebook/react-native/pull/13382

Differential Revision: D4851786

Pulled By: javache

fbshipit-source-id: 3cb67161653681c061d2e2b4a6a8c14527b8bd9b
---
 docs/IntegrationWithExistingApps.md | 2 +-
 docs/Upgrading.md                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/IntegrationWithExistingApps.md b/docs/IntegrationWithExistingApps.md
index 57d1b3b996b14d..54a5d973b61f95 100644
--- a/docs/IntegrationWithExistingApps.md
+++ b/docs/IntegrationWithExistingApps.md
@@ -735,7 +735,7 @@ Now your activity is ready to run some JavaScript code.
 
 ### Configure permissions for development error overlay
 
-If your app is targeting the Android `API level 23` or greater, make sure you have the `overlay` permission enabled for the development build. You can check it with `Settings.canDrawOverlays(this);`. This is required in dev builds because react native development errors must be displayed above all the other windows. Due to the new permissions system introduced in the API level 23, the user needs to approve it. This can be acheived by adding the following code to the Activity file in the onCreate() method. OVERLAY_PERMISSION_REQ_CODE is a field of the class which would be responsible for passing the result back to the Activity.
+If your app is targeting the Android `API level 23` or greater, make sure you have the `overlay` permission enabled for the development build. You can check it with `Settings.canDrawOverlays(this);`. This is required in dev builds because react native development errors must be displayed above all the other windows. Due to the new permissions system introduced in the API level 23, the user needs to approve it. This can be achieved by adding the following code to the Activity file in the onCreate() method. OVERLAY_PERMISSION_REQ_CODE is a field of the class which would be responsible for passing the result back to the Activity.
 
 ```java
 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
diff --git a/docs/Upgrading.md b/docs/Upgrading.md
index d1277093e4aa72..d7118b4409b533 100644
--- a/docs/Upgrading.md
+++ b/docs/Upgrading.md
@@ -26,7 +26,7 @@ a minimum of conflicts. Under the hood, it consists in 2 phases:
 * Then, the patch is applied on the user's sources.
 
 ### 1. Install Git
-Your project doesn't have to be handled by the Git versioning sytem (could be Mercurial, SVN or none)
+Your project doesn't have to be handled by the Git versioning system (could be Mercurial, SVN or none)
 but Git has to be installed and available in the `PATH`. You can download Git here:
 https://git-scm.com/downloads
 

From 39431deb1fdc8196eb06ba98085e753adad669a2 Mon Sep 17 00:00:00 2001
From: Steffen Forkmann <steffen.forkmann@msu-solutions.de>
Date: Fri, 7 Apr 2017 10:43:19 -0700
Subject: [PATCH 346/366] fix typo - closes #13369

Summary:
We're just fixing a reported typo from the docs.

proofreading
Closes https://github.com/facebook/react-native/pull/13375

Differential Revision: D4851601

Pulled By: javache

fbshipit-source-id: b8bd4067285809dd24b6e5c9bc8fddcc8734dfd1
---
 Libraries/Components/ScrollView/ScrollView.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Libraries/Components/ScrollView/ScrollView.js b/Libraries/Components/ScrollView/ScrollView.js
index b0bc86b9d09668..387465ab3a1b93 100644
--- a/Libraries/Components/ScrollView/ScrollView.js
+++ b/Libraries/Components/ScrollView/ScrollView.js
@@ -56,7 +56,7 @@ const requireNativeComponent = require('requireNativeComponent');
  *
  * On the other hand, this has a performance downside. Imagine you have a very
  * long list of items you want to display, maybe several screens worth of
- * content. Creating JS components and native views for everythign all at once,
+ * content. Creating JS components and native views for everything all at once,
  * much of which may not even be shown, will contribute to slow rendering and
  * increased memory usage.
  *

From 540f4c9638c293b400796635a4154e3996a2646b Mon Sep 17 00:00:00 2001
From: Ben Roth <spongebucket@gmail.com>
Date: Fri, 7 Apr 2017 10:47:17 -0700
Subject: [PATCH 347/366] Fix crash in `RCTRedBox::formatFrameSource:`

Summary:
Motivation: Similar to https://github.com/facebook/react-native/pull/13242 - the application will crash with `[NSNull lastPathComponent]: unrecognized selector sent to instance` if a stack frame with no filename makes it to RCTRedBox.
Closes https://github.com/facebook/react-native/pull/13360

Differential Revision: D4848980

Pulled By: javache

fbshipit-source-id: dc506f2ba39c2d4d68982b56a6e765a19dc048b0
---
 React/Modules/RCTRedBox.m | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/React/Modules/RCTRedBox.m b/React/Modules/RCTRedBox.m
index 7d7b47b49ef28b..c8003bc6d704ee 100644
--- a/React/Modules/RCTRedBox.m
+++ b/React/Modules/RCTRedBox.m
@@ -185,8 +185,9 @@ - (void)copyStack
 
 - (NSString *)formatFrameSource:(RCTJSStackFrame *)stackFrame
 {
+  NSString *fileName = RCTNilIfNull(stackFrame.file) ? [stackFrame.file lastPathComponent] : @"<unknown file>";
   NSString *lineInfo = [NSString stringWithFormat:@"%@:%zd",
-                        [stackFrame.file lastPathComponent],
+                        fileName,
                         stackFrame.lineNumber];
 
   if (stackFrame.column != 0) {

From 597c8c7700a08fb41d63f56c43692e17e0968a2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <hramos@users.noreply.github.com>
Date: Fri, 7 Apr 2017 11:05:28 -0700
Subject: [PATCH 348/366] Update ISSUE_TEMPLATE.md

Summary:
Thanks for submitting a PR! Please read these instructions carefully:

- [ ] Explain the **motivation** for making this change.
- [ ] Provide a **test plan** demonstrating that the code is solid.
- [ ] Match the **code formatting** of the rest of the codebase.
- [ ] Target the `master` branch, NOT a "stable" branch.

What existing problem does the pull request solve?

A good test plan has the exact commands you ran and their output, provides screenshots or videos if the pull request changes UI or updates the website. See [What is a Test Plan?][1] to learn more.

If you have added code that should be tested, add tests.

Sign the [CLA][2], if you haven't already.

Small pull requests are much easier to review and more likely to get merged. Make sure the PR does only one thing, otherwise please split it.

Make sure all **tests pass** on both [Travis][3] and [Circle CI][4]. PRs that break tests are unlikely to be merged.
Closes https://github.com/facebook/react-native/pull/13385

Differential Revision: D4852068

Pulled By: hramos

fbshipit-source-id: ff193a7c90aa8b00c248575ae647f1fb14eb261f
---
 .github/ISSUE_TEMPLATE.md | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index ccdf0f9c51f770..0911213387bfbd 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,11 +1,16 @@
 Please read the following carefully before opening a new issue.
 Your issue may be closed if it does not provide the information required by this template.
 
-We use GitHub Issues for tracking bugs in React Native.
+We use GitHub Issues exclusively for tracking bugs in React Native.
 
 - If you have a question, ask on Stack Overflow: http://stackoverflow.com/questions/tagged/react-native
 - If you have a feature request, post it on Canny: https://react-native.canny.io/feature-requests
 
+Make sure your issue reproduces on master. Your issue may already have been fixed!
+If your issue is present in master and in the stable release, try to reproduce your bug on https://snack.expo.io/
+If you can't reproduce the bug on Snack, provide a sample project. 
+At the very least, provide an example of your code.
+
 --- Delete everything above this line ---
 
 ### Description
@@ -14,8 +19,10 @@ Explain what you did, what you expected to happen, and what actually happens.
 
 ### Reproduction Steps and Sample Code
 
-Try to reproduce your bug on https://snack.expo.io/ and provide a link. 
-If you can't reproduce the bug on Snack, provide a sample project. At the very least, provide an example of your code.
+List all the steps required to reproduce the issue you're reporting. These steps should be clear and concise.
+
+  ***An example of your code is REQUIRED***
+
 
 ### Solution
 

From 76b93e12533610fff1c3669e917898fa19321dd9 Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieterdb@fb.com>
Date: Fri, 7 Apr 2017 11:11:03 -0700
Subject: [PATCH 349/366] Add block-based initializer for RCTModuleData

Reviewed By: shergin

Differential Revision: D4821772

fbshipit-source-id: 2cd35ec6726b6fe1494a92966ade5aa0b86e769b
---
 Libraries/RCTTest/RCTTestRunner.h |  4 +++-
 Libraries/RCTTest/RCTTestRunner.m |  4 ++--
 React/Base/RCTBatchedBridge.m     | 16 ++++++++--------
 React/Base/RCTBridge+Private.h    |  4 ++--
 React/Base/RCTBridge.h            |  4 ++--
 React/Base/RCTBridge.m            |  4 ++--
 React/Base/RCTModuleData.h        |  6 ++++++
 React/Base/RCTModuleData.mm       | 28 ++++++++++++++++++++--------
 React/CxxBridge/RCTCxxBridge.mm   |  9 +++++++--
 9 files changed, 52 insertions(+), 27 deletions(-)

diff --git a/Libraries/RCTTest/RCTTestRunner.h b/Libraries/RCTTest/RCTTestRunner.h
index 2688b2a019137c..790bcd0c15a5e7 100644
--- a/Libraries/RCTTest/RCTTestRunner.h
+++ b/Libraries/RCTTest/RCTTestRunner.h
@@ -9,6 +9,8 @@
 
 #import <Foundation/Foundation.h>
 
+#import <React/RCTBridge.h>
+
 #ifndef FB_REFERENCE_IMAGE_DIR
 #define FB_REFERENCE_IMAGE_DIR ""
 #endif
@@ -49,7 +51,7 @@
  */
 - (instancetype)initWithApp:(NSString *)app
          referenceDirectory:(NSString *)referenceDirectory
-             moduleProvider:(NSArray<id<RCTBridgeModule>> *(^)(void))block NS_DESIGNATED_INITIALIZER;
+             moduleProvider:(RCTBridgeModuleListProvider)block NS_DESIGNATED_INITIALIZER;
 
 /**
  * Simplest runTest function simply mounts the specified JS module with no
diff --git a/Libraries/RCTTest/RCTTestRunner.m b/Libraries/RCTTest/RCTTestRunner.m
index 25538d8161a191..6f3ed05631c4aa 100644
--- a/Libraries/RCTTest/RCTTestRunner.m
+++ b/Libraries/RCTTest/RCTTestRunner.m
@@ -23,12 +23,12 @@
 @implementation RCTTestRunner
 {
   FBSnapshotTestController *_testController;
-  RCTBridgeModuleProviderBlock _moduleProvider;
+  RCTBridgeModuleListProvider _moduleProvider;
 }
 
 - (instancetype)initWithApp:(NSString *)app
          referenceDirectory:(NSString *)referenceDirectory
-             moduleProvider:(RCTBridgeModuleProviderBlock)block
+             moduleProvider:(RCTBridgeModuleListProvider)block
 {
   RCTAssertParam(app);
   RCTAssertParam(referenceDirectory);
diff --git a/React/Base/RCTBatchedBridge.m b/React/Base/RCTBatchedBridge.m
index f2554c84cbf863..84ca447d9b2683 100644
--- a/React/Base/RCTBatchedBridge.m
+++ b/React/Base/RCTBatchedBridge.m
@@ -89,10 +89,14 @@ - (instancetype)initWithParentBridge:(RCTBridge *)bridge
   return self;
 }
 
-RCT_NOT_IMPLEMENTED(- (instancetype)initWithDelegate:(id<RCTBridgeDelegate>)delegate
-                                           bundleURL:(NSURL *)bundleURL
-                                      moduleProvider:(RCTBridgeModuleProviderBlock)block
-                                       launchOptions:(NSDictionary *)launchOptions)
+RCT_NOT_IMPLEMENTED(- (instancetype)initWithDelegate:(__unused id<RCTBridgeDelegate>)delegate
+                                           bundleURL:(__unused NSURL *)bundleURL
+                                      moduleProvider:(__unused RCTBridgeModuleListProvider)block
+                                       launchOptions:(__unused NSDictionary *)launchOptions)
+
+RCT_NOT_IMPLEMENTED(- (instancetype)initWithBundleURL:(__unused NSURL *)bundleURL
+                                       moduleProvider:(__unused RCTBridgeModuleListProvider)block
+                                        launchOptions:(__unused NSDictionary *)launchOptions)
 
 - (void)start
 {
@@ -588,10 +592,6 @@ - (void)stopLoadingWithError:(NSError *)error
   RCTFatal(error);
 }
 
-RCT_NOT_IMPLEMENTED(- (instancetype)initWithBundleURL:(__unused NSURL *)bundleURL
-                    moduleProvider:(__unused RCTBridgeModuleProviderBlock)block
-                    launchOptions:(__unused NSDictionary *)launchOptions)
-
 /**
  * Prevent super from calling setUp (that'd create another batchedBridge)
  */
diff --git a/React/Base/RCTBridge+Private.h b/React/Base/RCTBridge+Private.h
index 46f735a83da0c2..9aeca934961f1b 100644
--- a/React/Base/RCTBridge+Private.h
+++ b/React/Base/RCTBridge+Private.h
@@ -27,7 +27,7 @@ RCT_EXTERN void RCTVerifyAllModulesExported(NSArray *extraModules);
 // Private designated initializer
 - (instancetype)initWithDelegate:(id<RCTBridgeDelegate>)delegate
                        bundleURL:(NSURL *)bundleURL
-                  moduleProvider:(RCTBridgeModuleProviderBlock)block
+                  moduleProvider:(RCTBridgeModuleListProvider)block
                    launchOptions:(NSDictionary *)launchOptions NS_DESIGNATED_INITIALIZER;
 
 // Used for the profiler flow events between JS and native
@@ -61,7 +61,7 @@ RCT_EXTERN void RCTVerifyAllModulesExported(NSArray *extraModules);
  * The block that creates the modules' instances to be added to the bridge.
  * Exposed for the RCTBatchedBridge
  */
-@property (nonatomic, copy, readonly) RCTBridgeModuleProviderBlock moduleProvider;
+@property (nonatomic, copy, readonly) RCTBridgeModuleListProvider moduleProvider;
 
 /**
  * Used by RCTDevMenu to override the `hot` param of the current bundleURL.
diff --git a/React/Base/RCTBridge.h b/React/Base/RCTBridge.h
index f389c98d1cfb23..a2c86ba988c06f 100644
--- a/React/Base/RCTBridge.h
+++ b/React/Base/RCTBridge.h
@@ -53,7 +53,7 @@ RCT_EXTERN NSString *const RCTDidInitializeModuleNotification;
  * For this reason, the block should always return new module instances, and
  * module instances should not be shared between bridges.
  */
-typedef NSArray<id<RCTBridgeModule>> *(^RCTBridgeModuleProviderBlock)(void);
+typedef NSArray<id<RCTBridgeModule>> *(^RCTBridgeModuleListProvider)(void);
 
 /**
  * This function returns the module name for a given class.
@@ -88,7 +88,7 @@ RCT_EXTERN NSString *RCTBridgeModuleNameForClass(Class bridgeModuleClass);
  * parameters or configuration.
  */
 - (instancetype)initWithBundleURL:(NSURL *)bundleURL
-                   moduleProvider:(RCTBridgeModuleProviderBlock)block
+                   moduleProvider:(RCTBridgeModuleListProvider)block
                     launchOptions:(NSDictionary *)launchOptions;
 
 /**
diff --git a/React/Base/RCTBridge.m b/React/Base/RCTBridge.m
index 3939fb618d1581..a00fdd71fec3b6 100644
--- a/React/Base/RCTBridge.m
+++ b/React/Base/RCTBridge.m
@@ -169,7 +169,7 @@ - (instancetype)initWithDelegate:(id<RCTBridgeDelegate>)delegate
 }
 
 - (instancetype)initWithBundleURL:(NSURL *)bundleURL
-                   moduleProvider:(RCTBridgeModuleProviderBlock)block
+                   moduleProvider:(RCTBridgeModuleListProvider)block
                     launchOptions:(NSDictionary *)launchOptions
 {
   return [self initWithDelegate:nil
@@ -180,7 +180,7 @@ - (instancetype)initWithBundleURL:(NSURL *)bundleURL
 
 - (instancetype)initWithDelegate:(id<RCTBridgeDelegate>)delegate
                        bundleURL:(NSURL *)bundleURL
-                  moduleProvider:(RCTBridgeModuleProviderBlock)block
+                  moduleProvider:(RCTBridgeModuleListProvider)block
                    launchOptions:(NSDictionary *)launchOptions
 {
   if (self = [super init]) {
diff --git a/React/Base/RCTModuleData.h b/React/Base/RCTModuleData.h
index e4aa182dce447c..96099ba5b56d14 100644
--- a/React/Base/RCTModuleData.h
+++ b/React/Base/RCTModuleData.h
@@ -15,9 +15,15 @@
 @protocol RCTBridgeModule;
 @class RCTBridge;
 
+typedef id<RCTBridgeModule>(^RCTBridgeModuleProvider)(void);
+
 @interface RCTModuleData : NSObject <RCTInvalidating>
 
 - (instancetype)initWithModuleClass:(Class)moduleClass
+                             bridge:(RCTBridge *)bridge;
+
+- (instancetype)initWithModuleClass:(Class)moduleClass
+                     moduleProvider:(RCTBridgeModuleProvider)moduleProvider
                              bridge:(RCTBridge *)bridge NS_DESIGNATED_INITIALIZER;
 
 - (instancetype)initWithModuleInstance:(id<RCTBridgeModule>)instance
diff --git a/React/Base/RCTModuleData.mm b/React/Base/RCTModuleData.mm
index 4db8ea6dfb4ef8..c58a3e0540994a 100644
--- a/React/Base/RCTModuleData.mm
+++ b/React/Base/RCTModuleData.mm
@@ -10,13 +10,12 @@
 #import "RCTModuleData.h"
 
 #import <objc/runtime.h>
-
 #include <mutex>
 
-#import "RCTBridge.h"
 #import "RCTBridge+Private.h"
-#import "RCTModuleMethod.h"
+#import "RCTBridge.h"
 #import "RCTLog.h"
+#import "RCTModuleMethod.h"
 #import "RCTProfile.h"
 #import "RCTUtils.h"
 
@@ -25,6 +24,7 @@ @implementation RCTModuleData
   NSDictionary<NSString *, id> *_constantsToExport;
   NSString *_queueName;
   __weak RCTBridge *_bridge;
+  RCTBridgeModuleProvider _moduleProvider;
   std::mutex _instanceLock;
   BOOL _setupComplete;
 }
@@ -57,9 +57,19 @@ - (void)setUp
 - (instancetype)initWithModuleClass:(Class)moduleClass
                              bridge:(RCTBridge *)bridge
 {
-  if ((self = [super init])) {
+  return [self initWithModuleClass:moduleClass
+                    moduleProvider:^id<RCTBridgeModule>{ return [moduleClass new]; }
+                            bridge:bridge];
+}
+
+- (instancetype)initWithModuleClass:(Class)moduleClass
+                     moduleProvider:(RCTBridgeModuleProvider)moduleProvider
+                             bridge:(RCTBridge *)bridge
+{
+  if (self = [super init]) {
     _bridge = bridge;
     _moduleClass = moduleClass;
+    _moduleProvider = [moduleProvider copy];
     [self setUp];
   }
   return self;
@@ -68,7 +78,7 @@ - (instancetype)initWithModuleClass:(Class)moduleClass
 - (instancetype)initWithModuleInstance:(id<RCTBridgeModule>)instance
                                 bridge:(RCTBridge *)bridge
 {
-  if ((self = [super init])) {
+  if (self = [super init]) {
     _bridge = bridge;
     _instance = instance;
     _moduleClass = [instance class];
@@ -83,7 +93,9 @@ - (instancetype)initWithModuleInstance:(id<RCTBridgeModule>)instance
 
 - (void)setUpInstanceAndBridge
 {
-  RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"[RCTModuleData setUpInstanceAndBridge] [_instanceLock lock]", @{ @"moduleClass": NSStringFromClass(_moduleClass) });
+  RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"[RCTModuleData setUpInstanceAndBridge]", @{
+    @"moduleClass": NSStringFromClass(_moduleClass)
+  });
   {
     std::unique_lock<std::mutex> lock(_instanceLock);
 
@@ -92,8 +104,8 @@ - (void)setUpInstanceAndBridge
         if (RCT_DEBUG && _requiresMainQueueSetup) {
           RCTAssertMainQueue();
         }
-        RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"[RCTModuleData setUpInstanceAndBridge] [_moduleClass new]",  @{ @"moduleClass": NSStringFromClass(_moduleClass) });
-        _instance = [_moduleClass new];
+        RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"[RCTModuleData setUpInstanceAndBridge] Create module", nil);
+        _instance = _moduleProvider ? _moduleProvider() : nil;
         RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
         if (!_instance) {
           // Module init returned nil, probably because automatic instantatiation
diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm
index da803299b46919..931228be90d836 100644
--- a/React/CxxBridge/RCTCxxBridge.mm
+++ b/React/CxxBridge/RCTCxxBridge.mm
@@ -758,9 +758,14 @@ - (void)handleError:(NSError *)error
   });
 }
 
+RCT_NOT_IMPLEMENTED(- (instancetype)initWithDelegate:(__unused id<RCTBridgeDelegate>)delegate
+                                           bundleURL:(__unused NSURL *)bundleURL
+                                      moduleProvider:(__unused RCTBridgeModuleListProvider)block
+                                       launchOptions:(__unused NSDictionary *)launchOptions)
+
 RCT_NOT_IMPLEMENTED(- (instancetype)initWithBundleURL:(__unused NSURL *)bundleURL
-                    moduleProvider:(__unused RCTBridgeModuleProviderBlock)block
-                    launchOptions:(__unused NSDictionary *)launchOptions)
+                                       moduleProvider:(__unused RCTBridgeModuleListProvider)block
+                                        launchOptions:(__unused NSDictionary *)launchOptions)
 
 /**
  * Prevent super from calling setUp (that'd create another batchedBridge)

From 5767b98f4d30cfdadbe9eb85aaf65c23d84a5784 Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieterdb@fb.com>
Date: Fri, 7 Apr 2017 11:11:04 -0700
Subject: [PATCH 350/366] Add JSC utility header to RCTBridge

Reviewed By: shergin

Differential Revision: D4823509

fbshipit-source-id: 79c96d3bc183d89a5dec7da06b0a0a710d8c7dea
---
 React/Base/RCTBatchedBridge.m                 | 16 ++++++++++++
 React/Base/RCTBridge+JavaScriptCore.h         | 26 +++++++++++++++++++
 React/Base/RCTBridge.h                        |  6 -----
 React/Base/RCTBridge.m                        | 14 ++++++++++
 React/CxxBridge/RCTCxxBridge.mm               |  7 ++++-
 .../RCTSamplingProfilerPackagerMethod.h       |  5 ++--
 .../RCTSamplingProfilerPackagerMethod.mm      |  5 ++--
 React/Executors/RCTJSCExecutor.mm             |  2 --
 React/Modules/RCTDevSettings.mm               |  3 ++-
 React/React.xcodeproj/project.pbxproj         | 14 ++++++++--
 React/ReactCxx.xcodeproj/project.pbxproj      | 14 ++++++++--
 11 files changed, 94 insertions(+), 18 deletions(-)
 create mode 100644 React/Base/RCTBridge+JavaScriptCore.h

diff --git a/React/Base/RCTBatchedBridge.m b/React/Base/RCTBatchedBridge.m
index 84ca447d9b2683..2721f1537f065c 100644
--- a/React/Base/RCTBatchedBridge.m
+++ b/React/Base/RCTBatchedBridge.m
@@ -1100,4 +1100,20 @@ - (BOOL)isBatchActive
   return _wasBatchActive;
 }
 
+#pragma mark - JavaScriptCore
+
+- (JSGlobalContextRef)jsContextRef
+{
+  return [self.jsContext JSGlobalContextRef];
+}
+
+- (JSContext *)jsContext
+{
+  if ([_javaScriptExecutor isKindOfClass:[RCTJSCExecutor class]]) {
+    return [(RCTJSCExecutor *)_javaScriptExecutor jsContext];
+  } else {
+    return nil;
+  }
+}
+
 @end
diff --git a/React/Base/RCTBridge+JavaScriptCore.h b/React/Base/RCTBridge+JavaScriptCore.h
new file mode 100644
index 00000000000000..00a1501cf5e900
--- /dev/null
+++ b/React/Base/RCTBridge+JavaScriptCore.h
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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.
+ */
+
+#import <JavaScriptCore/JavaScriptCore.h>
+
+#import <React/RCTBridge.h>
+
+@interface RCTBridge (JavaScriptCore)
+
+/**
+ * The JSContext used by the bridge.
+ */
+@property (nonatomic, readonly, strong) JSContext *jsContext;
+
+/**
+ * The raw JSGlobalContextRef used by the bridge.
+ */
+@property (nonatomic, readonly, assign) JSGlobalContextRef jsContextRef;
+
+@end
diff --git a/React/Base/RCTBridge.h b/React/Base/RCTBridge.h
index a2c86ba988c06f..51b2ec0cbd79d0 100644
--- a/React/Base/RCTBridge.h
+++ b/React/Base/RCTBridge.h
@@ -15,7 +15,6 @@
 #import <React/RCTFrameUpdate.h>
 #import <React/RCTInvalidating.h>
 
-@class JSContext;
 @class JSValue;
 @class RCTBridge;
 @class RCTEventDispatcher;
@@ -185,11 +184,6 @@ RCT_EXTERN NSString *RCTBridgeModuleNameForClass(Class bridgeModuleClass);
  */
 @property (nonatomic, readonly, getter=isValid) BOOL valid;
 
-/**
- * The JSContext used by the bridge.
- */
-@property (nonatomic, readonly, weak) JSContext *jsContext;
-
 /**
  * Link to the Performance Logger that logs React Native perf events.
  */
diff --git a/React/Base/RCTBridge.m b/React/Base/RCTBridge.m
index a00fdd71fec3b6..e86df784bead0b 100644
--- a/React/Base/RCTBridge.m
+++ b/React/Base/RCTBridge.m
@@ -12,6 +12,7 @@
 
 #import <objc/runtime.h>
 
+#import "RCTBridge+JavaScriptCore.h"
 #import "RCTConvert.h"
 #import "RCTEventDispatcher.h"
 #import "RCTLog.h"
@@ -378,5 +379,18 @@ - (JSValue *)callFunctionOnModule:(NSString *)module
   return [self.batchedBridge callFunctionOnModule:module method:method arguments:arguments error:error];
 }
 
+@end
+
+@implementation RCTBridge (JavaScriptCore)
+
+- (JSContext *)jsContext
+{
+  return [self.batchedBridge jsContext];
+}
+
+- (JSGlobalContextRef)jsContextRef
+{
+  return [self.batchedBridge jsContextRef];
+}
 
 @end
diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm
index 931228be90d836..3605b1ca667f09 100644
--- a/React/CxxBridge/RCTCxxBridge.mm
+++ b/React/CxxBridge/RCTCxxBridge.mm
@@ -138,7 +138,12 @@ + (void)initialize
 
 - (JSContext *)jsContext
 {
-  return contextForGlobalContextRef((JSGlobalContextRef) self->_reactInstance->getJavaScriptContext());
+  return contextForGlobalContextRef([self jsContextRef]);
+}
+
+- (JSGlobalContextRef)jsContextRef
+{
+  return (JSGlobalContextRef)self->_reactInstance->getJavaScriptContext();
 }
 
 - (instancetype)initWithParentBridge:(RCTBridge *)bridge
diff --git a/React/DevSupport/RCTSamplingProfilerPackagerMethod.h b/React/DevSupport/RCTSamplingProfilerPackagerMethod.h
index b293d6eae37341..386c21d0f93d9c 100644
--- a/React/DevSupport/RCTSamplingProfilerPackagerMethod.h
+++ b/React/DevSupport/RCTSamplingProfilerPackagerMethod.h
@@ -7,12 +7,13 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import <React/RCTBridge.h>
 #import <React/RCTPackagerClient.h>
 
+@class RCTBridge;
+
 #if RCT_DEV // Only supported in dev mode
 
-@interface RCTSamplingProfilerPackagerMethod : NSObject<RCTPackagerClientMethod>
+@interface RCTSamplingProfilerPackagerMethod : NSObject <RCTPackagerClientMethod>
 
 - (instancetype)initWithBridge:(RCTBridge *)bridge;
 
diff --git a/React/DevSupport/RCTSamplingProfilerPackagerMethod.mm b/React/DevSupport/RCTSamplingProfilerPackagerMethod.mm
index 13906681f4070e..c7adaf27e0756a 100644
--- a/React/DevSupport/RCTSamplingProfilerPackagerMethod.mm
+++ b/React/DevSupport/RCTSamplingProfilerPackagerMethod.mm
@@ -11,6 +11,7 @@
 
 #import <JavaScriptCore/JavaScriptCore.h>
 
+#import <React/RCTBridge+JavaScriptCore.h>
 #import <jschelpers/JavaScriptCore.h>
 
 #import "RCTLog.h"
@@ -31,8 +32,7 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
 
 - (void)handleRequest:(__unused id)params withResponder:(RCTPackagerClientResponder *)responder
 {
-  JSContext *context = _bridge.jsContext;
-  JSGlobalContextRef globalContext = context.JSGlobalContextRef;
+  JSGlobalContextRef globalContext = [_bridge jsContextRef];
   if (!JSC_JSSamplingProfilerEnabled(globalContext)) {
     [responder respondWithError:@"The JSSamplingProfiler is disabled. See 'iOS specific setup' section here https://fburl.com/u4lw7xeq for some help"];
     return;
@@ -43,6 +43,7 @@ - (void)handleRequest:(__unused id)params withResponder:(RCTPackagerClientRespon
   if (JSC_JSValueGetType(globalContext, jsResult) == kJSTypeNull) {
     [responder respondWithResult:@"started"];
   } else {
+    JSContext *context = [_bridge jsContext];
     NSString *results = [[JSC_JSValue(globalContext) valueWithJSValueRef:jsResult inContext:context] toObject];
     [responder respondWithResult:results];
   }
diff --git a/React/Executors/RCTJSCExecutor.mm b/React/Executors/RCTJSCExecutor.mm
index 75be11f54b6fe9..b74c79c80fc890 100644
--- a/React/Executors/RCTJSCExecutor.mm
+++ b/React/Executors/RCTJSCExecutor.mm
@@ -282,11 +282,9 @@ - (NSError *)synchronouslyExecuteApplicationScript:(NSData *)script
 
 - (RCTJavaScriptContext *)context
 {
-  RCTAssertThread(_javaScriptThread, @"Must be called on JS thread.");
   if (!self.isValid) {
     return nil;
   }
-  RCTAssert(_context != nil, @"Fetching context while valid, but before it is created");
   return _context;
 }
 
diff --git a/React/Modules/RCTDevSettings.mm b/React/Modules/RCTDevSettings.mm
index 241838b0d98bdf..3e63ea1ab339fc 100644
--- a/React/Modules/RCTDevSettings.mm
+++ b/React/Modules/RCTDevSettings.mm
@@ -16,6 +16,7 @@
 #import <jschelpers/JavaScriptCore.h>
 
 #import "JSCSamplingProfiler.h"
+#import "RCTBridge+JavaScriptCore.h"
 #import "RCTBridge+Private.h"
 #import "RCTBridgeModule.h"
 #import "RCTEventDispatcher.h"
@@ -188,7 +189,7 @@ - (BOOL)isLiveReloadAvailable
 
 - (BOOL)isJSCSamplingProfilerAvailable
 {
-  return JSC_JSSamplingProfilerEnabled(_bridge.jsContext.JSGlobalContextRef);
+  return JSC_JSSamplingProfilerEnabled(_bridge.jsContextRef);
 }
 
 RCT_EXPORT_METHOD(reload)
diff --git a/React/React.xcodeproj/project.pbxproj b/React/React.xcodeproj/project.pbxproj
index 0a03aac539054b..7854faf31cf816 100644
--- a/React/React.xcodeproj/project.pbxproj
+++ b/React/React.xcodeproj/project.pbxproj
@@ -165,6 +165,10 @@
 		369123E11DDC75850095B341 /* JSCSamplingProfiler.m in Sources */ = {isa = PBXBuildFile; fileRef = 369123E01DDC75850095B341 /* JSCSamplingProfiler.m */; };
 		391E86A41C623EC800009732 /* RCTTouchEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 391E86A21C623EC800009732 /* RCTTouchEvent.m */; };
 		3D05745A1DE5FFF500184BB4 /* RCTJavaScriptLoader.mm in Sources */ = {isa = PBXBuildFile; fileRef = AC70D2E81DE489E4002E6351 /* RCTJavaScriptLoader.mm */; };
+		3D0976C11E97399A00B9C6DD /* RCTBridge+JavaScriptCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D0976C01E97399A00B9C6DD /* RCTBridge+JavaScriptCore.h */; };
+		3D0976C21E9739A100B9C6DD /* RCTBridge+JavaScriptCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D0976C01E97399A00B9C6DD /* RCTBridge+JavaScriptCore.h */; };
+		3D0976C31E9739AE00B9C6DD /* RCTBridge+JavaScriptCore.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D0976C01E97399A00B9C6DD /* RCTBridge+JavaScriptCore.h */; };
+		3D0976C41E9739B400B9C6DD /* RCTBridge+JavaScriptCore.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D0976C01E97399A00B9C6DD /* RCTBridge+JavaScriptCore.h */; };
 		3D1E68DB1CABD13900DD7465 /* RCTDisplayLink.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D1E68D91CABD13900DD7465 /* RCTDisplayLink.m */; };
 		3D302F1C1DF8264000D6DDAE /* JSBundleType.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D3CD8F51DE5FB2300167DC4 /* JSBundleType.h */; };
 		3D302F1E1DF8265A00D6DDAE /* JavaScriptCore.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D7A27DC1DE32541002E3F95 /* JavaScriptCore.h */; };
@@ -804,6 +808,7 @@
 			dstPath = include/React;
 			dstSubfolderSpec = 16;
 			files = (
+				3D0976C31E9739AE00B9C6DD /* RCTBridge+JavaScriptCore.h in Copy Headers */,
 				3D6B76D51E83DD3A008FA614 /* RCTDevSettings.h in Copy Headers */,
 				3D6B76D61E83DD3A008FA614 /* RCTConvert+Transform.h in Copy Headers */,
 				A12E9E211E5DEAFB0029001B /* RCTPackagerClient.h in Copy Headers */,
@@ -965,6 +970,7 @@
 			dstPath = include/React;
 			dstSubfolderSpec = 16;
 			files = (
+				3D0976C41E9739B400B9C6DD /* RCTBridge+JavaScriptCore.h in Copy Headers */,
 				A12E9E1F1E5DEAEF0029001B /* RCTPackagerClient.h in Copy Headers */,
 				A12E9E201E5DEAEF0029001B /* RCTPackagerClientResponder.h in Copy Headers */,
 				3D80D91F1DF6FA890028D040 /* RCTImageLoader.h in Copy Headers */,
@@ -1281,6 +1287,7 @@
 		369123E01DDC75850095B341 /* JSCSamplingProfiler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSCSamplingProfiler.m; sourceTree = "<group>"; };
 		391E86A21C623EC800009732 /* RCTTouchEvent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTouchEvent.m; sourceTree = "<group>"; };
 		391E86A31C623EC800009732 /* RCTTouchEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTouchEvent.h; sourceTree = "<group>"; };
+		3D0976C01E97399A00B9C6DD /* RCTBridge+JavaScriptCore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "RCTBridge+JavaScriptCore.h"; sourceTree = "<group>"; };
 		3D1E68D81CABD13900DD7465 /* RCTDisplayLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTDisplayLink.h; sourceTree = "<group>"; };
 		3D1E68D91CABD13900DD7465 /* RCTDisplayLink.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTDisplayLink.m; sourceTree = "<group>"; };
 		3D1FA07A1DE4F2EA00E03CC6 /* RCTNetworking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTNetworking.h; sourceTree = "<group>"; };
@@ -1724,13 +1731,12 @@
 		83CBBA491A601E3B00E9B192 /* Base */ = {
 			isa = PBXGroup;
 			children = (
-				139324FC1E70B069009FD7E0 /* RCTJSCErrorHandling.h */,
-				139324FD1E70B069009FD7E0 /* RCTJSCErrorHandling.mm */,
 				83CBBA4A1A601E3B00E9B192 /* RCTAssert.h */,
 				83CBBA4B1A601E3B00E9B192 /* RCTAssert.m */,
 				14C2CA771B3ACB0400E6CBB2 /* RCTBatchedBridge.m */,
 				83CBBA5E1A601EAA00E9B192 /* RCTBridge.h */,
 				83CBBA5F1A601EAA00E9B192 /* RCTBridge.m */,
+				3D0976C01E97399A00B9C6DD /* RCTBridge+JavaScriptCore.h */,
 				14A43DB81C1F849600794BC8 /* RCTBridge+Private.h */,
 				1482F9E61B55B927000ADFF3 /* RCTBridgeDelegate.h */,
 				13AFBCA11C07287B00BBAEAA /* RCTBridgeMethod.h */,
@@ -1755,6 +1761,8 @@
 				83CBBA631A601ECA00E9B192 /* RCTJavaScriptExecutor.h */,
 				14200DA81AC179B3008EE6BA /* RCTJavaScriptLoader.h */,
 				AC70D2E81DE489E4002E6351 /* RCTJavaScriptLoader.mm */,
+				139324FC1E70B069009FD7E0 /* RCTJSCErrorHandling.h */,
+				139324FD1E70B069009FD7E0 /* RCTJSCErrorHandling.mm */,
 				008341F51D1DB34400876D9A /* RCTJSStackFrame.h */,
 				008341F41D1DB34400876D9A /* RCTJSStackFrame.m */,
 				13A1F71C1A75392D00D3D453 /* RCTKeyCommands.h */,
@@ -1876,6 +1884,7 @@
 				3D302F3B1DF828F800D6DDAE /* RCTJavaScriptExecutor.h in Headers */,
 				3D302F3C1DF828F800D6DDAE /* RCTJavaScriptLoader.h in Headers */,
 				3D302F3D1DF828F800D6DDAE /* RCTJSStackFrame.h in Headers */,
+				3D0976C21E9739A100B9C6DD /* RCTBridge+JavaScriptCore.h in Headers */,
 				3D302F3E1DF828F800D6DDAE /* RCTKeyCommands.h in Headers */,
 				3D302F3F1DF828F800D6DDAE /* RCTLog.h in Headers */,
 				3D302F401DF828F800D6DDAE /* RCTModuleData.h in Headers */,
@@ -2087,6 +2096,7 @@
 				3D80DA451DF820620028D040 /* RCTWebSocketObserverProtocol.h in Headers */,
 				3D80DA481DF820620028D040 /* RCTJSCExecutor.h in Headers */,
 				3D80DA491DF820620028D040 /* JSCSamplingProfiler.h in Headers */,
+				3D0976C11E97399A00B9C6DD /* RCTBridge+JavaScriptCore.h in Headers */,
 				3D80DA4A1DF820620028D040 /* RCTAccessibilityManager.h in Headers */,
 				3D80DA4B1DF820620028D040 /* RCTAlertManager.h in Headers */,
 				3D80DA4C1DF820620028D040 /* RCTAppState.h in Headers */,
diff --git a/React/ReactCxx.xcodeproj/project.pbxproj b/React/ReactCxx.xcodeproj/project.pbxproj
index 7dd721d644fc6a..29476f0e9bea87 100644
--- a/React/ReactCxx.xcodeproj/project.pbxproj
+++ b/React/ReactCxx.xcodeproj/project.pbxproj
@@ -356,6 +356,10 @@
 		369123E11DDC75850095B341 /* JSCSamplingProfiler.m in Sources */ = {isa = PBXBuildFile; fileRef = 369123E01DDC75850095B341 /* JSCSamplingProfiler.m */; };
 		391E86A41C623EC800009732 /* RCTTouchEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 391E86A21C623EC800009732 /* RCTTouchEvent.m */; };
 		3D05745A1DE5FFF500184BB4 /* RCTJavaScriptLoader.mm in Sources */ = {isa = PBXBuildFile; fileRef = AC70D2E81DE489E4002E6351 /* RCTJavaScriptLoader.mm */; };
+		3D0976D51E9739ED00B9C6DD /* RCTBridge+JavaScriptCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D0976D41E9739ED00B9C6DD /* RCTBridge+JavaScriptCore.h */; };
+		3D0976D61E9739F000B9C6DD /* RCTBridge+JavaScriptCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D0976D41E9739ED00B9C6DD /* RCTBridge+JavaScriptCore.h */; };
+		3D0976D71E9739FB00B9C6DD /* RCTBridge+JavaScriptCore.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D0976D41E9739ED00B9C6DD /* RCTBridge+JavaScriptCore.h */; };
+		3D0976D81E973A0200B9C6DD /* RCTBridge+JavaScriptCore.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D0976D41E9739ED00B9C6DD /* RCTBridge+JavaScriptCore.h */; };
 		3D1E68DB1CABD13900DD7465 /* RCTDisplayLink.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D1E68D91CABD13900DD7465 /* RCTDisplayLink.m */; };
 		3D302F1E1DF8265A00D6DDAE /* JavaScriptCore.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D7A27DC1DE32541002E3F95 /* JavaScriptCore.h */; };
 		3D302F1F1DF8265A00D6DDAE /* JSCWrapper.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D7A27DE1DE32541002E3F95 /* JSCWrapper.h */; };
@@ -1062,6 +1066,7 @@
 			dstPath = include/React;
 			dstSubfolderSpec = 16;
 			files = (
+				3D0976D71E9739FB00B9C6DD /* RCTBridge+JavaScriptCore.h in Copy Headers */,
 				3DA981E91E5B0F7F004F2374 /* JSCSamplingProfiler.h in Copy Headers */,
 				3DA981EA1E5B0F7F004F2374 /* RCTAccessibilityManager.h in Copy Headers */,
 				3DA981EB1E5B0F7F004F2374 /* RCTAlertManager.h in Copy Headers */,
@@ -1254,6 +1259,7 @@
 			dstPath = include/React;
 			dstSubfolderSpec = 16;
 			files = (
+				3D0976D81E973A0200B9C6DD /* RCTBridge+JavaScriptCore.h in Copy Headers */,
 				3D80D91F1DF6FA890028D040 /* RCTImageLoader.h in Copy Headers */,
 				3D80D9201DF6FA890028D040 /* RCTImageStoreManager.h in Copy Headers */,
 				3D80D9211DF6FA890028D040 /* RCTResizeMode.h in Copy Headers */,
@@ -1679,6 +1685,7 @@
 		369123E01DDC75850095B341 /* JSCSamplingProfiler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSCSamplingProfiler.m; sourceTree = "<group>"; };
 		391E86A21C623EC800009732 /* RCTTouchEvent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTouchEvent.m; sourceTree = "<group>"; };
 		391E86A31C623EC800009732 /* RCTTouchEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTouchEvent.h; sourceTree = "<group>"; };
+		3D0976D41E9739ED00B9C6DD /* RCTBridge+JavaScriptCore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "RCTBridge+JavaScriptCore.h"; sourceTree = "<group>"; };
 		3D1E68D81CABD13900DD7465 /* RCTDisplayLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTDisplayLink.h; sourceTree = "<group>"; };
 		3D1E68D91CABD13900DD7465 /* RCTDisplayLink.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTDisplayLink.m; sourceTree = "<group>"; };
 		3D1FA07A1DE4F2EA00E03CC6 /* RCTNetworking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTNetworking.h; sourceTree = "<group>"; };
@@ -2315,12 +2322,11 @@
 		83CBBA491A601E3B00E9B192 /* Base */ = {
 			isa = PBXGroup;
 			children = (
-				135A9BF91E7B0EAE00587AEB /* RCTJSCErrorHandling.h */,
-				135A9BFA1E7B0EAE00587AEB /* RCTJSCErrorHandling.mm */,
 				83CBBA4A1A601E3B00E9B192 /* RCTAssert.h */,
 				83CBBA4B1A601E3B00E9B192 /* RCTAssert.m */,
 				83CBBA5E1A601EAA00E9B192 /* RCTBridge.h */,
 				83CBBA5F1A601EAA00E9B192 /* RCTBridge.m */,
+				3D0976D41E9739ED00B9C6DD /* RCTBridge+JavaScriptCore.h */,
 				14A43DB81C1F849600794BC8 /* RCTBridge+Private.h */,
 				1482F9E61B55B927000ADFF3 /* RCTBridgeDelegate.h */,
 				13AFBCA11C07287B00BBAEAA /* RCTBridgeMethod.h */,
@@ -2345,6 +2351,8 @@
 				83CBBA631A601ECA00E9B192 /* RCTJavaScriptExecutor.h */,
 				14200DA81AC179B3008EE6BA /* RCTJavaScriptLoader.h */,
 				AC70D2E81DE489E4002E6351 /* RCTJavaScriptLoader.mm */,
+				135A9BF91E7B0EAE00587AEB /* RCTJSCErrorHandling.h */,
+				135A9BFA1E7B0EAE00587AEB /* RCTJSCErrorHandling.mm */,
 				008341F51D1DB34400876D9A /* RCTJSStackFrame.h */,
 				008341F41D1DB34400876D9A /* RCTJSStackFrame.m */,
 				13A1F71C1A75392D00D3D453 /* RCTKeyCommands.h */,
@@ -2542,6 +2550,7 @@
 				3D302F621DF828F800D6DDAE /* RCTSourceCode.h in Headers */,
 				3D302F631DF828F800D6DDAE /* RCTStatusBarManager.h in Headers */,
 				3D302F641DF828F800D6DDAE /* RCTTiming.h in Headers */,
+				3D0976D61E9739F000B9C6DD /* RCTBridge+JavaScriptCore.h in Headers */,
 				3D302F651DF828F800D6DDAE /* RCTUIManager.h in Headers */,
 				3D302F661DF828F800D6DDAE /* RCTFPSGraph.h in Headers */,
 				3D302F681DF828F800D6DDAE /* RCTMacros.h in Headers */,
@@ -2824,6 +2833,7 @@
 				3D80DA721DF820620028D040 /* RCTModalHostViewManager.h in Headers */,
 				13134C9C1E296B2A00B9F3CB /* RCTCxxModule.h in Headers */,
 				3D80DA731DF820620028D040 /* RCTNavigator.h in Headers */,
+				3D0976D51E9739ED00B9C6DD /* RCTBridge+JavaScriptCore.h in Headers */,
 				3D80DA741DF820620028D040 /* RCTNavigatorManager.h in Headers */,
 				3D80DA751DF820620028D040 /* RCTNavItem.h in Headers */,
 				3D80DA761DF820620028D040 /* RCTNavItemManager.h in Headers */,

From d03f9b7442a1d408270b1fbfbcb35bcc4b976c92 Mon Sep 17 00:00:00 2001
From: Peter Pistorius <peter.pistorius@gmail.com>
Date: Fri, 7 Apr 2017 11:11:16 -0700
Subject: [PATCH 351/366] PushNotificationIOS.requestPermissions won't resolve
 if no event listeners are attached

Summary:
Resolves #13012

RCTPushNotificationManager uses startObserving to register for RCTRegisterUserNotificationSettings. According to the docs, the startObserving method won't be called until somebody subscribes to NotificationManagerIOS.

This means there is a scenario when the developer can call requestPermissions without subscribing to notifications first, but since RCTPushNotificationManager relies on NSNotificationCenter subscribtion, the result will never be returned.

When requesting permissions  the promise will resolve:
`PushNotificationIOS.requestPermissions().then(console.log);` without the need for calling `PushNotificationIOS.addEventListener()` first.
Closes https://github.com/facebook/react-native/pull/13263

Differential Revision: D4851767

Pulled By: javache

fbshipit-source-id: 2be8621e072ae1086014594bc986ca5590b5eb61
---
 .../RCTPushNotificationManager.m                   | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/Libraries/PushNotificationIOS/RCTPushNotificationManager.m b/Libraries/PushNotificationIOS/RCTPushNotificationManager.m
index 97f26edabcb722..55107370ecee06 100644
--- a/Libraries/PushNotificationIOS/RCTPushNotificationManager.m
+++ b/Libraries/PushNotificationIOS/RCTPushNotificationManager.m
@@ -142,6 +142,15 @@ - (void)startObserving
                                            selector:@selector(handleRemoteNotificationReceived:)
                                                name:RCTRemoteNotificationReceived
                                              object:nil];
+  [self startObservingRegistrationNotifications];
+}
+
+- (void)startObservingRegistrationNotifications
+{
+  [[NSNotificationCenter defaultCenter] addObserver:self
+                                           selector:@selector(handleRegisterUserNotificationSettings:)
+                                               name:RCTRegisterUserNotificationSettings
+                                             object:nil];
   [[NSNotificationCenter defaultCenter] addObserver:self
                                            selector:@selector(handleRemoteNotificationsRegistered:)
                                                name:RCTRemoteNotificationsRegistered
@@ -150,10 +159,6 @@ - (void)startObserving
                                            selector:@selector(handleRemoteNotificationRegistrationError:)
                                                name:RCTErrorRemoteNotificationRegistrationFailed
                                              object:nil];
-  [[NSNotificationCenter defaultCenter] addObserver:self
-                                           selector:@selector(handleRegisterUserNotificationSettings:)
-                                               name:RCTRegisterUserNotificationSettings
-                                             object:nil];
 }
 
 - (void)stopObserving
@@ -319,6 +324,7 @@ - (void)handleRegisterUserNotificationSettings:(NSNotification *)notification
     return;
   }
 
+  [self startObservingRegistrationNotifications];
   _requestPermissionsResolveBlock = resolve;
 
   UIUserNotificationType types = UIUserNotificationTypeNone;

From 403f3560826a2c121d225a527c1cdc07c90a571f Mon Sep 17 00:00:00 2001
From: Adam Perry <adam.n.perry@gmail.com>
Date: Fri, 7 Apr 2017 11:12:52 -0700
Subject: [PATCH 352/366] Stop yarn error message appearing for Windows users
 of local-cli

Summary:
On windows, recent versions of local-cli will display a yarn error to stderr when starting the packager (see https://github.com/expo/xde/issues/91, https://github.com/react-community/create-react-native-app/issues/101, https://github.com/react-community/create-react-native-app/issues/113#issuecomment-289185491 for examples of users hitting this in the wild), even though no package management action is being taken.

From what I can tell this is what happens:

* [`local-cli/util/yarn.js` does not ignore stderr on Windows](https://github.com/facebook/react-native/blob/6fa87134fc68fd447e33a01a538ae0af6710e5d2/local-cli/util/yarn.js#L25)
* [`local-cli/util/PackageManager.js` calls the above function when it's require'd](https://github.com/facebook/react-native/blob/6fa87134fc68fd447e33a01a538ae0af6710e5d2/local-cli/util/PackageManager.js#L20)

For Windows users who don't have yarn installed, this means that the 'yarn is not recognized as an internal or external command..." error displays wh
Closes https://github.com/facebook/react-native/pull/13355

Differential Revision: D4848084

Pulled By: hramos

fbshipit-source-id: f32176354e0bd7ff6d7009ea30dca64ff23ae3d5
---
 local-cli/util/PackageManager.js | 10 +++++-----
 local-cli/util/yarn.js           |  8 +++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/local-cli/util/PackageManager.js b/local-cli/util/PackageManager.js
index 989aa135fe7202..6d866a0505aa23 100644
--- a/local-cli/util/PackageManager.js
+++ b/local-cli/util/PackageManager.js
@@ -15,11 +15,6 @@ const spawnOpts = {
   stdin: 'inherit',
 };
 
-const projectDir = process.cwd();
-const isYarnAvailable =
-  yarn.getYarnVersionIfAvailable() &&
-  yarn.isGlobalCliUsingYarn(projectDir);
-
 /**
  * Execute npm or yarn command
  *
@@ -30,6 +25,11 @@ const isYarnAvailable =
 function callYarnOrNpm(yarnCommand, npmCommand) {
   let command;
 
+  const projectDir = process.cwd();
+  const isYarnAvailable =
+    yarn.getYarnVersionIfAvailable() &&
+    yarn.isGlobalCliUsingYarn(projectDir);
+
   if (isYarnAvailable) {
     command = yarnCommand;
   } else {
diff --git a/local-cli/util/yarn.js b/local-cli/util/yarn.js
index 86b0d3f5b354a6..8bef7804eb9b09 100644
--- a/local-cli/util/yarn.js
+++ b/local-cli/util/yarn.js
@@ -21,11 +21,9 @@ function getYarnVersionIfAvailable() {
   let yarnVersion;
   try {
     // execSync returns a Buffer -> convert to string
-    if (process.platform.startsWith('win')) {
-      yarnVersion = (execSync('yarn --version').toString() || '').trim();
-    } else {
-      yarnVersion = (execSync('yarn --version 2>/dev/null').toString() || '').trim();
-    }
+    yarnVersion = (execSync('yarn --version', {
+      stdio: [ 0, 'pipe', 'ignore', ]
+    }).toString() || '').trim();
   } catch (error) {
     return null;
   }

From e154117f37cdae3f5a3161010d67d139a83ad0e5 Mon Sep 17 00:00:00 2001
From: Benjamin Jaeger <bjaeger@fb.com>
Date: Fri, 7 Apr 2017 11:42:33 -0700
Subject: [PATCH 353/366] Add proguard rules to bridge BUCK

Summary:
prevents reflected classes from being stripped/obfuscated
Depends on D4830910

Reviewed By: mhorowitz

Differential Revision: D4835688

fbshipit-source-id: 5b85668f92ed4ae5cebc9902ec60f6d5d6299bd4
---
 .../main/java/com/facebook/react/bridge/BUCK  |  1 +
 .../com/facebook/react/bridge/reactnative.pro | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/bridge/reactnative.pro

diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK b/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK
index dfabde669263b9..0f67d30d35870f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK
@@ -21,6 +21,7 @@ android_library(
         react_native_dep("java/com/facebook/proguard/annotations:annotations"),
         react_native_dep("third-party/java/jsr-330:jsr-330"),
     ],
+    proguard_config = "reactnative.pro",
     visibility = [
         "PUBLIC",
     ],
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/reactnative.pro b/ReactAndroid/src/main/java/com/facebook/react/bridge/reactnative.pro
new file mode 100644
index 00000000000000..f5c925a42f6eb7
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/reactnative.pro
@@ -0,0 +1,19 @@
+-keepnames class * extends com.facebook.react.bridge.JavaScriptModule { *; }
+-keepnames class * extends com.facebook.react.cxxbridge.CxxModuleWrapper {*; }
+-keepclassmembers class * extends com.facebook.react.bridge.NativeModule {
+    @com.facebook.react.bridge.ReactMethod *;
+    public <init>(...);
+}
+
+-keepclassmembers class *  { @com.facebook.react.uimanager.annotations.ReactProp <methods>; }
+-keepclassmembers class *  { @com.facebook.react.uimanager.annotations.ReactPropGroup <methods>; }
+-keepnames class * extends com.facebook.react.uimanager.ViewManager
+-keepnames class * extends com.facebook.react.uimanager.ReactShadowNode
+-keep class **$$PropsSetter
+-keep class **$$ReactModuleInfoProvider
+-keep class com.facebook.react.bridge.ReadableType { *; }
+
+-keepnames class com.facebook.quicklog.QuickPerformanceLogger {
+  void markerAnnotate(int,int,java.lang.String,java.lang.String);
+  void markerTag(int,int,java.lang.String);
+}

From 909af08f24e3c65e46593a1f66d5484c34dda53c Mon Sep 17 00:00:00 2001
From: "Andrew Y. Chen" <ayc@fb.com>
Date: Fri, 7 Apr 2017 11:47:35 -0700
Subject: [PATCH 354/366] Add a nativeID prop to allow native code to reference
 react managed views

Reviewed By: sahrens

Differential Revision: D4786713

fbshipit-source-id: af9cef0737c010b429d52d00181c00bd81f13f5b
---
 Libraries/Components/TextInput/TextInput.js   |  2 +
 .../Components/Touchable/TouchableBounce.js   |  1 +
 .../Touchable/TouchableHighlight.js           |  2 +-
 .../Components/Touchable/TouchableOpacity.js  |  3 +-
 .../Touchable/TouchableWithoutFeedback.js     |  2 +
 .../TouchableHighlight-test.js.snap           |  1 +
 .../View/ReactNativeViewAttributes.js         |  1 +
 Libraries/Components/View/ViewPropTypes.js    |  9 +++
 Libraries/Text/Text.js                        |  7 +-
 .../java/com/facebook/react/tests/BUCK        |  3 +-
 .../react/tests/NativeIdTestCase.java         | 50 ++++++++++++
 .../src/androidTest/js/NativeIdTestModule.js  | 77 +++++++++++++++++++
 ReactAndroid/src/androidTest/js/TestBundle.js |  4 +
 .../react/uimanager/BaseViewManager.java      |  6 ++
 .../com/facebook/react/uimanager/util/BUCK    | 13 ++++
 .../uimanager/util/ReactFindViewUtil.java     | 38 +++++++++
 .../main/res/views/uimanager/values/ids.xml   |  3 +
 17 files changed, 218 insertions(+), 4 deletions(-)
 create mode 100644 ReactAndroid/src/androidTest/java/com/facebook/react/tests/NativeIdTestCase.java
 create mode 100644 ReactAndroid/src/androidTest/js/NativeIdTestModule.js
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/uimanager/util/BUCK
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/uimanager/util/ReactFindViewUtil.java

diff --git a/Libraries/Components/TextInput/TextInput.js b/Libraries/Components/TextInput/TextInput.js
index 2f24ab240ab6c0..20a060f8d3868e 100644
--- a/Libraries/Components/TextInput/TextInput.js
+++ b/Libraries/Components/TextInput/TextInput.js
@@ -698,6 +698,7 @@ const TextInput = React.createClass({
         accessible={props.accessible}
         accessibilityLabel={props.accessibilityLabel}
         accessibilityTraits={props.accessibilityTraits}
+        nativeID={this.props.nativeID}
         testID={props.testID}>
         {textContainer}
       </TouchableWithoutFeedback>
@@ -748,6 +749,7 @@ const TextInput = React.createClass({
         accessible={this.props.accessible}
         accessibilityLabel={this.props.accessibilityLabel}
         accessibilityComponentType={this.props.accessibilityComponentType}
+        nativeID={this.props.nativeID}
         testID={this.props.testID}>
         {textContainer}
       </TouchableWithoutFeedback>
diff --git a/Libraries/Components/Touchable/TouchableBounce.js b/Libraries/Components/Touchable/TouchableBounce.js
index 333cf6cbf79a9b..ae861f5e115688 100644
--- a/Libraries/Components/Touchable/TouchableBounce.js
+++ b/Libraries/Components/Touchable/TouchableBounce.js
@@ -141,6 +141,7 @@ var TouchableBounce = React.createClass({
         accessibilityLabel={this.props.accessibilityLabel}
         accessibilityComponentType={this.props.accessibilityComponentType}
         accessibilityTraits={this.props.accessibilityTraits}
+        nativeID={this.props.nativeID}
         testID={this.props.testID}
         hitSlop={this.props.hitSlop}
         onStartShouldSetResponder={this.touchableHandleStartShouldSetResponder}
diff --git a/Libraries/Components/Touchable/TouchableHighlight.js b/Libraries/Components/Touchable/TouchableHighlight.js
index ee0d056b22f22b..df821100c71363 100644
--- a/Libraries/Components/Touchable/TouchableHighlight.js
+++ b/Libraries/Components/Touchable/TouchableHighlight.js
@@ -22,7 +22,6 @@ var TimerMixin = require('react-timer-mixin');
 var Touchable = require('Touchable');
 var TouchableWithoutFeedback = require('TouchableWithoutFeedback');
 var View = require('View');
-
 const ViewPropTypes = require('ViewPropTypes');
 
 var ensureComponentIsNative = require('ensureComponentIsNative');
@@ -267,6 +266,7 @@ var TouchableHighlight = React.createClass({
         onResponderMove={this.touchableHandleResponderMove}
         onResponderRelease={this.touchableHandleResponderRelease}
         onResponderTerminate={this.touchableHandleResponderTerminate}
+        nativeID={this.props.nativeID}
         testID={this.props.testID}>
         {React.cloneElement(
           React.Children.only(this.props.children),
diff --git a/Libraries/Components/Touchable/TouchableOpacity.js b/Libraries/Components/Touchable/TouchableOpacity.js
index 40079f44538f00..0138fea92f52df 100644
--- a/Libraries/Components/Touchable/TouchableOpacity.js
+++ b/Libraries/Components/Touchable/TouchableOpacity.js
@@ -165,7 +165,7 @@ var TouchableOpacity = React.createClass({
   _opacityFocused: function() {
     this.setOpacityTo(this.props.focusedOpacity);
   },
-  
+
   _getChildStyleOpacityWithDefault: function() {
    var childStyle = flattenStyle(this.props.style) || {};
    return childStyle.opacity == undefined ? 1 : childStyle.opacity;
@@ -179,6 +179,7 @@ var TouchableOpacity = React.createClass({
         accessibilityComponentType={this.props.accessibilityComponentType}
         accessibilityTraits={this.props.accessibilityTraits}
         style={[this.props.style, {opacity: this.state.anim}]}
+        nativeID={this.props.nativeID}
         testID={this.props.testID}
         onLayout={this.props.onLayout}
         isTVSelectable={true}
diff --git a/Libraries/Components/Touchable/TouchableWithoutFeedback.js b/Libraries/Components/Touchable/TouchableWithoutFeedback.js
index 0886c577e09494..cd1f855ffee912 100755
--- a/Libraries/Components/Touchable/TouchableWithoutFeedback.js
+++ b/Libraries/Components/Touchable/TouchableWithoutFeedback.js
@@ -176,6 +176,8 @@ const TouchableWithoutFeedback = React.createClass({
       accessibilityComponentType: this.props.accessibilityComponentType,
       accessibilityTraits: this.props.accessibilityTraits,
       // $FlowFixMe(>=0.41.0)
+      nativeID: this.props.nativeID,
+      // $FlowFixMe(>=0.41.0)
       testID: this.props.testID,
       onLayout: this.props.onLayout,
       hitSlop: this.props.hitSlop,
diff --git a/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableHighlight-test.js.snap b/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableHighlight-test.js.snap
index 29f7478ffaf8ec..12896cafcaef50 100644
--- a/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableHighlight-test.js.snap
+++ b/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableHighlight-test.js.snap
@@ -9,6 +9,7 @@ exports[`TouchableHighlight renders correctly 1`] = `
   hasTVPreferredFocus={undefined}
   hitSlop={undefined}
   isTVSelectable={true}
+  nativeID={undefined}
   onLayout={undefined}
   onResponderGrant={[Function]}
   onResponderMove={[Function]}
diff --git a/Libraries/Components/View/ReactNativeViewAttributes.js b/Libraries/Components/View/ReactNativeViewAttributes.js
index e5e83a40de9569..3a769ca5ed7525 100644
--- a/Libraries/Components/View/ReactNativeViewAttributes.js
+++ b/Libraries/Components/View/ReactNativeViewAttributes.js
@@ -23,6 +23,7 @@ ReactNativeViewAttributes.UIView = {
   accessibilityLiveRegion: true,
   accessibilityTraits: true,
   importantForAccessibility: true,
+  nativeID: true,
   testID: true,
   renderToHardwareTextureAndroid: true,
   shouldRasterizeIOS: true,
diff --git a/Libraries/Components/View/ViewPropTypes.js b/Libraries/Components/View/ViewPropTypes.js
index 86f9f878718d6b..a0f8b8ff5f7208 100644
--- a/Libraries/Components/View/ViewPropTypes.js
+++ b/Libraries/Components/View/ViewPropTypes.js
@@ -173,6 +173,15 @@ module.exports = {
    */
   testID: PropTypes.string,
 
+  /**
+   * Used to locate this view from native classes.
+   *
+   * > This disables the 'layout-only view removal' optimization for this view!
+   *
+   * @platform android
+   */
+  nativeID: PropTypes.string,
+
   /**
    * For most touch interactions, you'll simply want to wrap your component in
    * `TouchableHighlight` or `TouchableOpacity`. Check out `Touchable.js`,
diff --git a/Libraries/Text/Text.js b/Libraries/Text/Text.js
index 2401589e9b078c..986f695905d2dd 100644
--- a/Libraries/Text/Text.js
+++ b/Libraries/Text/Text.js
@@ -21,9 +21,9 @@ const StyleSheetPropType = require('StyleSheetPropType');
 const TextStylePropTypes = require('TextStylePropTypes');
 const Touchable = require('Touchable');
 
-const processColor = require('processColor');
 const createReactNativeComponentClass = require('createReactNativeComponentClass');
 const mergeFast = require('mergeFast');
+const processColor = require('processColor');
 
 const { PropTypes } = React;
 
@@ -177,6 +177,11 @@ const Text = React.createClass({
      * Used to locate this view in end-to-end tests.
      */
     testID: PropTypes.string,
+    /**
+     * Used to locate this view from native code.
+     * @platform android
+     */
+    nativeID: PropTypes.string,
     /**
      * Specifies whether fonts should scale to respect Text Size accessibility settings. The
      * default is `true`.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK
index 992351f62026aa..1a76463511a962 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK
@@ -13,13 +13,14 @@ deps = [
     react_native_target("java/com/facebook/react/modules/appstate:appstate"),
     react_native_target("java/com/facebook/react/modules/core:core"),
     react_native_target("java/com/facebook/react/modules/datepicker:datepicker"),
+    react_native_target("java/com/facebook/react/modules/deviceinfo:deviceinfo"),
     react_native_target("java/com/facebook/react/modules/share:share"),
     react_native_target("java/com/facebook/react/modules/systeminfo:systeminfo"),
-    react_native_target("java/com/facebook/react/modules/deviceinfo:deviceinfo"),
     react_native_target("java/com/facebook/react/modules/timepicker:timepicker"),
     react_native_target("java/com/facebook/react/touch:touch"),
     react_native_target("java/com/facebook/react/uimanager:uimanager"),
     react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
+    react_native_target("java/com/facebook/react/uimanager/util:util"),
     react_native_target("java/com/facebook/react/views/picker:picker"),
     react_native_target("java/com/facebook/react/views/progressbar:progressbar"),
     react_native_target("java/com/facebook/react/views/scroll:scroll"),
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/NativeIdTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/NativeIdTestCase.java
new file mode 100644
index 00000000000000..cccec2ae1f4a62
--- /dev/null
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/NativeIdTestCase.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ * This source code is licensed under the BSD-style license found in the
+ * 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.
+ */
+
+package com.facebook.react.tests;
+
+import java.util.Arrays;
+import java.util.List;
+
+import android.view.View;
+
+import com.facebook.react.testing.ReactAppInstrumentationTestCase;
+import com.facebook.react.uimanager.util.ReactFindViewUtil;
+
+/**
+ * Tests that the 'nativeID' property can be set on various views.
+ * The 'nativeID' property is used to reference react managed views from native code.
+ */
+public class NativeIdTestCase extends ReactAppInstrumentationTestCase {
+
+  @Override
+  protected String getReactApplicationKeyUnderTest() {
+    return "NativeIdTestApp";
+  }
+
+  private final List<String> viewTags = Arrays.asList(
+    "Image",
+    "Text",
+    "TouchableBounce",
+    "TouchableHighlight",
+    "TouchableOpacity",
+    "TouchableWithoutFeedback",
+    "TextInput",
+    "View");
+
+  public void testPropertyIsSetForViews() {
+    for (String nativeId : viewTags) {
+      View viewWithTag = ReactFindViewUtil.findViewByNativeId(
+        getActivity().getRootView(),
+        nativeId);
+      assertNotNull(
+        "View with nativeID " + nativeId + " was not found. Check NativeIdTestModule.js.",
+        viewWithTag);
+    }
+  }
+}
diff --git a/ReactAndroid/src/androidTest/js/NativeIdTestModule.js b/ReactAndroid/src/androidTest/js/NativeIdTestModule.js
new file mode 100644
index 00000000000000..d1bf8c57df08fb
--- /dev/null
+++ b/ReactAndroid/src/androidTest/js/NativeIdTestModule.js
@@ -0,0 +1,77 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * 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 NativeIdTestModule
+ * @flow
+ */
+
+'use strict';
+
+const Image = require('Image');
+const React = require('React');
+const StyleSheet = require('StyleSheet');
+const Text = require('Text');
+const TextInput = require('TextInput');
+const TouchableBounce = require('TouchableBounce');
+const TouchableHighlight = require('TouchableHighlight');
+const TouchableOpacity = require('TouchableOpacity');
+const TouchableWithoutFeedback = require('TouchableWithoutFeedback');
+const View = require('View');
+
+/**
+ * All the views implemented on Android, each with the nativeID property set.
+ * We test that:
+ * - The app renders fine
+ * - The nativeID property is passed to the native views
+ */
+class NativeIdTestApp extends React.Component {
+  render() {
+    const uri = 'data:image/gif;base64,' +
+        'R0lGODdhMAAwAPAAAAAAAP///ywAAAAAMAAwAAAC8IyPqcvt3wCcDkiLc7C0qwyGHhSWpjQu5yqmCYsapy' +
+        'uvUUlvONmOZtfzgFzByTB10QgxOR0TqBQejhRNzOfkVJ+5YiUqrXF5Y5lKh/DeuNcP5yLWGsEbtLiOSpa/' +
+        'TPg7JpJHxyendzWTBfX0cxOnKPjgBzi4diinWGdkF8kjdfnycQZXZeYGejmJlZeGl9i2icVqaNVailT6F5' +
+        'iJ90m6mvuTS4OK05M0vDk0Q4XUtwvKOzrcd3iq9uisF81M1OIcR7lEewwcLp7tuNNkM3uNna3F2JQFo97V' +
+        'riy/Xl4/f1cf5VWzXyym7PHhhx4dbgYKAAA7';
+    return (
+      <View>
+        <Image
+          nativeID="Image"
+          source={{uri: uri}}
+          style={styles.base} />
+        <Text nativeID="Text">text</Text>
+        <TextInput nativeID="TextInput" value="Text input" />
+        <TouchableBounce nativeID="TouchableBounce">
+          <Text>TouchableBounce</Text>
+        </TouchableBounce>
+        <TouchableHighlight nativeID="TouchableHighlight">
+          <Text>TouchableHighlight</Text>
+        </TouchableHighlight>
+        <TouchableOpacity nativeID="TouchableOpacity">
+          <Text>TouchableOpacity</Text>
+        </TouchableOpacity>
+        <TouchableWithoutFeedback nativeID="TouchableWithoutFeedback">
+          <View>
+            <Text>TouchableWithoutFeedback</Text>
+          </View>
+        </TouchableWithoutFeedback>
+        <View nativeID="View" />
+      </View>
+    );
+  }
+}
+
+const styles = StyleSheet.create({
+  base: {
+    width: 150,
+    height: 50,
+  },
+});
+
+module.exports = {
+  NativeIdTestApp: NativeIdTestApp,
+};
diff --git a/ReactAndroid/src/androidTest/js/TestBundle.js b/ReactAndroid/src/androidTest/js/TestBundle.js
index 1d02425586d840..5cbfea239e59aa 100644
--- a/ReactAndroid/src/androidTest/js/TestBundle.js
+++ b/ReactAndroid/src/androidTest/js/TestBundle.js
@@ -69,6 +69,10 @@ var apps = [
   appKey: 'MultitouchHandlingTestAppModule',
   component: () => require('MultitouchHandlingTestAppModule')
 },
+{
+  appKey: 'NativeIdTestApp',
+  component: () => require('NativeIdTestModule').NativeIdTestApp
+},
 {
   appKey: 'PickerAndroidTestApp',
   component: () => require('PickerAndroidTestModule').PickerAndroidTestApp,
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
index 16c85690a1bdf8..271b126b3f9d0b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
@@ -41,6 +41,7 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
    * Used to locate views in end-to-end (UI) tests.
    */
   public static final String PROP_TEST_ID = "testID";
+  public static final String PROP_NATIVE_ID = "nativeID";
 
   private static MatrixMathHelper.MatrixDecompositionContext sMatrixDecompositionContext =
       new MatrixMathHelper.MatrixDecompositionContext();
@@ -92,6 +93,11 @@ public void setTestId(T view, String testId) {
     view.setTag(testId);
   }
 
+  @ReactProp(name = PROP_NATIVE_ID)
+  public void setNativeId(T view, String nativeId) {
+    view.setTag(R.id.view_tag_native_id, nativeId);
+  }
+
   @ReactProp(name = PROP_ACCESSIBILITY_LABEL)
   public void setAccessibilityLabel(T view, String accessibilityLabel) {
     view.setContentDescription(accessibilityLabel);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/util/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/util/BUCK
new file mode 100644
index 00000000000000..323a794bb58b6e
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/util/BUCK
@@ -0,0 +1,13 @@
+include_defs("//ReactAndroid/DEFS")
+
+android_library(
+    name = "util",
+    srcs = glob(["*.java"]),
+    visibility = [
+        "PUBLIC",
+    ],
+    deps = [
+        react_native_dep("third-party/java/jsr-305:jsr-305"),
+        react_native_target("res:uimanager"),
+    ],
+)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/util/ReactFindViewUtil.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/util/ReactFindViewUtil.java
new file mode 100644
index 00000000000000..1604931219bdb1
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/util/ReactFindViewUtil.java
@@ -0,0 +1,38 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+package com.facebook.react.uimanager.util;
+
+import javax.annotation.Nullable;
+
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.facebook.react.R;
+
+/**
+ * Finds views in React Native view hierarchies
+ */
+public class ReactFindViewUtil {
+
+  /**
+   * Finds a view that is tagged with {@param nativeId} as its `nativeID` prop
+   */
+  public static @Nullable View findViewByNativeId(View view, String nativeId) {
+    Object tag = view.getTag(R.id.view_tag_native_id);
+    if (tag instanceof String && tag.equals(nativeId)) {
+      return view;
+    }
+
+    if (view instanceof ViewGroup) {
+      ViewGroup viewGroup = (ViewGroup) view;
+      for (int i = 0; i < viewGroup.getChildCount(); i++) {
+        View v = findViewByNativeId(viewGroup.getChildAt(i), nativeId);
+        if (v != null) {
+          return v;
+        }
+      }
+    }
+
+    return null;
+  }
+}
diff --git a/ReactAndroid/src/main/res/views/uimanager/values/ids.xml b/ReactAndroid/src/main/res/views/uimanager/values/ids.xml
index 8744d7cad248db..75ac81d1710607 100644
--- a/ReactAndroid/src/main/res/views/uimanager/values/ids.xml
+++ b/ReactAndroid/src/main/res/views/uimanager/values/ids.xml
@@ -2,4 +2,7 @@
 <resources>
   <!-- tag is used to store the testID tag -->
   <item type="id" name="react_test_id"/>
+
+  <!-- tag is used to store the nativeID tag -->
+  <item type="id" name="view_tag_native_id"/>
 </resources>

From 29404f087e425ca1a7e24d6cc07eb26382032637 Mon Sep 17 00:00:00 2001
From: Ludovico Fischer <ludovicofischer@users.noreply.github.com>
Date: Fri, 7 Apr 2017 13:23:54 -0700
Subject: [PATCH 355/366] Correct `setState()` usage in tutorial
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Summary:
If the new state depends on the previous state, if I remember correctly, it’s safer to use  `setState()` with a function argument to ensure we’re not reading from an outdated `state`.

Thanks for submitting a PR! Please read these instructions carefully:

- [x] Explain the **motivation** for making this change.
- [x] Provide a **test plan** demonstrating that the code is solid.
- [x] Match the **code formatting** of the rest of the codebase.
- [x] Target the `master` branch, NOT a "stable" branch.

The tutorial suggests to use `setState()` with an object argument when the new state depends on the previous state. In such situations, it’s preferable to use a function to ensure the previous state is up-to-date.

Updates documentation only, so there are no additional tests. Rendering the site.

Sign the [CLA][2], if you haven't already.

Small pull requests are much easier to review and more likely to get merged. Make sure th
Closes https://github.com/facebook/react-native/pull/13358

Differential Revision: D4852404

Pulled By: hramos

fbshipit-source-id: 834759e16bcfbd5a8de71bf0c56f2b154f3321e1
---
 docs/State.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/State.md b/docs/State.md
index f9e62c2b08179e..f22013c063c6d3 100644
--- a/docs/State.md
+++ b/docs/State.md
@@ -25,7 +25,9 @@ class Blink extends Component {
 
     // Toggle the state every second
     setInterval(() => {
-      this.setState({ showText: !this.state.showText });
+      this.setState(previousState => {
+        return { showText: !previousState.showText };
+      });
     }, 1000);
   }
 

From 6f8ce41a3958068d6258f7b7c0d1f98646486475 Mon Sep 17 00:00:00 2001
From: Spencer Ahrens <sahrens@fb.com>
Date: Fri, 7 Apr 2017 15:49:46 -0700
Subject: [PATCH 356/366] Fix crash from FillRateLogging

Reviewed By: thechefchen

Differential Revision: D4853991

fbshipit-source-id: b024d4052edb04e9f9da2e2504c56f8b7840cded
---
 Libraries/Lists/FillRateHelper.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Libraries/Lists/FillRateHelper.js b/Libraries/Lists/FillRateHelper.js
index 745e21cac96ade..d856fa9527c2b4 100644
--- a/Libraries/Lists/FillRateHelper.js
+++ b/Libraries/Lists/FillRateHelper.js
@@ -108,6 +108,9 @@ class FillRateHelper {
       return null;
     }
     const start = performanceNow();
+    if (props.getItemCount(props.data) === 0) {
+      return null;
+    }
     if (!this._samplesStartTime) {
       this._samplesStartTime = start;
     }

From a1e06dfb39e6cf8d55c8a9dbe767924ba2bc2f97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9sar=20Alberca?= <cesalberca@gmail.com>
Date: Fri, 7 Apr 2017 18:35:14 -0700
Subject: [PATCH 357/366] Removed extra semicolon

Summary: Closes https://github.com/facebook/react-native/pull/13389

Differential Revision: D4854128

Pulled By: hramos

fbshipit-source-id: bd7d0d12eae51fed31cf4bc2260b8c4f447e08c8
---
 docs/Navigation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Navigation.md b/docs/Navigation.md
index b245f079fdf876..bfcfd663fcc420 100644
--- a/docs/Navigation.md
+++ b/docs/Navigation.md
@@ -48,7 +48,7 @@ class MainScreen extends React.Component {
       <Button
         title="Go to Jane's profile"
         onPress={() =>
-          navigate('Profile', { name: 'Jane' });
+          navigate('Profile', { name: 'Jane' })
         }
       />
     );

From 263f40a2d3addaf12868901fbe3db376d656944d Mon Sep 17 00:00:00 2001
From: David Aurelio <davidaurelio@fb.com>
Date: Fri, 7 Apr 2017 20:02:24 -0700
Subject: [PATCH 358/366] packager: HasteMap: expose getAllFiles()

Reviewed By: tomocchino

Differential Revision: D4850695

fbshipit-source-id: 8aae4353de8779f7a1358b2766dad4a6c751b4af
---
 packager/src/node-haste/DependencyGraph/HasteMap.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packager/src/node-haste/DependencyGraph/HasteMap.js b/packager/src/node-haste/DependencyGraph/HasteMap.js
index 0c42f28963762a..c62aaeee6c658f 100644
--- a/packager/src/node-haste/DependencyGraph/HasteMap.js
+++ b/packager/src/node-haste/DependencyGraph/HasteMap.js
@@ -55,6 +55,10 @@ class HasteMap extends EventEmitter {
     return Promise.all(promises).then(() => this._map);
   }
 
+  getAllFiles(): Array<string> {
+    return this._files;
+  }
+
   processFileChange(type, absPath) {
     return Promise.resolve().then(() => {
       /*eslint no-labels: 0 */

From 3d3cd867c9c5350a451a74bb23a2cbd78d752bc3 Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jon.kim@tegocover.com>
Date: Fri, 7 Apr 2017 20:11:25 -0700
Subject: [PATCH 359/366] Added option to disable xip

Summary:
When running an app on a real iPhone in debug mode, I occasionally get issues when trying to load the js bundle and I suspect the issue is with xip.io (and it doesn't look like I'm the only one: https://github.com/facebook/react-native/issues/12786 https://github.com/facebook/react-native/issues/9688#issuecomment-272591839). So I've added the ability to optionally disable the use of xip.io if an env variable `DISABLE_XIP` is set.

Add `export DISABLE_XIP=true` to the `Bundle React Native code and images` build phase. Run the app on a real iPhone and ensure that it can load the JS bundle from the host computers IP.
Closes https://github.com/facebook/react-native/pull/13326

Differential Revision: D4855719

Pulled By: ericvicenti

fbshipit-source-id: cb2e91291acadaa78ea302800b55c2e5388f6380
---
 packager/react-native-xcode.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packager/react-native-xcode.sh b/packager/react-native-xcode.sh
index 6ef8f3e01297aa..1a1c3660dd26b8 100755
--- a/packager/react-native-xcode.sh
+++ b/packager/react-native-xcode.sh
@@ -80,9 +80,14 @@ if [[ "$CONFIGURATION" = "Debug" && ! "$PLATFORM_NAME" == *simulator ]]; then
   if [ -z "$IP" ]; then
     IP=$(ifconfig | grep 'inet ' | grep -v 127.0.0.1 | cut -d\   -f2  | awk 'NR==1{print $1}')
   fi
+
+  if [ -z ${DISABLE_XIP+x} ]; then
+    IP="$IP.xip.io"
+  fi
+
   $PLISTBUDDY -c "Add NSAppTransportSecurity:NSExceptionDomains:localhost:NSTemporaryExceptionAllowsInsecureHTTPLoads bool true" "$PLIST"
-  $PLISTBUDDY -c "Add NSAppTransportSecurity:NSExceptionDomains:$IP.xip.io:NSTemporaryExceptionAllowsInsecureHTTPLoads bool true" "$PLIST"
-  echo "$IP.xip.io" > "$DEST/ip.txt"
+  $PLISTBUDDY -c "Add NSAppTransportSecurity:NSExceptionDomains:$IP:NSTemporaryExceptionAllowsInsecureHTTPLoads bool true" "$PLIST"
+  echo "$IP" > "$DEST/ip.txt"
 fi
 
 BUNDLE_FILE="$DEST/main.jsbundle"

From e67b8fe761dea91633f604802b361a5275536589 Mon Sep 17 00:00:00 2001
From: Andres Suarez <asuarez@fb.com>
Date: Sat, 8 Apr 2017 13:50:31 -0700
Subject: [PATCH 360/366] Use flow 0.43.1

Reviewed By: nmote

Differential Revision: D4851923

fbshipit-source-id: 018f61c3a45e32c899287848d36129e3601145a4
---
 .flowconfig                                | 2 +-
 local-cli/templates/HelloWorld/_flowconfig | 2 +-
 package.json                               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.flowconfig b/.flowconfig
index 62b8c8431e44fa..7eec6f4162328f 100644
--- a/.flowconfig
+++ b/.flowconfig
@@ -49,4 +49,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
 unsafe.enable_getters_and_setters=true
 
 [version]
-^0.43.0
+^0.43.1
diff --git a/local-cli/templates/HelloWorld/_flowconfig b/local-cli/templates/HelloWorld/_flowconfig
index de255a47a57c08..fdac4d6d72d842 100644
--- a/local-cli/templates/HelloWorld/_flowconfig
+++ b/local-cli/templates/HelloWorld/_flowconfig
@@ -44,4 +44,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
 unsafe.enable_getters_and_setters=true
 
 [version]
-^0.43.0
+^0.43.1
diff --git a/package.json b/package.json
index b24f77feda3804..5fc18048b4034c 100644
--- a/package.json
+++ b/package.json
@@ -223,7 +223,7 @@
     "eslint-plugin-flowtype": "^2.20.0",
     "eslint-plugin-react": "^6.4.1",
     "eslint-config-fbjs": "^1.1.1",
-    "flow-bin": "^0.43.0",
+    "flow-bin": "^0.43.1",
     "jest": "19.0.2",
     "jest-repl": "19.0.2",
     "jest-runtime": "19.0.2",

From f3dfd616f4eb9465585aeec1526592dcdad9871d Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieterdb@fb.com>
Date: Sat, 8 Apr 2017 15:14:32 -0700
Subject: [PATCH 361/366] Allow lazy Cxx modules to not initialize

Reviewed By: mhorowitz

Differential Revision: D4851596

fbshipit-source-id: cf5f5c51b9aaa0da96f7ab6fba1277b72c988400
---
 React/CxxModule/RCTCxxUtils.mm           |  6 ------
 ReactCommon/cxxreact/CxxNativeModule.cpp | 14 +++++++++++---
 ReactCommon/cxxreact/ModuleRegistry.cpp  |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/React/CxxModule/RCTCxxUtils.mm b/React/CxxModule/RCTCxxUtils.mm
index 331e0bfaf55792..73951be812d8da 100644
--- a/React/CxxModule/RCTCxxUtils.mm
+++ b/React/CxxModule/RCTCxxUtils.mm
@@ -46,12 +46,6 @@ @implementation RCTConvert (folly)
   std::vector<std::unique_ptr<NativeModule>> nativeModules;
   for (RCTModuleData *moduleData in modules) {
     if ([moduleData.moduleClass isSubclassOfClass:[RCTCxxModule class]]) {
-      // If a module does not support automatic instantiation, and
-      // wasn't provided as an extra module, it may not have an
-      // instance.  If so, skip it.
-      if (![moduleData hasInstance]) {
-        continue;
-      }
       nativeModules.emplace_back(std::make_unique<CxxNativeModule>(
         instance,
         [moduleData.name UTF8String],
diff --git a/ReactCommon/cxxreact/CxxNativeModule.cpp b/ReactCommon/cxxreact/CxxNativeModule.cpp
index 40d37f1a0ea7fc..52a1469fe90964 100644
--- a/ReactCommon/cxxreact/CxxNativeModule.cpp
+++ b/ReactCommon/cxxreact/CxxNativeModule.cpp
@@ -64,6 +64,10 @@ std::vector<MethodDescriptor> CxxNativeModule::getMethods() {
 folly::dynamic CxxNativeModule::getConstants() {
   lazyInit();
 
+  if (!module_) {
+    return nullptr;
+  }
+
   folly::dynamic constants = folly::dynamic::object();
   for (auto& pair : module_->getConstants()) {
     constants.insert(std::move(pair.first), std::move(pair.second));
@@ -161,13 +165,17 @@ MethodCallResult CxxNativeModule::callSerializableNativeHook(
 }
 
 void CxxNativeModule::lazyInit() {
-  if (module_) {
+  if (module_ || !provider_) {
     return;
   }
 
+  // TODO 17216751: providers should never return null modules
   module_ = provider_();
-  methods_ = module_->getMethods();
-  module_->setInstance(instance_);
+  provider_ = nullptr;
+  if (module_) {
+    methods_ = module_->getMethods();
+    module_->setInstance(instance_);
+  }
 }
 
 }
diff --git a/ReactCommon/cxxreact/ModuleRegistry.cpp b/ReactCommon/cxxreact/ModuleRegistry.cpp
index 4a7dcb80149a5c..7fda3c75cc4910 100644
--- a/ReactCommon/cxxreact/ModuleRegistry.cpp
+++ b/ReactCommon/cxxreact/ModuleRegistry.cpp
@@ -105,7 +105,7 @@ folly::Optional<ModuleConfig> ModuleRegistry::getConfig(const std::string& name)
     }
   }
 
-  if (config.size() == 1) {
+  if (config.size() == 2 && config[1].empty()) {
     // no constants or methods
     return nullptr;
   } else {

From 2336ac299c83da63c512d5244f5896336469d0c2 Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieterdb@fb.com>
Date: Sat, 8 Apr 2017 15:14:38 -0700
Subject: [PATCH 362/366] Improve constant extraction from RCTNativeModule

Reviewed By: dcaspi

Differential Revision: D4829671

fbshipit-source-id: 6b1cef1d31c7d8981c6f1e304d3742e885f8a83b
---
 React/Base/RCTModuleData.h         |  5 +++++
 React/Base/RCTModuleData.mm        | 11 ++++++++---
 React/CxxModule/RCTNativeModule.mm | 18 ++----------------
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/React/Base/RCTModuleData.h b/React/Base/RCTModuleData.h
index 96099ba5b56d14..aa1c4896feae3f 100644
--- a/React/Base/RCTModuleData.h
+++ b/React/Base/RCTModuleData.h
@@ -46,6 +46,11 @@ typedef id<RCTBridgeModule>(^RCTBridgeModuleProvider)(void);
  */
 @property (nonatomic, copy, readonly) NSArray<id<RCTBridgeMethod>> *methods;
 
+/**
+ * Returns the module's constants, if it exports any
+ */
+@property (nonatomic, copy, readonly) NSDictionary<NSString *, id> *exportedConstants;
+
 /**
  * Returns YES if module instance has already been initialized; NO otherwise.
  */
diff --git a/React/Base/RCTModuleData.mm b/React/Base/RCTModuleData.mm
index c58a3e0540994a..e3ad7641a26480 100644
--- a/React/Base/RCTModuleData.mm
+++ b/React/Base/RCTModuleData.mm
@@ -304,18 +304,23 @@ - (void)gatherConstants
   }
 }
 
-- (NSArray *)config
+- (NSDictionary<NSString *, id> *)exportedConstants
 {
   [self gatherConstants];
-  __block NSDictionary<NSString *, id> *constants = _constantsToExport;
+  NSDictionary<NSString *, id> *constants = _constantsToExport;
   _constantsToExport = nil; // Not needed anymore
+  return constants;
+}
 
+// TODO 10487027: this method can go once RCTBatchedBridge is gone
+- (NSArray *)config
+{
+  NSDictionary<NSString *, id> *constants = [self exportedConstants];
   if (constants.count == 0 && self.methods.count == 0) {
     return (id)kCFNull; // Nothing to export
   }
 
   RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, ([NSString stringWithFormat:@"[RCTModuleData config] %@", _moduleClass]), nil);
-
   NSMutableArray<NSString *> *methods = self.methods.count ? [NSMutableArray new] : nil;
   NSMutableArray<NSNumber *> *promiseMethods = nil;
   NSMutableArray<NSNumber *> *syncMethods = nil;
diff --git a/React/CxxModule/RCTNativeModule.mm b/React/CxxModule/RCTNativeModule.mm
index a150bd42e24e3d..d74c58426a3207 100644
--- a/React/CxxModule/RCTNativeModule.mm
+++ b/React/CxxModule/RCTNativeModule.mm
@@ -42,23 +42,9 @@
 }
 
 folly::dynamic RCTNativeModule::getConstants() {
-  // TODO mhorowitz #10487027: This does unnecessary work since it
-  // only needs constants.  Think about refactoring RCTModuleData or
-  // NativeModule to make this more natural.
-
-  RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways,
-                          @"[RCTNativeModule getConstants] moduleData.config", nil);
-  NSArray *config = m_moduleData.config;
-  RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
-  if (!config || config == (id)kCFNull) {
-    return nullptr;
-  }
-  id constants = config[1];
-  if (![constants isKindOfClass:[NSDictionary class]]) {
-      return nullptr;
-  }
   RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways,
-                          @"[RCTNativeModule getConstants] convert", nil);
+    @"[RCTNativeModule getConstants] moduleData.exportedConstants", nil);
+  NSDictionary *constants = m_moduleData.exportedConstants;
   folly::dynamic ret = [RCTConvert folly_dynamic:constants];
   RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
   return ret;

From 8591d8ae717a692da8cd3ec678bd1f315a1030f4 Mon Sep 17 00:00:00 2001
From: Faraz Sherwani <faraz@ipsy.com>
Date: Sun, 9 Apr 2017 21:32:57 -0700
Subject: [PATCH 363/366] Webview disable save form prop

Summary:
Adds functionality to be able to disable saving of form data and thereby disabling autocomplete in webview on Android. Can be used as a workaround for #13241

Manual testing that autocomplete is disabled when the property is set to true, and still enabled when it is unset or set to false.
Closes https://github.com/facebook/react-native/pull/13271

Differential Revision: D4858899

Pulled By: ericvicenti

fbshipit-source-id: 62738b0685e4c1958c8a32e184fa2fe4f711b336
---
 Libraries/Components/WebView/WebView.android.js           | 8 ++++++++
 .../facebook/react/views/webview/ReactWebViewManager.java | 5 +++++
 2 files changed, 13 insertions(+)

diff --git a/Libraries/Components/WebView/WebView.android.js b/Libraries/Components/WebView/WebView.android.js
index 3bbb58ec5c43e0..2ded46b1b8e655 100644
--- a/Libraries/Components/WebView/WebView.android.js
+++ b/Libraries/Components/WebView/WebView.android.js
@@ -184,11 +184,18 @@ class WebView extends React.Component {
       'always',
       'compatibility'
     ]),
+
+    /**
+     * Used on Android only, controls whether form autocomplete data should be saved
+     * @platform android
+     */
+    saveFormDataDisabled: PropTypes.bool,
   };
 
   static defaultProps = {
     javaScriptEnabled : true,
     scalesPageToFit: true,
+    saveFormDataDisabled: false
   };
 
   state = {
@@ -261,6 +268,7 @@ class WebView extends React.Component {
         mediaPlaybackRequiresUserAction={this.props.mediaPlaybackRequiresUserAction}
         allowUniversalAccessFromFileURLs={this.props.allowUniversalAccessFromFileURLs}
         mixedContentMode={this.props.mixedContentMode}
+        saveFormDataDisabled={this.props.saveFormDataDisabled}
       />;
 
     return (
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/webview/ReactWebViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/webview/ReactWebViewManager.java
index ec3107f2039829..7e246a7ff68f47 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/webview/ReactWebViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/webview/ReactWebViewManager.java
@@ -397,6 +397,11 @@ public void setMediaPlaybackRequiresUserAction(WebView view, boolean requires) {
   public void setAllowUniversalAccessFromFileURLs(WebView view, boolean allow) {
     view.getSettings().setAllowUniversalAccessFromFileURLs(allow);
   }
+  
+  @ReactProp(name = "saveFormDataDisabled")
+  public void setSaveFormDataDisabled(WebView view, boolean disable) {
+    view.getSettings().setSaveFormData(!disable);
+  }
 
   @ReactProp(name = "injectedJavaScript")
   public void setInjectedJavaScript(WebView view, @Nullable String injectedJavaScript) {

From 62114bb6157a4444a87d57d0ec616b8a00208271 Mon Sep 17 00:00:00 2001
From: Hilke Heremans <hilke@thinman.be>
Date: Sat, 11 Mar 2017 08:52:57 +0100
Subject: [PATCH 364/366] Fix for IP detection on Macs with multiple interfaces
 and loopbacks configured

---
 packager/react-native-xcode.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packager/react-native-xcode.sh b/packager/react-native-xcode.sh
index 1a1c3660dd26b8..26bfed5b7bb871 100755
--- a/packager/react-native-xcode.sh
+++ b/packager/react-native-xcode.sh
@@ -78,7 +78,7 @@ if [[ "$CONFIGURATION" = "Debug" && ! "$PLATFORM_NAME" == *simulator ]]; then
   PLIST=$TARGET_BUILD_DIR/$INFOPLIST_PATH
   IP=$(ipconfig getifaddr en0)
   if [ -z "$IP" ]; then
-    IP=$(ifconfig | grep 'inet ' | grep -v 127.0.0.1 | cut -d\   -f2  | awk 'NR==1{print $1}')
+    IP=$(ifconfig | grep 'inet ' | grep -v 127.0.0.1 | grep -v 127.94.0 | cut -d\   -f2  | awk 'NR==1{print $1}')
   fi
 
   if [ -z ${DISABLE_XIP+x} ]; then

From 97cb709cf9672d5e5860d5871ce0cb7df7d59469 Mon Sep 17 00:00:00 2001
From: Hilke Heremans <hilke@thinman.be>
Date: Fri, 7 Apr 2017 18:46:43 +0200
Subject: [PATCH 365/366] Match all loopback addresses

Filters everything starting with `127.`
---
 packager/react-native-xcode.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packager/react-native-xcode.sh b/packager/react-native-xcode.sh
index 26bfed5b7bb871..22624507c11bbc 100755
--- a/packager/react-native-xcode.sh
+++ b/packager/react-native-xcode.sh
@@ -78,7 +78,7 @@ if [[ "$CONFIGURATION" = "Debug" && ! "$PLATFORM_NAME" == *simulator ]]; then
   PLIST=$TARGET_BUILD_DIR/$INFOPLIST_PATH
   IP=$(ipconfig getifaddr en0)
   if [ -z "$IP" ]; then
-    IP=$(ifconfig | grep 'inet ' | grep -v 127.0.0.1 | grep -v 127.94.0 | cut -d\   -f2  | awk 'NR==1{print $1}')
+    IP=$(ifconfig | grep 'inet ' | grep -v '^127' | cut -d\   -f2  | awk 'NR==1{print $1}')
   fi
 
   if [ -z ${DISABLE_XIP+x} ]; then

From 5c2c2b81aeaa8ca8e39ae332a7e00ee2b909d9a3 Mon Sep 17 00:00:00 2001
From: Hilke Heremans <hilke@thinman.be>
Date: Fri, 7 Apr 2017 18:51:21 +0200
Subject: [PATCH 366/366] Correct incorrect grep

---
 packager/react-native-xcode.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packager/react-native-xcode.sh b/packager/react-native-xcode.sh
index 22624507c11bbc..048ffb52a34013 100755
--- a/packager/react-native-xcode.sh
+++ b/packager/react-native-xcode.sh
@@ -78,7 +78,7 @@ if [[ "$CONFIGURATION" = "Debug" && ! "$PLATFORM_NAME" == *simulator ]]; then
   PLIST=$TARGET_BUILD_DIR/$INFOPLIST_PATH
   IP=$(ipconfig getifaddr en0)
   if [ -z "$IP" ]; then
-    IP=$(ifconfig | grep 'inet ' | grep -v '^127' | cut -d\   -f2  | awk 'NR==1{print $1}')
+    IP=$(ifconfig | grep 'inet ' | grep -v ' 127.' | cut -d\   -f2 | awk 'NR==1{print $1}')
   fi
 
   if [ -z ${DISABLE_XIP+x} ]; then