summaryrefslogtreecommitdiffstats
path: root/web/react/package.json
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-07-30 01:06:50 -0800
committer=Corey Hulen <corey@hulen.com>2015-07-30 01:06:50 -0800
commitd93bf60248f066542d0851a7b6847f925975d77f (patch)
treebb2c8a931855c3a9da6cdd7d906a8f1b99b7fd46 /web/react/package.json
parentb4877c5d36569dae486a1e53f39c35d346e3d3d2 (diff)
parentdeb4fac1f64fde5d5f435129a79eada44cb6994c (diff)
downloadchat-d93bf60248f066542d0851a7b6847f925975d77f.tar.gz
chat-d93bf60248f066542d0851a7b6847f925975d77f.tar.bz2
chat-d93bf60248f066542d0851a7b6847f925975d77f.zip
Merge branch 'master' into mm-1355
Diffstat (limited to 'web/react/package.json')
-rw-r--r--web/react/package.json4
1 files changed, 3 insertions, 1 deletions
diff --git a/web/react/package.json b/web/react/package.json
index 8d9d57fab..2bba29e2b 100644
--- a/web/react/package.json
+++ b/web/react/package.json
@@ -16,7 +16,9 @@
"jest-cli": "~0.1.17",
"reactify": "^0.15.2",
"uglify-js": "~2.4.15",
- "watchify": "^2.1.1"
+ "watchify": "^2.1.1",
+ "eslint": "^0.24.1",
+ "eslint-plugin-react": "^3.0.0"
},
"scripts": {
"start": "watchify --extension=jsx -o ../static/js/bundle.js -v -d ./**/*.jsx",