Update emoji (#2714)

Emoji's broke because maxcdn stopped hosting the assets (see https://github.com/twitter/twemoji).

We can't just upgrade the library as Elon Musk's changes at twitter mean they don't support it any more. We could just change the asset URL but I thought we might as well update to a maintained fork (https://github.com/jdecked/twemoji), and get emoji v15 in the process 🫨

Backend: https://codeberg.org/karrot/karrot-backend/pulls/1295

Reviewed-on: https://codeberg.org/karrot/karrot-frontend/pulls/2714
Co-authored-by: Nick Sellen <git@nicksellen.co.uk>
Co-committed-by: Nick Sellen <git@nicksellen.co.uk>

Author: nicksellen

package.json

@@ -45,6 +45,7 @@
     "@quasar/extras": "^1.16.5",
     "@sentry/vue": "^7.59.2",
     "@tanstack/vue-query": "^4.29.25",
+    "@twemoji/api": "^15.1.0",
     "@vuelidate/core": "^2.0.3",
     "@vuelidate/validators": "^2.0.3",
     "@vueuse/core": "^10.2.1",
@@ -64,7 +65,7 @@
     "livekit-client": "^1.15.5",
     "loglevel": "^1.8.1",
     "markdown-it": "^13.0.1",
-    "markdown-it-emoji": "^2.0.2",
+    "markdown-it-emoji": "^3.0.0",
     "markdown-it-link-attributes": "^4.0.1",
     "markdown-it-regexp": "^0.4.0",
     "mitt": "^3.0.1",
@@ -73,7 +74,6 @@
     "rollup": "^3.26.3",
     "rrule": "^2.7.2",
     "sortablejs": "^1.15.0",
-    "twemoji": "^14.0.2",
     "v-tooltip": "^2.1.3",
     "vite": "^4.4.4",
     "vue": "^3.3.4",

src/messages/components/ConversationAddReactionInner.vue

@@ -27,7 +27,7 @@
 </template>
 
 <script>
-import emojiList from 'markdown-it-emoji/lib/data/full.json'
+import emojiList from 'markdown-it-emoji/lib/data/full.mjs'
 import {
   QInput,
   QIcon,

src/messages/components/EmojiButton.vue

@@ -14,9 +14,9 @@
 </template>
 
 <script>
-import emojiList from 'markdown-it-emoji/lib/data/full.json'
+import twemoji from '@twemoji/api'
+import emojiList from 'markdown-it-emoji/lib/data/full.mjs'
 import { QBtn } from 'quasar'
-import twemoji from 'twemoji'
 
 const EMOJI_CACHE = {}
 function getEmojiElement (name) {

src/utils/components/markdownRenderer.js

@@ -1,10 +1,10 @@
+import twemoji from '@twemoji/api'
 import markdownIt from 'markdown-it'
-import emoji from 'markdown-it-emoji'
+import { full as emoji } from 'markdown-it-emoji'
 import defaultEmojiShortcuts from 'markdown-it-emoji/lib/data/shortcuts'
 import markdownLinkAttributes from 'markdown-it-link-attributes'
 import RegexPlugin from 'markdown-it-regexp'
 import utils from 'markdown-it-regexp/lib/utils'
-import twemoji from 'twemoji'
 
 // Override to pass the env through...
 RegexPlugin.prototype.render = function (tokens, id, options, env) {

yarn.lock

@@ -3230,6 +3230,21 @@
   resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
   integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
 
+"@twemoji/api@^15.1.0":
+  version "15.1.0"
+  resolved "https://registry.yarnpkg.com/@twemoji/api/-/api-15.1.0.tgz#66fc74c74accbcb6376d977560a03bba5215923c"
+  integrity sha512-CySXR4/e6vY0z9lC2tW9EVjsH6zzz2/LQvLRMwwpHsDI4xcaweSIP+LcESf1Mq7w2/zcrrhG4ozniMvpSsEXag==
+  dependencies:
+    "@twemoji/parser" "15.1.0"
+    fs-extra "^8.0.1"
+    jsonfile "^5.0.0"
+    universalify "^0.1.2"
+
+"@twemoji/parser@15.1.0":
+  version "15.1.0"
+  resolved "https://registry.yarnpkg.com/@twemoji/parser/-/parser-15.1.0.tgz#ad83b69fcd1fbcb705022f2b85d73e127ad5f335"
+  integrity sha512-3HTiSxPvkWUJ4kZeCvwyKlIwkpTUfBOk6igpBBRQni58ceQMv5YK4smkc8vX/eqOlMMNER/9qobv+Q6Q8LVrqA==
+
 "@types/aria-query@^5.0.1":
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-5.0.1.tgz#3286741fb8f1e1580ac28784add4c7a1d49bdfbc"
@@ -8767,10 +8782,10 @@ map-or-similar@^1.5.0:
   resolved "https://registry.yarnpkg.com/map-or-similar/-/map-or-similar-1.5.0.tgz#6de2653174adfb5d9edc33c69d3e92a1b76faf08"
   integrity sha512-0aF7ZmVon1igznGI4VS30yugpduQW3y3GkcgGJOp7d8x8QrizhigUxjI/m2UojsXXto+jLAH3KSz+xOJTiORjg==
 
-markdown-it-emoji@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/markdown-it-emoji/-/markdown-it-emoji-2.0.2.tgz#cd42421c2fda1537d9cc12b9923f5c8aeb9029c8"
-  integrity sha512-zLftSaNrKuYl0kR5zm4gxXjHaOI3FAOEaloKmRA5hijmJZvSjmxcokOLlzycb/HXlUFWzXqpIEoyEMCE4i9MvQ==
+markdown-it-emoji@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/markdown-it-emoji/-/markdown-it-emoji-3.0.0.tgz#8475a04d671d7c93f931b76fb90c582768b7f0b5"
+  integrity sha512-+rUD93bXHubA4arpEZO3q80so0qgoFJEKRkRbjKX8RTdca89v2kfyF+xR3i2sQTwql9tpPZPOQN5B+PunspXRg==
 
 markdown-it-link-attributes@^4.0.1:
   version "4.0.1"
@@ -11837,21 +11852,6 @@ tunnel-agent@^0.6.0:
   dependencies:
     safe-buffer "^5.0.1"
 
-twemoji-parser@14.0.0:
-  version "14.0.0"
-  resolved "https://registry.yarnpkg.com/twemoji-parser/-/twemoji-parser-14.0.0.tgz#13dabcb6d3a261d9efbf58a1666b182033bf2b62"
-  integrity sha512-9DUOTGLOWs0pFWnh1p6NF+C3CkQ96PWmEFwhOVmT3WbecRC+68AIqpsnJXygfkFcp4aXbOp8Dwbhh/HQgvoRxA==
-
-twemoji@^14.0.2:
-  version "14.0.2"
-  resolved "https://registry.yarnpkg.com/twemoji/-/twemoji-14.0.2.tgz#c53adb01dab22bf4870f648ca8cc347ce99ee37e"
-  integrity sha512-BzOoXIe1QVdmsUmZ54xbEH+8AgtOKUiG53zO5vVP2iUu6h5u9lN15NcuS6te4OY96qx0H7JK9vjjl9WQbkTRuA==
-  dependencies:
-    fs-extra "^8.0.1"
-    jsonfile "^5.0.0"
-    twemoji-parser "14.0.0"
-    universalify "^0.1.2"
-
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"