diff options
author | 2019-02-01 10:35:18 +0100 | |
---|---|---|
committer | 2019-02-01 10:35:18 +0100 | |
commit | da92cd426cbf350313945e3459f96638a79bd44e (patch) | |
tree | 931d18bbf62854366ccf7021d6206de7e0c42636 /package.json | |
parent | Update stale.yml (diff) | |
parent | b23 (diff) | |
download | ferdium-app-da92cd426cbf350313945e3459f96638a79bd44e.tar.gz ferdium-app-da92cd426cbf350313945e3459f96638a79bd44e.tar.zst ferdium-app-da92cd426cbf350313945e3459f96638a79bd44e.zip |
Merge branch 'develop'v5.0.0-beta.23
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/package.json b/package.json index 05921d1a1..fba56eb3e 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.22", | 5 | "version": "5.0.0-beta.23", |
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", |
@@ -18,11 +18,11 @@ | |||
18 | "lint": "eslint src", | 18 | "lint": "eslint src", |
19 | "sign": "gulp sign", | 19 | "sign": "gulp sign", |
20 | "prebuild": "gulp build", | 20 | "prebuild": "gulp build", |
21 | "build": "node_modules/.bin/electron-builder --publish onTag", | 21 | "build": "npx electron-builder --publish onTag", |
22 | "rebuild": "node_modules/.bin/electron-rebuild", | 22 | "rebuild": "npx electron-builder install-app-deps", |
23 | "commit": "git-cz", | 23 | "commit": "git-cz", |
24 | "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s", | 24 | "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s", |
25 | "reformat-files": "./node_modules/.bin/prettier --ignore-path .eslintignore --write --require-pragma \"**/*.{js,jsx,scss}\"" | 25 | "reformat-files": "npx prettier --ignore-path .eslintignore --write --require-pragma \"**/*.{js,jsx,scss}\"" |
26 | }, | 26 | }, |
27 | "keywords": [], | 27 | "keywords": [], |
28 | "author": "Stefan Malzner <stefan@adlk.io>", | 28 | "author": "Stefan Malzner <stefan@adlk.io>", |
@@ -40,13 +40,12 @@ | |||
40 | "electron-fetch": "1.3.0", | 40 | "electron-fetch": "1.3.0", |
41 | "electron-hunspell": "0.1.1", | 41 | "electron-hunspell": "0.1.1", |
42 | "electron-react-titlebar": "0.8.1", | 42 | "electron-react-titlebar": "0.8.1", |
43 | "electron-updater": "3.2.3", | 43 | "electron-updater": "4.0.6", |
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 | "hex-to-rgba": "1.0.2", | 47 | "hex-to-rgba": "1.0.2", |
48 | "ini": "^1.3.4", | 48 | "ini": "^1.3.4", |
49 | "jshashes": "^1.0.6", | ||
50 | "jsonwebtoken": "^7.4.1", | 49 | "jsonwebtoken": "^7.4.1", |
51 | "keymaster": "^1.6.2", | 50 | "keymaster": "^1.6.2", |
52 | "lodash": "^4.17.4", | 51 | "lodash": "^4.17.4", |
@@ -72,6 +71,7 @@ | |||
72 | "react-intl": "2.7.2", | 71 | "react-intl": "2.7.2", |
73 | "react-jss": "8.6.1", | 72 | "react-jss": "8.6.1", |
74 | "react-loader": "2.4.5", | 73 | "react-loader": "2.4.5", |
74 | "react-modal": "3.7.1", | ||
75 | "react-router": "^3.0.2", | 75 | "react-router": "^3.0.2", |
76 | "react-sortable-hoc": "0.8.4", | 76 | "react-sortable-hoc": "0.8.4", |
77 | "react-tooltip": "3.9.0", | 77 | "react-tooltip": "3.9.0", |
@@ -95,11 +95,12 @@ | |||
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 | "conventional-changelog-cli": "2.0.11", | ||
98 | "cross-env": "^5.0.5", | 99 | "cross-env": "^5.0.5", |
99 | "cz-conventional-changelog": "2.1.0", | 100 | "cz-conventional-changelog": "2.1.0", |
100 | "dotenv": "^4.0.0", | 101 | "dotenv": "^4.0.0", |
101 | "electron": "^2.0.13", | 102 | "electron": "4.0.2", |
102 | "electron-builder": "20.34.0", | 103 | "electron-builder": "20.38.4", |
103 | "electron-rebuild": "^1.6.0", | 104 | "electron-rebuild": "^1.6.0", |
104 | "eslint": "5.10.0", | 105 | "eslint": "5.10.0", |
105 | "eslint-config-airbnb": "17.1.0", | 106 | "eslint-config-airbnb": "17.1.0", |
@@ -114,8 +115,10 @@ | |||
114 | "gulp-server-livereload": "^1.9.2", | 115 | "gulp-server-livereload": "^1.9.2", |
115 | "hex-rgb": "3.0.0", | 116 | "hex-rgb": "3.0.0", |
116 | "husky": "^1.1.4", | 117 | "husky": "^1.1.4", |
118 | "install": "0.12.2", | ||
117 | "kebab-case": "1.0.0", | 119 | "kebab-case": "1.0.0", |
118 | "node-sass": "^4.7.2", | 120 | "node-sass": "^4.7.2", |
121 | "npm": "6.5.0", | ||
119 | "prettier": "1.15.2" | 122 | "prettier": "1.15.2" |
120 | }, | 123 | }, |
121 | "config": { | 124 | "config": { |