reactjs-rails 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c80158e264672a4be39cfed7ae0c6b067f04be3
-  data.tar.gz: e4438f67373f225d45e73bc30034a21be75320f6
+  metadata.gz: 4a5d7a6f3940f90478b3bd1df9759523bbcd0ea9
+  data.tar.gz: 28fcf2af3590903ec731a8e24bc24e785b359b1b
 SHA512:
-  metadata.gz: 2d45e42bb9b7acc887a0bcb2dcff01a4272201c91b4f2daf5a77c03f3f1c8ad76ee4b0ad4b98fa183bb51a2571a6e2f2f77a51f8cf00a71eb5537913970ef919
-  data.tar.gz: e7d94d1201cba25ca17f25ea85db7520cc3cac825dcbd57a379fcbfabafabd7961960c3aea130c544a34e1c50e22f3497086a9bc567a2ac9fcbe00e0e1a3be99
+  metadata.gz: 60de7daf3fa323ec895dc0d02a5930755f1a5df7d0a737b3a7c0feaefbb24eda2fd4cb31500c59daf2d8e736a12f05b9fa520771d4aacd4d25f83ecdf0d2cc7c
+  data.tar.gz: a1c0663566c39ac78cb1fff43ca338bd291b2c39107dba9ff355502aff1cb4c3e3dd1c7938a1ca63519e32a5693f3b33ea3e1dc19921bfb0fbe178237c1de3c9

data/README.md

@@ -14,7 +14,7 @@ And then execute:
 
 Or install it yourself as:
 
-  $ gem install reactjs-rails
+    $ gem install reactjs-rails
 
 
 # Usage
@@ -22,11 +22,6 @@ Or install it yourself as:
 Add the following to your `app/assets/javascripts/application.js`:
 
     //= require react
-
-or
-
-    //= require react.min
-
     //= require jsxtransformer
 
 ## Contributing

data/lib/reactjs-rails.rb

@@ -1,7 +1,7 @@
-require "reactjs-rails/version"
+require 'reactjs-rails/version'
 
 module Reactjs
   module Rails
-    require "reactjs-rails/engine"
+    require 'reactjs-rails/engine'
   end
 end

data/lib/reactjs-rails/version.rb

@@ -1,5 +1,5 @@
 module Reactjs
   module Rails
-    VERSION = "0.4.0"
+    VERSION = '0.4.1'
   end
 end

data/vendor/assets/javascripts/jsxtransformer.js

