Merge pull request #968 from threema-ch/updates

Upgrade dependencies

package.json

@@ -34,75 +34,75 @@
   "private": true,
   "homepage": "https://threema.ch/",
   "dependencies": {
-    "@babel/core": "^7.4.5",
-    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
-    "@babel/plugin-transform-runtime": "^7.4.4",
-    "@babel/preset-env": "^7.4.5",
-    "@babel/runtime": "^7.4.5",
+    "@babel/core": "^7.8.4",
+    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+    "@babel/plugin-transform-runtime": "^7.8.3",
+    "@babel/preset-env": "^7.8.4",
+    "@babel/runtime": "^7.8.4",
     "@saltyrtc/client": "^0.14.4",
     "@saltyrtc/task-relayed-data": "^0.3.1",
     "@saltyrtc/task-webrtc": "^0.14.1",
     "@threema/compose-area": "^0.3.5",
-    "@types/angular": "^1.6.54",
-    "@types/angular-material": "^1.1.68",
-    "@types/angular-sanitize": "^1.3.7",
-    "@types/angular-translate": "^2.16.0",
+    "@types/angular": "^1.6.57",
+    "@types/angular-material": "^1.1.71",
+    "@types/angular-sanitize": "^1.7.0",
+    "@types/angular-translate": "^2.16.2",
     "@types/file-saver": "^2.0.1",
-    "@types/jquery": "^3.3.29",
-    "@types/msgpack-lite": "^0.1.6",
-    "@types/webrtc": "0.0.25",
-    "@uirouter/angularjs": "^1.0.22",
+    "@types/jquery": "^3.3.32",
+    "@types/msgpack-lite": "^0.1.7",
+    "@types/webrtc": "0.0.26",
+    "@uirouter/angularjs": "^1.0.25",
     "angular": "^1.7.9",
-    "angular-animate": "^1.7.8",
-    "angular-aria": "^1.7.8",
+    "angular-animate": "^1.7.9",
+    "angular-aria": "^1.7.9",
     "angular-material": "=1.1.11",
-    "angular-messages": "^1.7.8",
+    "angular-messages": "^1.7.9",
     "angular-qrcode": "~7.2",
-    "angular-route": "^1.7.8",
-    "angular-sanitize": "^1.7.8",
-    "angular-translate": "~2.18",
+    "angular-route": "^1.7.9",
+    "angular-sanitize": "^1.7.9",
+    "angular-translate": "~2.18.2",
     "angularjs-scroll-glue": "=2.1.0",
-    "autolinker": "^3.11.1",
+    "autolinker": "^3.12.0",
     "babel-loader": "^8.0.6",
-    "core-js": "^3.1.4",
+    "core-js": "^3.6.4",
     "croppie": "^2.6.4",
-    "emojibase-regex": "^3.2.0",
+    "emojibase-regex": "^3.2.1",
     "file-saver": "^2.0.2",
-    "messageformat": "^2.2.1",
+    "messageformat": "^2.3.0",
     "msgpack-lite": "~0.1.26",
-    "node-sass": "^4.12.0",
-    "sdp": "~2.9.0",
-    "ts-events": "^3.3.1",
-    "ts-loader": "^6",
+    "node-sass": "^4.13.1",
+    "sdp": "~2.12.0",
+    "ts-events": "~3.4.0",
+    "ts-loader": "~6.2.1",
     "ts-log": "^2.1.4",
-    "tweetnacl": "^1.0.1",
-    "twemoji": "^11.3.0",
-    "typescript": "^3.5.2",
-    "webpack": "^4.35.0",
-    "webpack-cli": "^3.3.5",
-    "webpack-merge": "^4.2.1",
-    "webrtc-adapter": "^7.2.4"
+    "tweetnacl": "^1.0.3",
+    "twemoji": "^12.1.5",
+    "typescript": "~3.7.5",
+    "webpack": "^4.41.6",
+    "webpack-cli": "^3.3.11",
+    "webpack-merge": "^4.2.2",
+    "webrtc-adapter": "^7.5.0"
   },
   "devDependencies": {
-    "@types/chai": "^4.1.7",
-    "@types/jasmine": "^3.3.13",
-    "@types/selenium-webdriver": "^4.0.0",
-    "angular-mocks": "^1.7.8",
+    "@types/chai": "^4.2.9",
+    "@types/jasmine": "^3.5.4",
+    "@types/selenium-webdriver": "^4.0.8",
+    "angular-mocks": "^1.7.9",
     "chai": "^4.2.0",
-    "concurrently": "~4.1.0",
-    "geckodriver": "^1.16.2",
-    "jasmine": "^3.4.0",
-    "jasmine-core": "^3.4.0",
-    "karma": "^4.1.0",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-firefox-launcher": "^1.1.0",
-    "karma-jasmine": "^2.0.1",
-    "sass-lint": "^1.13.1",
-    "sass-lint-auto-fix": "^0.17",
-    "selenium-webdriver": "^4.0.0-alpha.4",
+    "concurrently": "~5.1.0",
+    "geckodriver": "~1.19.1",
+    "jasmine": "~3.5.0",
+    "jasmine-core": "~3.5.0",
+    "karma": "~4.4.1",
+    "karma-chrome-launcher": "~3.1.0",
+    "karma-firefox-launcher": "~1.3.0",
+    "karma-jasmine": "~3.1.1",
+    "sass-lint": "~1.13.1",
+    "sass-lint-auto-fix": "~0.21.0",
+    "selenium-webdriver": "^4.0.0-alpha.5",
     "term-color": "^1.0.1",
-    "ts-node": "^8",
-    "tslint": "^5.18.0",
-    "webpack-dev-server": "^3.7.2"
+    "ts-node": "~8.6.2",
+    "tslint": "~6.0.0",
+    "webpack-dev-server": "^3.10.3"
   }
 }

src/helpers/emoji.ts

@@ -3099,7 +3099,7 @@ export function emojify(text: string): string {
 /**
  * Convert emoji unicode characters to structured EmojiInfo objects.
  */
-export function parseEmoji(text: string): Array<threema.EmojiInfo | string> {
+export function parseEmoji(text: string): (threema.EmojiInfo | string)[] {
     // Create a global RegExp, which stores state
     const regex = new RegExp(EMOJI_REGEX, 'g');
     const result = [];