updated to 1.31.0

1 files changed, 23 insertions, 23 deletions

diff --git a/noto-emoji.patch b/noto-emoji.patch
index 9cbf9029a3f4..696cb2d53b07 100644
--- a/noto-emoji.patch
+++ b/noto-emoji.patch
@@ -9,22 +9,22 @@ index 00000000..b1692606
 +set -e
 +exec git diff origin/master origin/noto-emoji > ${1:-'noto-emoji.patch'}
 diff --git a/package.json b/package.json
-index 863e3c79..fcbd8fc2 100644
+index ccdd03ff..c0bc7c78 100644
 --- a/package.json
 +++ b/package.json
 @@ -79,7 +79,7 @@
      "electron-mocha": "8.1.1",
      "electron-notarize": "0.1.1",
-     "emoji-datasource": "4.1.0",
--    "emoji-datasource-apple": "4.1.0",
-+    "emoji-datasource-google": "4.1.0",
+     "emoji-datasource": "5.0.1",
+-    "emoji-datasource-apple": "5.0.1",
++    "emoji-datasource-google": "5.0.1",
      "emoji-regex": "8.0.0",
      "filesize": "3.6.1",
      "firstline": "1.2.1",
 @@ -366,8 +366,8 @@
        "sticker-creator/dist/**",
        "!node_modules/emoji-datasource/emoji_pretty.json",
-       "!node_modules/emoji-datasource/*.png",
+       "!node_modules/emoji-datasource/**/*.png",
 -      "!node_modules/emoji-datasource-apple/emoji_pretty.json",
 -      "!node_modules/emoji-datasource-apple/img/apple/sheets*",
 +      "!node_modules/emoji-datasource-google/emoji_pretty.json",
@@ -33,19 +33,19 @@ index 863e3c79..fcbd8fc2 100644
        "!**/node_modules/*/{CHANGELOG.md,README.md,README,readme.md,readme,test,__tests__,tests,powered-test,example,examples,*.d.ts}",
        "!**/node_modules/.bin",
 diff --git a/ts/components/emoji/lib.ts b/ts/components/emoji/lib.ts
-index 05dc8b73..9f10357c 100644
+index 47b7f0b0..60996d4b 100644
 --- a/ts/components/emoji/lib.ts
 +++ b/ts/components/emoji/lib.ts
 @@ -69,7 +69,7 @@ export type EmojiData = {
  };
  
- const data = (untypedData as Array<EmojiData>).filter(
--  emoji => emoji.has_img_apple
-+  emoji => emoji.has_img_google
- );
- 
- // @ts-ignore
-@@ -81,7 +81,7 @@ const ROOT_PATH = get(
+ const data = (untypedData as Array<EmojiData>)
+-  .filter(emoji => emoji.has_img_apple)
++  .filter(emoji => emoji.has_img_google)
+   .map(emoji =>
+     // Why this weird map?
+     // the emoji dataset has two separate categories for Emotions and People
+@@ -91,7 +91,7 @@ const ROOT_PATH = get(
  );
  
  const makeImagePath = (src: string) => {
@@ -55,20 +55,20 @@ index 05dc8b73..9f10357c 100644
  
  const imageQueue = new PQueue({ concurrency: 10 });
 diff --git a/yarn.lock b/yarn.lock
-index 20fa5141..3c998b24 100644
+index 288d92c5..ccc02523 100644
 --- a/yarn.lock
 +++ b/yarn.lock
 @@ -6107,10 +6107,10 @@ elliptic@^6.0.0:
      minimalistic-assert "^1.0.0"
      minimalistic-crypto-utils "^1.0.0"
  
--emoji-datasource-apple@4.1.0:
-+emoji-datasource-google@4.1.0:
-   version "4.1.0"
--  resolved "https://registry.yarnpkg.com/emoji-datasource-apple/-/emoji-datasource-apple-4.1.0.tgz#e6725311b115144a32fb60043416a755fea30bf5"
--  integrity sha1-5nJTEbEVFEoy+2AENBanVf6jC/U=
-+  resolved "https://registry.yarnpkg.com/emoji-datasource-google/-/emoji-datasource-google-4.1.0.tgz#d69be74d48c76ee2bb9fcb4e7920f27fa12dde9e"
-+  integrity sha1-1pvnTUjHbuK7n8tOeSDyf6Et3p4=
+-emoji-datasource-apple@5.0.1:
++emoji-datasource-google@5.0.1:
+   version "5.0.1"
+-  resolved "https://registry.yarnpkg.com/emoji-datasource-apple/-/emoji-datasource-apple-5.0.1.tgz#fd3a3fb9993f1c58a53b015e3a30fe640641044f"
+-  integrity sha512-VmbD3iwv5FS2XUuxzmRpkicGNwXWrMe45f5ZL6YkcMznp0YtCsKO2bCxsSZ41XU1aWtwH5IZDqF12038TC01kw==
++  resolved "https://registry.yarnpkg.com/emoji-datasource-google/-/emoji-datasource-google-5.0.1.tgz#81ac5bdbbd153976196a516d840e04303f19375d"
++  integrity sha512-JLlz6tcuNRqg/BUhfWjWmOAaj8VhBvF7E88yRblMh+6c3IBmSeAqlYbepsavS1QPEhhvZICGUkch7+yxWTrRlQ==
  
- emoji-datasource@4.1.0:
-   version "4.1.0"
+ emoji-datasource@5.0.1:
+   version "5.0.1"