@@ -1,5 +1,5 @@
 /**
- * JSXTransformer v0.4.0
+ * JSXTransformer v0.4.1
  */
 (function(e){if("function"==typeof bootstrap)bootstrap("jsxtransformer",e);else if("object"==typeof exports)module.exports=e();else if("function"==typeof define&&define.amd)define(e);else if("undefined"!=typeof ses){if(!ses.ok())return;ses.makeJSXTransformer=e}else"undefined"!=typeof window?window.JSXTransformer=e():global.JSXTransformer=e()})(function(){var define,ses,bootstrap,module,exports;
 return (function(e,t,n){function i(n,s){if(!t[n]){if(!e[n]){var o=typeof require=="function"&&require;if(!s&&o)return o(n,!0);if(r)return r(n,!0);throw new Error("Cannot find module '"+n+"'")}var u=t[n]={exports:{}};e[n][0].call(u.exports,function(t){var r=e[n][1][t];return i(r?r:t)},u,u.exports)}return t[n].exports}var r=typeof require=="function"&&require;for(var s=0;s<n.length;s++)i(n[s]);return i})({1:[function(require,module,exports){
@@ -6886,7 +6886,7 @@ define(function (require, exports, module) {
     var sourceRoot = util.getArg(sourceMap, 'sourceRoot', null);
     var sourcesContent = util.getArg(sourceMap, 'sourcesContent', null);
     var mappings = util.getArg(sourceMap, 'mappings');
-    var file = util.getArg(sourceMap, 'file');
+    var file = util.getArg(sourceMap, 'file', null);
 
     if (version !== this._version) {
       throw new Error('Unsupported version: ' + version);
@@ -8450,13 +8450,13 @@ module.exports = amdefine;
 
 'use strict';
 var runScripts;
+var headEl;
 
 var transform = require('./fbtransform/lib/transform').transform;
 var visitors = require('./fbtransform/visitors').transformVisitors;
 var transform = transform.bind(null, visitors.react);
 var docblock = require('./fbtransform/lib/docblock');
 
-var headEl = document.getElementsByTagName('head')[0];
 
 exports.transform = transform;
 
@@ -8464,6 +8464,11 @@ exports.exec = function(code) {
   return eval(transform(code));
 };
 
+if (typeof window === "undefined" || window === null) {
+  return;
+}
+headEl = document.getElementsByTagName('head')[0];
+
 var run = exports.run = function(code) {
   var jsx = docblock.parseAsObject(docblock.extract(code)).jsx;
 
@@ -8474,10 +8479,6 @@ var run = exports.run = function(code) {
   headEl.appendChild(scriptEl);
 };
 
-if (typeof window === "undefined" || window === null) {
-  return;
-}
-
 var load = exports.load = function(url, callback) {
   var xhr;
   xhr = window.ActiveXObject ? new window.ActiveXObject('Microsoft.XMLHTTP')

data/vendor/assets/javascripts/react.js

@@ -1,5 +1,5 @@
 /**
- * React v0.4.0
+ * React v0.4.1
  */
 (function(e){if("function"==typeof bootstrap)bootstrap("react",e);else if("object"==typeof exports)module.exports=e();else if("function"==typeof define&&define.amd)define(e);else if("undefined"!=typeof ses){if(!ses.ok())return;ses.makeReact=e}else"undefined"!=typeof window?window.React=e():global.React=e()})(function(){var define,ses,bootstrap,module,exports;
 return (function(e,t,n){function i(n,s){if(!t[n]){if(!e[n]){var o=typeof require=="function"&&require;if(!s&&o)return o(n,!0);if(r)return r(n,!0);throw new Error("Cannot find module '"+n+"'")}var u=t[n]={exports:{}};e[n][0].call(u.exports,function(t){var r=e[n][1][t];return i(r?r:t)},u,u.exports)}return t[n].exports}var r=typeof require=="function"&&require;for(var s=0;s<n.length;s++)i(n[s]);return i})({1:[function(require,module,exports){
@@ -50,7 +50,7 @@ function $(id) {
 
 module.exports = $;
 
-},{"./ex":66,"./ge":69}],2:[function(require,module,exports){
+},{"./ex":68,"./ge":71}],2:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -240,7 +240,7 @@ var CSSPropertyOperations = {
 
 module.exports = CSSPropertyOperations;
 
-},{"./CSSProperty":2,"./dangerousStyleValue":63,"./escapeTextForBrowser":65,"./hyphenate":73,"./memoizeStringOnly":80}],4:[function(require,module,exports){
+},{"./CSSProperty":2,"./dangerousStyleValue":65,"./escapeTextForBrowser":67,"./hyphenate":76,"./memoizeStringOnly":83}],4:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -730,7 +730,7 @@ var ChangeEventPlugin = {
 module.exports = ChangeEventPlugin;
 
 })()
-},{"./EventConstants":13,"./EventPluginHub":15,"./EventPropagators":18,"./ExecutionEnvironment":19,"./SyntheticEvent":50,"./isEventSupported":76,"./keyOf":79}],6:[function(require,module,exports){
+},{"./EventConstants":13,"./EventPluginHub":15,"./EventPropagators":18,"./ExecutionEnvironment":19,"./SyntheticEvent":51,"./isEventSupported":79,"./keyOf":82}],6:[function(require,module,exports){
 (function(){/**
  * Copyright 2013 Facebook, Inc.
  *
@@ -877,7 +877,7 @@ var DOMChildrenOperations = {
 module.exports = DOMChildrenOperations;
 
 })()
-},{"./Danger":9,"./insertNodeAt":74,"./keyOf":79,"./throwIf":86}],7:[function(require,module,exports){
+},{"./Danger":9,"./insertNodeAt":77,"./keyOf":82,"./throwIf":89}],7:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -1112,7 +1112,7 @@ var DOMProperty = {
 
 module.exports = DOMProperty;
 
-},{"./invariant":75}],8:[function(require,module,exports){
+},{"./invariant":78}],8:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -1232,7 +1232,7 @@ var DOMPropertyOperations = {
 
 module.exports = DOMPropertyOperations;
 
-},{"./DOMProperty":7,"./escapeTextForBrowser":65,"./memoizeStringOnly":80}],9:[function(require,module,exports){
+},{"./DOMProperty":7,"./escapeTextForBrowser":67,"./memoizeStringOnly":83}],9:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -1464,7 +1464,7 @@ var Danger = {
 
 module.exports = Danger;
 
-},{"./ExecutionEnvironment":19,"./throwIf":86}],10:[function(require,module,exports){
+},{"./ExecutionEnvironment":19,"./throwIf":89}],10:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -1505,6 +1505,7 @@ var DefaultDOMPropertyConfig = {
     action: null,
     ajaxify: MUST_USE_ATTRIBUTE,
     allowFullScreen: MUST_USE_ATTRIBUTE | HAS_BOOLEAN_VALUE,
+    allowTransparency: MUST_USE_ATTRIBUTE,
     alt: null,
     autoComplete: null,
     autoFocus: HAS_BOOLEAN_VALUE,
@@ -1523,6 +1524,7 @@ var DefaultDOMPropertyConfig = {
     disabled: MUST_USE_PROPERTY | HAS_BOOLEAN_VALUE,
     draggable: null,
     encType: null,
+    frameBorder: MUST_USE_ATTRIBUTE,
     height: MUST_USE_ATTRIBUTE,
     hidden: MUST_USE_ATTRIBUTE | HAS_BOOLEAN_VALUE,
     href: null,
@@ -1661,12 +1663,13 @@ var DefaultEventPluginOrder = [
   keyOf({TapEventPlugin: null}),
   keyOf({EnterLeaveEventPlugin: null}),
   keyOf({ChangeEventPlugin: null}),
-  keyOf({AnalyticsEventPlugin: null})
+  keyOf({AnalyticsEventPlugin: null}),
+  keyOf({MobileSafariClickEventPlugin: null})
 ];
 
 module.exports = DefaultEventPluginOrder;
 
-},{"./keyOf":79}],12:[function(require,module,exports){
+},{"./keyOf":82}],12:[function(require,module,exports){
 (function(){/**
  * Copyright 2013 Facebook, Inc.
  *
@@ -1691,14 +1694,13 @@ module.exports = DefaultEventPluginOrder;
 var EventConstants = require("./EventConstants");
 var EventPropagators = require("./EventPropagators");
 var ExecutionEnvironment = require("./ExecutionEnvironment");
-var ReactInstanceHandles = require("./ReactInstanceHandles");
 var SyntheticMouseEvent = require("./SyntheticMouseEvent");
 
-var ReactID = require("./ReactID");
+var ReactMount = require("./ReactMount");
 var keyOf = require("./keyOf");
 
 var topLevelTypes = EventConstants.topLevelTypes;
-var getFirstReactDOM = ReactInstanceHandles.getFirstReactDOM;
+var getFirstReactDOM = ReactMount.getFirstReactDOM;
 
 var eventTypes = {
   mouseEnter: {registrationName: keyOf({onMouseEnter: null})},
@@ -1754,8 +1756,8 @@ var EnterLeaveEventPlugin = {
       return null;
     }
 
-    var fromID = from ? ReactID.getID(from) : '';
-    var toID = to ? ReactID.getID(to) : '';
+    var fromID = from ? ReactMount.getID(from) : '';
+    var toID = to ? ReactMount.getID(to) : '';
 
     var leave = SyntheticMouseEvent.getPooled(
       eventTypes.mouseLeave,
@@ -1777,7 +1779,7 @@ var EnterLeaveEventPlugin = {
 module.exports = EnterLeaveEventPlugin;
 
 })()
-},{"./EventConstants":13,"./EventPropagators":18,"./ExecutionEnvironment":19,"./ReactID":35,"./ReactInstanceHandles":37,"./SyntheticMouseEvent":53,"./keyOf":79}],13:[function(require,module,exports){
+},{"./EventConstants":13,"./EventPropagators":18,"./ExecutionEnvironment":19,"./ReactMount":39,"./SyntheticMouseEvent":54,"./keyOf":82}],13:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -1846,7 +1848,7 @@ var EventConstants = {
 
 module.exports = EventConstants;
 
-},{"./keyMirror":78}],14:[function(require,module,exports){
+},{"./keyMirror":81}],14:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -2101,7 +2103,7 @@ if (ExecutionEnvironment.canUseDOM) {
 
 module.exports = EventPluginHub;
 
-},{"./CallbackRegistry":4,"./EventPluginRegistry":16,"./EventPluginUtils":17,"./EventPropagators":18,"./ExecutionEnvironment":19,"./accumulate":60,"./forEachAccumulated":68,"./invariant":75}],16:[function(require,module,exports){
+},{"./CallbackRegistry":4,"./EventPluginRegistry":16,"./EventPluginUtils":17,"./EventPropagators":18,"./ExecutionEnvironment":19,"./accumulate":61,"./forEachAccumulated":70,"./invariant":78}],16:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -2347,7 +2349,7 @@ var EventPluginRegistry = {
 
 module.exports = EventPluginRegistry;
 
-},{"./invariant":75}],17:[function(require,module,exports){
+},{"./invariant":78}],17:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -2534,7 +2536,7 @@ var EventPluginUtils = {
 
 module.exports = EventPluginUtils;
 
-},{"./EventConstants":13,"./invariant":75}],18:[function(require,module,exports){
+},{"./EventConstants":13,"./invariant":78}],18:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -2715,7 +2717,7 @@ var EventPropagators = {
 
 module.exports = EventPropagators;
 
-},{"./CallbackRegistry":4,"./EventConstants":13,"./accumulate":60,"./forEachAccumulated":68}],19:[function(require,module,exports){
+},{"./CallbackRegistry":4,"./EventConstants":13,"./accumulate":61,"./forEachAccumulated":70}],19:[function(require,module,exports){
 (function(){/**
  * Copyright 2013 Facebook, Inc.
  *
@@ -2762,6 +2764,71 @@ module.exports = ExecutionEnvironment;
 
 })()
 },{}],20:[function(require,module,exports){
+/**
+ * Copyright 2013 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @providesModule MobileSafariClickEventPlugin
+ * @typechecks static-only
+ */
+
+"use strict";
+
+var EventConstants = require("./EventConstants");
+
+var emptyFunction = require("./emptyFunction");
+
+var topLevelTypes = EventConstants.topLevelTypes;
+
+/**
+ * Mobile Safari does not fire properly bubble click events on non-interactive
+ * elements, which means delegated click listeners do not fire. The workaround
+ * for this bug involves attaching an empty click listener on the target node.
+ *
+ * This particular plugin works around the bug by attaching an empty click
+ * listener on `touchstart` (which does fire on every element).
+ */
+var MobileSafariClickEventPlugin = {
+
+  eventTypes: null,
+
+  /**
+   * @param {string} topLevelType Record from `EventConstants`.
+   * @param {DOMEventTarget} topLevelTarget The listening component root node.
+   * @param {string} topLevelTargetID ID of `topLevelTarget`.
+   * @param {object} nativeEvent Native browser event.
+   * @return {*} An accumulation of synthetic events.
+   * @see {EventPluginHub.extractEvents}
+   */
+  extractEvents: function(
+      topLevelType,
+      topLevelTarget,
+      topLevelTargetID,
+      nativeEvent) {
+    if (topLevelType === topLevelTypes.topTouchStart) {
+      var target = nativeEvent.target;
+      if (target && !target.onclick) {
+        target.onclick = emptyFunction;
+      }
+    }
+  }
+
+};
+
+module.exports = MobileSafariClickEventPlugin;
+
+},{"./EventConstants":13,"./emptyFunction":66}],21:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -2876,7 +2943,7 @@ var PooledClass = {
 
 module.exports = PooledClass;
 
-},{}],21:[function(require,module,exports){
+},{}],22:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -2926,7 +2993,7 @@ var React = {
 
 module.exports = React;
 
-},{"./ReactComponent":22,"./ReactCompositeComponent":23,"./ReactDOM":25,"./ReactDefaultInjection":32,"./ReactMount":38,"./ReactPropTypes":44,"./ReactServerRendering":46}],22:[function(require,module,exports){
+},{"./ReactComponent":23,"./ReactCompositeComponent":24,"./ReactDOM":26,"./ReactDefaultInjection":33,"./ReactMount":39,"./ReactPropTypes":45,"./ReactServerRendering":47}],23:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -2949,9 +3016,10 @@ module.exports = React;
 
 "use strict";
 
+var getReactRootElementInContainer = require("./getReactRootElementInContainer");
 var ReactCurrentOwner = require("./ReactCurrentOwner");
 var ReactDOMIDOperations = require("./ReactDOMIDOperations");
-var ReactID = require("./ReactID");
+var ReactMarkupChecksum = require("./ReactMarkupChecksum");
 var ReactMount = require("./ReactMount");
 var ReactOwner = require("./ReactOwner");
 var ReactReconcileTransaction = require("./ReactReconcileTransaction");
@@ -3184,7 +3252,7 @@ var ReactComponent = {
         this.isMounted(),
         'getDOMNode(): A component must be mounted to have a DOM node.'
       );
-      return ReactID.getNode(this._rootNodeID);
+      return ReactMount.getNode(this._rootNodeID);
     },
 
     /**
@@ -3310,7 +3378,7 @@ var ReactComponent = {
       if (props.ref != null) {
         ReactOwner.removeComponentAsRefFrom(this, props.ref, props[OWNER]);
       }
-      ReactID.purgeID(this._rootNodeID);
+      ReactMount.purgeID(this._rootNodeID);
       this._rootNodeID = null;
       this._lifeCycleState = ComponentLifeCycle.UNMOUNTED;
     },
@@ -3427,15 +3495,28 @@ var ReactComponent = {
         container && container.nodeType === 1,
         'mountComponentIntoNode(...): Target container is not a DOM element.'
       );
-      var renderStart = Date.now();
       var markup = this.mountComponent(rootID, transaction);
-      ReactMount.totalInstantiationTime += (Date.now() - renderStart);
 
       if (shouldReuseMarkup) {
-        return;
+        if (ReactMarkupChecksum.canReuseMarkup(
+              markup,
+              getReactRootElementInContainer(container))) {
+          return;
+        } else {
+          if (true) {
+            console.warn(
+              'React attempted to use reuse markup in a container but the ' +
+              'checksum was invalid. This generally means that you are using ' +
+              'server rendering and the markup generated on the server was ' +
+              'not what the client was expecting. React injected new markup ' +
+              'to compensate which works but you have lost many of the ' +
+              'benefits of server rendering. Instead, figure out why the ' +
+              'markup being generated is different on the client or server.'
+            );
+          }
+        }
       }
 
-      var injectionStart = Date.now();
       // Asynchronously inject markup by ensuring that the container is not in
       // the document when settings its `innerHTML`.
       var parent = container.parentNode;
@@ -3451,7 +3532,6 @@ var ReactComponent = {
       } else {
         container.innerHTML = markup;
       }
-      ReactMount.totalInjectionTime += (Date.now() - injectionStart);
     },
 
     /**
@@ -3504,7 +3584,7 @@ var ReactComponent = {
 
 module.exports = ReactComponent;
 
-},{"./ReactCurrentOwner":24,"./ReactDOMIDOperations":27,"./ReactID":35,"./ReactMount":38,"./ReactOwner":42,"./ReactReconcileTransaction":45,"./ReactUpdates":48,"./invariant":75,"./keyMirror":78,"./merge":81}],23:[function(require,module,exports){
+},{"./ReactCurrentOwner":25,"./ReactDOMIDOperations":28,"./ReactMarkupChecksum":38,"./ReactMount":39,"./ReactOwner":43,"./ReactReconcileTransaction":46,"./ReactUpdates":49,"./getReactRootElementInContainer":73,"./invariant":78,"./keyMirror":81,"./merge":84}],24:[function(require,module,exports){
 (function(){/**
  * Copyright 2013 Facebook, Inc.
  *
@@ -4422,7 +4502,7 @@ var ReactCompositeComponent = {
 module.exports = ReactCompositeComponent;
 
 })()
-},{"./ReactComponent":22,"./ReactCurrentOwner":24,"./ReactOwner":42,"./ReactPropTransferer":43,"./ReactUpdates":48,"./invariant":75,"./keyMirror":78,"./merge":81,"./mixInto":84}],24:[function(require,module,exports){
+},{"./ReactComponent":23,"./ReactCurrentOwner":25,"./ReactOwner":43,"./ReactPropTransferer":44,"./ReactUpdates":49,"./invariant":78,"./keyMirror":81,"./merge":84,"./mixInto":87}],25:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -4463,7 +4543,7 @@ var ReactCurrentOwner = {
 
 module.exports = ReactCurrentOwner;
 
-},{}],25:[function(require,module,exports){
+},{}],26:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -4658,7 +4738,7 @@ ReactDOM.injection = injection;
 
 module.exports = ReactDOM;
 
-},{"./ReactNativeComponent":40,"./mergeInto":83,"./objMapKeyVal":85}],26:[function(require,module,exports){
+},{"./ReactNativeComponent":41,"./mergeInto":86,"./objMapKeyVal":88}],27:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -4712,7 +4792,7 @@ var ReactDOMForm = ReactCompositeComponent.createClass({
 
 module.exports = ReactDOMForm;
 
-},{"./EventConstants":13,"./ReactCompositeComponent":23,"./ReactDOM":25,"./ReactEventEmitter":33}],27:[function(require,module,exports){
+},{"./EventConstants":13,"./ReactCompositeComponent":24,"./ReactDOM":26,"./ReactEventEmitter":34}],28:[function(require,module,exports){
 (function(){/**
  * Copyright 2013 Facebook, Inc.
  *
@@ -4739,7 +4819,7 @@ module.exports = ReactDOMForm;
 var CSSPropertyOperations = require("./CSSPropertyOperations");
 var DOMChildrenOperations = require("./DOMChildrenOperations");
 var DOMPropertyOperations = require("./DOMPropertyOperations");
-var ReactID = require("./ReactID");
+var ReactMount = require("./ReactMount");
 
 var getTextContentAccessor = require("./getTextContentAccessor");
 var invariant = require("./invariant");
@@ -4780,13 +4860,21 @@ var ReactDOMIDOperations = {
    * @internal
    */
   updatePropertyByID: function(id, name, value) {
-    var node = ReactID.getNode(id);
+    var node = ReactMount.getNode(id);
     invariant(
       !INVALID_PROPERTY_ERRORS.hasOwnProperty(name),
       'updatePropertyByID(...): %s',
       INVALID_PROPERTY_ERRORS[name]
     );
-    DOMPropertyOperations.setValueForProperty(node, name, value);
+
+    // If we're updating to null or undefined, we should remove the property
+    // from the DOM node instead of inadvertantly setting to a string. This
+    // brings us in line with the same behavior we have on initial render.
+    if (value != null) {
+      DOMPropertyOperations.setValueForProperty(node, name, value);
+    } else {
+      DOMPropertyOperations.deleteValueForProperty(node, name);
+    }
   },
 
   /**
@@ -4798,7 +4886,7 @@ var ReactDOMIDOperations = {
    * @internal
    */
   deletePropertyByID: function(id, name, value) {
-    var node = ReactID.getNode(id);
+    var node = ReactMount.getNode(id);
     invariant(
       !INVALID_PROPERTY_ERRORS.hasOwnProperty(name),
       'updatePropertyByID(...): %s',
@@ -4835,7 +4923,7 @@ var ReactDOMIDOperations = {
    * @internal
    */
   updateStylesByID: function(id, styles) {
-    var node = ReactID.getNode(id);
+    var node = ReactMount.getNode(id);
     CSSPropertyOperations.setValueForStyles(node, styles);
   },
 
@@ -4847,7 +4935,7 @@ var ReactDOMIDOperations = {
    * @internal
    */
   updateInnerHTMLByID: function(id, html) {
-    var node = ReactID.getNode(id);
+    var node = ReactMount.getNode(id);
     // HACK: IE8- normalize whitespace in innerHTML, removing leading spaces.
     // @see quirksmode.org/bugreports/archives/2004/11/innerhtml_and_t.html
     node.innerHTML = (html && html.__html || '').replace(/^ /g, '&nbsp;');
@@ -4861,7 +4949,7 @@ var ReactDOMIDOperations = {
    * @internal
    */
   updateTextContentByID: function(id, content) {
-    var node = ReactID.getNode(id);
+    var node = ReactMount.getNode(id);
     node[textContentAccessor] = content;
   },
 
@@ -4874,7 +4962,7 @@ var ReactDOMIDOperations = {
    * @see {Danger.dangerouslyReplaceNodeWithMarkup}
    */
   dangerouslyReplaceNodeWithMarkupByID: function(id, markup) {
-    var node = ReactID.getNode(id);
+    var node = ReactMount.getNode(id);
     DOMChildrenOperations.dangerouslyReplaceNodeWithMarkup(node, markup);
   },
 
@@ -4883,7 +4971,7 @@ var ReactDOMIDOperations = {
    *       Detect if any elements were removed instead of blindly purging.
    */
   manageChildrenByParentID: function(parentID, domOperations) {
-    var parent = ReactID.getNode(parentID);
+    var parent = ReactMount.getNode(parentID);
     DOMChildrenOperations.manageChildren(parent, domOperations);
   }
 
@@ -4892,7 +4980,7 @@ var ReactDOMIDOperations = {
 module.exports = ReactDOMIDOperations;
 
 })()
-},{"./CSSPropertyOperations":3,"./DOMChildrenOperations":6,"./DOMPropertyOperations":8,"./ReactID":35,"./getTextContentAccessor":71,"./invariant":75}],28:[function(require,module,exports){
+},{"./CSSPropertyOperations":3,"./DOMChildrenOperations":6,"./DOMPropertyOperations":8,"./ReactMount":39,"./getTextContentAccessor":74,"./invariant":78}],29:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -5009,7 +5097,7 @@ var ReactDOMInput = ReactCompositeComponent.createClass({
 
 module.exports = ReactDOMInput;
 
-},{"./DOMPropertyOperations":8,"./ReactCompositeComponent":23,"./ReactDOM":25,"./merge":81}],29:[function(require,module,exports){
+},{"./DOMPropertyOperations":8,"./ReactCompositeComponent":24,"./ReactDOM":26,"./merge":84}],30:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -5061,7 +5149,7 @@ var ReactDOMOption = ReactCompositeComponent.createClass({
 
 module.exports = ReactDOMOption;
 
-},{"./ReactCompositeComponent":23,"./ReactDOM":25}],30:[function(require,module,exports){
+},{"./ReactCompositeComponent":24,"./ReactDOM":26}],31:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -5221,7 +5309,7 @@ var ReactDOMSelect = ReactCompositeComponent.createClass({
 
 module.exports = ReactDOMSelect;
 
-},{"./ReactCompositeComponent":23,"./ReactDOM":25,"./invariant":75,"./merge":81}],31:[function(require,module,exports){
+},{"./ReactCompositeComponent":24,"./ReactDOM":26,"./invariant":78,"./merge":84}],32:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -5361,7 +5449,7 @@ var ReactDOMTextarea = ReactCompositeComponent.createClass({
 
 module.exports = ReactDOMTextarea;
 
-},{"./DOMPropertyOperations":8,"./ReactCompositeComponent":23,"./ReactDOM":25,"./invariant":75,"./merge":81}],32:[function(require,module,exports){
+},{"./DOMPropertyOperations":8,"./ReactCompositeComponent":24,"./ReactDOM":26,"./invariant":78,"./merge":84}],33:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -5388,6 +5476,8 @@ var ReactDOMInput = require("./ReactDOMInput");
 var ReactDOMOption = require("./ReactDOMOption");
 var ReactDOMSelect = require("./ReactDOMSelect");
 var ReactDOMTextarea = require("./ReactDOMTextarea");
+var ReactEventEmitter = require("./ReactEventEmitter");
+var ReactEventTopLevelCallback = require("./ReactEventTopLevelCallback");
 
 var DefaultDOMPropertyConfig = require("./DefaultDOMPropertyConfig");
 var DOMProperty = require("./DOMProperty");
@@ -5398,8 +5488,10 @@ var ChangeEventPlugin = require("./ChangeEventPlugin");
 var EventPluginHub = require("./EventPluginHub");
 var ReactInstanceHandles = require("./ReactInstanceHandles");
 var SimpleEventPlugin = require("./SimpleEventPlugin");
+var MobileSafariClickEventPlugin = require("./MobileSafariClickEventPlugin");
 
 function inject() {
+  ReactEventEmitter.TopLevelCallbackCreator = ReactEventTopLevelCallback;
   /**
    * Inject module for resolving DOM hierarchy and plugin ordering.
    */
@@ -5413,7 +5505,8 @@ function inject() {
   EventPluginHub.injection.injectEventPluginsByName({
     'SimpleEventPlugin': SimpleEventPlugin,
     'EnterLeaveEventPlugin': EnterLeaveEventPlugin,
-    'ChangeEventPlugin': ChangeEventPlugin
+    'ChangeEventPlugin': ChangeEventPlugin,
+    'MobileSafariClickEventPlugin': MobileSafariClickEventPlugin
   });
 
   ReactDOM.injection.injectComponentClasses({
@@ -5431,7 +5524,7 @@ module.exports = {
   inject: inject
 };
 
-},{"./ChangeEventPlugin":5,"./DOMProperty":7,"./DefaultDOMPropertyConfig":10,"./DefaultEventPluginOrder":11,"./EnterLeaveEventPlugin":12,"./EventPluginHub":15,"./ReactDOM":25,"./ReactDOMForm":26,"./ReactDOMInput":28,"./ReactDOMOption":29,"./ReactDOMSelect":30,"./ReactDOMTextarea":31,"./ReactInstanceHandles":37,"./SimpleEventPlugin":49}],33:[function(require,module,exports){
+},{"./ChangeEventPlugin":5,"./DOMProperty":7,"./DefaultDOMPropertyConfig":10,"./DefaultEventPluginOrder":11,"./EnterLeaveEventPlugin":12,"./EventPluginHub":15,"./MobileSafariClickEventPlugin":20,"./ReactDOM":26,"./ReactDOMForm":27,"./ReactDOMInput":29,"./ReactDOMOption":30,"./ReactDOMSelect":31,"./ReactDOMTextarea":32,"./ReactEventEmitter":34,"./ReactEventTopLevelCallback":35,"./ReactInstanceHandles":37,"./SimpleEventPlugin":50}],34:[function(require,module,exports){
 (function(){/**
  * Copyright 2013 Facebook, Inc.
  *
@@ -5678,7 +5771,7 @@ var ReactEventEmitter = {
 
   /**
    * React references `ReactEventTopLevelCallback` using this property in order
-   * to allow dependency injection via `ensureListening`.
+   * to allow dependency injection.
    */
   TopLevelCallbackCreator: null,
 
@@ -5691,17 +5784,20 @@ var ReactEventEmitter = {
    * reason, and only in some cases).
    *
    * @param {boolean} touchNotMouse Listen to touch events instead of mouse.
-   * @param {object} TopLevelCallbackCreator
    */
-  ensureListening: function(touchNotMouse, TopLevelCallbackCreator) {
+  ensureListening: function(touchNotMouse) {
     invariant(
       ExecutionEnvironment.canUseDOM,
       'ensureListening(...): Cannot toggle event listening in a Worker ' +
       'thread. This is likely a bug in the framework. Please report ' +
       'immediately.'
     );
+    invariant(
+      ReactEventEmitter.TopLevelCallbackCreator,
+      'ensureListening(...): Cannot be called without a top level callback ' +
+      'creator being injected.'
+    );
     if (!_isListening) {
-      ReactEventEmitter.TopLevelCallbackCreator = TopLevelCallbackCreator;
       listenAtTopLevel(touchNotMouse);
       _isListening = true;
     }
@@ -5780,7 +5876,7 @@ var ReactEventEmitter = {
 module.exports = ReactEventEmitter;
 
 })()
-},{"./EventConstants":13,"./EventListener":14,"./EventPluginHub":15,"./ExecutionEnvironment":19,"./ReactUpdates":48,"./ViewportMetrics":59,"./invariant":75,"./isEventSupported":76}],34:[function(require,module,exports){
+},{"./EventConstants":13,"./EventListener":14,"./EventPluginHub":15,"./ExecutionEnvironment":19,"./ReactUpdates":49,"./ViewportMetrics":60,"./invariant":78,"./isEventSupported":79}],35:[function(require,module,exports){
 (function(){/**
  * Copyright 2013 Facebook, Inc.
  *
@@ -5804,8 +5900,7 @@ module.exports = ReactEventEmitter;
 
 var ExecutionEnvironment = require("./ExecutionEnvironment");
 var ReactEventEmitter = require("./ReactEventEmitter");
-var ReactID = require("./ReactID");
-var ReactInstanceHandles = require("./ReactInstanceHandles");
+var ReactMount = require("./ReactMount");
 
 var getEventTarget = require("./getEventTarget");
 
@@ -5817,7 +5912,7 @@ var _topLevelListenersEnabled = true;
 
 /**
  * Top-level callback creator used to implement event handling using delegation.
- * This is used via dependency injection in `ReactEventEmitter.ensureListening`.
+ * This is used via dependency injection.
  */
 var ReactEventTopLevelCallback = {
 
@@ -5856,10 +5951,10 @@ var ReactEventTopLevelCallback = {
           nativeEvent.srcElement !== nativeEvent.target) {
         nativeEvent.target = nativeEvent.srcElement;
       }
-      var topLevelTarget = ReactInstanceHandles.getFirstReactDOM(
+      var topLevelTarget = ReactMount.getFirstReactDOM(
         getEventTarget(nativeEvent)
       ) || ExecutionEnvironment.global;
-      var topLevelTargetID = ReactID.getID(topLevelTarget) || '';
+      var topLevelTargetID = ReactMount.getID(topLevelTarget) || '';
       ReactEventEmitter.handleTopLevel(
         topLevelType,
         topLevelTarget,
@@ -5874,175 +5969,7 @@ var ReactEventTopLevelCallback = {
 module.exports = ReactEventTopLevelCallback;
 
 })()
-},{"./ExecutionEnvironment":19,"./ReactEventEmitter":33,"./ReactID":35,"./ReactInstanceHandles":37,"./getEventTarget":70}],35:[function(require,module,exports){
-/**
- * Copyright 2013 Facebook, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * @providesModule ReactID
- * @typechecks static-only
- */
-
-"use strict";
-
-var invariant = require("./invariant");
-var ReactMount = require("./ReactMount");
-var ATTR_NAME = 'data-reactid';
-var nodeCache = {};
-
-/**
- * Accessing node[ATTR_NAME] or calling getAttribute(ATTR_NAME) on a form
- * element can return its control whose name or ID equals ATTR_NAME. All
- * DOM nodes support `getAttributeNode` but this can also get called on
- * other objects so just return '' if we're given something other than a
- * DOM node (such as window).
- *
- * @param {?DOMElement|DOMWindow|DOMDocument|DOMTextNode} node DOM node.
- * @return {string} ID of the supplied `domNode`.
- */
-function getID(node) {
-  var id = internalGetID(node);
-  if (id) {
-    if (nodeCache.hasOwnProperty(id)) {
-      var cached = nodeCache[id];
-      if (cached !== node) {
-        invariant(
-          !isValid(cached, id),
-          'ReactID: Two valid but unequal nodes with the same `%s`: %s',
-          ATTR_NAME, id
-        );
-
-        nodeCache[id] = node;
-      }
-    } else {
-      nodeCache[id] = node;
-    }
-  }
-
-  return id;
-}
-
-function internalGetID(node) {
-  if (node && node.getAttributeNode) {
-    var attributeNode = node.getAttributeNode(ATTR_NAME);
-    if (attributeNode) {
-      return attributeNode.value || '';
-    }
-  }
-  return '';
-}
-
-/**
- * Sets the React-specific ID of the given node.
- *
- * @param {DOMElement} node The DOM node whose ID will be set.
- * @param {string} id The value of the ID attribute.
- */
-function setID(node, id) {
-  var oldID = internalGetID(node);
-  if (oldID !== id) {
-    delete nodeCache[oldID];
-  }
-  node.setAttribute(ATTR_NAME, id);
-  nodeCache[id] = node;
-}
-
-/**
- * Finds the node with the supplied React-generated DOM ID.
- *
- * @param {string} id A React-generated DOM ID.
- * @return {DOMElement} DOM node with the suppled `id`.
- * @internal
- */
-function getNode(id) {
-  if (!nodeCache.hasOwnProperty(id) || !isValid(nodeCache[id], id)) {
-    nodeCache[id] = ReactMount.findReactNodeByID(id);
-  }
-  return nodeCache[id];
-}
-
-/**
- * A node is "valid" if it is contained by a currently mounted container.
- *
- * This means that the node does not have to be contained by a document in
- * order to be considered valid.
- *
- * @param {?DOMElement} node The candidate DOM node.
- * @param {string} id The expected ID of the node.
- * @return {boolean} Whether the node is contained by a mounted container.
- */
-function isValid(node, id) {
-  if (node) {
-    invariant(
-      internalGetID(node) === id,
-      'ReactID: Unexpected modification of `%s`',
-      ATTR_NAME
-    );
-
-    var container = ReactMount.findReactContainerForID(id);
-    if (container && contains(container, node)) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-function contains(ancestor, descendant) {
-  if (ancestor.contains) {
-    // Supported natively in virtually all browsers, but not in jsdom.
-    return ancestor.contains(descendant);
-  }
-
-  if (descendant === ancestor) {
-    return true;
-  }
-
-  if (descendant.nodeType === 3) {
-    // If descendant is a text node, start from descendant.parentNode
-    // instead, so that we can assume all ancestors worth considering are
-    // element nodes with nodeType === 1.
-    descendant = descendant.parentNode;
-  }
-
-  while (descendant && descendant.nodeType === 1) {
-    if (descendant === ancestor) {
-      return true;
-    }
-    descendant = descendant.parentNode;
-  }
-
-  return false;
-}
-
-/**
- * Causes the cache to forget about one React-specific ID.
- *
- * @param {string} id The ID to forget.
- */
-function purgeID(id) {
-  delete nodeCache[id];
-}
-
-exports.ATTR_NAME = ATTR_NAME;
-exports.getID = getID;
-exports.rawGetID = internalGetID;
-exports.setID = setID;
-exports.getNode = getNode;
-exports.purgeID = purgeID;
-
-},{"./ReactMount":38,"./invariant":75}],36:[function(require,module,exports){
+},{"./ExecutionEnvironment":19,"./ReactEventEmitter":34,"./ReactMount":39,"./getEventTarget":72}],36:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -6250,8 +6177,6 @@ module.exports = ReactInputSelection;
 
 "use strict";
 
-var ReactID = require("./ReactID");
-
 var invariant = require("./invariant");
 
 var SEPARATOR = '.';
@@ -6471,127 +6396,30 @@ var ReactInstanceHandles = {
   },
 
   /**
-   * True if the supplied `node` is rendered by React.
+   * Gets the DOM ID of the React component that is the root of the tree that
+   * contains the React component with the supplied DOM ID.
    *
-   * @param {*} node DOM Element to check.
-   * @return {boolean} True if the DOM Element appears to be rendered by React.
+   * @param {string} id DOM ID of a React component.
+   * @return {?string} DOM ID of the React component that is the root.
    * @internal
    */
-  isRenderedByReact: function(node) {
-    if (node.nodeType !== 1) {
-      // Not a DOMElement, therefore not a React component
-      return false;
-    }
-    var id = ReactID.getID(node);
-    return id ? id.charAt(0) === SEPARATOR : false;
+  getReactRootIDFromNodeID: function(id) {
+    var regexResult = /\.r\[[^\]]+\]/.exec(id);
+    return regexResult && regexResult[0];
   },
 
   /**
-   * Traverses up the ancestors of the supplied node to find a node that is a
-   * DOM representation of a React component.
+   * Traverses the ID hierarchy and invokes the supplied `cb` on any IDs that
+   * should would receive a `mouseEnter` or `mouseLeave` event.
    *
-   * @param {*} node
-   * @return {?DOMEventTarget}
-   * @internal
-   */
-  getFirstReactDOM: function(node) {
-    var current = node;
-    while (current && current.parentNode !== current) {
-      if (ReactInstanceHandles.isRenderedByReact(current)) {
-        return current;
-      }
-      current = current.parentNode;
-    }
-    return null;
-  },
-
-  /**
-   * Finds a node with the supplied `id` inside of the supplied `ancestorNode`.
-   * Exploits the ID naming scheme to perform the search quickly.
-   *
-   * @param {DOMEventTarget} ancestorNode Search from this root.
-   * @pararm {string} id ID of the DOM representation of the component.
-   * @return {DOMEventTarget} DOM node with the supplied `id`.
-   * @internal
-   */
-  findComponentRoot: function(ancestorNode, id) {
-    var firstChildren = [ancestorNode.firstChild];
-    var childIndex = 0;
-
-    while (childIndex < firstChildren.length) {
-      var child = firstChildren[childIndex++];
-      while (child) {
-        var childID = ReactID.getID(child);
-        if (childID) {
-          if (id === childID) {
-            return child;
-          } else if (isAncestorIDOf(childID, id)) {
-            // If we find a child whose ID is an ancestor of the given ID,
-            // then we can be sure that we only want to search the subtree
-            // rooted at this child, so we can throw out the rest of the
-            // search state.
-            firstChildren.length = childIndex = 0;
-            firstChildren.push(child.firstChild);
-            break;
-          } else {
-            // TODO This should not be necessary if the ID hierarchy is
-            // correct, but is occasionally necessary if the DOM has been
-            // modified in unexpected ways.
-            firstChildren.push(child.firstChild);
-          }
-        } else {
-          // If this child had no ID, then there's a chance that it was
-          // injected automatically by the browser, as when a `<table>`
-          // element sprouts an extra `<tbody>` child as a side effect of
-          // `.innerHTML` parsing. Optimistically continue down this
-          // branch, but not before examining the other siblings.
-          firstChildren.push(child.firstChild);
-        }
-        child = child.nextSibling;
-      }
-    }
-
-    if (true) {
-      console.error(
-        'Error while invoking `findComponentRoot` with the following ' +
-        'ancestor node:',
-        ancestorNode
-      );
-    }
-    invariant(
-      false,
-      'findComponentRoot(..., %s): Unable to find element. This probably ' +
-      'means the DOM was unexpectedly mutated (e.g. by the browser).',
-      id,
-      ReactID.getID(ancestorNode)
-    );
-  },
-
-  /**
-   * Gets the DOM ID of the React component that is the root of the tree that
-   * contains the React component with the supplied DOM ID.
-   *
-   * @param {string} id DOM ID of a React component.
-   * @return {?string} DOM ID of the React component that is the root.
-   * @internal
-   */
-  getReactRootIDFromNodeID: function(id) {
-    var regexResult = /\.r\[[^\]]+\]/.exec(id);
-    return regexResult && regexResult[0];
-  },
-
-  /**
-   * Traverses the ID hierarchy and invokes the supplied `cb` on any IDs that
-   * should would receive a `mouseEnter` or `mouseLeave` event.
-   *
-   * NOTE: Does not invoke the callback on the nearest common ancestor because
-   * nothing "entered" or "left" that element.
-   *
-   * @param {string} leaveID ID being left.
-   * @param {string} enterID ID being entered.
-   * @param {function} cb Callback to invoke on each entered/left ID.
-   * @param {*} upArg Argument to invoke the callback with on left IDs.
-   * @param {*} downArg Argument to invoke the callback with on entered IDs.
+   * NOTE: Does not invoke the callback on the nearest common ancestor because
+   * nothing "entered" or "left" that element.
+   *
+   * @param {string} leaveID ID being left.
+   * @param {string} enterID ID being entered.
+   * @param {function} cb Callback to invoke on each entered/left ID.
+   * @param {*} upArg Argument to invoke the callback with on left IDs.
+   * @param {*} downArg Argument to invoke the callback with on entered IDs.
    * @internal
    */
   traverseEnterLeave: function(leaveID, enterID, cb, upArg, downArg) {
@@ -6631,13 +6459,72 @@ var ReactInstanceHandles = {
    * Exposed for unit testing.
    * @private
    */
-  _getNextDescendantID: getNextDescendantID
+  _getNextDescendantID: getNextDescendantID,
+
+  isAncestorIDOf: isAncestorIDOf,
+
+  SEPARATOR: SEPARATOR
 
 };
 
 module.exports = ReactInstanceHandles;
 
-},{"./ReactID":35,"./invariant":75}],38:[function(require,module,exports){
+},{"./invariant":78}],38:[function(require,module,exports){
+/**
+ * Copyright 2013 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @providesModule ReactMarkupChecksum
+ */
+
+"use strict";
+
+var adler32 = require("./adler32");
+
+var ReactMarkupChecksum = {
+  CHECKSUM_ATTR_NAME: 'data-react-checksum',
+
+  /**
+   * @param {string} markup Markup string
+   * @return {string} Markup string with checksum attribute attached
+   */
+  addChecksumToMarkup: function(markup) {
+    var checksum = adler32(markup);
+    return markup.replace(
+      '>',
+      ' ' + ReactMarkupChecksum.CHECKSUM_ATTR_NAME + '="' + checksum + '">'
+    );
+  },
+
+  /**
+   * @param {string} markup to use
+   * @param {DOMElement} element root React element
+   * @returns {boolean} whether or not the markup is the same
+   */
+  canReuseMarkup: function(markup, element) {
+    var existingChecksum = element.getAttribute(
+      ReactMarkupChecksum.CHECKSUM_ATTR_NAME
+    );
+    existingChecksum = existingChecksum && parseInt(existingChecksum, 10);
+    var markupChecksum = adler32(markup);
+    return markupChecksum === existingChecksum;
+  }
+};
+
+module.exports = ReactMarkupChecksum;
+
+},{"./adler32":62}],39:[function(require,module,exports){
 (function(){/**
  * Copyright 2013 Facebook, Inc.
  *
@@ -6659,10 +6546,14 @@ module.exports = ReactInstanceHandles;
 "use strict";
 
 var invariant = require("./invariant");
+var getReactRootElementInContainer = require("./getReactRootElementInContainer");
 var ReactEventEmitter = require("./ReactEventEmitter");
 var ReactInstanceHandles = require("./ReactInstanceHandles");
-var ReactEventTopLevelCallback = require("./ReactEventTopLevelCallback");
-var ReactID = require("./ReactID");
+
+var SEPARATOR = ReactInstanceHandles.SEPARATOR;
+
+var ATTR_NAME = 'data-reactid';
+var nodeCache = {};
 
 var $ = require("./$");
 
@@ -6677,21 +6568,144 @@ if (true) {
   var rootElementsByReactRootID = {};
 }
 
-/**
- * @param {DOMElement} container DOM element that may contain a React component
- * @return {?*} DOM element that may have the reactRoot ID, or null.
- */
-function getReactRootElementInContainer(container) {
-  return container && container.firstChild;
-}
-
 /**
  * @param {DOMElement} container DOM element that may contain a React component.
  * @return {?string} A "reactRoot" ID, if a React component is rendered.
  */
 function getReactRootID(container) {
   var rootElement = getReactRootElementInContainer(container);
-  return rootElement && ReactID.getID(rootElement);
+  return rootElement && ReactMount.getID(rootElement);
+}
+
+/**
+ * Accessing node[ATTR_NAME] or calling getAttribute(ATTR_NAME) on a form
+ * element can return its control whose name or ID equals ATTR_NAME. All
+ * DOM nodes support `getAttributeNode` but this can also get called on
+ * other objects so just return '' if we're given something other than a
+ * DOM node (such as window).
+ *
+ * @param {?DOMElement|DOMWindow|DOMDocument|DOMTextNode} node DOM node.
+ * @return {string} ID of the supplied `domNode`.
+ */
+function getID(node) {
+  var id = internalGetID(node);
+  if (id) {
+    if (nodeCache.hasOwnProperty(id)) {
+      var cached = nodeCache[id];
+      if (cached !== node) {
+        invariant(
+          !isValid(cached, id),
+          'ReactMount: Two valid but unequal nodes with the same `%s`: %s',
+          ATTR_NAME, id
+        );
+
+        nodeCache[id] = node;
+      }
+    } else {
+      nodeCache[id] = node;
+    }
+  }
+
+  return id;
+}
+
+function internalGetID(node) {
+  // If node is something like a window, document, or text node, none of
+  // which support attributes or a .getAttribute method, gracefully return
+  // the empty string, as if the attribute were missing.
+  return node && node.getAttribute && node.getAttribute(ATTR_NAME) || '';
+}
+
+/**
+ * Sets the React-specific ID of the given node.
+ *
+ * @param {DOMElement} node The DOM node whose ID will be set.
+ * @param {string} id The value of the ID attribute.
+ */
+function setID(node, id) {
+  var oldID = internalGetID(node);
+  if (oldID !== id) {
+    delete nodeCache[oldID];
+  }
+  node.setAttribute(ATTR_NAME, id);
+  nodeCache[id] = node;
+}
+
+/**
+ * Finds the node with the supplied React-generated DOM ID.
+ *
+ * @param {string} id A React-generated DOM ID.
+ * @return {DOMElement} DOM node with the suppled `id`.
+ * @internal
+ */
+function getNode(id) {
+  if (!nodeCache.hasOwnProperty(id) || !isValid(nodeCache[id], id)) {
+    nodeCache[id] = ReactMount.findReactNodeByID(id);
+  }
+  return nodeCache[id];
+}
+
+/**
+ * A node is "valid" if it is contained by a currently mounted container.
+ *
+ * This means that the node does not have to be contained by a document in
+ * order to be considered valid.
+ *
+ * @param {?DOMElement} node The candidate DOM node.
+ * @param {string} id The expected ID of the node.
+ * @return {boolean} Whether the node is contained by a mounted container.
+ */
+function isValid(node, id) {
+  if (node) {
+    invariant(
+      internalGetID(node) === id,
+      'ReactMount: Unexpected modification of `%s`',
+      ATTR_NAME
+    );
+
+    var container = ReactMount.findReactContainerForID(id);
+    if (container && contains(container, node)) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+function contains(ancestor, descendant) {
+  if (ancestor.contains) {
+    // Supported natively in virtually all browsers, but not in jsdom.
+    return ancestor.contains(descendant);
+  }
+
+  if (descendant === ancestor) {
+    return true;
+  }
+
+  if (descendant.nodeType === 3) {
+    // If descendant is a text node, start from descendant.parentNode
+    // instead, so that we can assume all ancestors worth considering are
+    // element nodes with nodeType === 1.
+    descendant = descendant.parentNode;
+  }
+
+  while (descendant && descendant.nodeType === 1) {
+    if (descendant === ancestor) {
+      return true;
+    }
+    descendant = descendant.parentNode;
+  }
+
+  return false;
+}
+
+/**
+ * Causes the cache to forget about one React-specific ID.
+ *
+ * @param {string} id The ID to forget.
+ */
+function purgeID(id) {
+  delete nodeCache[id];
 }
 
 /**
@@ -6736,14 +6750,10 @@ var ReactMount = {
    * Ensures that the top-level event delegation listener is set up. This will
    * be invoked some time before the first time any React component is rendered.
    *
-   * @param {object} TopLevelCallbackCreator
    * @private
    */
-  prepareTopLevelEvents: function(TopLevelCallbackCreator) {
-    ReactEventEmitter.ensureListening(
-      ReactMount.useTouchEvents,
-      TopLevelCallbackCreator
-    );
+  prepareTopLevelEvents: function() {
+    ReactEventEmitter.ensureListening(ReactMount.useTouchEvents);
   },
 
   /**
@@ -6779,7 +6789,7 @@ var ReactMount = {
    * @return {string} reactRoot ID prefix
    */
   _registerComponent: function(nextComponent, container) {
-    ReactMount.prepareTopLevelEvents(ReactEventTopLevelCallback);
+    ReactMount.prepareTopLevelEvents();
 
     var reactRootID = ReactMount.registerContainer(container);
     instanceByReactRootID[reactRootID] = nextComponent;
@@ -6843,8 +6853,7 @@ var ReactMount = {
 
     var reactRootElement = getReactRootElementInContainer(container);
     var containerHasReactMarkup =
-      reactRootElement &&
-        ReactInstanceHandles.isRenderedByReact(reactRootElement);
+      reactRootElement && ReactMount.isRenderedByReact(reactRootElement);
 
     var shouldReuseMarkup = containerHasReactMarkup && !registeredComponent;
 
@@ -6931,60 +6940,173 @@ var ReactMount = {
    * Finds the container DOM element that contains React component to which the
    * supplied DOM `id` belongs.
    *
-   * @param {string} id The ID of an element rendered by a React component.
-   * @return {?DOMElement} DOM element that contains the `id`.
+   * @param {string} id The ID of an element rendered by a React component.
+   * @return {?DOMElement} DOM element that contains the `id`.
+   */
+  findReactContainerForID: function(id) {
+    var reactRootID = ReactInstanceHandles.getReactRootIDFromNodeID(id);
+    var container = containersByReactRootID[reactRootID];
+
+    if (true) {
+      var rootElement = rootElementsByReactRootID[reactRootID];
+      if (rootElement && rootElement.parentNode !== container) {
+        invariant(
+          // Call internalGetID here because getID calls isValid which calls
+          // findReactContainerForID (this function).
+          internalGetID(rootElement) === reactRootID,
+          'ReactMount: Root element ID differed from reactRootID.'
+        );
+
+        var containerChild = container.firstChild;
+        if (containerChild &&
+            reactRootID === internalGetID(containerChild)) {
+          // If the container has a new child with the same ID as the old
+          // root element, then rootElementsByReactRootID[reactRootID] is
+          // just stale and needs to be updated. The case that deserves a
+          // warning is when the container is empty.
+          rootElementsByReactRootID[reactRootID] = containerChild;
+        } else {
+          console.warn(
+            'ReactMount: Root element has been removed from its original ' +
+            'container. New container:', rootElement.parentNode
+          );
+        }
+      }
+    }
+
+    return container;
+  },
+
+  /**
+   * Finds an element rendered by React with the supplied ID.
+   *
+   * @param {string} id ID of a DOM node in the React component.
+   * @return {DOMElement} Root DOM node of the React component.
+   */
+  findReactNodeByID: function(id) {
+    var reactRoot = ReactMount.findReactContainerForID(id);
+    return ReactMount.findComponentRoot(reactRoot, id);
+  },
+
+  /**
+   * True if the supplied `node` is rendered by React.
+   *
+   * @param {*} node DOM Element to check.
+   * @return {boolean} True if the DOM Element appears to be rendered by React.
+   * @internal
+   */
+  isRenderedByReact: function(node) {
+    if (node.nodeType !== 1) {
+      // Not a DOMElement, therefore not a React component
+      return false;
+    }
+    var id = ReactMount.getID(node);
+    return id ? id.charAt(0) === SEPARATOR : false;
+  },
+
+  /**
+   * Traverses up the ancestors of the supplied node to find a node that is a
+   * DOM representation of a React component.
+   *
+   * @param {*} node
+   * @return {?DOMEventTarget}
+   * @internal
+   */
+  getFirstReactDOM: function(node) {
+    var current = node;
+    while (current && current.parentNode !== current) {
+      if (ReactMount.isRenderedByReact(current)) {
+        return current;
+      }
+      current = current.parentNode;
+    }
+    return null;
+  },
+
+  /**
+   * Finds a node with the supplied `id` inside of the supplied `ancestorNode`.
+   * Exploits the ID naming scheme to perform the search quickly.
+   *
+   * @param {DOMEventTarget} ancestorNode Search from this root.
+   * @pararm {string} id ID of the DOM representation of the component.
+   * @return {DOMEventTarget} DOM node with the supplied `id`.
+   * @internal
    */
-  findReactContainerForID: function(id) {
-    var reactRootID = ReactInstanceHandles.getReactRootIDFromNodeID(id);
-    var container = containersByReactRootID[reactRootID];
-
-    if (true) {
-      var rootElement = rootElementsByReactRootID[reactRootID];
-      if (rootElement && rootElement.parentNode !== container) {
-        invariant(
-          // Call rawGetID here because getID calls isValid which calls
-          // findReactContainerForID (this function).
-          ReactID.rawGetID(rootElement) === reactRootID,
-          'ReactMount: Root element ID differed from reactRootID.'
-        );
+  findComponentRoot: function(ancestorNode, id) {
+    var firstChildren = [ancestorNode.firstChild];
+    var childIndex = 0;
 
-        var containerChild = container.firstChild;
-        if (containerChild &&
-            reactRootID === ReactID.rawGetID(containerChild)) {
-          // If the container has a new child with the same ID as the old
-          // root element, then rootElementsByReactRootID[reactRootID] is
-          // just stale and needs to be updated. The case that deserves a
-          // warning is when the container is empty.
-          rootElementsByReactRootID[reactRootID] = containerChild;
+    while (childIndex < firstChildren.length) {
+      var child = firstChildren[childIndex++];
+      while (child) {
+        var childID = ReactMount.getID(child);
+        if (childID) {
+          if (id === childID) {
+            return child;
+          } else if (ReactInstanceHandles.isAncestorIDOf(childID, id)) {
+            // If we find a child whose ID is an ancestor of the given ID,
+            // then we can be sure that we only want to search the subtree
+            // rooted at this child, so we can throw out the rest of the
+            // search state.
+            firstChildren.length = childIndex = 0;
+            firstChildren.push(child.firstChild);
+            break;
+          } else {
+            // TODO This should not be necessary if the ID hierarchy is
+            // correct, but is occasionally necessary if the DOM has been
+            // modified in unexpected ways.
+            firstChildren.push(child.firstChild);
+          }
         } else {
-          console.warn(
-            'ReactMount: Root element has been removed from its original ' +
-            'container. New container:', rootElement.parentNode
-          );
+          // If this child had no ID, then there's a chance that it was
+          // injected automatically by the browser, as when a `<table>`
+          // element sprouts an extra `<tbody>` child as a side effect of
+          // `.innerHTML` parsing. Optimistically continue down this
+          // branch, but not before examining the other siblings.
+          firstChildren.push(child.firstChild);
         }
+        child = child.nextSibling;
       }
     }
 
-    return container;
+    if (true) {
+      console.error(
+        'Error while invoking `findComponentRoot` with the following ' +
+        'ancestor node:',
+        ancestorNode
+      );
+    }
+    invariant(
+      false,
+      'findComponentRoot(..., %s): Unable to find element. This probably ' +
+      'means the DOM was unexpectedly mutated (e.g. by the browser).',
+      id,
+      ReactMount.getID(ancestorNode)
+    );
   },
 
+
   /**
-   * Finds an element rendered by React with the supplied ID.
-   *
-   * @param {string} id ID of a DOM node in the React component.
-   * @return {DOMElement} Root DOM node of the React component.
+   * React ID utilities.
    */
-  findReactNodeByID: function(id) {
-    var reactRoot = ReactMount.findReactContainerForID(id);
-    return ReactInstanceHandles.findComponentRoot(reactRoot, id);
-  }
 
+  ATTR_NAME: ATTR_NAME,
+
+  getID: getID,
+
+  setID: setID,
+
+  getNode: getNode,
+
+  purgeID: purgeID,
+
+  injection: {}
 };
 
 module.exports = ReactMount;
 
 })()
-},{"./$":1,"./ReactEventEmitter":33,"./ReactEventTopLevelCallback":34,"./ReactID":35,"./ReactInstanceHandles":37,"./invariant":75}],39:[function(require,module,exports){
+},{"./$":1,"./ReactEventEmitter":34,"./ReactInstanceHandles":37,"./getReactRootElementInContainer":73,"./invariant":78}],40:[function(require,module,exports){
 (function(){/**
  * Copyright 2013 Facebook, Inc.
  *
@@ -7194,7 +7316,7 @@ var ReactMultiChild = {
 module.exports = ReactMultiChild;
 
 })()
-},{"./ReactComponent":22}],40:[function(require,module,exports){
+},{"./ReactComponent":23}],41:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -7222,7 +7344,7 @@ var DOMPropertyOperations = require("./DOMPropertyOperations");
 var ReactComponent = require("./ReactComponent");
 var ReactEventEmitter = require("./ReactEventEmitter");
 var ReactMultiChild = require("./ReactMultiChild");
-var ReactID = require("./ReactID");
+var ReactMount = require("./ReactMount");
 
 var escapeTextForBrowser = require("./escapeTextForBrowser");
 var flattenChildren = require("./flattenChildren");
@@ -7333,7 +7455,7 @@ ReactNativeComponent.Mixin = {
     }
 
     var escapedID = escapeTextForBrowser(this._rootNodeID);
-    return ret + ' ' + ReactID.ATTR_NAME + '="' + escapedID + '">';
+    return ret + ' ' + ReactMount.ATTR_NAME + '="' + escapedID + '">';
   },
 
   /**
@@ -7557,7 +7679,7 @@ mixInto(ReactNativeComponent, ReactMultiChild.Mixin);
 
 module.exports = ReactNativeComponent;
 
-},{"./CSSPropertyOperations":3,"./DOMProperty":7,"./DOMPropertyOperations":8,"./ReactComponent":22,"./ReactEventEmitter":33,"./ReactID":35,"./ReactMultiChild":39,"./escapeTextForBrowser":65,"./flattenChildren":67,"./invariant":75,"./keyOf":79,"./merge":81,"./mixInto":84}],41:[function(require,module,exports){
+},{"./CSSPropertyOperations":3,"./DOMProperty":7,"./DOMPropertyOperations":8,"./ReactComponent":23,"./ReactEventEmitter":34,"./ReactMount":39,"./ReactMultiChild":40,"./escapeTextForBrowser":67,"./flattenChildren":69,"./invariant":78,"./keyOf":82,"./merge":84,"./mixInto":87}],42:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -7654,7 +7776,7 @@ PooledClass.addPoolingTo(ReactOnDOMReady);
 
 module.exports = ReactOnDOMReady;
 
-},{"./PooledClass":20,"./mixInto":84}],42:[function(require,module,exports){
+},{"./PooledClass":21,"./mixInto":87}],43:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -7802,7 +7924,7 @@ var ReactOwner = {
 
 module.exports = ReactOwner;
 
-},{"./invariant":75}],43:[function(require,module,exports){
+},{"./invariant":78}],44:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -7922,7 +8044,7 @@ var ReactPropTransferer = {
 
 module.exports = ReactPropTransferer;
 
-},{"./emptyFunction":64,"./joinClasses":77,"./merge":81}],44:[function(require,module,exports){
+},{"./emptyFunction":66,"./joinClasses":80,"./merge":84}],45:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -8082,7 +8204,7 @@ function createChainableTypeChecker(validate) {
 
 module.exports = Props;
 
-},{"./createObjectFrom":62,"./invariant":75}],45:[function(require,module,exports){
+},{"./createObjectFrom":64,"./invariant":78}],46:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -8245,7 +8367,7 @@ PooledClass.addPoolingTo(ReactReconcileTransaction);
 
 module.exports = ReactReconcileTransaction;
 
-},{"./ExecutionEnvironment":19,"./PooledClass":20,"./ReactEventEmitter":33,"./ReactInputSelection":36,"./ReactOnDOMReady":41,"./Transaction":58,"./mixInto":84}],46:[function(require,module,exports){
+},{"./ExecutionEnvironment":19,"./PooledClass":21,"./ReactEventEmitter":34,"./ReactInputSelection":36,"./ReactOnDOMReady":42,"./Transaction":59,"./mixInto":87}],47:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -8266,6 +8388,7 @@ module.exports = ReactReconcileTransaction;
  */
 "use strict";
 
+var ReactMarkupChecksum = require("./ReactMarkupChecksum");
 var ReactReconcileTransaction = require("./ReactReconcileTransaction");
 var ReactInstanceHandles = require("./ReactInstanceHandles");
 
@@ -8281,7 +8404,9 @@ function renderComponentToString(component, callback) {
   transaction.reinitializeTransaction();
   try {
     transaction.perform(function() {
-      callback(component.mountComponent(id, transaction));
+      var markup = component.mountComponent(id, transaction);
+      markup = ReactMarkupChecksum.addChecksumToMarkup(markup);
+      callback(markup);
     }, null);
   } finally {
     ReactReconcileTransaction.release(transaction);
@@ -8292,7 +8417,7 @@ module.exports = {
   renderComponentToString: renderComponentToString
 };
 
-},{"./ReactInstanceHandles":37,"./ReactReconcileTransaction":45}],47:[function(require,module,exports){
+},{"./ReactInstanceHandles":37,"./ReactMarkupChecksum":38,"./ReactReconcileTransaction":46}],48:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -8315,7 +8440,7 @@ module.exports = {
 "use strict";
 
 var ReactComponent = require("./ReactComponent");
-var ReactID = require("./ReactID");
+var ReactMount = require("./ReactMount");
 
 var escapeTextForBrowser = require("./escapeTextForBrowser");
 var mixInto = require("./mixInto");
@@ -8353,7 +8478,7 @@ mixInto(ReactTextComponent, {
   mountComponent: function(rootID) {
     ReactComponent.Mixin.mountComponent.call(this, rootID);
     return (
-      '<span ' + ReactID.ATTR_NAME + '="' + rootID + '">' +
+      '<span ' + ReactMount.ATTR_NAME + '="' + rootID + '">' +
         escapeTextForBrowser(this.props.text) +
       '</span>'
     );
@@ -8380,7 +8505,7 @@ mixInto(ReactTextComponent, {
 
 module.exports = ReactTextComponent;
 
-},{"./ReactComponent":22,"./ReactID":35,"./escapeTextForBrowser":65,"./mixInto":84}],48:[function(require,module,exports){
+},{"./ReactComponent":23,"./ReactMount":39,"./escapeTextForBrowser":67,"./mixInto":87}],49:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -8437,7 +8562,7 @@ function batchedUpdates(callback) {
         component.performUpdateIfNecessary();
         if (callbacks) {
           for (var j = 0; j < callbacks.length; j++) {
-            callbacks[j]();
+            callbacks[j].call(component);
           }
         }
       }
@@ -8487,7 +8612,7 @@ var ReactUpdates = {
 
 module.exports = ReactUpdates;
 
-},{"./invariant":75}],49:[function(require,module,exports){
+},{"./invariant":78}],50:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -8824,7 +8949,7 @@ var SimpleEventPlugin = {
 
 module.exports = SimpleEventPlugin;
 
-},{"./EventConstants":13,"./EventPropagators":18,"./SyntheticEvent":50,"./SyntheticFocusEvent":51,"./SyntheticKeyboardEvent":52,"./SyntheticMouseEvent":53,"./SyntheticMutationEvent":54,"./SyntheticTouchEvent":55,"./SyntheticUIEvent":56,"./SyntheticWheelEvent":57,"./invariant":75,"./keyOf":79}],50:[function(require,module,exports){
+},{"./EventConstants":13,"./EventPropagators":18,"./SyntheticEvent":51,"./SyntheticFocusEvent":52,"./SyntheticKeyboardEvent":53,"./SyntheticMouseEvent":54,"./SyntheticMutationEvent":55,"./SyntheticTouchEvent":56,"./SyntheticUIEvent":57,"./SyntheticWheelEvent":58,"./invariant":78,"./keyOf":82}],51:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -8895,6 +9020,9 @@ function SyntheticEvent(dispatchConfig, dispatchMarker, nativeEvent) {
 
   var Interface = this.constructor.Interface;
   for (var propName in Interface) {
+    if (!Interface.hasOwnProperty(propName)) {
+      continue;
+    }
     var normalize = Interface[propName];
     if (normalize) {
       this[propName] = normalize(nativeEvent);
@@ -8983,7 +9111,7 @@ PooledClass.addPoolingTo(SyntheticEvent, PooledClass.threeArgumentPooler);
 
 module.exports = SyntheticEvent;
 
-},{"./PooledClass":20,"./emptyFunction":64,"./getEventTarget":70,"./merge":81,"./mergeInto":83}],51:[function(require,module,exports){
+},{"./PooledClass":21,"./emptyFunction":66,"./getEventTarget":72,"./merge":84,"./mergeInto":86}],52:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -9029,7 +9157,7 @@ SyntheticUIEvent.augmentClass(SyntheticFocusEvent, FocusEventInterface);
 
 module.exports = SyntheticFocusEvent;
 
-},{"./SyntheticUIEvent":56}],52:[function(require,module,exports){
+},{"./SyntheticUIEvent":57}],53:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -9087,7 +9215,7 @@ SyntheticUIEvent.augmentClass(SyntheticKeyboardEvent, KeyboardEventInterface);
 
 module.exports = SyntheticKeyboardEvent;
 
-},{"./SyntheticUIEvent":56}],53:[function(require,module,exports){
+},{"./SyntheticUIEvent":57}],54:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -9174,7 +9302,7 @@ SyntheticUIEvent.augmentClass(SyntheticMouseEvent, MouseEventInterface);
 
 module.exports = SyntheticMouseEvent;
 
-},{"./SyntheticUIEvent":56,"./ViewportMetrics":59}],54:[function(require,module,exports){
+},{"./SyntheticUIEvent":57,"./ViewportMetrics":60}],55:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -9224,7 +9352,7 @@ SyntheticEvent.augmentClass(SyntheticMutationEvent, MutationEventInterface);
 
 module.exports = SyntheticMutationEvent;
 
-},{"./SyntheticEvent":50}],55:[function(require,module,exports){
+},{"./SyntheticEvent":51}],56:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -9276,7 +9404,7 @@ SyntheticUIEvent.augmentClass(SyntheticTouchEvent, TouchEventInterface);
 
 module.exports = SyntheticTouchEvent;
 
-},{"./SyntheticUIEvent":56}],56:[function(require,module,exports){
+},{"./SyntheticUIEvent":57}],57:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -9323,7 +9451,7 @@ SyntheticEvent.augmentClass(SyntheticUIEvent, UIEventInterface);
 
 module.exports = SyntheticUIEvent;
 
-},{"./SyntheticEvent":50}],57:[function(require,module,exports){
+},{"./SyntheticEvent":51}],58:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -9388,7 +9516,7 @@ SyntheticMouseEvent.augmentClass(SyntheticWheelEvent, WheelEventInterface);
 
 module.exports = SyntheticWheelEvent;
 
-},{"./SyntheticMouseEvent":53}],58:[function(require,module,exports){
+},{"./SyntheticMouseEvent":54}],59:[function(require,module,exports){
 (function(){/**
  * Copyright 2013 Facebook, Inc.
  *
@@ -9409,23 +9537,7 @@ module.exports = SyntheticWheelEvent;
 
 "use strict";
 
-var throwIf = require("./throwIf");
-
-var DUAL_TRANSACTION = 'DUAL_TRANSACTION';
-var MISSING_TRANSACTION = 'MISSING_TRANSACTION';
-if (true) {
-  DUAL_TRANSACTION =
-    'Cannot initialize transaction when there is already an outstanding ' +
-    'transaction. Common causes of this are trying to render a component ' +
-    'when you are already rendering a component or attempting a state ' +
-    'transition while in a render function. Another possibility is that ' +
-    'you are rendering new content (or state transitioning) in a ' +
-    'componentDidRender callback. If this is not the case, please report the ' +
-    'issue immediately.';
-
-  MISSING_TRANSACTION =
-    'Cannot close transaction when there is none open.';
-}
+var invariant = require("./invariant");
 
 /**
  * `Transaction` creates a black box that is able to wrap any method such that
@@ -9547,26 +9659,33 @@ var Mixin = {
    * @return Return value from `method`.
    */
   perform: function(method, scope, a, b, c, d, e, f) {
-    throwIf(this.isInTransaction(), DUAL_TRANSACTION);
+    invariant(
+      !this.isInTransaction(),
+      'Transaction.perform(...): Cannot initialize a transaction when there ' +
+      'is already an outstanding transaction.'
+    );
     var memberStart = Date.now();
-    var err = null;
+    var errorToThrow = null;
     var ret;
     try {
       this.initializeAll();
       ret = method.call(scope, a, b, c, d, e, f);
-    } catch (ie_requires_catch) {
-      err = ie_requires_catch;
+    } catch (error) {
+      // IE8 requires `catch` in order to use `finally`.
+      errorToThrow = error;
     } finally {
       var memberEnd = Date.now();
       this.methodInvocationTime += (memberEnd - memberStart);
       try {
         this.closeAll();
-      } catch (closeAllErr) {
-        err = err || closeAllErr;
+      } catch (closeError) {
+        // If `method` throws, prefer to show that stack trace over any thrown
+        // by invoking `closeAll`.
+        errorToThrow = errorToThrow || closeError;
       }
     }
-    if (err) {
-      throw err;
+    if (errorToThrow) {
+      throw errorToThrow;
     }
     return ret;
   },
@@ -9575,15 +9694,17 @@ var Mixin = {
     this._isInTransaction = true;
     var transactionWrappers = this.transactionWrappers;
     var wrapperInitTimes = this.timingMetrics.wrapperInitTimes;
-    var err = null;
+    var errorToThrow = null;
     for (var i = 0; i < transactionWrappers.length; i++) {
       var initStart = Date.now();
       var wrapper = transactionWrappers[i];
       try {
-        this.wrapperInitData[i] =
-          wrapper.initialize ? wrapper.initialize.call(this) : null;
-      } catch (initErr) {
-        err = err || initErr;  // Remember the first error.
+        this.wrapperInitData[i] = wrapper.initialize ?
+          wrapper.initialize.call(this) :
+          null;
+      } catch (initError) {
+        // Prefer to show the stack trace of the first error.
+        errorToThrow = errorToThrow || initError;
         this.wrapperInitData[i] = Transaction.OBSERVED_ERROR;
       } finally {
         var curInitTime = wrapperInitTimes[i];
@@ -9591,8 +9712,8 @@ var Mixin = {
         wrapperInitTimes[i] = (curInitTime || 0) + (initEnd - initStart);
       }
     }
-    if (err) {
-      throw err;
+    if (errorToThrow) {
+      throw errorToThrow;
     }
   },
 
@@ -9603,10 +9724,13 @@ var Mixin = {
    * invoked).
    */
   closeAll: function() {
-    throwIf(!this.isInTransaction(), MISSING_TRANSACTION);
+    invariant(
+      this.isInTransaction(),
+      'Transaction.closeAll(): Cannot close transaction when none are open.'
+    );
     var transactionWrappers = this.transactionWrappers;
     var wrapperCloseTimes = this.timingMetrics.wrapperCloseTimes;
-    var err = null;
+    var errorToThrow = null;
     for (var i = 0; i < transactionWrappers.length; i++) {
       var wrapper = transactionWrappers[i];
       var closeStart = Date.now();
@@ -9615,8 +9739,9 @@ var Mixin = {
         if (initData !== Transaction.OBSERVED_ERROR) {
           wrapper.close && wrapper.close.call(this, initData);
         }
-      } catch (closeErr) {
-        err = err || closeErr;  // Remember the first error.
+      } catch (closeError) {
+        // Prefer to show the stack trace of the first error.
+        errorToThrow = errorToThrow || closeError;
       } finally {
         var closeEnd = Date.now();
         var curCloseTime = wrapperCloseTimes[i];
@@ -9625,14 +9750,16 @@ var Mixin = {
     }
     this.wrapperInitData.length = 0;
     this._isInTransaction = false;
-    if (err) {
-      throw err;
+    if (errorToThrow) {
+      throw errorToThrow;
     }
   }
 };
 
 var Transaction = {
+
   Mixin: Mixin,
+
   /**
    * Token to look for to determine if an error occured.
    */
@@ -9643,7 +9770,7 @@ var Transaction = {
 module.exports = Transaction;
 
 })()
-},{"./throwIf":86}],59:[function(require,module,exports){
+},{"./invariant":78}],60:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -9681,7 +9808,7 @@ var ViewportMetrics = {
 
 module.exports = ViewportMetrics;
 
-},{}],60:[function(require,module,exports){
+},{}],61:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -9702,50 +9829,34 @@ module.exports = ViewportMetrics;
 
 "use strict";
 
-var throwIf = require("./throwIf");
-
-var INVALID_ARGS = 'INVALID_ACCUM_ARGS';
-
-if (true) {
-  INVALID_ARGS =
-    'accumulate requires non empty (non-null, defined) next ' +
-    'values. All arrays accumulated must not contain any empty items.';
-}
+var invariant = require("./invariant");
 
 /**
- * Accumulates items that must never be empty, into a result in a manner that
- * conserves memory - avoiding allocation of arrays until they are needed. The
- * accumulation may start and/or end up being a single element or an array
- * depending on the total count (if greater than one, an array is allocated).
- * Handles most common case first (starting with an empty current value and
- * acquiring one).
- * @return {Accumulation} An accumulation which is either a single item or an
- * Array of items.
+ * Accumulates items that must not be null or undefined.
+ *
+ * This is used to conserve memory by avoiding array allocations.
+ *
+ * @return {*|array<*>} An accumulation of items.
  */
-function accumulate(cur, next) {
-  var curValIsEmpty = cur == null;   // Will test for emptiness (null/undef)
-  var nextValIsEmpty = next === null;
-  if (true) {
-    throwIf(nextValIsEmpty, INVALID_ARGS);
-  }
-  if (nextValIsEmpty) {
-    return cur;
+function accumulate(current, next) {
+  invariant(
+    next != null,
+    'accumulate(...): Accumulated items must be not be null or undefined.'
+  );
+  if (current == null) {
+    return next;
   } else {
-    if (curValIsEmpty) {
-      return next;
+    // Both are not empty. Warning: Never call x.concat(y) when you are not
+    // certain that x is an Array (x could be a string with concat method).
+    var currentIsArray = Array.isArray(current);
+    var nextIsArray = Array.isArray(next);
+    if (currentIsArray) {
+      return current.concat(next);
     } else {
-      // Both are not empty. Warning: Never call x.concat(y) when you are not
-      // certain that x is an Array (x could be a string with concat method).
-      var curIsArray = Array.isArray(cur);
-      var nextIsArray = Array.isArray(next);
-      if (curIsArray) {
-        return cur.concat(next);
+      if (nextIsArray) {
+        return [current].concat(next);
       } else {
-        if (nextIsArray) {
-          return [cur].concat(next);
-        } else {
-          return [cur, next];
-        }
+        return [current, next];
       }
     }
   }
@@ -9753,7 +9864,46 @@ function accumulate(cur, next) {
 
 module.exports = accumulate;
 
-},{"./throwIf":86}],61:[function(require,module,exports){
+},{"./invariant":78}],62:[function(require,module,exports){
+/**
+ * Copyright 2013 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @providesModule adler32
+ */
+
+"use strict";
+
+var MOD = 65521;
+
+// This is a clean-room implementation of adler32 designed for detecting
+// if markup is not what we expect it to be. It does not need to be
+// cryptographically strong, only reasonable good at detecting if markup
+// generated on the server is different than that on the client.
+function adler32(data) {
+  var a = 1;
+  var b = 0;
+  for (var i = 0; i < data.length; i++) {
+    a = (a + data.charCodeAt(i)) % MOD;
+    b = (b + a) % MOD;
+  }
+  return a | (b << 16);
+}
+
+module.exports = adler32;
+
+},{}],63:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -9809,7 +9959,7 @@ function copyProperties(obj, a, b, c, d, e, f) {
 
 module.exports = copyProperties;
 
-},{}],62:[function(require,module,exports){
+},{}],64:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -9874,7 +10024,7 @@ function createObjectFrom(keys, values /* = true */) {
 
 module.exports = createObjectFrom;
 
-},{"./hasArrayNature":72}],63:[function(require,module,exports){
+},{"./hasArrayNature":75}],65:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -9933,7 +10083,7 @@ function dangerousStyleValue(styleName, value) {
 
 module.exports = dangerousStyleValue;
 
-},{"./CSSProperty":2}],64:[function(require,module,exports){
+},{"./CSSProperty":2}],66:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -9978,7 +10128,7 @@ copyProperties(emptyFunction, {
 
 module.exports = emptyFunction;
 
-},{"./copyProperties":61}],65:[function(require,module,exports){
+},{"./copyProperties":63}],67:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -9995,19 +10145,12 @@ module.exports = emptyFunction;
  * limitations under the License.
  *
  * @providesModule escapeTextForBrowser
+ * @typechecks static-only
  */
 
 "use strict";
 
-var throwIf = require("./throwIf");
-
-var ESCAPE_TYPE_ERR;
-
-if (true) {
-  ESCAPE_TYPE_ERR =
-    'The React core has attempted to escape content that is of a ' +
-    'mysterious type (object etc) Escaping only works on numbers and strings';
-}
+var invariant = require("./invariant");
 
 var ESCAPE_LOOKUP = {
   "&": "&amp;",
@@ -10022,13 +10165,19 @@ function escaper(match) {
   return ESCAPE_LOOKUP[match];
 }
 
-var escapeTextForBrowser = function (text) {
+/**
+ * Escapes text to prevent scripting attacks.
+ *
+ * @param {number|string} text Text value to escape.
+ * @return {string} An escaped string.
+ */
+function escapeTextForBrowser(text) {
   var type = typeof text;
-  var invalid = type === 'object';
-  if (true) {
-    throwIf(invalid, ESCAPE_TYPE_ERR);
-  }
-  if (text === '' || invalid) {
+  invariant(
+    type !== 'object',
+    'escapeTextForBrowser(...): Attempted to escape an object.'
+  );
+  if (text === '') {
     return '';
   } else {
     if (type === 'string') {
@@ -10037,11 +10186,11 @@ var escapeTextForBrowser = function (text) {
       return (''+text).replace(/[&><"'\/]/g, escaper);
     }
   }
-};
+}
 
 module.exports = escapeTextForBrowser;
 
-},{"./throwIf":86}],66:[function(require,module,exports){
+},{"./invariant":78}],68:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -10092,7 +10241,7 @@ ex._suffix = ']]>';
 
 module.exports = ex;
 
-},{}],67:[function(require,module,exports){
+},{}],69:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -10113,7 +10262,7 @@ module.exports = ex;
 
 "use strict";
 
-var throwIf = require("./throwIf");
+var invariant = require("./invariant");
 var traverseAllChildren = require("./traverseAllChildren");
 
 /**
@@ -10122,14 +10271,14 @@ var traverseAllChildren = require("./traverseAllChildren");
  * @param {!string} name String name of key path to child.
  */
 function flattenSingleChildIntoContext(traverseContext, child, name) {
-  // We found a component instance
+  // We found a component instance.
   var result = traverseContext;
-  if (true) {
-    throwIf(
-      result.hasOwnProperty(name),
-      traverseAllChildren.DUPLICATE_KEY_ERROR
-    );
-  }
+  invariant(
+    !result.hasOwnProperty(name),
+    'flattenChildren(...): Encountered two children with the same key, `%s`. ' +
+    'Children keys must be unique.',
+    name
+  );
   result[name] = child;
 }
 
@@ -10138,7 +10287,7 @@ function flattenSingleChildIntoContext(traverseContext, child, name) {
  * @return {!object} flattened children keyed by name.
  */
 function flattenChildren(children) {
-  if (children === null || children === undefined) {
+  if (children == null) {
     return children;
   }
   var result = {};
@@ -10148,7 +10297,7 @@ function flattenChildren(children) {
 
 module.exports = flattenChildren;
 
-},{"./throwIf":86,"./traverseAllChildren":87}],68:[function(require,module,exports){
+},{"./invariant":78,"./traverseAllChildren":90}],70:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -10186,7 +10335,7 @@ var forEachAccumulated = function(arr, cb, scope) {
 
 module.exports = forEachAccumulated;
 
-},{}],69:[function(require,module,exports){
+},{}],71:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -10264,7 +10413,7 @@ function _getNodeID(node) {
 
 module.exports = ge;
 
-},{}],70:[function(require,module,exports){
+},{}],72:[function(require,module,exports){
 (function(){/**
  * Copyright 2013 Facebook, Inc.
  *
@@ -10308,7 +10457,38 @@ function getEventTarget(nativeEvent) {
 module.exports = getEventTarget;
 
 })()
-},{"./ExecutionEnvironment":19}],71:[function(require,module,exports){
+},{"./ExecutionEnvironment":19}],73:[function(require,module,exports){
+/**
+ * Copyright 2013 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @providesModule getReactRootElementInContainer
+ */
+
+"use strict";
+
+/**
+ * @param {DOMElement} container DOM element that may contain a React component
+ * @return {?*} DOM element that may have the reactRoot ID, or null.
+ */
+function getReactRootElementInContainer(container) {
+  return container && container.firstChild;
+}
+
+module.exports = getReactRootElementInContainer;
+
+},{}],74:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -10350,7 +10530,7 @@ function getTextContentAccessor() {
 
 module.exports = getTextContentAccessor;
 
-},{"./ExecutionEnvironment":19}],72:[function(require,module,exports){
+},{"./ExecutionEnvironment":19}],75:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -10407,7 +10587,7 @@ function hasArrayNature(obj) {
 
 module.exports = hasArrayNature;
 
-},{}],73:[function(require,module,exports){
+},{}],76:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -10444,7 +10624,7 @@ function hyphenate(string) {
 
 module.exports = hyphenate;
 
-},{}],74:[function(require,module,exports){
+},{}],77:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -10492,7 +10672,7 @@ function insertNodeAt(root, node, atIndex) {
 
 module.exports = insertNodeAt;
 
-},{}],75:[function(require,module,exports){
+},{}],78:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -10548,7 +10728,7 @@ if (true) {
   module.exports = invariantDev;
 }
 
-},{}],76:[function(require,module,exports){
+},{}],79:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -10624,7 +10804,7 @@ function isEventSupported(eventNameSuffix, capture) {
 
 module.exports = isEventSupported;
 
-},{"./ExecutionEnvironment":19}],77:[function(require,module,exports){
+},{"./ExecutionEnvironment":19}],80:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -10670,7 +10850,7 @@ function joinClasses(className/*, ... */) {
 
 module.exports = joinClasses;
 
-},{}],78:[function(require,module,exports){
+},{}],81:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -10687,36 +10867,38 @@ module.exports = joinClasses;
  * limitations under the License.
  *
  * @providesModule keyMirror
+ * @typechecks static-only
  */
 
 "use strict";
 
-var throwIf = require("./throwIf");
-
-var NOT_OBJECT_ERROR = 'NOT_OBJECT_ERROR';
-if (true) {
-  NOT_OBJECT_ERROR = 'keyMirror only works on objects';
-}
+var invariant = require("./invariant");
 
 /**
- * Utility for constructing enums with keys being equal to the associated
- * values, even when using advanced key crushing. This is useful for debugging,
- * but also for using the values themselves as lookups into the enum.
- * Example:
- * var COLORS = keyMirror({blue: null, red: null});
- * var myColor = COLORS.blue;
- * var isColorValid = !!COLORS[myColor]
+ * Constructs an enumeration with keys equal to their value.
+ *
+ * For example:
+ *
+ *   var COLORS = keyMirror({blue: null, red: null});
+ *   var myColor = COLORS.blue;
+ *   var isColorValid = !!COLORS[myColor];
+ *
  * The last line could not be performed if the values of the generated enum were
  * not equal to their keys.
- * Input:  {key1: val1, key2: val2}
- * Output: {key1: key1, key2: key2}
+ *
+ *   Input:  {key1: val1, key2: val2}
+ *   Output: {key1: key1, key2: key2}
+ *
+ * @param {object} obj
+ * @return {object}
  */
 var keyMirror = function(obj) {
   var ret = {};
   var key;
-
-  throwIf(!(obj instanceof Object) || Array.isArray(obj), NOT_OBJECT_ERROR);
-
+  invariant(
+    obj instanceof Object && !Array.isArray(obj),
+    'keyMirror(...): Argument must be an object.'
+  );
   for (key in obj) {
     if (!obj.hasOwnProperty(key)) {
       continue;
@@ -10728,7 +10910,7 @@ var keyMirror = function(obj) {
 
 module.exports = keyMirror;
 
-},{"./throwIf":86}],79:[function(require,module,exports){
+},{"./invariant":78}],82:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -10771,7 +10953,7 @@ var keyOf = function(oneKeyObj) {
 
 module.exports = keyOf;
 
-},{}],80:[function(require,module,exports){
+},{}],83:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -10812,7 +10994,7 @@ function memoizeStringOnly(callback) {
 
 module.exports = memoizeStringOnly;
 
-},{}],81:[function(require,module,exports){
+},{}],84:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -10851,7 +11033,7 @@ var merge = function(one, two) {
 
 module.exports = merge;
 
-},{"./mergeInto":83}],82:[function(require,module,exports){
+},{"./mergeInto":86}],85:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -10874,8 +11056,8 @@ module.exports = merge;
 
 "use strict";
 
+var invariant = require("./invariant");
 var keyMirror = require("./keyMirror");
-var throwIf = require("./throwIf");
 
 /**
  * Maximum number of levels to traverse. Will catch circular structures.
@@ -10883,41 +11065,6 @@ var throwIf = require("./throwIf");
  */
 var MAX_MERGE_DEPTH = 36;
 
-var ERRORS = keyMirror({
-  MERGE_ARRAY_FAIL: null,
-  MERGE_CORE_FAILURE: null,
-  MERGE_TYPE_USAGE_FAILURE: null,
-  MERGE_DEEP_MAX_LEVELS: null,
-  MERGE_DEEP_NO_ARR_STRATEGY: null
-});
-
-if (true) {
-  ERRORS = {
-    MERGE_ARRAY_FAIL:
-      'Unsupported type passed to a merge function. You may have passed a ' +
-      'structure that contains an array and the merge function does not know ' +
-      'how to merge arrays. ',
-
-    MERGE_CORE_FAILURE:
-      'Critical assumptions about the merge functions have been violated. ' +
-      'This is the fault of the merge functions themselves, not necessarily ' +
-      'the callers.',
-
-    MERGE_TYPE_USAGE_FAILURE:
-      'Calling merge function with invalid types. You may call merge ' +
-      'functions (non-array non-terminal) OR (null/undefined) arguments. ' +
-      'mergeInto functions have the same requirements but with an added ' +
-      'restriction that the first parameter must not be null/undefined.',
-
-    MERGE_DEEP_MAX_LEVELS:
-      'Maximum deep merge depth exceeded. You may attempting to merge ' +
-      'circular structures in an unsupported way.',
-    MERGE_DEEP_NO_ARR_STRATEGY:
-      'You must provide an array strategy to deep merge functions to ' +
-      'instruct the deep merge how to resolve merging two arrays.'
-  };
-}
-
 /**
  * We won't worry about edge cases like new String('x') or new Boolean(true).
  * Functions are considered terminals, and arrays are not.
@@ -10953,9 +11100,11 @@ var mergeHelpers = {
    * @param {*} two Array to merge from.
    */
   checkMergeArrayArgs: function(one, two) {
-    throwIf(
-      !Array.isArray(one) || !Array.isArray(two),
-      ERRORS.MERGE_CORE_FAILURE
+    invariant(
+      Array.isArray(one) && Array.isArray(two),
+      'Critical assumptions about the merge functions have been violated. ' +
+      'This is the fault of the merge functions themselves, not necessarily ' +
+      'the callers.'
     );
   },
 
@@ -10972,7 +11121,12 @@ var mergeHelpers = {
    * @param {*} arg
    */
   checkMergeObjectArg: function(arg) {
-    throwIf(isTerminal(arg) || Array.isArray(arg), ERRORS.MERGE_CORE_FAILURE);
+    invariant(
+      !isTerminal(arg) && !Array.isArray(arg),
+      'Critical assumptions about the merge functions have been violated. ' +
+      'This is the fault of the merge functions themselves, not necessarily ' +
+      'the callers.'
+    );
   },
 
   /**
@@ -10982,19 +11136,23 @@ var mergeHelpers = {
    * @param {number} Level of recursion to validate against maximum.
    */
   checkMergeLevel: function(level) {
-    throwIf(level >= MAX_MERGE_DEPTH, ERRORS.MERGE_DEEP_MAX_LEVELS);
+    invariant(
+      level < MAX_MERGE_DEPTH,
+      'Maximum deep merge depth exceeded. You may be attempting to merge ' +
+      'circular structures in an unsupported way.'
+    );
   },
 
   /**
-   * Checks that a merge was not given a circular object or an object that had
-   * too great of depth.
+   * Checks that the supplied merge strategy is valid.
    *
-   * @param {number} Level of recursion to validate against maximum.
+   * @param {string} Array merge strategy.
    */
   checkArrayStrategy: function(strategy) {
-    throwIf(
-      strategy !== undefined && !(strategy in mergeHelpers.ArrayStrategies),
-      ERRORS.MERGE_DEEP_NO_ARR_STRATEGY
+    invariant(
+      strategy === undefined || strategy in mergeHelpers.ArrayStrategies,
+      'You must provide an array strategy to deep merge functions to ' +
+      'instruct the deep merge how to resolve merging two arrays.'
     );
   },
 
@@ -11008,14 +11166,13 @@ var mergeHelpers = {
   ArrayStrategies: keyMirror({
     Clobber: true,
     IndexByIndex: true
-  }),
+  })
 
-  ERRORS: ERRORS
 };
 
 module.exports = mergeHelpers;
 
-},{"./keyMirror":78,"./throwIf":86}],83:[function(require,module,exports){
+},{"./invariant":78,"./keyMirror":81}],86:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -11062,7 +11219,7 @@ function mergeInto(one, two) {
 
 module.exports = mergeInto;
 
-},{"./mergeHelpers":82}],84:[function(require,module,exports){
+},{"./mergeHelpers":85}],87:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -11098,7 +11255,7 @@ var mixInto = function(constructor, methodBag) {
 
 module.exports = mixInto;
 
-},{}],85:[function(require,module,exports){
+},{}],88:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -11147,7 +11304,7 @@ function objMapKeyVal(obj, func, context) {
 
 module.exports = objMapKeyVal;
 
-},{}],86:[function(require,module,exports){
+},{}],89:[function(require,module,exports){
 /**
  * Copyright 2013 Facebook, Inc.
  *
@@ -11176,7 +11333,7 @@ var throwIf = function(condition, err) {
 
 module.exports = throwIf;
 
-},{}],87:[function(require,module,exports){
+},{}],90:[function(require,module,exports){
 (function(){/**
  * Copyright 2013 Facebook, Inc.
  *
@@ -11200,22 +11357,7 @@ module.exports = throwIf;
 var ReactComponent = require("./ReactComponent");
 var ReactTextComponent = require("./ReactTextComponent");
 
-var throwIf = require("./throwIf");
-
-/**
- * @polyFill Array.isArray
- */
-var DUPLICATE_KEY_ERROR = 'DUPLICATE_KEY_ERROR';
-var INVALID_CHILD = 'INVALID_CHILD';
-if (true) {
-  INVALID_CHILD =
-    'You may not pass a child of that type to a React component. It ' +
-    'is a common mistake to try to pass a standard browser DOM element ' +
-    'as a child of a React component.';
-  DUPLICATE_KEY_ERROR =
-    'You have two children with identical keys. Make sure that you set the ' +
-    '"key" property to a unique value such as a row ID.';
-}
+var invariant = require("./invariant");
 
 /**
  * TODO: Test that:
@@ -11267,7 +11409,11 @@ var traverseAllChildrenImpl =
         subtreeCount = 1;
       } else {
         if (type === 'object') {
-          throwIf(children && children.nodeType === 1, INVALID_CHILD);
+          invariant(
+            children || children.nodeType !== 1,
+            'traverseAllChildren(...): Encountered an invalid child; DOM ' +
+            'elements are not valid children of React components.'
+          );
           for (var key in children) {
             if (children.hasOwnProperty(key)) {
               subtreeCount += traverseAllChildrenImpl(
@@ -11314,15 +11460,9 @@ function traverseAllChildren(children, callback, traverseContext) {
   }
 }
 
-/**
- * Export the error code for use in other walking/mapping code.
- */
-traverseAllChildren.DUPLICATE_KEY_ERROR = DUPLICATE_KEY_ERROR;
-
-
 module.exports = traverseAllChildren;
 
 })()
-},{"./ReactComponent":22,"./ReactTextComponent":47,"./throwIf":86}]},{},[21])(21)
+},{"./ReactComponent":23,"./ReactTextComponent":48,"./invariant":78}]},{},[22])(22)
 });
 ;