diff --git a/packages/web/__tests__/pages/loginPageTests.tsx b/packages/web/__tests__/pages/loginPageTests.tsx index 4163dba23..11227d51d 100644 --- a/packages/web/__tests__/pages/loginPageTests.tsx +++ b/packages/web/__tests__/pages/loginPageTests.tsx @@ -1,7 +1,5 @@ import { render } from '@testing-library/react' import Login from '../../pages/login' -import { IntlProvider } from 'react-intl' -import { englishTranslations } from './../../locales/en/messages' // Details on mocking a next router // https://github.com/vercel/next.js/issues/7479 @@ -22,13 +20,7 @@ jest.mock('next/router', () => ({ describe('the Login page', () => { it('renders itself', () => { const { queryByTestId } = render( - - - , + , {} ) expect(queryByTestId('login-page-tag')).toBeInTheDocument() diff --git a/packages/web/components/templates/LoginForm.tsx b/packages/web/components/templates/LoginForm.tsx index 93d7abcca..894bf8d77 100644 --- a/packages/web/components/templates/LoginForm.tsx +++ b/packages/web/components/templates/LoginForm.tsx @@ -8,7 +8,7 @@ import { appleAuthRedirectURI, } from '../../lib/appConfig' import AppleLogin from 'react-apple-login' -import { useIntl } from 'react-intl' +import { formatMessage } from '../../locales/en/messages' export type LoginFormProps = { errorMessage?: string @@ -73,7 +73,6 @@ export function LoginForm(props: LoginFormProps): JSX.Element { } function LoginFormHeader() { - const intl = useIntl() const StyledTextHeadline = styled('h1', StyledText) return ( @@ -82,7 +81,7 @@ function LoginFormHeader() { style="fixedHeadline" css={{ mx: '$2', color: '$omnivoreGray', marginBlockEnd: '0px' }} > - {intl.formatMessage({ id: 'login.headline' })} + {formatMessage({ id: 'login.headline' })} diff --git a/packages/web/locales/en/messages.ts b/packages/web/locales/en/messages.ts index d23498c76..1efc879fc 100644 --- a/packages/web/locales/en/messages.ts +++ b/packages/web/locales/en/messages.ts @@ -1,4 +1,4 @@ -const errorMessages = { +const errorMessages: Record = { 'error.AUTH_FAILED': 'Something went wrong, please try again in a moment', 'error.USER_ALREADY_EXISTS': 'User with this email exists already', 'error.INVALID_CREDENTIALS': 'Invalid email or password', @@ -26,7 +26,7 @@ const errorMessages = { 'error.USER_EXISTS': 'User with this email exists already', } -const loginPageMessages = { +const loginPageMessages: Record = { 'login.highlight': 'Highlight', 'login.note': 'Note', 'login.collaborate': 'Collaborate', @@ -38,12 +38,12 @@ const loginPageMessages = { 'login.SIGNUP_SUCCESS': 'Sign up successful', } -const feedPageMessages = { - key: 'value', -} - -export const englishTranslations = { - ...errorMessages, - ...loginPageMessages, - ...feedPageMessages, +export const formatMessage = (p: { id: string}): string | undefined=> { + if (p.id in errorMessages) { + return errorMessages[p.id] + } + if (p.id in loginPageMessages) { + return loginPageMessages[p.id] + } + return undefined } diff --git a/packages/web/package.json b/packages/web/package.json index 4cc139621..38f0f54c1 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -40,7 +40,6 @@ "react-colorful": "^5.5.1", "react-dom": "^17.0.2", "react-hot-toast": "^2.1.1", - "react-intl": "^5.20.12", "react-loading-skeleton": "^3.0.2", "react-topbar-progress-indicator": "^4.1.1", "react-twitter-widgets": "^1.10.0", diff --git a/packages/web/pages/_app.tsx b/packages/web/pages/_app.tsx index 6e7409b5f..d579980d5 100644 --- a/packages/web/pages/_app.tsx +++ b/packages/web/pages/_app.tsx @@ -1,9 +1,7 @@ import '../styles/globals.css' import '../styles/articleInnerStyling.css' import type { AppProps } from 'next/app' -import { IntlProvider } from 'react-intl' import { IdProvider } from '@radix-ui/react-id' -import { englishTranslations } from './../locales/en/messages' import { useRouter } from 'next/router' import { useEffect, useState } from 'react' import { Analytics, AnalyticsBrowser } from '@segment/analytics-next' @@ -54,15 +52,9 @@ function OmnivoreApp({ Component, pageProps }: AppProps): JSX.Element { return ( - - - - - + + + ) } diff --git a/packages/web/pages/email-login.tsx b/packages/web/pages/email-login.tsx index 14caa7223..c402990ea 100644 --- a/packages/web/pages/email-login.tsx +++ b/packages/web/pages/email-login.tsx @@ -2,9 +2,9 @@ import { PrimaryLayout } from '../components/templates/PrimaryLayout' import { useEffect, useState } from 'react' import { useRouter } from 'next/router' import { StyledText } from '../components/elements/StyledText' -import { useIntl } from 'react-intl' import { fetchEndpoint } from '../lib/appConfig' import { parseErrorCodes } from '../lib/queryParamParser' +import { formatMessage } from '../locales/en/messages' export default function EmailLogin(): JSX.Element { const [errorMessage, setErrorMessage] = useState( @@ -12,21 +12,20 @@ export default function EmailLogin(): JSX.Element { ) const [message, setMessage] = useState(undefined) const router = useRouter() - const intl = useIntl() useEffect(() => { if (!router.isReady) return const errorCode = parseErrorCodes(router.query) const errorMsg = errorCode - ? intl.formatMessage({ id: `error.${errorCode}` }) + ? formatMessage({ id: `error.${errorCode}` }) : undefined setErrorMessage(errorMsg) const message = router.query.message - ? intl.formatMessage({ id: `login.${router.query.message}` }) + ? formatMessage({ id: `login.${router.query.message}` }) : undefined setMessage(message) - }, [router.isReady, router.query, intl]) + }, [router.isReady, router.query]) return ( diff --git a/packages/web/pages/email-registration.tsx b/packages/web/pages/email-registration.tsx index dc35a112d..468569262 100644 --- a/packages/web/pages/email-registration.tsx +++ b/packages/web/pages/email-registration.tsx @@ -2,25 +2,24 @@ import { PrimaryLayout } from '../components/templates/PrimaryLayout' import { useEffect, useState } from 'react' import { useRouter } from 'next/router' import { StyledText } from '../components/elements/StyledText' -import { useIntl } from 'react-intl' import { fetchEndpoint } from '../lib/appConfig' import { parseErrorCodes } from '../lib/queryParamParser' +import { formatMessage } from '../locales/en/messages' export default function EmailRegistration(): JSX.Element { const [errorMessage, setErrorMessage] = useState( undefined ) const router = useRouter() - const intl = useIntl() useEffect(() => { if (!router.isReady) return const errorCode = parseErrorCodes(router.query) const message = errorCode - ? intl.formatMessage({ id: `error.${errorCode}` }) + ? formatMessage({ id: `error.${errorCode}` }) : undefined setErrorMessage(message) - }, [router.isReady, router.query, intl]) + }, [router.isReady, router.query]) return ( diff --git a/packages/web/pages/login.tsx b/packages/web/pages/login.tsx index 80bbcbca4..c315b53e2 100644 --- a/packages/web/pages/login.tsx +++ b/packages/web/pages/login.tsx @@ -5,12 +5,10 @@ import { useState, useEffect } from 'react' import { LoginLayout } from './../components/templates/LoginLayout' import { parseErrorCodes } from '../lib/queryParamParser' import { PageMetaData } from '../components/patterns/PageMetaData' -import { useIntl } from 'react-intl' +import { formatMessage } from '../locales/en/messages' export default function Login(): JSX.Element { const router = useRouter() - const intl = useIntl() - const [errorMessage, setErrorMessage] = useState( undefined ) @@ -19,10 +17,11 @@ export default function Login(): JSX.Element { if (!router.isReady) return const errorCode = parseErrorCodes(router.query) const message = errorCode - ? intl.formatMessage({ id: `error.${errorCode}` }) + ? formatMessage({ id: `error.${errorCode}` }) : undefined setErrorMessage(message) - }, [router.isReady, router.query, intl]) + console.log('error message', message) + }, [router.isReady, router.query]) const loginFormProps = { waitlistButtonClickHander: () => { diff --git a/yarn.lock b/yarn.lock index b4b68e852..35a1fde08 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2317,76 +2317,6 @@ dependencies: tslib "^2.1.0" -"@formatjs/ecma402-abstract@1.9.9": - version "1.9.9" - resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.9.9.tgz#f556782fc12398af283ae2f8be64e938f969d240" - integrity sha512-w2HpUW17Ev8UN8G1fSvl0skCLP+HkhGZii0ALaBXYc7rd3osD2s8EF2ihSNkeEeC6aySX1IAkRm0f4lnE8Jeaw== - dependencies: - "@formatjs/intl-localematcher" "0.2.21" - tslib "^2.1.0" - -"@formatjs/fast-memoize@1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@formatjs/fast-memoize/-/fast-memoize-1.2.0.tgz#1123bfcc5d21d761f15d8b1c32d10e1b6530355d" - integrity sha512-fObitP9Tlc31SKrPHgkPgQpGo4+4yXfQQITTCNH8AZdEqB7Mq4nPrjpUL/tNGN3lEeJcFxDbi0haX8HM7QvQ8w== - dependencies: - tslib "^2.1.0" - -"@formatjs/icu-messageformat-parser@2.0.12": - version "2.0.12" - resolved "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.0.12.tgz#0e03b2c83c03d4f95debb51a727934cb8d8fdbea" - integrity sha512-X/tdbKLfVBc2yJRX+xC3uqYxXkp9336FhSS1Hb6kU6pSOU+EseylS3a/vjFOKjol1qQ5BSIQd8YPWtOOt3KcWA== - dependencies: - "@formatjs/ecma402-abstract" "1.9.9" - "@formatjs/icu-skeleton-parser" "1.2.13" - tslib "^2.1.0" - -"@formatjs/icu-skeleton-parser@1.2.13": - version "1.2.13" - resolved "https://registry.yarnpkg.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.2.13.tgz#8360fd8b24f70e1894a891aa63566a19c8e9cffa" - integrity sha512-PHK4kdIcNTI15ASyn6dCA2cxzUPHE+UK/FsBkPULNpKgPWEZIYAFO9PgG0a9SDcIIr7Ta3SPPbUZGKRXT3d+ng== - dependencies: - "@formatjs/ecma402-abstract" "1.9.9" - tslib "^2.1.0" - -"@formatjs/intl-displaynames@5.2.4": - version "5.2.4" - resolved "https://registry.yarnpkg.com/@formatjs/intl-displaynames/-/intl-displaynames-5.2.4.tgz#3e076eb2c35f04c2acdd5526464f7ef9355d414c" - integrity sha512-04ePaKLSuM8hHYiFEtpauYBCJzALktgwDo2T9CAyffO4ULYVjQbjcqIpKV2Ik5I7CZLbKVbMfWHis+VhNENNgQ== - dependencies: - "@formatjs/ecma402-abstract" "1.9.9" - "@formatjs/intl-localematcher" "0.2.21" - tslib "^2.1.0" - -"@formatjs/intl-listformat@6.3.4": - version "6.3.4" - resolved "https://registry.yarnpkg.com/@formatjs/intl-listformat/-/intl-listformat-6.3.4.tgz#aec02df277627fce416d15bf0c455406fd312d89" - integrity sha512-CofbXe8IXIniUX12jpnPNwnLtx/qLzpTvOcNeilqerwPTe/br0qdlpMorcTDS0CM40ourSb5WbkHftZNbytWSA== - dependencies: - "@formatjs/ecma402-abstract" "1.9.9" - "@formatjs/intl-localematcher" "0.2.21" - tslib "^2.1.0" - -"@formatjs/intl-localematcher@0.2.21": - version "0.2.21" - resolved "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.2.21.tgz#39ef33d701fe8084f3d693cd3ff7cbe03cdd3a49" - integrity sha512-JTJeLiNwexN4Gy0cMxoUPvJbKhXdnSuo5jPrDafEZpnDWlJ5VDYta8zUVVozO/pwzEmFVHEUpgiEDj+39L4oMg== - dependencies: - tslib "^2.1.0" - -"@formatjs/intl@1.14.2": - version "1.14.2" - resolved "https://registry.yarnpkg.com/@formatjs/intl/-/intl-1.14.2.tgz#86584bc2802437eb4f1cddda8c4171b1578048c5" - integrity sha512-bZhKS7STrxR1DOU0zudYKn3wsMsZN+PbJLbZ1JU+cQkjs7l8CzQmjZ+wlzQU1jvjvsypZbJeLnwz2yY7DvktUg== - dependencies: - "@formatjs/ecma402-abstract" "1.9.9" - "@formatjs/fast-memoize" "1.2.0" - "@formatjs/icu-messageformat-parser" "2.0.12" - "@formatjs/intl-displaynames" "5.2.4" - "@formatjs/intl-listformat" "6.3.4" - intl-messageformat "9.9.2" - tslib "^2.1.0" - "@google-cloud/common@^3.4.1": version "3.7.1" resolved "https://registry.yarnpkg.com/@google-cloud/common/-/common-3.7.1.tgz#e6a4b512ea0c72435b853831565bfba6a8dff2ac" @@ -3053,7 +2983,7 @@ dependencies: "@istanbuljs/schema" "^0.1.2" -"@istanbuljs/schema@^0.1.2", "@istanbuljs/schema@^0.1.3": +"@istanbuljs/schema@^0.1.2": version "0.1.3" resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== @@ -3293,14 +3223,6 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" -"@jridgewell/trace-mapping@^0.3.7": - version "0.3.9" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9" - integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ== - dependencies: - "@jridgewell/resolve-uri" "^3.0.3" - "@jridgewell/sourcemap-codec" "^1.4.10" - "@lerna/add@4.0.0": version "4.0.0" resolved "https://registry.yarnpkg.com/@lerna/add/-/add-4.0.0.tgz#c36f57d132502a57b9e7058d1548b7a565ef183f" @@ -7626,14 +7548,6 @@ resolved "https://registry.yarnpkg.com/@types/highlightjs/-/highlightjs-9.12.2.tgz#6b6d460968a975f4ce3ab3907c03cde46a72a02f" integrity sha512-oW2pEKwshxwBW1nVUizWQg/tnhboRtKrUKnF2hd6l4BZ0shr5ZjQ4ra/82+NEH6uWeM8JjrMGCux5enQXOQbTA== -"@types/hoist-non-react-statics@^3.3.1": - version "3.3.1" - resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#1124aafe5118cb591977aeb1ceaaed1070eb039f" - integrity sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA== - dependencies: - "@types/react" "*" - hoist-non-react-statics "^3.3.0" - "@types/html-minifier-terser@^5.0.0": version "5.1.2" resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz#693b316ad323ea97eed6b38ed1a3cc02b1672b57" @@ -7976,15 +7890,6 @@ "@types/scheduler" "*" csstype "^3.0.2" -"@types/react@16 || 17": - version "17.0.27" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.27.tgz#6498ed9b3ad117e818deb5525fa1946c09f2e0e6" - integrity sha512-zgiJwtsggVGtr53MndV7jfiUESTqrbxOcBvwfe6KS/9bzaVPCTDieTWnFNecVNx6EAaapg5xsLLWFfHHR437AA== - dependencies: - "@types/prop-types" "*" - "@types/scheduler" "*" - csstype "^3.0.2" - "@types/react@17.0.2": version "17.0.2" resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8" @@ -9534,17 +9439,7 @@ babel-jest@^27.4.5, babel-jest@^27.5.1: graceful-fs "^4.2.9" slash "^3.0.0" -babel-loader@^8.0.0: - version "8.2.5" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.5.tgz#d45f585e654d5a5d90f5350a779d7647c5ed512e" - integrity sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ== - dependencies: - find-cache-dir "^3.3.1" - loader-utils "^2.0.0" - make-dir "^3.1.0" - schema-utils "^2.6.5" - -babel-loader@^8.2.3: +babel-loader@^8.0.0, babel-loader@^8.2.3: version "8.2.4" resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.4.tgz#95f5023c791b2e9e2ca6f67b0984f39c82ff384b" integrity sha512-8dytA3gcvPPPv4Grjhnt8b5IIiTcq/zeXOPk4iTYI0SVXcsmuGg7JtBRDp8S9X+gJfhQ8ektjXZlDu1Bb33U8A== @@ -10193,22 +10088,22 @@ bytes@3.1.1: integrity sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg== c8@^7.6.0: - version "7.11.2" - resolved "https://registry.yarnpkg.com/c8/-/c8-7.11.2.tgz#2f2103e39079899041e612999a16b31d7ea6d463" - integrity sha512-6ahJSrhS6TqSghHm+HnWt/8Y2+z0hM/FQyB1ybKhAR30+NYL9CTQ1uwHxuWw6U7BHlHv6wvhgOrH81I+lfCkxg== + version "7.11.0" + resolved "https://registry.yarnpkg.com/c8/-/c8-7.11.0.tgz#b3ab4e9e03295a102c47ce11d4ef6d735d9a9ac9" + integrity sha512-XqPyj1uvlHMr+Y1IeRndC2X5P7iJzJlEJwBpCdBbq2JocXOgJfr+JVfJkyNMGROke5LfKrhSFXGFXnwnRJAUJw== dependencies: "@bcoe/v8-coverage" "^0.2.3" - "@istanbuljs/schema" "^0.1.3" + "@istanbuljs/schema" "^0.1.2" find-up "^5.0.0" foreground-child "^2.0.0" - istanbul-lib-coverage "^3.2.0" + istanbul-lib-coverage "^3.0.1" istanbul-lib-report "^3.0.0" - istanbul-reports "^3.1.4" - rimraf "^3.0.2" + istanbul-reports "^3.0.2" + rimraf "^3.0.0" test-exclude "^6.0.0" - v8-to-istanbul "^9.0.0" + v8-to-istanbul "^8.0.0" yargs "^16.2.0" - yargs-parser "^20.2.9" + yargs-parser "^20.2.7" cacache@^12.0.2: version "12.0.4" @@ -11338,9 +11233,9 @@ core-js-compat@^3.20.2, core-js-compat@^3.21.0: semver "7.0.0" core-js-compat@^3.8.1: - version "3.22.1" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.22.1.tgz#47b9c5e79efbf13935f637449fa1cdec8cd9515f" - integrity sha512-CWbNqTluLMvZg1cjsQUbGiCM91dobSHKfDIyCoxuqxthdjGuUlaMbCsSehP3CBiVvG0C7P6UIrC1v0hgFE75jw== + version "3.22.0" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.22.0.tgz#7ce17ab57c378be2c717c7c8ed8f82a50a25b3e4" + integrity sha512-WwA7xbfRGrk8BGaaHlakauVXrlYmAIkk8PNGb1FDQS+Rbrewc3pgFfwJFRw6psmJVAll7Px9UHRYE16oRQnwAQ== dependencies: browserslist "^4.20.2" semver "7.0.0" @@ -11351,14 +11246,14 @@ core-js-pure@^3.16.0: integrity sha512-oxKe64UH049mJqrKkynWp6Vu0Rlm/BTXO/bJZuN2mmR3RtOFNepLlSWDd1eo16PzHpQAoNG97rLU1V/YxesJjw== core-js-pure@^3.8.1, core-js-pure@^3.8.2: - version "3.22.1" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.22.1.tgz#4d94e0c9a7b710da20dadd727fe98b43543119f0" - integrity sha512-TChjCtgcMDc8t12RiwAsThjqrS/VpBlEvDgL009ot4HESzBo3h2FSZNa6ZS1nWKZEPDoulnszxUll9n0/spflQ== + version "3.22.0" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.22.0.tgz#0eaa54b6d1f4ebb4d19976bb4916dfad149a3747" + integrity sha512-ylOC9nVy0ak1N+fPIZj00umoZHgUVqmucklP5RT5N+vJof38klKn8Ze6KGyvchdClvEBr6LcQqJpI216LUMqYA== core-js@^3.0.4, core-js@^3.6.5, core-js@^3.8.2: - version "3.22.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.22.1.tgz#1936e4f1da82675fe22ae10ee60ef638cd9752fd" - integrity sha512-l6CwCLq7XgITOQGhv1dIUmwCFoqFjyQ6zQHUCQlS0xKmb9d6OHIg8jDiEoswhaettT21BSF5qKr6kbvE+aKwxw== + version "3.22.0" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.22.0.tgz#b52007870c5e091517352e833b77f0b2d2b259f3" + integrity sha512-8h9jBweRjMiY+ORO7bdWSeWfHhLPO7whobj7Z2Bl0IDo00C228EdGgH7FE4jGumbEjzcFfkfW8bXgdkEDhnwHQ== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -13977,9 +13872,9 @@ functional-red-black-tree@^1.0.1: integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= functions-have-names@^1.2.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" - integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== + version "1.2.2" + resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.2.tgz#98d93991c39da9361f8e50b337c4f6e41f120e21" + integrity sha512-bLgc3asbWdwPbx2mNk2S49kmJCuQeu0nfmaOgbs8WIyzzkw3r4htszdIi9Q9EMezDPTYuJx2wvjZ/EwgAthpnA== fuse.js@^3.6.1: version "3.6.1" @@ -15443,15 +15338,6 @@ interpret@^2.2.0: resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9" integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw== -intl-messageformat@9.9.2: - version "9.9.2" - resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-9.9.2.tgz#59a364ffbfc882660c9584a6198998c3d06e4eea" - integrity sha512-IR/bOP7XUrCxrlgFlZeHXixIT29BNd/1bOS8leElk5sQfvGvsDVoTGI+wLpvWG4INIBQNj8vjxgxlbquB12vog== - dependencies: - "@formatjs/fast-memoize" "1.2.0" - "@formatjs/icu-messageformat-parser" "2.0.12" - tslib "^2.1.0" - invariant@^2.2.4: version "2.2.4" resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" @@ -16133,7 +16019,7 @@ istanbul-lib-coverage@^3.0.0: resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec" integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg== -istanbul-lib-coverage@^3.0.0-alpha.1, istanbul-lib-coverage@^3.2.0: +istanbul-lib-coverage@^3.0.0-alpha.1, istanbul-lib-coverage@^3.0.1, istanbul-lib-coverage@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3" integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw== @@ -16197,7 +16083,7 @@ istanbul-lib-source-maps@^4.0.0: istanbul-lib-coverage "^3.0.0" source-map "^0.6.1" -istanbul-reports@^3.0.2, istanbul-reports@^3.1.3, istanbul-reports@^3.1.4: +istanbul-reports@^3.0.2, istanbul-reports@^3.1.3: version "3.1.4" resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.4.tgz#1b6f068ecbc6c331040aab5741991273e609e40c" integrity sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw== @@ -20961,22 +20847,6 @@ react-inspector@^5.1.0: is-dom "^1.0.0" prop-types "^15.0.0" -react-intl@^5.20.12: - version "5.20.12" - resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-5.20.12.tgz#1a4969d15c381378cae35912fa2ec7010e27b4f7" - integrity sha512-5Vcjcz/1WRiLMft6daLZpH2To66GV9YYSTJOCSAKaiOox9mAciLJTtHB+3l4zMTVPt0JVHEXEWkILDdSQaSbZw== - dependencies: - "@formatjs/ecma402-abstract" "1.9.9" - "@formatjs/icu-messageformat-parser" "2.0.12" - "@formatjs/intl" "1.14.2" - "@formatjs/intl-displaynames" "5.2.4" - "@formatjs/intl-listformat" "6.3.4" - "@types/hoist-non-react-statics" "^3.3.1" - "@types/react" "16 || 17" - hoist-non-react-statics "^3.3.2" - intl-messageformat "9.9.2" - tslib "^2.1.0" - react-is@17.0.2, react-is@^17.0.1, react-is@^17.0.2: version "17.0.2" resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" @@ -24309,6 +24179,15 @@ v8-compile-cache@^2.0.3: resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== +v8-to-istanbul@^8.0.0: + version "8.1.1" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz#77b752fd3975e31bbcef938f85e9bd1c7a8d60ed" + integrity sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w== + dependencies: + "@types/istanbul-lib-coverage" "^2.0.1" + convert-source-map "^1.6.0" + source-map "^0.7.3" + v8-to-istanbul@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.1.0.tgz#0aeb763894f1a0a1676adf8a8b7612a38902446c" @@ -24318,15 +24197,6 @@ v8-to-istanbul@^8.1.0: convert-source-map "^1.6.0" source-map "^0.7.3" -v8-to-istanbul@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.0.0.tgz#be0dae58719fc53cb97e5c7ac1d7e6d4f5b19511" - integrity sha512-HcvgY/xaRm7isYmyx+lFKA4uQmfUbN0J4M0nNItvzTvH/iQ9kW5j/t4YSR+Ge323/lrgDAWJoF46tzGQHwBHFw== - dependencies: - "@jridgewell/trace-mapping" "^0.3.7" - "@types/istanbul-lib-coverage" "^2.0.1" - convert-source-map "^1.6.0" - v8flags@^2.0.10: version "2.1.1" resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4" @@ -25185,7 +25055,7 @@ yargs-parser@^18.1.2, yargs-parser@^18.1.3: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^20.2.2, yargs-parser@^20.2.3, yargs-parser@^20.2.9: +yargs-parser@^20.2.2, yargs-parser@^20.2.3, yargs-parser@^20.2.7: 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==