From 70cbfcbce643b230d8f7c66f615b4cc9bde9b816 Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Fri, 24 Jun 2022 19:35:01 +0200 Subject: [PATCH 01/52] feat: add themeVersion flag to ChatProps & ChatContext --- src/components/Chat/Chat.tsx | 4 ++++ src/components/Chat/hooks/useCreateChatContext.ts | 2 ++ src/context/ChatContext.tsx | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/components/Chat/Chat.tsx b/src/components/Chat/Chat.tsx index 2ea0e4c272..34abe815c2 100644 --- a/src/components/Chat/Chat.tsx +++ b/src/components/Chat/Chat.tsx @@ -44,6 +44,8 @@ export type ChatProps< initialNavOpen?: boolean; /** @deprecated and to be removed in a future major release. Use the `customStyles` prop to adjust CSS variables and [customize the theme](https://getstream.io/chat/docs/sdk/react/customization/css_and_theming/#css-variables) of your app */ theme?: Theme; + /** temporary flag to signal whether markup for newer V2 styles version should be generated. Defaults to 1 */ + themeVersion?: 1 | 2; /** Windows 10 does not support country flag emojis out of the box. It chooses to render these emojis as characters instead. Stream * Chat can override this behavior by loading a custom web font that will render images instead (PNGs or SVGs depending on the platform). * Set this prop to true if you want to use these custom emojis for Windows users. @@ -70,6 +72,7 @@ export const Chat = < i18nInstance, initialNavOpen = true, theme = 'messaging light', + themeVersion = 1, useImageFlagEmojisOnWindows = false, } = props; @@ -102,6 +105,7 @@ export const Chat = < openMobileNav, setActiveChannel, theme, + themeVersion, useImageFlagEmojisOnWindows, }); diff --git a/src/components/Chat/hooks/useCreateChatContext.ts b/src/components/Chat/hooks/useCreateChatContext.ts index 74c00b8151..3986ff2539 100644 --- a/src/components/Chat/hooks/useCreateChatContext.ts +++ b/src/components/Chat/hooks/useCreateChatContext.ts @@ -21,6 +21,7 @@ export const useCreateChatContext = < openMobileNav, setActiveChannel, theme, + themeVersion, useImageFlagEmojisOnWindows, } = value; @@ -47,6 +48,7 @@ export const useCreateChatContext = < openMobileNav, setActiveChannel, theme, + themeVersion, useImageFlagEmojisOnWindows, }), [ diff --git a/src/context/ChatContext.tsx b/src/context/ChatContext.tsx index 142ab60654..01a2765592 100644 --- a/src/context/ChatContext.tsx +++ b/src/context/ChatContext.tsx @@ -3,7 +3,7 @@ import React, { PropsWithChildren, useContext } from 'react'; import type { AppSettingsAPIResponse, Channel, Mute, StreamChat } from 'stream-chat'; import { getDisplayName } from './utils/getDisplayName'; -import type { Theme } from '../components/Chat/Chat'; +import type { ChatProps, Theme } from '../components/Chat/Chat'; import type { DefaultStreamChatGenerics, UnknownType } from '../types/types'; import type { ChannelsQueryState } from '../components/Chat/hooks/useChannelsQueryState'; @@ -40,6 +40,7 @@ export type ChatContextValue< ) => void; /** @deprecated */ theme: Theme; + themeVersion: ChatProps['themeVersion']; useImageFlagEmojisOnWindows: boolean; channel?: Channel; customClasses?: CustomClasses; From 34210879aaede5ecf63dc4c85da47440372af058 Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Mon, 27 Jun 2022 11:11:31 +0200 Subject: [PATCH 02/52] feat: compute the themeVersion value, remove themeVersion Chat prop --- src/components/Chat/Chat.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/Chat/Chat.tsx b/src/components/Chat/Chat.tsx index 34abe815c2..9cb9d5667d 100644 --- a/src/components/Chat/Chat.tsx +++ b/src/components/Chat/Chat.tsx @@ -44,8 +44,6 @@ export type ChatProps< initialNavOpen?: boolean; /** @deprecated and to be removed in a future major release. Use the `customStyles` prop to adjust CSS variables and [customize the theme](https://getstream.io/chat/docs/sdk/react/customization/css_and_theming/#css-variables) of your app */ theme?: Theme; - /** temporary flag to signal whether markup for newer V2 styles version should be generated. Defaults to 1 */ - themeVersion?: 1 | 2; /** Windows 10 does not support country flag emojis out of the box. It chooses to render these emojis as characters instead. Stream * Chat can override this behavior by loading a custom web font that will render images instead (PNGs or SVGs depending on the platform). * Set this prop to true if you want to use these custom emojis for Windows users. @@ -72,7 +70,6 @@ export const Chat = < i18nInstance, initialNavOpen = true, theme = 'messaging light', - themeVersion = 1, useImageFlagEmojisOnWindows = false, } = props; @@ -89,6 +86,9 @@ export const Chat = < } = useChat({ client, defaultLanguage, i18nInstance, initialNavOpen }); const channelsQueryState = useChannelsQueryState(); + const themeVersion = (getComputedStyle(document.documentElement) + .getPropertyValue('--str-chat__theme-version') + .replace(' ', '') || '1') as '1' | '2'; useCustomStyles(darkMode ? darkModeTheme : customStyles); From 695f30a0f6137c4c84f07ef8528e97f6666a40db Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Mon, 27 Jun 2022 13:52:33 +0200 Subject: [PATCH 03/52] feat: add ThemeVersion type to ChatContext --- src/context/ChatContext.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/context/ChatContext.tsx b/src/context/ChatContext.tsx index 01a2765592..c53574bc29 100644 --- a/src/context/ChatContext.tsx +++ b/src/context/ChatContext.tsx @@ -3,7 +3,7 @@ import React, { PropsWithChildren, useContext } from 'react'; import type { AppSettingsAPIResponse, Channel, Mute, StreamChat } from 'stream-chat'; import { getDisplayName } from './utils/getDisplayName'; -import type { ChatProps, Theme } from '../components/Chat/Chat'; +import type { Theme } from '../components/Chat/Chat'; import type { DefaultStreamChatGenerics, UnknownType } from '../types/types'; import type { ChannelsQueryState } from '../components/Chat/hooks/useChannelsQueryState'; @@ -23,6 +23,8 @@ export type CustomClasses = Partial>; type ChannelCID = string; // e.g.: "messaging:general" +type ThemeVersion = '1' | '2'; + export type ChatContextValue< StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics > = { @@ -40,7 +42,7 @@ export type ChatContextValue< ) => void; /** @deprecated */ theme: Theme; - themeVersion: ChatProps['themeVersion']; + themeVersion: ThemeVersion; useImageFlagEmojisOnWindows: boolean; channel?: Channel; customClasses?: CustomClasses; From 50c82717c0a6e7dfec409faa91e89bbbe57e4d82 Mon Sep 17 00:00:00 2001 From: Anton Arnautov Date: Wed, 22 Jun 2022 22:19:53 +0200 Subject: [PATCH 04/52] chore(deps): added package clsx --- package.json | 1 + yarn.lock | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/package.json b/package.json index a0a63e1dd2..b47b729fb9 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "@braintree/sanitize-url": "6.0.0", "@juggle/resize-observer": "^3.3.1", "@stream-io/stream-chat-css": "^2.10.0", + "clsx": "^1.1.1", "dayjs": "^1.10.4", "emoji-mart": "3.0.1", "emoji-regex": "^9.2.0", diff --git a/yarn.lock b/yarn.lock index e32279ae01..c4757b19b2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5958,6 +5958,11 @@ cloneable-readable@^1.0.0: process-nextick-args "^2.0.0" readable-stream "^2.3.5" +clsx@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188" + integrity sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA== + cmd-shim@^3.0.0, cmd-shim@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-3.0.3.tgz#2c35238d3df37d98ecdd7d5f6b8dc6b21cadc7cb" From bff3f86ffe64758921c3ab07136633f68c4982a8 Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Tue, 5 Jul 2022 08:02:31 +0200 Subject: [PATCH 05/52] chore: upgrade typescript version --- package.json | 2 +- yarn.lock | 1838 ++++---------------------------------------------- 2 files changed, 133 insertions(+), 1707 deletions(-) diff --git a/package.json b/package.json index b47b729fb9..d81fc346b7 100644 --- a/package.json +++ b/package.json @@ -171,7 +171,7 @@ "style-loader": "^2.0.0", "ts-jest": "^26.5.1", "tslib": "2.3.0", - "typescript": "4.3.5", + "typescript": "^4.7.4", "url-loader": "^4.1.1", "webpack": "4.44.2", "webpack-cli": "^3.3.12", diff --git a/yarn.lock b/yarn.lock index c4757b19b2..c34bae53a9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -34,53 +34,19 @@ "@nicolo-ribaudo/chokidar-2" "2.1.8-no-fsevents" chokidar "^3.4.0" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658" - integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g== - dependencies: - "@babel/highlight" "^7.12.13" - -"@babel/code-frame@^7.16.7": +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789" integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg== dependencies: "@babel/highlight" "^7.16.7" -"@babel/compat-data@^7.13.0", "@babel/compat-data@^7.13.8": - version "7.13.11" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.11.tgz#9c8fe523c206979c9a81b1e12fe50c1254f1aa35" - integrity sha512-BwKEkO+2a67DcFeS3RLl0Z3Gs2OvdXewuWjc1Hfokhb5eQWP9YRYH1/+VrVZvql2CfjOiNGqSAFOYt4lsqTHzg== - -"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.8", "@babel/compat-data@^7.17.0", "@babel/compat-data@^7.17.7": +"@babel/compat-data@^7.13.0", "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.8", "@babel/compat-data@^7.17.0", "@babel/compat-data@^7.17.7": version "7.17.7" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.7.tgz#078d8b833fbbcc95286613be8c716cef2b519fa2" integrity sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ== -"@babel/core@^7.1.0", "@babel/core@^7.12.9", "@babel/core@^7.7.5": - version "7.13.10" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.10.tgz#07de050bbd8193fcd8a3c27918c0890613a94559" - integrity sha512-bfIYcT0BdKeAZrovpMqX2Mx5NrgAckGbwT982AkdS5GNfn3KMGiprlBAtmBcFZRUmpaufS6WZFP8trvx8ptFDw== - dependencies: - "@babel/code-frame" "^7.12.13" - "@babel/generator" "^7.13.9" - "@babel/helper-compilation-targets" "^7.13.10" - "@babel/helper-module-transforms" "^7.13.0" - "@babel/helpers" "^7.13.10" - "@babel/parser" "^7.13.10" - "@babel/template" "^7.12.13" - "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.0" - convert-source-map "^1.7.0" - debug "^4.1.0" - gensync "^1.0.0-beta.2" - json5 "^2.1.2" - lodash "^4.17.19" - semver "^6.3.0" - source-map "^0.5.0" - -"@babel/core@^7.17.8", "@babel/core@^7.17.9": +"@babel/core@^7.1.0", "@babel/core@^7.12.9", "@babel/core@^7.17.8", "@babel/core@^7.17.9", "@babel/core@^7.7.5": version "7.17.9" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.9.tgz#6bae81a06d95f4d0dec5bb9d74bbc1f58babdcfe" integrity sha512-5ug+SfZCpDAkVp9SFIZAzlW18rlzsOcJGaetCjkySnrXXDUw9AR8cDUm1iByTmdWM6yxX6/zycaV76w3YTF2gw== @@ -101,25 +67,7 @@ json5 "^2.2.1" semver "^6.3.0" -"@babel/generator@^7.13.0", "@babel/generator@^7.13.9": - version "7.13.9" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.9.tgz#3a7aa96f9efb8e2be42d38d80e2ceb4c64d8de39" - integrity sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw== - dependencies: - "@babel/types" "^7.13.0" - jsesc "^2.5.1" - source-map "^0.5.0" - -"@babel/generator@^7.17.3", "@babel/generator@^7.17.7": - version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.7.tgz#8da2599beb4a86194a3b24df6c085931d9ee45ad" - integrity sha512-oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w== - dependencies: - "@babel/types" "^7.17.0" - jsesc "^2.5.1" - source-map "^0.5.0" - -"@babel/generator@^7.17.9": +"@babel/generator@^7.17.7", "@babel/generator@^7.17.9": version "7.17.9" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.9.tgz#f4af9fd38fa8de143c29fce3f71852406fc1e2fc" integrity sha512-rAdDousTwxbIxbz5I7GEQ3lUip+xVCXooZNbsydCWs3xA7ZsYOv+CFRdzGxRX78BmQHu9B1Eso59AOZQOJDEdQ== @@ -128,13 +76,6 @@ jsesc "^2.5.1" source-map "^0.5.0" -"@babel/helper-annotate-as-pure@^7.10.4", "@babel/helper-annotate-as-pure@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz#0f58e86dfc4bb3b1fcd7db806570e177d439b6ab" - integrity sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw== - dependencies: - "@babel/types" "^7.12.13" - "@babel/helper-annotate-as-pure@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862" @@ -142,14 +83,6 @@ dependencies: "@babel/types" "^7.16.7" -"@babel/helper-builder-binary-assignment-operator-visitor@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz#6bc20361c88b0a74d05137a65cac8d3cbf6f61fc" - integrity sha512-CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA== - dependencies: - "@babel/helper-explode-assignable-expression" "^7.12.13" - "@babel/types" "^7.12.13" - "@babel/helper-builder-binary-assignment-operator-visitor@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz#38d138561ea207f0f69eb1626a418e4f7e6a580b" @@ -158,17 +91,7 @@ "@babel/helper-explode-assignable-expression" "^7.16.7" "@babel/types" "^7.16.7" -"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.10", "@babel/helper-compilation-targets@^7.13.8": - version "7.13.10" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.10.tgz#1310a1678cb8427c07a753750da4f8ce442bdd0c" - integrity sha512-/Xju7Qg1GQO4mHZ/Kcs6Au7gfafgZnwm+a7sy/ow/tV1sHeraRUHbjdat8/UvDor4Tez+siGKDk6zIKtCPKVJA== - dependencies: - "@babel/compat-data" "^7.13.8" - "@babel/helper-validator-option" "^7.12.17" - browserslist "^4.14.5" - semver "^6.3.0" - -"@babel/helper-compilation-targets@^7.16.7", "@babel/helper-compilation-targets@^7.17.7": +"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7", "@babel/helper-compilation-targets@^7.17.7": version "7.17.7" resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz#a3c2924f5e5f0379b356d4cfb313d1414dc30e46" integrity sha512-UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w== @@ -178,17 +101,6 @@ browserslist "^4.17.5" semver "^6.3.0" -"@babel/helper-create-class-features-plugin@^7.13.0": - version "7.13.11" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.11.tgz#30d30a005bca2c953f5653fc25091a492177f4f6" - integrity sha512-ays0I7XYq9xbjCSvT+EvysLgfc3tOkwCULHjrnscGT3A9qD4sk3wXnJ3of0MAWsWGjdinFvajHU2smYuqXKMrw== - dependencies: - "@babel/helper-function-name" "^7.12.13" - "@babel/helper-member-expression-to-functions" "^7.13.0" - "@babel/helper-optimise-call-expression" "^7.12.13" - "@babel/helper-replace-supers" "^7.13.0" - "@babel/helper-split-export-declaration" "^7.12.13" - "@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.6": version "7.17.6" resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz#3778c1ed09a7f3e65e6d6e0f6fbfcc53809d92c9" @@ -202,14 +114,6 @@ "@babel/helper-replace-supers" "^7.16.7" "@babel/helper-split-export-declaration" "^7.16.7" -"@babel/helper-create-regexp-features-plugin@^7.12.13": - version "7.12.17" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz#a2ac87e9e319269ac655b8d4415e94d38d663cb7" - integrity sha512-p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg== - dependencies: - "@babel/helper-annotate-as-pure" "^7.12.13" - regexpu-core "^4.7.1" - "@babel/helper-create-regexp-features-plugin@^7.16.7": version "7.17.0" resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz#1dcc7d40ba0c6b6b25618997c5dbfd310f186fe1" @@ -253,13 +157,6 @@ dependencies: "@babel/types" "^7.16.7" -"@babel/helper-explode-assignable-expression@^7.12.13": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz#17b5c59ff473d9f956f40ef570cf3a76ca12657f" - integrity sha512-qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA== - dependencies: - "@babel/types" "^7.13.0" - "@babel/helper-explode-assignable-expression@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz#12a6d8522fdd834f194e868af6354e8650242b7a" @@ -267,25 +164,7 @@ dependencies: "@babel/types" "^7.16.7" -"@babel/helper-function-name@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz#93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a" - integrity sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA== - dependencies: - "@babel/helper-get-function-arity" "^7.12.13" - "@babel/template" "^7.12.13" - "@babel/types" "^7.12.13" - -"@babel/helper-function-name@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz#f1ec51551fb1c8956bc8dd95f38523b6cf375f8f" - integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA== - dependencies: - "@babel/helper-get-function-arity" "^7.16.7" - "@babel/template" "^7.16.7" - "@babel/types" "^7.16.7" - -"@babel/helper-function-name@^7.17.9": +"@babel/helper-function-name@^7.16.7", "@babel/helper-function-name@^7.17.9": version "7.17.9" resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz#136fcd54bc1da82fcb47565cf16fd8e444b1ff12" integrity sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg== @@ -293,28 +172,6 @@ "@babel/template" "^7.16.7" "@babel/types" "^7.17.0" -"@babel/helper-get-function-arity@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583" - integrity sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg== - dependencies: - "@babel/types" "^7.12.13" - -"@babel/helper-get-function-arity@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419" - integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw== - dependencies: - "@babel/types" "^7.16.7" - -"@babel/helper-hoist-variables@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.0.tgz#5d5882e855b5c5eda91e0cadc26c6e7a2c8593d8" - integrity sha512-0kBzvXiIKfsCA0y6cFEIJf4OdzfpRuNk4+YTeHZpGGc666SATFKTz6sRncwFnQk7/ugJ4dSrCj6iJuvW4Qwr2g== - dependencies: - "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.0" - "@babel/helper-hoist-variables@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246" @@ -322,13 +179,6 @@ dependencies: "@babel/types" "^7.16.7" -"@babel/helper-member-expression-to-functions@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz#6aa4bb678e0f8c22f58cdb79451d30494461b091" - integrity sha512-yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ== - dependencies: - "@babel/types" "^7.13.0" - "@babel/helper-member-expression-to-functions@^7.16.7": version "7.17.7" resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz#a34013b57d8542a8c4ff8ba3f747c02452a4d8c4" @@ -336,35 +186,13 @@ dependencies: "@babel/types" "^7.17.0" -"@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz#ec67e4404f41750463e455cc3203f6a32e93fcb0" - integrity sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g== - dependencies: - "@babel/types" "^7.12.13" - -"@babel/helper-module-imports@^7.16.7": +"@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437" integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg== dependencies: "@babel/types" "^7.16.7" -"@babel/helper-module-transforms@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.0.tgz#42eb4bd8eea68bab46751212c357bfed8b40f6f1" - integrity sha512-Ls8/VBwH577+pw7Ku1QkUWIyRRNHpYlts7+qSqBBFCW3I8QteB9DxfcZ5YJpOwH6Ihe/wn8ch7fMGOP1OhEIvw== - dependencies: - "@babel/helper-module-imports" "^7.12.13" - "@babel/helper-replace-supers" "^7.13.0" - "@babel/helper-simple-access" "^7.12.13" - "@babel/helper-split-export-declaration" "^7.12.13" - "@babel/helper-validator-identifier" "^7.12.11" - "@babel/template" "^7.12.13" - "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.0" - lodash "^4.17.19" - "@babel/helper-module-transforms@^7.16.7", "@babel/helper-module-transforms@^7.17.7": version "7.17.7" resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz#3943c7f777139e7954a5355c815263741a9c1cbd" @@ -379,13 +207,6 @@ "@babel/traverse" "^7.17.3" "@babel/types" "^7.17.0" -"@babel/helper-optimise-call-expression@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea" - integrity sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA== - dependencies: - "@babel/types" "^7.12.13" - "@babel/helper-optimise-call-expression@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz#a34e3560605abbd31a18546bd2aad3e6d9a174f2" @@ -393,25 +214,11 @@ dependencies: "@babel/types" "^7.16.7" -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af" - integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ== - -"@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7": +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5" integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA== -"@babel/helper-remap-async-to-generator@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz#376a760d9f7b4b2077a9dd05aa9c3927cadb2209" - integrity sha512-pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg== - dependencies: - "@babel/helper-annotate-as-pure" "^7.12.13" - "@babel/helper-wrap-function" "^7.13.0" - "@babel/types" "^7.13.0" - "@babel/helper-remap-async-to-generator@^7.16.8": version "7.16.8" resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz#29ffaade68a367e2ed09c90901986918d25e57e3" @@ -421,16 +228,6 @@ "@babel/helper-wrap-function" "^7.16.8" "@babel/types" "^7.16.8" -"@babel/helper-replace-supers@^7.12.13", "@babel/helper-replace-supers@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz#6034b7b51943094cb41627848cb219cb02be1d24" - integrity sha512-Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw== - dependencies: - "@babel/helper-member-expression-to-functions" "^7.13.0" - "@babel/helper-optimise-call-expression" "^7.12.13" - "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.0" - "@babel/helper-replace-supers@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz#e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1" @@ -442,13 +239,6 @@ "@babel/traverse" "^7.16.7" "@babel/types" "^7.16.7" -"@babel/helper-simple-access@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz#8478bcc5cacf6aa1672b251c1d2dde5ccd61a6c4" - integrity sha512-0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA== - dependencies: - "@babel/types" "^7.12.13" - "@babel/helper-simple-access@^7.17.7": version "7.17.7" resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz#aaa473de92b7987c6dfa7ce9a7d9674724823367" @@ -456,13 +246,6 @@ dependencies: "@babel/types" "^7.17.0" -"@babel/helper-skip-transparent-expression-wrappers@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz#462dc63a7e435ade8468385c63d2b84cce4b3cbf" - integrity sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA== - dependencies: - "@babel/types" "^7.12.1" - "@babel/helper-skip-transparent-expression-wrappers@^7.16.0": version "7.16.0" resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09" @@ -470,13 +253,6 @@ dependencies: "@babel/types" "^7.16.0" -"@babel/helper-split-export-declaration@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05" - integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg== - dependencies: - "@babel/types" "^7.12.13" - "@babel/helper-split-export-declaration@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b" @@ -484,36 +260,16 @@ dependencies: "@babel/types" "^7.16.7" -"@babel/helper-validator-identifier@^7.12.11": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed" - integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw== - "@babel/helper-validator-identifier@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad" integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw== -"@babel/helper-validator-option@^7.12.17": - version "7.12.17" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831" - integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw== - "@babel/helper-validator-option@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23" integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ== -"@babel/helper-wrap-function@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz#bdb5c66fda8526ec235ab894ad53a1235c79fcc4" - integrity sha512-1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA== - dependencies: - "@babel/helper-function-name" "^7.12.13" - "@babel/template" "^7.12.13" - "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.0" - "@babel/helper-wrap-function@^7.16.8": version "7.16.8" resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz#58afda087c4cd235de92f7ceedebca2c41274200" @@ -524,15 +280,6 @@ "@babel/traverse" "^7.16.8" "@babel/types" "^7.16.8" -"@babel/helpers@^7.13.10": - version "7.13.10" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.10.tgz#fd8e2ba7488533cdeac45cc158e9ebca5e3c7df8" - integrity sha512-4VO883+MWPDUVRF3PhiLBUFHoX/bsLTGFpFK/HqvvfBZz2D57u9XzPVNFVBTc0PW/CWR9BXTOKt8NF4DInUHcQ== - dependencies: - "@babel/template" "^7.12.13" - "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.0" - "@babel/helpers@^7.17.9": version "7.17.9" resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.9.tgz#b2af120821bfbe44f9907b1826e168e819375a1a" @@ -542,15 +289,6 @@ "@babel/traverse" "^7.17.9" "@babel/types" "^7.17.0" -"@babel/highlight@^7.12.13": - version "7.13.10" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.13.10.tgz#a8b2a66148f5b27d666b15d81774347a731d52d1" - integrity sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg== - dependencies: - "@babel/helper-validator-identifier" "^7.12.11" - chalk "^2.0.0" - js-tokens "^4.0.0" - "@babel/highlight@^7.16.7": version "7.16.10" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz#744f2eb81579d6eea753c227b0f570ad785aba88" @@ -573,17 +311,7 @@ regenerator-runtime "^0.13.4" v8flags "^3.1.1" -"@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.13.0", "@babel/parser@^7.13.10", "@babel/parser@^7.7.0": - version "7.13.11" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.11.tgz#f93ebfc99d21c1772afbbaa153f47e7ce2f50b88" - integrity sha512-PhuoqeHoO9fc4ffMEVk4qb/w/s2iOSWohvbHxLtxui0eBg3Lg5gN1U8wp1V1u61hOWkPQJJyJzGH6Y+grwkq8Q== - -"@babel/parser@^7.16.7", "@babel/parser@^7.17.3": - version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.7.tgz#fc19b645a5456c8d6fdb6cecd3c66c0173902800" - integrity sha512-bm3AQf45vR4gKggRfvJdYJ0gFLoCbsPxiFLSH6hTVYABptNHY6l9NrhnucVjQ/X+SPtLANT9lc0fFhikj+VBRA== - -"@babel/parser@^7.17.8", "@babel/parser@^7.17.9": +"@babel/parser@^7.1.0", "@babel/parser@^7.16.7", "@babel/parser@^7.17.8", "@babel/parser@^7.17.9", "@babel/parser@^7.7.0": version "7.17.9" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.9.tgz#9c94189a6062f0291418ca021077983058e171ef" integrity sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg== @@ -604,15 +332,6 @@ "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" "@babel/plugin-proposal-optional-chaining" "^7.16.7" -"@babel/plugin-proposal-async-generator-functions@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.8.tgz#87aacb574b3bc4b5603f6fe41458d72a5a2ec4b1" - integrity sha512-rPBnhj+WgoSmgq+4gQUtXx/vOcU+UYtjy1AA/aeD61Hwj410fwYyqfUcRP3lR8ucgliVJL/G7sXcNUecC75IXA== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-remap-async-to-generator" "^7.13.0" - "@babel/plugin-syntax-async-generators" "^7.8.4" - "@babel/plugin-proposal-async-generator-functions@^7.16.8": version "7.16.8" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz#3bdd1ebbe620804ea9416706cd67d60787504bc8" @@ -622,15 +341,7 @@ "@babel/helper-remap-async-to-generator" "^7.16.8" "@babel/plugin-syntax-async-generators" "^7.8.4" -"@babel/plugin-proposal-class-properties@^7.12.1", "@babel/plugin-proposal-class-properties@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz#146376000b94efd001e57a40a88a525afaab9f37" - integrity sha512-KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.13.0" - "@babel/helper-plugin-utils" "^7.13.0" - -"@babel/plugin-proposal-class-properties@^7.16.7": +"@babel/plugin-proposal-class-properties@^7.12.1", "@babel/plugin-proposal-class-properties@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0" integrity sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww== @@ -647,14 +358,6 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-class-static-block" "^7.14.5" -"@babel/plugin-proposal-dynamic-import@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz#876a1f6966e1dec332e8c9451afda3bebcdf2e1d" - integrity sha512-ONWKj0H6+wIRCkZi9zSbZtE/r73uOhMVHh256ys0UzfM7I3d4n+spZNWjOnJv2gzopumP2Wxi186vI8N0Y2JyQ== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - "@babel/plugin-proposal-dynamic-import@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz#c19c897eaa46b27634a00fee9fb7d829158704b2" @@ -663,14 +366,6 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-dynamic-import" "^7.8.3" -"@babel/plugin-proposal-export-namespace-from@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz#393be47a4acd03fa2af6e3cde9b06e33de1b446d" - integrity sha512-INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/plugin-syntax-export-namespace-from" "^7.8.3" - "@babel/plugin-proposal-export-namespace-from@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz#09de09df18445a5786a305681423ae63507a6163" @@ -679,14 +374,6 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" -"@babel/plugin-proposal-json-strings@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz#bf1fb362547075afda3634ed31571c5901afef7b" - integrity sha512-w4zOPKUFPX1mgvTmL/fcEqy34hrQ1CRcGxdphBc6snDnnqJ47EZDIyop6IwXzAC8G916hsIuXB2ZMBCExC5k7Q== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/plugin-syntax-json-strings" "^7.8.3" - "@babel/plugin-proposal-json-strings@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz#9732cb1d17d9a2626a08c5be25186c195b6fa6e8" @@ -695,14 +382,6 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-json-strings" "^7.8.3" -"@babel/plugin-proposal-logical-assignment-operators@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz#93fa78d63857c40ce3c8c3315220fd00bfbb4e1a" - integrity sha512-aul6znYB4N4HGweImqKn59Su9RS8lbUIqxtXTOcAGtNIDczoEFv+l1EhmX8rUBp3G1jMjKJm8m0jXVp63ZpS4A== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" - "@babel/plugin-proposal-logical-assignment-operators@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz#be23c0ba74deec1922e639832904be0bea73cdea" @@ -711,14 +390,6 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" -"@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz#3730a31dafd3c10d8ccd10648ed80a2ac5472ef3" - integrity sha512-iePlDPBn//UhxExyS9KyeYU7RM9WScAG+D3Hhno0PLJebAEpDZMocbDe64eqynhNAnwz/vZoL/q/QB2T1OH39A== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" - "@babel/plugin-proposal-nullish-coalescing-operator@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz#141fc20b6857e59459d430c850a0011e36561d99" @@ -727,14 +398,6 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" -"@babel/plugin-proposal-numeric-separator@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz#bd9da3188e787b5120b4f9d465a8261ce67ed1db" - integrity sha512-O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/plugin-syntax-numeric-separator" "^7.10.4" - "@babel/plugin-proposal-numeric-separator@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz#d6b69f4af63fb38b6ca2558442a7fb191236eba9" @@ -743,17 +406,6 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-numeric-separator" "^7.10.4" -"@babel/plugin-proposal-object-rest-spread@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz#5d210a4d727d6ce3b18f9de82cc99a3964eed60a" - integrity sha512-DhB2EuB1Ih7S3/IRX5AFVgZ16k3EzfRbq97CxAVI1KSYcW+lexV8VZb7G7L8zuPVSdQMRn0kiBpf/Yzu9ZKH0g== - dependencies: - "@babel/compat-data" "^7.13.8" - "@babel/helper-compilation-targets" "^7.13.8" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-transform-parameters" "^7.13.0" - "@babel/plugin-proposal-object-rest-spread@^7.16.7": version "7.17.3" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.3.tgz#d9eb649a54628a51701aef7e0ea3d17e2b9dd390" @@ -765,14 +417,6 @@ "@babel/plugin-syntax-object-rest-spread" "^7.8.3" "@babel/plugin-transform-parameters" "^7.16.7" -"@babel/plugin-proposal-optional-catch-binding@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.13.8.tgz#3ad6bd5901506ea996fc31bdcf3ccfa2bed71107" - integrity sha512-0wS/4DUF1CuTmGo+NiaHfHcVSeSLj5S3e6RivPTg/2k3wOv3jO35tZ6/ZWsQhQMvdgI7CwphjQa/ccarLymHVA== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" - "@babel/plugin-proposal-optional-catch-binding@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz#c623a430674ffc4ab732fd0a0ae7722b67cb74cf" @@ -781,15 +425,6 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" -"@babel/plugin-proposal-optional-chaining@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.8.tgz#e39df93efe7e7e621841babc197982e140e90756" - integrity sha512-hpbBwbTgd7Cz1QryvwJZRo1U0k1q8uyBmeXOSQUjdg/A2TASkhR/rz7AyqZ/kS8kbpsNA80rOYbxySBJAqmhhQ== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" - "@babel/plugin-proposal-optional-chaining@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz#7cd629564724816c0e8a969535551f943c64c39a" @@ -799,14 +434,6 @@ "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" "@babel/plugin-syntax-optional-chaining" "^7.8.3" -"@babel/plugin-proposal-private-methods@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz#04bd4c6d40f6e6bbfa2f57e2d8094bad900ef787" - integrity sha512-MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.13.0" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/plugin-proposal-private-methods@^7.16.11": version "7.16.11" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz#e8df108288555ff259f4527dbe84813aac3a1c50" @@ -825,15 +452,7 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-private-property-in-object" "^7.14.5" -"@babel/plugin-proposal-unicode-property-regex@^7.12.13", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz#bebde51339be829c17aaaaced18641deb62b39ba" - integrity sha512-XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.13" - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-proposal-unicode-property-regex@^7.16.7": +"@babel/plugin-proposal-unicode-property-regex@^7.16.7", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz#635d18eb10c6214210ffc5ff4932552de08188a2" integrity sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg== @@ -897,13 +516,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-jsx@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.13.tgz#044fb81ebad6698fe62c478875575bcbb9b70f15" - integrity sha512-d4HM23Q1K7oq/SLNmG6mRt85l2csmQ0cHRaxRXjKW0YFdEXqlZ5kzFQKH5Uc3rDJECgu+yCRgPkG04Mm98R/1g== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/plugin-syntax-jsx@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.7.tgz#50b6571d13f764266a113d77c82b4a6508bbe665" @@ -960,27 +572,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-syntax-top-level-await@^7.12.13", "@babel/plugin-syntax-top-level-await@^7.8.3": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz#c5f0fa6e249f5b739727f923540cf7a806130178" - integrity sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-syntax-top-level-await@^7.14.5": +"@babel/plugin-syntax-top-level-await@^7.14.5", "@babel/plugin-syntax-top-level-await@^7.8.3": version "7.14.5" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw== dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-syntax-typescript@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.13.tgz#9dff111ca64154cef0f4dc52cf843d9f12ce4474" - integrity sha512-cHP3u1JiUiG2LFDKbXnwVad81GvfyIOmCD6HIEId6ojrY0Drfy2q1jw7BwN7dE84+kTnBjLkXoL3IEy/3JPu2w== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/plugin-syntax-typescript@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.7.tgz#39c9b55ee153151990fb038651d58d3fd03f98f8" @@ -988,13 +586,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-arrow-functions@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz#10a59bebad52d637a027afa692e8d5ceff5e3dae" - integrity sha512-96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/plugin-transform-arrow-functions@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz#44125e653d94b98db76369de9c396dc14bef4154" @@ -1002,15 +593,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-async-to-generator@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz#8e112bf6771b82bf1e974e5e26806c5c99aa516f" - integrity sha512-3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg== - dependencies: - "@babel/helper-module-imports" "^7.12.13" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-remap-async-to-generator" "^7.13.0" - "@babel/plugin-transform-async-to-generator@^7.16.8": version "7.16.8" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz#b83dff4b970cf41f1b819f8b49cc0cfbaa53a808" @@ -1020,13 +602,6 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-remap-async-to-generator" "^7.16.8" -"@babel/plugin-transform-block-scoped-functions@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz#a9bf1836f2a39b4eb6cf09967739de29ea4bf4c4" - integrity sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/plugin-transform-block-scoped-functions@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz#4d0d57d9632ef6062cdf354bb717102ee042a620" @@ -1034,13 +609,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-block-scoping@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.13.tgz#f36e55076d06f41dfd78557ea039c1b581642e61" - integrity sha512-Pxwe0iqWJX4fOOM2kEZeUuAxHMWb9nK+9oh5d11bsLoB0xMg+mkDpt0eYuDZB7ETrY9bbcVlKUGTOGWy7BHsMQ== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/plugin-transform-block-scoping@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz#f50664ab99ddeaee5bc681b8f3a6ea9d72ab4f87" @@ -1048,19 +616,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-classes@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz#0265155075c42918bf4d3a4053134176ad9b533b" - integrity sha512-9BtHCPUARyVH1oXGcSJD3YpsqRLROJx5ZNP6tN5vnk17N0SVf9WCtf8Nuh1CFmgByKKAIMstitKduoCmsaDK5g== - dependencies: - "@babel/helper-annotate-as-pure" "^7.12.13" - "@babel/helper-function-name" "^7.12.13" - "@babel/helper-optimise-call-expression" "^7.12.13" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-replace-supers" "^7.13.0" - "@babel/helper-split-export-declaration" "^7.12.13" - globals "^11.1.0" - "@babel/plugin-transform-classes@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz#8f4b9562850cd973de3b498f1218796eb181ce00" @@ -1075,13 +630,6 @@ "@babel/helper-split-export-declaration" "^7.16.7" globals "^11.1.0" -"@babel/plugin-transform-computed-properties@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz#845c6e8b9bb55376b1fa0b92ef0bdc8ea06644ed" - integrity sha512-RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/plugin-transform-computed-properties@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz#66dee12e46f61d2aae7a73710f591eb3df616470" @@ -1089,13 +637,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-destructuring@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.0.tgz#c5dce270014d4e1ebb1d806116694c12b7028963" - integrity sha512-zym5em7tePoNT9s964c0/KU3JPPnuq7VhIxPRefJ4/s82cD+q1mgKfuGRDMCPL0HTyKz4dISuQlCusfgCJ86HA== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/plugin-transform-destructuring@^7.16.7": version "7.17.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.7.tgz#49dc2675a7afa9a5e4c6bdee636061136c3408d1" @@ -1103,15 +644,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-dotall-regex@^7.12.13", "@babel/plugin-transform-dotall-regex@^7.4.4": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz#3f1601cc29905bfcb67f53910f197aeafebb25ad" - integrity sha512-foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.13" - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-transform-dotall-regex@^7.16.7": +"@babel/plugin-transform-dotall-regex@^7.16.7", "@babel/plugin-transform-dotall-regex@^7.4.4": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz#6b2d67686fab15fb6a7fd4bd895d5982cfc81241" integrity sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ== @@ -1119,13 +652,6 @@ "@babel/helper-create-regexp-features-plugin" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-duplicate-keys@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz#6f06b87a8b803fd928e54b81c258f0a0033904de" - integrity sha512-NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/plugin-transform-duplicate-keys@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz#2207e9ca8f82a0d36a5a67b6536e7ef8b08823c9" @@ -1133,14 +659,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-exponentiation-operator@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz#4d52390b9a273e651e4aba6aee49ef40e80cd0a1" - integrity sha512-fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA== - dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.12.13" - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/plugin-transform-exponentiation-operator@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz#efa9862ef97e9e9e5f653f6ddc7b665e8536fe9b" @@ -1149,13 +667,6 @@ "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-for-of@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz#c799f881a8091ac26b54867a845c3e97d2696062" - integrity sha512-IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/plugin-transform-for-of@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz#649d639d4617dff502a9a158c479b3b556728d8c" @@ -1163,14 +674,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-function-name@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz#bb024452f9aaed861d374c8e7a24252ce3a50051" - integrity sha512-6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ== - dependencies: - "@babel/helper-function-name" "^7.12.13" - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/plugin-transform-function-name@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz#5ab34375c64d61d083d7d2f05c38d90b97ec65cf" @@ -1180,13 +683,6 @@ "@babel/helper-function-name" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-literals@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz#2ca45bafe4a820197cf315794a4d26560fe4bdb9" - integrity sha512-FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/plugin-transform-literals@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz#254c9618c5ff749e87cb0c0cef1a0a050c0bdab1" @@ -1194,13 +690,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-member-expression-literals@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz#5ffa66cd59b9e191314c9f1f803b938e8c081e40" - integrity sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/plugin-transform-member-expression-literals@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz#6e5dcf906ef8a098e630149d14c867dd28f92384" @@ -1208,15 +697,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-modules-amd@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.13.0.tgz#19f511d60e3d8753cc5a6d4e775d3a5184866cc3" - integrity sha512-EKy/E2NHhY/6Vw5d1k3rgoobftcNUmp9fGjb9XZwQLtTctsRBOTRO7RHHxfIky1ogMN5BxN7p9uMA3SzPfotMQ== - dependencies: - "@babel/helper-module-transforms" "^7.13.0" - "@babel/helper-plugin-utils" "^7.13.0" - babel-plugin-dynamic-import-node "^2.3.3" - "@babel/plugin-transform-modules-amd@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz#b28d323016a7daaae8609781d1f8c9da42b13186" @@ -1226,16 +706,6 @@ "@babel/helper-plugin-utils" "^7.16.7" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-commonjs@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.13.8.tgz#7b01ad7c2dcf2275b06fa1781e00d13d420b3e1b" - integrity sha512-9QiOx4MEGglfYZ4XOnU79OHr6vIWUakIj9b4mioN8eQIoEh+pf5p/zEB36JpDFWA12nNMiRf7bfoRvl9Rn79Bw== - dependencies: - "@babel/helper-module-transforms" "^7.13.0" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-simple-access" "^7.12.13" - babel-plugin-dynamic-import-node "^2.3.3" - "@babel/plugin-transform-modules-commonjs@^7.16.8": version "7.17.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.7.tgz#d86b217c8e45bb5f2dbc11eefc8eab62cf980d19" @@ -1246,17 +716,6 @@ "@babel/helper-simple-access" "^7.17.7" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-systemjs@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz#6d066ee2bff3c7b3d60bf28dec169ad993831ae3" - integrity sha512-hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A== - dependencies: - "@babel/helper-hoist-variables" "^7.13.0" - "@babel/helper-module-transforms" "^7.13.0" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-validator-identifier" "^7.12.11" - babel-plugin-dynamic-import-node "^2.3.3" - "@babel/plugin-transform-modules-systemjs@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.7.tgz#887cefaef88e684d29558c2b13ee0563e287c2d7" @@ -1268,14 +727,6 @@ "@babel/helper-validator-identifier" "^7.16.7" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-umd@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.13.0.tgz#8a3d96a97d199705b9fd021580082af81c06e70b" - integrity sha512-D/ILzAh6uyvkWjKKyFE/W0FzWwasv6vPTSqPcjxFqn6QpX3u8DjRVliq4F2BamO2Wee/om06Vyy+vPkNrd4wxw== - dependencies: - "@babel/helper-module-transforms" "^7.13.0" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/plugin-transform-modules-umd@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz#23dad479fa585283dbd22215bff12719171e7618" @@ -1284,13 +735,6 @@ "@babel/helper-module-transforms" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-named-capturing-groups-regex@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz#2213725a5f5bbbe364b50c3ba5998c9599c5c9d9" - integrity sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.13" - "@babel/plugin-transform-named-capturing-groups-regex@^7.16.8": version "7.16.8" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz#7f860e0e40d844a02c9dcf9d84965e7dfd666252" @@ -1298,13 +742,6 @@ dependencies: "@babel/helper-create-regexp-features-plugin" "^7.16.7" -"@babel/plugin-transform-new-target@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz#e22d8c3af24b150dd528cbd6e685e799bf1c351c" - integrity sha512-/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/plugin-transform-new-target@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz#9967d89a5c243818e0800fdad89db22c5f514244" @@ -1312,14 +749,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-object-super@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz#b4416a2d63b8f7be314f3d349bd55a9c1b5171f7" - integrity sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/helper-replace-supers" "^7.12.13" - "@babel/plugin-transform-object-super@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz#ac359cf8d32cf4354d27a46867999490b6c32a94" @@ -1328,13 +757,6 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-replace-supers" "^7.16.7" -"@babel/plugin-transform-parameters@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.13.0.tgz#8fa7603e3097f9c0b7ca1a4821bc2fb52e9e5007" - integrity sha512-Jt8k/h/mIwE2JFEOb3lURoY5C85ETcYPnbuAJ96zRBzh1XHtQZfs62ChZ6EP22QlC8c7Xqr9q+e1SU5qttwwjw== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/plugin-transform-parameters@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz#a1721f55b99b736511cb7e0152f61f17688f331f" @@ -1342,13 +764,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-property-literals@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz#4e6a9e37864d8f1b3bc0e2dce7bf8857db8b1a81" - integrity sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/plugin-transform-property-literals@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz#2dadac85155436f22c696c4827730e0fe1057a55" @@ -1356,13 +771,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-react-display-name@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.13.tgz#c28effd771b276f4647411c9733dbb2d2da954bd" - integrity sha512-MprESJzI9O5VnJZrL7gg1MpdqmiFcUv41Jc7SahxYsNP2kDkFqClxxTZq+1Qv4AFCamm+GXMRDQINNn+qrxmiA== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/plugin-transform-react-display-name@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.7.tgz#7b6d40d232f4c0f550ea348593db3b21e2404340" @@ -1370,13 +778,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-react-jsx-development@^7.12.12": - version "7.12.17" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.17.tgz#f510c0fa7cd7234153539f9a362ced41a5ca1447" - integrity sha512-BPjYV86SVuOaudFhsJR1zjgxxOhJDt6JHNoD48DxWEIxUCAMjV1ys6DYw4SDYZh0b1QsS2vfIA9t/ZsQGsDOUQ== - dependencies: - "@babel/plugin-transform-react-jsx" "^7.12.17" - "@babel/plugin-transform-react-jsx-development@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.7.tgz#43a00724a3ed2557ed3f276a01a929e6686ac7b8" @@ -1398,17 +799,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-react-jsx@^7.12.13", "@babel/plugin-transform-react-jsx@^7.12.17": - version "7.12.17" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.17.tgz#dd2c1299f5e26de584939892de3cfc1807a38f24" - integrity sha512-mwaVNcXV+l6qJOuRhpdTEj8sT/Z0owAVWf9QujTZ0d2ye9X/K+MTOTSizcgKOj18PGnTc/7g1I4+cIUjsKhBcw== - dependencies: - "@babel/helper-annotate-as-pure" "^7.12.13" - "@babel/helper-module-imports" "^7.12.13" - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/plugin-syntax-jsx" "^7.12.13" - "@babel/types" "^7.12.17" - "@babel/plugin-transform-react-jsx@^7.16.7", "@babel/plugin-transform-react-jsx@^7.17.3": version "7.17.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.17.3.tgz#eac1565da176ccb1a715dae0b4609858808008c1" @@ -1420,14 +810,6 @@ "@babel/plugin-syntax-jsx" "^7.16.7" "@babel/types" "^7.17.0" -"@babel/plugin-transform-react-pure-annotations@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.12.1.tgz#05d46f0ab4d1339ac59adf20a1462c91b37a1a42" - integrity sha512-RqeaHiwZtphSIUZ5I85PEH19LOSzxfuEazoY7/pWASCAIBuATQzpSVD+eT6MebeeZT2F4eSL0u4vw6n4Nm0Mjg== - dependencies: - "@babel/helper-annotate-as-pure" "^7.10.4" - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/plugin-transform-react-pure-annotations@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.7.tgz#232bfd2f12eb551d6d7d01d13fe3f86b45eb9c67" @@ -1436,13 +818,6 @@ "@babel/helper-annotate-as-pure" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-regenerator@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.13.tgz#b628bcc9c85260ac1aeb05b45bde25210194a2f5" - integrity sha512-lxb2ZAvSLyJ2PEe47hoGWPmW22v7CtSl9jW8mingV4H2sEX/JOcrAj2nPuGWi56ERUm2bUpjKzONAuT6HCn2EA== - dependencies: - regenerator-transform "^0.14.2" - "@babel/plugin-transform-regenerator@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz#9e7576dc476cb89ccc5096fff7af659243b4adeb" @@ -1450,13 +825,6 @@ dependencies: regenerator-transform "^0.14.2" -"@babel/plugin-transform-reserved-words@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz#7d9988d4f06e0fe697ea1d9803188aa18b472695" - integrity sha512-xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/plugin-transform-reserved-words@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz#1d798e078f7c5958eec952059c460b220a63f586" @@ -1476,13 +844,6 @@ babel-plugin-polyfill-regenerator "^0.1.2" semver "^6.3.0" -"@babel/plugin-transform-shorthand-properties@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz#db755732b70c539d504c6390d9ce90fe64aff7ad" - integrity sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/plugin-transform-shorthand-properties@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz#e8549ae4afcf8382f711794c0c7b6b934c5fbd2a" @@ -1490,14 +851,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-spread@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz#84887710e273c1815ace7ae459f6f42a5d31d5fd" - integrity sha512-V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" - "@babel/plugin-transform-spread@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz#a303e2122f9f12e0105daeedd0f30fb197d8ff44" @@ -1506,13 +859,6 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" -"@babel/plugin-transform-sticky-regex@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz#760ffd936face73f860ae646fb86ee82f3d06d1f" - integrity sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/plugin-transform-sticky-regex@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz#c84741d4f4a38072b9a1e2e3fd56d359552e8660" @@ -1520,13 +866,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-template-literals@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz#a36049127977ad94438dee7443598d1cefdf409d" - integrity sha512-d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/plugin-transform-template-literals@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz#f3d1c45d28967c8e80f53666fc9c3e50618217ab" @@ -1534,13 +873,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-typeof-symbol@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz#785dd67a1f2ea579d9c2be722de8c84cb85f5a7f" - integrity sha512-eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/plugin-transform-typeof-symbol@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz#9cdbe622582c21368bd482b660ba87d5545d4f7e" @@ -1548,15 +880,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-typescript@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.13.0.tgz#4a498e1f3600342d2a9e61f60131018f55774853" - integrity sha512-elQEwluzaU8R8dbVuW2Q2Y8Nznf7hnjM7+DSCd14Lo5fF63C9qNLbwZYbmZrtV9/ySpSUpkRpQXvJb6xyu4hCQ== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.13.0" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/plugin-syntax-typescript" "^7.12.13" - "@babel/plugin-transform-typescript@^7.16.7": version "7.16.8" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.8.tgz#591ce9b6b83504903fa9dd3652c357c2ba7a1ee0" @@ -1566,13 +889,6 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-typescript" "^7.16.7" -"@babel/plugin-transform-unicode-escapes@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz#840ced3b816d3b5127dd1d12dcedc5dead1a5e74" - integrity sha512-0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/plugin-transform-unicode-escapes@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz#da8717de7b3287a2c6d659750c964f302b31ece3" @@ -1580,14 +896,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-unicode-regex@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz#b52521685804e155b1202e83fc188d34bb70f5ac" - integrity sha512-mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.13" - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/plugin-transform-unicode-regex@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz#0f7aa4a501198976e25e82702574c34cfebe9ef2" @@ -1596,81 +904,7 @@ "@babel/helper-create-regexp-features-plugin" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" -"@babel/preset-env@^7.12.7": - version "7.13.10" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.13.10.tgz#b5cde31d5fe77ab2a6ab3d453b59041a1b3a5252" - integrity sha512-nOsTScuoRghRtUsRr/c69d042ysfPHcu+KOB4A9aAO9eJYqrkat+LF8G1yp1HD18QiwixT2CisZTr/0b3YZPXQ== - dependencies: - "@babel/compat-data" "^7.13.8" - "@babel/helper-compilation-targets" "^7.13.10" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-validator-option" "^7.12.17" - "@babel/plugin-proposal-async-generator-functions" "^7.13.8" - "@babel/plugin-proposal-class-properties" "^7.13.0" - "@babel/plugin-proposal-dynamic-import" "^7.13.8" - "@babel/plugin-proposal-export-namespace-from" "^7.12.13" - "@babel/plugin-proposal-json-strings" "^7.13.8" - "@babel/plugin-proposal-logical-assignment-operators" "^7.13.8" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.13.8" - "@babel/plugin-proposal-numeric-separator" "^7.12.13" - "@babel/plugin-proposal-object-rest-spread" "^7.13.8" - "@babel/plugin-proposal-optional-catch-binding" "^7.13.8" - "@babel/plugin-proposal-optional-chaining" "^7.13.8" - "@babel/plugin-proposal-private-methods" "^7.13.0" - "@babel/plugin-proposal-unicode-property-regex" "^7.12.13" - "@babel/plugin-syntax-async-generators" "^7.8.4" - "@babel/plugin-syntax-class-properties" "^7.12.13" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - "@babel/plugin-syntax-export-namespace-from" "^7.8.3" - "@babel/plugin-syntax-json-strings" "^7.8.3" - "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" - "@babel/plugin-syntax-numeric-separator" "^7.10.4" - "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" - "@babel/plugin-syntax-top-level-await" "^7.12.13" - "@babel/plugin-transform-arrow-functions" "^7.13.0" - "@babel/plugin-transform-async-to-generator" "^7.13.0" - "@babel/plugin-transform-block-scoped-functions" "^7.12.13" - "@babel/plugin-transform-block-scoping" "^7.12.13" - "@babel/plugin-transform-classes" "^7.13.0" - "@babel/plugin-transform-computed-properties" "^7.13.0" - "@babel/plugin-transform-destructuring" "^7.13.0" - "@babel/plugin-transform-dotall-regex" "^7.12.13" - "@babel/plugin-transform-duplicate-keys" "^7.12.13" - "@babel/plugin-transform-exponentiation-operator" "^7.12.13" - "@babel/plugin-transform-for-of" "^7.13.0" - "@babel/plugin-transform-function-name" "^7.12.13" - "@babel/plugin-transform-literals" "^7.12.13" - "@babel/plugin-transform-member-expression-literals" "^7.12.13" - "@babel/plugin-transform-modules-amd" "^7.13.0" - "@babel/plugin-transform-modules-commonjs" "^7.13.8" - "@babel/plugin-transform-modules-systemjs" "^7.13.8" - "@babel/plugin-transform-modules-umd" "^7.13.0" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.12.13" - "@babel/plugin-transform-new-target" "^7.12.13" - "@babel/plugin-transform-object-super" "^7.12.13" - "@babel/plugin-transform-parameters" "^7.13.0" - "@babel/plugin-transform-property-literals" "^7.12.13" - "@babel/plugin-transform-regenerator" "^7.12.13" - "@babel/plugin-transform-reserved-words" "^7.12.13" - "@babel/plugin-transform-shorthand-properties" "^7.12.13" - "@babel/plugin-transform-spread" "^7.13.0" - "@babel/plugin-transform-sticky-regex" "^7.12.13" - "@babel/plugin-transform-template-literals" "^7.13.0" - "@babel/plugin-transform-typeof-symbol" "^7.12.13" - "@babel/plugin-transform-unicode-escapes" "^7.12.13" - "@babel/plugin-transform-unicode-regex" "^7.12.13" - "@babel/preset-modules" "^0.1.4" - "@babel/types" "^7.13.0" - babel-plugin-polyfill-corejs2 "^0.1.4" - babel-plugin-polyfill-corejs3 "^0.1.3" - babel-plugin-polyfill-regenerator "^0.1.2" - core-js-compat "^3.9.0" - semver "^6.3.0" - -"@babel/preset-env@^7.16.11": +"@babel/preset-env@^7.12.7", "@babel/preset-env@^7.16.11": version "7.16.11" resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.11.tgz#5dd88fd885fae36f88fd7c8342475c9f0abe2982" integrity sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g== @@ -1750,17 +984,6 @@ core-js-compat "^3.20.2" semver "^6.3.0" -"@babel/preset-modules@^0.1.4": - version "0.1.4" - resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz#362f2b68c662842970fdb5e254ffc8fc1c2e415e" - integrity sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-proposal-unicode-property-regex" "^7.4.4" - "@babel/plugin-transform-dotall-regex" "^7.4.4" - "@babel/types" "^7.4.4" - esutils "^2.0.2" - "@babel/preset-modules@^0.1.5": version "0.1.5" resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9" @@ -1772,18 +995,7 @@ "@babel/types" "^7.4.4" esutils "^2.0.2" -"@babel/preset-react@^7.12.7": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.13.tgz#5f911b2eb24277fa686820d5bd81cad9a0602a0a" - integrity sha512-TYM0V9z6Abb6dj1K7i5NrEhA13oS5ujUYQYDfqIBXYHOc2c2VkFgc+q9kyssIyUfy4/hEwqrgSlJ/Qgv8zJLsA== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/plugin-transform-react-display-name" "^7.12.13" - "@babel/plugin-transform-react-jsx" "^7.12.13" - "@babel/plugin-transform-react-jsx-development" "^7.12.12" - "@babel/plugin-transform-react-pure-annotations" "^7.12.1" - -"@babel/preset-react@^7.16.7": +"@babel/preset-react@^7.12.7", "@babel/preset-react@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.16.7.tgz#4c18150491edc69c183ff818f9f2aecbe5d93852" integrity sha512-fWpyI8UM/HE6DfPBzD8LnhQ/OcH8AgTaqcqP2nGOXEUV+VKBR5JRN9hCk9ai+zQQ57vtm9oWeXguBCPNUjytgA== @@ -1795,16 +1007,7 @@ "@babel/plugin-transform-react-jsx-development" "^7.16.7" "@babel/plugin-transform-react-pure-annotations" "^7.16.7" -"@babel/preset-typescript@^7.12.7": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.13.0.tgz#ab107e5f050609d806fbb039bec553b33462c60a" - integrity sha512-LXJwxrHy0N3f6gIJlYbLta1D9BDtHpQeqwzM0LIfjDlr6UE/D5Mc7W4iDiQzaE+ks0sTjT26ArcHWnJVt0QiHw== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-validator-option" "^7.12.17" - "@babel/plugin-transform-typescript" "^7.13.0" - -"@babel/preset-typescript@^7.16.7": +"@babel/preset-typescript@^7.12.7", "@babel/preset-typescript@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.16.7.tgz#ab114d68bb2020afc069cd51b37ff98a046a70b9" integrity sha512-WbVEmgXdIyvzB77AQjGBEyYPZx+8tTsO50XtfozQrkW8QB2rLJpH2lgx0TRw5EJrBxOZQ+wCcyPVQvS8tjEHpQ== @@ -1839,16 +1042,7 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/template@^7.12.13", "@babel/template@^7.3.3": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327" - integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA== - dependencies: - "@babel/code-frame" "^7.12.13" - "@babel/parser" "^7.12.13" - "@babel/types" "^7.12.13" - -"@babel/template@^7.16.7": +"@babel/template@^7.16.7", "@babel/template@^7.3.3": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155" integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w== @@ -1857,38 +1051,7 @@ "@babel/parser" "^7.16.7" "@babel/types" "^7.16.7" -"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.7.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.0.tgz#6d95752475f86ee7ded06536de309a65fc8966cc" - integrity sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ== - dependencies: - "@babel/code-frame" "^7.12.13" - "@babel/generator" "^7.13.0" - "@babel/helper-function-name" "^7.12.13" - "@babel/helper-split-export-declaration" "^7.12.13" - "@babel/parser" "^7.13.0" - "@babel/types" "^7.13.0" - debug "^4.1.0" - globals "^11.1.0" - lodash "^4.17.19" - -"@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.3": - version "7.17.3" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57" - integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw== - dependencies: - "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.17.3" - "@babel/helper-environment-visitor" "^7.16.7" - "@babel/helper-function-name" "^7.16.7" - "@babel/helper-hoist-variables" "^7.16.7" - "@babel/helper-split-export-declaration" "^7.16.7" - "@babel/parser" "^7.17.3" - "@babel/types" "^7.17.0" - debug "^4.1.0" - globals "^11.1.0" - -"@babel/traverse@^7.17.9": +"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.3", "@babel/traverse@^7.17.9", "@babel/traverse@^7.7.0": version "7.17.9" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.9.tgz#1f9b207435d9ae4a8ed6998b2b82300d83c37a0d" integrity sha512-PQO8sDIJ8SIwipTPiR71kJQCKQYB5NGImbOviK8K+kg5xkNSYXLBupuX9QhatFowrsvo9Hj8WgArg3W7ijNAQw== @@ -1904,16 +1067,7 @@ debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.12.17", "@babel/types@^7.13.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.0.tgz#74424d2816f0171b4100f0ab34e9a374efdf7f80" - integrity sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA== - dependencies: - "@babel/helper-validator-identifier" "^7.12.11" - lodash "^4.17.19" - to-fast-properties "^2.0.0" - -"@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0": +"@babel/types@^7.0.0", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0": version "7.17.0" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b" integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw== @@ -3214,12 +2368,7 @@ dependencies: "@types/unist" "*" -"@types/minimatch@*": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" - integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== - -"@types/minimatch@^3.0.3": +"@types/minimatch@*", "@types/minimatch@^3.0.3": version "3.0.5" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== @@ -3236,12 +2385,7 @@ dependencies: moment "*" -"@types/node@*": - version "14.14.35" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.35.tgz#42c953a4e2b18ab931f72477e7012172f4ffa313" - integrity sha512-Lt+wj8NVPx0zUmUwumiVXapmaLUcAk3yPuHCFVXras9k5VT9TdhJqKqGVUQCD60OTMCl0qxJ57OiTL0Mic3Iag== - -"@types/node@>=12": +"@types/node@*", "@types/node@>=12": version "17.0.23" resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.23.tgz#3b41a6e643589ac6442bdbd7a4a3ded62f33f7da" integrity sha512-UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw== @@ -3262,21 +2406,14 @@ integrity sha512-PijRCG/K3s3w1We6ynUKdxEc5AcuuH3NBmMDP8uvKVp6X43UY7NQlTzczakXP3DJR0F4dfNQIGjU2cUeRYs2AA== "@types/prop-types@*": - version "15.7.3" - resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7" - integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw== - -"@types/react-dom@^18.0.0": - version "18.0.1" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.1.tgz#cb3cc10ea91141b12c71001fede1017acfbce4db" - integrity sha512-jCwTXvHtRLiyVvKm9aEdHXs8rflVOGd5Sl913JZrPshfXjn8NYsTNZOz70bCsA31IR0TOqwi3ad+X4tSCBoMTw== - dependencies: - "@types/react" "*" + version "15.7.5" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf" + integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w== -"@types/react-dom@^18.0.3": - version "18.0.3" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.3.tgz#a022ea08c75a476fe5e96b675c3e673363853831" - integrity sha512-1RRW9kst+67gveJRYPxGmVy8eVJ05O43hg77G2j5m76/RFJtMbcfAs2viQ2UNsvvDg8F7OfQZx8qQcl6ymygaQ== +"@types/react-dom@^18.0.0", "@types/react-dom@^18.0.3": + version "18.0.5" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.5.tgz#330b2d472c22f796e5531446939eacef8378444a" + integrity sha512-OWPWTUrY/NIrjsAPkAk1wW9LZeIjSvkXRhclsFO8CZcZGCOg2G0YZy4ft+rOyYxy8B7ui5iZzi9OkDebZ7/QSA== dependencies: "@types/react" "*" @@ -3295,9 +2432,9 @@ "@types/react" "*" "@types/react@*", "@types/react@^18.0.8": - version "18.0.8" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.8.tgz#a051eb380a9fbcaa404550543c58e1cf5ce4ab87" - integrity sha512-+j2hk9BzCOrrOSJASi5XiOyBbERk9jG5O73Ya4M0env5Ixi6vUNli4qy994AINcEF+1IEHISYFfIT4zwr++LKw== + version "18.0.14" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.14.tgz#e016616ffff51dba01b04945610fe3671fdbe06d" + integrity sha512-x4gGuASSiWmo0xjDLpm5mPb52syZHJx02VKbqUKdLmKtAwIh63XClGsiTI1K6DO5q7ox4xAsQrU+Gl3+gGXF9Q== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -3316,9 +2453,9 @@ integrity sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g== "@types/scheduler@*": - version "0.16.1" - resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.1.tgz#18845205e86ff0038517aab7a18a62a6b9f71275" - integrity sha512-EaCxbanVeyxDRTQBkdLb3Bvl/HK7PBK6UJjsSixB0iHKoWxE5uu2Q/DgtpOhPIojN0Zl1whvOd7PoHs2P0s5eA== + version "0.16.2" + resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" + integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew== "@types/stack-utils@^2.0.0": version "2.0.0" @@ -3392,7 +2529,7 @@ semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/experimental-utils@4.27.0": +"@typescript-eslint/experimental-utils@4.27.0", "@typescript-eslint/experimental-utils@^4.0.1": version "4.27.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.27.0.tgz#78192a616472d199f084eab8f10f962c0757cd1c" integrity sha512-n5NlbnmzT2MXlyT+Y0Jf0gsmAQzCnQSWXKy4RGSXVStjDvS5we9IWbh7qRVKdGcxT0WYlgcCYUK/HRg7xFhvjQ== @@ -3414,18 +2551,6 @@ eslint-scope "^5.0.0" eslint-utils "^2.0.0" -"@typescript-eslint/experimental-utils@^4.0.1": - version "4.18.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.18.0.tgz#ed6c955b940334132b17100d2917449b99a91314" - integrity sha512-92h723Kblt9JcT2RRY3QS2xefFKar4ZQFVs3GityOKWQYgtajxt/tuXIzL7sVCUlM1hgreiV5gkGYyBpdOwO6A== - dependencies: - "@types/json-schema" "^7.0.3" - "@typescript-eslint/scope-manager" "4.18.0" - "@typescript-eslint/types" "4.18.0" - "@typescript-eslint/typescript-estree" "4.18.0" - eslint-scope "^5.0.0" - eslint-utils "^2.0.0" - "@typescript-eslint/parser@4.27.0": version "4.27.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.27.0.tgz#85447e573364bce4c46c7f64abaa4985aadf5a94" @@ -3436,14 +2561,6 @@ "@typescript-eslint/typescript-estree" "4.27.0" debug "^4.3.1" -"@typescript-eslint/scope-manager@4.18.0": - version "4.18.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.18.0.tgz#d75b55234c35d2ff6ac945758d6d9e53be84a427" - integrity sha512-olX4yN6rvHR2eyFOcb6E4vmhDPsfdMyfQ3qR+oQNkAv8emKKlfxTWUXU5Mqxs2Fwe3Pf1BoPvrwZtwngxDzYzQ== - dependencies: - "@typescript-eslint/types" "4.18.0" - "@typescript-eslint/visitor-keys" "4.18.0" - "@typescript-eslint/scope-manager@4.27.0": version "4.27.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.27.0.tgz#b0b1de2b35aaf7f532e89c8e81d0fa298cae327d" @@ -3452,11 +2569,6 @@ "@typescript-eslint/types" "4.27.0" "@typescript-eslint/visitor-keys" "4.27.0" -"@typescript-eslint/types@4.18.0": - version "4.18.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.18.0.tgz#bebe323f81f2a7e2e320fac9415e60856267584a" - integrity sha512-/BRociARpj5E+9yQ7cwCF/SNOWwXJ3qhjurMuK2hIFUbr9vTuDeu476Zpu+ptxY2kSxUHDGLLKy+qGq2sOg37A== - "@typescript-eslint/types@4.27.0": version "4.27.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.27.0.tgz#712b408519ed699baff69086bc59cd2fc13df8d8" @@ -3475,19 +2587,6 @@ semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/typescript-estree@4.18.0": - version "4.18.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.18.0.tgz#756d3e61da8c16ab99185532c44872f4cd5538cb" - integrity sha512-wt4xvF6vvJI7epz+rEqxmoNQ4ZADArGQO9gDU+cM0U5fdVv7N+IAuVoVAoZSOZxzGHBfvE3XQMLdy+scsqFfeg== - dependencies: - "@typescript-eslint/types" "4.18.0" - "@typescript-eslint/visitor-keys" "4.18.0" - debug "^4.1.1" - globby "^11.0.1" - is-glob "^4.0.1" - semver "^7.3.2" - tsutils "^3.17.1" - "@typescript-eslint/typescript-estree@4.27.0": version "4.27.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.27.0.tgz#189a7b9f1d0717d5cccdcc17247692dedf7a09da" @@ -3501,14 +2600,6 @@ semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/visitor-keys@4.18.0": - version "4.18.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.18.0.tgz#4e6fe2a175ee33418318a029610845a81e2ff7b6" - integrity sha512-Q9t90JCvfYaN0OfFUgaLqByOfz8yPeTAdotn/XYNm5q9eHax90gzdb+RJ6E9T5s97Kv/UHWKERTmqA0jTKAEHw== - dependencies: - "@typescript-eslint/types" "4.18.0" - eslint-visitor-keys "^2.0.0" - "@typescript-eslint/visitor-keys@4.27.0": version "4.27.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.27.0.tgz#f56138b993ec822793e7ebcfac6ffdce0a60cb81" @@ -3716,15 +2807,7 @@ abbrev@1, abbrev@~1.1.1: resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== -accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: - version "1.3.7" - resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" - integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== - dependencies: - mime-types "~2.1.24" - negotiator "0.6.2" - -accepts@~1.3.8: +accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8: version "1.3.8" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== @@ -3740,16 +2823,11 @@ acorn-globals@^6.0.0: acorn "^7.1.1" acorn-walk "^7.1.1" -acorn-jsx@^5.2.0: +acorn-jsx@^5.2.0, acorn-jsx@^5.3.1: version "5.3.2" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== -acorn-jsx@^5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b" - integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng== - acorn-walk@^7.1.1: version "7.2.0" resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" @@ -3775,12 +2853,7 @@ acorn@^7.1.1, acorn@^7.4.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.0.5: - version "8.1.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.1.0.tgz#52311fd7037ae119cbb134309e901aa46295b3fe" - integrity sha512-LWCF/Wn0nfHOmJ9rzQApGnxnvgfROzGilS8936rqN/lfcYkY9MYZzdMqN+2NJ4SlTc+m5HiSa+kNfDtI64dwUA== - -acorn@^8.4.1: +acorn@^8.0.5, acorn@^8.4.1: version "8.7.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf" integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ== @@ -3913,12 +2986,7 @@ ansi-regex@^4.1.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== -ansi-regex@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" - integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== - -ansi-regex@^5.0.1: +ansi-regex@^5.0.0, ansi-regex@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== @@ -3965,15 +3033,7 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" -anymatch@^3.0.3, anymatch@~3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142" - integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg== - dependencies: - normalize-path "^3.0.0" - picomatch "^2.0.4" - -anymatch@~3.1.2: +anymatch@^3.0.3, anymatch@~3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== @@ -4272,17 +3332,7 @@ axe-core@4.4.1: resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.4.1.tgz#7dbdc25989298f9ad006645cd396782443757413" integrity sha512-gd1kmb21kwNuWr6BQz8fv6GNECPBnUasepcoLbekws23NVBLODdsClRZ+bQ8+9Uomf3Sm3+Vwn0oYG9NvwnJCw== -axe-core@^4.0.2: - version "4.1.3" - resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.1.3.tgz#64a4c85509e0991f5168340edc4bedd1ceea6966" - integrity sha512-vwPpH4Aj4122EW38mxO/fxhGKtwWTMLDIJfZ1He0Edbtjcfna/R3YB67yVhezUMzqc3Jr3+Ii50KRntlENL4xQ== - -axe-core@^4.3.3: - version "4.3.5" - resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.3.5.tgz#78d6911ba317a8262bfee292aeafcc1e04b49cc5" - integrity sha512-WKTW1+xAzhMS5dJsxWkliixlO/PqC4VhmO9T4juNYcaTg9jzWiJsou6m5pxWYGfigWbwzJWeFY6z47a+4neRXA== - -axe-core@^4.4.1: +axe-core@^4.0.2, axe-core@^4.3.3, axe-core@^4.4.1: version "4.4.2" resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.4.2.tgz#dcf7fb6dea866166c3eab33d68208afe4d5f670c" integrity sha512-LVAaGp/wkkgYJcjmHsoKx4juT1aQvJyPcW09MLCjVTh3V2cc6PnyempiLMNH5iMdfIX/zdbjUx2KDjMLCTdPeA== @@ -5086,22 +4136,6 @@ bn.js@^5.0.0, bn.js@^5.1.1: resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002" integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw== -body-parser@1.19.0: - version "1.19.0" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" - integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw== - dependencies: - bytes "3.1.0" - content-type "~1.0.4" - debug "2.6.9" - depd "~1.1.2" - http-errors "1.7.2" - iconv-lite "0.4.24" - on-finished "~2.3.0" - qs "6.7.0" - raw-body "2.4.0" - type-is "~1.6.17" - body-parser@1.20.0: version "1.20.0" resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.0.tgz#3de69bd89011c11573d7bfee6a64f11b6bd27cc5" @@ -5214,7 +4248,7 @@ braces@^2.3.1, braces@^2.3.2: split-string "^3.0.2" to-regex "^3.0.1" -braces@^3.0.1, braces@^3.0.2, braces@~3.0.2: +braces@^3.0.2, braces@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== @@ -5332,18 +4366,7 @@ browserslist@^3.2.6: caniuse-lite "^1.0.30000844" electron-to-chromium "^1.3.47" -browserslist@^4.14.5, browserslist@^4.16.3: - version "4.16.3" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.3.tgz#340aa46940d7db878748567c5dea24a48ddf3717" - integrity sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw== - dependencies: - caniuse-lite "^1.0.30001181" - colorette "^1.2.1" - electron-to-chromium "^1.3.649" - escalade "^3.1.1" - node-releases "^1.1.70" - -browserslist@^4.17.5, browserslist@^4.19.1: +browserslist@^4.16.3, browserslist@^4.17.5, browserslist@^4.19.1: version "4.20.2" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.2.tgz#567b41508757ecd904dab4d1c646c612cd3d4f88" integrity sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA== @@ -5444,11 +4467,6 @@ bytes@3.0.0: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg= -bytes@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" - integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== - bytes@3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" @@ -5569,7 +4587,7 @@ camelcase@^6.0.0, camelcase@^6.2.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== -caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001181, caniuse-lite@^1.0.30001196, caniuse-lite@^1.0.30001317: +caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001196, caniuse-lite@^1.0.30001317: version "1.0.30001344" resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001344.tgz" integrity sha512-0ZFjnlCaXNOAYcV7i+TtdKBp0L/3XEU2MF/x6Du1lrh+SRX4IfzIVL4HNJg5pB2PmFb8rszIGyOvsZnqqRoc2g== @@ -5599,7 +4617,7 @@ caseless@~0.12.0: resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= -chalk@4.1.0, chalk@^4.0.0, chalk@^4.1.0: +chalk@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== @@ -5635,7 +4653,7 @@ chalk@^3.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -chalk@^4.1.2: +chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -5716,22 +4734,7 @@ chokidar@^2.1.8: optionalDependencies: fsevents "^1.2.7" -chokidar@^3.4.0, chokidar@^3.4.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a" - integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw== - dependencies: - anymatch "~3.1.1" - braces "~3.0.2" - glob-parent "~5.1.0" - is-binary-path "~2.1.0" - is-glob "~4.0.1" - normalize-path "~3.0.0" - readdirp "~3.5.0" - optionalDependencies: - fsevents "~2.3.1" - -chokidar@^3.5.3: +chokidar@^3.4.0, chokidar@^3.4.1, chokidar@^3.5.3: version "3.5.3" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== @@ -6046,7 +5049,7 @@ color-support@^1.1.3: resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== -colorette@^1.1.0, colorette@^1.2.1, colorette@^1.2.2: +colorette@^1.1.0, colorette@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94" integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w== @@ -6234,13 +5237,6 @@ contains-path@^0.1.0: resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a" integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo= -content-disposition@0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" - integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g== - dependencies: - safe-buffer "5.1.2" - content-disposition@0.5.4: version "0.5.4" resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe" @@ -6293,19 +5289,7 @@ conventional-commits-filter@^2.0.0, conventional-commits-filter@^2.0.7: lodash.ismatch "^4.4.0" modify-values "^1.0.0" -conventional-commits-parser@^3.0.0: - version "3.2.3" - resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.2.3.tgz#fc43704698239451e3ef35fd1d8ed644f46bd86e" - integrity sha512-YyRDR7On9H07ICFpRm/igcdjIqebXbvf4Cff+Pf0BrBys1i1EOzx9iFXNlAbdrLAR8jf7bkUYkDAr8pEy0q4Pw== - dependencies: - JSONStream "^1.0.4" - is-text-path "^1.0.1" - lodash "^4.17.15" - meow "^8.0.0" - split2 "^3.0.0" - through2 "^4.0.0" - -conventional-commits-parser@^3.2.2, conventional-commits-parser@^3.2.3: +conventional-commits-parser@^3.0.0, conventional-commits-parser@^3.2.2, conventional-commits-parser@^3.2.3: version "3.2.4" resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.2.4.tgz#a7d3b77758a202a9b2293d2112a8d8052c740972" integrity sha512-nK7sAtfi+QXbxHCYfhpZsfRtaitZLIA6889kFIouLvz6repszQDgxBu7wf2WbU+Dco7sAnNCJYERCwt54WPC2Q== @@ -6317,14 +5301,7 @@ conventional-commits-parser@^3.2.2, conventional-commits-parser@^3.2.3: split2 "^3.0.0" through2 "^4.0.0" -convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" - integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA== - dependencies: - safe-buffer "~5.1.1" - -convert-source-map@^1.5.0, convert-source-map@^1.5.1: +convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1, convert-source-map@^1.6.0, convert-source-map@^1.7.0: version "1.8.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA== @@ -6336,11 +5313,6 @@ cookie-signature@1.0.6: resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= -cookie@0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" - integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== - cookie@0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b" @@ -6363,7 +5335,7 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= -core-js-compat@^3.20.2, core-js-compat@^3.21.0: +core-js-compat@^3.20.2, core-js-compat@^3.21.0, core-js-compat@^3.8.1: version "3.21.1" resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.21.1.tgz#cac369f67c8d134ff8f9bd1623e3bc2c42068c82" integrity sha512-gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g== @@ -6371,14 +5343,6 @@ core-js-compat@^3.20.2, core-js-compat@^3.21.0: browserslist "^4.19.1" semver "7.0.0" -core-js-compat@^3.8.1, core-js-compat@^3.9.0: - version "3.9.1" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.9.1.tgz#4e572acfe90aff69d76d8c37759d21a5c59bb455" - integrity sha512-jXAirMQxrkbiiLsCx9bQPJFA6llDadKMpYrBJQJ3/c4/vsPP/fAf29h24tviRlvwUL6AmY5CHLu2GvjuYviQqA== - dependencies: - browserslist "^4.16.3" - semver "7.0.0" - core-js-pure@^3.0.0: version "3.9.1" resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.9.1.tgz#677b322267172bd490e4464696f790cbc355bec5" @@ -6407,7 +5371,7 @@ cosmiconfig-typescript-loader@^1.0.0: cosmiconfig "^7" ts-node "^10.7.0" -cosmiconfig@^7: +cosmiconfig@^7, cosmiconfig@^7.0.0: version "7.0.1" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ== @@ -6418,17 +5382,6 @@ cosmiconfig@^7: path-type "^4.0.0" yaml "^1.10.0" -cosmiconfig@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3" - integrity sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA== - dependencies: - "@types/parse-json" "^4.0.0" - import-fresh "^3.2.1" - parse-json "^5.0.0" - path-type "^4.0.0" - yaml "^1.10.0" - create-ecdh@^4.0.0: version "4.0.4" resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e" @@ -6599,9 +5552,9 @@ cssstyle@^2.3.0: cssom "~0.3.6" csstype@^3.0.2: - version "3.0.7" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.7.tgz#2a5fb75e1015e84dd15692f71e89a1450290950b" - integrity sha512-KxnUB0ZMlnUWCsx2Z8MUsr6qV6ja1w9ArPErJaJaF8a5SOWoHLIszeCTKGRGRgtLgYrs1E8CHkNSP1VZTTPc9g== + version "3.1.0" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.0.tgz#4ddcac3718d787cf9df0d1b7d15033925c8f29f2" + integrity sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA== cyclist@^1.0.1: version "1.0.1" @@ -6663,10 +5616,10 @@ debug@3.1.0: dependencies: ms "2.0.0" -debug@4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" - integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== +debug@4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.4: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: ms "2.1.2" @@ -6677,13 +5630,6 @@ debug@^3.1.0, debug@^3.1.1, debug@^3.2.6: dependencies: ms "^2.1.1" -debug@^4.3.4: - version "4.3.4" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" - integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== - dependencies: - ms "2.1.2" - debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" @@ -6865,11 +5811,6 @@ destroy@1.2.0: resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015" integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== -destroy@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" - integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= - detect-file@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" @@ -6988,26 +5929,12 @@ doctrine@^3.0.0: dependencies: esutils "^2.0.2" -dom-accessibility-api@^0.5.4: - version "0.5.4" - resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.4.tgz#b06d059cdd4a4ad9a79275f9d414a5c126241166" - integrity sha512-TvrjBckDy2c6v6RLxPv5QXOnU+SmF9nBII5621Ve5fu6Z/BDrENurBEvlC1f44lKEUVqOpK4w9E5Idc5/EgkLQ== - -dom-accessibility-api@^0.5.6, dom-accessibility-api@^0.5.9: +dom-accessibility-api@^0.5.4, dom-accessibility-api@^0.5.6, dom-accessibility-api@^0.5.9: version "0.5.13" resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.13.tgz#102ee5f25eacce09bdf1cfa5a298f86da473be4b" integrity sha512-R305kwb5CcMDIpSHUnLyIAp7SrSPBx6F0VfQFB3M75xVMHhXJJIdePYgbPPh1o57vCHNu5QztokWUPsLjWzFqw== -dom-serializer@^1.0.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.2.0.tgz#3433d9136aeb3c627981daa385fc7f32d27c48f1" - integrity sha512-n6kZFH/KlCrqs/1GHMOd5i2fd/beQHuehKdWvNNffbGHTr/almdhuVvTVFb3V7fglz+nC50fFusu3lY33h12pA== - dependencies: - domelementtype "^2.0.1" - domhandler "^4.0.0" - entities "^2.0.0" - -dom-serializer@^1.3.2: +dom-serializer@^1.0.1, dom-serializer@^1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91" integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig== @@ -7021,12 +5948,7 @@ domain-browser@^1.1.1: resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA== -domelementtype@^2.0.1, domelementtype@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.1.0.tgz#a851c080a6d1c3d94344aed151d99f669edf585e" - integrity sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w== - -domelementtype@^2.2.0: +domelementtype@^2.0.1, domelementtype@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== @@ -7045,30 +5967,14 @@ domhandler@^3.3.0: dependencies: domelementtype "^2.0.1" -domhandler@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.0.0.tgz#01ea7821de996d85f69029e81fa873c21833098e" - integrity sha512-KPTbnGQ1JeEMQyO1iYXoagsI6so/C96HZiFyByU3T6iAzpXn8EGEvct6unm1ZGoed8ByO2oirxgwxBmqKF9haA== - dependencies: - domelementtype "^2.1.0" - -domhandler@^4.2.0, domhandler@^4.3.1: +domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1: version "4.3.1" resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c" integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ== dependencies: domelementtype "^2.2.0" -domutils@^2.4.2: - version "2.5.0" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.5.0.tgz#42f49cffdabb92ad243278b331fd761c1c2d3039" - integrity sha512-Ho16rzNMOFk2fPwChGh3D2D9OEHAfG19HgmRR2l+WLSsIstNsAYBzePH412bL0y5T44ejABIVfTHQ8nqi/tBCg== - dependencies: - dom-serializer "^1.0.1" - domelementtype "^2.0.1" - domhandler "^4.0.0" - -domutils@^2.5.2, domutils@^2.8.0: +domutils@^2.4.2, domutils@^2.5.2, domutils@^2.8.0: version "2.8.0" resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A== @@ -7148,17 +6054,7 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -electron-to-chromium@^1.3.47: - version "1.3.901" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.901.tgz#ce2c3157d61bce9f42f1e83225c17358ae9f4918" - integrity sha512-ToJdV2vzwT2jeAsw8zIggTFllJ4Kxvwghk39AhJEHHlIxor10wsFI3wo69p8nFc0s/ATWBqugPv/k3nW4Y9Mww== - -electron-to-chromium@^1.3.649: - version "1.3.691" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.691.tgz#a671eaf135a3ccec0915eb8d844a0952aba79f3b" - integrity sha512-ZqiO69KImmOGCyoH0icQPU3SndJiW93juEvf63gQngyhODO6SpQIPMTOHldtCs5DS5GMKvAkquk230E2zt2vpw== - -electron-to-chromium@^1.4.84: +electron-to-chromium@^1.3.47, electron-to-chromium@^1.4.84: version "1.4.85" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.85.tgz#a3666ba42147026b9f34d4d8d4caf0740e80f751" integrity sha512-K9AsQ41WS2bjZUFpRWfvaS4RjEcRCamEkBJN1Z1TQILBfP1H8QnJ9ti0wiLiMv0sRjX3EHKzgs9jDnmGFx2jXg== @@ -8008,43 +6904,7 @@ expect@^26.6.2: jest-message-util "^26.6.2" jest-regex-util "^26.0.0" -express@^4.17.1: - version "4.17.1" - resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" - integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g== - dependencies: - accepts "~1.3.7" - array-flatten "1.1.1" - body-parser "1.19.0" - content-disposition "0.5.3" - content-type "~1.0.4" - cookie "0.4.0" - cookie-signature "1.0.6" - debug "2.6.9" - depd "~1.1.2" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - finalhandler "~1.1.2" - fresh "0.5.2" - merge-descriptors "1.0.1" - methods "~1.1.2" - on-finished "~2.3.0" - parseurl "~1.3.3" - path-to-regexp "0.1.7" - proxy-addr "~2.0.5" - qs "6.7.0" - range-parser "~1.2.1" - safe-buffer "5.1.2" - send "0.17.1" - serve-static "1.14.1" - setprototypeof "1.1.1" - statuses "~1.5.0" - type-is "~1.6.18" - utils-merge "1.0.1" - vary "~1.1.2" - -express@^4.18.0: +express@^4.17.1, express@^4.18.0: version "4.18.1" resolved "https://registry.yarnpkg.com/express/-/express-4.18.1.tgz#7797de8b9c72c857b9cd0e14a5eea80666267caf" integrity sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q== @@ -8144,19 +7004,7 @@ fast-diff@^1.1.2: resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03" integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== -fast-glob@^3.0.3, fast-glob@^3.1.1: - version "3.2.5" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661" - integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg== - dependencies: - "@nodelib/fs.stat" "^2.0.2" - "@nodelib/fs.walk" "^1.2.3" - glob-parent "^5.1.0" - merge2 "^1.3.0" - micromatch "^4.0.2" - picomatch "^2.2.1" - -fast-glob@^3.2.9: +fast-glob@^3.0.3, fast-glob@^3.2.9: version "3.2.11" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9" integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew== @@ -8284,19 +7132,6 @@ finalhandler@1.2.0: statuses "2.0.1" unpipe "~1.0.0" -finalhandler@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" - integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== - dependencies: - debug "2.6.9" - encodeurl "~1.0.2" - escape-html "~1.0.3" - on-finished "~2.3.0" - parseurl "~1.3.3" - statuses "~1.5.0" - unpipe "~1.0.0" - find-babel-config@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-1.2.0.tgz#a9b7b317eb5b9860cda9d54740a8c8337a2283a2" @@ -8411,12 +7246,7 @@ flush-write-stream@^1.0.0, flush-write-stream@^1.0.2: inherits "^2.0.3" readable-stream "^2.3.6" -follow-redirects@^1.0.0: - version "1.13.3" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.3.tgz#e5598ad50174c1bc4e872301e82ac2cd97f90267" - integrity sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA== - -follow-redirects@^1.14.4: +follow-redirects@^1.0.0, follow-redirects@^1.14.4: version "1.14.6" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.6.tgz#8cfb281bbc035b3c067d6cd975b0f6ade6e855cd" integrity sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A== @@ -8454,11 +7284,6 @@ forwarded@0.2.0: resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== -forwarded@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" - integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= - fraction.js@^4.0.13: version "4.0.13" resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.0.13.tgz#3c1c315fa16b35c85fffa95725a36fa729c69dfe" @@ -8606,7 +7431,7 @@ fsevents@^1.2.7: bindings "^1.5.0" nan "^2.12.1" -fsevents@^2.1.2, fsevents@~2.3.1, fsevents@~2.3.2: +fsevents@^2.1.2, fsevents@~2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== @@ -8792,7 +7617,7 @@ glob-parent@^3.1.0: is-glob "^3.1.0" path-dirname "^1.0.0" -glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@^5.1.2, glob-parent@~5.1.0, glob-parent@~5.1.2: +glob-parent@^5.0.0, glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== @@ -8820,19 +7645,7 @@ glob-stream@^6.1.0: to-absolute-glob "^2.0.0" unique-stream "^2.0.2" -glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: - version "7.1.6" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" - integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^7.2.0: +glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0: version "7.2.0" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== @@ -8918,31 +7731,7 @@ globby@10.0.1: merge2 "^1.2.3" slash "^3.0.0" -globby@^11.0.0, globby@^11.0.3: - version "11.0.4" - resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5" - integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg== - dependencies: - array-union "^2.1.0" - dir-glob "^3.0.1" - fast-glob "^3.1.1" - ignore "^5.1.4" - merge2 "^1.3.0" - slash "^3.0.0" - -globby@^11.0.1: - version "11.0.2" - resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.2.tgz#1af538b766a3b540ebfb58a32b2e2d5897321d83" - integrity sha512-2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og== - dependencies: - array-union "^2.1.0" - dir-glob "^3.0.1" - fast-glob "^3.1.1" - ignore "^5.1.4" - merge2 "^1.3.0" - slash "^3.0.0" - -globby@^11.0.4: +globby@^11.0.0, globby@^11.0.1, globby@^11.0.3, globby@^11.0.4: version "11.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== @@ -9004,26 +7793,11 @@ got@^9.6.0: to-readable-stream "^1.0.0" url-parse-lax "^3.0.0" -graceful-fs@^4.0.0, graceful-fs@^4.2.6: +graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: version "4.2.10" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== -graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4: - version "4.2.6" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" - integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== - -graceful-fs@^4.2.2: - version "4.2.8" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" - integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== - -graceful-fs@^4.2.9: - version "4.2.9" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" - integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ== - growly@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" @@ -9219,12 +7993,7 @@ hook-std@^2.0.0: resolved "https://registry.yarnpkg.com/hook-std/-/hook-std-2.0.0.tgz#ff9aafdebb6a989a354f729bb6445cf4a3a7077c" integrity sha512-zZ6T5WcuBMIUVh49iPQS9t977t7C0l7OtHrpeMb5uk48JdflRX0NSFvCekfYNmGQETnLq9W/isMyHl69kxGi8g== -hosted-git-info@^2.1.4: - version "2.8.8" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488" - integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg== - -hosted-git-info@^2.7.1, hosted-git-info@^2.8.9: +hosted-git-info@^2.1.4, hosted-git-info@^2.7.1, hosted-git-info@^2.8.9: version "2.8.9" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== @@ -9315,17 +8084,6 @@ http-deceiver@^1.2.7: resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc= -http-errors@1.7.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" - integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg== - dependencies: - depd "~1.1.2" - inherits "2.0.3" - setprototypeof "1.1.1" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" - http-errors@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3" @@ -9347,17 +8105,6 @@ http-errors@~1.6.2: setprototypeof "1.1.0" statuses ">= 1.4.0 < 2" -http-errors@~1.7.2: - version "1.7.3" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" - integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== - dependencies: - depd "~1.1.2" - inherits "2.0.4" - setprototypeof "1.1.1" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" - http-parser-js@>=0.5.1: version "0.5.3" resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz#01d2709c79d41698bb01d4decc5e9da4e4a033d9" @@ -9582,12 +8329,7 @@ ignore@^4.0.6: resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== -ignore@^5.1.1, ignore@^5.1.4: - version "5.1.8" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" - integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== - -ignore@^5.2.0: +ignore@^5.1.1, ignore@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== @@ -9913,21 +8655,7 @@ is-cidr@^4.0.2: dependencies: cidr-regex "^3.1.1" -is-core-module@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a" - integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ== - dependencies: - has "^1.0.3" - -is-core-module@^2.5.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548" - integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw== - dependencies: - has "^1.0.3" - -is-core-module@^2.8.1: +is-core-module@^2.5.0, is-core-module@^2.8.1: version "2.8.1" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211" integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA== @@ -10929,12 +9657,10 @@ json3@^3.3.3: resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81" integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA== -json5@2.x, json5@^2.1.2: - version "2.2.0" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" - integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== - dependencies: - minimist "^1.2.5" +json5@2.x, json5@^2.1.2, json5@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" + integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== json5@^0.5.1: version "0.5.1" @@ -10948,11 +9674,6 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -json5@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" - integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== - jsonfile@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" @@ -11978,7 +10699,7 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4: snapdragon "^0.8.1" to-regex "^3.0.2" -micromatch@^4.0.0, micromatch@^4.0.5: +micromatch@^4.0.0, micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5: version "4.0.5" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== @@ -11986,22 +10707,6 @@ micromatch@^4.0.0, micromatch@^4.0.5: braces "^3.0.2" picomatch "^2.3.1" -micromatch@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259" - integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q== - dependencies: - braces "^3.0.1" - picomatch "^2.0.5" - -micromatch@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" - integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== - dependencies: - braces "^3.0.1" - picomatch "^2.2.3" - miller-rabin@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d" @@ -12010,24 +10715,12 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" -mime-db@1.46.0, "mime-db@>= 1.43.0 < 2": - version "1.46.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.46.0.tgz#6267748a7f799594de3cbc8cde91def349661cee" - integrity sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ== - -mime-db@1.52.0: +mime-db@1.52.0, "mime-db@>= 1.43.0 < 2": version "1.52.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== -mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24: - version "2.1.29" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.29.tgz#1d4ab77da64b91f5f72489df29236563754bb1b2" - integrity sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ== - dependencies: - mime-db "1.46.0" - -mime-types@~2.1.34: +mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34: version "2.1.35" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== @@ -12084,20 +10777,13 @@ minimalistic-crypto-utils@^1.0.1: resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= -minimatch@^3.0.2: +minimatch@^3.0.2, minimatch@^3.0.4: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== dependencies: brace-expansion "^1.1.7" -minimatch@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== - dependencies: - brace-expansion "^1.1.7" - minimatch@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.0.1.tgz#fb9022f7528125187c92bd9e9b6366be1cf3415b" @@ -12179,14 +10865,7 @@ minipass@^2.3.5, minipass@^2.6.0, minipass@^2.9.0: safe-buffer "^5.1.2" yallist "^3.0.0" -minipass@^3.0.0, minipass@^3.1.1: - version "3.1.5" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.5.tgz#71f6251b0a33a49c01b3cf97ff77eda030dff732" - integrity sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw== - dependencies: - yallist "^4.0.0" - -minipass@^3.1.6: +minipass@^3.0.0, minipass@^3.1.1, minipass@^3.1.6: version "3.1.6" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.6.tgz#3b8150aa688a711a1521af5e8779c1d3bb4f45ee" integrity sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ== @@ -12299,11 +10978,6 @@ ms@2.0.0: resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= -ms@2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" - integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== - ms@2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" @@ -12337,12 +11011,7 @@ nan@^2.12.1: resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19" integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ== -nanoid@^3.1.20, nanoid@^3.1.22: - version "3.3.1" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.1.tgz#6347a18cac88af88f58af0b3594b723d5e99bb35" - integrity sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw== - -nanoid@^3.3.4: +nanoid@^3.1.22, nanoid@^3.3.4: version "3.3.4" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab" integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw== @@ -12374,11 +11043,6 @@ natural-compare@^1.4.0: resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= -negotiator@0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" - integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== - negotiator@0.6.3, negotiator@^0.6.3: version "0.6.3" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" @@ -12519,11 +11183,6 @@ node-notifier@^8.0.0: uuid "^8.3.0" which "^2.0.2" -node-releases@^1.1.70: - version "1.1.71" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb" - integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg== - node-releases@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.2.tgz#7139fe71e2f4f11b47d4d2986aaf8c48699e0c01" @@ -13147,13 +11806,6 @@ on-finished@2.4.1: dependencies: ee-first "1.1.1" -on-finished@~2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" - integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= - dependencies: - ee-first "1.1.1" - on-headers@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" @@ -13173,16 +11825,7 @@ onetime@^5.1.0, onetime@^5.1.2: dependencies: mimic-fn "^2.1.0" -open@^8.0.0: - version "8.0.2" - resolved "https://registry.yarnpkg.com/open/-/open-8.0.2.tgz#8c3e95cce93ba2fc8d99968ee8bfefecdb50b84f" - integrity sha512-NV5QmWJrTaNBLHABJyrb+nd5dXI5zfea/suWawBhkHzAbVhLLiJdrqMgxMypGK9Eznp2Ltoh7SAVkQ3XAucX7Q== - dependencies: - define-lazy-prop "^2.0.0" - is-docker "^2.1.1" - is-wsl "^2.2.0" - -open@^8.4.0: +open@^8.0.0, open@^8.4.0: version "8.4.0" resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8" integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q== @@ -13657,11 +12300,6 @@ path-key@^3.0.0, path-key@^3.1.0: resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== -path-parse@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" - integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== - path-parse@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" @@ -13710,12 +12348,7 @@ picocolors@^1.0.0: resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== -picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1, picomatch@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" - integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== - -picomatch@^2.2.3, picomatch@^2.3.1: +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== @@ -13891,16 +12524,7 @@ postcss-value-parser@^4.1.0: resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb" integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== -postcss@^8.1.10, postcss@^8.2.8: - version "8.2.8" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.8.tgz#0b90f9382efda424c4f0f69a2ead6f6830d08ece" - integrity sha512-1F0Xb2T21xET7oQV9eKuctbM9S7BC0fetoHCc4H13z0PT6haiRLP4T0ZY4XWh7iLP0usgqykT6p9B2RtOf4FPw== - dependencies: - colorette "^1.2.2" - nanoid "^3.1.20" - source-map "^0.6.1" - -postcss@^8.4.13: +postcss@^8.1.10, postcss@^8.2.8, postcss@^8.4.13: version "8.4.14" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.14.tgz#ee9274d5622b4858c1007a74d76e42e56fd21caf" integrity sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig== @@ -14052,16 +12676,7 @@ promzard@^0.3.0: dependencies: read "1" -prop-types@^15.6.0, prop-types@^15.7.2: - version "15.7.2" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" - integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== - dependencies: - loose-envify "^1.4.0" - object-assign "^4.1.1" - react-is "^16.8.1" - -prop-types@^15.8.1: +prop-types@^15.6.0, prop-types@^15.7.2, prop-types@^15.8.1: version "15.8.1" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== @@ -14082,14 +12697,6 @@ protoduck@^5.0.1: dependencies: genfun "^5.0.0" -proxy-addr@~2.0.5: - version "2.0.6" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf" - integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw== - dependencies: - forwarded "~0.1.2" - ipaddr.js "1.9.1" - proxy-addr@~2.0.7: version "2.0.7" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" @@ -14182,11 +12789,6 @@ qs@6.10.3: dependencies: side-channel "^1.0.4" -qs@6.7.0: - version "6.7.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" - integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== - qs@~6.5.2: version "6.5.2" resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" @@ -14276,16 +12878,6 @@ range-parser@^1.2.1, range-parser@~1.2.1: resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== -raw-body@2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" - integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q== - dependencies: - bytes "3.1.0" - http-errors "1.7.2" - iconv-lite "0.4.24" - unpipe "1.0.0" - raw-body@2.5.1: version "2.5.1" resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857" @@ -14307,12 +12899,12 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.2.8: strip-json-comments "~2.0.1" react-dom@^18.1.0: - version "18.1.0" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.1.0.tgz#7f6dd84b706408adde05e1df575b3a024d7e8a2f" - integrity sha512-fU1Txz7Budmvamp7bshe4Zi32d0ll7ect+ccxNu9FlObT605GOEB8BfO4tmRJ39R5Zj831VCpvQ05QPBW5yb+w== + version "18.2.0" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.2.0.tgz#22aaf38708db2674ed9ada224ca4aa708d821e3d" + integrity sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g== dependencies: loose-envify "^1.1.0" - scheduler "^0.22.0" + scheduler "^0.23.0" react-dropzone@^12.0.5: version "12.1.0" @@ -14352,7 +12944,7 @@ react-image-gallery@^1.2.7: resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.1.0.tgz#61aaed3096d30eacf2a2127118b5b41387d32a67" integrity sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg== -react-is@^16.13.1, react-is@^16.8.1, react-is@^16.8.6: +react-is@^16.13.1, react-is@^16.8.6: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== @@ -14429,9 +13021,9 @@ react-virtuoso@^2.10.2: "@virtuoso.dev/urx" "^0.2.12" react@^18.1.0: - version "18.1.0" - resolved "https://registry.yarnpkg.com/react/-/react-18.1.0.tgz#6f8620382decb17fdc5cc223a115e2adbf104890" - integrity sha512-4oL8ivCz5ZEPyclFQXaNksK3adutVS8l2xzZU0cqEFrE9Sb7fC0EFK5uEk74wIreL1DERyjvsU915j1pcT2uEQ== + version "18.2.0" + resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5" + integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ== dependencies: loose-envify "^1.1.0" @@ -14592,13 +13184,6 @@ readdirp@^2.2.1: micromatch "^3.1.10" readable-stream "^2.0.2" -readdirp@~3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e" - integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ== - dependencies: - picomatch "^2.2.1" - readdirp@~3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" @@ -14638,14 +13223,7 @@ regenerate-unicode-properties@^10.0.1: dependencies: regenerate "^1.4.2" -regenerate-unicode-properties@^8.2.0: - version "8.2.0" - resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec" - integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA== - dependencies: - regenerate "^1.4.0" - -regenerate@^1.2.1, regenerate@^1.4.0, regenerate@^1.4.2: +regenerate@^1.2.1, regenerate@^1.4.2: version "1.4.2" resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== @@ -14711,18 +13289,6 @@ regexpu-core@^2.0.0: regjsgen "^0.2.0" regjsparser "^0.1.4" -regexpu-core@^4.7.1: - version "4.7.1" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6" - integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ== - dependencies: - regenerate "^1.4.0" - regenerate-unicode-properties "^8.2.0" - regjsgen "^0.5.1" - regjsparser "^0.6.4" - unicode-match-property-ecmascript "^1.0.4" - unicode-match-property-value-ecmascript "^1.2.0" - regexpu-core@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.0.1.tgz#c531122a7840de743dcf9c83e923b5560323ced3" @@ -14769,11 +13335,6 @@ regjsgen@^0.2.0: resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7" integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc= -regjsgen@^0.5.1: - version "0.5.2" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733" - integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A== - regjsgen@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.6.0.tgz#83414c5354afd7d6627b16af5f10f41c4e71808d" @@ -14786,13 +13347,6 @@ regjsparser@^0.1.4: dependencies: jsesc "~0.5.0" -regjsparser@^0.6.4: - version "0.6.7" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.7.tgz#c00164e1e6713c2e3ee641f1701c4b7aa0a7f86c" - integrity sha512-ib77G0uxsA2ovgiYbCVGx4Pv3PSttAx2vIwidqQzbL2U5S4Q+j00HdSAneSBuyVcMvEnTXMjiGgB+DlXozVhpQ== - dependencies: - jsesc "~0.5.0" - regjsparser@^0.8.2: version "0.8.4" resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.8.4.tgz#8a14285ffcc5de78c5b95d62bbf413b6bc132d5f" @@ -15027,15 +13581,7 @@ resolve-url@^0.2.1: resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= -resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.18.1: - version "1.20.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" - integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== - dependencies: - is-core-module "^2.2.0" - path-parse "^1.0.6" - -resolve@^1.22.0: +resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.22.0: version "1.22.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198" integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw== @@ -15195,14 +13741,7 @@ rollup-pluginutils@^2.3.1, rollup-pluginutils@^2.8.1, rollup-pluginutils@^2.8.2: dependencies: estree-walker "^0.6.1" -rollup@^2.33.3: - version "2.41.4" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.41.4.tgz#2a674d64db4322482d440699acb060dc6dd9e65f" - integrity sha512-f9IHfMO8p2Y8OdisI7Oj3oKkPuaQ6cgSwYqAi0TDvP3w2p+oX1VejX/w28a1h8WTnrapzfO5d4Uqhww+gL0b0g== - optionalDependencies: - fsevents "~2.3.1" - -rollup@^2.59.0: +rollup@^2.33.3, rollup@^2.59.0: version "2.70.1" resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.70.1.tgz#824b1f1f879ea396db30b0fc3ae8d2fead93523e" integrity sha512-CRYsI5EuzLbXdxC6RnYhOuRdtz4bhejPMSWjsFLfVM/7w/85n2szZv6yExqUXsBdz5KT8eoubeyDUDjhLHEslA== @@ -15296,6 +13835,13 @@ scheduler@^0.22.0: dependencies: loose-envify "^1.1.0" +scheduler@^0.23.0: + version "0.23.0" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.0.tgz#ba8041afc3d30eb206a487b6b384002e4e61fdfe" + integrity sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw== + dependencies: + loose-envify "^1.1.0" + schema-utils@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770" @@ -15436,50 +13982,24 @@ semver@7.0.0: resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== -semver@7.3.5, semver@^7.1.1, semver@^7.1.2, semver@^7.1.3, semver@^7.3.5: +semver@7.3.5: version "7.3.5" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== dependencies: lru-cache "^6.0.0" -semver@7.x, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4: - version "7.3.4" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" - integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== - dependencies: - lru-cache "^6.0.0" - -semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -semver@^7.0.0: +semver@7.x, semver@^7.0.0, semver@^7.1.1, semver@^7.1.2, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: version "7.3.6" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.6.tgz#5d73886fb9c0c6602e79440b97165c29581cbb2b" integrity sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w== dependencies: lru-cache "^7.4.0" -send@0.17.1: - version "0.17.1" - resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" - integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg== - dependencies: - debug "2.6.9" - depd "~1.1.2" - destroy "~1.0.4" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - fresh "0.5.2" - http-errors "~1.7.2" - mime "1.6.0" - ms "2.1.1" - on-finished "~2.3.0" - range-parser "~1.2.1" - statuses "~1.5.0" +semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== send@0.18.0: version "0.18.0" @@ -15520,16 +14040,6 @@ serve-index@^1.9.1: mime-types "~2.1.17" parseurl "~1.3.2" -serve-static@1.14.1: - version "1.14.1" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" - integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg== - dependencies: - encodeurl "~1.0.2" - escape-html "~1.0.3" - parseurl "~1.3.3" - send "0.17.1" - serve-static@1.15.0: version "1.15.0" resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540" @@ -15565,11 +14075,6 @@ setprototypeof@1.1.0: resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ== -setprototypeof@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" - integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== - setprototypeof@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" @@ -15628,17 +14133,7 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" -signal-exit@^3.0.0, signal-exit@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" - integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== - -signal-exit@^3.0.3: - version "3.0.5" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz#9e3e8cc0c75a99472b44321033a7702e7738252f" - integrity sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ== - -signal-exit@^3.0.7: +signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7: version "3.0.7" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== @@ -15976,20 +14471,13 @@ sshpk@^1.7.0: safer-buffer "^2.0.2" tweetnacl "~0.14.0" -ssri@^6.0.0, ssri@^6.0.2: +ssri@^6.0.0, ssri@^6.0.1, ssri@^6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5" integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q== dependencies: figgy-pudding "^3.5.1" -ssri@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8" - integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA== - dependencies: - figgy-pudding "^3.5.1" - ssri@^8.0.1: version "8.0.1" resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af" @@ -16029,7 +14517,7 @@ statuses@2.0.1: resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== -"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0: +"statuses@>= 1.4.0 < 2": version "1.5.0" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= @@ -16136,7 +14624,7 @@ string-width@^1.0.1: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.2.2, string-width@^4.2.3: +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -16162,15 +14650,6 @@ string-width@^3.0.0, string-width@^3.1.0: is-fullwidth-code-point "^2.0.0" strip-ansi "^5.1.0" -string-width@^4.1.0, string-width@^4.2.0: - version "4.2.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" - integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.0" - string.prototype.matchall@^4.0.2: version "4.0.4" resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.4.tgz#608f255e93e072107f5de066f81a2dfb78cf6b29" @@ -16250,14 +14729,7 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" -strip-ansi@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" - integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== - dependencies: - ansi-regex "^5.0.0" - -strip-ansi@^6.0.1: +strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -16340,15 +14812,7 @@ supports-color@^7.0.0, supports-color@^7.1.0: dependencies: has-flag "^4.0.0" -supports-hyperlinks@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz#f663df252af5f37c5d49bbd7eeefa9e0b9e59e47" - integrity sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA== - dependencies: - has-flag "^4.0.0" - supports-color "^7.0.0" - -supports-hyperlinks@^2.2.0: +supports-hyperlinks@^2.0.0, supports-hyperlinks@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb" integrity sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ== @@ -16644,11 +15108,6 @@ to-through@^2.0.0: dependencies: through2 "^2.0.3" -toidentifier@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" - integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== - toidentifier@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" @@ -16783,7 +15242,7 @@ tsconfig-paths@^3.9.0: minimist "^1.2.0" strip-bom "^3.0.0" -tslib@2.3.0, tslib@^2.0.3: +tslib@2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e" integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg== @@ -16793,12 +15252,7 @@ tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.1: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" - integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== - -tslib@^2.2.0: +tslib@^2.0.1, tslib@^2.0.3, tslib@^2.2.0: version "2.3.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== @@ -16899,7 +15353,7 @@ type-fest@^1.0.2: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1" integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA== -type-is@~1.6.17, type-is@~1.6.18: +type-is@~1.6.18: version "1.6.18" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== @@ -16919,16 +15373,16 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript@4.3.5: - version "4.3.5" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4" - integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA== - typescript@^4.2.4, typescript@^4.4.3: version "4.6.3" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.3.tgz#eefeafa6afdd31d725584c67a0eaba80f6fc6c6c" integrity sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw== +typescript@^4.7.4: + version "4.7.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235" + integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ== + uglify-js@^3.1.4: version "3.14.3" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.14.3.tgz#c0f25dfea1e8e5323eccf59610be08b6043c15cf" @@ -16980,24 +15434,11 @@ unherit@^1.0.4: inherits "^2.0.0" xtend "^4.0.0" -unicode-canonical-property-names-ecmascript@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818" - integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ== - unicode-canonical-property-names-ecmascript@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ== -unicode-match-property-ecmascript@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c" - integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg== - dependencies: - unicode-canonical-property-names-ecmascript "^1.0.4" - unicode-property-aliases-ecmascript "^1.0.4" - unicode-match-property-ecmascript@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3" @@ -17006,21 +15447,11 @@ unicode-match-property-ecmascript@^2.0.0: unicode-canonical-property-names-ecmascript "^2.0.0" unicode-property-aliases-ecmascript "^2.0.0" -unicode-match-property-value-ecmascript@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531" - integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ== - unicode-match-property-value-ecmascript@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714" integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw== -unicode-property-aliases-ecmascript@^1.0.4: - version "1.1.0" - resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4" - integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg== - unicode-property-aliases-ecmascript@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8" @@ -18038,10 +16469,10 @@ yaml@^1.10.0: resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== -yargs-parser@20.x, yargs-parser@^20.2.2: - version "20.2.7" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz#61df85c113edfb5a7a4e36eb8aa60ef423cbc90a" - integrity sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw== +yargs-parser@20.x, yargs-parser@^20.2.2, yargs-parser@^20.2.3: + version "20.2.9" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" + integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== yargs-parser@^13.1.2: version "13.1.2" @@ -18067,11 +16498,6 @@ yargs-parser@^18.1.2: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^20.2.3: - version "20.2.9" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" - integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== - yargs-parser@^21.0.0: version "21.0.1" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz#0267f286c877a4f0f728fceb6f8a3e4cb95c6e35" From c4f7520aa0a113547a1f44834dcf9636df42fc00 Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Tue, 5 Jul 2022 08:04:02 +0200 Subject: [PATCH 06/52] feat: add "str-chat__message--error-message" class to message error div --- src/components/Message/MessageText.tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/components/Message/MessageText.tsx b/src/components/Message/MessageText.tsx index bcb8815f24..4eee06cec8 100644 --- a/src/components/Message/MessageText.tsx +++ b/src/components/Message/MessageText.tsx @@ -87,12 +87,16 @@ const UnMemoizedMessageTextComponent = < > {message.quoted_message && } {message.type === 'error' && ( -
+
{t('Error · Unsent')}
)} {message.status === 'failed' && ( -
+
{message.errorStatusCode !== 403 ? t('Message Failed · Click to try again') : t('Message Failed · Unauthorized')} From 9323edb46aa0bf0c83d23817698756d9cbdf2da4 Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Tue, 5 Jul 2022 08:05:11 +0200 Subject: [PATCH 07/52] feat: wrap ThreadHead content in a div to enable styling for class str-chat__parent-message-li --- src/components/Thread/ThreadHead.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Thread/ThreadHead.tsx b/src/components/Thread/ThreadHead.tsx index 338c953dcb..edb14884a4 100644 --- a/src/components/Thread/ThreadHead.tsx +++ b/src/components/Thread/ThreadHead.tsx @@ -16,9 +16,9 @@ export const ThreadHead = < 'ThreadHead', ); return ( - <> +
- +
); }; From ecd0b4b255023d3f665dfebb651ea69e5b5885a2 Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Tue, 5 Jul 2022 08:06:37 +0200 Subject: [PATCH 08/52] feat: add class "str-chat__message-sender-avatar" to Avatar root to display it for sender only --- src/components/Avatar/Avatar.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Avatar/Avatar.tsx b/src/components/Avatar/Avatar.tsx index 5fc5b2c436..85f717aee3 100644 --- a/src/components/Avatar/Avatar.tsx +++ b/src/components/Avatar/Avatar.tsx @@ -59,7 +59,7 @@ export const Avatar = < return (
Date: Tue, 5 Jul 2022 08:08:37 +0200 Subject: [PATCH 09/52] feat: change the close icon for modal and remove Close text --- src/components/Modal/Modal.tsx | 12 ++---------- src/components/Modal/icons.tsx | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 10 deletions(-) create mode 100644 src/components/Modal/icons.tsx diff --git a/src/components/Modal/Modal.tsx b/src/components/Modal/Modal.tsx index b23c073d06..499343725e 100644 --- a/src/components/Modal/Modal.tsx +++ b/src/components/Modal/Modal.tsx @@ -1,6 +1,6 @@ import React, { PropsWithChildren, useEffect, useRef } from 'react'; -import { useTranslationContext } from '../../context/TranslationContext'; +import { CloseIcon } from './icons'; export type ModalProps = { /** If true, modal is opened or visible. */ @@ -12,8 +12,6 @@ export type ModalProps = { export const Modal = (props: PropsWithChildren) => { const { children, onClose, open } = props; - const { t } = useTranslationContext('Modal'); - const innerRef = useRef(null); const closeRef = useRef(null); @@ -42,13 +40,7 @@ export const Modal = (props: PropsWithChildren) => { return (
{children} diff --git a/src/components/Modal/icons.tsx b/src/components/Modal/icons.tsx new file mode 100644 index 0000000000..637bc90499 --- /dev/null +++ b/src/components/Modal/icons.tsx @@ -0,0 +1,21 @@ +import React from 'react'; + +export const CloseIcon = () => ( + + + + + +); From 97e8047651b788d5eb588da99c9e7e0c67657873 Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Tue, 5 Jul 2022 13:53:59 +0200 Subject: [PATCH 10/52] feat: add Attachment icons for theming v2 --- src/components/Attachment/icons.tsx | 31 +++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/components/Attachment/icons.tsx diff --git a/src/components/Attachment/icons.tsx b/src/components/Attachment/icons.tsx new file mode 100644 index 0000000000..6e26b2c396 --- /dev/null +++ b/src/components/Attachment/icons.tsx @@ -0,0 +1,31 @@ +import React from 'react'; +import type { IconProps } from '../../types/types'; + +export const DownloadIcon = ({ className }: IconProps) => ( + + + +); + +export const PlayTriangleIcon = () => ( + + + +); + +export const PauseIcon = () => ( + + + +); From 52acd80b6b7ccd939aae357b0019f1b99975f585 Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Tue, 5 Jul 2022 13:56:21 +0200 Subject: [PATCH 11/52] feat: add FileAttachment component for theming v2 --- src/components/Attachment/DownloadButton.tsx | 19 ++++ src/components/Attachment/FileAttachment.tsx | 67 +++++++++---- .../Attachment/FileSizeIndicator.tsx | 14 +++ .../Attachment/__tests__/File.test.js | 28 +++++- .../__tests__/__snapshots__/File.test.js.snap | 96 +++++++++++++++++-- 5 files changed, 193 insertions(+), 31 deletions(-) create mode 100644 src/components/Attachment/DownloadButton.tsx create mode 100644 src/components/Attachment/FileSizeIndicator.tsx diff --git a/src/components/Attachment/DownloadButton.tsx b/src/components/Attachment/DownloadButton.tsx new file mode 100644 index 0000000000..dbd98e8611 --- /dev/null +++ b/src/components/Attachment/DownloadButton.tsx @@ -0,0 +1,19 @@ +import React from 'react'; + +import { DownloadIcon } from './icons'; +import { SafeAnchor } from '../SafeAnchor'; + +type DownloadButtonProps = { + assetUrl?: string; +}; + +export const DownloadButton = ({ assetUrl }: DownloadButtonProps) => ( + + + +); diff --git a/src/components/Attachment/FileAttachment.tsx b/src/components/Attachment/FileAttachment.tsx index 53cb095404..1d194d84ca 100644 --- a/src/components/Attachment/FileAttachment.tsx +++ b/src/components/Attachment/FileAttachment.tsx @@ -1,10 +1,12 @@ import React from 'react'; -import prettybytes from 'pretty-bytes'; -import { FileIcon } from 'react-file-utils'; +import { FileIcon, FileIconV2 } from 'react-file-utils'; +import type { Attachment } from 'stream-chat'; -import { SafeAnchor } from '../SafeAnchor'; +import { DownloadButton } from './DownloadButton'; +import { FileSizeIndicator } from './FileSizeIndicator'; +import { SafeAnchor } from '../SafeAnchor/SafeAnchor'; -import type { Attachment } from 'stream-chat'; +import { useChatContext } from '../../context/ChatContext'; import type { DefaultStreamChatGenerics } from '../../types/types'; @@ -14,26 +16,51 @@ export type FileAttachmentProps< attachment: Attachment; }; -const UnMemoizedFileAttachment = < +const UnMemoizedFileAttachmentV1 = < + StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics +>({ + attachment, +}: FileAttachmentProps) => ( +
+ +
+ + {attachment.title} + + +
+
+); + +const UnMemoizedFileAttachmentV2 = < StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics ->( - props: FileAttachmentProps, -) => { - const { attachment } = props; - - return ( -
- -
- +>({ + attachment, +}: FileAttachmentProps) => ( +
+ +
+
+
{attachment.title} - - {attachment.file_size && Number.isFinite(Number(attachment.file_size)) && ( - {prettybytes(attachment.file_size as number)} - )} +
+
+
- ); +
+); + +const UnMemoizedFileAttachment = < + StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics +>({ + attachment, +}: FileAttachmentProps) => { + const { themeVersion } = useChatContext('FileAttachment'); + + if (themeVersion === '2') return ; + + return ; }; export const FileAttachment = React.memo( diff --git a/src/components/Attachment/FileSizeIndicator.tsx b/src/components/Attachment/FileSizeIndicator.tsx new file mode 100644 index 0000000000..d518318ecd --- /dev/null +++ b/src/components/Attachment/FileSizeIndicator.tsx @@ -0,0 +1,14 @@ +import React from 'react'; +import prettybytes from 'pretty-bytes'; + +type FileSizeIndicatorProps = { + fileSize?: number; +}; + +export const FileSizeIndicator = ({ fileSize }: FileSizeIndicatorProps) => { + if (!(fileSize && Number.isFinite(Number(fileSize)))) return null; + + return ( + {prettybytes(fileSize)} + ); +}; diff --git a/src/components/Attachment/__tests__/File.test.js b/src/components/Attachment/__tests__/File.test.js index ee2cb06482..9b1dae06df 100644 --- a/src/components/Attachment/__tests__/File.test.js +++ b/src/components/Attachment/__tests__/File.test.js @@ -2,11 +2,16 @@ import React from 'react'; import '@testing-library/jest-dom'; import renderer from 'react-test-renderer'; import { FileAttachment } from '../FileAttachment'; +import { ChatContext } from '../../../context'; -const getComponent = (attachment) => ; +const getComponent = ({ attachment, chatContext }) => ( + + + +); describe('File', () => { - it('should render File component', () => { + it('should render File component in V1', () => { const file = { asset_url: 'https://www.w3.org/WAI/ER/tests/xhtml/testfiles/resources/pdf/dummy.pdf', file_size: 1337, @@ -15,7 +20,24 @@ describe('File', () => { title: 'Nice file', type: 'file', }; - const tree = renderer.create(getComponent(file)).toJSON(); + const tree = renderer + .create(getComponent({ attachment: file, chatContext: { themeVersion: '1' } })) + .toJSON(); + expect(tree).toMatchSnapshot(); + }); + + it('should render File component in V2', () => { + const file = { + asset_url: 'https://www.w3.org/WAI/ER/tests/xhtml/testfiles/resources/pdf/dummy.pdf', + file_size: 1337, + mime_type: 'application/pdf', + text: 'My file', + title: 'Nice file', + type: 'file', + }; + const tree = renderer + .create(getComponent({ attachment: file, chatContext: { themeVersion: '2' } })) + .toJSON(); expect(tree).toMatchSnapshot(); }); }); diff --git a/src/components/Attachment/__tests__/__snapshots__/File.test.js.snap b/src/components/Attachment/__tests__/__snapshots__/File.test.js.snap index 21af715c3c..71399e871d 100644 --- a/src/components/Attachment/__tests__/__snapshots__/File.test.js.snap +++ b/src/components/Attachment/__tests__/__snapshots__/File.test.js.snap @@ -1,20 +1,20 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`File should render File component 1`] = ` +exports[`File should render File component in V1 1`] = `
Nice file - + + 1.34 kB + +
+
+`; + +exports[`File should render File component in V2 1`] = ` +
+ + + + + + + +
+
+
+ Nice file +
+ + + + + +
+ 1.34 kB
From 3ff89bb75a7204e0805e88ee61988a172932a394 Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Tue, 5 Jul 2022 14:19:27 +0200 Subject: [PATCH 12/52] feat: add common IconProps type --- src/types/types.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/types/types.ts b/src/types/types.ts index 268c38cae3..5a0d02269b 100644 --- a/src/types/types.ts +++ b/src/types/types.ts @@ -94,3 +94,7 @@ export type PaginatorProps = { /** Offset from when to start the loadNextPage call */ threshold?: number; }; + +export interface IconProps { + className?: string; +} From 9ff9034aa036a382326bb737fc68cc28664ed856 Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Tue, 5 Jul 2022 14:22:34 +0200 Subject: [PATCH 13/52] feat: add Message icons for theming v2 - MessageDeliveredIcon, MessageErrorIcon --- src/components/Message/icons.tsx | 64 ++++++++++++++++++++++++++++---- 1 file changed, 57 insertions(+), 7 deletions(-) diff --git a/src/components/Message/icons.tsx b/src/components/Message/icons.tsx index b720b9fcfc..50635ed3c4 100644 --- a/src/components/Message/icons.tsx +++ b/src/components/Message/icons.tsx @@ -2,10 +2,16 @@ import React from 'react'; import type { PinIndicatorProps } from './types'; -import type { DefaultStreamChatGenerics } from '../../types/types'; +import type { DefaultStreamChatGenerics, IconProps } from '../../types/types'; -export const ActionsIcon = () => ( - +export const ActionsIcon = ({ className = '' }: IconProps) => ( + ( ); -export const ReactionIcon = () => ( - +export const ReactionIcon = ({ className = '' }: IconProps) => ( + @@ -41,8 +53,8 @@ export const ReactionIcon = () => ( ); -export const ThreadIcon = () => ( - +export const ThreadIcon = ({ className = '' }: IconProps) => ( + ); }; + +export const MessageDeliveredIcon = () => ( + + + +); + +export const MessageErrorIcon = () => ( +
+ + + + +
+); From a5b0fae589ae72eff24436ec06d49d16aad22106 Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Tue, 5 Jul 2022 14:24:18 +0200 Subject: [PATCH 14/52] feat: adapt MessageStatus to theming v2 --- src/components/Message/MessageStatus.tsx | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/components/Message/MessageStatus.tsx b/src/components/Message/MessageStatus.tsx index 79c6ac1fb9..9a71598ca5 100644 --- a/src/components/Message/MessageStatus.tsx +++ b/src/components/Message/MessageStatus.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { DeliveredCheckIcon } from './icons'; +import { DeliveredCheckIcon, MessageDeliveredIcon } from './icons'; import { getReadByTooltipText } from './utils'; import { AvatarProps, Avatar as DefaultAvatar } from '../Avatar'; @@ -36,6 +36,7 @@ const UnMemoizedMessageStatus = < threadList, } = useMessageContext('MessageStatus'); const { t } = useTranslationContext('MessageStatus'); + const { themeVersion } = useChatContext('MessageStatus'); const Avatar = propAvatar || contextAvatar || DefaultAvatar; @@ -44,13 +45,11 @@ const UnMemoizedMessageStatus = < } const justReadByMe = readBy?.length === 1 && readBy[0].id === client.user?.id; + const rootClassName = `str-chat__message-${messageType}-status str-chat__message-status`; if (message.status === 'sending') { return ( - + {t('Sending...')} @@ -61,10 +60,7 @@ const UnMemoizedMessageStatus = < const lastReadUser = readBy.filter((item) => item.id !== client.user?.id)[0]; return ( - + {getReadByTooltipText(readBy, t, client)} + {t('Delivered')} - + {themeVersion === '2' ? : } ); } From 23c2d93cc2452f5711625a5a198d01d1a2d9d7c0 Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Tue, 5 Jul 2022 15:15:53 +0200 Subject: [PATCH 15/52] feat: adapt MessageOptions to theming v2 --- src/components/Message/MessageOptions.tsx | 61 +++++-------------- .../Message/__tests__/MessageOptions.test.js | 6 +- 2 files changed, 17 insertions(+), 50 deletions(-) diff --git a/src/components/Message/MessageOptions.tsx b/src/components/Message/MessageOptions.tsx index 3a6858c9bb..d720114841 100644 --- a/src/components/Message/MessageOptions.tsx +++ b/src/components/Message/MessageOptions.tsx @@ -17,6 +17,7 @@ export type MessageOptionsProps< StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics > = Partial, 'handleOpenThread'>> & { ActionsIcon?: React.FunctionComponent; + /** @deprecated: use CSS to style the order of the contents */ displayLeft?: boolean; displayReplies?: boolean; messageWrapperRef?: React.RefObject; @@ -32,7 +33,6 @@ const UnMemoizedMessageOptions = < ) => { const { ActionsIcon = DefaultActionsIcon, - displayLeft = true, displayReplies = true, handleOpenThread: propHandleOpenThread, messageWrapperRef, @@ -46,7 +46,6 @@ const UnMemoizedMessageOptions = < getMessageActions, handleOpenThread: contextHandleOpenThread, initialMessage, - isMyMessage, message, onReactionListClick, threadList, @@ -74,60 +73,32 @@ const UnMemoizedMessageOptions = < return null; } - if (isMyMessage() && displayLeft) { - return ( -
- {showActionsBox && ( - - )} - {shouldShowReplies && ( - - )} - {shouldShowReactions && ( - - )} -
- ); - } + const rootClassName = `str-chat__message-${theme}__actions str-chat__message-options`; return ( -
- {shouldShowReactions && ( - +
+ {showActionsBox && ( + )} {shouldShowReplies && ( )} - {showActionsBox && ( - + {shouldShowReactions && ( + )}
); diff --git a/src/components/Message/__tests__/MessageOptions.test.js b/src/components/Message/__tests__/MessageOptions.test.js index 3b4c97ca1d..6ad9725cc4 100644 --- a/src/components/Message/__tests__/MessageOptions.test.js +++ b/src/components/Message/__tests__/MessageOptions.test.js @@ -93,14 +93,10 @@ const reactionActionTestId = 'message-reaction-action'; describe('', () => { beforeEach(jest.clearAllMocks); it('should not render message options when there is no message set', async () => { - const consoleWarnSpy = jest.spyOn(console, 'warn').mockImplementationOnce(() => null); const { queryByTestId } = await renderMessageOptions({ message: {}, }); expect(queryByTestId(/message-options/)).not.toBeInTheDocument(); - expect(consoleWarnSpy).toHaveBeenCalledWith( - 'MessageTimestamp was called without a message, or message has invalid created_at date.', - ); }); it.each([ @@ -125,7 +121,7 @@ describe('', () => { expect(queryByTestId(/message-options/)).not.toBeInTheDocument(); }); - it('should display thread actions when message is not displayed on a thread list and channel has replies configured', async () => { + it('should display thread actions when message is not displayed in a thread list and channel has replies configured', async () => { const { getByTestId } = await renderMessageOptions( defaultMessageProps, {}, From aeee07884310043d08594a767b4a9c735bf2cfc6 Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Wed, 6 Jul 2022 13:47:44 +0200 Subject: [PATCH 16/52] feat: convert attachment render functions into components, group attachments in order --- src/components/Attachment/Attachment.tsx | 173 ++++++--- .../Attachment/AttachmentActions.tsx | 6 +- .../Attachment/AttachmentContainer.tsx | 207 +++++++++++ .../Attachment/__tests__/Attachment.test.js | 330 +++++++++++------- .../__snapshots__/Attachment.test.js.snap | 127 +++++++ src/components/Attachment/index.ts | 1 + src/components/Attachment/utils.tsx | 99 ++++-- src/mock-builders/generator/attachment.js | 72 +++- 8 files changed, 787 insertions(+), 228 deletions(-) create mode 100644 src/components/Attachment/AttachmentContainer.tsx create mode 100644 src/components/Attachment/__tests__/__snapshots__/Attachment.test.js.snap diff --git a/src/components/Attachment/Attachment.tsx b/src/components/Attachment/Attachment.tsx index 936bafb03e..a32f10d365 100644 --- a/src/components/Attachment/Attachment.tsx +++ b/src/components/Attachment/Attachment.tsx @@ -1,21 +1,27 @@ -import React from 'react'; +import React, { useMemo } from 'react'; +import { sanitizeUrl } from '@braintree/sanitize-url'; +import type { ReactPlayerProps } from 'react-player'; +import type { Attachment as StreamAttachment } from 'stream-chat'; import { + AttachmentComponentType, + GroupedRenderedAttachment, isAudioAttachment, isFileAttachment, - isGalleryAttachmentType, - isImageAttachment, + isGiphyAttachment, isMediaAttachment, - renderAudio, - renderCard, - renderFile, - renderGallery, - renderImage, - renderMedia, + isScrapedContent, + isUploadedImage, } from './utils'; -import type { ReactPlayerProps } from 'react-player'; -import type { Attachment as StreamAttachment } from 'stream-chat'; +import { + AudioContainer, + CardContainer, + FileContainer, + GalleryContainer, + ImageContainer, + MediaContainer, +} from './AttachmentContainer'; import type { AttachmentActionsProps } from './AttachmentActions'; import type { AudioProps } from './Audio'; @@ -26,6 +32,22 @@ import type { ActionHandlerReturnType } from '../Message/hooks/useActionHandler' import type { DefaultStreamChatGenerics } from '../../types/types'; +const CONTAINER_MAP = { + audio: AudioContainer, + card: CardContainer, + file: FileContainer, + media: MediaContainer, +} as const; + +const ATTACHMENT_GROUPS_ORDER: AttachmentComponentType[] = [ + 'card', + 'gallery', + 'image', + 'media', + 'audio', + 'file', +]; + export type AttachmentProps< StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics > = { @@ -57,54 +79,99 @@ export const Attachment = < >( props: AttachmentProps, ) => { - const { attachments, ...rest } = props; - - const gallery = { - images: attachments?.filter( - (attachment) => - attachment.type === 'image' && !(attachment.og_scrape_url || attachment.title_link), - ), - type: 'gallery', - }; - - const newAttachments = - gallery.images.length >= 2 - ? [ - ...attachments.filter( - (attachment) => - !( - attachment.type === 'image' && !(attachment.og_scrape_url || attachment.title_link) - ), - ), - gallery, - ] - : attachments; + const { attachments } = props; + + const groupedAttachments = useMemo(() => renderGroupedAttachments(props), [attachments]); return ( - <> - {newAttachments.map((attachment) => { - if (isGalleryAttachmentType(attachment)) { - return renderGallery({ ...rest, attachment }); - } +
+ {ATTACHMENT_GROUPS_ORDER.reduce( + (acc, groupName) => [...acc, ...groupedAttachments[groupName]], + [] as React.ReactNode[], + )} +
+ ); +}; - if (isImageAttachment(attachment)) { - return renderImage({ ...rest, attachment }); - } +const renderGroupedAttachments = < + StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics +>({ + attachments, + ...rest +}: AttachmentProps): GroupedRenderedAttachment => { + const uploadedImages: StreamAttachment[] = []; - if (isAudioAttachment(attachment)) { - return renderAudio({ ...rest, attachment }); - } + const containers = attachments.reduce( + (acc, attachment) => { + if (isUploadedImage(attachment)) { + uploadedImages.push({ + ...attachment, + image_url: sanitizeUrl(attachment.image_url), + og_scrape_url: sanitizeUrl(attachment.og_scrape_url), + thumb_url: sanitizeUrl(attachment.thumb_url), + title_link: sanitizeUrl(attachment.title_link), + }); + } else { + const attachmentType = getAttachmentType(attachment); + // allow single card attachment + if (acc.card.length === 1 && attachmentType === 'card') return acc; - if (isFileAttachment(attachment)) { - return renderFile({ ...rest, attachment }); + if (attachmentType) { + const Container = CONTAINER_MAP[attachmentType]; + acc[attachmentType].push( + , + ); } + } + return acc; + }, + { + audio: [], + card: [], + file: [], + gallery: [], + image: [], + media: [], + } as GroupedRenderedAttachment, + ); - if (isMediaAttachment(attachment)) { - return renderMedia({ ...rest, attachment }); - } + if (uploadedImages.length > 1) { + containers['gallery'] = [ + , + ]; + } else if (uploadedImages.length === 1) { + containers['image'] = [ + , + ]; + } + return containers; +}; - return renderCard({ ...rest, attachment }); - })} - - ); +const getAttachmentType = < + StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics +>( + attachment: AttachmentProps['attachments'][number], +): keyof typeof CONTAINER_MAP | null => { + if (isScrapedContent(attachment) || isGiphyAttachment(attachment)) { + return 'card'; + } else if (isMediaAttachment(attachment)) { + return 'media'; + } else if (isAudioAttachment(attachment)) { + return 'audio'; + } else if (isFileAttachment(attachment)) { + return 'file'; + } + + return null; }; diff --git a/src/components/Attachment/AttachmentActions.tsx b/src/components/Attachment/AttachmentActions.tsx index 697473f1d7..5d6dc610c8 100644 --- a/src/components/Attachment/AttachmentActions.tsx +++ b/src/components/Attachment/AttachmentActions.tsx @@ -30,11 +30,7 @@ const UnMemoizedAttachmentActions = < event: React.MouseEvent, name?: string, value?: string, - ) => { - if (actionHandler) { - actionHandler(name, value, event); - } - }; + ) => actionHandler?.(name, value, event); return (
diff --git a/src/components/Attachment/AttachmentContainer.tsx b/src/components/Attachment/AttachmentContainer.tsx new file mode 100644 index 0000000000..d0345521a7 --- /dev/null +++ b/src/components/Attachment/AttachmentContainer.tsx @@ -0,0 +1,207 @@ +import React, { PropsWithChildren } from 'react'; +import ReactPlayer from 'react-player'; +import clsx from 'clsx'; +import { nanoid } from 'nanoid'; + +import { AttachmentActions as DefaultAttachmentActions } from './AttachmentActions'; +import { Audio as DefaultAudio } from './Audio'; +import { Gallery as DefaultGallery, ImageComponent as DefaultImage } from '../Gallery'; +import { Card as DefaultCard } from './Card'; +import { FileAttachment as DefaultFile } from './FileAttachment'; +import { + AttachmentContainerProps, + isGalleryAttachmentType, + RenderAttachmentProps, + RenderGalleryProps, +} from './utils'; + +import type { DefaultStreamChatGenerics } from '../../types/types'; + +export const AttachmentWithinContainer = < + StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics +>({ + attachment, + children, + componentType, +}: PropsWithChildren>) => { + const isGAT = isGalleryAttachmentType(attachment); + let extra = ''; + + if (!isGAT) { + extra = + componentType === 'card' && !attachment?.image_url && !attachment?.thumb_url + ? 'no-image' + : attachment?.actions?.length + ? 'actions' + : ''; + } + + const classNames = clsx( + 'str-chat__message-attachment', + `str-chat__message-attachment--${componentType}`, + attachment?.type && `str-chat__message-attachment--${attachment?.type}`, + extra && `str-chat__message-attachment--${componentType}--${extra}`, + extra === 'actions' && 'str-chat__message-attachment-with-actions', // added for theme V2 (better readability) + ); + + return ( +
+ {children} +
+ ); +}; + +export const AttachmentActionsContainer = < + StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics +>({ + actionHandler, + attachment, + AttachmentActions = DefaultAttachmentActions, +}: RenderAttachmentProps) => { + if (!attachment.actions?.length) return null; + + return ( + actionHandler?.(event, name, value)} + actions={attachment.actions} + id={attachment.id || ''} + text={attachment.text || ''} + /> + ); +}; + +export const GalleryContainer = < + StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics +>({ + attachment, + Gallery = DefaultGallery, +}: RenderGalleryProps) => ( + + + +); + +export const ImageContainer = < + StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics +>( + props: RenderAttachmentProps, +) => { + const { attachment, Image = DefaultImage } = props; + const componentType = 'image'; + + if (attachment.actions && attachment.actions.length) { + return ( + +
+ + +
+ + ); + } + + return ( + + + + ); +}; + +export const CardContainer = < + StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics +>( + props: RenderAttachmentProps, +) => { + const { attachment, Media, Card = DefaultCard } = props; + const componentType = 'card'; + + if (attachment.actions && attachment.actions.length) { + return ( + +
+ + +
+ + ); + } + + return ( + + + + ); +}; + +export const FileContainer = < + StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics +>({ + attachment, + File = DefaultFile, +}: RenderAttachmentProps) => { + if (!attachment.asset_url) return null; + + return ( + + + + ); +}; +export const AudioContainer = < + StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics +>({ + attachment, + Audio = DefaultAudio, +}: RenderAttachmentProps) => ( + +
+
+ +); + +export const MediaContainer = < + StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics +>( + props: RenderAttachmentProps, +) => { + const { attachment, Media = ReactPlayer } = props; + const componentType = 'media'; + + if (attachment.actions?.length) { + return ( + +
+
+ +
+ +
+ + ); + } + + return ( + +
+ +
+ + ); +}; diff --git a/src/components/Attachment/__tests__/Attachment.test.js b/src/components/Attachment/__tests__/Attachment.test.js index 0681b044de..2155e1910b 100644 --- a/src/components/Attachment/__tests__/Attachment.test.js +++ b/src/components/Attachment/__tests__/Attachment.test.js @@ -1,182 +1,250 @@ import React from 'react'; -import { render, waitFor } from '@testing-library/react'; +import { render, screen, waitFor } from '@testing-library/react'; import '@testing-library/jest-dom'; import { nanoid } from 'nanoid'; import { generateAttachmentAction, generateAudioAttachment, - generateCardAttachment, generateFileAttachment, generateGiphyAttachment, generateImageAttachment, - generateImgurAttachment, + generateScrapedAudioAttachment, + generateScrapedDataAttachment, + generateScrapedImageAttachment, generateVideoAttachment, } from 'mock-builders'; import { Attachment } from '../Attachment'; import { SUPPORTED_VIDEO_FORMATS } from '../utils'; +import { generateScrapedVideoAttachment } from '../../../mock-builders'; -const Audio = () =>
; -const Card = () =>
; -const Media = () =>
; +const Audio = (props) =>
{props.customTestId}
; +const Card = (props) =>
{props.customTestId}
; +const Media = (props) =>
{props.customTestId}
; const AttachmentActions = () =>
; -const Image = () =>
; -const File = () =>
; -const Gallery = () =>
; +const Image = (props) =>
{props.customTestId}
; +const File = (props) =>
{props.customTestId}
; +const Gallery = (props) =>
{props.customTestId}
; -const getAttachmentComponent = (props) => ( - -); +const ATTACHMENTS = { + scraped: { + audio: generateScrapedAudioAttachment(), + giphy: generateGiphyAttachment(), + image: generateScrapedImageAttachment(), + unrecognized: generateScrapedDataAttachment({ type: nanoid() }), + video: generateScrapedVideoAttachment(), + }, + uploaded: { + audio: generateAudioAttachment(), + file: generateFileAttachment(), + gallery: Array.from({ length: 3 }, generateImageAttachment), + image: generateImageAttachment(), + video: generateVideoAttachment(), + }, +}; -describe('Attachment', () => { - it('should render Audio component for "audio" type attachment', async () => { - const attachment = generateAudioAttachment(); - const { getByTestId } = render(getAttachmentComponent({ attachments: [attachment] })); - await waitFor(() => { - expect(getByTestId('audio-attachment')).toBeInTheDocument(); - }); - }); - it('should render File component for "file" type attachment', async () => { - const attachment = generateFileAttachment(); - const { getByTestId } = render(getAttachmentComponent({ attachments: [attachment] })); - await waitFor(() => { - expect(getByTestId('file-attachment')).toBeInTheDocument(); - }); - }); - it('should render Card component for "imgur" type attachment', async () => { - const attachment = generateImgurAttachment(); - const { getByTestId } = render(getAttachmentComponent({ attachments: [attachment] })); - await waitFor(() => { - expect(getByTestId('card-attachment')).toBeInTheDocument(); +const renderComponent = (props) => + render( + , + ); + +describe('attachment', () => { + describe('non-scraped content', () => { + it('should render empty attachment list if unrecognized type', () => { + const { container } = renderComponent({ attachments: [{}] }); + expect(container.firstChild).toBeEmptyDOMElement(); }); - }); - it('should render Card component for "giphy" type attachment', async () => { - const attachment = generateGiphyAttachment(); - const { getByTestId } = render(getAttachmentComponent({ attachments: [attachment] })); - await waitFor(() => { - expect(getByTestId('card-attachment')).toBeInTheDocument(); + + const cases = { + audio: { + attachments: [ATTACHMENTS.uploaded.audio], + case: '"audio" type attachment', + renderedComponent: 'Audio', + testId: 'audio-attachment', + }, + file: { + attachments: [ATTACHMENTS.uploaded.file], + case: '"file" type attachment', + renderedComponent: 'File', + testId: 'file-attachment', + }, + gallery: { + attachments: ATTACHMENTS.uploaded.gallery, + case: 'message with multiple "image" attachments', + renderedComponent: 'Gallery', + testId: 'gallery-attachment', + }, + image: { + attachments: [ATTACHMENTS.uploaded.image], + case: 'message with single image', + renderedComponent: 'Image', + testId: 'image-attachment', + }, + }; + it.each` + attachments | case | renderedComponent | testId + ${cases.audio.attachments} | ${cases.audio.case} | ${cases.audio.renderedComponent} | ${cases.audio.testId} + ${cases.file.attachments} | ${cases.file.case} | ${cases.file.renderedComponent} | ${cases.file.testId} + ${cases.gallery.attachments} | ${cases.gallery.case} | ${cases.gallery.renderedComponent} | ${cases.gallery.testId} + ${cases.image.attachments} | ${cases.image.case} | ${cases.image.renderedComponent} | ${cases.image.testId} + `('should render $renderedComponent component for $case', async ({ attachments, testId }) => { + renderComponent({ attachments }); + await waitFor(() => { + expect(screen.getByTestId(testId)).toBeInTheDocument(); + }); }); + + it.each(SUPPORTED_VIDEO_FORMATS.map((f) => [f]))( + 'should render Media component for video of %s mime-type attachment', + async (mime_type) => { + const attachment = generateVideoAttachment({ mime_type }); + renderComponent({ attachments: [attachment] }); + await waitFor(() => { + expect(screen.getByTestId('media-attachment')).toBeInTheDocument(); + }); + }, + ); }); - describe('gallery type attachment', () => { - it('should render Gallery component if attachments contains multiple type "image" attachments', async () => { - const image = generateImageAttachment({ - og_scrape_url: undefined, - title_link: undefined, - }); - const attachments = [image, image, image]; - const { getByTestId } = render(getAttachmentComponent({ attachments })); + describe('scraped content', () => { + it.each([ + { og_scrape_url: undefined, title_link: nanoid() }, + { og_scrape_url: nanoid(), title_link: undefined }, + ])( + 'should render null, if scraped attachment og_scrape_url is %s & title_link is %s', + ({ og_scrape_url, title_link }) => { + const attachment = generateScrapedDataAttachment({ og_scrape_url, title_link }); + const { container } = renderComponent({ attachments: [attachment] }); + expect(container.firstChild).toBeEmptyDOMElement(); + }, + ); + + const cases = [ + { + attachments: [ATTACHMENTS.scraped.unrecognized], + case: 'not recognized, but has title_link or og_scrape_url', + }, + { + attachments: [ATTACHMENTS.scraped.giphy], + case: 'giphy', + }, + { + attachments: [ATTACHMENTS.scraped.image], + case: 'image', + }, + { + attachments: [ATTACHMENTS.scraped.video], + case: 'video', + }, + { + attachments: [ATTACHMENTS.scraped.audio], + case: 'audio', + }, + ]; + it.each` + attachments | case + ${cases[0].attachments} | ${cases[0].case} + ${cases[1].attachments} | ${cases[1].case} + ${cases[2].attachments} | ${cases[2].case} + ${cases[3].attachments} | ${cases[3].case} + ${cases[4].attachments} | ${cases[4].case} + `('should render Card if attachment type is $case', async ({ attachments }) => { + renderComponent({ attachments }); await waitFor(() => { - expect(getByTestId('gallery-attachment')).toBeInTheDocument(); + expect(screen.getByTestId('card-attachment')).toBeInTheDocument(); }); }); + }); + + describe('combines scraped & uploaded content', () => { it('should render Image and Card if one image has title_link or og_scrape_url', async () => { - const image = generateImageAttachment({ - og_scrape_url: undefined, - title_link: undefined, - }); - const card = generateImageAttachment(); + const image = generateImageAttachment(); + const card = generateScrapedImageAttachment(); const attachments = [card, image]; - const { getByTestId } = render(getAttachmentComponent({ attachments })); + renderComponent({ attachments }); await waitFor(() => { - expect(getByTestId('image-attachment')).toBeInTheDocument(); - expect(getByTestId('card-attachment')).toBeInTheDocument(); + expect(screen.getByTestId('image-attachment')).toBeInTheDocument(); + expect(screen.getByTestId('card-attachment')).toBeInTheDocument(); }); }); - it('should render Gallery and Card if threres multiple images without and image with title_link or og_scrape_url', async () => { - const image = generateImageAttachment({ - og_scrape_url: undefined, - title_link: undefined, + it('should render attachments in default order', async () => { + const { container } = renderComponent({ + attachments: [ + ATTACHMENTS.uploaded.file, + ATTACHMENTS.uploaded.audio, + ATTACHMENTS.uploaded.video, + ATTACHMENTS.scraped.audio, + ATTACHMENTS.uploaded.image, + ATTACHMENTS.uploaded.image, + ], }); - const card = generateImageAttachment(); - const attachments = [image, image, card]; - const { getByTestId } = render(getAttachmentComponent({ attachments })); await waitFor(() => { - expect(getByTestId('gallery-attachment')).toBeInTheDocument(); - expect(getByTestId('card-attachment')).toBeInTheDocument(); + expect(container).toMatchSnapshot(); }); }); - }); - describe('image type attachment', () => { - it('should render Card component if attachment has title_link or og_scrape_url', async () => { - const attachment = generateImageAttachment(); - const { getByTestId } = render(getAttachmentComponent({ attachments: [attachment] })); - await waitFor(() => { - expect(getByTestId('card-attachment')).toBeInTheDocument(); - }); - }); - it('should otherwise render Image component', async () => { - const attachment = generateImageAttachment({ - og_scrape_url: undefined, - title_link: undefined, + + it('should render only the first scraped attachment in a single card', async () => { + const scrapedAudio = { ...ATTACHMENTS.scraped.audio, customTestId: nanoid() }; + const scrapedVideo = { ...ATTACHMENTS.scraped.video, customTestId: nanoid() }; + const scrapedImage = { ...ATTACHMENTS.scraped.image, customTestId: nanoid() }; + renderComponent({ + attachments: [ + ATTACHMENTS.uploaded.file, + ATTACHMENTS.uploaded.audio, + ATTACHMENTS.uploaded.video, + scrapedAudio, + scrapedVideo, + scrapedImage, + ATTACHMENTS.uploaded.image, + ATTACHMENTS.uploaded.image, + ], }); - const { getByTestId } = render(getAttachmentComponent({ attachments: [attachment] })); await waitFor(() => { - expect(getByTestId('image-attachment')).toBeInTheDocument(); + /* eslint-disable jest-dom/prefer-in-document */ + const Card = screen.queryAllByTestId('card-attachment'); + expect(Card).toHaveLength(1); + expect(Card[0]).toHaveTextContent(scrapedAudio.customTestId); }); }); - it('should render AttachmentActions component if attachment has actions', async () => { - const attachment = generateImageAttachment({ - actions: [generateAttachmentAction(), generateAttachmentAction()], + + it('should render all uploaded attachments', async () => { + const { container } = renderComponent({ + attachments: [ + ATTACHMENTS.uploaded.file, + ATTACHMENTS.uploaded.file, + ATTACHMENTS.uploaded.audio, + ATTACHMENTS.uploaded.audio, + ATTACHMENTS.uploaded.video, + ATTACHMENTS.uploaded.video, + ATTACHMENTS.uploaded.image, + ATTACHMENTS.uploaded.image, + ], }); - const { getByTestId } = render(getAttachmentComponent({ attachments: [attachment] })); await waitFor(() => { - expect(getByTestId('attachment-actions')).toBeInTheDocument(); + expect(container).toMatchSnapshot(); }); }); }); - describe('video type attachment', () => { - it.each(SUPPORTED_VIDEO_FORMATS.map((f) => [f]))( - 'should render Media component for video of %s mime-type attachment', - async (mime_type) => { - const attachment = generateVideoAttachment({ mime_type }); - const { getByTestId } = render(getAttachmentComponent({ attachments: [attachment] })); - await waitFor(() => { - expect(getByTestId('media-attachment')).toBeInTheDocument(); - }); - }, - ); - it('should render video player if video type is video', async () => { - const attachment = generateVideoAttachment({ - asset_url: 'https://www.youtube.com/embed/UaeOlIa0LL8', - author_name: 'YouTube', - image_url: 'https://i.ytimg.com/vi/UaeOlIa0LL8/maxresdefault.jpg', - mime_type: 'nothing', - og_scrape_url: 'https://www.youtube.com/watch?v=UaeOlIa0LL8', - text: - "It's Gmod TTT! Praise Ben in the church of Bon! Hail the great jetstream in Gmod TTT! Confused? Check out the new roles here: https://twitter.com/yogscast/st...", - thumb_url: 'https://i.ytimg.com/vi/UaeOlIa0LL8/maxresdefault.jpg', - title: 'THE CHURCH OF BON! | Gmod TTT', - title_link: 'https://www.youtube.com/watch?v=UaeOlIa0LL8', - type: 'video', - }); - const { getByTestId } = render(getAttachmentComponent({ attachments: [attachment] })); - - await waitFor(() => { - expect(getByTestId('media-attachment')).toBeInTheDocument(); - }); + it('should render AttachmentActions component if attachment has actions', async () => { + const action = generateAttachmentAction(); + const attachment = generateImageAttachment({ + actions: [action, action], }); - }); - it('should render "Card" if attachment type is not recognized, but has title_link or og_scrape_url', async () => { - const { getByTestId } = render( - getAttachmentComponent({ - attachments: [generateCardAttachment({ type: nanoid() })], - }), - ); + renderComponent({ attachments: [attachment] }); await waitFor(() => { - expect(getByTestId('card-attachment')).toBeInTheDocument(); + expect(screen.getByTestId('attachment-actions')).toBeInTheDocument(); }); }); }); diff --git a/src/components/Attachment/__tests__/__snapshots__/Attachment.test.js.snap b/src/components/Attachment/__tests__/__snapshots__/Attachment.test.js.snap new file mode 100644 index 0000000000..8c3799cdfc --- /dev/null +++ b/src/components/Attachment/__tests__/__snapshots__/Attachment.test.js.snap @@ -0,0 +1,127 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`attachment combines scraped & uploaded content should render all uploaded attachments 1`] = ` +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+`; + +exports[`attachment combines scraped & uploaded content should render attachments in default order 1`] = ` +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+`; diff --git a/src/components/Attachment/index.ts b/src/components/Attachment/index.ts index a5b5b7226c..00ab79559f 100644 --- a/src/components/Attachment/index.ts +++ b/src/components/Attachment/index.ts @@ -1,5 +1,6 @@ export * from './Attachment'; export * from './AttachmentActions'; +export * from './AttachmentContainer'; export * from './Audio'; export * from './Card'; export * from './FileAttachment'; diff --git a/src/components/Attachment/utils.tsx b/src/components/Attachment/utils.tsx index a124223643..958db06a4d 100644 --- a/src/components/Attachment/utils.tsx +++ b/src/components/Attachment/utils.tsx @@ -1,6 +1,7 @@ -import React, { PropsWithChildren } from 'react'; +import React, { PropsWithChildren, ReactNode } from 'react'; import ReactPlayer from 'react-player'; import { nanoid } from 'nanoid'; +import clsx from 'clsx'; import { AttachmentActions as DefaultAttachmentActions } from './AttachmentActions'; import { Audio as DefaultAudio } from './Audio'; @@ -14,18 +15,22 @@ import type { DefaultStreamChatGenerics } from '../../types/types'; export const SUPPORTED_VIDEO_FORMATS = ['video/mp4', 'video/ogg', 'video/webm', 'video/quicktime']; +export type AttachmentComponentType = 'audio' | 'card' | 'file' | 'gallery' | 'image' | 'media'; + +export type GroupedRenderedAttachment = Record; + export type GalleryAttachment< StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics > = { images: Attachment[]; - type: string; + type: 'gallery'; }; export type AttachmentContainerProps< StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics > = { attachment: Attachment | GalleryAttachment; - componentType: string; + componentType: AttachmentComponentType; }; export type RenderAttachmentProps< @@ -40,12 +45,30 @@ export type RenderGalleryProps< attachment: GalleryAttachment; }; +export const isScrapedContent = < + StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics +>( + attachment: Attachment, +) => attachment.og_scrape_url && attachment.title_link; + +// giphy attachment has only title_link, but not og_scrape_url +export const isCardRenderable = < + StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics +>( + attachment: Attachment, +) => attachment.og_scrape_url || attachment.title_link; + +export const isUploadedImage = < + StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics +>( + attachment: Attachment, +) => attachment.type === 'image' && !isScrapedContent(attachment); + export const isGalleryAttachmentType = < StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics >( output: Attachment | GalleryAttachment, -): output is GalleryAttachment => - (output as GalleryAttachment).images != null; +): output is GalleryAttachment => Array.isArray(output.images); export const isAudioAttachment = < StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics @@ -63,12 +86,6 @@ export const isFileAttachment = < SUPPORTED_VIDEO_FORMATS.indexOf(attachment.mime_type) === -1 && attachment.type !== 'video'); -export const isImageAttachment = < - StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics ->( - attachment: Attachment, -) => attachment.type === 'image' && !attachment.title_link && !attachment.og_scrape_url; - export const isMediaAttachment = < StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics >( @@ -77,38 +94,56 @@ export const isMediaAttachment = < (attachment.mime_type && SUPPORTED_VIDEO_FORMATS.indexOf(attachment.mime_type) !== -1) || attachment.type === 'video'; +export const isGiphyAttachment = < + StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics +>( + attachment: Attachment, +) => attachment.type === 'giphy'; + +/** + * @deprecated will be removed in the next major release, + * replaced with the proper component equivalent `AttachmentContainer/AttachmentWithinContainer` + */ export const renderAttachmentWithinContainer = < StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics >( props: PropsWithChildren>, ) => { const { attachment, children, componentType } = props; - + const isGAT = isGalleryAttachmentType(attachment); let extra = ''; - if (!isGalleryAttachmentType(attachment)) { + if (!isGAT) { extra = componentType === 'card' && !attachment?.image_url && !attachment?.thumb_url ? 'no-image' - : attachment && attachment.actions && attachment.actions.length + : attachment?.actions?.length ? 'actions' : ''; } + const classNames = clsx( + 'str-chat__message-attachment', + `str-chat__message-attachment--${componentType}`, + attachment?.type && `str-chat__message-attachment--${attachment?.type}`, + extra && `str-chat__message-attachment--${componentType}--${extra}`, + extra === 'actions' && 'str-chat__message-attachment-with-actions', // added for theme V2 (better readability) + ); + return (
{children}
); }; +/** + * @deprecated will be removed in the next major release, + * replaced with the proper component equivalent `AttachmentContainer/AttachmentActionsContainer` + */ export const renderAttachmentActions = < StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics >( @@ -130,6 +165,10 @@ export const renderAttachmentActions = < ); }; +/** + * @deprecated will be removed in the next major release, + * replaced with the proper component equivalent `AttachmentContainer/GalleryContainer` + */ export const renderGallery = < StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics >( @@ -144,6 +183,10 @@ export const renderGallery = < }); }; +/** + * @deprecated will be removed in the next major release, + * replaced with the proper component equivalent `AttachmentContainer/ImageContainer` + */ export const renderImage = < StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics >( @@ -171,6 +214,10 @@ export const renderImage = < }); }; +/** + * @deprecated will be removed in the next major release, + * replaced with the proper component equivalent `AttachmentContainer/CardContainer` + */ export const renderCard = < StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics >( @@ -198,6 +245,10 @@ export const renderCard = < }); }; +/** + * @deprecated will be removed in the next major release, + * replaced with the proper component equivalent `AttachmentContainer/FileContainer` + */ export const renderFile = < StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics >( @@ -214,6 +265,10 @@ export const renderFile = < }); }; +/** + * @deprecated will be removed in the next major release, + * replaced with the proper component equivalent `AttachmentContainer/AudioContainer` + */ export const renderAudio = < StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics >( @@ -232,6 +287,10 @@ export const renderAudio = < }); }; +/** + * @deprecated will be removed in the next major release, + * replaced with the proper component equivalent `AttachmentContainer/MediaContainer` + */ export const renderMedia = < StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics >( diff --git a/src/mock-builders/generator/attachment.js b/src/mock-builders/generator/attachment.js index f5213b1fe2..1b2ffe45e8 100644 --- a/src/mock-builders/generator/attachment.js +++ b/src/mock-builders/generator/attachment.js @@ -7,55 +7,89 @@ export const generateAttachmentAction = (a) => ({ ...a, }); +export const generateScrapedDataAttachment = (a) => ({ + og_scrape_url: nanoid(), + title_link: nanoid(), + ...a, +}); + export const generateVideoAttachment = (a) => ({ asset_url: 'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4', + file_size: 2930530, mime_type: 'video/mp4', title: nanoid(), - type: 'media', + type: 'video', + ...a, +}); + +export const generateScrapedVideoAttachment = (a) => ({ + ...generateScrapedDataAttachment({ + asset_url: nanoid(), + author_name: nanoid(), + image_url: nanoid(), + text: nanoid(), + thumb_url: nanoid(), + title: nanoid(), + type: 'video', + }), ...a, }); export const generateImageAttachment = (a) => ({ + fallback: nanoid(), image_url: nanoid(), - text: nanoid(), - thumb_url: nanoid(), - title: nanoid(), - title_link: 'https://getstream.io', type: 'image', ...a, }); +export const generateScrapedImageAttachment = (a) => ({ + ...generateScrapedDataAttachment({ + author_name: nanoid(), + image_url: nanoid(), + text: nanoid(), + thumb_url: nanoid(), + title: nanoid(), + type: 'image', + }), + ...a, +}); + export const generateAudioAttachment = (a) => ({ asset_url: 'http://www.jackblack.com/tribute.mp3', - description: nanoid(), - image_url: 'http://www.jackblack.com/tenac_iousd.bmp', - text: nanoid(), + file_size: 36132, + mime_type: 'audio/mpeg', title: nanoid(), type: 'audio', ...a, }); +export const generateScrapedAudioAttachment = (a) => ({ + ...generateScrapedDataAttachment({ + asset_url: 'http://www.jackblack.com/tribute.mp3', + author_name: nanoid(), + description: nanoid(), + image_url: 'http://www.jackblack.com/tenac_iousd.bmp', + text: nanoid(), + thumb_url: nanoid(), + title: nanoid(), + type: 'audio', + }), + ...a, +}); + export const generateFileAttachment = (a) => ({ asset_url: 'https://www.w3.org/WAI/ER/tests/xhtml/testfiles/resources/pdf/dummy.pdf', - description: nanoid(), file_size: 1337, - mime_type: nanoid(), - text: nanoid(), + mime_type: 'application/pdf', title: nanoid(), type: 'file', ...a, }); -export const generateCardAttachment = (a) => ({ - image_url: 'http://www.jackblack.com/tenac_iousd.bmp', - og_scrape_url: nanoid(), - text: nanoid(), +export const generateGiphyAttachment = (a) => ({ thumb_url: 'http://www.jackblack.com/tenac_iousd.bmp', title: nanoid(), title_link: nanoid(), + type: 'giphy', ...a, }); - -export const generateImgurAttachment = () => generateCardAttachment({ type: 'imgur' }); - -export const generateGiphyAttachment = () => generateCardAttachment({ type: 'giphy' }); From d62e04a8791338c5a4eef4b44a5a1e210bd6e2d7 Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Wed, 6 Jul 2022 14:12:59 +0200 Subject: [PATCH 17/52] feat: add theming v2 classes to MessageActions elements --- .../MessageActions/MessageActions.tsx | 9 ++++-- .../MessageActions/MessageActionsBox.tsx | 32 ++++++++++--------- .../__tests__/MessageActions.test.js | 16 ++++++++-- 3 files changed, 37 insertions(+), 20 deletions(-) diff --git a/src/components/MessageActions/MessageActions.tsx b/src/components/MessageActions/MessageActions.tsx index bfcd94c999..7cc9762677 100644 --- a/src/components/MessageActions/MessageActions.tsx +++ b/src/components/MessageActions/MessageActions.tsx @@ -127,8 +127,9 @@ export const MessageActions = < aria-expanded={actionsBoxOpen} aria-haspopup='true' aria-label='Open Message Actions Menu' + className='str-chat__message-actions-box-button' > - + ); @@ -143,8 +144,10 @@ export type MessageActionsWrapperProps = { const MessageActionsWrapper = (props: PropsWithChildren) => { const { children, customWrapperClass, inline, setActionsBoxOpen } = props; - const defaultWrapperClass = - 'str-chat__message-simple__actions__action str-chat__message-simple__actions__action--options'; + const defaultWrapperClass = ` + str-chat__message-simple__actions__action + str-chat__message-simple__actions__action--options + str-chat__message-actions-container`; const wrapperClass = customWrapperClass || defaultWrapperClass; diff --git a/src/components/MessageActions/MessageActionsBox.tsx b/src/components/MessageActions/MessageActionsBox.tsx index b3e9f0a819..ce2221ab8c 100644 --- a/src/components/MessageActions/MessageActionsBox.tsx +++ b/src/components/MessageActions/MessageActionsBox.tsx @@ -1,4 +1,5 @@ import React, { useCallback, useState } from 'react'; +import clsx from 'clsx'; import { MESSAGE_ACTIONS } from '../Message/utils'; @@ -127,16 +128,17 @@ const UnMemoizedMessageActionsBox = < } }; + const rootClassName = clsx( + 'str-chat__message-actions-box', + open && 'str-chat__message-actions-box--open', + mine && 'str-chat__message-actions-box--mine', + reverse && 'str-chat__message-actions-box--reverse', + ); + const buttonClassName = + 'str-chat__message-actions-list-item str-chat__message-actions-list-item-button'; + return ( -
+
{customMessageActions && ( @@ -144,7 +146,7 @@ const UnMemoizedMessageActionsBox = < {messageActions.indexOf(MESSAGE_ACTIONS.quote) > -1 && !message.quoted_message && ( +
+
+
+ + + deterministic + + + +
+
+
+
+
+
+
+`; diff --git a/src/components/Attachment/hooks/useAudioController.ts b/src/components/Attachment/hooks/useAudioController.ts new file mode 100644 index 0000000000..acc8046a0f --- /dev/null +++ b/src/components/Attachment/hooks/useAudioController.ts @@ -0,0 +1,46 @@ +import { useCallback, useEffect, useRef, useState } from 'react'; + +const progressUpdateInterval = 500; + +export const useAudioController = () => { + const [isPlaying, setIsPlaying] = useState(false); + const [progress, setProgress] = useState(0); + + const audioRef = useRef(null); + + const updateProgress = useCallback(() => { + if (!audioRef.current) return; + + const position = audioRef.current.currentTime; + const { duration } = audioRef.current; + const currentProgress = (100 / duration) * position; + setProgress(currentProgress); + + if (position === duration) { + setIsPlaying(false); + } + }, [audioRef]); + + const togglePlay = useCallback(() => { + setIsPlaying((playing) => !playing); + }, []); + + useEffect(() => { + if (!audioRef.current) return; + if (isPlaying) { + audioRef.current.play(); + const interval = setInterval(updateProgress, progressUpdateInterval); + return () => clearInterval(interval); + } + audioRef.current.pause(); + + return; + }, [isPlaying, updateProgress]); + + return { + audioRef, + isPlaying, + progress, + togglePlay, + }; +}; From f84d22c3912b079a10e4f672b1acd129d3100aa3 Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Wed, 6 Jul 2022 16:47:16 +0200 Subject: [PATCH 19/52] style: order File.test.js imports --- src/components/Attachment/__tests__/File.test.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/Attachment/__tests__/File.test.js b/src/components/Attachment/__tests__/File.test.js index 9b1dae06df..5dde053469 100644 --- a/src/components/Attachment/__tests__/File.test.js +++ b/src/components/Attachment/__tests__/File.test.js @@ -1,8 +1,10 @@ import React from 'react'; import '@testing-library/jest-dom'; import renderer from 'react-test-renderer'; + import { FileAttachment } from '../FileAttachment'; -import { ChatContext } from '../../../context'; + +import { ChatContext } from '../../../context/ChatContext'; const getComponent = ({ attachment, chatContext }) => ( From 27e149a64ad0cbf05342e8a0132fb03c153da7eb Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Wed, 6 Jul 2022 16:50:15 +0200 Subject: [PATCH 20/52] feat: add ModalGallery to the ComponentContext --- src/components/Channel/Channel.tsx | 3 +++ src/context/ComponentContext.tsx | 2 ++ 2 files changed, 5 insertions(+) diff --git a/src/components/Channel/Channel.tsx b/src/components/Channel/Channel.tsx index 4852e39ce4..6bd39d9d8d 100644 --- a/src/components/Channel/Channel.tsx +++ b/src/components/Channel/Channel.tsx @@ -167,6 +167,8 @@ export type ChannelProps< MessageSystem?: ComponentContextValue['MessageSystem']; /** Custom UI component to display a timestamp on a message, defaults to and accepts same props as: [MessageTimestamp](https://github.com/GetStream/stream-chat-react/blob/master/src/components/Message/MessageTimestamp.tsx) */ MessageTimestamp?: ComponentContextValue['MessageTimestamp']; + /** Custom UI component for image viewing message's image attachments, defaults to and accepts the same props as [ModalGallery](https://github.com/GetStream/stream-chat-react/blob/master/src/components/Gallery/ModalGallery.tsx) */ + ModalGallery?: ComponentContextValue['ModalGallery']; /** Whether to allow multiple attachment uploads */ multipleUploads?: boolean; /** Custom action handler function to run on click of an @mention in a message */ @@ -870,6 +872,7 @@ const ChannelInner = < MessageStatus: props.MessageStatus, MessageSystem: props.MessageSystem, MessageTimestamp: props.MessageTimestamp, + ModalGallery: props.ModalGallery, PinIndicator: props.PinIndicator, QuotedMessage: props.QuotedMessage, QuotedMessagePreview: props.QuotedMessagePreview, diff --git a/src/context/ComponentContext.tsx b/src/context/ComponentContext.tsx index 2f3c19a693..72d539be90 100644 --- a/src/context/ComponentContext.tsx +++ b/src/context/ComponentContext.tsx @@ -20,6 +20,7 @@ import type { MessageProps } from '../components/Message/types'; import type { MessageRepliesCountButtonProps } from '../components/Message/MessageRepliesCountButton'; import type { MessageStatusProps } from '../components/Message/MessageStatus'; import type { MessageTimestampProps } from '../components/Message/MessageTimestamp'; +import type { ModalGalleryProps } from '../components/Gallery/ModalGallery'; import type { ReactionSelectorProps } from '../components/Reactions/ReactionSelector'; import type { ReactionsListProps } from '../components/Reactions/ReactionsList'; import type { @@ -61,6 +62,7 @@ export type ComponentContextValue< MessageStatus?: React.ComponentType; MessageSystem?: React.ComponentType>; MessageTimestamp?: React.ComponentType>; + ModalGallery?: React.ComponentType; PinIndicator?: React.ComponentType>; QuotedMessage?: React.ComponentType; QuotedMessagePreview?: React.ComponentType>; From de29a7337d7472ac2a8541632a03f829beecee0c Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Thu, 7 Jul 2022 08:51:30 +0200 Subject: [PATCH 21/52] feat: adjust Gallery and Image widget for theming v2 --- src/components/Gallery/Gallery.tsx | 39 +++++------ src/components/Gallery/Image.tsx | 56 ++++++++------- src/components/Gallery/ModalGallery.tsx | 45 ++++++++++++ src/components/Gallery/ModalWrapper.tsx | 31 -------- .../Gallery/__tests__/Gallery.test.js | 70 ++++++++++++++++--- .../Gallery/__tests__/Image.test.js | 44 +++++++++--- .../__snapshots__/Gallery.test.js.snap | 8 +-- .../__snapshots__/Image.test.js.snap | 2 +- src/components/Gallery/index.tsx | 2 +- 9 files changed, 196 insertions(+), 101 deletions(-) create mode 100644 src/components/Gallery/ModalGallery.tsx delete mode 100644 src/components/Gallery/ModalWrapper.tsx diff --git a/src/components/Gallery/Gallery.tsx b/src/components/Gallery/Gallery.tsx index 7597ecd9a5..7252fd3d30 100644 --- a/src/components/Gallery/Gallery.tsx +++ b/src/components/Gallery/Gallery.tsx @@ -1,7 +1,10 @@ -import React, { useMemo, useState } from 'react'; +import React, { useState } from 'react'; +import clsx from 'clsx'; -import { ModalComponent as ModalWrapper } from './ModalWrapper'; +import { Modal } from '../Modal'; +import { ModalGallery as DefaultModalGallery } from './ModalGallery'; +import { useComponentContext } from '../../context/ComponentContext'; import { useTranslationContext } from '../../context/TranslationContext'; import type { Attachment } from 'stream-chat'; @@ -29,6 +32,7 @@ const UnMemoizedGallery = < const [index, setIndex] = useState(0); const [modalOpen, setModalOpen] = useState(false); + const { ModalGallery = DefaultModalGallery } = useComponentContext('Gallery'); const { t } = useTranslationContext('Gallery'); const countImagesDisplayedInPreview = 4; @@ -43,16 +47,6 @@ const UnMemoizedGallery = < } }; - const formattedArray = useMemo( - () => - images.map((image) => ({ - original: image.image_url || image.thumb_url || '', - originalAlt: 'User uploaded content', - source: image.image_url || image.thumb_url || '', - })), - [images], - ); - const renderImages = images.slice(0, countImagesDisplayedInPreview).map((image, i) => i === lastImageIndexInPreview && images.length > countImagesDisplayedInPreview ? ( +
+ +
); }; diff --git a/src/components/Message/__tests__/MessageRepliesCountButton.test.js b/src/components/Message/__tests__/MessageRepliesCountButton.test.js index 0ea7e19d2d..b26b484274 100644 --- a/src/components/Message/__tests__/MessageRepliesCountButton.test.js +++ b/src/components/Message/__tests__/MessageRepliesCountButton.test.js @@ -2,7 +2,7 @@ import React from 'react'; import { cleanup, fireEvent, render } from '@testing-library/react'; import '@testing-library/jest-dom'; import { MessageRepliesCountButton } from '../MessageRepliesCountButton'; -import { TranslationProvider } from '../../../context'; +import { ChatProvider, TranslationProvider } from '../../../context'; const onClickMock = jest.fn(); const defaultSingularText = '1 reply'; @@ -10,11 +10,13 @@ const defaultPluralText = '2 replies'; const i18nMock = (key, { count }) => (count > 1 ? defaultPluralText : defaultSingularText); -const renderComponent = (props) => +const renderComponent = (props, themeVersion = '1') => render( - - - , + + + + + , ); describe('MessageRepliesCountButton', () => { @@ -65,4 +67,15 @@ describe('MessageRepliesCountButton', () => { expect(queryByTestId('replies-count-button')).not.toBeInTheDocument(); }); + + it('should not render ReplyIcon for theming v2', () => { + const themeVersion = '2'; + const { queryByTestId } = renderComponent( + { + reply_count: 1, + }, + themeVersion, + ); + expect(queryByTestId('reply-icon')).not.toBeInTheDocument(); + }); }); diff --git a/src/components/Message/icons.tsx b/src/components/Message/icons.tsx index 50635ed3c4..19fdbbda1c 100644 --- a/src/components/Message/icons.tsx +++ b/src/components/Message/icons.tsx @@ -20,7 +20,7 @@ export const ActionsIcon = ({ className = '' }: IconProps) => ( ); export const ReplyIcon = () => ( - + Date: Thu, 7 Jul 2022 09:11:02 +0200 Subject: [PATCH 24/52] refactor: assert error type --- src/components/ChannelList/hooks/usePaginatedChannels.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ChannelList/hooks/usePaginatedChannels.ts b/src/components/ChannelList/hooks/usePaginatedChannels.ts index 8f6a882a0f..14665451b5 100644 --- a/src/components/ChannelList/hooks/usePaginatedChannels.ts +++ b/src/components/ChannelList/hooks/usePaginatedChannels.ts @@ -62,7 +62,7 @@ export const usePaginatedChannels = < } } catch (err) { console.warn(err); - setError(err); + setError(err as Error); } setQueryInProgress(null); From aa1624a619a89351217ad8e5512b4471512db4ba Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Thu, 7 Jul 2022 09:18:28 +0200 Subject: [PATCH 25/52] feat: do not sanitize attachment scrape urls --- src/components/Attachment/Attachment.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/components/Attachment/Attachment.tsx b/src/components/Attachment/Attachment.tsx index a32f10d365..5d3fc55087 100644 --- a/src/components/Attachment/Attachment.tsx +++ b/src/components/Attachment/Attachment.tsx @@ -107,9 +107,7 @@ const renderGroupedAttachments = < uploadedImages.push({ ...attachment, image_url: sanitizeUrl(attachment.image_url), - og_scrape_url: sanitizeUrl(attachment.og_scrape_url), thumb_url: sanitizeUrl(attachment.thumb_url), - title_link: sanitizeUrl(attachment.title_link), }); } else { const attachmentType = getAttachmentType(attachment); From e4c2a7bde291a9fdad51b336abadd233998558ec Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Fri, 8 Jul 2022 13:56:27 +0200 Subject: [PATCH 26/52] feat: add realistic giphy attachment generator --- src/mock-builders/generator/attachment.js | 122 ++++++++++++++++------ 1 file changed, 90 insertions(+), 32 deletions(-) diff --git a/src/mock-builders/generator/attachment.js b/src/mock-builders/generator/attachment.js index 1b2ffe45e8..0dd5e35517 100644 --- a/src/mock-builders/generator/attachment.js +++ b/src/mock-builders/generator/attachment.js @@ -7,9 +7,19 @@ export const generateAttachmentAction = (a) => ({ ...a, }); -export const generateScrapedDataAttachment = (a) => ({ - og_scrape_url: nanoid(), - title_link: nanoid(), +export const generateFileAttachment = (a) => ({ + asset_url: 'https://www.w3.org/WAI/ER/tests/xhtml/testfiles/resources/pdf/dummy.pdf', + file_size: 1337, + mime_type: 'application/pdf', + title: nanoid(), + type: 'file', + ...a, +}); + +export const generateImageAttachment = (a) => ({ + fallback: nanoid(), + image_url: nanoid(), + type: 'image', ...a, }); @@ -22,23 +32,18 @@ export const generateVideoAttachment = (a) => ({ ...a, }); -export const generateScrapedVideoAttachment = (a) => ({ - ...generateScrapedDataAttachment({ - asset_url: nanoid(), - author_name: nanoid(), - image_url: nanoid(), - text: nanoid(), - thumb_url: nanoid(), - title: nanoid(), - type: 'video', - }), +export const generateAudioAttachment = (a) => ({ + asset_url: 'http://www.jackblack.com/tribute.mp3', + file_size: 36132, + mime_type: 'audio/mpeg', + title: nanoid(), + type: 'audio', ...a, }); -export const generateImageAttachment = (a) => ({ - fallback: nanoid(), - image_url: nanoid(), - type: 'image', +export const generateScrapedDataAttachment = (a) => ({ + og_scrape_url: nanoid(), + title_link: nanoid(), ...a, }); @@ -54,12 +59,16 @@ export const generateScrapedImageAttachment = (a) => ({ ...a, }); -export const generateAudioAttachment = (a) => ({ - asset_url: 'http://www.jackblack.com/tribute.mp3', - file_size: 36132, - mime_type: 'audio/mpeg', - title: nanoid(), - type: 'audio', +export const generateScrapedVideoAttachment = (a) => ({ + ...generateScrapedDataAttachment({ + asset_url: nanoid(), + author_name: nanoid(), + image_url: nanoid(), + text: nanoid(), + thumb_url: nanoid(), + title: nanoid(), + type: 'video', + }), ...a, }); @@ -77,16 +86,65 @@ export const generateScrapedAudioAttachment = (a) => ({ ...a, }); -export const generateFileAttachment = (a) => ({ - asset_url: 'https://www.w3.org/WAI/ER/tests/xhtml/testfiles/resources/pdf/dummy.pdf', - file_size: 1337, - mime_type: 'application/pdf', - title: nanoid(), - type: 'file', - ...a, -}); - export const generateGiphyAttachment = (a) => ({ + giphy: { + fixed_height: { + frames: '', + height: '200', + size: '445149', + url: + 'https://media2.giphy.com/media/j5L4RHeV8Q5tmepRVb/200.gif?cid=c4b03675kgziudvt7s9990i28hp8zpffi4oyem1snvl7sfvl&rid=200.gif&ct=g', + width: '200', + }, + fixed_height_downsampled: { + frames: '', + height: '200', + size: '148168', + url: + 'https://media2.giphy.com/media/j5L4RHeV8Q5tmepRVb/200_d.gif?cid=c4b03675kgziudvt7s9990i28hp8zpffi4oyem1snvl7sfvl&rid=200_d.gif&ct=g', + width: '200', + }, + fixed_height_still: { + frames: '', + height: '200', + size: '23240', + url: + 'https://media2.giphy.com/media/j5L4RHeV8Q5tmepRVb/200_s.gif?cid=c4b03675kgziudvt7s9990i28hp8zpffi4oyem1snvl7sfvl&rid=200_s.gif&ct=g', + width: '200', + }, + fixed_width: { + frames: '', + height: '200', + size: '445149', + url: + 'https://media2.giphy.com/media/j5L4RHeV8Q5tmepRVb/200w.gif?cid=c4b03675kgziudvt7s9990i28hp8zpffi4oyem1snvl7sfvl&rid=200w.gif&ct=g', + width: '200', + }, + fixed_width_downsampled: { + frames: '', + height: '200', + size: '148168', + url: + 'https://media2.giphy.com/media/j5L4RHeV8Q5tmepRVb/200w_d.gif?cid=c4b03675kgziudvt7s9990i28hp8zpffi4oyem1snvl7sfvl&rid=200w_d.gif&ct=g', + width: '200', + }, + fixed_width_still: { + frames: '', + height: '200', + size: '23240', + url: + 'https://media2.giphy.com/media/j5L4RHeV8Q5tmepRVb/200w_s.gif?cid=c4b03675kgziudvt7s9990i28hp8zpffi4oyem1snvl7sfvl&rid=200w_s.gif&ct=g', + width: '200', + }, + original: { + frames: '20', + height: '400', + size: '1308571', + url: + 'https://media2.giphy.com/media/j5L4RHeV8Q5tmepRVb/giphy.gif?cid=c4b03675kgziudvt7s9990i28hp8zpffi4oyem1snvl7sfvl&rid=giphy.gif&ct=g', + width: '400', + }, + }, thumb_url: 'http://www.jackblack.com/tenac_iousd.bmp', title: nanoid(), title_link: nanoid(), From d5480c7f36ad6237cd1d421cd62bebfd68e24615 Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Fri, 8 Jul 2022 16:25:44 +0200 Subject: [PATCH 27/52] test: render null if scraped attachment does not have og_scrape_url neither title_link --- .../Attachment/__tests__/Attachment.test.js | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/components/Attachment/__tests__/Attachment.test.js b/src/components/Attachment/__tests__/Attachment.test.js index 2155e1910b..e6ccc8be35 100644 --- a/src/components/Attachment/__tests__/Attachment.test.js +++ b/src/components/Attachment/__tests__/Attachment.test.js @@ -117,17 +117,14 @@ describe('attachment', () => { }); describe('scraped content', () => { - it.each([ - { og_scrape_url: undefined, title_link: nanoid() }, - { og_scrape_url: nanoid(), title_link: undefined }, - ])( - 'should render null, if scraped attachment og_scrape_url is %s & title_link is %s', - ({ og_scrape_url, title_link }) => { - const attachment = generateScrapedDataAttachment({ og_scrape_url, title_link }); - const { container } = renderComponent({ attachments: [attachment] }); - expect(container.firstChild).toBeEmptyDOMElement(); - }, - ); + it('should render null, if og_scrape_url & title_link are undefined', () => { + const attachment = generateScrapedDataAttachment({ + og_scrape_url: undefined, + title_link: undefined, + }); + const { container } = renderComponent({ attachments: [attachment] }); + expect(container.firstChild).toBeEmptyDOMElement(); + }); const cases = [ { From 0f42f62fbd1aca6dfeb04334e662d582871b9ec3 Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Fri, 8 Jul 2022 16:27:28 +0200 Subject: [PATCH 28/52] refactor: scraped attachment has either og_scrape_url or title_link --- src/components/Attachment/Attachment.tsx | 3 +-- src/components/Attachment/utils.tsx | 13 ------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/components/Attachment/Attachment.tsx b/src/components/Attachment/Attachment.tsx index 5d3fc55087..e1d05fa9a6 100644 --- a/src/components/Attachment/Attachment.tsx +++ b/src/components/Attachment/Attachment.tsx @@ -8,7 +8,6 @@ import { GroupedRenderedAttachment, isAudioAttachment, isFileAttachment, - isGiphyAttachment, isMediaAttachment, isScrapedContent, isUploadedImage, @@ -161,7 +160,7 @@ const getAttachmentType = < >( attachment: AttachmentProps['attachments'][number], ): keyof typeof CONTAINER_MAP | null => { - if (isScrapedContent(attachment) || isGiphyAttachment(attachment)) { + if (isScrapedContent(attachment)) { return 'card'; } else if (isMediaAttachment(attachment)) { return 'media'; diff --git a/src/components/Attachment/utils.tsx b/src/components/Attachment/utils.tsx index 958db06a4d..4121983d12 100644 --- a/src/components/Attachment/utils.tsx +++ b/src/components/Attachment/utils.tsx @@ -49,13 +49,6 @@ export const isScrapedContent = < StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics >( attachment: Attachment, -) => attachment.og_scrape_url && attachment.title_link; - -// giphy attachment has only title_link, but not og_scrape_url -export const isCardRenderable = < - StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics ->( - attachment: Attachment, ) => attachment.og_scrape_url || attachment.title_link; export const isUploadedImage = < @@ -94,12 +87,6 @@ export const isMediaAttachment = < (attachment.mime_type && SUPPORTED_VIDEO_FORMATS.indexOf(attachment.mime_type) !== -1) || attachment.type === 'video'; -export const isGiphyAttachment = < - StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics ->( - attachment: Attachment, -) => attachment.type === 'giphy'; - /** * @deprecated will be removed in the next major release, * replaced with the proper component equivalent `AttachmentContainer/AttachmentWithinContainer` From 80279083cbd336cf3a8de2a5ce4658e1926aa838 Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Fri, 8 Jul 2022 16:30:16 +0200 Subject: [PATCH 29/52] feat: extract CardAudio and render only uploaded audio data in Audio component --- src/components/Attachment/Audio.tsx | 73 +++++++++++-------- .../Attachment/__tests__/Audio.test.js | 70 ++++-------------- .../__snapshots__/Audio.test.js.snap | 2 +- 3 files changed, 57 insertions(+), 88 deletions(-) diff --git a/src/components/Attachment/Audio.tsx b/src/components/Attachment/Audio.tsx index 7baf6521b6..12c22642af 100644 --- a/src/components/Attachment/Audio.tsx +++ b/src/components/Attachment/Audio.tsx @@ -3,7 +3,6 @@ import React from 'react'; import type { Attachment } from 'stream-chat'; import { PauseIcon, PlayTriangleIcon } from './icons'; -import { isScrapedContent } from './utils'; import { FileSizeIndicator } from './FileSizeIndicator'; import { DownloadButton } from './DownloadButton'; @@ -108,13 +107,50 @@ const ProgressBar = ({ progress }: ProgressBarProps) => (
); +export const CardAudio = ({ og: { asset_url, text, title } }: AudioProps) => { + const { audioRef, isPlaying, progress, togglePlay } = useAudioController(); + + const dataTestId = 'card-audio-widget'; + const rootClassName = 'str-chat__message-attachment-card-audio-widget'; + return ( +
+ {asset_url && ( + <> + +
+
+ +
+ +
+ + )} +
+ {title &&
{title}
} + {text && ( +
{text}
+ )} +
+
+ ); +}; + const AudioV2 = ({ og }: AudioProps) => { - const { asset_url, file_size, text, title } = og; + const { asset_url, file_size, title } = og; const { audioRef, isPlaying, progress, togglePlay } = useAudioController(); - let rootClassName = 'str-chat__message-attachment-audio-widget'; - let audioContent = ( - <> + if (!asset_url) return null; + + const dataTestId = 'audio-widget'; + const rootClassName = 'str-chat__message-attachment-audio-widget'; + + return ( +
+
@@ -128,33 +164,6 @@ const AudioV2 = ({ og }: AudioProps) => {
- - ); - - if (isScrapedContent(og)) { - rootClassName = 'str-chat__message-attachment-card-audio-widget'; - audioContent = ( - <> -
-
- -
- -
-
-
{title}
-
{text}
-
- - ); - } - - return ( -
- - {audioContent}
); }; diff --git a/src/components/Attachment/__tests__/Audio.test.js b/src/components/Attachment/__tests__/Audio.test.js index 7d83c52341..8c8b27a292 100644 --- a/src/components/Attachment/__tests__/Audio.test.js +++ b/src/components/Attachment/__tests__/Audio.test.js @@ -7,19 +7,14 @@ import { Audio } from '../Audio'; import { ChatContext } from '../../../context/ChatContext'; -import { generateAudioAttachment, generateScrapedAudioAttachment } from 'mock-builders'; +import { generateAudioAttachment } from 'mock-builders'; -const THEME_VERSIONS = ['1', '2']; - -const AUDIO = { - scraped: generateScrapedAudioAttachment(), - uploaded: generateAudioAttachment(), -}; +const AUDIO = generateAudioAttachment(); const renderComponent = ( props = { chatContext: { themeVersion: '1' }, - og: AUDIO.scraped, + og: AUDIO, }, ) => render( @@ -40,74 +35,39 @@ describe('Audio', () => { }); afterEach(cleanup); - it('in v1 scraped should render title and description as text, and render the image with description as alt tag', () => { - const audioData = AUDIO.scraped; - const { getByAltText, getByText } = renderComponent({ - chatContext: { themeVersion: '1' }, - og: audioData, - }); - - expect(getByText(audioData.title)).toBeInTheDocument(); - expect(getByText(audioData.text)).toBeInTheDocument(); - - const image = getByAltText(audioData.description); - expect(image).toBeInTheDocument(); - expect(image.src).toBe(audioData.image_url); - }); - - it('in v1 uploaded should render title and render the image with description as alt tag', () => { - const audioData = AUDIO.uploaded; + it('in v1 should render title and render the image with description as alt tag', () => { const { container } = renderComponent({ chatContext: { themeVersion: '1' }, - og: { ...audioData, title: 'deterministic' }, + og: { ...AUDIO, title: 'deterministic' }, }); expect(container).toMatchSnapshot(); }); - it('in v2 scraped should render title and description as text, and render the image with description as alt tag', () => { - const { container, getByText } = renderComponent({ - chatContext: { themeVersion: '2' }, - og: AUDIO.scraped, - }); - - expect(getByText(AUDIO.scraped.title)).toBeInTheDocument(); - expect(getByText(AUDIO.scraped.text)).toBeInTheDocument(); - - expect(container.querySelector('img')).not.toBeInTheDocument(); - }); - it('in v2 uploaded should render title and file size', () => { const { container, getByText } = renderComponent({ chatContext: { themeVersion: '2' }, - og: AUDIO.uploaded, + og: AUDIO, }); - expect(getByText(AUDIO.uploaded.title)).toBeInTheDocument(); - expect(getByText(prettybytes(AUDIO.uploaded.file_size))).toBeInTheDocument(); + expect(getByText(AUDIO.title)).toBeInTheDocument(); + expect(getByText(prettybytes(AUDIO.file_size))).toBeInTheDocument(); expect(container.querySelector('img')).not.toBeInTheDocument(); }); - const matrix = THEME_VERSIONS.reduce((acc, version) => { - Object.entries(AUDIO).forEach(([type, attachment]) => { - acc.push([type, version, attachment]); - }); - return acc; - }, []); - - describe.each(matrix)('%s in version %s', (type, themeVersion, audioData) => { + describe.each([['1'], ['2']])('version %s', (themeVersion) => { it('should render an audio element with the right source', () => { - const { getByTestId } = renderComponent({ chatContext: { themeVersion }, og: audioData }); + const { getByTestId } = renderComponent({ chatContext: { themeVersion }, og: AUDIO }); const source = getByTestId('audio-source'); expect(source).toBeInTheDocument(); - expect(source.src).toBe(audioData.asset_url); + expect(source.src).toBe(AUDIO.asset_url); expect(source.parentElement).toBeInstanceOf(HTMLAudioElement); }); it('should show the correct button if the song is paused/playing', async () => { - const { queryByTestId } = renderComponent({ chatContext: { themeVersion }, og: audioData }); + const { queryByTestId } = renderComponent({ chatContext: { themeVersion }, og: AUDIO }); const playButton = () => queryByTestId(playButtonTestId); const pauseButton = () => queryByTestId(pauseButtonTestId); @@ -127,7 +87,7 @@ describe('Audio', () => { }); it('should poll for progress every 500ms if the file is played, and stop doing that when it is paused', () => { - const { getByTestId } = renderComponent({ chatContext: { themeVersion }, og: audioData }); + const { getByTestId } = renderComponent({ chatContext: { themeVersion }, og: AUDIO }); let intervalId; const setIntervalSpy = jest.spyOn(window, 'setInterval').mockImplementationOnce(() => { @@ -146,7 +106,7 @@ describe('Audio', () => { it('should clean up the progress interval if the component is unmounted while the file is playing', () => { const { getByTestId, unmount = cleanup } = renderComponent({ chatContext: { themeVersion }, - og: audioData, + og: AUDIO, }); let intervalId; @@ -164,7 +124,7 @@ describe('Audio', () => { }); it('should show the correct progress', async () => { - const { getByTestId } = renderComponent({ chatContext: { themeVersion }, og: audioData }); + const { getByTestId } = renderComponent({ chatContext: { themeVersion }, og: AUDIO }); jest.spyOn(HTMLAudioElement.prototype, 'duration', 'get').mockImplementationOnce(() => 100); jest.spyOn(HTMLAudioElement.prototype, 'currentTime', 'get').mockImplementationOnce(() => 50); diff --git a/src/components/Attachment/__tests__/__snapshots__/Audio.test.js.snap b/src/components/Attachment/__tests__/__snapshots__/Audio.test.js.snap index 3966d74f61..ae7055badb 100644 --- a/src/components/Attachment/__tests__/__snapshots__/Audio.test.js.snap +++ b/src/components/Attachment/__tests__/__snapshots__/Audio.test.js.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Audio in v1 uploaded should render title and render the image with description as alt tag 1`] = ` +exports[`Audio in v1 should render title and render the image with description as alt tag 1`] = `
Date: Fri, 8 Jul 2022 16:32:02 +0200 Subject: [PATCH 30/52] test: render v1 icons in File v1 --- .../Attachment/__tests__/File.test.js | 25 +++++++------------ .../__tests__/__snapshots__/File.test.js.snap | 12 ++++----- 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/src/components/Attachment/__tests__/File.test.js b/src/components/Attachment/__tests__/File.test.js index 5dde053469..bb057496c4 100644 --- a/src/components/Attachment/__tests__/File.test.js +++ b/src/components/Attachment/__tests__/File.test.js @@ -12,16 +12,17 @@ const getComponent = ({ attachment, chatContext }) => ( ); +const file = { + asset_url: 'https://www.w3.org/WAI/ER/tests/xhtml/testfiles/resources/pdf/dummy.pdf', + file_size: 1337, + mime_type: 'application/pdf', + text: 'My file', + title: 'Nice file', + type: 'file', +}; + describe('File', () => { it('should render File component in V1', () => { - const file = { - asset_url: 'https://www.w3.org/WAI/ER/tests/xhtml/testfiles/resources/pdf/dummy.pdf', - file_size: 1337, - mime_type: 'application/pdf', - text: 'My file', - title: 'Nice file', - type: 'file', - }; const tree = renderer .create(getComponent({ attachment: file, chatContext: { themeVersion: '1' } })) .toJSON(); @@ -29,14 +30,6 @@ describe('File', () => { }); it('should render File component in V2', () => { - const file = { - asset_url: 'https://www.w3.org/WAI/ER/tests/xhtml/testfiles/resources/pdf/dummy.pdf', - file_size: 1337, - mime_type: 'application/pdf', - text: 'My file', - title: 'Nice file', - type: 'file', - }; const tree = renderer .create(getComponent({ attachment: file, chatContext: { themeVersion: '2' } })) .toJSON(); diff --git a/src/components/Attachment/__tests__/__snapshots__/File.test.js.snap b/src/components/Attachment/__tests__/__snapshots__/File.test.js.snap index 71399e871d..0fb3054d36 100644 --- a/src/components/Attachment/__tests__/__snapshots__/File.test.js.snap +++ b/src/components/Attachment/__tests__/__snapshots__/File.test.js.snap @@ -6,15 +6,15 @@ exports[`File should render File component in V1 1`] = ` data-testid="attachment-file" >
Date: Fri, 8 Jul 2022 16:34:22 +0200 Subject: [PATCH 31/52] fix: do not generate class names to contain string 'undefined', do not pass Media prop to Card --- src/components/Attachment/AttachmentContainer.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/Attachment/AttachmentContainer.tsx b/src/components/Attachment/AttachmentContainer.tsx index d0345521a7..226d81f05e 100644 --- a/src/components/Attachment/AttachmentContainer.tsx +++ b/src/components/Attachment/AttachmentContainer.tsx @@ -38,9 +38,9 @@ export const AttachmentWithinContainer = < const classNames = clsx( 'str-chat__message-attachment', - `str-chat__message-attachment--${componentType}`, + componentType && `str-chat__message-attachment--${componentType}`, attachment?.type && `str-chat__message-attachment--${attachment?.type}`, - extra && `str-chat__message-attachment--${componentType}--${extra}`, + componentType && extra && `str-chat__message-attachment--${componentType}--${extra}`, extra === 'actions' && 'str-chat__message-attachment-with-actions', // added for theme V2 (better readability) ); @@ -116,14 +116,14 @@ export const CardContainer = < >( props: RenderAttachmentProps, ) => { - const { attachment, Media, Card = DefaultCard } = props; + const { attachment, Card = DefaultCard } = props; const componentType = 'card'; if (attachment.actions && attachment.actions.length) { return (
- +
@@ -132,7 +132,7 @@ export const CardContainer = < return ( - + ); }; From 5f5341ff112658c75675cbf2a77b76aa80f330a3 Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Fri, 8 Jul 2022 16:36:07 +0200 Subject: [PATCH 32/52] feat: add Card component for theming v2 --- src/components/Attachment/Card.tsx | 172 +- .../Attachment/__tests__/Card.test.js | 594 +++++-- .../__tests__/__snapshots__/Card.test.js.snap | 1497 +++++++++++++++++ 3 files changed, 2071 insertions(+), 192 deletions(-) create mode 100644 src/components/Attachment/__tests__/__snapshots__/Card.test.js.snap diff --git a/src/components/Attachment/Card.tsx b/src/components/Attachment/Card.tsx index 53f9d6be68..2d8e717fb2 100644 --- a/src/components/Attachment/Card.tsx +++ b/src/components/Attachment/Card.tsx @@ -1,12 +1,48 @@ -import React, { PropsWithChildren } from 'react'; +import React from 'react'; +import clsx from 'clsx'; +import ReactPlayer from 'react-player'; +import { CardAudio } from './Audio'; import { SafeAnchor } from '../SafeAnchor'; -import { useTranslationContext } from '../../context/TranslationContext'; +import { useChatContext } from '../../context/ChatContext'; import { useChannelStateContext } from '../../context/ChannelStateContext'; +import { useTranslationContext } from '../../context/TranslationContext'; + import type { Attachment } from 'stream-chat'; +import type { RenderAttachmentProps } from './utils'; + +const trimUrl = (url?: string | null) => { + if (url !== undefined && url !== null) { + const [trimmedUrl] = url.replace(/^(?:https?:\/\/)?(?:www\.)?/i, '').split('/'); + + return trimmedUrl; + } + return null; +}; + +const UnableToRenderCard = ({ type }: { type?: CardProps['type'] }) => { + const { t } = useTranslationContext('Card'); + + return ( +
+
+
+ {t('this content could not be displayed')} +
+
+
+ ); +}; + +type Dimensions = { height?: string; width?: string }; -export type CardProps = { +interface CardV1Props { giphy?: Attachment['giphy']; /** The url of the full sized image */ image_url?: string; @@ -22,15 +58,14 @@ export type CardProps = { title_link?: string; /** The card type used in the className attribute */ type?: string; -}; +} -const UnMemoizedCard = (props: PropsWithChildren) => { +const CardV1 = (props: CardV1Props) => { const { giphy, image_url, og_scrape_url, text, thumb_url, title, title_link, type } = props; - const { t } = useTranslationContext('Card'); const { giphyVersion: giphyVersionName } = useChannelStateContext('Card'); let image = thumb_url || image_url; - const dimensions: { height?: string; width?: string } = {}; + const dimensions: Dimensions = {}; if (type === 'giphy' && typeof giphy !== 'undefined') { const giphyVersion = giphy[giphyVersionName as keyof NonNullable]; @@ -39,27 +74,8 @@ const UnMemoizedCard = (props: PropsWithChildren) => { dimensions.width = giphyVersion.width; } - const trimUrl = (url?: string | null) => { - if (url !== undefined && url !== null) { - const [trimmedUrl] = url.replace(/^(?:https?:\/\/)?(?:www\.)?/i, '').split('/'); - - return trimmedUrl; - } - return null; - }; - if (!title && !title_link && !image) { - return ( -
-
-
- {t('this content could not be displayed')} -
-
-
- ); + return ; } if (!title_link && !og_scrape_url) { @@ -93,6 +109,108 @@ const UnMemoizedCard = (props: PropsWithChildren) => { ); }; +const Caption = ({ author_name, url }: Pick & { url: string }) => ( +
+ + {author_name || trimUrl(url)} + +
+); + +type CardHeaderProps = Pick< + CardProps, + 'asset_url' | 'author_name' | 'og_scrape_url' | 'title' | 'title_link' | 'type' +> & { dimensions: Dimensions; image?: string }; + +const CardHeader = (props: CardHeaderProps) => { + const { + asset_url, + author_name, + dimensions, + image, + og_scrape_url, + title, + title_link, + type, + } = props; + + let visual = null; + if (asset_url && type === 'video') { + visual = ( + + ); + } else if (image) { + visual = {title; + } + + const url = og_scrape_url || title_link; + + return visual ? ( +
+ {visual} + {url && } +
+ ) : null; +}; + +type CardContentProps = RenderAttachmentProps['attachment']; + +const CardContent = (props: CardContentProps) => { + const { text, title, type } = props; + + return ( +
+ {type === 'audio' ? ( + + ) : ( +
+ {title &&
{title}
} + {text &&
{text}
} +
+ )} +
+ ); +}; + +const CardV2 = (props: CardProps) => { + const { asset_url, giphy, image_url, thumb_url, title, title_link, type } = props; + const { giphyVersion: giphyVersionName } = useChannelStateContext('CardHeader'); + + let image = thumb_url || image_url; + const dimensions: { height?: string; width?: string } = {}; + + if (type === 'giphy' && typeof giphy !== 'undefined') { + const giphyVersion = giphy[giphyVersionName as keyof NonNullable]; + image = giphyVersion.url; + dimensions.height = giphyVersion.height; + dimensions.width = giphyVersion.width; + } + + if (!title && !title_link && !asset_url && !image) { + return ; + } + + return ( +
+ + +
+ ); +}; + +export type CardProps = RenderAttachmentProps['attachment']; + +const UnMemoizedCard = (props: CardProps) => { + const { themeVersion } = useChatContext('Card'); + + return themeVersion === '2' ? : ; +}; + /** * Simple Card Layout for displaying links */ diff --git a/src/components/Attachment/__tests__/Card.test.js b/src/components/Attachment/__tests__/Card.test.js index 428f17745d..422c22eeb6 100644 --- a/src/components/Attachment/__tests__/Card.test.js +++ b/src/components/Attachment/__tests__/Card.test.js @@ -1,5 +1,5 @@ import React from 'react'; -import { cleanup, render } from '@testing-library/react'; +import { cleanup, render, waitFor } from '@testing-library/react'; import '@testing-library/jest-dom'; import { Card } from '../Card'; @@ -9,6 +9,7 @@ import { ChatProvider } from '../../../context/ChatContext'; import { generateChannel, + generateGiphyAttachment, generateMember, generateUser, getOrCreateChannelApi, @@ -26,9 +27,9 @@ const mockedChannel = generateChannel({ thread: [], }); -const renderCard = (client, cardProps, theRenderer = render) => +const renderCard = ({ cardProps, chatContext, theRenderer = render }) => theRenderer( - + @@ -45,195 +46,458 @@ describe('Card', () => { afterEach(cleanup); - it('should render Card with default props', async () => { - const { container } = await renderCard(chatClient); - expect(container.firstChild).toMatchInlineSnapshot(` -
+ describe('theme V1', () => { + it('should render Card with default props', async () => { + const { container } = await renderCard({ chatContext: { chatClient } }); + expect(container.firstChild).toMatchInlineSnapshot(`
- this content could not be displayed -
-
-
- `); - }); - - it('should render Card with default props and image_url', async () => { - const { container } = await renderCard(chatClient, { image_url: 'test.jpg' }); - expect(container.firstChild).toMatchInlineSnapshot(`null`); - }); - - it('should render Card with default props and title', async () => { - const { container } = await renderCard(chatClient, { title: 'test' }); - expect(container.firstChild).toMatchInlineSnapshot(`null`); - }); - - it('should render Card with default props and og_scrape_url', async () => { - const { container } = await renderCard(chatClient, { og_scrape_url: 'https://google.com' }); - expect(container.firstChild).toMatchInlineSnapshot(` -
-
-
- this content could not be displayed -
-
-
- `); - }); - - it('should render Card with default props and title and og_scrape_url', async () => { - const { container } = await renderCard(chatClient, { - og_scrape_url: 'https://google.com', - title: 'test', - }); - expect(container.firstChild).toMatchInlineSnapshot(` -
-
-
- test + this content could not be displayed
- - google.com -
-
- `); - }); + `); + }); - it('should render Card with default props and title, og_scrape_url, image_url', async () => { - const { container } = await renderCard(chatClient, { - image_url: 'test.jpg', - og_scrape_url: 'https://google.com', - title: 'test', + it('should render Card with default props and image_url', async () => { + const { container } = await renderCard({ + cardProps: { image_url: 'test.jpg' }, + chatContext: { chatClient }, + }); + expect(container.firstChild).toMatchInlineSnapshot(`null`); }); - expect(container.firstChild).toMatchInlineSnapshot(` -
-
- test.jpg -
-
-
-
- test -
- - google.com - -
-
-
- `); - }); - it('should render Card with default props and title, og_scrape_url, image_url, text', async () => { - const { container } = await renderCard(chatClient, { - image_url: 'test.jpg', - og_scrape_url: 'https://google.com', - text: 'test text', - title: 'test', + it('should render Card with default props and title', async () => { + const { container } = await renderCard({ + cardProps: { title: 'test' }, + chatContext: { chatClient }, + }); + expect(container.firstChild).toMatchInlineSnapshot(`null`); }); - expect(container.firstChild).toMatchInlineSnapshot(` -
+ it('should render Card with default props and og_scrape_url', async () => { + const { container } = await renderCard({ + cardProps: { og_scrape_url: 'https://google.com' }, + chatContext: { chatClient }, + }); + expect(container.firstChild).toMatchInlineSnapshot(`
- test.jpg -
-
-
- test -
- test text + this content could not be displayed
- - google.com -
-
- `); - }); + `); + }); + + it('should render Card with default props and title and og_scrape_url', async () => { + const { container } = await renderCard({ + cardProps: { + og_scrape_url: 'https://google.com', + title: 'test', + }, + chatContext: { chatClient }, + }); + expect(container.firstChild).toMatchInlineSnapshot(` +
+
+
+
+ test +
+ + google.com + +
+
+
+ `); + }); - it('should render trimmed url', async () => { - const { getByText } = await renderCard(chatClient, { - og_scrape_url: - 'https://www.theverge.com/2020/6/15/21291288/sony-ps5-software-user-interface-ui-design-dashboard-teaser-video', - title: 'test', + it('should render Card with default props and title, og_scrape_url, image_url', async () => { + const { container } = await renderCard({ + cardProps: { + image_url: 'test.jpg', + og_scrape_url: 'https://google.com', + title: 'test', + }, + chatContext: { chatClient }, + }); + expect(container.firstChild).toMatchInlineSnapshot(` +
+
+ test.jpg +
+
+
+
+ test +
+ + google.com + +
+
+
+ `); + }); + + it('should render Card with default props and title, og_scrape_url, image_url, text', async () => { + const { container } = await renderCard({ + cardProps: { + image_url: 'test.jpg', + og_scrape_url: 'https://google.com', + text: 'test text', + title: 'test', + }, + chatContext: { chatClient }, + }); + + expect(container.firstChild).toMatchInlineSnapshot(` +
+
+ test.jpg +
+
+
+
+ test +
+
+ test text +
+ + google.com + +
+
+
+ `); + }); + + it('should render trimmed url', async () => { + const { getByText } = await renderCard({ + cardProps: { + og_scrape_url: + 'https://www.theverge.com/2020/6/15/21291288/sony-ps5-software-user-interface-ui-design-dashboard-teaser-video', + title: 'test', + }, + chatContext: { chatClient }, + }); + expect(getByText('theverge.com')).toBeInTheDocument(); + }); + + it('should return null if no og_scrape_url && no title_link', async () => { + const { container } = await renderCard({ + cardProps: { title: 'test card' }, + chatContext: { chatClient }, + }); + expect(container).toBeEmptyDOMElement(); }); - expect(getByText('theverge.com')).toBeInTheDocument(); }); - it('should return null if no og_scrape_url && no title_link', async () => { - const { container } = await renderCard(chatClient, { title: 'test card' }, render); - expect(container).toBeEmptyDOMElement(); + describe('theme V2', () => { + beforeAll(() => { + jest.spyOn(window.HTMLMediaElement.prototype, 'pause').mockImplementation(() => {}); + }); + + afterAll(jest.restoreAllMocks); + + const dummyAttachment = { + asset_url: 'dummyAttachment_asset_url', + author_name: 'dummyAttachment_author_name', + image_url: 'dummyAttachment_image_url', + og_scrape_url: 'dummyAttachment_og_scrape_url', + text: 'dummyAttachment_text', + thumb_url: 'dummyAttachment_thumb_url', + title: 'dummyAttachment_title', + title_link: 'dummyAttachment_title_link', + }; + + const attachmentTypes = ['audio', 'image', 'video']; + + const cases = attachmentTypes.reduce((acc, type) => { + const attachment = { ...dummyAttachment, type }; + acc[type] = [ + { + attachment: { ...attachment, og_scrape_url: undefined, title_link: undefined }, + props: 'og_scrape_url neither title_link is available', + render: `card without caption`, + }, + { + attachment: { + ...attachment, + asset_url: undefined, + image_url: undefined, + thumb_url: undefined, + title: undefined, + title_link: undefined, + }, + props: 'neither image and asset urls nor title_link are available', + render: 'unable-to-display card', + }, + { + attachment: { ...attachment, title_link: undefined }, + props: 'title_link is not available', + render: `${type} with caption using og_scrape_url and with asset in header`, + }, + { + attachment: { ...attachment, title: undefined }, + props: 'title is not available', + render: `${type} without title`, + }, + { + attachment: { ...attachment, title: undefined, title_link: undefined }, + props: 'title_link neither title is available', + render: `${type} without title and with caption using og_scrape_url and with image in header`, + }, + ]; + if (type === 'audio') { + acc[type].push( + { + attachment: { + ...attachment, + image_url: undefined, + thumb_url: undefined, + }, + props: 'og image URLs are not available', + render: `audio widget with title & text in Card content and without Card header`, + }, + { + attachment: { ...attachment, asset_url: undefined, image_url: undefined }, + props: 'thumb_url is available, but not asset_url, image_url', + render: `image loaded from thumb_url not ${type} widget`, + }, + { + attachment: { ...attachment, asset_url: undefined, thumb_url: undefined }, + props: 'image_url is available, but not asset_url, thumb_url', + render: `image loaded from image_url not ${type} widget`, + }, + { + attachment, + props: 'all props are available', + render: `audio widget with image loaded from thumb_url and title & text in Card content`, + }, + { + attachment: { + ...attachment, + asset_url: undefined, + image_url: undefined, + thumb_url: undefined, + }, + props: 'asset and neither og image URL is available', + render: 'content part with title and text only and without the header part of the Card', + }, + ); + } else if (type === 'video') { + acc[type].push( + { + attachment: { + ...attachment, + image_url: undefined, + thumb_url: undefined, + }, + props: 'og image URLs are not available', + render: `video widget in header and title & text in Card content`, + }, + { + attachment: { ...attachment, asset_url: undefined, image_url: undefined }, + props: 'thumb_url is available, but not asset_url, image_url', + render: `image loaded from thumb_url not ${type} widget`, + }, + { + attachment: { ...attachment, asset_url: undefined, thumb_url: undefined }, + props: 'image_url is available, but not asset_url, thumb_url', + render: `image loaded from image_url not ${type} widget`, + }, + { + attachment, + props: 'all props are available', + render: `video widget in header and title & text in Card content`, + }, + { + attachment: { + ...attachment, + asset_url: undefined, + image_url: undefined, + thumb_url: undefined, + }, + props: 'scraped media URL is not available', + render: `content part with title and text only and without the header part of the Card`, + }, + ); + } else if (type === 'image') { + acc[type].push( + { + attachment: { + ...attachment, + image_url: undefined, + thumb_url: undefined, + }, + props: 'og image URLs are not available', + render: `card with title and text only and without the image in the header part of the Card`, + }, + { + attachment: { ...attachment, image_url: undefined }, + props: 'thumb_url is available, but not image_url', + render: `image loaded from thumb_url`, + }, + { + attachment: { ...attachment, thumb_url: undefined }, + props: 'image_url is available, but not thumb_url', + render: `image loaded from image_url`, + }, + ); + } + return acc; + }, {}); + + it.each` + num | render | type | props | attachment + ${1} | ${cases.audio[0].render} | ${cases.audio[0].attachment.type} | ${cases.audio[0].props} | ${cases.audio[0].attachment} + ${2} | ${cases.video[0].render} | ${cases.video[0].attachment.type} | ${cases.video[0].props} | ${cases.video[0].attachment} + ${3} | ${cases.image[0].render} | ${cases.image[0].attachment.type} | ${cases.image[0].props} | ${cases.image[0].attachment} + ${4} | ${cases.audio[1].render} | ${cases.audio[1].attachment.type} | ${cases.audio[1].props} | ${cases.audio[1].attachment} + ${5} | ${cases.video[1].render} | ${cases.video[1].attachment.type} | ${cases.video[1].props} | ${cases.video[1].attachment} + ${6} | ${cases.image[1].render} | ${cases.image[1].attachment.type} | ${cases.image[1].props} | ${cases.image[1].attachment} + ${7} | ${cases.audio[2].render} | ${cases.audio[2].attachment.type} | ${cases.audio[2].props} | ${cases.audio[2].attachment} + ${8} | ${cases.video[2].render} | ${cases.video[2].attachment.type} | ${cases.video[2].props} | ${cases.video[2].attachment} + ${9} | ${cases.image[2].render} | ${cases.image[2].attachment.type} | ${cases.image[2].props} | ${cases.image[2].attachment} + ${10} | ${cases.audio[3].render} | ${cases.audio[3].attachment.type} | ${cases.audio[3].props} | ${cases.audio[3].attachment} + ${11} | ${cases.video[3].render} | ${cases.video[3].attachment.type} | ${cases.video[3].props} | ${cases.video[3].attachment} + ${12} | ${cases.image[3].render} | ${cases.image[3].attachment.type} | ${cases.image[3].props} | ${cases.image[3].attachment} + ${13} | ${cases.audio[4].render} | ${cases.audio[4].attachment.type} | ${cases.audio[4].props} | ${cases.audio[4].attachment} + ${14} | ${cases.video[4].render} | ${cases.video[4].attachment.type} | ${cases.video[4].props} | ${cases.video[4].attachment} + ${15} | ${cases.image[4].render} | ${cases.image[4].attachment.type} | ${cases.image[4].props} | ${cases.image[4].attachment} + ${16} | ${cases.audio[5].render} | ${cases.audio[5].attachment.type} | ${cases.audio[5].props} | ${cases.audio[5].attachment} + ${17} | ${cases.video[5].render} | ${cases.video[5].attachment.type} | ${cases.video[5].props} | ${cases.video[5].attachment} + ${18} | ${cases.image[5].render} | ${cases.image[5].attachment.type} | ${cases.image[5].props} | ${cases.image[5].attachment} + ${19} | ${cases.audio[6].render} | ${cases.audio[6].attachment.type} | ${cases.audio[6].props} | ${cases.audio[6].attachment} + ${20} | ${cases.video[6].render} | ${cases.video[6].attachment.type} | ${cases.video[6].props} | ${cases.video[6].attachment} + ${21} | ${cases.image[6].render} | ${cases.image[6].attachment.type} | ${cases.image[6].props} | ${cases.image[6].attachment} + ${22} | ${cases.audio[7].render} | ${cases.audio[7].attachment.type} | ${cases.audio[7].props} | ${cases.audio[7].attachment} + ${23} | ${cases.video[7].render} | ${cases.video[7].attachment.type} | ${cases.video[7].props} | ${cases.video[7].attachment} + ${24} | ${cases.image[7].render} | ${cases.image[7].attachment.type} | ${cases.image[7].props} | ${cases.image[7].attachment} + ${25} | ${cases.audio[8].render} | ${cases.audio[8].attachment.type} | ${cases.audio[8].props} | ${cases.audio[8].attachment} + ${26} | ${cases.video[8].render} | ${cases.video[8].attachment.type} | ${cases.video[8].props} | ${cases.video[8].attachment} + ${27} | ${cases.audio[9].render} | ${cases.audio[9].attachment.type} | ${cases.audio[9].props} | ${cases.audio[9].attachment} + ${28} | ${cases.video[9].render} | ${cases.video[9].attachment.type} | ${cases.video[9].props} | ${cases.video[9].attachment} + `( + '($num) should render $render if attachment type is $type and $props', + async ({ attachment }) => { + const { container } = await renderCard({ + cardProps: attachment, + chatContext: { chatClient, themeVersion: '2' }, + render, + }); + + await waitFor(() => { + expect(container).toMatchSnapshot(); + }); + }, + ); + + it('should render giphy image if type is giphy', async () => { + const { container } = await renderCard({ + cardProps: { attachment: generateGiphyAttachment() }, + chatContext: { chatClient, themeVersion: '2' }, + render, + }); + + await waitFor(() => { + expect(container).toMatchSnapshot(); + }); + }); + it('should not render giphy image if url is not available', async () => { + const { queryByTestId } = await renderCard({ + cardProps: { attachment: generateGiphyAttachment({ giphy: undefined }) }, + chatContext: { chatClient, themeVersion: '2' }, + render, + }); + + await waitFor(() => { + expect(queryByTestId('card-header')).not.toBeInTheDocument(); + }); + }); + + it('should display trimmed URL in caption if author_name is not available', async () => { + const { getByText } = await renderCard({ + cardProps: { + og_scrape_url: + 'https://www.theverge.com/2020/6/15/21291288/sony-ps5-software-user-interface-ui-design-dashboard-teaser-video', + title: 'test', + }, + chatContext: { chatClient }, + }); + expect(getByText('theverge.com')).toBeInTheDocument(); + }); }); }); diff --git a/src/components/Attachment/__tests__/__snapshots__/Card.test.js.snap b/src/components/Attachment/__tests__/__snapshots__/Card.test.js.snap new file mode 100644 index 0000000000..6c2bb04329 --- /dev/null +++ b/src/components/Attachment/__tests__/__snapshots__/Card.test.js.snap @@ -0,0 +1,1497 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Card theme V2 (1) should render card without caption if attachment type is audio and og_scrape_url neither title_link is available 1`] = ` +
+
+
+ dummyAttachment_title +
+
+
+ +
+
+ +
+
+
+
+
+
+
+
+ dummyAttachment_title +
+
+ dummyAttachment_text +
+
+
+
+
+
+`; + +exports[`Card theme V2 (2) should render card without caption if attachment type is video and og_scrape_url neither title_link is available 1`] = ` +
+
+
+
+
+
+
+
+ dummyAttachment_title +
+
+ dummyAttachment_text +
+
+
+
+
+`; + +exports[`Card theme V2 (3) should render card without caption if attachment type is image and og_scrape_url neither title_link is available 1`] = ` +
+
+
+ dummyAttachment_title +
+
+
+
+ dummyAttachment_title +
+
+ dummyAttachment_text +
+
+
+
+
+`; + +exports[`Card theme V2 (4) should render unable-to-display card if attachment type is audio and neither image and asset urls nor title_link are available 1`] = ` +
+
+
+
+ this content could not be displayed +
+
+
+
+`; + +exports[`Card theme V2 (5) should render unable-to-display card if attachment type is video and neither image and asset urls nor title_link are available 1`] = ` +
+
+
+
+ this content could not be displayed +
+
+
+
+`; + +exports[`Card theme V2 (6) should render unable-to-display card if attachment type is image and neither image and asset urls nor title_link are available 1`] = ` +
+
+
+
+ this content could not be displayed +
+
+
+
+`; + +exports[`Card theme V2 (7) should render audio with caption using og_scrape_url and with asset in header if attachment type is audio and title_link is not available 1`] = ` +
+
+
+ dummyAttachment_title +
+ + dummyAttachment_author_name + +
+
+
+
+ +
+
+ +
+
+
+
+
+
+
+
+ dummyAttachment_title +
+
+ dummyAttachment_text +
+
+
+
+
+
+`; + +exports[`Card theme V2 (8) should render video with caption using og_scrape_url and with asset in header if attachment type is video and title_link is not available 1`] = ` +
+
+
+
+
+
+ + dummyAttachment_author_name + +
+
+
+
+
+ dummyAttachment_title +
+
+ dummyAttachment_text +
+
+
+
+
+`; + +exports[`Card theme V2 (9) should render image with caption using og_scrape_url and with asset in header if attachment type is image and title_link is not available 1`] = ` +
+
+
+ dummyAttachment_title +
+ + dummyAttachment_author_name + +
+
+
+
+
+ dummyAttachment_title +
+
+ dummyAttachment_text +
+
+
+
+
+`; + +exports[`Card theme V2 (10) should render audio without title if attachment type is audio and title is not available 1`] = ` +
+
+
+ dummyAttachment_thumb_url +
+ + dummyAttachment_author_name + +
+
+
+
+ +
+
+ +
+
+
+
+
+
+
+
+ dummyAttachment_text +
+
+
+
+
+
+`; + +exports[`Card theme V2 (11) should render video without title if attachment type is video and title is not available 1`] = ` +
+
+
+
+
+
+ + dummyAttachment_author_name + +
+
+
+
+
+ dummyAttachment_text +
+
+
+
+
+`; + +exports[`Card theme V2 (12) should render image without title if attachment type is image and title is not available 1`] = ` +
+
+
+ dummyAttachment_thumb_url +
+ + dummyAttachment_author_name + +
+
+
+
+
+ dummyAttachment_text +
+
+
+
+
+`; + +exports[`Card theme V2 (13) should render audio without title and with caption using og_scrape_url and with image in header if attachment type is audio and title_link neither title is available 1`] = ` +
+
+
+ dummyAttachment_thumb_url +
+ + dummyAttachment_author_name + +
+
+
+
+ +
+
+ +
+
+
+
+
+
+
+
+ dummyAttachment_text +
+
+
+
+
+
+`; + +exports[`Card theme V2 (14) should render video without title and with caption using og_scrape_url and with image in header if attachment type is video and title_link neither title is available 1`] = ` +
+
+
+
+
+
+ + dummyAttachment_author_name + +
+
+
+
+
+ dummyAttachment_text +
+
+
+
+
+`; + +exports[`Card theme V2 (15) should render image without title and with caption using og_scrape_url and with image in header if attachment type is image and title_link neither title is available 1`] = ` +
+
+
+ dummyAttachment_thumb_url +
+ + dummyAttachment_author_name + +
+
+
+
+
+ dummyAttachment_text +
+
+
+
+
+`; + +exports[`Card theme V2 (16) should render audio widget with title & text in Card content and without Card header if attachment type is audio and og image URLs are not available 1`] = ` +
+
+
+
+ +
+
+ +
+
+
+
+
+
+
+
+ dummyAttachment_title +
+
+ dummyAttachment_text +
+
+
+
+
+
+`; + +exports[`Card theme V2 (17) should render video widget in header and title & text in Card content if attachment type is video and og image URLs are not available 1`] = ` +
+
+
+
+
+
+ + dummyAttachment_author_name + +
+
+
+
+
+ dummyAttachment_title +
+
+ dummyAttachment_text +
+
+
+
+
+`; + +exports[`Card theme V2 (18) should render card with title and text only and without the image in the header part of the Card if attachment type is image and og image URLs are not available 1`] = ` +
+
+
+
+
+ dummyAttachment_title +
+
+ dummyAttachment_text +
+
+
+
+
+`; + +exports[`Card theme V2 (19) should render image loaded from thumb_url not audio widget if attachment type is audio and thumb_url is available, but not asset_url, image_url 1`] = ` +
+
+
+ dummyAttachment_title +
+ + dummyAttachment_author_name + +
+
+
+
+
+
+ dummyAttachment_title +
+
+ dummyAttachment_text +
+
+
+
+
+
+`; + +exports[`Card theme V2 (20) should render image loaded from thumb_url not video widget if attachment type is video and thumb_url is available, but not asset_url, image_url 1`] = ` +
+
+
+ dummyAttachment_title +
+ + dummyAttachment_author_name + +
+
+
+
+
+ dummyAttachment_title +
+
+ dummyAttachment_text +
+
+
+
+
+`; + +exports[`Card theme V2 (21) should render image loaded from thumb_url if attachment type is image and thumb_url is available, but not image_url 1`] = ` +
+
+
+ dummyAttachment_title +
+ + dummyAttachment_author_name + +
+
+
+
+
+ dummyAttachment_title +
+
+ dummyAttachment_text +
+
+
+
+
+`; + +exports[`Card theme V2 (22) should render image loaded from image_url not audio widget if attachment type is audio and image_url is available, but not asset_url, thumb_url 1`] = ` +
+
+
+ dummyAttachment_title +
+ + dummyAttachment_author_name + +
+
+
+
+
+
+ dummyAttachment_title +
+
+ dummyAttachment_text +
+
+
+
+
+
+`; + +exports[`Card theme V2 (23) should render image loaded from image_url not video widget if attachment type is video and image_url is available, but not asset_url, thumb_url 1`] = ` +
+
+
+ dummyAttachment_title +
+ + dummyAttachment_author_name + +
+
+
+
+
+ dummyAttachment_title +
+
+ dummyAttachment_text +
+
+
+
+
+`; + +exports[`Card theme V2 (24) should render image loaded from image_url if attachment type is image and image_url is available, but not thumb_url 1`] = ` +
+
+
+ dummyAttachment_title +
+ + dummyAttachment_author_name + +
+
+
+
+
+ dummyAttachment_title +
+
+ dummyAttachment_text +
+
+
+
+
+`; + +exports[`Card theme V2 (25) should render audio widget with image loaded from thumb_url and title & text in Card content if attachment type is audio and all props are available 1`] = ` +
+
+
+ dummyAttachment_title +
+ + dummyAttachment_author_name + +
+
+
+
+ +
+
+ +
+
+
+
+
+
+
+
+ dummyAttachment_title +
+
+ dummyAttachment_text +
+
+
+
+
+
+`; + +exports[`Card theme V2 (26) should render video widget in header and title & text in Card content if attachment type is video and all props are available 1`] = ` +
+
+
+
+
+
+ + dummyAttachment_author_name + +
+
+
+
+
+ dummyAttachment_title +
+
+ dummyAttachment_text +
+
+
+
+
+`; + +exports[`Card theme V2 (27) should render content part with title and text only and without the header part of the Card if attachment type is audio and asset and neither og image URL is available 1`] = ` +
+
+
+
+
+
+ dummyAttachment_title +
+
+ dummyAttachment_text +
+
+
+
+
+
+`; + +exports[`Card theme V2 (28) should render content part with title and text only and without the header part of the Card if attachment type is video and scraped media URL is not available 1`] = ` +
+
+
+
+
+ dummyAttachment_title +
+
+ dummyAttachment_text +
+
+
+
+
+`; + +exports[`Card theme V2 should render giphy image if type is giphy 1`] = ` +
+
+
+
+ this content could not be displayed +
+
+
+
+`; From ebd4bd7758ae0afaf3547e281377f46b3b5dc6ab Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Fri, 8 Jul 2022 17:14:31 +0200 Subject: [PATCH 33/52] feat: adjust MessageSimple for theming v2 --- src/components/Message/MessageSimple.tsx | 127 +++++++++++------- .../Message/__tests__/MessageSimple.test.js | 2 +- .../Message/__tests__/MessageText.test.js | 92 ++++++------- 3 files changed, 117 insertions(+), 104 deletions(-) diff --git a/src/components/Message/MessageSimple.tsx b/src/components/Message/MessageSimple.tsx index 4ff24f2a06..29dce7df58 100644 --- a/src/components/Message/MessageSimple.tsx +++ b/src/components/Message/MessageSimple.tsx @@ -1,5 +1,7 @@ import React from 'react'; +import clsx from 'clsx'; +import { MessageErrorIcon } from './icons'; import { MessageDeleted as DefaultMessageDeleted } from './MessageDeleted'; import { MessageOptions as DefaultMessageOptions } from './MessageOptions'; import { MessageRepliesCountButton as DefaultMessageRepliesCountButton } from './MessageRepliesCountButton'; @@ -18,6 +20,7 @@ import { ReactionSelector as DefaultReactionSelector, } from '../Reactions'; +import { useChatContext } from '../../context/ChatContext'; import { useComponentContext } from '../../context/ComponentContext'; import { MessageContextValue, useMessageContext } from '../../context/MessageContext'; @@ -45,7 +48,6 @@ const MessageSimpleWithContext = < handleOpenThread, handleRetry, highlighted, - initialMessage, isMyMessage, isReactionEnabled, message, @@ -68,14 +70,11 @@ const MessageSimpleWithContext = < ReactionSelector = DefaultReactionSelector, ReactionsList = DefaultReactionList, } = useComponentContext('MessageSimple'); + const { themeVersion } = useChatContext('MessageSimple'); const hasAttachment = messageHasAttachments(message); const hasReactions = messageHasReactions(message); - const messageClasses = isMyMessage() - ? 'str-chat__message str-chat__message--me str-chat__message-simple str-chat__message-simple--me' - : 'str-chat__message str-chat__message-simple'; - if (message.customType === CUSTOM_MESSAGE_TYPE.date) { return null; } @@ -84,6 +83,30 @@ const MessageSimpleWithContext = < return ; } + const showMetadata = !groupedByUser || endOfGroup; + const showReplyCountButton = !threadList && !!message.reply_count; + + const rootClassName = clsx( + isMyMessage() + ? 'str-chat__message str-chat__message-simple str-chat__message--me str-chat__message-simple--me' + : 'str-chat__message str-chat__message-simple str-chat__message--other', + `str-chat__message--${message.type}`, + `str-chat__message--${message.status}`, + message.text ? 'str-chat__message--has-text' : 'has-no-text', + hasAttachment && 'str-chat__message--has-attachment', + hasReactions && + isReactionEnabled && + 'str-chat__message--with-reactions str-chat__message-with-thread-link', + highlighted && 'str-chat__message--highlighted', + message.pinned && 'pinned-message', + groupedByUser && 'str-chat__virtual-message__wrapper--group', + firstOfGroup && 'str-chat__virtual-message__wrapper--first', + endOfGroup && 'str-chat__virtual-message__wrapper--end', + message?.status === 'failed' && + message?.errorStatusCode !== 403 && + 'str-chat__message-send-can-be-retried', + ); + return ( <> {editing && ( @@ -97,24 +120,8 @@ const MessageSimpleWithContext = < )} { -
- +
+ {themeVersion === '1' && } {message.user && ( handleRetry(message) : undefined } - onKeyPress={ + onKeyUp={ message.status === 'failed' && message.errorStatusCode !== 403 ? () => handleRetry(message) : undefined } > - <> - - {hasReactions && !showDetailedReactions && isReactionEnabled && ( - - )} - {showDetailedReactions && isReactionEnabled && ( - + +
+ <> + {hasReactions && !showDetailedReactions && isReactionEnabled && ( + + )} + {showDetailedReactions && isReactionEnabled && ( + + )} + + {message.attachments?.length && !message.quoted_message ? ( + + ) : null} + + {message.mml && ( + )} - - {message.attachments?.length && !message.quoted_message ? ( - - ) : null} - - {message.mml && ( - } +
+ {showReplyCountButton && themeVersion === '1' && ( + )} - {!threadList && !!message.reply_count && ( -
- -
- )} - {(!groupedByUser || endOfGroup) && ( + {showMetadata && themeVersion === '1' && (
{!isMyMessage() && message.user ? ( @@ -177,6 +185,25 @@ const MessageSimpleWithContext = <
)}
+ {showReplyCountButton && themeVersion === '2' && ( + + )} + {showMetadata && themeVersion === '2' && ( +
+ + {!isMyMessage() && !!message.user && ( + + {message.user.name || message.user.id} + + )} + +
+ )}
} diff --git a/src/components/Message/__tests__/MessageSimple.test.js b/src/components/Message/__tests__/MessageSimple.test.js index 7c0eca9368..695465716f 100644 --- a/src/components/Message/__tests__/MessageSimple.test.js +++ b/src/components/Message/__tests__/MessageSimple.test.js @@ -67,7 +67,7 @@ async function renderMessageSimple( const client = await getTestClientWithUser(alice); return render( - + diff --git a/src/components/Message/__tests__/MessageText.test.js b/src/components/Message/__tests__/MessageText.test.js index b069301013..5035251cab 100644 --- a/src/components/Message/__tests__/MessageText.test.js +++ b/src/components/Message/__tests__/MessageText.test.js @@ -103,25 +103,17 @@ const reactionSelectorTestId = 'reaction-selector'; describe('', () => { beforeEach(jest.clearAllMocks); it('should not render anything if message is not set', async () => { - const consoleWarnSpy = jest.spyOn(console, 'warn').mockImplementationOnce(() => null); const { container, queryByTestId } = await renderMessageText({ message: {} }); expect(queryByTestId(messageTextTestId)).not.toBeInTheDocument(); const results = await axe(container); expect(results).toHaveNoViolations(); - expect(consoleWarnSpy).toHaveBeenCalledWith( - 'MessageTimestamp was called without a message, or message has invalid created_at date.', - ); }); it('should not render anything if message text is not set', async () => { - const consoleWarnSpy = jest.spyOn(console, 'warn').mockImplementationOnce(() => null); const { container, queryByTestId } = await renderMessageText({ message: {} }); expect(queryByTestId(messageTextTestId)).not.toBeInTheDocument(); const results = await axe(container); expect(results).toHaveNoViolations(); - expect(consoleWarnSpy).toHaveBeenCalledWith( - 'MessageTimestamp was called without a message, or message has invalid created_at date.', - ); }); it('should set attachments css class modifier when message has text and is focused', async () => { @@ -295,10 +287,7 @@ describe('', () => { const tree = await renderMessageText({ customWrapperClass, message }, {}, testRenderer.create); expect(tree.toJSON()).toMatchInlineSnapshot(`
', () => { >
-

- hello world -

+
+

+ hello world +

+
-
`); @@ -337,10 +327,7 @@ describe('', () => { const tree = await renderMessageText({ customInnerClass, message }, {}, testRenderer.create); expect(tree.toJSON()).toMatchInlineSnapshot(`
', () => { >
-

- hi mate -

+
+

+ hi mate +

+
-
`); @@ -378,10 +366,7 @@ describe('', () => { const tree = await renderMessageText({ message, theme: 'custom' }, {}, testRenderer.create); expect(tree.toJSON()).toMatchInlineSnapshot(`
', () => { >
-

- whatup?! -

+
+

+ whatup?! +

+
-
`); From 14faa01e8e9b3699328856353161f70454b6bf0d Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Fri, 8 Jul 2022 17:15:12 +0200 Subject: [PATCH 34/52] test: update Avatar snapshots --- src/components/Avatar/__tests__/Avatar.test.js | 4 ++-- .../__snapshots__/ChannelPreviewMessenger.test.js.snap | 2 +- src/components/UserItem/__tests__/UserItem.test.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/Avatar/__tests__/Avatar.test.js b/src/components/Avatar/__tests__/Avatar.test.js index 1fdfe7893f..929498188f 100644 --- a/src/components/Avatar/__tests__/Avatar.test.js +++ b/src/components/Avatar/__tests__/Avatar.test.js @@ -12,7 +12,7 @@ describe('Avatar', () => { const tree = renderer.create().toJSON(); expect(tree).toMatchInlineSnapshot(`
{ const tree = renderer.create().toJSON(); expect(tree).toMatchInlineSnapshot(`
{ className="str-chat__user-item" >
Date: Sun, 10 Jul 2022 20:13:29 +0200 Subject: [PATCH 35/52] refactor: use FileIcon instead of FileIconV2 in FileAttachment --- src/components/Attachment/FileAttachment.tsx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/components/Attachment/FileAttachment.tsx b/src/components/Attachment/FileAttachment.tsx index 1d194d84ca..e263c2c234 100644 --- a/src/components/Attachment/FileAttachment.tsx +++ b/src/components/Attachment/FileAttachment.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { FileIcon, FileIconV2 } from 'react-file-utils'; +import { FileIcon } from 'react-file-utils'; import type { Attachment } from 'stream-chat'; import { DownloadButton } from './DownloadButton'; @@ -22,7 +22,7 @@ const UnMemoizedFileAttachmentV1 = < attachment, }: FileAttachmentProps) => (
- +
{attachment.title} @@ -38,7 +38,7 @@ const UnMemoizedFileAttachmentV2 = < attachment, }: FileAttachmentProps) => (
- +
@@ -58,9 +58,11 @@ const UnMemoizedFileAttachment = < }: FileAttachmentProps) => { const { themeVersion } = useChatContext('FileAttachment'); - if (themeVersion === '2') return ; - - return ; + return themeVersion === '2' ? ( + + ) : ( + + ); }; export const FileAttachment = React.memo( From 4d150b108ef8bc406800ad7bd7edc1c4f8afcc66 Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Sun, 10 Jul 2022 20:15:10 +0200 Subject: [PATCH 36/52] feat: use FileIcon with version in UploadsPreview --- src/components/MessageInput/UploadsPreview.tsx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/components/MessageInput/UploadsPreview.tsx b/src/components/MessageInput/UploadsPreview.tsx index 05ecfbd0e2..5dbc00669a 100644 --- a/src/components/MessageInput/UploadsPreview.tsx +++ b/src/components/MessageInput/UploadsPreview.tsx @@ -5,10 +5,12 @@ import { useChannelStateContext } from '../../context/ChannelStateContext'; import { useMessageInputContext } from '../../context/MessageInputContext'; import type { DefaultStreamChatGenerics } from '../../types/types'; +import { useChatContext } from '../../context'; export const UploadsPreview = < StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics >() => { + const { themeVersion } = useChatContext('UploadsPreview'); const { maxNumberOfFiles, multipleUploads } = useChannelStateContext( 'UploadsPreview', ); @@ -48,6 +50,10 @@ export const UploadsPreview = < )} {fileOrder.length > 0 && ( Date: Mon, 11 Jul 2022 10:23:18 +0200 Subject: [PATCH 37/52] feat: remove deprecated components: MessageCommerce, MessageLivestream, MessageTeam --- src/components/Message/MessageCommerce.tsx | 167 --------- src/components/Message/MessageLivestream.tsx | 369 ------------------- src/components/Message/MessageTeam.tsx | 315 ---------------- src/components/Message/index.ts | 3 - 4 files changed, 854 deletions(-) delete mode 100644 src/components/Message/MessageCommerce.tsx delete mode 100644 src/components/Message/MessageLivestream.tsx delete mode 100644 src/components/Message/MessageTeam.tsx diff --git a/src/components/Message/MessageCommerce.tsx b/src/components/Message/MessageCommerce.tsx deleted file mode 100644 index 35f2eba215..0000000000 --- a/src/components/Message/MessageCommerce.tsx +++ /dev/null @@ -1,167 +0,0 @@ -import React from 'react'; - -import { MessageDeleted as DefaultMessageDeleted } from './MessageDeleted'; -import { MessageOptions as DefaultMessageOptions } from './MessageOptions'; -import { MessageRepliesCountButton as DefaultMessageRepliesCountButton } from './MessageRepliesCountButton'; -import { MessageText } from './MessageText'; -import { MessageTimestamp as DefaultMessageTimestamp } from './MessageTimestamp'; -import { areMessageUIPropsEqual, messageHasAttachments, messageHasReactions } from './utils'; - -import { Avatar as DefaultAvatar } from '../Avatar'; -import { CUSTOM_MESSAGE_TYPE } from '../../constants/messageTypes'; -import { MML } from '../MML'; -import { - ReactionSelector as DefaultReactionSelector, - ReactionsList as DefaultReactionsList, -} from '../Reactions'; - -import { useComponentContext } from '../../context/ComponentContext'; -import { MessageContextValue, useMessageContext } from '../../context/MessageContext'; - -import type { MessageUIComponentProps, ReactEventHandler } from './types'; - -import type { DefaultStreamChatGenerics } from '../../types/types'; - -type MessageCommerceWithContextProps< - StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics -> = MessageContextValue & { - isReactionEnabled: boolean; - onReactionListClick: ReactEventHandler; - reactionSelectorRef: React.MutableRefObject; - showDetailedReactions: boolean; -}; - -const MessageCommerceWithContext = < - StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics ->( - props: MessageCommerceWithContextProps, -) => { - const { - groupStyles, - handleAction, - handleOpenThread, - isMyMessage, - isReactionEnabled, - message, - onUserClick, - onUserHover, - reactionSelectorRef, - showDetailedReactions, - threadList, - } = props; - - const { - Attachment, - Avatar = DefaultAvatar, - MessageDeleted = DefaultMessageDeleted, - MessageRepliesCountButton = DefaultMessageRepliesCountButton, - MessageOptions = DefaultMessageOptions, - MessageTimestamp = DefaultMessageTimestamp, - ReactionSelector = DefaultReactionSelector, - ReactionsList = DefaultReactionsList, - } = useComponentContext('MessageCommerce'); - - const hasAttachment = messageHasAttachments(message); - const hasReactions = messageHasReactions(message); - - const firstGroupStyle = groupStyles ? groupStyles[0] : 'single'; - - const messageClasses = `str-chat__message-commerce str-chat__message-commerce--${ - isMyMessage() ? 'right' : 'left' - }`; - - if (message.deleted_at) { - return ; - } - - if (message.customType === CUSTOM_MESSAGE_TYPE.date) { - return null; - } - - return ( -
- {(firstGroupStyle === 'bottom' || firstGroupStyle === 'single') && ( - - )} -
- <> - {} - {hasReactions && !showDetailedReactions && isReactionEnabled && } - {showDetailedReactions && isReactionEnabled && ( - - )} - - {message.attachments?.length ? ( - - ) : null} - {message.mml && ( - - )} - {message.text && ( - - )} - {!threadList && ( -
- -
- )} -
- {!isMyMessage() ? ( - - {message.user?.name || message.user?.id} - - ) : null} - -
-
-
- ); -}; - -const MemoizedMessageCommerce = React.memo( - MessageCommerceWithContext, - areMessageUIPropsEqual, -) as typeof MessageCommerceWithContext; - -/** - * @deprecated - This UI component will be removed in the next major release. - * - * UI component that renders a message and receives functionality from the Message/MessageList components - */ -export const MessageCommerce = < - StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics ->( - props: MessageUIComponentProps, -) => { - const messageContext = useMessageContext('MessageCommerce'); - - return ; -}; diff --git a/src/components/Message/MessageLivestream.tsx b/src/components/Message/MessageLivestream.tsx deleted file mode 100644 index c30a9f2330..0000000000 --- a/src/components/Message/MessageLivestream.tsx +++ /dev/null @@ -1,369 +0,0 @@ -import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'; - -import { MessageDeleted as DefaultMessageDeleted } from './MessageDeleted'; -import { MessageRepliesCountButton as DefaultMessageRepliesCountButton } from './MessageRepliesCountButton'; -import { MessageTimestamp as DefaultTimestamp } from './MessageTimestamp'; -import { useReactionClick } from './hooks'; -import { PinIndicator as DefaultPinIndicator, ErrorIcon, ReactionIcon, ThreadIcon } from './icons'; -import { QuotedMessage as DefaultQuotedMessage } from './QuotedMessage'; -import { areMessageUIPropsEqual, MESSAGE_ACTIONS, showMessageActionsBox } from './utils'; - -import { Avatar as DefaultAvatar } from '../Avatar'; -import { CUSTOM_MESSAGE_TYPE } from '../../constants/messageTypes'; -import { MessageActions } from '../MessageActions'; -import { EditMessageForm as DefaultEditMessageForm, MessageInput } from '../MessageInput'; -import { - ReactionSelector as DefaultReactionSelector, - SimpleReactionsList as DefaultReactionsList, -} from '../Reactions'; - -import { useComponentContext } from '../../context/ComponentContext'; -import { MessageContextValue, useMessageContext } from '../../context/MessageContext'; -import { useTranslationContext } from '../../context/TranslationContext'; -import { renderText as defaultRenderText, isOnlyEmojis } from '../../utils'; - -import type { TranslationLanguages } from 'stream-chat'; - -import type { MessageUIComponentProps, ReactEventHandler } from './types'; - -import type { DefaultStreamChatGenerics } from '../../types/types'; - -type MessageLivestreamWithContextProps< - StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics -> = MessageContextValue & { - isReactionEnabled: boolean; - messageWrapperRef: React.MutableRefObject; - onReactionListClick: ReactEventHandler; - reactionSelectorRef: React.MutableRefObject; - showDetailedReactions: boolean; -}; - -const MessageLivestreamWithContext = < - StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics ->( - props: MessageLivestreamWithContextProps, -) => { - const { - clearEditingState, - editing, - groupStyles, - handleAction, - handleOpenThread, - handleRetry, - initialMessage, - isReactionEnabled, - message, - messageWrapperRef, - onMentionsClickMessage, - onMentionsHoverMessage, - onReactionListClick, - onUserClick, - onUserHover, - reactionSelectorRef, - renderText = defaultRenderText, - showDetailedReactions, - unsafeHTML, - } = props; - - const { - Attachment, - Avatar = DefaultAvatar, - EditMessageInput = DefaultEditMessageForm, - MessageDeleted = DefaultMessageDeleted, - MessageRepliesCountButton = DefaultMessageRepliesCountButton, - PinIndicator = DefaultPinIndicator, - QuotedMessage = DefaultQuotedMessage, - ReactionsList = DefaultReactionsList, - ReactionSelector = DefaultReactionSelector, - } = useComponentContext('MessageLivestream'); - const { t, userLanguage } = useTranslationContext('MessageLivestream'); - - const messageTextToRender = - message.i18n?.[`${userLanguage}_text` as `${TranslationLanguages}_text`] || message.text; - - const messageText = useMemo(() => renderText(messageTextToRender, message.mentioned_users), [ - message.mentioned_users, - messageTextToRender, - ]); - - const firstGroupStyle = groupStyles ? groupStyles[0] : 'single'; - - if (message.customType === CUSTOM_MESSAGE_TYPE.date) { - return null; - } - - if (message.deleted_at) { - return ; - } - - if (editing) { - return ( -
- {(firstGroupStyle === 'top' || firstGroupStyle === 'single') && ( -
- -
- )} - -
- ); - } - - return ( - <> - {message.pinned && ( -
- -
- )} -
- {showDetailedReactions && isReactionEnabled && ( - - )} - -
- -
-
-
-
- {message.user?.name || message.user?.id} - {message.type === 'error' && ( -
- {t('Only visible to you')} -
- )} -
-
- {message.quoted_message && ( -
- -
- )} - {message.type !== 'error' && - message.status !== 'failed' && - !unsafeHTML && - messageText} - {message.type !== 'error' && - message.status !== 'failed' && - unsafeHTML && - !!message.html &&
} - {message.type === 'error' && !message.command && ( -

- - {message.text} -

- )} - {message.type === 'error' && message.command && ( -

- - {/* TODO: Translate following sentence */} - /{message.command} is not a valid command -

- )} - {message.status === 'failed' && ( -

handleRetry(message) : undefined} - > - - {message.errorStatusCode !== 403 - ? t('Message Failed · Click to try again') - : t('Message Failed · Unauthorized')} -

- )} -
- {message.attachments?.length ? ( - - ) : null} - {isReactionEnabled && } - {!initialMessage && ( - - )} -
-
-
- - ); -}; - -export type MessageLivestreamActionsProps = { - messageWrapperRef: React.RefObject; - onReactionListClick: ReactEventHandler; -}; - -const MessageLivestreamActions = < - StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics ->( - props: MessageLivestreamActionsProps, -) => { - const { messageWrapperRef, onReactionListClick } = props; - - const { MessageTimestamp = DefaultTimestamp } = useComponentContext( - 'MessageLivestream', - ); - - const { - getMessageActions, - handleOpenThread, - initialMessage, - message, - threadList, - } = useMessageContext('MessageLivestream'); - - const [actionsBoxOpen, setActionsBoxOpen] = useState(false); - - const hideOptions = useCallback(() => setActionsBoxOpen(false), []); - const messageDeletedAt = !!message.deleted_at; - const messageWrapper = messageWrapperRef?.current; - - const messageActions = getMessageActions(); - const showActionsBox = showMessageActionsBox(messageActions); - - const shouldShowReactions = messageActions.indexOf(MESSAGE_ACTIONS.react) > -1; - const shouldShowReplies = messageActions.indexOf(MESSAGE_ACTIONS.reply) > -1 && !threadList; - - useEffect(() => { - if (messageWrapper) { - messageWrapper.addEventListener('mouseleave', hideOptions); - } - - return () => { - if (messageWrapper) { - messageWrapper.removeEventListener('mouseleave', hideOptions); - } - }; - }, [messageWrapper, hideOptions]); - - useEffect(() => { - if (messageDeletedAt) { - document.removeEventListener('click', hideOptions); - } - }, [messageDeletedAt, hideOptions]); - - useEffect(() => { - if (actionsBoxOpen) { - document.addEventListener('click', hideOptions); - } else { - document.removeEventListener('click', hideOptions); - } - return () => { - document.removeEventListener('click', hideOptions); - }; - }, [actionsBoxOpen, hideOptions]); - - if ( - initialMessage || - !message || - message.type === 'error' || - message.type === 'system' || - message.type === 'ephemeral' || - message.status === 'failed' || - message.status === 'sending' - ) { - return null; - } - - return ( -
- - {shouldShowReactions && ( - - - - - - )} - {shouldShowReplies && ( - - - - )} - {showActionsBox && } -
- ); -}; - -const MemoizedMessageLivestream = React.memo( - MessageLivestreamWithContext, - areMessageUIPropsEqual, -) as typeof MessageLivestreamWithContext; - -/** - * @deprecated - This UI component will be removed in the next major release. - * - * Handles the rendering of a message and depends on the Message component for all the logic. - * Implements the look and feel for a livestream use case. - */ -export const MessageLivestream = < - StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics ->( - props: MessageUIComponentProps, -) => { - const messageContext = useMessageContext('MessageLivestream'); - - const messageWrapperRef = useRef(null); - const reactionSelectorRef = useRef(null); - - const message = props.message || messageContext.message; - - const { isReactionEnabled, onReactionListClick, showDetailedReactions } = useReactionClick( - message, - reactionSelectorRef, - messageWrapperRef, - ); - - return ( - - ); -}; diff --git a/src/components/Message/MessageTeam.tsx b/src/components/Message/MessageTeam.tsx deleted file mode 100644 index 2972f3d3e2..0000000000 --- a/src/components/Message/MessageTeam.tsx +++ /dev/null @@ -1,315 +0,0 @@ -import React, { useMemo, useRef } from 'react'; - -import { MessageDeleted as DefaultMessageDeleted } from './MessageDeleted'; -import { MessageRepliesCountButton as DefaultMessageRepliesCountButton } from './MessageRepliesCountButton'; -import { MessageStatus } from './MessageStatus'; -import { MessageTimestamp as DefaultTimestamp } from './MessageTimestamp'; -import { useReactionClick } from './hooks'; -import { PinIndicator as DefaultPinIndicator, ErrorIcon, ReactionIcon, ThreadIcon } from './icons'; -import { QuotedMessage as DefaultQuotedMessage } from './QuotedMessage'; -import { areMessageUIPropsEqual, MESSAGE_ACTIONS, showMessageActionsBox } from './utils'; - -import { Avatar as DefaultAvatar } from '../Avatar'; -import { MessageActions } from '../MessageActions'; -import { EditMessageForm as DefaultEditMessageForm, MessageInput } from '../MessageInput'; -import { MML } from '../MML'; -import { - ReactionSelector as DefaultReactionSelector, - SimpleReactionsList as DefaultReactionsList, -} from '../Reactions'; - -import { useComponentContext } from '../../context/ComponentContext'; -import { MessageContextValue, useMessageContext } from '../../context/MessageContext'; -import { useTranslationContext } from '../../context/TranslationContext'; -import { renderText as defaultRenderText, isOnlyEmojis } from '../../utils'; - -import type { TranslationLanguages } from 'stream-chat'; - -import type { MessageUIComponentProps, ReactEventHandler } from './types'; - -import type { DefaultStreamChatGenerics } from '../../types/types'; - -type MessageTeamWithContextProps< - StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics -> = MessageContextValue & { - isReactionEnabled: boolean; - messageWrapperRef: React.MutableRefObject; - onReactionListClick: ReactEventHandler; - reactionSelectorRef: React.MutableRefObject; - showDetailedReactions: boolean; -}; - -const MessageTeamWithContext = < - StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics ->( - props: MessageTeamWithContextProps, -) => { - const { - clearEditingState, - editing, - getMessageActions, - groupStyles, - handleAction, - handleOpenThread, - handleRetry, - initialMessage, - isReactionEnabled, - message, - messageWrapperRef, - onMentionsClickMessage, - onMentionsHoverMessage, - onReactionListClick, - onUserClick, - onUserHover, - reactionSelectorRef, - renderText = defaultRenderText, - showDetailedReactions, - threadList, - unsafeHTML, - } = props; - - const { - Attachment, - Avatar = DefaultAvatar, - EditMessageInput = DefaultEditMessageForm, - MessageDeleted = DefaultMessageDeleted, - MessageRepliesCountButton = DefaultMessageRepliesCountButton, - MessageTimestamp = DefaultTimestamp, - PinIndicator = DefaultPinIndicator, - QuotedMessage = DefaultQuotedMessage, - ReactionsList = DefaultReactionsList, - ReactionSelector = DefaultReactionSelector, - } = useComponentContext('MessageTeam'); - - const { t, userLanguage } = useTranslationContext('MessageTeam'); - - const messageActions = getMessageActions(); - const showActionsBox = showMessageActionsBox(messageActions); - - const shouldShowReplies = messageActions.indexOf(MESSAGE_ACTIONS.reply) > -1 && !threadList; - - const messageTextToRender = - message.i18n?.[`${userLanguage}_text` as `${TranslationLanguages}_text`] || message.text; - - const messageMentionedUsersItem = message.mentioned_users; - - const messageText = useMemo(() => renderText(messageTextToRender, messageMentionedUsersItem), [ - messageMentionedUsersItem, - messageTextToRender, - ]); - - const firstGroupStyle = groupStyles ? groupStyles[0] : 'single'; - - if (message.deleted_at) { - return ; - } - - if (editing) { - return ( -
- {(firstGroupStyle === 'top' || firstGroupStyle === 'single') && ( -
- -
- )} - -
- ); - } - - return ( - <> - {message.pinned && ( -
- -
- )} -
-
- {firstGroupStyle === 'top' || firstGroupStyle === 'single' || initialMessage ? ( - - ) : ( -
- )} - -
-
- {(firstGroupStyle === 'top' || firstGroupStyle === 'single' || initialMessage) && ( -
- {message.user?.name || message.user?.id} - {message.type === 'error' && ( -
- {t('Only visible to you')} -
- )} -
- )} -
- {message.quoted_message && } - {!initialMessage && - message.status !== 'sending' && - message.status !== 'failed' && - message.type !== 'system' && - message.type !== 'ephemeral' && - message.type !== 'error' && ( -
- {showDetailedReactions && } - {isReactionEnabled && ( - - - - )} - {shouldShowReplies && ( - - - - )} - {showActionsBox && ( - - )} -
- )} - { - - {unsafeHTML && message.html ? ( -
- ) : ( - messageText - )} - - } - {message.mml && } - {!message.text && message.attachments?.length ? ( - - ) : null} - {message.latest_reactions?.length !== 0 && message.text !== '' && isReactionEnabled && ( - - )} - {message.status === 'failed' && ( - - )} -
- - {message.text && message.attachments?.length ? ( - - ) : null} - {message.latest_reactions && - message.latest_reactions.length !== 0 && - message.text === '' && - isReactionEnabled && } - {!threadList && ( - - )} -
-
- - ); -}; - -const MemoizedMessageTeam = React.memo( - MessageTeamWithContext, - areMessageUIPropsEqual, -) as typeof MessageTeamWithContext; - -/** - * @deprecated - This UI component will be removed in the next major release. - * - * Handles the rendering of a Message and depends on the Message component for all the logic. - * Implements the look and feel for a team style collaboration environment. - */ -export const MessageTeam = < - StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics ->( - props: MessageUIComponentProps, -) => { - const messageContext = useMessageContext('MessageTeam'); - - const reactionSelectorRef = useRef(null); - const messageWrapperRef = useRef(null); - - const message = props.message || messageContext.message; - - const { isReactionEnabled, onReactionListClick, showDetailedReactions } = useReactionClick( - message, - reactionSelectorRef, - messageWrapperRef, - ); - - return ( - - ); -}; diff --git a/src/components/Message/index.ts b/src/components/Message/index.ts index ff132031f6..702ff99d14 100644 --- a/src/components/Message/index.ts +++ b/src/components/Message/index.ts @@ -2,14 +2,11 @@ export * from './FixedHeightMessage'; export * from './hooks'; export * from './icons'; export * from './Message'; -export * from './MessageCommerce'; export * from './MessageDeleted'; -export * from './MessageLivestream'; export * from './MessageOptions'; export * from './MessageRepliesCountButton'; export * from './MessageSimple'; export * from './MessageStatus'; -export * from './MessageTeam'; export * from './MessageText'; export * from './MessageTimestamp'; export * from './types'; From e524d0a986c0f417d3a0c1106d1134856b32d5eb Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Mon, 11 Jul 2022 15:36:54 +0200 Subject: [PATCH 38/52] feat: remove translations for deprecated components: MessageCommerce, MessageLivestream, MessageTeam --- src/i18n/de.json | 1 - src/i18n/en.json | 1 - src/i18n/es.json | 1 - src/i18n/fr.json | 1 - src/i18n/hi.json | 1 - src/i18n/it.json | 1 - src/i18n/ja.json | 1 - src/i18n/ko.json | 1 - src/i18n/nl.json | 1 - src/i18n/pt.json | 1 - src/i18n/ru.json | 1 - src/i18n/tr.json | 1 - 12 files changed, 12 deletions(-) diff --git a/src/i18n/de.json b/src/i18n/de.json index 1866eba785..05fbd4b50e 100644 --- a/src/i18n/de.json +++ b/src/i18n/de.json @@ -37,7 +37,6 @@ "No chats here yet…": "Noch keine Chats hier...", "No results found": "keine Ergebnisse gefunden", "Nothing yet...": "Noch nichts...", - "Only visible to you": "Nur für Sie sichtbar", "Open emoji picker": "Emoji-Picker öffnen", "People matching": "Passende Personen", "Pick your emoji": "Emoji wählen", diff --git a/src/i18n/en.json b/src/i18n/en.json index ac3ae2fa9e..2ed4e7c964 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -37,7 +37,6 @@ "No chats here yet…": "No chats here yet…", "No results found": "No results found", "Nothing yet...": "Nothing yet...", - "Only visible to you": "Only visible to you", "Open emoji picker": "Open emoji picker", "People matching": "People matching", "Pick your emoji": "Pick your emoji", diff --git a/src/i18n/es.json b/src/i18n/es.json index 86014d597d..f8055b2c1c 100644 --- a/src/i18n/es.json +++ b/src/i18n/es.json @@ -37,7 +37,6 @@ "No chats here yet…": "Aún no hay mensajes aquí...", "No results found": "No se han encontrado resultados", "Nothing yet...": "Nada aún...", - "Only visible to you": "Solo visible para ti", "Open emoji picker": "Selector de emoji abierto", "People matching": "Personas que coinciden", "Pick your emoji": "Elige tu emoji", diff --git a/src/i18n/fr.json b/src/i18n/fr.json index 6cc6202660..1bdbce4d14 100644 --- a/src/i18n/fr.json +++ b/src/i18n/fr.json @@ -37,7 +37,6 @@ "No chats here yet…": "Pas encore de messages ici...", "No results found": "Aucun résultat trouvé", "Nothing yet...": "Aucun message...", - "Only visible to you": "Visible uniquement pour vous", "Open emoji picker": "Ouvrez le sélecteur d'emoji", "People matching": "Correspondance de personnes", "Pick your emoji": "Choisissez votre emoji", diff --git a/src/i18n/hi.json b/src/i18n/hi.json index d86df728fe..45ba1df964 100644 --- a/src/i18n/hi.json +++ b/src/i18n/hi.json @@ -37,7 +37,6 @@ "No chats here yet…": "यहां अभी तक कोई चैट नहीं...", "No results found": "कोई परिणाम नहीं मिला", "Nothing yet...": "कोई मैसेज नहीं है", - "Only visible to you": "सिर्फ आपको दिखाई दे रहा है", "Open emoji picker": "इमोजी पिकर खोलिये", "People matching": "मेल खाते लोग", "Pick your emoji": "इमोजी चूस करे", diff --git a/src/i18n/it.json b/src/i18n/it.json index 81e7122471..e99cbf7648 100644 --- a/src/i18n/it.json +++ b/src/i18n/it.json @@ -37,7 +37,6 @@ "No chats here yet…": "Non ci sono ancora messaggi qui...", "No results found": "Nessun risultato trovato", "Nothing yet...": "Ancora niente...", - "Only visible to you": "Visibile soltanto da te", "Open emoji picker": "Apri il selettore dellle emoji", "People matching": "Persone che corrispondono", "Pick your emoji": "Scegli la tua emoji", diff --git a/src/i18n/ja.json b/src/i18n/ja.json index 8db8962a62..2ddb2c0b2d 100644 --- a/src/i18n/ja.json +++ b/src/i18n/ja.json @@ -37,7 +37,6 @@ "No chats here yet…": "ここにはまだチャットはありません…", "No results found": "結果が見つかりません", "Nothing yet...": "まだ何もありません...", - "Only visible to you": "あなただけに見える", "Open emoji picker": "絵文字ピッカーを開く", "People matching": "一致する人", "Pick your emoji": "絵文字を選んでください", diff --git a/src/i18n/ko.json b/src/i18n/ko.json index eaad5fbdfa..7ef9be684a 100644 --- a/src/i18n/ko.json +++ b/src/i18n/ko.json @@ -37,7 +37,6 @@ "No chats here yet…": "아직 채팅이 없습니다...", "No results found": "검색 결과가 없습니다", "Nothing yet...": "아직 아무것도...", - "Only visible to you": "당신만 볼 수 있습니다", "Open emoji picker": "이모티콘 선택기 열기", "People matching": "일치하는 사람", "Pick your emoji": "이모티콘 선택", diff --git a/src/i18n/nl.json b/src/i18n/nl.json index f59a129816..971d936098 100644 --- a/src/i18n/nl.json +++ b/src/i18n/nl.json @@ -37,7 +37,6 @@ "No chats here yet…": "Nog geen chats hier...", "No results found": "Geen resultaten gevonden", "Nothing yet...": "Nog niets ...", - "Only visible to you": "Alleen zichtbaar voor jou", "Open emoji picker": "Open emojipicker", "People matching": "Mensen die matchen", "Pick your emoji": "Kies je emoji", diff --git a/src/i18n/pt.json b/src/i18n/pt.json index 4471ba99c3..10d509d223 100644 --- a/src/i18n/pt.json +++ b/src/i18n/pt.json @@ -37,7 +37,6 @@ "No chats here yet…": "Ainda não há conversas aqui...", "No results found": "Nenhum resultado encontrado", "Nothing yet...": "Nada ainda...", - "Only visible to you": "Visível apenas para você", "Open emoji picker": "Abrir seletor de emoji", "People matching": "Pessoas correspondentes", "Pick your emoji": "Escolha o seu emoji", diff --git a/src/i18n/ru.json b/src/i18n/ru.json index e7336314e1..402a6bf0cd 100644 --- a/src/i18n/ru.json +++ b/src/i18n/ru.json @@ -37,7 +37,6 @@ "No chats here yet…": "Здесь еще нет чатов...", "No results found": "результаты не найдены", "Nothing yet...": "Пока ничего нет...", - "Only visible to you": "Только видно для вас", "Open emoji picker": "Выбрать emoji", "People matching": "Соответствующие люди", "Pick your emoji": "Выберите свой emoji", diff --git a/src/i18n/tr.json b/src/i18n/tr.json index 680e106748..0123891dca 100644 --- a/src/i18n/tr.json +++ b/src/i18n/tr.json @@ -37,7 +37,6 @@ "No chats here yet…": "Henüz burada sohbet yok...", "No results found": "Sonuç bulunamadı", "Nothing yet...": "Şimdilik hiçbir şey...", - "Only visible to you": "Sadece size görünür", "Open emoji picker": "Emoji klavyesini aç", "People matching": "Eşleşen kişiler", "Pick your emoji": "Emoji seçin", From 0234522547d7d68754ae4cc7ba1e1bcfab509626 Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Tue, 12 Jul 2022 16:40:11 +0200 Subject: [PATCH 39/52] feat: add str-chat-react__modal__inner class to str-chat__modal__inner --- src/components/Modal/Modal.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Modal/Modal.tsx b/src/components/Modal/Modal.tsx index 499343725e..68121ed08b 100644 --- a/src/components/Modal/Modal.tsx +++ b/src/components/Modal/Modal.tsx @@ -42,7 +42,7 @@ export const Modal = (props: PropsWithChildren) => { -
+
{children}
From c44bcd771ce5fd677bf27fd3949c1d503941495f Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Tue, 12 Jul 2022 17:17:23 +0200 Subject: [PATCH 40/52] fix: move card caption to card content and rename to source link --- src/components/Attachment/Audio.tsx | 34 +- src/components/Attachment/Card.tsx | 67 ++- .../__tests__/__snapshots__/Card.test.js.snap | 560 ++++++++++-------- 3 files changed, 356 insertions(+), 305 deletions(-) diff --git a/src/components/Attachment/Audio.tsx b/src/components/Attachment/Audio.tsx index 12c22642af..228678af0a 100644 --- a/src/components/Attachment/Audio.tsx +++ b/src/components/Attachment/Audio.tsx @@ -79,7 +79,7 @@ type PlayButtonProps = { onClick: () => void; }; -const PlayButton = ({ isPlaying, onClick }: PlayButtonProps) => ( +export const PlayButton = ({ isPlaying, onClick }: PlayButtonProps) => ( ) : null; })}
  • - {getTotalReactionCount()} + {totalReactionCount}
    • From f6a12d0ca7b2fa939ba2a3f4319d2e02ff4daabe Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Tue, 12 Jul 2022 15:53:02 +0200 Subject: [PATCH 43/52] feat: add theme v2 to Reaction components, extract shared logic ReactionList & SimpleReactionList --- .../React/message-components/reactions.mdx | 24 +++ src/components/Reactions/ReactionSelector.tsx | 6 +- src/components/Reactions/ReactionsList.tsx | 72 +++----- .../Reactions/SimpleReactionsList.tsx | 166 ++++++++---------- .../Reactions/hooks/useProcessReactions.tsx | 100 +++++++++++ 5 files changed, 218 insertions(+), 150 deletions(-) create mode 100644 src/components/Reactions/hooks/useProcessReactions.tsx diff --git a/docusaurus/docs/React/message-components/reactions.mdx b/docusaurus/docs/React/message-components/reactions.mdx index 4042669406..1ffbbac95b 100644 --- a/docusaurus/docs/React/message-components/reactions.mdx +++ b/docusaurus/docs/React/message-components/reactions.mdx @@ -195,6 +195,14 @@ If true, adds a CSS class that reverses the horizontal positioning of the select ## ReactionsList Props +### additionalEmojiProps + +Additional props to be passed to the [NimbleEmoji](https://github.com/missive/emoji-mart/blob/master/src/components/emoji/nimble-emoji.js) component from `emoji-mart`. + +| Type | +| ------ | +| object | + ### onClick Custom on click handler for an individual reaction in the list (overrides the function stored in `MessageContext`). @@ -203,6 +211,14 @@ Custom on click handler for an individual reaction in the list (overrides the fu | ----------------------------------------------------------- | ------------------------------------------------------------------------------------------------- | | (event: React.BaseSyntheticEvent) => Promise \| void | [MessageContextValue['onReactionListClick']](../contexts/message-context.mdx#onreactionlistclick) | +### own_reactions + +An array of the own reaction objects to distinguish own reactions visually (overrides `message.own_reactions` from `MessageContext`). + +| Type | +| ----- | +| array | + ### reaction_counts An object that keeps track of the count of each type of reaction on a message (overrides `message.reaction_counts` from `MessageContext`). @@ -253,6 +269,14 @@ Function that adds/removes a reaction on a message (overrides the function store | ------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- | | (reactionType: string, event: React.BaseSyntheticEvent) => Promise | [MessageContextValue['handleReaction']](../contexts/message-context.mdx#handlereaction) | +### own_reactions + +An array of the own reaction objects to distinguish own reactions visually (overrides `message.own_reactions` from `MessageContext`). + +| Type | +| ----- | +| array | + ### reaction_counts An object that keeps track of the count of each type of reaction on a message (overrides `message.reaction_counts` from `MessageContext`). diff --git a/src/components/Reactions/ReactionSelector.tsx b/src/components/Reactions/ReactionSelector.tsx index e8e2ea828a..cd1c5e0e71 100644 --- a/src/components/Reactions/ReactionSelector.tsx +++ b/src/components/Reactions/ReactionSelector.tsx @@ -28,6 +28,8 @@ export type ReactionSelectorProps< handleReaction?: (reactionType: string, event: React.BaseSyntheticEvent) => Promise; /** An array of the reaction objects to display in the list */ latest_reactions?: ReactionResponse[]; + /** An array of the own reaction objects to distinguish own reactions visually */ + own_reactions?: ReactionResponse[]; /** An object that keeps track of the count of each type of reaction on a message */ reaction_counts?: { [key: string]: number }; /** A list of the currently supported reactions on a message */ @@ -47,6 +49,7 @@ const UnMemoizedReactionSelector = React.forwardRef( detailedView = true, handleReaction: propHandleReaction, latest_reactions: propLatestReactions, + own_reactions: propOwnReactions, reaction_counts: propReactionCounts, reactionOptions: propReactionOptions, reverse = false, @@ -64,6 +67,7 @@ const UnMemoizedReactionSelector = React.forwardRef( const Avatar = propAvatar || contextAvatar || DefaultAvatar; const handleReaction = propHandleReaction || contextHandleReaction; const latestReactions = propLatestReactions || message?.latest_reactions || []; + const ownReactions = propOwnReactions || message?.own_reactions || []; const reactionCounts = propReactionCounts || message?.reaction_counts || {}; const reactionOptions = propReactionOptions || defaultMinimalEmojis; const reactionsAreCustom = !!propReactionOptions?.length; @@ -129,7 +133,7 @@ const UnMemoizedReactionSelector = React.forwardRef( .filter(Boolean); const iHaveReactedWithReaction = (reactionType: string) => - latestReactions.find((reaction) => reaction.type === reactionType); + ownReactions.find((reaction) => reaction.type === reactionType); const getLatestUserForReactionType = (type: string | null) => latestReactions.find((reaction) => reaction.type === type && !!reaction.user)?.user || diff --git a/src/components/Reactions/ReactionsList.tsx b/src/components/Reactions/ReactionsList.tsx index aa94bba91b..a6a530c646 100644 --- a/src/components/Reactions/ReactionsList.tsx +++ b/src/components/Reactions/ReactionsList.tsx @@ -1,10 +1,9 @@ -import React, { Suspense, useMemo } from 'react'; +import React, { Suspense } from 'react'; import clsx from 'clsx'; -import { getStrippedEmojiData, ReactionEmoji } from '../Channel/emojiData'; - import { useEmojiContext } from '../../context/EmojiContext'; import { useMessageContext } from '../../context/MessageContext'; +import { useProcessReactions } from './hooks/useProcessReactions'; import type { NimbleEmojiProps } from 'emoji-mart'; import type { ReactionResponse } from 'stream-chat'; @@ -12,6 +11,7 @@ import type { ReactionResponse } from 'stream-chat'; import type { ReactEventHandler } from '../Message/types'; import type { DefaultStreamChatGenerics } from '../../types/types'; +import type { ReactionEmoji } from '../Channel/emojiData'; export type ReactionsListProps< StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics @@ -20,6 +20,8 @@ export type ReactionsListProps< additionalEmojiProps?: Partial; /** Custom on click handler for an individual reaction, defaults to `onReactionListClick` from the `MessageContext` */ onClick?: ReactEventHandler; + /** An array of the own reaction objects to distinguish own reactions visually */ + own_reactions?: ReactionResponse[]; /** An object that keeps track of the count of each type of reaction on a message */ reaction_counts?: { [key: string]: number }; /** A list of the currently supported reactions on a message */ @@ -35,61 +37,27 @@ const UnMemoizedReactionsList = < >( props: ReactionsListProps, ) => { - const { - additionalEmojiProps, - onClick, - reaction_counts: propReactionCounts, - reactionOptions: propReactionOptions, - reactions: propReactions, - reverse = false, - } = props; + const { onClick, reverse = false, ...rest } = props; const { Emoji, emojiConfig } = useEmojiContext('ReactionsList'); - const { message, onReactionListClick } = useMessageContext('ReactionsList'); - - const { defaultMinimalEmojis, emojiData: fullEmojiData, emojiSetDef } = emojiConfig || {}; + const { onReactionListClick } = useMessageContext('ReactionsList'); - const latestReactions = propReactions || message.latest_reactions || []; - const reactionCounts = propReactionCounts || message.reaction_counts || {}; - const reactionOptions = propReactionOptions || defaultMinimalEmojis; - const reactionsAreCustom = !!propReactionOptions?.length; - - const emojiData = useMemo( - () => (reactionsAreCustom ? fullEmojiData : getStrippedEmojiData(fullEmojiData)), - [fullEmojiData, reactionsAreCustom], - ); + const { + additionalEmojiProps, + emojiData, + getEmojiByReactionType, + iHaveReactedWithReaction, + latestReactions, + latestReactionTypes, + reactionCounts, + supportedReactionsArePresent, + totalReactionCount, + } = useProcessReactions({ emojiConfig, ...rest }); if (!latestReactions.length) return null; - const messageReactionTypes = latestReactions.reduce((reactionTypes, { type }) => { - if (reactionTypes.indexOf(type) === -1) { - reactionTypes.push(type); - } - return reactionTypes; - }, [] as string[]); - - const supportedReactionMap = reactionOptions.reduce((acc, { id }) => { - acc[id] = true; - return acc; - }, {} as Record); - - const supportedReactionsArePresent = messageReactionTypes.some( - (type) => supportedReactionMap[type], - ); - if (!supportedReactionsArePresent) return null; - const totalReactionCount = Object.values(reactionCounts).reduce( - (total, count) => total + count, - 0, - ); - - const iHaveReactedWithReaction = (reactionType: string) => - latestReactions.find((reaction) => reaction.type === reactionType); - - const getEmojiByReactionType = (type: string): ReactionEmoji | undefined => - reactionOptions.find((option: ReactionEmoji) => option.id === type); - return (
      - {messageReactionTypes.map((reactionType) => { + {latestReactionTypes.map((reactionType) => { const emojiObject = getEmojiByReactionType(reactionType); const isOwnReaction = iHaveReactedWithReaction(reactionType); return emojiObject ? ( @@ -122,7 +90,7 @@ const UnMemoizedReactionsList = < data={emojiData} emoji={emojiObject} size={16} - {...(reactionsAreCustom ? additionalEmojiProps : emojiSetDef)} + {...additionalEmojiProps} /> diff --git a/src/components/Reactions/SimpleReactionsList.tsx b/src/components/Reactions/SimpleReactionsList.tsx index 7b9679aae5..1c9b229c04 100644 --- a/src/components/Reactions/SimpleReactionsList.tsx +++ b/src/components/Reactions/SimpleReactionsList.tsx @@ -1,14 +1,15 @@ -import React, { Suspense, useMemo, useState } from 'react'; - -import { getStrippedEmojiData, ReactionEmoji } from '../Channel/emojiData'; +import React, { Suspense, useState } from 'react'; +import clsx from 'clsx'; import { useEmojiContext } from '../../context/EmojiContext'; import { useMessageContext } from '../../context/MessageContext'; +import { useProcessReactions } from './hooks/useProcessReactions'; import type { NimbleEmojiProps } from 'emoji-mart'; import type { ReactionResponse } from 'stream-chat'; import type { DefaultStreamChatGenerics } from '../../types/types'; +import type { ReactionEmoji } from '../Channel/emojiData'; export type SimpleReactionsListProps< StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics @@ -17,6 +18,8 @@ export type SimpleReactionsListProps< additionalEmojiProps?: Partial; /** Function that adds/removes a reaction on a message (overrides the function stored in `MessageContext`) */ handleReaction?: (reactionType: string, event: React.BaseSyntheticEvent) => Promise; + /** An array of the own reaction objects to distinguish own reactions visually */ + own_reactions?: ReactionResponse[]; /** An object that keeps track of the count of each type of reaction on a message */ reaction_counts?: { [key: string]: number }; /** A list of the currently supported reactions on a message */ @@ -30,38 +33,34 @@ const UnMemoizedSimpleReactionsList = < >( props: SimpleReactionsListProps, ) => { - const { - additionalEmojiProps = {}, - handleReaction: propHandleReaction, - reaction_counts: propReactionCounts, - reactionOptions: propReactionOptions, - reactions: propReactions, - } = props; + const { handleReaction: propHandleReaction, ...rest } = props; const { Emoji, emojiConfig } = useEmojiContext('SimpleReactionsList'); - const { handleReaction: contextHandleReaction, message } = useMessageContext( + const { handleReaction: contextHandleReaction } = useMessageContext( 'SimpleReactionsList', ); - const { defaultMinimalEmojis, emojiData: fullEmojiData, emojiSetDef } = emojiConfig || {}; + const { + additionalEmojiProps, + emojiData, + getEmojiByReactionType, + iHaveReactedWithReaction, + latestReactions, + latestReactionTypes, + supportedReactionsArePresent, + totalReactionCount, + } = useProcessReactions({ emojiConfig, ...rest }); const [tooltipReactionType, setTooltipReactionType] = useState(undefined); const handleReaction = propHandleReaction || contextHandleReaction; - const reactions = propReactions || message.latest_reactions || []; - const reactionCounts = propReactionCounts || message.reaction_counts || {}; - const reactionOptions = propReactionOptions || defaultMinimalEmojis; - const reactionsAreCustom = !!propReactionOptions?.length; - const emojiData = useMemo( - () => (reactionsAreCustom ? fullEmojiData : getStrippedEmojiData(fullEmojiData)), - [fullEmojiData, reactionsAreCustom], - ); + if (!latestReactions.length) return null; - if (!reactions.length) return null; + if (!supportedReactionsArePresent) return null; const getUsersPerReactionType = (type: string) => - reactions + latestReactions .map((reaction) => { if (reaction.type === type) { return reaction.user?.name || reaction.user?.id; @@ -70,83 +69,56 @@ const UnMemoizedSimpleReactionsList = < }) .filter(Boolean); - const getTotalReactionCount = () => - Object.values(reactionCounts).reduce((total, count) => total + count, 0); - - const getCurrentMessageReactionTypes = () => { - const reactionTypes: string[] = []; - reactions.forEach(({ type }) => { - if (reactionTypes.indexOf(type) === -1) { - reactionTypes.push(type); - } - }); - return reactionTypes; - }; - - const getEmojiByReactionType = (type: string): ReactionEmoji | undefined => { - const reactionEmoji = reactionOptions.find((option: ReactionEmoji) => option.id === type); - return reactionEmoji; - }; - - const getSupportedReactionMap = () => { - const reactionMap: Record = {}; - reactionOptions.forEach(({ id }) => (reactionMap[id] = true)); - return reactionMap; - }; - - const messageReactionTypes = getCurrentMessageReactionTypes(); - const supportedReactionMap = getSupportedReactionMap(); - - const supportedReactionsArePresent = messageReactionTypes.some( - (type) => supportedReactionMap[type], - ); - - if (!supportedReactionsArePresent) return null; - return ( -
        setTooltipReactionType(undefined)} - > - {messageReactionTypes.map((reactionType, i) => { - const emojiObject = getEmojiByReactionType(reactionType); - - return emojiObject ? ( -
      • handleReaction(reactionType, event)} - onKeyPress={(event) => handleReaction(reactionType, event)} - > - setTooltipReactionType(reactionType)}> - { - - - - } -   - - {tooltipReactionType === emojiObject.id && ( -
        -
        - {getUsersPerReactionType(tooltipReactionType)?.join(', ')} -
        - )} +
        +
          setTooltipReactionType(undefined)} + > + {latestReactionTypes.map((reactionType, i) => { + const emojiObject = getEmojiByReactionType(reactionType); + const isOwnReaction = iHaveReactedWithReaction(reactionType); + + return emojiObject ? ( +
        • handleReaction(reactionType, event)} + onKeyUp={(event) => handleReaction(reactionType, event)} + > + setTooltipReactionType(reactionType)}> + { + + + + } +   + + {tooltipReactionType === emojiObject.id && ( +
          +
          + {getUsersPerReactionType(tooltipReactionType)?.join(', ')} +
          + )} +
          • + ) : null; + })} + { +
        • + {totalReactionCount}
          • - ) : null; - })} - { -
        • - {getTotalReactionCount()} -
          • - } -
        + } +
      +
    ); }; diff --git a/src/components/Reactions/hooks/useProcessReactions.tsx b/src/components/Reactions/hooks/useProcessReactions.tsx new file mode 100644 index 0000000000..260430a44a --- /dev/null +++ b/src/components/Reactions/hooks/useProcessReactions.tsx @@ -0,0 +1,100 @@ +import { useCallback, useMemo } from 'react'; +import { getStrippedEmojiData, ReactionEmoji } from '../../Channel/emojiData'; +import type { EmojiContextValue } from '../../../context/EmojiContext'; +import type { ReactionsListProps } from '../ReactionsList'; +import { useMessageContext } from '../../../context'; +import type { DefaultStreamChatGenerics } from '../../../types/types'; + +type SharedReactionListProps = + | 'additionalEmojiProps' + | 'own_reactions' + | 'reaction_counts' + | 'reactionOptions' + | 'reactions'; + +type UseProcessReactionsParams = Pick & + Pick; + +export const useProcessReactions = < + StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics +>( + params: UseProcessReactionsParams, +) => { + const { + additionalEmojiProps = {}, + emojiConfig, + own_reactions: propOwnReactions, + reaction_counts: propReactionCounts, + reactionOptions: propReactionOptions, + reactions: propReactions, + } = params; + const { message } = useMessageContext('ReactionsList'); + const { defaultMinimalEmojis, emojiData: fullEmojiData, emojiSetDef } = emojiConfig || {}; + + const latestReactions = propReactions || message.latest_reactions || []; + const ownReactions = propOwnReactions || message?.own_reactions || []; + const reactionCounts = propReactionCounts || message.reaction_counts || {}; + const reactionOptions = propReactionOptions || defaultMinimalEmojis; + const reactionsAreCustom = !!propReactionOptions?.length; + + const iHaveReactedWithReaction = useCallback( + (reactionType: string) => ownReactions.find((reaction) => reaction.type === reactionType), + [ownReactions], + ); + + const getEmojiByReactionType = useCallback( + (type: string): ReactionEmoji | undefined => + reactionOptions.find((option: ReactionEmoji) => option.id === type), + [reactionOptions], + ); + + const emojiData = useMemo( + () => (reactionsAreCustom ? fullEmojiData : getStrippedEmojiData(fullEmojiData)), + [fullEmojiData, reactionsAreCustom], + ); + + const latestReactionTypes = useMemo( + () => + latestReactions.reduce((reactionTypes, { type }) => { + if (reactionTypes.indexOf(type) === -1) { + reactionTypes.push(type); + } + return reactionTypes; + }, [] as string[]), + [latestReactions], + ); + + const supportedReactionMap = useMemo( + () => + reactionOptions.reduce((acc, { id }) => { + acc[id] = true; + return acc; + }, {} as Record), + [reactionOptions], + ); + + const supportedReactionsArePresent = useMemo( + () => latestReactionTypes.some((type) => supportedReactionMap[type]), + [latestReactionTypes, supportedReactionMap], + ); + + const totalReactionCount = useMemo( + () => + supportedReactionsArePresent + ? Object.values(reactionCounts).reduce((total, count) => total + count, 0) + : 0, + [reactionCounts, supportedReactionsArePresent], + ); + + return { + additionalEmojiProps: reactionsAreCustom ? additionalEmojiProps : emojiSetDef, + emojiData, + getEmojiByReactionType, + iHaveReactedWithReaction, + latestReactions, + latestReactionTypes, + reactionCounts, + supportedReactionsArePresent, + totalReactionCount, + }; +}; From 51e7c14183c08b07792f7afb15606ab9affe9c34 Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Wed, 13 Jul 2022 12:47:36 +0200 Subject: [PATCH 44/52] fix: sync event listener keyDown type btw the image attachment and gallery modal --- src/components/Gallery/Image.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Gallery/Image.tsx b/src/components/Gallery/Image.tsx index 802bcbda59..ba415fb6f4 100644 --- a/src/components/Gallery/Image.tsx +++ b/src/components/Gallery/Image.tsx @@ -45,7 +45,7 @@ export const ImageComponent = < className='str-chat__message-attachment--img' data-testid='image-test' onClick={toggleModal} - onKeyUp={toggleModal} + onKeyDown={toggleModal} src={imageSrc} tabIndex={0} /> From a9ede6beeedc711ac431036c564980655c1cd86f Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Wed, 13 Jul 2022 12:48:43 +0200 Subject: [PATCH 45/52] test: sync event listener keyDown type btw the image attachment and gallery modal --- .../Gallery/__tests__/__snapshots__/Image.test.js.snap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Gallery/__tests__/__snapshots__/Image.test.js.snap b/src/components/Gallery/__tests__/__snapshots__/Image.test.js.snap index 5b245328f1..50af6b9e13 100644 --- a/src/components/Gallery/__tests__/__snapshots__/Image.test.js.snap +++ b/src/components/Gallery/__tests__/__snapshots__/Image.test.js.snap @@ -5,7 +5,7 @@ exports[`Image should render component with default props 1`] = ` className="str-chat__message-attachment--img" data-testid="image-test" onClick={[Function]} - onKeyUp={[Function]} + onKeyDown={[Function]} src="about:blank" tabIndex={0} /> From ab75c2c8b51a54384d327fc97c0db3151ffaa10c Mon Sep 17 00:00:00 2001 From: MartinCupela <32706194+MartinCupela@users.noreply.github.com> Date: Wed, 13 Jul 2022 13:19:19 +0200 Subject: [PATCH 46/52] feat: add v2 classes to send and cancel button of EditMessageForm (#1669) --- src/components/MessageInput/EditMessageForm.tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/components/MessageInput/EditMessageForm.tsx b/src/components/MessageInput/EditMessageForm.tsx index 7de9ad88ec..e7d5ca2461 100644 --- a/src/components/MessageInput/EditMessageForm.tsx +++ b/src/components/MessageInput/EditMessageForm.tsx @@ -95,8 +95,12 @@ export const EditMessageForm = < )}
    - - + +
    From 037dc89e7dd5035f162da610f02fbb575bd8efcb Mon Sep 17 00:00:00 2001 From: MartinCupela <32706194+MartinCupela@users.noreply.github.com> Date: Wed, 13 Jul 2022 22:22:00 +0200 Subject: [PATCH 47/52] feat: add theme v2 class to CustomNotification --- src/components/MessageList/CustomNotification.tsx | 2 +- src/components/MessageList/__tests__/CustomNotification.test.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/MessageList/CustomNotification.tsx b/src/components/MessageList/CustomNotification.tsx index 3432575720..89eb4e28ca 100644 --- a/src/components/MessageList/CustomNotification.tsx +++ b/src/components/MessageList/CustomNotification.tsx @@ -13,7 +13,7 @@ const UnMemoizedCustomNotification = (props: PropsWithChildren {children} diff --git a/src/components/MessageList/__tests__/CustomNotification.test.js b/src/components/MessageList/__tests__/CustomNotification.test.js index d6e87fdc86..af3219f798 100644 --- a/src/components/MessageList/__tests__/CustomNotification.test.js +++ b/src/components/MessageList/__tests__/CustomNotification.test.js @@ -23,7 +23,7 @@ describe('CustomNotification', () => { expect(tree).toMatchInlineSnapshot(`
    children From e643523595c8feaa6342deb88bdaae538f454850 Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Fri, 22 Jul 2022 14:08:44 +0200 Subject: [PATCH 48/52] chore(deps): bump version react-file-utils from v1.1.12 to v1.2.0 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index d81fc346b7..9282bdb3ae 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "pretty-bytes": "^5.4.1", "prop-types": "^15.7.2", "react-fast-compare": "^3.2.0", - "react-file-utils": "^1.1.12", + "react-file-utils": "^1.2.0", "react-image-gallery": "^1.2.7", "react-is": "^18.1.0", "react-markdown": "^5.0.3", diff --git a/yarn.lock b/yarn.lock index c34bae53a9..80d915bea0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12927,10 +12927,10 @@ react-fast-compare@^3.0.1, react-fast-compare@^3.2.0: resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb" integrity sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA== -react-file-utils@^1.1.12: - version "1.1.12" - resolved "https://registry.yarnpkg.com/react-file-utils/-/react-file-utils-1.1.12.tgz#fb1d04d743e7cfc04f44047374dd4a79119006e6" - integrity sha512-ZbCRUeb9wjPgFWBB6P/vqJvmUmMd0j3YlXXvTwxjfGSq8spEfDNfKkmJKLQfd+3SQToPyP80VIg4HurNzKR00w== +react-file-utils@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/react-file-utils/-/react-file-utils-1.2.0.tgz#4420f41b76bfdc19acfbccc092ebd3ca6d41e955" + integrity sha512-pu5mpNNwHZe7X+LG4CNtEwqf+J2sseE3y9dbkt1LLQpYs7TC4sy3XgRkQTzZuvLXsDyGpASbhDJCpB/KHCPbAA== dependencies: react-dropzone "^12.0.5" From 8b853ef363946c191b0ae7f34f7915d399d90c20 Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Fri, 22 Jul 2022 14:11:30 +0200 Subject: [PATCH 49/52] refactor: use type ThemeVersion --- src/components/Chat/Chat.tsx | 4 ++-- src/context/ChatContext.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/Chat/Chat.tsx b/src/components/Chat/Chat.tsx index 9cb9d5667d..631890fdd6 100644 --- a/src/components/Chat/Chat.tsx +++ b/src/components/Chat/Chat.tsx @@ -5,7 +5,7 @@ import { useCreateChatContext } from './hooks/useCreateChatContext'; import { useChannelsQueryState } from './hooks/useChannelsQueryState'; import { CustomStyles, darkModeTheme, useCustomStyles } from './hooks/useCustomStyles'; -import { ChatProvider, CustomClasses } from '../../context/ChatContext'; +import { ChatProvider, CustomClasses, ThemeVersion } from '../../context/ChatContext'; import { SupportedTranslations, TranslationProvider } from '../../context/TranslationContext'; import type { StreamChat } from 'stream-chat'; @@ -88,7 +88,7 @@ export const Chat = < const channelsQueryState = useChannelsQueryState(); const themeVersion = (getComputedStyle(document.documentElement) .getPropertyValue('--str-chat__theme-version') - .replace(' ', '') || '1') as '1' | '2'; + .replace(' ', '') || '1') as ThemeVersion; useCustomStyles(darkMode ? darkModeTheme : customStyles); diff --git a/src/context/ChatContext.tsx b/src/context/ChatContext.tsx index c53574bc29..d986c63a40 100644 --- a/src/context/ChatContext.tsx +++ b/src/context/ChatContext.tsx @@ -23,7 +23,7 @@ export type CustomClasses = Partial>; type ChannelCID = string; // e.g.: "messaging:general" -type ThemeVersion = '1' | '2'; +export type ThemeVersion = '1' | '2'; export type ChatContextValue< StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics From 473a86924ccdd90d5e2028a414e5bab9b03e14c8 Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Fri, 22 Jul 2022 14:27:59 +0200 Subject: [PATCH 50/52] refactor: reorganize MessageSimple & Gallery root classes --- src/components/Gallery/Gallery.tsx | 9 +++---- src/components/Message/MessageSimple.tsx | 31 ++++++++++++------------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/components/Gallery/Gallery.tsx b/src/components/Gallery/Gallery.tsx index 7252fd3d30..ae0629b30c 100644 --- a/src/components/Gallery/Gallery.tsx +++ b/src/components/Gallery/Gallery.tsx @@ -75,11 +75,10 @@ const UnMemoizedGallery = < ), ); - const className = clsx( - 'str-chat__gallery', - images.length > lastImageIndexInPreview && 'str-chat__gallery--square', - images.length > 2 && 'str-chat__gallery-two-rows', - ); + const className = clsx('str-chat__gallery', { + 'str-chat__gallery--square': images.length > lastImageIndexInPreview, + 'str-chat__gallery-two-rows': images.length > 2, + }); return (
    diff --git a/src/components/Message/MessageSimple.tsx b/src/components/Message/MessageSimple.tsx index 9ef68931b1..ed4f5bee36 100644 --- a/src/components/Message/MessageSimple.tsx +++ b/src/components/Message/MessageSimple.tsx @@ -87,24 +87,25 @@ const MessageSimpleWithContext = < const showReplyCountButton = !threadList && !!message.reply_count; const rootClassName = clsx( - isMyMessage() - ? 'str-chat__message str-chat__message-simple str-chat__message--me str-chat__message-simple--me' - : 'str-chat__message str-chat__message-simple str-chat__message--other', + 'str-chat__message str-chat__message-simple', `str-chat__message--${message.type}`, `str-chat__message--${message.status}`, + isMyMessage() + ? 'str-chat__message--me str-chat__message-simple--me' + : 'str-chat__message--other', message.text ? 'str-chat__message--has-text' : 'has-no-text', - hasAttachment && 'str-chat__message--has-attachment', - hasReactions && - isReactionEnabled && - 'str-chat__message--with-reactions str-chat__message-with-thread-link', - highlighted && 'str-chat__message--highlighted', - message.pinned && 'pinned-message', - groupedByUser && 'str-chat__virtual-message__wrapper--group', - firstOfGroup && 'str-chat__virtual-message__wrapper--first', - endOfGroup && 'str-chat__virtual-message__wrapper--end', - message?.status === 'failed' && - message?.errorStatusCode !== 403 && - 'str-chat__message-send-can-be-retried', + { + 'pinned-message': message.pinned, + 'str-chat__message--has-attachment': hasAttachment, + 'str-chat__message--highlighted': highlighted, + 'str-chat__message--with-reactions str-chat__message-with-thread-link': + hasReactions && isReactionEnabled, + 'str-chat__message-send-can-be-retried': + message?.status === 'failed' && message?.errorStatusCode !== 403, + 'str-chat__virtual-message__wrapper--end': endOfGroup, + 'str-chat__virtual-message__wrapper--first': firstOfGroup, + 'str-chat__virtual-message__wrapper--group': groupedByUser, + }, ); return ( From d2acd9b713608940361b6b575a0eaf2720b0922f Mon Sep 17 00:00:00 2001 From: MartinCupela Date: Fri, 22 Jul 2022 15:01:19 +0200 Subject: [PATCH 51/52] test: update snapshots after reorganization of MessageSimple root classes --- src/components/Message/__tests__/MessageText.test.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/Message/__tests__/MessageText.test.js b/src/components/Message/__tests__/MessageText.test.js index d81803f44d..94f66a3140 100644 --- a/src/components/Message/__tests__/MessageText.test.js +++ b/src/components/Message/__tests__/MessageText.test.js @@ -289,7 +289,7 @@ describe('', () => { const tree = await renderMessageText({ customWrapperClass, message }, {}, testRenderer.create); expect(tree.toJSON()).toMatchInlineSnapshot(`
    ', () => { const tree = await renderMessageText({ customInnerClass, message }, {}, testRenderer.create); expect(tree.toJSON()).toMatchInlineSnapshot(`
    ', () => { const tree = await renderMessageText({ message, theme: 'custom' }, {}, testRenderer.create); expect(tree.toJSON()).toMatchInlineSnapshot(`
    Date: Fri, 22 Jul 2022 15:02:07 +0200 Subject: [PATCH 52/52] test: update snapshots for file icons --- .../Attachment/__tests__/__snapshots__/File.test.js.snap | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/Attachment/__tests__/__snapshots__/File.test.js.snap b/src/components/Attachment/__tests__/__snapshots__/File.test.js.snap index 0fb3054d36..fe9ba5d41a 100644 --- a/src/components/Attachment/__tests__/__snapshots__/File.test.js.snap +++ b/src/components/Attachment/__tests__/__snapshots__/File.test.js.snap @@ -45,7 +45,9 @@ exports[`File should render File component in V2 1`] = `