Update dependencies. Fix React 15 deprecations

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 4.0.0
+
+- Upgraded dependencies
+- Removed deprecation warnings for React 15.x
+- Added support for React 15.x
+
 ## 3.5.1
 
 - Added a style tag to the HTML embed addon to cut default body margins

addons/common/__tests__/embedded.test.jsx

@@ -21,8 +21,8 @@ describe('Addons - Common - Embedded', function() {
     component.hasSlug().should.equal(false)
   })
 
-  it ('properly handles cases where the slug is null', function() {
-    const component = render(<Embedded name="test" slug={ null } onChange={ sinon.stub() } />)
+  it ('properly handles cases where the slug is empty', function() {
+    const component = render(<Embedded name="test" slug={ '' } onChange={ sinon.stub() } />)
     component.hasSlug().should.equal(false)
   })
 

addons/common/__tests__/field.test.jsx

@@ -23,7 +23,7 @@ describe('Addons - Common - Field', function () {
   })
 
   it ('sets up aria-describeby for hints', function() {
-    let component = render(<Field hint="Yes" autofocus />)
+    let component = render(<Field hint="Yes" autoFocus />)
     let el = DOM.findDOMNode(component)
     let hint = el.querySelector('.col-field-hint')
     let input = el.querySelector('.col-field-input')

example/server.js

@@ -2,30 +2,19 @@ var Server  = require("webpack-dev-server")
 var Webpack = require("webpack")
 var config  = require('../webpack.config')
 
-config.devtool = '#eval-source-map'
+config.devtool = 'inline-source-map'
 
 config.entry = [
   "webpack-dev-server/client?http://localhost:8080",
-  'webpack/hot/only-dev-server',
   './example/example.js'
 ]
 
-config.plugins = [ new Webpack.HotModuleReplacementPlugin() ]
-
 config.output = {
   filename: 'example.build.js',
   path: __dirname,
   publicPath: '/'
 }
 
-config.module.loaders.unshift(
-  {
-    test    : /\.jsx*$/,
-    exclude : /node_modules/,
-    loader  : 'react-hot'
-  }
-)
-
 module.exports = new Server(Webpack(config), {
   contentBase: './example',
   noInfo: true,

package.json

@@ -6,7 +6,6 @@
   "main": "src/Colonel.js",
   "scripts": {
     "start": "make example",
-    "prepublish": "make build",
     "release": "make release",
     "test": "make test",
     "test:watch": "make test-watch",
@@ -73,26 +72,22 @@
     "mocha": "~2",
     "node-sass": "~3",
     "postcss": "~4.1",
-    "react": "~0.14",
-    "react-addons-test-utils": "~0.14",
-    "react-dom": "~0.14",
-    "react-hot-loader": "~1.2",
+    "react": "~15.2.0",
+    "react-addons-test-utils": "~15.2.0",
+    "react-dom": "~15.2.0",
     "sass-loader": "~2.0",
     "sinon": "1.17.3",
     "sinon-chai": "2.8.0",
     "style-loader": "~0.12",
     "webpack": "1.13.0",
     "webpack-dev-server": "1.14.0"
   },
-  "peerDependencies": {
-    "react": "~0.14"
-  },
   "dependencies": {
     "classnames": "~2",
     "group-by": "0.0.1",
     "microcosm": "~9.21",
-    "react-addons-css-transition-group": "~0.14",
-    "react-focus-trap": "~2.1",
+    "react-addons-css-transition-group": ">= 0.14",
+    "react-focus-trap": "~2.3",
     "react-ink": "~5.1",
     "uid": "0.0.2"
   },

src/components/BlockMenu.jsx

@@ -22,7 +22,7 @@ module.exports = React.createClass({
 
   getMenuItem(item) {
     let { id } = item
-    return (<Item key={ id } ref={ id } { ...item} { ...this.props} />)
+    return (<Item key={ id } ref={ id } { ...item } { ...this.props } />)
   },
 
   getMenuItems() {

src/components/MenuItem.jsx

@@ -25,7 +25,7 @@ module.exports = React.createClass({
   },
 
   render() {
-    let { label, ...safe } = this.props
+    let { label, app, block, onOpen, onExit, active, isDisabled, items, ...safe } = this.props
 
     return (
       <Button { ...safe } onClick={ this._onClick } disabled={ this.isDisabled() }>