summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2016-02-01 11:14:43 -0800
committer=Corey Hulen <corey@hulen.com>2016-02-01 11:14:43 -0800
commitbaa2927ab6de624d69662e3ca8805b00f27a9aec (patch)
treea360d88f55462dc6aa9861c3f0ed6cefb05ecfee /web
parent2487d561cd84eeb17c757bb4ee86ff007820da62 (diff)
parentbf69acefc4b5804655af8bc3764351259fbeb571 (diff)
downloadchat-baa2927ab6de624d69662e3ca8805b00f27a9aec.tar.gz
chat-baa2927ab6de624d69662e3ca8805b00f27a9aec.tar.bz2
chat-baa2927ab6de624d69662e3ca8805b00f27a9aec.zip
Merge branch 'master' into fix-email
Diffstat (limited to 'web')
-rw-r--r--web/react/package.json15
1 files changed, 8 insertions, 7 deletions
diff --git a/web/react/package.json b/web/react/package.json
index f36e55b40..ed5adebc2 100644
--- a/web/react/package.json
+++ b/web/react/package.json
@@ -13,18 +13,19 @@
"twemoji": "1.4.1"
},
"devDependencies": {
- "browserify": "12.0.1",
- "babelify": "7.2.0",
+ "babel-eslint": "4.1.5",
+ "babel-plugin-transform-runtime": "6.1.4",
"babel-preset-es2015": "6.1.18",
- "babel-preset-stage-0": "6.1.18",
"babel-preset-react": "6.1.18",
- "babel-plugin-transform-runtime": "6.1.4",
- "uglify-js": "2.6.1",
- "watchify": "3.6.1",
+ "babel-preset-stage-0": "6.1.18",
+ "babelify": "7.2.0",
+ "browserify": "12.0.1",
+ "escope": "3.3.0",
"eslint": "1.9.0",
"eslint-plugin-react": "3.9.0",
"exorcist": "0.4.0",
- "babel-eslint": "4.1.5"
+ "uglify-js": "2.6.1",
+ "watchify": "3.6.1"
},
"scripts": {
"check": "",