diff options
author | 2021-12-16 12:02:18 +0100 | |
---|---|---|
committer | 2021-12-16 12:02:18 +0100 | |
commit | 36c23f67c3783b3986b21ea85d56fc0e37941a0c (patch) | |
tree | 3c9138790d672ff84071bba8e441149c245a80e7 /package.json | |
parent | Bumped up ferdi to '5.6.3' (diff) | |
parent | Iterate on README [skip ci] (diff) | |
download | ferdium-app-36c23f67c3783b3986b21ea85d56fc0e37941a0c.tar.gz ferdium-app-36c23f67c3783b3986b21ea85d56fc0e37941a0c.tar.zst ferdium-app-36c23f67c3783b3986b21ea85d56fc0e37941a0c.zip |
Merge branch 'develop' into release
# Conflicts:
# package-lock.json
# package.json
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/package.json b/package.json index 7cd375949..a8619bf15 100644 --- a/package.json +++ b/package.json | |||
@@ -3,7 +3,7 @@ | |||
3 | "productName": "Ferdi", | 3 | "productName": "Ferdi", |
4 | "desktopName": "ferdi.desktop", | 4 | "desktopName": "ferdi.desktop", |
5 | "appId": "com.kytwb.ferdi", | 5 | "appId": "com.kytwb.ferdi", |
6 | "version": "5.6.3", | 6 | "version": "5.6.4-nightly.34", |
7 | "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", | 7 | "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", |
8 | "copyright": "kytwb", | 8 | "copyright": "kytwb", |
9 | "main": "index.js", | 9 | "main": "index.js", |
@@ -35,8 +35,8 @@ | |||
35 | "contributors": "all-contributors", | 35 | "contributors": "all-contributors", |
36 | "reformat-files": "./node_modules/.bin/prettier --ignore-path .eslintignore --write --require-pragma \"**/*.{js,jsx,scss}\"", | 36 | "reformat-files": "./node_modules/.bin/prettier --ignore-path .eslintignore --write --require-pragma \"**/*.{js,jsx,scss}\"", |
37 | "apply-branding": "ts-node ./src/i18n/apply-branding.ts", | 37 | "apply-branding": "ts-node ./src/i18n/apply-branding.ts", |
38 | "update-submodules": "git submodule update --remote --force", | 38 | "update-submodules": "git submodule update --init --recursive --remote --rebase --force", |
39 | "prepare-code": "npm run lint && npm run reformat-files && npm run manage-translations && npm run apply-branding", | 39 | "prepare-code": "npm run lint:fix && npm run reformat-files && npm run manage-translations && npm run apply-branding", |
40 | "link-readme": "ts-node scripts/link-readme.ts", | 40 | "link-readme": "ts-node scripts/link-readme.ts", |
41 | "minify-images": "./scripts/minify-images.sh", | 41 | "minify-images": "./scripts/minify-images.sh", |
42 | "start:server": "ts-node src/internal-server/test.ts", | 42 | "start:server": "ts-node src/internal-server/test.ts", |
@@ -66,6 +66,7 @@ | |||
66 | "auto-launch": "^5.0.5", | 66 | "auto-launch": "^5.0.5", |
67 | "btoa": "^1.2.1", | 67 | "btoa": "^1.2.1", |
68 | "classnames": "^2.3.1", | 68 | "classnames": "^2.3.1", |
69 | "cld": "^2.7.1", | ||
69 | "color": "^4.0.1", | 70 | "color": "^4.0.1", |
70 | "csstype": "^3.0.9", | 71 | "csstype": "^3.0.9", |
71 | "darkreader": "^4.9.39", | 72 | "darkreader": "^4.9.39", |
@@ -75,7 +76,7 @@ | |||
75 | "electron-fetch": "^1.7.4", | 76 | "electron-fetch": "^1.7.4", |
76 | "electron-find": "^1.0.7", | 77 | "electron-find": "^1.0.7", |
77 | "electron-react-titlebar": "^1.1.0", | 78 | "electron-react-titlebar": "^1.1.0", |
78 | "electron-updater": "^4.3.9", | 79 | "electron-updater": "^4.6.2", |
79 | "electron-window-state": "^5.0.3", | 80 | "electron-window-state": "^5.0.3", |
80 | "fast-folder-size": "^1.5.0", | 81 | "fast-folder-size": "^1.5.0", |
81 | "fs-extra": "^10.0.0", | 82 | "fs-extra": "^10.0.0", |
@@ -87,8 +88,8 @@ | |||
87 | "minimist": "^1.2.5", | 88 | "minimist": "^1.2.5", |
88 | "mobx": "^5.15.0", | 89 | "mobx": "^5.15.0", |
89 | "mobx-localstorage": "^1.2.0", | 90 | "mobx-localstorage": "^1.2.0", |
90 | "mobx-react": "^5.4.2", | 91 | "mobx-react": "^6.3.1", |
91 | "mobx-react-form": "1.35.1", | 92 | "mobx-react-form": "^2.0.9", |
92 | "mobx-react-router": "^3.1.2", | 93 | "mobx-react-router": "^3.1.2", |
93 | "moment": "^2.29.1", | 94 | "moment": "^2.29.1", |
94 | "ms": "^2.1.3", | 95 | "ms": "^2.1.3", |
@@ -104,7 +105,7 @@ | |||
104 | "react-dropzone": "^11.4.2", | 105 | "react-dropzone": "^11.4.2", |
105 | "react-electron-web-view": "^2.0.1", | 106 | "react-electron-web-view": "^2.0.1", |
106 | "react-intl": "^5.21.0", | 107 | "react-intl": "^5.21.0", |
107 | "react-jss": "^8.6.1", | 108 | "react-jss": "^10.8.2", |
108 | "react-loader": "^2.4.7", | 109 | "react-loader": "^2.4.7", |
109 | "react-modal": "^3.14.3", | 110 | "react-modal": "^3.14.3", |
110 | "react-router": "^3.2.6", | 111 | "react-router": "^3.2.6", |
@@ -121,14 +122,14 @@ | |||
121 | "ws": "^8.2.3" | 122 | "ws": "^8.2.3" |
122 | }, | 123 | }, |
123 | "devDependencies": { | 124 | "devDependencies": { |
124 | "@babel/eslint-parser": "^7.16.0", | 125 | "@babel/eslint-parser": "^7.16.3", |
125 | "@babel/plugin-proposal-class-properties": "^7.14.5", | 126 | "@babel/plugin-proposal-class-properties": "^7.14.5", |
126 | "@babel/plugin-proposal-decorators": "^7.16.0", | 127 | "@babel/plugin-proposal-decorators": "^7.16.0", |
127 | "@babel/preset-env": "^7.16.0", | 128 | "@babel/preset-env": "^7.16.0", |
128 | "@babel/preset-react": "^7.14.5", | 129 | "@babel/preset-react": "^7.14.5", |
129 | "@babel/register": "^7.15.3", | 130 | "@babel/register": "^7.15.3", |
130 | "@commitlint/cli": "^14.1.0", | 131 | "@commitlint/cli": "^15.0.0", |
131 | "@commitlint/config-conventional": "^14.1.0", | 132 | "@commitlint/config-conventional": "^15.0.0", |
132 | "@formatjs/cli": "^4.4.0", | 133 | "@formatjs/cli": "^4.4.0", |
133 | "@types/color": "^3.0.2", | 134 | "@types/color": "^3.0.2", |
134 | "@types/expect.js": "^0.3.29", | 135 | "@types/expect.js": "^0.3.29", |
@@ -144,8 +145,8 @@ | |||
144 | "@types/tar": "^6.1.0", | 145 | "@types/tar": "^6.1.0", |
145 | "@types/uuid": "^8.3.1", | 146 | "@types/uuid": "^8.3.1", |
146 | "@types/validator": "^13.6.4", | 147 | "@types/validator": "^13.6.4", |
147 | "@typescript-eslint/eslint-plugin": "^5.1.0", | 148 | "@typescript-eslint/eslint-plugin": "^5.3.1", |
148 | "@typescript-eslint/parser": "^5.1.0", | 149 | "@typescript-eslint/parser": "^5.3.1", |
149 | "all-contributors-cli": "^6.20.0", | 150 | "all-contributors-cli": "^6.20.0", |
150 | "babel-plugin-formatjs": "^10.3.11", | 151 | "babel-plugin-formatjs": "^10.3.11", |
151 | "commitizen": "^4.2.4", | 152 | "commitizen": "^4.2.4", |
@@ -153,20 +154,20 @@ | |||
153 | "cross-env": "^7.0.3", | 154 | "cross-env": "^7.0.3", |
154 | "cz-conventional-changelog": "^3.3.0", | 155 | "cz-conventional-changelog": "^3.3.0", |
155 | "dotenv": "^10.0.0", | 156 | "dotenv": "^10.0.0", |
156 | "electron": "15.3.0", | 157 | "electron": "15.3.3", |
157 | "electron-builder": "22.14.5", | 158 | "electron-builder": "22.14.10", |
158 | "electron-notarize": "^1.1.1", | 159 | "electron-notarize": "^1.1.1", |
159 | "eslint": "^8.1.0", | 160 | "eslint": "^8.2.0", |
160 | "eslint-config-airbnb": "^18.2.1", | 161 | "eslint-config-airbnb": "^19.0.0", |
161 | "eslint-config-airbnb-typescript": "^14.0.1", | 162 | "eslint-config-airbnb-typescript": "^16.0.0", |
162 | "eslint-config-prettier": "^8.3.0", | 163 | "eslint-config-prettier": "^8.3.0", |
163 | "eslint-plugin-import": "^2.25.2", | 164 | "eslint-plugin-import": "^2.25.3", |
164 | "eslint-plugin-jest": "^25.2.2", | 165 | "eslint-plugin-jest": "^25.2.4", |
165 | "eslint-plugin-jsx-a11y": "^6.4.1", | 166 | "eslint-plugin-jsx-a11y": "^6.5.1", |
166 | "eslint-plugin-prettier": "^4.0.0", | 167 | "eslint-plugin-prettier": "^4.0.0", |
167 | "eslint-plugin-react": "^7.26.1", | 168 | "eslint-plugin-react": "^7.27.0", |
168 | "eslint-plugin-react-hooks": "^4.2.0", | 169 | "eslint-plugin-react-hooks": "^4.3.0", |
169 | "eslint-plugin-unicorn": "^37.0.1", | 170 | "eslint-plugin-unicorn": "^39.0.0", |
170 | "expect.js": "^0.3.1", | 171 | "expect.js": "^0.3.1", |
171 | "gulp": "^4.0.2", | 172 | "gulp": "^4.0.2", |
172 | "gulp-babel": "^8.0.0", | 173 | "gulp-babel": "^8.0.0", |
@@ -196,15 +197,14 @@ | |||
196 | "ts-loader": "^5.4.5", | 197 | "ts-loader": "^5.4.5", |
197 | "ts-mocha": "^8.0.0", | 198 | "ts-mocha": "^8.0.0", |
198 | "ts-node": "^10.2.1", | 199 | "ts-node": "^10.2.1", |
199 | "typescript": "4.2.4", | 200 | "typescript": "4.5.2", |
200 | "wait-on": "^6.0.0", | 201 | "wait-on": "^6.0.0", |
201 | "webpack": "^4.46.0", | 202 | "webpack": "^4.46.0", |
202 | "webpack-cli": "^3.3.12", | 203 | "webpack-cli": "^3.3.12", |
203 | "webpack-dev-server": "^3.11.2" | 204 | "webpack-dev-server": "^3.11.2" |
204 | }, | 205 | }, |
205 | "optionalDependencies": { | 206 | "optionalDependencies": { |
206 | "cld": "^2.7.0", | 207 | "node-mac-permissions": "git@github.com:vraravam/node-mac-permissions.git#3cffec37379e6584627d831611a8ff12b57bbcdb" |
207 | "node-mac-permissions": "^2.2.0" | ||
208 | }, | 208 | }, |
209 | "config": { | 209 | "config": { |
210 | "commitizen": { | 210 | "commitizen": { |