From 4ad9acf10c45e38d40617c968cf73d24e8f7ea3d Mon Sep 17 00:00:00 2001 From: tassoman Date: Thu, 28 Sep 2023 22:42:01 +0200 Subject: [PATCH] draft: updating emoji-datasource to 15.0.1 --- package.json | 3 +- .../emoji/components/emoji-picker.tsx | 2 +- src/features/emoji/data.ts | 3 +- yarn.lock | 52 ++----------------- 4 files changed, 8 insertions(+), 52 deletions(-) diff --git a/package.json b/package.json index b93eb9ce6..28f4fdc85 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,7 @@ "cssnano": "^6.0.0", "detect-passive-events": "^2.0.0", "dotenv": "^16.0.0", - "emoji-datasource": "14.0.0", + "emoji-datasource": "^15.0.1", "emoji-mart": "^5.5.2", "escape-html": "^1.0.3", "exifr": "^7.1.3", @@ -164,7 +164,6 @@ "tiny-queue": "^0.2.1", "ts-node": "^10.9.1", "tslib": "^2.3.1", - "twemoji": "https://github.com/twitter/twemoji#v14.0.2", "type-fest": "^4.0.0", "typescript": "^5.1.3", "util": "^0.12.4", diff --git a/src/features/emoji/components/emoji-picker.tsx b/src/features/emoji/components/emoji-picker.tsx index 695fae2cc..634601697 100644 --- a/src/features/emoji/components/emoji-picker.tsx +++ b/src/features/emoji/components/emoji-picker.tsx @@ -6,7 +6,7 @@ import { joinPublicPath } from 'soapbox/utils/static'; import data from '../data'; const getSpritesheetURL = (set: string) => { - return require('emoji-datasource/img/twitter/sheets/32.png'); + return require('emoji-datasource/img/google/sheets/32.png'); }; const getImageURL = (set: string, name: string) => { diff --git a/src/features/emoji/data.ts b/src/features/emoji/data.ts index 2d74822f3..192011741 100644 --- a/src/features/emoji/data.ts +++ b/src/features/emoji/data.ts @@ -1,4 +1,5 @@ -import data from '@emoji-mart/data/sets/14/twitter.json'; +// import data from '@emoji-mart/data/sets/14/twitter.json'; +import data from 'emoji-datasource/emoji.json'; export interface NativeEmoji { unified: string diff --git a/yarn.lock b/yarn.lock index c732c13a8..f8363a269 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4227,10 +4227,10 @@ electron-to-chromium@^1.4.477: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.519.tgz#01b9bc3f1bb50c4971bdd1eeca6d9a73575bd581" integrity sha512-kqs9oGYL4UFVkLKhqCTgBCYZv+wZ374yABDMqlDda9HvlkQxvSr7kgf4hfWVjMieDbX+1MwPHFBsOGCMIBaFKg== -emoji-datasource@14.0.0: - version "14.0.0" - resolved "https://registry.yarnpkg.com/emoji-datasource/-/emoji-datasource-14.0.0.tgz#99529a62f3a86546fc670c09b672ddc9f24f3d44" - integrity sha512-SoOv0lSa+9/2X9ulSRDhu2u1zAOaOv5vtMY3OYUDcQCoReEh0/3eQAMuBM9LyD7Hy3G4K7mDPDqVeHUWvy7cow== +emoji-datasource@^15.0.1: + version "15.0.1" + resolved "https://registry.yarnpkg.com/emoji-datasource/-/emoji-datasource-15.0.1.tgz#6cc7676e4d48d7559c2e068ffcacf84ec653584c" + integrity sha512-aF5Q6LCKXzJzpG4K0ETiItuzz0xLYxNexR9qWw45/shuuEDWZkOIbeGHA23uopOSYA/LmeZIXIFsySCx+YKg2g== emoji-mart@^5.5.2: version "5.5.2" @@ -4877,15 +4877,6 @@ fs-extra@^11.1.0: jsonfile "^6.0.1" universalify "^2.0.0" -fs-extra@^8.0.1: - version "8.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" - integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== - dependencies: - graceful-fs "^4.2.0" - jsonfile "^4.0.0" - universalify "^0.1.0" - fs-extra@^9.0.0, fs-extra@^9.0.1: version "9.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" @@ -5860,22 +5851,6 @@ jsonc-parser@^3.2.0: resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76" integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w== -jsonfile@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" - integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= - optionalDependencies: - graceful-fs "^4.1.6" - -jsonfile@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-5.0.0.tgz#e6b718f73da420d612823996fdf14a03f6ff6922" - integrity sha512-NQRZ5CRo74MhMMC3/3r5g2k4fjodJ/wh8MxjFbCViWKFjxrnudWSY5vomh+23ZaXzAS7J3fBZIR2dV6WbmfM0w== - dependencies: - universalify "^0.1.2" - optionalDependencies: - graceful-fs "^4.1.6" - jsonfile@^6.0.1: version "6.1.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" @@ -8716,20 +8691,6 @@ tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.1: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf" integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== -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@https://github.com/twitter/twemoji#v14.0.2": - version "14.0.2" - resolved "https://github.com/twitter/twemoji#7a3dad4a4da30497093dab22eafba135f02308e1" - 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" @@ -8883,11 +8844,6 @@ unique-string@^2.0.0: dependencies: crypto-random-string "^2.0.0" -universalify@^0.1.0, universalify@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" - integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== - universalify@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"