From 58d3db090ddfebdc8717b93c148bb32b281a4374 Mon Sep 17 00:00:00 2001 From: Haishan Date: Sat, 3 Sep 2022 11:32:13 +0800 Subject: [PATCH] Minor style tweaks --- package.json | 14 +- pnpm-lock.yaml | 499 +++++++++++++++---------------- src/components/Home.module.scss | 3 + src/components/Input.module.scss | 2 +- src/components/Input.tsx | 7 +- src/components/TrafficNow.tsx | 9 +- 6 files changed, 265 insertions(+), 269 deletions(-) diff --git a/package.json b/package.json index 203e20f..626816f 100644 --- a/package.json +++ b/package.json @@ -77,12 +77,12 @@ "@fontsource/inter": "4.5.12", "@types/invariant": "2.2.35", "@types/lodash-es": "4.17.6", - "@types/react": "18.0.17", + "@types/react": "18.0.18", "@types/react-dom": "18.0.6", "@types/react-modal": "3.13.1", "@types/react-window": "1.8.5", - "@typescript-eslint/eslint-plugin": "5.35.1", - "@typescript-eslint/parser": "5.35.1", + "@typescript-eslint/eslint-plugin": "5.36.1", + "@typescript-eslint/parser": "5.36.1", "@vitejs/plugin-react": "2.0.1", "autoprefixer": "10.4.8", "eslint": "8.23.0", @@ -92,18 +92,18 @@ "eslint-plugin-flowtype": "8.0.3", "eslint-plugin-import": "2.26.0", "eslint-plugin-jsx-a11y": "6.6.1", - "eslint-plugin-react": "7.31.1", + "eslint-plugin-react": "7.31.2", "eslint-plugin-react-hooks": "4.6.0", "eslint-plugin-simple-import-sort": "^7.0.0", "postcss": "8.4.16", "postcss-custom-media": "^8.0.2", - "postcss-import": "14.1.0", + "postcss-import": "15.0.0", "postcss-simple-vars": "^6.0.3", "prettier": "2.7.1", "resize-observer-polyfill": "^1.5.1", - "sass": "1.54.5", + "sass": "1.54.8", "typescript": "4.8.2", "vite": "3.0.9", - "vite-plugin-pwa": "0.12.3" + "vite-plugin-pwa": "0.12.6" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3c10a1e..dfdad13 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,12 +10,12 @@ specifiers: '@tanstack/react-query': 4.2.3 '@types/invariant': 2.2.35 '@types/lodash-es': 4.17.6 - '@types/react': 18.0.17 + '@types/react': 18.0.18 '@types/react-dom': 18.0.6 '@types/react-modal': 3.13.1 '@types/react-window': 1.8.5 - '@typescript-eslint/eslint-plugin': 5.35.1 - '@typescript-eslint/parser': 5.35.1 + '@typescript-eslint/eslint-plugin': 5.36.1 + '@typescript-eslint/parser': 5.36.1 '@vitejs/plugin-react': 2.0.1 autoprefixer: 10.4.8 chart.js: 3.9.1 @@ -29,7 +29,7 @@ specifiers: eslint-plugin-flowtype: 8.0.3 eslint-plugin-import: 2.26.0 eslint-plugin-jsx-a11y: 6.6.1 - eslint-plugin-react: 7.31.1 + eslint-plugin-react: 7.31.2 eslint-plugin-react-hooks: 4.6.0 eslint-plugin-simple-import-sort: ^7.0.0 framer-motion: 7.2.1 @@ -44,7 +44,7 @@ specifiers: modern-normalize: 1.1.0 postcss: 8.4.16 postcss-custom-media: ^8.0.2 - postcss-import: 14.1.0 + postcss-import: 15.0.0 postcss-simple-vars: ^6.0.3 prettier: 2.7.1 prop-types: 15.8.1 @@ -65,12 +65,12 @@ specifiers: regenerator-runtime: 0.13.9 reselect: 4.1.6 resize-observer-polyfill: ^1.5.1 - sass: 1.54.5 + sass: 1.54.8 tslib: 2.4.0 typescript: 4.8.2 use-asset: 1.0.4 vite: 3.0.9 - vite-plugin-pwa: 0.12.3 + vite-plugin-pwa: 0.12.6 workbox-core: 6.5.4 workbox-expiration: 6.5.4 workbox-precaching: 6.5.4 @@ -127,12 +127,12 @@ devDependencies: '@fontsource/inter': 4.5.12 '@types/invariant': 2.2.35 '@types/lodash-es': 4.17.6 - '@types/react': 18.0.17 + '@types/react': 18.0.18 '@types/react-dom': 18.0.6 '@types/react-modal': 3.13.1 '@types/react-window': 1.8.5 - '@typescript-eslint/eslint-plugin': 5.35.1_pfwtupu3r4wxmgbx6hj7gwmyuu - '@typescript-eslint/parser': 5.35.1_yqf6kl63nyoq5megxukfnom5rm + '@typescript-eslint/eslint-plugin': 5.36.1_lbwfnm54o3pmr3ypeqp3btnera + '@typescript-eslint/parser': 5.36.1_yqf6kl63nyoq5megxukfnom5rm '@vitejs/plugin-react': 2.0.1_vite@3.0.9 autoprefixer: 10.4.8_postcss@8.4.16 eslint: 8.23.0 @@ -140,21 +140,21 @@ devDependencies: eslint-config-prettier: 8.5.0_eslint@8.23.0 eslint-config-react-app: 7.0.1_yqf6kl63nyoq5megxukfnom5rm eslint-plugin-flowtype: 8.0.3_eslint@8.23.0 - eslint-plugin-import: 2.26.0_kavhtzjob4obuugpatbfgsyfbm + eslint-plugin-import: 2.26.0_wyxuyzvlfep3lsyoibc4fosfq4 eslint-plugin-jsx-a11y: 6.6.1_eslint@8.23.0 - eslint-plugin-react: 7.31.1_eslint@8.23.0 + eslint-plugin-react: 7.31.2_eslint@8.23.0 eslint-plugin-react-hooks: 4.6.0_eslint@8.23.0 eslint-plugin-simple-import-sort: 7.0.0_eslint@8.23.0 postcss: 8.4.16 postcss-custom-media: 8.0.2_postcss@8.4.16 - postcss-import: 14.1.0_postcss@8.4.16 + postcss-import: 15.0.0_postcss@8.4.16 postcss-simple-vars: 6.0.3_postcss@8.4.16 prettier: 2.7.1 resize-observer-polyfill: 1.5.1 - sass: 1.54.5 + sass: 1.54.8 typescript: 4.8.2 - vite: 3.0.9_sass@1.54.5 - vite-plugin-pwa: 0.12.3_vite@3.0.9 + vite: 3.0.9_sass@1.54.8 + vite-plugin-pwa: 0.12.6_vite@3.0.9 packages: @@ -373,8 +373,8 @@ packages: - supports-color dev: true - /@babel/helper-create-class-features-plugin/7.18.9_@babel+core@7.18.13: - resolution: {integrity: sha512-WvypNAYaVh23QcjpMR24CwZY2Nz6hqdOcFdPbNpV56hL5H6KiFheO7Xm1aPdlLQ7d5emYZX7VZwPp9x3z+2opw==} + /@babel/helper-create-class-features-plugin/7.18.13_@babel+core@7.18.13: + resolution: {integrity: sha512-hDvXp+QYxSRL+23mpAlSGxHMDyIGChm0/AwTfTAAK5Ufe40nCsyNdaYCGuK91phn/fVu9kqayImRDkvNAgdrsA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 @@ -442,16 +442,14 @@ packages: - supports-color dev: true - /@babel/helper-define-polyfill-provider/0.3.1_@babel+core@7.18.13: - resolution: {integrity: sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==} + /@babel/helper-define-polyfill-provider/0.3.2_@babel+core@7.18.13: + resolution: {integrity: sha512-r9QJJ+uDWrd+94BSPcP6/de67ygLtvVy6cK4luE6MOuDsZIdoaPBnfSpbO/+LTifjPckbKXRuI9BB/Z2/y3iTg==} peerDependencies: '@babel/core': ^7.4.0-0 dependencies: '@babel/core': 7.18.13 '@babel/helper-compilation-targets': 7.18.9_@babel+core@7.18.13 - '@babel/helper-module-imports': 7.18.6 '@babel/helper-plugin-utils': 7.18.9 - '@babel/traverse': 7.18.13 debug: 4.3.4 lodash.debounce: 4.0.8 resolve: 1.22.1 @@ -586,7 +584,7 @@ packages: '@babel/core': 7.18.13 '@babel/helper-annotate-as-pure': 7.18.6 '@babel/helper-environment-visitor': 7.18.9 - '@babel/helper-wrap-function': 7.18.9 + '@babel/helper-wrap-function': 7.18.11 '@babel/types': 7.18.13 transitivePeerDependencies: - supports-color @@ -686,8 +684,8 @@ packages: - supports-color dev: true - /@babel/helper-wrap-function/7.18.9: - resolution: {integrity: sha512-cG2ru3TRAL6a60tfQflpEfs4ldiPwF6YW3zfJiRgmoFVIaC1vGnBBgatfec+ZUziPHkHSaXAuEck3Cdkf3eRpQ==} + /@babel/helper-wrap-function/7.18.11: + resolution: {integrity: sha512-oBUlbv+rjZLh2Ks9SKi4aL7eKaAXBWleHzU89mP0G6BMUlRxSckk9tSIkgDGydhgFxHuGSlBQZfnaD47oBEB7w==} engines: {node: '>=6.9.0'} dependencies: '@babel/helper-function-name': 7.18.9 @@ -803,8 +801,8 @@ packages: - supports-color dev: true - /@babel/plugin-proposal-async-generator-functions/7.18.6_@babel+core@7.18.13: - resolution: {integrity: sha512-WAz4R9bvozx4qwf74M+sfqPMKfSqwM0phxPTR6iJIi8robgzXwkEgmeJG1gEKhm6sDqT/U9aV3lfcqybIpev8w==} + /@babel/plugin-proposal-async-generator-functions/7.18.10_@babel+core@7.18.13: + resolution: {integrity: sha512-1mFuY2TOsR1hxbjCo4QL+qlIjV07p4H4EUYw2J/WCqsvFV6V9X9z9YhXbWndc/4fw+hYGlDT7egYxliMp5O6Ew==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -838,7 +836,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.13 - '@babel/helper-create-class-features-plugin': 7.18.9_@babel+core@7.18.13 + '@babel/helper-create-class-features-plugin': 7.18.13_@babel+core@7.18.13 '@babel/helper-plugin-utils': 7.18.9 transitivePeerDependencies: - supports-color @@ -865,7 +863,7 @@ packages: '@babel/core': ^7.12.0 dependencies: '@babel/core': 7.18.13 - '@babel/helper-create-class-features-plugin': 7.18.9_@babel+core@7.18.13 + '@babel/helper-create-class-features-plugin': 7.18.13_@babel+core@7.18.13 '@babel/helper-plugin-utils': 7.18.9 '@babel/plugin-syntax-class-static-block': 7.14.5_@babel+core@7.18.13 transitivePeerDependencies: @@ -1115,7 +1113,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.13 - '@babel/helper-create-class-features-plugin': 7.18.9_@babel+core@7.18.13 + '@babel/helper-create-class-features-plugin': 7.18.13_@babel+core@7.18.13 '@babel/helper-plugin-utils': 7.18.9 transitivePeerDependencies: - supports-color @@ -1159,7 +1157,7 @@ packages: dependencies: '@babel/core': 7.18.13 '@babel/helper-annotate-as-pure': 7.18.6 - '@babel/helper-create-class-features-plugin': 7.18.9_@babel+core@7.18.13 + '@babel/helper-create-class-features-plugin': 7.18.13_@babel+core@7.18.13 '@babel/helper-plugin-utils': 7.18.9 '@babel/plugin-syntax-private-property-in-object': 7.14.5_@babel+core@7.18.13 transitivePeerDependencies: @@ -1673,8 +1671,8 @@ packages: '@babel/helper-plugin-utils': 7.18.9 dev: true - /@babel/plugin-transform-destructuring/7.18.9_@babel+core@7.18.13: - resolution: {integrity: sha512-p5VCYNddPLkZTq4XymQIaIfZNJwT9YsjkPOhkVEqt6QIpQFZVM9IltqqYpOEkJoN1DPznmxUDyZ5CTZs/ZCuHA==} + /@babel/plugin-transform-destructuring/7.18.13_@babel+core@7.18.13: + resolution: {integrity: sha512-TodpQ29XekIsex2A+YJPj5ax2plkGa8YYY6mFjCohk/IG9IY42Rtuj1FuDeemfg2ipxIFLzPeA83SIBnlhSIow==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -2349,8 +2347,8 @@ packages: '@babel/helper-plugin-utils': 7.18.9 dev: true - /@babel/plugin-transform-unicode-escapes/7.18.6_@babel+core@7.18.13: - resolution: {integrity: sha512-XNRwQUXYMP7VLuy54cr/KS/WeL3AZeORhrmeZ7iewgu+X2eBqmpaLI/hzqr9ZxCeUoq0ASK4GUzSM0BDhZkLFw==} + /@babel/plugin-transform-unicode-escapes/7.18.10_@babel+core@7.18.13: + resolution: {integrity: sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -2466,8 +2464,8 @@ packages: - supports-color dev: true - /@babel/preset-env/7.18.9_@babel+core@7.18.13: - resolution: {integrity: sha512-75pt/q95cMIHWssYtyfjVlvI+QEZQThQbKvR9xH+F/Agtw/s4Wfc2V9Bwd/P39VtixB7oWxGdH4GteTTwYJWMg==} + /@babel/preset-env/7.18.10_@babel+core@7.18.13: + resolution: {integrity: sha512-wVxs1yjFdW3Z/XkNfXKoblxoHgbtUF7/l3PvvP4m02Qz9TZ6uZGxRVYjSQeR87oQmHco9zWitW5J82DJ7sCjvA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -2479,7 +2477,7 @@ packages: '@babel/helper-validator-option': 7.18.6 '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.18.6_@babel+core@7.18.13 '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.18.9_@babel+core@7.18.13 - '@babel/plugin-proposal-async-generator-functions': 7.18.6_@babel+core@7.18.13 + '@babel/plugin-proposal-async-generator-functions': 7.18.10_@babel+core@7.18.13 '@babel/plugin-proposal-class-properties': 7.18.6_@babel+core@7.18.13 '@babel/plugin-proposal-class-static-block': 7.18.6_@babel+core@7.18.13 '@babel/plugin-proposal-dynamic-import': 7.18.6_@babel+core@7.18.13 @@ -2515,7 +2513,7 @@ packages: '@babel/plugin-transform-block-scoping': 7.18.9_@babel+core@7.18.13 '@babel/plugin-transform-classes': 7.18.9_@babel+core@7.18.13 '@babel/plugin-transform-computed-properties': 7.18.9_@babel+core@7.18.13 - '@babel/plugin-transform-destructuring': 7.18.9_@babel+core@7.18.13 + '@babel/plugin-transform-destructuring': 7.18.13_@babel+core@7.18.13 '@babel/plugin-transform-dotall-regex': 7.18.6_@babel+core@7.18.13 '@babel/plugin-transform-duplicate-keys': 7.18.9_@babel+core@7.18.13 '@babel/plugin-transform-exponentiation-operator': 7.18.6_@babel+core@7.18.13 @@ -2539,14 +2537,14 @@ packages: '@babel/plugin-transform-sticky-regex': 7.18.6_@babel+core@7.18.13 '@babel/plugin-transform-template-literals': 7.18.9_@babel+core@7.18.13 '@babel/plugin-transform-typeof-symbol': 7.18.9_@babel+core@7.18.13 - '@babel/plugin-transform-unicode-escapes': 7.18.6_@babel+core@7.18.13 + '@babel/plugin-transform-unicode-escapes': 7.18.10_@babel+core@7.18.13 '@babel/plugin-transform-unicode-regex': 7.18.6_@babel+core@7.18.13 '@babel/preset-modules': 0.1.5_@babel+core@7.18.13 '@babel/types': 7.18.13 - babel-plugin-polyfill-corejs2: 0.3.1_@babel+core@7.18.13 - babel-plugin-polyfill-corejs3: 0.5.2_@babel+core@7.18.13 - babel-plugin-polyfill-regenerator: 0.3.1_@babel+core@7.18.13 - core-js-compat: 3.23.5 + babel-plugin-polyfill-corejs2: 0.3.2_@babel+core@7.18.13 + babel-plugin-polyfill-corejs3: 0.5.3_@babel+core@7.18.13 + babel-plugin-polyfill-regenerator: 0.4.0_@babel+core@7.18.13 + core-js-compat: 3.25.0 semver: 6.3.0 transitivePeerDependencies: - supports-color @@ -3021,7 +3019,7 @@ packages: tslib: 2.4.0 dev: false - /@rollup/plugin-babel/5.3.1_iiztohilof6rnf2lard37ehhqq: + /@rollup/plugin-babel/5.3.1_qa5xd24o3tymwictiiptlhxtom: resolution: {integrity: sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==} engines: {node: '>= 10.0.0'} peerDependencies: @@ -3034,36 +3032,36 @@ packages: dependencies: '@babel/core': 7.18.13 '@babel/helper-module-imports': 7.18.6 - '@rollup/pluginutils': 3.1.0_rollup@2.77.0 - rollup: 2.77.0 + '@rollup/pluginutils': 3.1.0_rollup@2.79.0 + rollup: 2.79.0 dev: true - /@rollup/plugin-node-resolve/11.2.1_rollup@2.77.0: + /@rollup/plugin-node-resolve/11.2.1_rollup@2.79.0: resolution: {integrity: sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==} engines: {node: '>= 10.0.0'} peerDependencies: rollup: ^1.20.0||^2.0.0 dependencies: - '@rollup/pluginutils': 3.1.0_rollup@2.77.0 + '@rollup/pluginutils': 3.1.0_rollup@2.79.0 '@types/resolve': 1.17.1 builtin-modules: 3.3.0 deepmerge: 4.2.2 is-module: 1.0.0 resolve: 1.22.1 - rollup: 2.77.0 + rollup: 2.79.0 dev: true - /@rollup/plugin-replace/2.4.2_rollup@2.77.0: + /@rollup/plugin-replace/2.4.2_rollup@2.79.0: resolution: {integrity: sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==} peerDependencies: rollup: ^1.20.0 || ^2.0.0 dependencies: - '@rollup/pluginutils': 3.1.0_rollup@2.77.0 + '@rollup/pluginutils': 3.1.0_rollup@2.79.0 magic-string: 0.25.9 - rollup: 2.77.0 + rollup: 2.79.0 dev: true - /@rollup/pluginutils/3.1.0_rollup@2.77.0: + /@rollup/pluginutils/3.1.0_rollup@2.79.0: resolution: {integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==} engines: {node: '>= 8.0.0'} peerDependencies: @@ -3072,7 +3070,7 @@ packages: '@types/estree': 0.0.39 estree-walker: 1.0.1 picomatch: 2.3.1 - rollup: 2.77.0 + rollup: 2.79.0 dev: true /@rushstack/eslint-patch/1.1.3: @@ -3137,8 +3135,8 @@ packages: resolution: {integrity: sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==} dev: true - /@types/node/18.0.6: - resolution: {integrity: sha512-/xUq6H2aQm261exT6iZTMifUySEt4GR5KX8eYyY+C4MSNPqSh9oNIP7tz2GLKTlFaiBbgZNxffoR3CVRG+cljw==} + /@types/node/18.7.14: + resolution: {integrity: sha512-6bbDaETVi8oyIARulOE9qF1/Qdi/23z6emrUh0fNJRUmjznqrixD4MpGDdgOFk5Xb0m2H6Xu42JGdvAxaJR/wA==} dev: true /@types/parse-json/4.0.0: @@ -3152,23 +3150,23 @@ packages: /@types/react-dom/18.0.6: resolution: {integrity: sha512-/5OFZgfIPSwy+YuIBP/FgJnQnsxhZhjjrnxudMddeblOouIodEQ75X14Rr4wGSG/bknL+Omy9iWlLo1u/9GzAA==} dependencies: - '@types/react': 18.0.17 + '@types/react': 18.0.18 dev: true /@types/react-modal/3.13.1: resolution: {integrity: sha512-iY/gPvTDIy6Z+37l+ibmrY+GTV4KQTHcCyR5FIytm182RQS69G5ps4PH2FxtC7bAQ2QRHXMevsBgck7IQruHNg==} dependencies: - '@types/react': 18.0.17 + '@types/react': 18.0.18 dev: true /@types/react-window/1.8.5: resolution: {integrity: sha512-V9q3CvhC9Jk9bWBOysPGaWy/Z0lxYcTXLtLipkt2cnRj1JOSFNF7wqGpkScSXMgBwC+fnVRg/7shwgddBG5ICw==} dependencies: - '@types/react': 18.0.17 + '@types/react': 18.0.18 dev: true - /@types/react/18.0.17: - resolution: {integrity: sha512-38ETy4tL+rn4uQQi7mB81G7V1g0u2ryquNmsVIOKUAEIDK+3CUjZ6rSRpdvS99dNBnkLFL83qfmtLacGOTIhwQ==} + /@types/react/18.0.18: + resolution: {integrity: sha512-6hI08umYs6NaiHFEEGioXnxJ+oEhY3eRz8VCUaudZmGdtvPviCJB8mgaMxaDWAdPSYd4eFavrPk2QIolwbLYrg==} dependencies: '@types/prop-types': 15.7.5 '@types/scheduler': 0.16.2 @@ -3178,7 +3176,7 @@ packages: /@types/resolve/1.17.1: resolution: {integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==} dependencies: - '@types/node': 18.0.6 + '@types/node': 18.7.14 dev: true /@types/scheduler/0.16.2: @@ -3193,8 +3191,8 @@ packages: resolution: {integrity: sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA==} dev: false - /@typescript-eslint/eslint-plugin/5.35.1_pfwtupu3r4wxmgbx6hj7gwmyuu: - resolution: {integrity: sha512-RBZZXZlI4XCY4Wzgy64vB+0slT9+yAPQRjj/HSaRwUot33xbDjF1oN9BLwOLTewoOI0jothIltZRe9uJCHf8gg==} + /@typescript-eslint/eslint-plugin/5.36.1_lbwfnm54o3pmr3ypeqp3btnera: + resolution: {integrity: sha512-iC40UK8q1tMepSDwiLbTbMXKDxzNy+4TfPWgIL661Ym0sD42vRcQU93IsZIrmi+x292DBr60UI/gSwfdVYexCA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: '@typescript-eslint/parser': ^5.0.0 @@ -3204,10 +3202,10 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/parser': 5.35.1_yqf6kl63nyoq5megxukfnom5rm - '@typescript-eslint/scope-manager': 5.35.1 - '@typescript-eslint/type-utils': 5.35.1_yqf6kl63nyoq5megxukfnom5rm - '@typescript-eslint/utils': 5.35.1_yqf6kl63nyoq5megxukfnom5rm + '@typescript-eslint/parser': 5.36.1_yqf6kl63nyoq5megxukfnom5rm + '@typescript-eslint/scope-manager': 5.36.1 + '@typescript-eslint/type-utils': 5.36.1_yqf6kl63nyoq5megxukfnom5rm + '@typescript-eslint/utils': 5.36.1_yqf6kl63nyoq5megxukfnom5rm debug: 4.3.4 eslint: 8.23.0 functional-red-black-tree: 1.0.1 @@ -3233,8 +3231,8 @@ packages: - typescript dev: true - /@typescript-eslint/parser/5.35.1_yqf6kl63nyoq5megxukfnom5rm: - resolution: {integrity: sha512-XL2TBTSrh3yWAsMYpKseBYTVpvudNf69rPOWXWVBI08My2JVT5jR66eTt4IgQFHA/giiKJW5dUD4x/ZviCKyGg==} + /@typescript-eslint/parser/5.36.1_yqf6kl63nyoq5megxukfnom5rm: + resolution: {integrity: sha512-/IsgNGOkBi7CuDfUbwt1eOqUXF9WGVBW9dwEe1pi+L32XrTsZIgmDFIi2RxjzsvB/8i+MIf5JIoTEH8LOZ368A==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 @@ -3243,9 +3241,9 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/scope-manager': 5.35.1 - '@typescript-eslint/types': 5.35.1 - '@typescript-eslint/typescript-estree': 5.35.1_typescript@4.8.2 + '@typescript-eslint/scope-manager': 5.36.1 + '@typescript-eslint/types': 5.36.1 + '@typescript-eslint/typescript-estree': 5.36.1_typescript@4.8.2 debug: 4.3.4 eslint: 8.23.0 typescript: 4.8.2 @@ -3269,16 +3267,16 @@ packages: '@typescript-eslint/visitor-keys': 5.27.0 dev: true - /@typescript-eslint/scope-manager/5.35.1: - resolution: {integrity: sha512-kCYRSAzIW9ByEIzmzGHE50NGAvAP3wFTaZevgWva7GpquDyFPFcmvVkFJGWJJktg/hLwmys/FZwqM9EKr2u24Q==} + /@typescript-eslint/scope-manager/5.36.1: + resolution: {integrity: sha512-pGC2SH3/tXdu9IH3ItoqciD3f3RRGCh7hb9zPdN2Drsr341zgd6VbhP5OHQO/reUqihNltfPpMpTNihFMarP2w==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - '@typescript-eslint/types': 5.35.1 - '@typescript-eslint/visitor-keys': 5.35.1 + '@typescript-eslint/types': 5.36.1 + '@typescript-eslint/visitor-keys': 5.36.1 dev: true - /@typescript-eslint/type-utils/5.35.1_yqf6kl63nyoq5megxukfnom5rm: - resolution: {integrity: sha512-8xT8ljvo43Mp7BiTn1vxLXkjpw8wS4oAc00hMSB4L1/jIiYbjjnc3Qp2GAUOG/v8zsNCd1qwcqfCQ0BuishHkw==} + /@typescript-eslint/type-utils/5.36.1_yqf6kl63nyoq5megxukfnom5rm: + resolution: {integrity: sha512-xfZhfmoQT6m3lmlqDvDzv9TiCYdw22cdj06xY0obSznBsT///GK5IEZQdGliXpAOaRL34o8phEvXzEo/VJx13Q==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: '*' @@ -3287,7 +3285,8 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/utils': 5.35.1_yqf6kl63nyoq5megxukfnom5rm + '@typescript-eslint/typescript-estree': 5.36.1_typescript@4.8.2 + '@typescript-eslint/utils': 5.36.1_yqf6kl63nyoq5megxukfnom5rm debug: 4.3.4 eslint: 8.23.0 tsutils: 3.21.0_typescript@4.8.2 @@ -3306,8 +3305,8 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@typescript-eslint/types/5.35.1: - resolution: {integrity: sha512-FDaujtsH07VHzG0gQ6NDkVVhi1+rhq0qEvzHdJAQjysN+LHDCKDKCBRlZFFE0ec0jKxiv0hN63SNfExy0KrbQQ==} + /@typescript-eslint/types/5.36.1: + resolution: {integrity: sha512-jd93ShpsIk1KgBTx9E+hCSEuLCUFwi9V/urhjOWnOaksGZFbTOxAT47OH2d4NLJnLhkVD+wDbB48BuaycZPLBg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true @@ -3353,8 +3352,8 @@ packages: - supports-color dev: true - /@typescript-eslint/typescript-estree/5.35.1_typescript@4.8.2: - resolution: {integrity: sha512-JUqE1+VRTGyoXlDWWjm6MdfpBYVq+hixytrv1oyjYIBEOZhBCwtpp5ZSvBt4wIA1MKWlnaC2UXl2XmYGC3BoQA==} + /@typescript-eslint/typescript-estree/5.36.1_typescript@4.8.2: + resolution: {integrity: sha512-ih7V52zvHdiX6WcPjsOdmADhYMDN15SylWRZrT2OMy80wzKbc79n8wFW0xpWpU0x3VpBz/oDgTm2xwDAnFTl+g==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: typescript: '*' @@ -3362,8 +3361,8 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/types': 5.35.1 - '@typescript-eslint/visitor-keys': 5.35.1 + '@typescript-eslint/types': 5.36.1 + '@typescript-eslint/visitor-keys': 5.36.1 debug: 4.3.4 globby: 11.1.0 is-glob: 4.0.3 @@ -3410,16 +3409,16 @@ packages: - typescript dev: true - /@typescript-eslint/utils/5.35.1_yqf6kl63nyoq5megxukfnom5rm: - resolution: {integrity: sha512-v6F8JNXgeBWI4pzZn36hT2HXXzoBBBJuOYvoQiaQaEEjdi5STzux3Yj8v7ODIpx36i/5s8TdzuQ54TPc5AITQQ==} + /@typescript-eslint/utils/5.36.1_yqf6kl63nyoq5megxukfnom5rm: + resolution: {integrity: sha512-lNj4FtTiXm5c+u0pUehozaUWhh7UYKnwryku0nxJlYUEWetyG92uw2pr+2Iy4M/u0ONMKzfrx7AsGBTCzORmIg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: '@types/json-schema': 7.0.11 - '@typescript-eslint/scope-manager': 5.35.1 - '@typescript-eslint/types': 5.35.1 - '@typescript-eslint/typescript-estree': 5.35.1_typescript@4.8.2 + '@typescript-eslint/scope-manager': 5.36.1 + '@typescript-eslint/types': 5.36.1 + '@typescript-eslint/typescript-estree': 5.36.1_typescript@4.8.2 eslint: 8.23.0 eslint-scope: 5.1.1 eslint-utils: 3.0.0_eslint@8.23.0 @@ -3444,11 +3443,11 @@ packages: eslint-visitor-keys: 3.3.0 dev: true - /@typescript-eslint/visitor-keys/5.35.1: - resolution: {integrity: sha512-cEB1DvBVo1bxbW/S5axbGPE6b7FIMAbo3w+AGq6zNDA7+NYJOIkKj/sInfTv4edxd4PxJSgdN4t6/pbvgA+n5g==} + /@typescript-eslint/visitor-keys/5.36.1: + resolution: {integrity: sha512-ojB9aRyRFzVMN3b5joSYni6FAS10BBSCAfKJhjJAV08t/a95aM6tAhz+O1jF+EtgxktuSO3wJysp2R+Def/IWQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - '@typescript-eslint/types': 5.35.1 + '@typescript-eslint/types': 5.36.1 eslint-visitor-keys: 3.3.0 dev: true @@ -3465,7 +3464,7 @@ packages: '@babel/plugin-transform-react-jsx-source': 7.18.6_@babel+core@7.18.13 magic-string: 0.26.2 react-refresh: 0.14.0 - vite: 3.0.9_sass@1.54.5 + vite: 3.0.9_sass@1.54.8 transitivePeerDependencies: - supports-color dev: true @@ -3573,7 +3572,7 @@ packages: dependencies: call-bind: 1.0.2 define-properties: 1.1.4 - es-abstract: 1.20.1 + es-abstract: 1.20.2 es-shim-unscopables: 1.0.0 dev: true @@ -3643,14 +3642,14 @@ packages: - supports-color dev: true - /babel-plugin-polyfill-corejs2/0.3.1_@babel+core@7.18.13: - resolution: {integrity: sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==} + /babel-plugin-polyfill-corejs2/0.3.2_@babel+core@7.18.13: + resolution: {integrity: sha512-LPnodUl3lS0/4wN3Rb+m+UK8s7lj2jcLRrjho4gLw+OJs+I4bvGXshINesY5xx/apM+biTnQ9reDI8yj+0M5+Q==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: '@babel/compat-data': 7.18.13 '@babel/core': 7.18.13 - '@babel/helper-define-polyfill-provider': 0.3.1_@babel+core@7.18.13 + '@babel/helper-define-polyfill-provider': 0.3.2_@babel+core@7.18.13 semver: 6.3.0 transitivePeerDependencies: - supports-color @@ -3668,14 +3667,14 @@ packages: - supports-color dev: true - /babel-plugin-polyfill-corejs3/0.5.2_@babel+core@7.18.13: - resolution: {integrity: sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==} + /babel-plugin-polyfill-corejs3/0.5.3_@babel+core@7.18.13: + resolution: {integrity: sha512-zKsXDh0XjnrUEW0mxIHLfjBfnXSMr5Q/goMe/fxpQnLm07mcOZiIZHBNWCMx60HmdvjxfXcalac0tfFg0wqxyw==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.13 - '@babel/helper-define-polyfill-provider': 0.3.1_@babel+core@7.18.13 - core-js-compat: 3.22.4 + '@babel/helper-define-polyfill-provider': 0.3.2_@babel+core@7.18.13 + core-js-compat: 3.25.0 transitivePeerDependencies: - supports-color dev: true @@ -3691,13 +3690,13 @@ packages: - supports-color dev: true - /babel-plugin-polyfill-regenerator/0.3.1_@babel+core@7.18.13: - resolution: {integrity: sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==} + /babel-plugin-polyfill-regenerator/0.4.0_@babel+core@7.18.13: + resolution: {integrity: sha512-RW1cnryiADFeHmfLS+WW/G431p1PsW5qdRdz0SDRi7TKcUgc7Oh/uXkT7MZ/+tGsT1BkczEAmD5XjUyJ5SWDTw==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.18.13 - '@babel/helper-define-polyfill-provider': 0.3.1_@babel+core@7.18.13 + '@babel/helper-define-polyfill-provider': 0.3.2_@babel+core@7.18.13 transitivePeerDependencies: - supports-color dev: true @@ -3892,8 +3891,8 @@ packages: semver: 7.0.0 dev: true - /core-js-compat/3.23.5: - resolution: {integrity: sha512-fHYozIFIxd+91IIbXJgWd/igXIc8Mf9is0fusswjnGIWVG96y2cwyUdlCkGOw6rMLHKAxg7xtCIVaHsyOUnJIg==} + /core-js-compat/3.25.0: + resolution: {integrity: sha512-extKQM0g8/3GjFx9US12FAgx8KJawB7RCQ5y8ipYLbmfzEzmFRWdDjIlxDx82g7ygcNG85qMVUSRyABouELdow==} dependencies: browserslist: 4.21.3 semver: 7.0.0 @@ -4107,6 +4106,35 @@ packages: unbox-primitive: 1.0.2 dev: true + /es-abstract/1.20.2: + resolution: {integrity: sha512-XxXQuVNrySBNlEkTYJoDNFe5+s2yIOpzq80sUHEdPdQr0S5nTLz4ZPPPswNIpKseDDUS5yghX1gfLIHQZ1iNuQ==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + es-to-primitive: 1.2.1 + function-bind: 1.1.1 + function.prototype.name: 1.1.5 + get-intrinsic: 1.1.2 + get-symbol-description: 1.0.0 + has: 1.0.3 + has-property-descriptors: 1.0.0 + has-symbols: 1.0.3 + internal-slot: 1.0.3 + is-callable: 1.2.4 + is-negative-zero: 2.0.2 + is-regex: 1.1.4 + is-shared-array-buffer: 1.0.2 + is-string: 1.0.7 + is-weakref: 1.0.2 + object-inspect: 1.12.2 + object-keys: 1.1.1 + object.assign: 4.1.4 + regexp.prototype.flags: 1.4.3 + string.prototype.trimend: 1.0.5 + string.prototype.trimstart: 1.0.5 + unbox-primitive: 1.0.2 + dev: true + /es-shim-unscopables/1.0.0: resolution: {integrity: sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==} dependencies: @@ -4355,7 +4383,7 @@ packages: dependencies: confusing-browser-globals: 1.0.11 eslint: 8.23.0 - eslint-plugin-import: 2.26.0_kavhtzjob4obuugpatbfgsyfbm + eslint-plugin-import: 2.26.0_wyxuyzvlfep3lsyoibc4fosfq4 object.assign: 4.1.2 object.entries: 1.1.5 semver: 6.3.0 @@ -4383,16 +4411,16 @@ packages: '@babel/core': 7.17.10 '@babel/eslint-parser': 7.17.0_lsex7ygrzd3zqwnugixc6yhawa '@rushstack/eslint-patch': 1.1.3 - '@typescript-eslint/eslint-plugin': 5.35.1_pfwtupu3r4wxmgbx6hj7gwmyuu - '@typescript-eslint/parser': 5.35.1_yqf6kl63nyoq5megxukfnom5rm + '@typescript-eslint/eslint-plugin': 5.36.1_lbwfnm54o3pmr3ypeqp3btnera + '@typescript-eslint/parser': 5.36.1_yqf6kl63nyoq5megxukfnom5rm babel-preset-react-app: 10.0.1 confusing-browser-globals: 1.0.11 eslint: 8.23.0 eslint-plugin-flowtype: 8.0.3_eslint@8.23.0 - eslint-plugin-import: 2.26.0_kavhtzjob4obuugpatbfgsyfbm - eslint-plugin-jest: 25.7.0_ut56vft6kevoww5nsd7lm4ihue + eslint-plugin-import: 2.26.0_wyxuyzvlfep3lsyoibc4fosfq4 + eslint-plugin-jest: 25.7.0_vj2biyzi5xv6yshnzimrvgmo7e eslint-plugin-jsx-a11y: 6.6.1_eslint@8.23.0 - eslint-plugin-react: 7.31.1_eslint@8.23.0 + eslint-plugin-react: 7.31.2_eslint@8.23.0 eslint-plugin-react-hooks: 4.6.0_eslint@8.23.0 eslint-plugin-testing-library: 5.4.0_yqf6kl63nyoq5megxukfnom5rm typescript: 4.8.2 @@ -4414,7 +4442,7 @@ packages: - supports-color dev: true - /eslint-module-utils/2.7.3_v26d7mdxwhyqykunawffqp7s2m: + /eslint-module-utils/2.7.3_632zrvmnhpkgiajg2zqauquf6u: resolution: {integrity: sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==} engines: {node: '>=4'} peerDependencies: @@ -4432,7 +4460,7 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 5.35.1_yqf6kl63nyoq5megxukfnom5rm + '@typescript-eslint/parser': 5.36.1_yqf6kl63nyoq5megxukfnom5rm debug: 3.2.7 eslint-import-resolver-node: 0.3.6 find-up: 2.1.0 @@ -4453,7 +4481,7 @@ packages: string-natural-compare: 3.0.1 dev: true - /eslint-plugin-import/2.26.0_kavhtzjob4obuugpatbfgsyfbm: + /eslint-plugin-import/2.26.0_wyxuyzvlfep3lsyoibc4fosfq4: resolution: {integrity: sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==} engines: {node: '>=4'} peerDependencies: @@ -4463,14 +4491,14 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 5.35.1_yqf6kl63nyoq5megxukfnom5rm + '@typescript-eslint/parser': 5.36.1_yqf6kl63nyoq5megxukfnom5rm array-includes: 3.1.5 array.prototype.flat: 1.3.0 debug: 2.6.9 doctrine: 2.1.0 eslint: 8.23.0 eslint-import-resolver-node: 0.3.6 - eslint-module-utils: 2.7.3_v26d7mdxwhyqykunawffqp7s2m + eslint-module-utils: 2.7.3_632zrvmnhpkgiajg2zqauquf6u has: 1.0.3 is-core-module: 2.9.0 is-glob: 4.0.3 @@ -4484,7 +4512,7 @@ packages: - supports-color dev: true - /eslint-plugin-jest/25.7.0_ut56vft6kevoww5nsd7lm4ihue: + /eslint-plugin-jest/25.7.0_vj2biyzi5xv6yshnzimrvgmo7e: resolution: {integrity: sha512-PWLUEXeeF7C9QGKqvdSbzLOiLTx+bno7/HC9eefePfEb257QFHg7ye3dh80AZVkaa/RQsBB1Q/ORQvg2X7F0NQ==} engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} peerDependencies: @@ -4497,7 +4525,7 @@ packages: jest: optional: true dependencies: - '@typescript-eslint/eslint-plugin': 5.35.1_pfwtupu3r4wxmgbx6hj7gwmyuu + '@typescript-eslint/eslint-plugin': 5.36.1_lbwfnm54o3pmr3ypeqp3btnera '@typescript-eslint/experimental-utils': 5.22.0_yqf6kl63nyoq5megxukfnom5rm eslint: 8.23.0 transitivePeerDependencies: @@ -4536,8 +4564,8 @@ packages: eslint: 8.23.0 dev: true - /eslint-plugin-react/7.31.1_eslint@8.23.0: - resolution: {integrity: sha512-j4/2xWqt/R7AZzG8CakGHA6Xa/u7iR8Q3xCxY+AUghdT92bnIDOBEefV456OeH0QvBcroVc0eyvrrLSyQGYIfg==} + /eslint-plugin-react/7.31.2_eslint@8.23.0: + resolution: {integrity: sha512-l8uMqMohh0YnM4bhUThmEgSx7sr7xTMPRRAHD0CBNRZvtwJ9/LVVML6LfoYzSFQgJYW/ZkjLTyYvNOAo8oKRNw==} engines: {node: '>=4'} peerDependencies: eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 @@ -5018,13 +5046,8 @@ packages: '@babel/runtime': 7.18.9 dev: false - /idb/6.1.5: - resolution: {integrity: sha512-IJtugpKkiVXQn5Y+LteyBCNk1N8xpGV3wWZk9EVtZWH8DYkjBn0bX1XnGP9RkyZF0sAcywa6unHqSWKe7q4LGw==} - dev: true - /idb/7.0.2: resolution: {integrity: sha512-jjKrT1EnyZewQ/gCBb/eyiYrhGzws2FeY92Yx8qT9S9GeQAmo4JFVIiWRIfKW/6Ob9A+UDAOW9j9jn58fy2HIg==} - dev: false /ignore/5.2.0: resolution: {integrity: sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==} @@ -5228,7 +5251,7 @@ packages: resolution: {integrity: sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 18.0.6 + '@types/node': 18.7.14 merge-stream: 2.0.0 supports-color: 7.2.0 dev: true @@ -5547,14 +5570,14 @@ packages: dependencies: call-bind: 1.0.2 define-properties: 1.1.4 - es-abstract: 1.20.1 + es-abstract: 1.20.2 dev: true /object.hasown/1.1.1: resolution: {integrity: sha512-LYLe4tivNQzq4JdaWW6WO3HMZZJWzkkH8fnI6EebWl0VZth2wL2Lovm74ep2/gZzlaTdV62JZHEqHQ2yVn8Q/A==} dependencies: define-properties: 1.1.4 - es-abstract: 1.20.1 + es-abstract: 1.20.2 dev: true /object.values/1.1.5: @@ -5673,7 +5696,7 @@ packages: dev: true /pify/2.3.0: - resolution: {integrity: sha1-7RQaasBDqEnqWISY59yosVMw6Qw=} + resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==} engines: {node: '>=0.10.0'} dev: true @@ -5696,16 +5719,16 @@ packages: postcss-value-parser: 4.2.0 dev: true - /postcss-import/14.1.0_postcss@8.4.16: - resolution: {integrity: sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==} - engines: {node: '>=10.0.0'} + /postcss-import/15.0.0_postcss@8.4.16: + resolution: {integrity: sha512-Y20shPQ07RitgBGv2zvkEAu9bqvrD77C9axhj/aA1BQj4czape2MdClCExvB27EwYEJdGgKZBpKanb0t1rK2Kg==} + engines: {node: '>=14.0.0'} peerDependencies: postcss: ^8.0.0 dependencies: postcss: 8.4.16 postcss-value-parser: 4.2.0 read-cache: 1.0.0 - resolve: 1.22.0 + resolve: 1.22.1 dev: true /postcss-simple-vars/6.0.3_postcss@8.4.16: @@ -5927,7 +5950,7 @@ packages: dev: false /read-cache/1.0.0: - resolution: {integrity: sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=} + resolution: {integrity: sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==} dependencies: pify: 2.3.0 dev: true @@ -6082,28 +6105,28 @@ packages: glob: 7.2.3 dev: true - /rollup-plugin-terser/7.0.2_rollup@2.77.0: + /rollup-plugin-terser/7.0.2_rollup@2.79.0: resolution: {integrity: sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==} peerDependencies: rollup: ^2.0.0 dependencies: '@babel/code-frame': 7.18.6 jest-worker: 26.6.2 - rollup: 2.77.0 + rollup: 2.79.0 serialize-javascript: 4.0.0 - terser: 5.14.2 + terser: 5.15.0 dev: true - /rollup/2.77.0: - resolution: {integrity: sha512-vL8xjY4yOQEw79DvyXLijhnhh+R/O9zpF/LEgkCebZFtb6ELeN9H3/2T0r8+mp+fFTBHZ5qGpOpW2ela2zRt3g==} + /rollup/2.77.3: + resolution: {integrity: sha512-/qxNTG7FbmefJWoeeYJFbHehJ2HNWnjkAFRKzWN/45eNBBF/r8lo992CwcJXEzyVxs5FmfId+vTSTQDb+bxA+g==} engines: {node: '>=10.0.0'} hasBin: true optionalDependencies: fsevents: 2.3.2 dev: true - /rollup/2.77.3: - resolution: {integrity: sha512-/qxNTG7FbmefJWoeeYJFbHehJ2HNWnjkAFRKzWN/45eNBBF/r8lo992CwcJXEzyVxs5FmfId+vTSTQDb+bxA+g==} + /rollup/2.79.0: + resolution: {integrity: sha512-x4KsrCgwQ7ZJPcFA/SUu6QVcYlO7uRLfLAy0DSA4NS2eG8japdbpM50ToH7z4iObodRYOJ0soneF0iaQRJ6zhA==} engines: {node: '>=10.0.0'} hasBin: true optionalDependencies: @@ -6124,8 +6147,8 @@ packages: resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==} dev: true - /sass/1.54.5: - resolution: {integrity: sha512-p7DTOzxkUPa/63FU0R3KApkRHwcVZYC0PLnLm5iyZACyp15qSi32x7zVUhRdABAATmkALqgGrjCJAcWvobmhHw==} + /sass/1.54.8: + resolution: {integrity: sha512-ib4JhLRRgbg6QVy6bsv5uJxnJMTS2soVcCp9Y88Extyy13A8vV0G1fAwujOzmNkFQbR3LvedudAMbtuNRPbQww==} engines: {node: '>=12.0.0'} hasBin: true dependencies: @@ -6226,7 +6249,7 @@ packages: dependencies: call-bind: 1.0.2 define-properties: 1.1.4 - es-abstract: 1.20.1 + es-abstract: 1.20.2 get-intrinsic: 1.1.2 has-symbols: 1.0.3 internal-slot: 1.0.3 @@ -6326,8 +6349,8 @@ packages: unique-string: 2.0.0 dev: true - /terser/5.14.2: - resolution: {integrity: sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==} + /terser/5.15.0: + resolution: {integrity: sha512-L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA==} engines: {node: '>=10'} hasBin: true dependencies: @@ -6500,24 +6523,24 @@ packages: react: 18.2.0 dev: false - /vite-plugin-pwa/0.12.3_vite@3.0.9: - resolution: {integrity: sha512-gmYdIVXpmBuNjzbJFPZFzxWYrX4lHqwMAlOtjmXBbxApiHjx9QPXKQPJjSpeTeosLKvVbNcKSAAhfxMda0QVNQ==} + /vite-plugin-pwa/0.12.6_vite@3.0.9: + resolution: {integrity: sha512-qRxx1zUlwKq2QD20nDZVL449wV+dflRVeDMLa2k4LZiHfWRfHWwmdhnDZOlMEgni0Zss1DkhyTmuzLYuO6aO3A==} peerDependencies: vite: ^2.0.0 || ^3.0.0-0 dependencies: debug: 4.3.4 fast-glob: 3.2.11 pretty-bytes: 6.0.0 - rollup: 2.77.0 - vite: 3.0.9_sass@1.54.5 - workbox-build: 6.5.3 - workbox-window: 6.5.3 + rollup: 2.79.0 + vite: 3.0.9_sass@1.54.8 + workbox-build: 6.5.4 + workbox-window: 6.5.4 transitivePeerDependencies: - '@types/babel__core' - supports-color dev: true - /vite/3.0.9_sass@1.54.5: + /vite/3.0.9_sass@1.54.8: resolution: {integrity: sha512-waYABTM+G6DBTCpYAxvevpG50UOlZuynR0ckTK5PawNVt7ebX6X7wNXHaGIO6wYYFXSM7/WcuFuO2QzhBB6aMw==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true @@ -6540,7 +6563,7 @@ packages: postcss: 8.4.16 resolve: 1.22.1 rollup: 2.77.3 - sass: 1.54.5 + sass: 1.54.8 optionalDependencies: fsevents: 2.3.2 dev: true @@ -6602,30 +6625,30 @@ packages: engines: {node: '>=0.10.0'} dev: true - /workbox-background-sync/6.5.3: - resolution: {integrity: sha512-0DD/V05FAcek6tWv9XYj2w5T/plxhDSpclIcAGjA/b7t/6PdaRkQ7ZgtAX6Q/L7kV7wZ8uYRJUoH11VjNipMZw==} + /workbox-background-sync/6.5.4: + resolution: {integrity: sha512-0r4INQZMyPky/lj4Ou98qxcThrETucOde+7mRGJl13MPJugQNKeZQOdIJe/1AchOP23cTqHcN/YVpD6r8E6I8g==} dependencies: - idb: 6.1.5 - workbox-core: 6.5.3 + idb: 7.0.2 + workbox-core: 6.5.4 dev: true - /workbox-broadcast-update/6.5.3: - resolution: {integrity: sha512-4AwCIA5DiDrYhlN+Miv/fp5T3/whNmSL+KqhTwRBTZIL6pvTgE4lVuRzAt1JltmqyMcQ3SEfCdfxczuI4kwFQg==} + /workbox-broadcast-update/6.5.4: + resolution: {integrity: sha512-I/lBERoH1u3zyBosnpPEtcAVe5lwykx9Yg1k6f8/BGEPGaMMgZrwVrqL1uA9QZ1NGGFoyE6t9i7lBjOlDhFEEw==} dependencies: - workbox-core: 6.5.3 + workbox-core: 6.5.4 dev: true - /workbox-build/6.5.3: - resolution: {integrity: sha512-8JNHHS7u13nhwIYCDea9MNXBNPHXCs5KDZPKI/ZNTr3f4sMGoD7hgFGecbyjX1gw4z6e9bMpMsOEJNyH5htA/w==} + /workbox-build/6.5.4: + resolution: {integrity: sha512-kgRevLXEYvUW9WS4XoziYqZ8Q9j/2ziJYEtTrjdz5/L/cTUa2XfyMP2i7c3p34lgqJ03+mTiz13SdFef2POwbA==} engines: {node: '>=10.0.0'} dependencies: '@apideck/better-ajv-errors': 0.3.6_ajv@8.11.0 '@babel/core': 7.18.13 - '@babel/preset-env': 7.18.9_@babel+core@7.18.13 + '@babel/preset-env': 7.18.10_@babel+core@7.18.13 '@babel/runtime': 7.18.9 - '@rollup/plugin-babel': 5.3.1_iiztohilof6rnf2lard37ehhqq - '@rollup/plugin-node-resolve': 11.2.1_rollup@2.77.0 - '@rollup/plugin-replace': 2.4.2_rollup@2.77.0 + '@rollup/plugin-babel': 5.3.1_qa5xd24o3tymwictiiptlhxtom + '@rollup/plugin-node-resolve': 11.2.1_rollup@2.79.0 + '@rollup/plugin-replace': 2.4.2_rollup@2.79.0 '@surma/rollup-plugin-off-main-thread': 2.2.3 ajv: 8.11.0 common-tags: 1.8.2 @@ -6634,82 +6657,61 @@ packages: glob: 7.2.3 lodash: 4.17.21 pretty-bytes: 5.6.0 - rollup: 2.77.0 - rollup-plugin-terser: 7.0.2_rollup@2.77.0 + rollup: 2.79.0 + rollup-plugin-terser: 7.0.2_rollup@2.79.0 source-map: 0.8.0-beta.0 stringify-object: 3.3.0 strip-comments: 2.0.1 tempy: 0.6.0 upath: 1.2.0 - workbox-background-sync: 6.5.3 - workbox-broadcast-update: 6.5.3 - workbox-cacheable-response: 6.5.3 - workbox-core: 6.5.3 - workbox-expiration: 6.5.3 - workbox-google-analytics: 6.5.3 - workbox-navigation-preload: 6.5.3 - workbox-precaching: 6.5.3 - workbox-range-requests: 6.5.3 - workbox-recipes: 6.5.3 - workbox-routing: 6.5.3 - workbox-strategies: 6.5.3 - workbox-streams: 6.5.3 - workbox-sw: 6.5.3 - workbox-window: 6.5.3 + workbox-background-sync: 6.5.4 + workbox-broadcast-update: 6.5.4 + workbox-cacheable-response: 6.5.4 + workbox-core: 6.5.4 + workbox-expiration: 6.5.4 + workbox-google-analytics: 6.5.4 + workbox-navigation-preload: 6.5.4 + workbox-precaching: 6.5.4 + workbox-range-requests: 6.5.4 + workbox-recipes: 6.5.4 + workbox-routing: 6.5.4 + workbox-strategies: 6.5.4 + workbox-streams: 6.5.4 + workbox-sw: 6.5.4 + workbox-window: 6.5.4 transitivePeerDependencies: - '@types/babel__core' - supports-color dev: true - /workbox-cacheable-response/6.5.3: - resolution: {integrity: sha512-6JE/Zm05hNasHzzAGKDkqqgYtZZL2H06ic2GxuRLStA4S/rHUfm2mnLFFXuHAaGR1XuuYyVCEey1M6H3PdZ7SQ==} + /workbox-cacheable-response/6.5.4: + resolution: {integrity: sha512-DCR9uD0Fqj8oB2TSWQEm1hbFs/85hXXoayVwFKLVuIuxwJaihBsLsp4y7J9bvZbqtPJ1KlCkmYVGQKrBU4KAug==} dependencies: - workbox-core: 6.5.3 - dev: true - - /workbox-core/6.5.3: - resolution: {integrity: sha512-Bb9ey5n/M9x+l3fBTlLpHt9ASTzgSGj6vxni7pY72ilB/Pb3XtN+cZ9yueboVhD5+9cNQrC9n/E1fSrqWsUz7Q==} + workbox-core: 6.5.4 dev: true /workbox-core/6.5.4: resolution: {integrity: sha512-OXYb+m9wZm8GrORlV2vBbE5EC1FKu71GGp0H4rjmxmF4/HLbMCoTFws87M3dFwgpmg0v00K++PImpNQ6J5NQ6Q==} - dev: false - - /workbox-expiration/6.5.3: - resolution: {integrity: sha512-jzYopYR1zD04ZMdlbn/R2Ik6ixiXbi15c9iX5H8CTi6RPDz7uhvMLZPKEndZTpfgmUk8mdmT9Vx/AhbuCl5Sqw==} - dependencies: - idb: 6.1.5 - workbox-core: 6.5.3 - dev: true /workbox-expiration/6.5.4: resolution: {integrity: sha512-jUP5qPOpH1nXtjGGh1fRBa1wJL2QlIb5mGpct3NzepjGG2uFFBn4iiEBiI9GUmfAFR2ApuRhDydjcRmYXddiEQ==} dependencies: idb: 7.0.2 workbox-core: 6.5.4 - dev: false - /workbox-google-analytics/6.5.3: - resolution: {integrity: sha512-3GLCHotz5umoRSb4aNQeTbILETcrTVEozSfLhHSBaegHs1PnqCmN0zbIy2TjTpph2AGXiNwDrWGF0AN+UgDNTw==} + /workbox-google-analytics/6.5.4: + resolution: {integrity: sha512-8AU1WuaXsD49249Wq0B2zn4a/vvFfHkpcFfqAFHNHwln3jK9QUYmzdkKXGIZl9wyKNP+RRX30vcgcyWMcZ9VAg==} dependencies: - workbox-background-sync: 6.5.3 - workbox-core: 6.5.3 - workbox-routing: 6.5.3 - workbox-strategies: 6.5.3 + workbox-background-sync: 6.5.4 + workbox-core: 6.5.4 + workbox-routing: 6.5.4 + workbox-strategies: 6.5.4 dev: true - /workbox-navigation-preload/6.5.3: - resolution: {integrity: sha512-bK1gDFTc5iu6lH3UQ07QVo+0ovErhRNGvJJO/1ngknT0UQ702nmOUhoN9qE5mhuQSrnK+cqu7O7xeaJ+Rd9Tmg==} + /workbox-navigation-preload/6.5.4: + resolution: {integrity: sha512-IIwf80eO3cr8h6XSQJF+Hxj26rg2RPFVUmJLUlM0+A2GzB4HFbQyKkrgD5y2d84g2IbJzP4B4j5dPBRzamHrng==} dependencies: - workbox-core: 6.5.3 - dev: true - - /workbox-precaching/6.5.3: - resolution: {integrity: sha512-sjNfgNLSsRX5zcc63H/ar/hCf+T19fRtTqvWh795gdpghWb5xsfEkecXEvZ8biEi1QD7X/ljtHphdaPvXDygMQ==} - dependencies: - workbox-core: 6.5.3 - workbox-routing: 6.5.3 - workbox-strategies: 6.5.3 + workbox-core: 6.5.4 dev: true /workbox-precaching/6.5.4: @@ -6718,65 +6720,50 @@ packages: workbox-core: 6.5.4 workbox-routing: 6.5.4 workbox-strategies: 6.5.4 - dev: false - /workbox-range-requests/6.5.3: - resolution: {integrity: sha512-pGCP80Bpn/0Q0MQsfETSfmtXsQcu3M2QCJwSFuJ6cDp8s2XmbUXkzbuQhCUzKR86ZH2Vex/VUjb2UaZBGamijA==} + /workbox-range-requests/6.5.4: + resolution: {integrity: sha512-Je2qR1NXCFC8xVJ/Lux6saH6IrQGhMpDrPXWZWWS8n/RD+WZfKa6dSZwU+/QksfEadJEr/NfY+aP/CXFFK5JFg==} dependencies: - workbox-core: 6.5.3 + workbox-core: 6.5.4 dev: true - /workbox-recipes/6.5.3: - resolution: {integrity: sha512-IcgiKYmbGiDvvf3PMSEtmwqxwfQ5zwI7OZPio3GWu4PfehA8jI8JHI3KZj+PCfRiUPZhjQHJ3v1HbNs+SiSkig==} + /workbox-recipes/6.5.4: + resolution: {integrity: sha512-QZNO8Ez708NNwzLNEXTG4QYSKQ1ochzEtRLGaq+mr2PyoEIC1xFW7MrWxrONUxBFOByksds9Z4//lKAX8tHyUA==} dependencies: - workbox-cacheable-response: 6.5.3 - workbox-core: 6.5.3 - workbox-expiration: 6.5.3 - workbox-precaching: 6.5.3 - workbox-routing: 6.5.3 - workbox-strategies: 6.5.3 - dev: true - - /workbox-routing/6.5.3: - resolution: {integrity: sha512-DFjxcuRAJjjt4T34RbMm3MCn+xnd36UT/2RfPRfa8VWJGItGJIn7tG+GwVTdHmvE54i/QmVTJepyAGWtoLPTmg==} - dependencies: - workbox-core: 6.5.3 + workbox-cacheable-response: 6.5.4 + workbox-core: 6.5.4 + workbox-expiration: 6.5.4 + workbox-precaching: 6.5.4 + workbox-routing: 6.5.4 + workbox-strategies: 6.5.4 dev: true /workbox-routing/6.5.4: resolution: {integrity: sha512-apQswLsbrrOsBUWtr9Lf80F+P1sHnQdYodRo32SjiByYi36IDyL2r7BH1lJtFX8fwNHDa1QOVY74WKLLS6o5Pg==} dependencies: workbox-core: 6.5.4 - dev: false - - /workbox-strategies/6.5.3: - resolution: {integrity: sha512-MgmGRrDVXs7rtSCcetZgkSZyMpRGw8HqL2aguszOc3nUmzGZsT238z/NN9ZouCxSzDu3PQ3ZSKmovAacaIhu1w==} - dependencies: - workbox-core: 6.5.3 - dev: true /workbox-strategies/6.5.4: resolution: {integrity: sha512-DEtsxhx0LIYWkJBTQolRxG4EI0setTJkqR4m7r4YpBdxtWJH1Mbg01Cj8ZjNOO8etqfA3IZaOPHUxCs8cBsKLw==} dependencies: workbox-core: 6.5.4 - dev: false - /workbox-streams/6.5.3: - resolution: {integrity: sha512-vN4Qi8o+b7zj1FDVNZ+PlmAcy1sBoV7SC956uhqYvZ9Sg1fViSbOpydULOssVJ4tOyKRifH/eoi6h99d+sJ33w==} + /workbox-streams/6.5.4: + resolution: {integrity: sha512-FXKVh87d2RFXkliAIheBojBELIPnWbQdyDvsH3t74Cwhg0fDheL1T8BqSM86hZvC0ZESLsznSYWw+Va+KVbUzg==} dependencies: - workbox-core: 6.5.3 - workbox-routing: 6.5.3 + workbox-core: 6.5.4 + workbox-routing: 6.5.4 dev: true - /workbox-sw/6.5.3: - resolution: {integrity: sha512-BQBzm092w+NqdIEF2yhl32dERt9j9MDGUTa2Eaa+o3YKL4Qqw55W9yQC6f44FdAHdAJrJvp0t+HVrfh8AiGj8A==} + /workbox-sw/6.5.4: + resolution: {integrity: sha512-vo2RQo7DILVRoH5LjGqw3nphavEjK4Qk+FenXeUsknKn14eCNedHOXWbmnvP4ipKhlE35pvJ4yl4YYf6YsJArA==} dev: true - /workbox-window/6.5.3: - resolution: {integrity: sha512-GnJbx1kcKXDtoJBVZs/P7ddP0Yt52NNy4nocjBpYPiRhMqTpJCNrSL+fGHZ/i/oP6p/vhE8II0sA6AZGKGnssw==} + /workbox-window/6.5.4: + resolution: {integrity: sha512-HnLZJDwYBE+hpG25AQBO8RUWBJRaCsI9ksQJEp3aCOFCaG5kqaToAYXFRAHxzRluM2cQbGzdQF5rjKPWPA1fug==} dependencies: '@types/trusted-types': 2.0.2 - workbox-core: 6.5.3 + workbox-core: 6.5.4 dev: true /wrappy/1.0.2: diff --git a/src/components/Home.module.scss b/src/components/Home.module.scss index f15c80f..9717441 100644 --- a/src/components/Home.module.scss +++ b/src/components/Home.module.scss @@ -4,3 +4,6 @@ padding: 10px 40px; } } +.chart { + margin-top: 15px; +} diff --git a/src/components/Input.module.scss b/src/components/Input.module.scss index 4ca42fa..09f9424 100644 --- a/src/components/Input.module.scss +++ b/src/components/Input.module.scss @@ -10,7 +10,7 @@ font-size: inherit; height: 40px; outline: none; - padding: 0 15px; + padding: 0 8px; width: 100%; } diff --git a/src/components/Input.tsx b/src/components/Input.tsx index efb5665..ce634b3 100644 --- a/src/components/Input.tsx +++ b/src/components/Input.tsx @@ -1,4 +1,4 @@ -import React from 'react'; +import * as React from 'react'; import s0 from './Input.module.scss'; @@ -27,7 +27,10 @@ export function SelfControlledInput({ value, ...restProps }) { } refValue.current = value; }, [value]); - const onChange = useCallback((e) => setInternalValue(e.target.value), [setInternalValue]); + const onChange = useCallback( + (e: React.ChangeEvent) => setInternalValue(e.target.value), + [setInternalValue] + ); return ; } diff --git a/src/components/TrafficNow.tsx b/src/components/TrafficNow.tsx index b82594c..d07f298 100644 --- a/src/components/TrafficNow.tsx +++ b/src/components/TrafficNow.tsx @@ -1,6 +1,9 @@ import * as React from 'react'; import { useTranslation } from 'react-i18next'; +import { State } from '$src/store/types'; +import { ClashAPIConfig } from '$src/types'; + import * as connAPI from '../api/connections'; import { fetchData } from '../api/traffic'; import prettyBytes from '../misc/pretty-bytes'; @@ -10,7 +13,7 @@ import s0 from './TrafficNow.module.scss'; const { useState, useEffect, useCallback } = React; -const mapState = (s) => ({ +const mapState = (s: State) => ({ apiConfig: getClashAPIConfig(s), }); export default connect(mapState)(TrafficNow); @@ -45,7 +48,7 @@ function TrafficNow({ apiConfig }) { ); } -function useSpeed(apiConfig) { +function useSpeed(apiConfig: ClashAPIConfig) { const [speed, setSpeed] = useState({ upStr: '0 B/s', downStr: '0 B/s' }); useEffect(() => { return fetchData(apiConfig).subscribe((o) => @@ -58,7 +61,7 @@ function useSpeed(apiConfig) { return speed; } -function useConnection(apiConfig) { +function useConnection(apiConfig: ClashAPIConfig) { const [state, setState] = useState({ upTotal: '0 B', dlTotal: '0 B',