diff options
| author | Erik Larkö <erik@mullvad.net> | 2017-12-14 09:31:05 +0100 |
|---|---|---|
| committer | Erik Larkö <erik@mullvad.net> | 2017-12-14 09:31:05 +0100 |
| commit | c544d50488a0c44498f23912a43137ab44705456 (patch) | |
| tree | 8f4d0474eadcf7a7916786acb16a5a8d4a3da328 /package.json | |
| parent | b74910f21f720741a6b7e3e537ee637200e6a449 (diff) | |
| parent | d73225de48ccb45455c08bedb18405f187821c32 (diff) | |
| download | mullvadvpn-c544d50488a0c44498f23912a43137ab44705456.tar.xz mullvadvpn-c544d50488a0c44498f23912a43137ab44705456.zip | |
Merge branch 'reactxp-rebased'
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/package.json b/package.json index f84cc878c8..421d637605 100644 --- a/package.json +++ b/package.json @@ -20,15 +20,18 @@ "mkdirp": "^0.5.1", "moment": "^2.17.1", "prop-types": "^15.5.10", - "react": "^15.6.1", - "react-custom-scrollbars": "^4.0.2", - "react-dom": "^15.6.1", + "react": "^16.0.0", + "react-custom-scrollbars": "^4.2.1", + "react-dom": "^16.0.0", "react-if": "^2.2.1", "react-mapbox-gl": "^2.1.0", + "react-native": "^0.50.4", + "react-native-windows": "^0.50.0-rc.2", "react-redux": "^5.0.2", - "react-router": "^4.1.1", + "react-router": "^4.2.0", "react-router-redux": "5.0.0-alpha.6", "react-transition-group": "^1.2.0", + "reactxp": "^0.46.5", "redux": "^3.0.0", "redux-thunk": "^2.2.0", "shell-escape": "^0.2.0", @@ -53,14 +56,15 @@ "electron-builder": "^19.37.2", "electron-devtools-installer": "^2.2.1", "electron-mocha": "^5.0.0", - "enzyme": "^2.9.1", + "enzyme": "^3.2.0", + "enzyme-adapter-react-16": "^1.1.0", "eslint": "^4.11.0", "eslint-plugin-flowtype": "^2.39.1", "eslint-plugin-react": "^7.5.1", "flow-bin": "^0.50.0", "flow-typed": "^2.2.3", "npm-run-all": "^4.0.1", - "react-test-renderer": "^15.6.1", + "react-test-renderer": "16.0.0", "redux-mock-store": "^1.3.0", "rimraf": "^2.5.4", "sinon": "^3.2.1" |