refactor(Typing Page): 抽离出 wordList 管理hook

2026-04-05 14:29:04 +08:00 · 2021-02-05 18:26:36 +08:00
parent c84e4e61a0
commit 2e56f62572
8 changed files with 367 additions and 177 deletions
--- a/package.json
+++ b/package.json
@@ -32,11 +32,11 @@
    "prettier": "^2.2.1",
    "react": "^17.0.1",
    "react-app-polyfill": "^2.0.0",
-    "react-cookie": "^4.0.3",
    "react-dom": "^17.0.1",
    "react-hotkeys-hook": "^3.0.3",
    "react-scripts": "4.0.1",
    "react-timer-hook": "^2.0.7",
+    "react-use": "^17.1.0",
    "source-map-explorer": "^2.5.2",
    "typescript": "^4.0.3",
    "use-sound": "^2.0.1",
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -4,17 +4,14 @@ import './index.css'
 import Typing from './pages/Typing'
 import './icon'
 import reportWebVitals from './reportWebVitals'
-import { CookiesProvider } from 'react-cookie'
 import 'react-app-polyfill/stable'
 import { AppSettingsProvider } from 'components/AppSettings'

 ReactDOM.render(
  <React.StrictMode>
-    <CookiesProvider>
    <AppSettingsProvider>
      <Typing />
    </AppSettingsProvider>
-    </CookiesProvider>
  </React.StrictMode>,
  document.getElementById('root'),
 )
--- a/src/pages/Typing/DictSwitcher/index.tsx
+++ b/src/pages/Typing/DictSwitcher/index.tsx
@@ -0,0 +1,52 @@
+import { WordListState, dictList } from '../hooks/useWordList'
+import _ from 'lodash'
+
+export type DictSwitcherPropsType = {
+  dictName: string
+  chapter: number
+  chapterListLength: number
+  changeDict: any
+  changeChapter: any
+}
+
+const DictSwitcher: React.FC<DictSwitcherPropsType> = ({ dictName, chapter, chapterListLength, changeDict, changeChapter }) => {
+  return (
+    <div className="flex items-center justify-center space-x-3">
+      <div>
+        <select
+          value={dictName}
+          onChange={(e) => {
+            changeDict(e.target.value)
+            e.target.blur()
+          }}
+        >
+          {Object.keys(dictList).map((key) => (
+            <option value={key} key={key}>
+              {dictList[key][0]}
+            </option>
+          ))}
+        </select>
+      </div>
+
+      <div>
+        <select
+          value={chapter}
+          onChange={(e) => {
+            changeChapter(parseInt(e.target.value))
+            e.target.blur()
+          }}
+        >
+          {_.range(chapterListLength).map((i) => {
+            return (
+              <option value={i} key={i}>
+                Chap. {i + 1}
+              </option>
+            )
+          })}
+        </select>
+      </div>
+    </div>
+  )
+}
+
+export default DictSwitcher
--- a/src/pages/Typing/Switcher/index.tsx
+++ b/src/pages/Typing/Switcher/index.tsx
@@ -1,6 +1,6 @@
 import React, { Dispatch, useEffect } from 'react'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import { switcherStateType, switcherDispatchType } from './useSwitcherState'
