summaryrefslogtreecommitdiffstats
path: root/webapp/package.json
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-05-12 07:50:53 -0400
committerJoram Wilander <jwawilander@gmail.com>2016-05-12 07:50:53 -0400
commit4b260b761a78ea1a0dd6b02df7d25e93b496b6ff (patch)
treef82ff05a4692a52807260df326b9b12698ebf7f2 /webapp/package.json
parenta3cfdf04836bb5cef2c34626c07ce04349178792 (diff)
downloadchat-4b260b761a78ea1a0dd6b02df7d25e93b496b6ff.tar.gz
chat-4b260b761a78ea1a0dd6b02df7d25e93b496b6ff.tar.bz2
chat-4b260b761a78ea1a0dd6b02df7d25e93b496b6ff.zip
Updating client dependancies and ESLint (#2954)
* Updating client dependancies * Fixing eslint errors with updates * Updating eslint
Diffstat (limited to 'webapp/package.json')
-rw-r--r--webapp/package.json48
1 files changed, 24 insertions, 24 deletions
diff --git a/webapp/package.json b/webapp/package.json
index 9c0377cdd..81f868baa 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -5,52 +5,52 @@
"dependencies": {
"autolinker": "mattermost/Autolinker.js#9689831109e104d7b545318e54199e6de8fd9b87",
"bootstrap": "3.3.6",
- "bootstrap-colorpicker": "2.3.0",
- "chart.js": "1.0.2",
+ "bootstrap-colorpicker": "2.3.3",
+ "chart.js": "2.1.2",
"compass-mixins": "0.12.7",
"fastclick": "1.0.6",
"flux": "2.1.1",
- "font-awesome": "4.5.0",
- "highlight.js": "9.2.0",
+ "font-awesome": "4.6.1",
+ "highlight.js": "9.3.0",
"intl": "1.1.0",
"jasny-bootstrap": "3.1.3",
- "jquery": "2.2.1",
+ "jquery": "2.2.3",
"keymirror": "0.1.1",
"marked": "mattermost/marked#cb85e5cc81bc7937dbb73c3c53d9532b1b97e3ca",
"match-at": "0.1.0",
- "object-assign": "4.0.1",
- "perfect-scrollbar": "0.6.10",
- "react": "0.14.7",
- "react-addons-pure-render-mixin": "0.14.7",
- "react-bootstrap": "0.28.3",
+ "object-assign": "4.1.0",
+ "perfect-scrollbar": "0.6.11",
+ "react": "15.0.2",
+ "react-addons-pure-render-mixin": "15.0.2",
+ "react-bootstrap": "0.29.3",
"react-custom-scrollbars": "4.0.0-beta.1",
- "react-dom": "0.14.7",
+ "react-dom": "15.0.2",
"react-intl": "2.0.0-rc-1",
- "react-router": "2.0.1",
- "react-textarea-autosize": "3.3.0",
+ "react-router": "2.4.0",
+ "react-textarea-autosize": "4.0.1",
"superagent": "1.8.3",
"twemoji": "2.0.5",
"velocity-animate": "1.2.3"
},
"devDependencies": {
- "babel-eslint": "5.0.0",
+ "babel-eslint": "6.0.4",
"babel-loader": "6.2.4",
- "babel-plugin-transform-runtime": "6.6.0",
- "babel-polyfill": "6.7.2",
- "babel-preset-es2015-webpack": "6.4.0",
+ "babel-plugin-transform-runtime": "6.8.0",
+ "babel-polyfill": "6.8.0",
+ "babel-preset-es2015-webpack": "6.4.1",
"babel-preset-react": "6.5.0",
"babel-preset-stage-0": "6.5.0",
- "copy-webpack-plugin": "1.1.1",
+ "copy-webpack-plugin": "2.1.3",
"css-loader": "0.23.1",
- "eslint": "2.2.0",
- "eslint-plugin-react": "4.0.0",
+ "eslint": "2.9.0",
+ "eslint-plugin-react": "5.1.1",
"exports-loader": "0.6.3",
"extract-text-webpack-plugin": "1.0.1",
"file-loader": "0.8.5",
"html-loader": "0.4.3",
"imports-loader": "0.6.5",
"jquery-deferred": "0.3.0",
- "jsdom": "8.5.0",
+ "jsdom": "9.0.0",
"jsdom-global": "1.7.0",
"json-loader": "0.5.4",
"mocha": "2.4.5",
@@ -58,11 +58,11 @@
"mocha-webpack": "0.3.0",
"node-sass": "3.4.2",
"raw-loader": "0.5.1",
- "react-addons-test-utils": "0.14.7",
+ "react-addons-test-utils": "15.0.2",
"sass-loader": "3.2.0",
- "style-loader": "0.13.0",
+ "style-loader": "0.13.1",
"url-loader": "0.5.7",
- "webpack": "2.1.0-beta.5",
+ "webpack": "2.1.0-beta.7",
"webpack-node-externals": "1.2.0"
},
"scripts": {