Merge remote-tracking branch 'origin' into release

mmanela · Apr 7, 2024 · 712a3ae · 712a3ae
2 parents 1cdb04e + 5cf02c0
commit 712a3ae
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 22 deletions.
diff --git a/lib/.tool-versions b/lib/.tool-versions
@@ -0,0 +1 @@
+nodejs 16.20.2
diff --git a/lib/package.json b/lib/package.json
@@ -9,6 +9,7 @@
     "@babel/register": "^7.6.0",
     "@graphql-codegen/typescript-resolvers": "1.1.3",
     "@sendgrid/mail": "^7.4.1",
+    "@twemoji/parser": "^15.1.1",
     "@types/connect-ensure-login": "^0.1.5",
     "@types/cron": "^1.7.2",
     "@types/dompurify": "^2.0.0",
@@ -25,7 +26,7 @@
     "@types/react-router-dom": "^4.3.3",
     "@types/react-simple-maps": "^1.0.2",
     "@types/react-tooltip": "^4.2.4",
-    "antd": "4.1.4", 
+    "antd": "4.1.4",
     "apollo-server": "2.14.2",
     "apollo-server-express": "2.14.2",
     "apollo-server-plugin-response-cache": "^0.5.2",
@@ -75,7 +76,6 @@
     "sitemap": "^6.1.4",
     "transliteration": "^2.1.3",
     "tslib": "^1.9.3",
-    "twemoji-parser": "^12.0.0",
     "url-loader": "^2.1.0",
     "web-vitals": "^0.2.4",
     "workbox-background-sync": "^5.1.3",
@@ -126,6 +126,7 @@
     "client:start": "react-app-rewired start",
     "client:build": "react-app-rewired build",
     "client:build:staging": "env-cmd --no-override -f .env.staging.local react-app-rewired build",
+    "client:build:dev": "env-cmd --no-override -f .env.development.local react-app-rewired build",
     "client:test": "react-app-rewired test",
     "client:eject": "react-scripts eject",
     "client:schema": "apollo service:download ./src/schema.json",

diff --git a/lib/src/components/CountryFlag.tsx b/lib/src/components/CountryFlag.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import { parse as emoji } from "twemoji-parser";
+import { parse as emoji } from "@twemoji/parser";
 import { Tooltip, Avatar } from "antd";
 import "./LanguageFlags.scss";
 import { FullIdiomEntry_language_countries, GetIdiomQuery_idiom_equivalents_language_countries, GetIdiomQuery_idiom_language_countries } from "../__generated__/types";

diff --git a/lib/src/custom_typings/limax/index.d.ts b/lib/src/custom_typings/limax/index.d.ts
diff --git a/lib/yarn.lock b/lib/yarn.lock
@@ -2900,6 +2900,11 @@
   resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.3.tgz#472eaab5f15c1ffdd7f8628bd4c4f753995ec79e"
   integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==
 
+"@twemoji/parser@^15.1.1":
+  version "15.1.1"
+  resolved "https://registry.yarnpkg.com/@twemoji/parser/-/parser-15.1.1.tgz#e47e09415403b8444645a3ee465887f0c1bdbb40"
+  integrity sha512-CChRzIu6ngkCJOmURBlYEdX5DZSu+bBTtqR60XjBkFrmvplKW7OQsea+i8XwF4bLVlUXBO7ZmHhRPDzfQyLwwg==
+
 "@types/accepts@*", "@types/accepts@^1.3.5":
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/@types/accepts/-/accepts-1.3.5.tgz#c34bec115cfc746e04fe5a059df4ce7e7b391575"
@@ -17349,11 +17354,6 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
   integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==
 
-twemoji-parser@^12.0.0:
-  version "12.1.3"
-  resolved "https://registry.yarnpkg.com/twemoji-parser/-/twemoji-parser-12.1.3.tgz#916c0153e77bd5f1011e7a99cbeacf52e43c9371"
-  integrity sha512-ND4LZXF4X92/PFrzSgGkq6KPPg8swy/U0yRw1k/+izWRVmq1HYi3khPwV3XIB6FRudgVICAaBhJfW8e8G3HC7Q==
-
 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"