summaryrefslogtreecommitdiffhomepage
path: root/package.json
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@mullvad.net>2018-08-08 16:53:23 +0200
committerAndrej Mihajlov <and@mullvad.net>2018-08-08 16:53:23 +0200
commitac98e48c68eadfdd7250eccd38aa492e6f830744 (patch)
tree05bfd7a9f05456220f11f40329093b127a5b20a2 /package.json
parentd53fda746465c0bb6525371b9d780cbfac90f942 (diff)
parenta8f2831cd50e98b1d126b8c3169adcf1ef75b8a2 (diff)
downloadmullvadvpn-ac98e48c68eadfdd7250eccd38aa492e6f830744.tar.xz
mullvadvpn-ac98e48c68eadfdd7250eccd38aa492e6f830744.zip
Merge branch 'remove-auto-login'
Diffstat (limited to 'package.json')
-rw-r--r--package.json14
1 files changed, 7 insertions, 7 deletions
diff --git a/package.json b/package.json
index 084a96b0ca..f2aa5b4425 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
"react-redux": "^5.0.7",
"react-router": "^4.3.1",
"react-simple-maps": "^0.10.1",
- "reactxp": "^1.3.0",
+ "reactxp": "^1.3.3",
"redux": "^4.0.0",
"redux-thunk": "^2.3.0",
"uuid": "^3.0.1",
@@ -60,13 +60,13 @@
"enzyme-adapter-react-16": "^1.1.0",
"eslint": "^4.19.1",
"eslint-config-prettier": "^2.9.0",
- "eslint-plugin-flowtype": "^2.49.3",
- "eslint-plugin-react": "^7.9.1",
+ "eslint-plugin-flowtype": "^2.50.0",
+ "eslint-plugin-react": "^7.10.0",
"flow-bin": "^0.78.0",
- "flow-typed": "^2.4.0",
- "mock-socket": "^7.1.0",
+ "flow-typed": "^2.5.1",
+ "mock-socket": "^8.0.2",
"npm-run-all": "^4.0.1",
- "prettier": "1.13.7",
+ "prettier": "1.14.0",
"rimraf": "^2.5.4"
},
"scripts": {
@@ -90,6 +90,6 @@
"private:serve": "cross-env BABEL_ENV=electron babel-node scripts/serve.js",
"private:compile": "babel app/ --copy-files --out-dir build",
"private:clean": "rimraf build",
- "private:format": "cross-env prettier 'app/**/*.js' 'test/**/*.js'"
+ "private:format": "cross-env prettier 'app/**/*.js' 'test/**/*.js' 'scripts/*.js'"
}
}