aboutsummaryrefslogtreecommitdiffstats
path: root/package.json
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2018-12-13 14:01:33 +0100
committerLibravatar Stefan Malzner <stefan@adlk.io>2018-12-13 14:01:33 +0100
commitb5937bd427e02d64b675c9c4719ec8148c68c224 (patch)
tree3e67ca01935eb36ab6d40a1e197d7c2c0f38b587 /package.json
parentUpdate CHANGELOG.md (diff)
parentIgnore clicks on premium elements (diff)
downloadferdium-app-b5937bd427e02d64b675c9c4719ec8148c68c224.tar.gz
ferdium-app-b5937bd427e02d64b675c9c4719ec8148c68c224.tar.zst
ferdium-app-b5937bd427e02d64b675c9c4719ec8148c68c224.zip
Merge branch 'develop'v5.0.0-beta.21
Diffstat (limited to 'package.json')
-rw-r--r--package.json52
1 files changed, 26 insertions, 26 deletions
diff --git a/package.json b/package.json
index 6c6adee5d..551727ca9 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
2 "name": "franz", 2 "name": "franz",
3 "productName": "Franz", 3 "productName": "Franz",
4 "appId": "com.meetfranz.franz", 4 "appId": "com.meetfranz.franz",
5 "version": "5.0.0-beta.20", 5 "version": "5.0.0-beta.21",
6 "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", 6 "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
7 "copyright": "adlk x franz - Stefan Malzner", 7 "copyright": "adlk x franz - Stefan Malzner",
8 "main": "index.js", 8 "main": "index.js",
@@ -33,7 +33,7 @@
33 "@meetfranz/electron-notification-state": "^1.0.0", 33 "@meetfranz/electron-notification-state": "^1.0.0",
34 "address-rfc2822": "^2.0.1", 34 "address-rfc2822": "^2.0.1",
35 "auto-launch": "https://github.com/meetfranz/node-auto-launch.git", 35 "auto-launch": "https://github.com/meetfranz/node-auto-launch.git",
36 "classnames": "^2.2.5", 36 "classnames": "2.2.6",
37 "debug-electron": "^0.0.4", 37 "debug-electron": "^0.0.4",
38 "du": "^0.1.0", 38 "du": "^0.1.0",
39 "electron-dl": "1.12.0", 39 "electron-dl": "1.12.0",
@@ -44,7 +44,7 @@
44 "electron-window-state": "^4.1.0", 44 "electron-window-state": "^4.1.0",
45 "fs-extra": "7.0.1", 45 "fs-extra": "7.0.1",
46 "gulp-cli": "1.2.2", 46 "gulp-cli": "1.2.2",
47 "hunspell-dict-downloader": "1.0.0", 47 "hex-to-rgba": "1.0.2",
48 "ini": "^1.3.4", 48 "ini": "^1.3.4",
49 "jshashes": "^1.0.6", 49 "jshashes": "^1.0.6",
50 "jsonwebtoken": "^7.4.1", 50 "jsonwebtoken": "^7.4.1",
@@ -54,28 +54,27 @@
54 "mime-types": "2.1.21", 54 "mime-types": "2.1.21",
55 "minimist": "^1.2.0", 55 "minimist": "^1.2.0",
56 "mkdirp": "^0.5.1", 56 "mkdirp": "^0.5.1",
57 "mobx": "^3.1.0", 57 "mobx": "5.7.0",
58 "mobx-localstorage": "^0.1.7", 58 "mobx-localstorage": "1.1.0",
59 "mobx-react": "^4.1.0", 59 "mobx-react": "5.4.2",
60 "mobx-react-form": "^1.32.2", 60 "mobx-react-form": "1.35.1",
61 "mobx-react-router": "^3.1.2", 61 "mobx-react-router": "3.1.2",
62 "moment": "^2.17.1", 62 "moment": "^2.17.1",
63 "normalize-url": "^1.9.1", 63 "normalize-url": "^1.9.1",
64 "pretty-bytes": "^4.0.2", 64 "pretty-bytes": "^4.0.2",
65 "prop-types": "^15.5.10", 65 "prop-types": "^15.5.10",
66 "prop-types-extended": "^0.2.1", 66 "prop-types-extended": "^0.2.1",
67 "react": "^15.4.1", 67 "react": "16.6.3",
68 "react-addons-css-transition-group": "^15.4.2", 68 "react-addons-css-transition-group": "15.6.2",
69 "react-dom": "^15.4.1", 69 "react-dom": "16.6.3",
70 "react-dropzone": "^4.2.1", 70 "react-dropzone": "7.0.1",
71 "react-electron-web-view": "^2.0.1", 71 "react-electron-web-view": "^2.0.1",
72 "react-intl": "^2.3.0", 72 "react-intl": "2.7.2",
73 "react-jss": "8.6.1", 73 "react-jss": "8.6.1",
74 "react-loader": "^2.4.0", 74 "react-loader": "2.4.5",
75 "react-router": "^3.0.2", 75 "react-router": "^3.0.2",
76 "react-router-transition": "^0.1.1", 76 "react-sortable-hoc": "0.8.4",
77 "react-sortable-hoc": "^0.6.7", 77 "react-tooltip": "3.9.0",
78 "react-tooltip": "^3.2.7",
79 "route-parser": "^0.0.5", 78 "route-parser": "^0.0.5",
80 "semver": "^5.4.1", 79 "semver": "^5.4.1",
81 "smoothscroll-polyfill": "^0.3.4", 80 "smoothscroll-polyfill": "^0.3.4",
@@ -84,7 +83,8 @@
84 }, 83 },
85 "devDependencies": { 84 "devDependencies": {
86 "@adlk/misty": "^0.1.1", 85 "@adlk/misty": "^0.1.1",
87 "@babel/core": "^7.0.0", 86 "@babel/cli": "7.0.0",
87 "@babel/core": "7.0.0",
88 "@babel/plugin-proposal-class-properties": "^7.0.0", 88 "@babel/plugin-proposal-class-properties": "^7.0.0",
89 "@babel/plugin-proposal-decorators": "^7.0.0", 89 "@babel/plugin-proposal-decorators": "^7.0.0",
90 "@babel/plugin-proposal-export-default-from": "^7.0.0", 90 "@babel/plugin-proposal-export-default-from": "^7.0.0",
@@ -93,20 +93,20 @@
93 "@babel/plugin-transform-regenerator": "^7.0.0", 93 "@babel/plugin-transform-regenerator": "^7.0.0",
94 "@babel/preset-env": "^7.0.0", 94 "@babel/preset-env": "^7.0.0",
95 "@babel/preset-react": "^7.0.0", 95 "@babel/preset-react": "^7.0.0",
96 "@babel/register": "^7.0.0", 96 "@babel/register": "7.0.0",
97 "babel-eslint": "^10.0.1", 97 "babel-eslint": "10.0.1",
98 "cross-env": "^5.0.5", 98 "cross-env": "^5.0.5",
99 "cz-conventional-changelog": "^2.0.0", 99 "cz-conventional-changelog": "2.1.0",
100 "dotenv": "^4.0.0", 100 "dotenv": "^4.0.0",
101 "electron": "^2.0.13", 101 "electron": "^2.0.13",
102 "electron-builder": "20.34.0", 102 "electron-builder": "20.34.0",
103 "electron-rebuild": "^1.6.0", 103 "electron-rebuild": "^1.6.0",
104 "eslint": "^4.7.1", 104 "eslint": "5.10.0",
105 "eslint-config-airbnb": "^14.1.0", 105 "eslint-config-airbnb": "17.1.0",
106 "eslint-loader": "^1.9.0", 106 "eslint-loader": "^1.9.0",
107 "eslint-plugin-import": "^2.2.0", 107 "eslint-plugin-import": "2.14.0",
108 "eslint-plugin-jsx-a11y": "^3.0.0", 108 "eslint-plugin-jsx-a11y": "6.1.2",
109 "eslint-plugin-react": "^6.10.0", 109 "eslint-plugin-react": "7.11.1",
110 "gulp": "^4.0.0", 110 "gulp": "^4.0.0",
111 "gulp-babel": "^8.0.0", 111 "gulp-babel": "^8.0.0",
112 "gulp-sass": "^4.0.2", 112 "gulp-sass": "^4.0.2",