Merge branch 'master' into controlled

.babelrc

@@ -1,3 +1,6 @@
 {
-  "presets": ["airbnb"]
+  "presets": ["airbnb"],
+  "plugins": [
+    ["transform-replace-object-assign", "object.assign"],
+  ],
 }

.gitignore

@@ -1,6 +1,12 @@
+# gitignore
+
 lib
 node_modules
 npm-debug.log
 coverage
 build
 .nyc_output
+
+# Only apps should have lockfiles
+yarn.lock
+package-lock.json

.npmrc

@@ -0,0 +1 @@
+package-lock=false

package.json

@@ -30,38 +30,40 @@
   "author": "Josh Perez <josh.perez@airbnb.com>",
   "license": "MIT",
   "devDependencies": {
-    "@kadira/storybook": "^2.35.2",
-    "babel-cli": "^6.18.0",
-    "babel-core": "^6.21.0",
-    "babel-preset-airbnb": "^2.1.1",
+    "@kadira/storybook": "^2.35.3",
+    "babel-cli": "^6.24.1",
+    "babel-core": "^6.24.1",
+    "babel-plugin-transform-replace-object-assign": "^0.2.1",
+    "babel-preset-airbnb": "^2.2.3",
     "babel-register": "^6.24.1",
-    "casual": "^1.5.8",
-    "chai": "^3.5.0",
-    "chai-enzyme": "^0.6.1",
-    "create-react-class": "^15.5.2",
+    "casual": "^1.5.12",
+    "chai": "^4.0.1",
+    "chai-enzyme": "^0.7.1",
+    "create-react-class": "^15.5.3",
     "enzyme": "^2.8.2",
-    "eslint": "^3.13.1",
-    "eslint-config-airbnb": "^14.0.0",
-    "eslint-plugin-import": "^2.2.0",
-    "eslint-plugin-jsx-a11y": "^3.0.2",
-    "eslint-plugin-react": "^6.9.0",
+    "eslint": "^3.19.0",
+    "eslint-config-airbnb": "^15.0.1",
+    "eslint-plugin-import": "^2.3.0",
+    "eslint-plugin-jsx-a11y": "^5.0.3",
+    "eslint-plugin-react": "^7.0.1",
     "has": "^1.0.1",
     "jsdom": "^9.12.0",
-    "mocha": "^3.2.0",
-    "nyc": "^10.2.0",
+    "mocha": "^3.4.2",
+    "nyc": "^11.0.2",
     "raw-loader": "^0.5.1",
-    "react": "^15.4.2",
-    "react-addons-test-utils": "^15.4.2",
-    "react-dom": "^15.4.2",
+    "react": "^15.5.4",
+    "react-addons-test-utils": "^15.5.1",
+    "react-dom": "^15.5.4",
     "react-test-renderer": "^15.5.4",
-    "rimraf": "^2.5.4",
-    "sinon": "^1.17.7",
-    "style-loader": "^0.13.1"
+    "rimraf": "^2.6.1",
+    "sinon": "^2.3.2",
+    "style-loader": "^0.17.0"
   },
   "peerDependencies": {
     "react": ">=0.13.x"
   },
   "dependencies": {
-    "prop-types": "^15.5.6"
+    "object.assign": "^4.0.4",
+    "prop-types": "^15.5.10"
   }
 }