+import { switcherStateType, switcherDispatchType } from '../hooks/useSwitcherState'
 import { useHotkeys } from 'react-hotkeys-hook'

 export type SwitcherPropsType = {
--- a/src/pages/Typing/Switcher/useSwitcherState.ts
+++ b/src/pages/Typing/Switcher/useSwitcherState.ts
--- a/src/pages/Typing/hooks/useWordList.ts
+++ b/src/pages/Typing/hooks/useWordList.ts
@@ -0,0 +1,89 @@
+import { useState, useCallback } from 'react'
+import cet4 from 'assets/CET4_N.json'
+
+export const dictList: any = {
+  cet4: ['CET-4', ''],
+  cet6: ['CET-6', './dicts/CET6_N.json'],
+  gmat: ['GMAT', './dicts/GMAT_N.json'],
+  gre: ['GRE', './dicts/GRE_N.json'],
+  ielts: ['IELTS', './dicts/IELTS_N.json'],
+  kaoyan: ['考研', './dicts/KaoYan_N.json'],
+  level4: ['专四', './dicts/Level4_N.json'],
+  level8: ['专八', './dicts/Level8_N.json'],
+  sat: ['SAT', './dicts/SAT_N.json'],
+  toefl: ['TOEFL', './dicts/TOEFL_N.json'],
+  coder: ['Coder Dict', './dicts/it-words.json'],
+  jsArray: ['js-array', './dicts/js-array.json'],
+  jsDate: ['js-date', './dicts/js-date.json'],
+  jsGlobal: ['js-global', './dicts/js-global.json'],
+  jsMapSet: ['js-map-set', './dicts/js-map-set.json'],
+  jsMath: ['js-math', './dicts/js-math.json'],
+  jsNumber: ['js-number', './dicts/js-number.json'],
+  jsObject: ['js-object', './dicts/js-object.json'],
+  jsPromise: ['js-promise', './dicts/js-promise.json'],
+  jsString: ['js-string', './dicts/js-string.json'],
+}
+
+export type WordType = {
+  name: string
+  trans: string[]
+  usphone: string
+  ukphone: string
+}
+
+export type WordListState = {
+  dictName: string
+  chapter: number
+  chapterListLength: number
+}
+export type wordListDispatchType = (type: string, payload?: any, callback?: any) => void
+
+export const useWordList = (
+  InputchapterLength: number,
+): [dictName: string, chapter: number, chapterListLength: number, wordList: WordType[], dispatch: wordListDispatchType] => {
+  const [chapterLength, setChapterLength] = useState(InputchapterLength)
+  const [dictName, setDictName] = useState<string>('cet4')
+  const [chapter, setChapter] = useState<number>(0)
+  const [dict, setDict] = useState(cet4)
+  const [wordList, setWordList] = useState<WordType[]>(dict.slice(chapter * chapterLength, (chapter + 1) * chapterLength))
+  const [chapterListLength, setChapterListLength] = useState<number>(Math.ceil(cet4.length / chapterLength))
+
+  const dispatch: wordListDispatchType = useCallback(
+    (type, payload, callback) => {
+      switch (type) {
+        case 'setDictName':
+          setDictName(payload)
+
+          if (payload === 'cet4') {
+            const newDict = cet4
+            setDict(newDict)
+            setWordList(newDict.slice(0 * chapterLength, (0 + 1) * chapterLength))
+            setChapterListLength(Math.ceil(newDict.length / chapterLength))
+            if (callback !== undefined) {
+              callback()
+            }
+          } else {
+            fetch(dictList[payload][1])
+              .then((response) => response.json())
+              .then((data) => {
+                const newDict = data
+                setDict(newDict)
+                setWordList(newDict.slice(0 * chapterLength, (0 + 1) * chapterLength))
+                setChapterListLength(Math.ceil(newDict.length / chapterLength))
+                if (callback !== undefined) {
+                  callback()
+                }
+              })
+          }
+          break
+        case 'setChapter':
+          setChapter(payload)
+          setWordList(dict.slice(payload * chapterLength, (payload + 1) * chapterLength))
+          break
+      }
+    },
+    [chapterLength, dict],
+  )
+
+  return [dictName, chapter, chapterListLength, wordList, dispatch]
+}
--- a/src/pages/Typing/index.tsx
+++ b/src/pages/Typing/index.tsx
@@ -12,42 +12,16 @@ import Phonetic from 'components/Phonetic'
 import { isLegal } from 'utils/utils'
 import { useHotkeys } from 'react-hotkeys-hook'
 import { useModals } from 'utils/hooks'
-import { useCookies } from 'react-cookie'
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import useSwitcherState from './Switcher/useSwitcherState'
-import { useAppSettings } from 'components/AppSettings'
+import useSwitcherState from './hooks/useSwitcherState'
 import Switcher from './Switcher'
+import DictSwitcher from './DictSwitcher'
+import { dictList, useWordList } from './hooks/useWordList'
+import { useLocalStorage } from 'react-use'

-import cet4 from 'assets/CET4_N.json'
-
-const dicts: any = {
-  cet4: ['CET-4', ''],
-  cet6: ['CET-6', './dicts/CET6_N.json'],
-  gmat: ['GMAT', './dicts/GMAT_N.json'],
-  gre: ['GRE', './dicts/GRE_N.json'],
-  ielts: ['IELTS', './dicts/IELTS_N.json'],
-  kaoyan: ['考研', './dicts/KaoYan_N.json'],
-  level4: ['专四', './dicts/Level4_N.json'],
-  level8: ['专八', './dicts/Level8_N.json'],
-  sat: ['SAT', './dicts/SAT_N.json'],
-  toefl: ['TOEFL', './dicts/TOEFL_N.json'],
-  coder: ['Coder Dict', './dicts/it-words.json'],
-  jsArray: ['js-array', './dicts/js-array.json'],
-  jsDate: ['js-date', './dicts/js-date.json'],
-  jsGlobal: ['js-global', './dicts/js-global.json'],
-  jsMapSet: ['js-map-set', './dicts/js-map-set.json'],
-  jsMath: ['js-math', './dicts/js-math.json'],
-  jsNumber: ['js-number', './dicts/js-number.json'],
-  jsObject: ['js-object', './dicts/js-object.json'],
-  jsPromise: ['js-promise', './dicts/js-promise.json'],
-  jsString: ['js-string', './dicts/js-string.json'],
-}
-
-type WordType = {
-  name: string
-  trans: string[]
-  usphone: string
-  ukphone: string
+type localStorage = {
+  dictName: string
+  chapter: number
+  order: number
 }

 const App: React.FC = () => {
@@ -55,20 +29,14 @@ const App: React.FC = () => {

  const [order, setOrder] = useState<number>(0)
  const [isLoading, setIsLoading] = useState<boolean>(false)
-  const [dictName, setDictName] = useState<string>('cet4')
-  const [dict, setDict] = useState<Array<WordType>>(cet4)

  const [inputCount, setInputCount] = useState<number>(0)
  const [correctCount, setCorrectCount] = useState<number>(0)
  const [isStart, setIsStart] = useState<boolean>(false)

-  const [chapterListLength, setChapterListLength] = useState<number>(10)
-  const [chapter, setChapter] = useState<number>(0)
-  const [wordList, setWordList] = useState<Array<WordType>>(dict.slice(chapter * chapterLength, (chapter + 1) * chapterLength))
-
-  const [cookies, setCookies] = useCookies()
-
+  const [localStorage, setLocalStorage] = useLocalStorage<localStorage>('Dict')
  const [switcherState, switcherStateDispatch] = useSwitcherState({ wordVisible: true, phonetic: false })
+  const [dictName, chapter, chapterListLength, wordList, wordListDispatch] = useWordList(chapterLength)

  const {
    modalState,
@@ -99,20 +67,21 @@ const App: React.FC = () => {

  useEffect(() => {
    // 首次加载时，读取 cookies
-    const cookieDict = cookies.dict
-    const cookieChapter = parseInt(cookies.chapter)
-    const cookieOrder = parseInt(cookies.order)
-    if (cookieDict && cookieChapter) {
+    console.log(localStorage)
+    if (localStorage) {
+      const cookieDict = localStorage.dictName
+      const cookieChapter = localStorage.chapter
+      const cookieOrder = localStorage.order
      setModalMessage(
        '提示',
-        `您上次练习到字典 ${dicts[cookieDict][0]} 章节 ${cookieChapter + 1} 第${cookieOrder + 1}个单词 ，是否继续？`,
+        `您上次练习到字典 ${dictList[cookieDict][0]} 章节 ${cookieChapter + 1} 第${cookieOrder + 1}个单词 ，是否继续？`,
        '继续上次练习',
        '从头开始',
      )
      setModalHandler(
        () => {
-          changeDict(cookieDict, cookieChapter)
          setOrder(cookieOrder)
+          changeDict(cookieDict, cookieChapter)
          setModalState(false)
        },
        () => {
@@ -149,24 +118,17 @@ const App: React.FC = () => {
  }, [isStart])

  useEffect(() => {
-    setChapterListLength(Math.ceil(dict.length / chapterLength))
-  }, [dict])
-
-  useEffect(() => {
-    setWordList(dict.slice(chapter * chapterLength, (chapter + 1) * chapterLength))
-    setOrder(0)
-  }, [dict, chapter])
-
-  useEffect(() => {
-    setCookies('chapter', chapter, { path: '/' })
-    setCookies('dict', dictName, { path: '/' })
-    setCookies('order', order, { path: '/' })
-  }, [dictName, chapter, order, setCookies])
+    setLocalStorage({
+      dictName,
+      chapter,
+      order: order,
+    })
+  }, [dictName, chapter, order, setLocalStorage])

  const modalHandlerGenerator = (chapter: number, order: number, modalState: boolean) => {
    return () => {
      setOrder(order)
-      setChapter(chapter)
+      wordListDispatch('setChapter', chapter)
      setModalState(modalState)
    }
  }
@@ -193,28 +155,31 @@ const App: React.FC = () => {
      }
    } else {
      setOrder((order) => order + 1)
-      setCorrectCount((count) => count + dict[order].name.trim().length)
+      setCorrectCount((count) => count + wordList[order].name.trim().length)
    }
  }

-  const changeDict = (dictName: string, chaper: number = 0) => {
+  const changeDict = useCallback(
+    (dictName: string, chapter?: number) => {
+      setOrder(0)
      setIsLoading(true)
-    setDictName(dictName)
-
-    if (dictName === 'cet4') {
-      setDict(cet4)
-      setChapter(chaper)
-      setIsLoading(false)
-    } else {
-      fetch(dicts[dictName][1])
-        .then((response) => response.json())
-        .then((data) => {
-          setDict(data)
-          setChapter(chaper)
+      wordListDispatch('setDictName', dictName, () => {
        setIsLoading(false)
+        if (chapter !== undefined) {
+          wordListDispatch('setChapter', chapter)
+        }
      })
-    }
-  }
+    },
+    [wordListDispatch],
+  )
+
+  const changeChapter = useCallback(
+    (chapter: number) => {
+      setOrder(0)
+      wordListDispatch('setChapter', chapter)
+    },
+    [wordListDispatch],
+  )

  return (
    <>
@@ -235,39 +200,13 @@ const App: React.FC = () => {
      {isLoading && <Loading />}
      <div className="h-screen w-full pb-4 flex flex-col items-center">
        <Header>
-          <div>
-            <select
-              value={dictName}
-              onChange={(e) => {
-                changeDict(e.target.value)
-                e.target.blur()
-              }}
-            >
-              {Object.keys(dicts).map((key) => (
-                <option value={key} key={key}>
-                  {dicts[key][0]}
-                </option>
-              ))}
-            </select>
-          </div>
-
-          <div>
-            <select
-              value={chapter}
-              onChange={(e) => {
-                setChapter(parseInt(e.target.value))
-                e.target.blur()
-              }}
-            >
-              {_.range(chapterListLength).map((i) => {
-                return (
-                  <option value={i} key={i}>
-                    Chap. {i + 1}
-                  </option>
-                )
-              })}
-            </select>
-          </div>
+          <DictSwitcher
+            dictName={dictName}
+            chapter={chapter}
+            chapterListLength={chapterListLength}
+            changeDict={changeDict}
+            changeChapter={changeChapter}
+          />
          <Switcher state={switcherState} dispatch={switcherStateDispatch} />
          <div className="group relative">
            <button
--- a/yarn.lock
+++ b/yarn.lock
@@ -1071,6 +1071,13 @@
  dependencies:
    regenerator-runtime "^0.13.4"

+"@babel/runtime@^7.1.2":
+  version "7.12.13"
+  resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.13.tgz#0a21452352b02542db0ffb928ac2d3ca7cb6d66d"
+  integrity sha512-8+3UMPBrjFa/6TtKi/7sehPKqfAm4g6K+YQjyyFOLUTxzOngcRZTlAVY8sc2CORJYqdHQY8gRPHmn+qo15rCBw==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
 "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
  version "7.12.5"
  resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e"
@@ -1625,7 +1632,7 @@
    "@svgr/plugin-svgo" "^5.4.0"
    loader-utils "^2.0.0"

-"@tailwindcss/postcss7-compat@^2.0.2", "tailwindcss@npm:@tailwindcss/postcss7-compat":
+"@tailwindcss/postcss7-compat@^2.0.2", "tailwindcss@npm:@tailwindcss/postcss7-compat@^2.0.2":
  version "2.0.2"
  resolved "https://registry.npmjs.org/@tailwindcss/postcss7-compat/-/postcss7-compat-2.0.2.tgz#49cb21703dfb4447620fceab5cef3285cff8c69d"
  integrity sha512-KM8kjG5dd8qoXBX2a6r3r1TOqhFh8NtFBheG9qpVPwSjrD8wRdoM7s+Xz56HEA1XmeN64gEKqjmY6vm55DiS3Q==
@@ -1739,11 +1746,6 @@
  dependencies:
    "@babel/types" "^7.3.0"

-"@types/cookie@^0.3.3":
-  version "0.3.3"
-  resolved "https://registry.npmjs.org/@types/cookie/-/cookie-0.3.3.tgz#85bc74ba782fb7aa3a514d11767832b0e3bc6803"
-  integrity sha512-LKVP3cgXBT9RYj+t+9FDKwS5tdI+rPBXaNSkma7hvqy35lc7mAokC2zsqWJH0LaqIt3B962nuYI77hsJoT1gow==
-
 "@types/eslint@^7.2.4":
  version "7.2.6"
  resolved "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.6.tgz#5e9aff555a975596c03a98b59ecd103decc70c3c"
@@ -1777,14 +1779,6 @@
  dependencies:
    "@types/node" "*"

-"@types/hoist-non-react-statics@^3.0.1":
-  version "3.3.1"
-  resolved "https://registry.npmjs.org/@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.1"
  resolved "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#3c9ee980f1a10d6021ae6632ca3e79ca2ec4fb50"
@@ -1879,14 +1873,6 @@
  dependencies:
    "@types/react" "^16"

-"@types/react@*":
-  version "17.0.0"
-  resolved "https://registry.npmjs.org/@types/react/-/react-17.0.0.tgz#5af3eb7fad2807092f0046a1302b7823e27919b8"
-  integrity sha512-aj/L7RIMsRlWML3YB6KZiXB3fV2t41+5RBGYF8z+tAKU43Px8C3cYUZsDvf1/+Bm4FK21QWBrDutu8ZJ/70qOw==
-  dependencies:
-    "@types/prop-types" "*"
-    csstype "^3.0.2"
-
 "@types/react@^16", "@types/react@^16.9.53":
  version "16.14.2"
  resolved "https://registry.npmjs.org/@types/react/-/react-16.14.2.tgz#85dcc0947d0645349923c04ccef6018a1ab7538c"
@@ -2217,6 +2203,11 @@
    "@webassemblyjs/wast-parser" "1.9.0"
    "@xtuc/long" "4.2.2"

+"@xobotyi/scrollbar-width@^1.9.5":
+  version "1.9.5"
+  resolved "https://registry.npmjs.org/@xobotyi/scrollbar-width/-/scrollbar-width-1.9.5.tgz#80224a6919272f405b87913ca13b92929bdf3c4d"
+  integrity sha512-N8tkAACJx2ww8vFMneJmaAgmjAG1tnVBZJRLRcx061tmsLRZHSEZSLuGWnwPtunsSLvSqXQ2wfp7Mgqg1I+2dQ==
+
 "@xtuc/ieee754@^1.2.0":
  version "1.2.0"
  resolved "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
@@ -3623,11 +3614,6 @@ cookie@0.4.0:
  resolved "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
  integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==

-cookie@^0.4.0:
-  version "0.4.1"
-  resolved "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
-  integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
-
 copy-concurrently@^1.0.0:
  version "1.0.5"
  resolved "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
@@ -3645,6 +3631,13 @@ copy-descriptor@^0.1.0:
  resolved "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=

+copy-to-clipboard@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz#115aa1a9998ffab6196f93076ad6da3b913662ae"
+  integrity sha512-i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw==
+  dependencies:
+    toggle-selection "^1.0.6"
+
 core-js-compat@^3.6.2, core-js-compat@^3.8.0:
  version "3.8.3"
  resolved "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.3.tgz#9123fb6b9cad30f0651332dc77deba48ef9b0b3f"
@@ -3806,6 +3799,14 @@ css-has-pseudo@^0.10.0:
    postcss "^7.0.6"
    postcss-selector-parser "^5.0.0-rc.4"

+css-in-js-utils@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/css-in-js-utils/-/css-in-js-utils-2.0.1.tgz#3b472b398787291b47cfe3e44fecfdd9e914ba99"
+  integrity sha512-PJF0SpJT+WdbVVt0AOYp9C8GnuruRlL/UFW7932nLWmFLQTaWEzTBQEx7/hn4BuV+WON75iAViSUJLiU3PKbpA==
+  dependencies:
+    hyphenate-style-name "^1.0.2"
+    isobject "^3.0.1"
+
 css-loader@4.3.0:
  version "4.3.0"
  resolved "https://registry.npmjs.org/css-loader/-/css-loader-4.3.0.tgz#c888af64b2a5b2e85462c72c0f4a85c7e2e0821e"
@@ -4003,7 +4004,7 @@ cssstyle@^2.2.0:
  dependencies:
    cssom "~0.3.6"

-csstype@^3.0.2:
+csstype@^3.0.2, csstype@^3.0.6:
  version "3.0.6"
  resolved "https://registry.npmjs.org/csstype/-/csstype-3.0.6.tgz#865d0b5833d7d8d40f4e5b8a6d76aea3de4725ef"
  integrity sha512-+ZAmfyWMT7TiIlzdqJgjMb7S4f1beorDbWbsocyK4RaiqA5RTX3K14bnBWmmA9QEM0gRdsjyyrEmcyga8Zsxmw==
@@ -5046,7 +5047,7 @@ extsprintf@^1.2.0:
  resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=

-fast-deep-equal@^3.1.1:
+fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
  version "3.1.3"
  resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
@@ -5078,6 +5079,16 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
  resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=

+fast-shallow-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/fast-shallow-equal/-/fast-shallow-equal-1.0.0.tgz#d4dcaf6472440dcefa6f88b98e3251e27f25628b"
+  integrity sha512-HPtaa38cPgWvaCFmRNhlc6NG7pv6NUHqjPgVAkWGoB9mQMwYB27/K0CvOM5Czy+qpT3e8XJ6Q4aPAnzpNpzNaw==
+
+fastest-stable-stringify@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.npmjs.org/fastest-stable-stringify/-/fastest-stable-stringify-2.0.2.tgz#3757a6774f6ec8de40c4e86ec28ea02417214c76"
+  integrity sha512-bijHueCGd0LqqNK9b5oCMHc0MluJAx0cwqASgbWMvkO01lCYgIhacVRLcaDz3QnyYIRNJRDwMb41VuT6pHJ91Q==
+
 fastq@^1.6.0:
  version "1.10.1"
  resolved "https://registry.npmjs.org/fastq/-/fastq-1.10.1.tgz#8b8f2ac8bf3632d67afcd65dac248d5fdc45385e"
@@ -5678,13 +5689,6 @@ hmac-drbg@^1.0.0:
    minimalistic-assert "^1.0.0"
    minimalistic-crypto-utils "^1.0.1"

-hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.3.0:
-  version "3.3.2"
-  resolved "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
-  integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
-  dependencies:
-    react-is "^16.7.0"
-
 hoopy@^0.1.4:
  version "0.1.4"
  resolved "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz#609207d661100033a9a9402ad3dea677381c1b1d"
@@ -5888,6 +5892,11 @@ husky@^4.3.8:
    slash "^3.0.0"
    which-pm-runs "^1.0.0"

+hyphenate-style-name@^1.0.2:
+  version "1.0.4"
+  resolved "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz#691879af8e220aea5750e8827db4ef62a54e361d"
+  integrity sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ==
+
 iconv-lite@0.4.24:
  version "0.4.24"
  resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
@@ -6028,6 +6037,13 @@ ini@^1.3.5:
  resolved "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==

+inline-style-prefixer@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-6.0.0.tgz#f73d5dbf2855733d6b153a4d24b7b47a73e9770b"
+  integrity sha512-XTHvRUS4ZJNzC1GixJRmOlWSS45fSt+DJoyQC9ytj0WxQfcgofQtDtyKKYxHUqEsWCs+LIWftPF1ie7+i012Fg==
+  dependencies:
+    css-in-js-utils "^2.0.0"
+
 internal-ip@^4.3.0:
  version "4.3.0"
  resolved "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
@@ -6898,6 +6914,11 @@ jest@26.6.0:
    import-local "^3.0.2"
    jest-cli "^26.6.0"

+js-cookie@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.npmjs.org/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8"
+  integrity sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==
+
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
  version "4.0.0"
  resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -7666,6 +7687,20 @@ nan@^2.12.1:
  resolved "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
  integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==

+nano-css@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.npmjs.org/nano-css/-/nano-css-5.3.1.tgz#b709383e07ad3be61f64edffacb9d98250b87a1f"
+  integrity sha512-ENPIyNzANQRyYVvb62ajDd7PAyIgS2LIUnT9ewih4yrXSZX4hKoUwssy8WjUH++kEOA5wUTMgNnV7ko5n34kUA==
+  dependencies:
+    css-tree "^1.1.2"
+    csstype "^3.0.6"
+    fastest-stable-stringify "^2.0.2"
+    inline-style-prefixer "^6.0.0"
+    rtl-css-js "^1.14.0"
+    sourcemap-codec "^1.4.8"
+    stacktrace-js "^2.0.2"
+    stylis "^4.0.6"
+
 nanoid@^3.1.20:
  version "3.1.20"
  resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz#badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788"
@@ -9392,15 +9427,6 @@ react-app-polyfill@^2.0.0:
    regenerator-runtime "^0.13.7"
    whatwg-fetch "^3.4.1"

-react-cookie@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.npmjs.org/react-cookie/-/react-cookie-4.0.3.tgz#ba8e5ea0047c916516e1181a3ad394c9b7580b56"
-  integrity sha512-cmi6IpdVgTSvjqssqIEvo779Gfqc4uPGHRrKMEdHcqkmGtPmxolGfsyKj95bhdLEKqMdbX8MLBCwezlnhkHK0g==
-  dependencies:
-    "@types/hoist-non-react-statics" "^3.0.1"
-    hoist-non-react-statics "^3.0.0"
-    universal-cookie "^4.0.0"
-
 react-dev-utils@^11.0.1:
  version "11.0.1"
  resolved "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.1.tgz#30106c2055acfd6b047d2dc478a85c356e66fe45"
@@ -9452,7 +9478,7 @@ react-hotkeys-hook@^3.0.3:
  dependencies:
    hotkeys-js "3.8.1"

-react-is@^16.7.0, react-is@^16.8.1:
+react-is@^16.8.1:
  version "16.13.1"
  resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
  integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
@@ -9538,6 +9564,30 @@ react-timer-hook@^2.0.7:
  resolved "https://registry.npmjs.org/react-timer-hook/-/react-timer-hook-2.0.7.tgz#49d998d92cf83fa5d874a1d94116766336666487"
  integrity sha512-kCuCgXLS736lc7hocvHsGzmBdOh3uv1Al9ynIgxmV690nA73UqgYLoGNIxoo6CUoEcyNVARiveBlCRKDQbZIbQ==

+react-universal-interface@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.npmjs.org/react-universal-interface/-/react-universal-interface-0.6.2.tgz#5e8d438a01729a4dbbcbeeceb0b86be146fe2b3b"
+  integrity sha512-dg8yXdcQmvgR13RIlZbTRQOoUrDciFVoSBZILwjE2LFISxZZ8loVJKAkuzswl5js8BHda79bIb2b84ehU8IjXw==
+
+react-use@^17.1.0:
+  version "17.1.0"
+  resolved "https://registry.npmjs.org/react-use/-/react-use-17.1.0.tgz#a2db05f7cca2f09a6b90b2151cd4c620e9582fe8"
+  integrity sha512-BVVG5FWXYhfkQcGhtSYNx3wPh5bvOZieH2iq1h6/WYTDCScade1JqoM5XRHPkYXfFzAzhb8QlAtt9Suj8yAumA==
+  dependencies:
+    "@xobotyi/scrollbar-width" "^1.9.5"
+    copy-to-clipboard "^3.3.1"
+    fast-deep-equal "^3.1.3"
+    fast-shallow-equal "^1.0.0"
+    js-cookie "^2.2.1"
+    nano-css "^5.3.1"
+    react-universal-interface "^0.6.2"
+    resize-observer-polyfill "^1.5.1"
+    screenfull "^5.1.0"
+    set-harmonic-interval "^1.0.1"
+    throttle-debounce "^3.0.1"
+    ts-easing "^0.2.0"
+    tslib "^2.1.0"
+
 react@^17.0.1:
  version "17.0.1"
  resolved "https://registry.npmjs.org/react/-/react-17.0.1.tgz#6e0600416bd57574e3f86d92edba3d9008726127"
@@ -9815,6 +9865,11 @@ requires-port@^1.0.0:
  resolved "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=

+resize-observer-polyfill@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
+  integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==
+
 resolve-cwd@^2.0.0:
  version "2.0.0"
  resolved "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
@@ -9996,6 +10051,13 @@ rsvp@^4.8.4:
  resolved "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
  integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==

+rtl-css-js@^1.14.0:
+  version "1.14.0"
+  resolved "https://registry.npmjs.org/rtl-css-js/-/rtl-css-js-1.14.0.tgz#daa4f192a92509e292a0519f4b255e6e3c076b7d"
+  integrity sha512-Dl5xDTeN3e7scU1cWX8c9b6/Nqz3u/HgR4gePc1kWXYiQWVQbKCEyK6+Hxve9LbcJ5EieHy1J9nJCN3grTtGwg==
+  dependencies:
+    "@babel/runtime" "^7.1.2"
+
 run-parallel@^1.1.9:
  version "1.1.10"
  resolved "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.10.tgz#60a51b2ae836636c81377df16cb107351bcd13ef"
@@ -10115,6 +10177,11 @@ schema-utils@^3.0.0:
    ajv "^6.12.5"
    ajv-keywords "^3.5.2"

+screenfull@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.npmjs.org/screenfull/-/screenfull-5.1.0.tgz#85c13c70f4ead4c1b8a935c70010dfdcd2c0e5c8"
+  integrity sha512-dYaNuOdzr+kc6J6CFcBrzkLCfyGcMg+gWkJ8us93IQ7y1cevhQAugFsaCdMHb6lw8KV3xPzSxzH7zM1dQap9mA==
+
 select-hose@^2.0.0:
  version "2.0.0"
  resolved "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
@@ -10225,6 +10292,11 @@ set-blocking@^2.0.0:
  resolved "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=

+set-harmonic-interval@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/set-harmonic-interval/-/set-harmonic-interval-1.0.1.tgz#e1773705539cdfb80ce1c3d99e7f298bb3995249"
+  integrity sha512-AhICkFV84tBP1aWqPwLZqFvAwqEoVA9kxNMniGEUvzOlm4vLmOFLiTT3UZ6bziJTy4bOVpzWGTfSCbmaayGx8g==
+
 set-value@^2.0.0, set-value@^2.0.1:
  version "2.0.1"
  resolved "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
@@ -10461,6 +10533,11 @@ source-map-url@^0.4.0:
  resolved "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=

+source-map@0.5.6:
+  version "0.5.6"
+  resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
+  integrity sha1-dc449SvwczxafwwRjYEzSiu19BI=
+
 source-map@0.6.1, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
  version "0.6.1"
  resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
@@ -10476,7 +10553,7 @@ source-map@^0.7.3, source-map@~0.7.2:
  resolved "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==

-sourcemap-codec@^1.4.4:
+sourcemap-codec@^1.4.4, sourcemap-codec@^1.4.8:
  version "1.4.8"
  resolved "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
  integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
@@ -10576,6 +10653,13 @@ stable@^0.1.8:
  resolved "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
  integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==

+stack-generator@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.npmjs.org/stack-generator/-/stack-generator-2.0.5.tgz#fb00e5b4ee97de603e0773ea78ce944d81596c36"
+  integrity sha512-/t1ebrbHkrLrDuNMdeAcsvynWgoH/i4o8EGGfX7dEYDoTXOYVAkEpFdtshlvabzc6JlJ8Kf9YdFEoz7JkzGN9Q==
+  dependencies:
+    stackframe "^1.1.1"
+
 stack-utils@^2.0.2:
  version "2.0.3"
  resolved "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.3.tgz#cd5f030126ff116b78ccb3c027fe302713b61277"
@@ -10588,6 +10672,23 @@ stackframe@^1.1.1:
  resolved "https://registry.npmjs.org/stackframe/-/stackframe-1.2.0.tgz#52429492d63c62eb989804c11552e3d22e779303"
  integrity sha512-GrdeshiRmS1YLMYgzF16olf2jJ/IzxXY9lhKOskuVziubpTYcYqyOwYeJKzQkwy7uN0fYSsbsC4RQaXf9LCrYA==

+stacktrace-gps@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.npmjs.org/stacktrace-gps/-/stacktrace-gps-3.0.4.tgz#7688dc2fc09ffb3a13165ebe0dbcaf41bcf0c69a"
+  integrity sha512-qIr8x41yZVSldqdqe6jciXEaSCKw1U8XTXpjDuy0ki/apyTn/r3w9hDAAQOhZdxvsC93H+WwwEu5cq5VemzYeg==
+  dependencies:
+    source-map "0.5.6"
+    stackframe "^1.1.1"
+
+stacktrace-js@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.npmjs.org/stacktrace-js/-/stacktrace-js-2.0.2.tgz#4ca93ea9f494752d55709a081d400fdaebee897b"
+  integrity sha512-Je5vBeY4S1r/RnLydLl0TBTi3F2qdfWmYsGvtfZgEI+SCprPppaIhQf5nGcal4gI4cGpCV/duLcAzT1np6sQqg==
+  dependencies:
+    error-stack-parser "^2.0.6"
+    stack-generator "^2.0.5"
+    stacktrace-gps "^3.0.4"
+
 static-extend@^0.1.1:
  version "0.1.2"
  resolved "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
@@ -10809,6 +10910,11 @@ stylehacks@^4.0.0:
    postcss "^7.0.0"
    postcss-selector-parser "^3.0.0"

+stylis@^4.0.6:
+  version "4.0.7"
+  resolved "https://registry.npmjs.org/stylis/-/stylis-4.0.7.tgz#412a90c28079417f3d27c028035095e4232d2904"
+  integrity sha512-OFFeUXFgwnGOKvEXaSv0D0KQ5ADP0n6g3SVONx6I/85JzNZ3u50FRwB3lVIk1QO2HNdI75tbVzc4Z66Gdp9voA==
+
 supports-color@^5.3.0, supports-color@^5.4.0:
  version "5.5.0"
  resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@@ -10991,6 +11097,11 @@ throat@^5.0.0:
  resolved "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b"
  integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==

+throttle-debounce@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-3.0.1.tgz#32f94d84dfa894f786c9a1f290e7a645b6a19abb"
+  integrity sha512-dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg==
+
 through2@^2.0.0:
  version "2.0.5"
  resolved "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
@@ -11068,6 +11179,11 @@ to-regex@^3.0.1, to-regex@^3.0.2:
    regex-not "^1.0.2"
    safe-regex "^1.1.0"

+toggle-selection@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.npmjs.org/toggle-selection/-/toggle-selection-1.0.6.tgz#6e45b1263f2017fa0acc7d89d78b15b8bf77da32"
+  integrity sha1-bkWxJj8gF/oKzH2J14sVuL932jI=
+
 toidentifier@1.0.0:
  version "1.0.0"
  resolved "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
@@ -11102,6 +11218,11 @@ tryer@^1.0.1:
  resolved "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8"
  integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==

+ts-easing@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.npmjs.org/ts-easing/-/ts-easing-0.2.0.tgz#c8a8a35025105566588d87dbda05dd7fbfa5a4ec"
+  integrity sha512-Z86EW+fFFh/IFB1fqQ3/+7Zpf9t2ebOAxNI/V6Wo7r5gqiqtxmgTlQ1qbqQcjLKYeSHPTsEmvlJUDg/EuL0uHQ==
+
 ts-pnp@1.2.0, ts-pnp@^1.1.6:
  version "1.2.0"
  resolved "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92"
@@ -11122,7 +11243,7 @@ tslib@^1.8.1, tslib@^1.9.0:
  resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==

-tslib@^2.0.3:
+tslib@^2.0.3, tslib@^2.1.0:
  version "2.1.0"
  resolved "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a"
  integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==
@@ -11289,14 +11410,6 @@ unique-string@^1.0.0:
  dependencies:
    crypto-random-string "^1.0.0"

-universal-cookie@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.npmjs.org/universal-cookie/-/universal-cookie-4.0.4.tgz#06e8b3625bf9af049569ef97109b4bb226ad798d"
-  integrity sha512-lbRVHoOMtItjWbM7TwDLdl8wug7izB0tq3/YVKhT/ahB4VDvWMyvnADfnJI8y6fSvsjh51Ix7lTGC6Tn4rMPhw==
-  dependencies:
-    "@types/cookie" "^0.3.3"
-    cookie "^0.4.0"
-
 universalify@^0.1.0:
  version "0.1.2"
  resolved "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"