From 29e8a03592503eb4b62198c7c10c903d2779a9a2 Mon Sep 17 00:00:00 2001
From: dminyi <1301963064@qq.com>
Date: Fri, 09 Aug 2024 09:58:29 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh into master
---
customerSystem/yarn.lock | 646 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 644 insertions(+), 2 deletions(-)
diff --git a/customerSystem/yarn.lock b/customerSystem/yarn.lock
index 378a7ea..e525dcd 100644
--- a/customerSystem/yarn.lock
+++ b/customerSystem/yarn.lock
@@ -50,11 +50,17 @@
"@ctrl/tinycolor" "^3.4.0"
"@ant-design/colors@^7.0.0":
+<<<<<<< HEAD
version "7.0.0"
resolved "https://registry.npmmirror.com/@ant-design/colors/-/colors-7.0.0.tgz"
integrity sha512-iVm/9PfGCbC0dSMBrz7oiEXZaaGH7ceU40OJEfKmyuzR9R5CRimJYPlRiFtMQGQcbNMea/ePcoIebi4ASGYXtg==
+=======
+ version "7.1.0"
+ resolved "https://registry.npmmirror.com/@ant-design/colors/-/colors-7.1.0.tgz"
+ integrity sha512-MMoDGWn1y9LdQJQSHiCC20x3uZ3CwQnv9QMz6pCmJOrqdgM9YxsoVVY0wtrdXbmfSgnV0KNk6zi09NAhMR2jvg==
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
dependencies:
- "@ctrl/tinycolor" "^3.4.0"
+ "@ctrl/tinycolor" "^3.6.1"
"@ant-design/flowchart@^1.0.2":
version "1.2.2"
@@ -81,6 +87,7 @@
insert-css "^2.0.0"
react-content-loader "^5.0.4"
+<<<<<<< HEAD
"@ant-design/icons-svg@^4.2.1":
version "4.2.1"
resolved "https://registry.npmmirror.com/@ant-design/icons-svg/-/icons-svg-4.2.1.tgz"
@@ -90,11 +97,26 @@
version "4.7.0"
resolved "https://registry.npmmirror.com/@ant-design/icons/-/icons-4.7.0.tgz"
integrity sha512-aoB4Z7JA431rt6d4u+8xcNPPCrdufSRMUOpxa1ab6mz1JCQZOEVolj2WVs/tDFmN62zzK30mNelEsprLYsSF3g==
+=======
+"@ant-design/icons-svg@^4.3.0":
+ version "4.4.2"
+ resolved "https://registry.npmmirror.com/@ant-design/icons-svg/-/icons-svg-4.4.2.tgz"
+ integrity sha512-vHbT+zJEVzllwP+CM+ul7reTEfBR0vgxFe7+lREAsAA7YGsYpboiq2sQNeQeRvh09GfQgs/GyFEvZpJ9cLXpXA==
+
+"@ant-design/icons@^4.7.0":
+ version "4.8.3"
+ resolved "https://registry.npmmirror.com/@ant-design/icons/-/icons-4.8.3.tgz"
+ integrity sha512-HGlIQZzrEbAhpJR6+IGdzfbPym94Owr6JZkJ2QCCnOkPVIWMO2xgIVcOKnl8YcpijIo39V7l2qQL5fmtw56cMw==
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
dependencies:
"@ant-design/colors" "^6.0.0"
- "@ant-design/icons-svg" "^4.2.1"
+ "@ant-design/icons-svg" "^4.3.0"
"@babel/runtime" "^7.11.2"
classnames "^2.2.6"
+<<<<<<< HEAD
+=======
+ lodash "^4.17.15"
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
rc-util "^5.9.4"
"@ant-design/maps@^1.0.1":
@@ -828,6 +850,36 @@
jsonpointer "^5.0.0"
leven "^3.1.0"
+<<<<<<< HEAD
+=======
+"@arco-design/color@^0.4.0":
+ version "0.4.0"
+ resolved "https://registry.npmmirror.com/@arco-design/color/-/color-0.4.0.tgz"
+ integrity sha512-s7p9MSwJgHeL8DwcATaXvWT3m2SigKpxx4JA1BGPHL4gfvaQsmQfrLBDpjOJFJuJ2jG2dMt3R3P8Pm9E65q18g==
+ dependencies:
+ color "^3.1.3"
+
+"@arco-design/web-react@^2.63.1":
+ version "2.63.1"
+ resolved "https://registry.npmmirror.com/@arco-design/web-react/-/web-react-2.63.1.tgz"
+ integrity sha512-Ted5MY5iM7I4Cqf1QaHBZ55DZHO6oQQa8Oaazz0ku3f+pa/y8eEWM1le4rkXTvNdtDete6M2gFRS0OWguI6DEw==
+ dependencies:
+ "@arco-design/color" "^0.4.0"
+ "@babel/runtime" "^7.5.5"
+ b-tween "^0.3.3"
+ b-validate "^1.4.2"
+ compute-scroll-into-view "^1.0.17"
+ dayjs "^1.10.5"
+ lodash "^4.17.21"
+ number-precision "^1.3.1"
+ react-focus-lock "^2.9.1"
+ react-is "^18.2.0"
+ react-transition-group "^4.3.0"
+ resize-observer-polyfill "^1.5.1"
+ scroll-into-view-if-needed "2.2.20"
+ shallowequal "^1.1.0"
+
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.24.7", "@babel/code-frame@^7.8.3":
version "7.24.7"
resolved "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.24.7.tgz"
@@ -1824,7 +1876,11 @@
core-js-pure "^3.30.2"
regenerator-runtime "^0.14.0"
+<<<<<<< HEAD
"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.16.3", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.0", "@babel/runtime@^7.7.7", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
+=======
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.16.3", "@babel/runtime@^7.18.0", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.0", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.7", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
version "7.25.0"
resolved "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.25.0.tgz"
integrity sha512-7dRy4DwXwtzBrPbZflqxnvfxLF8kdZXPkhymtDeFoFqE6ldzjQFgYTtYIFARcLEYDrqfBfYcZt1WqFxRoyC9Rw==
@@ -1866,6 +1922,7 @@
version "0.2.3"
resolved "https://registry.npmmirror.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
+<<<<<<< HEAD
"@craco/craco@^6.4.3":
version "6.4.3"
@@ -1884,6 +1941,26 @@
resolved "https://registry.npmmirror.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz"
integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
dependencies:
+=======
+
+"@craco/craco@^6.4.3":
+ version "6.4.3"
+ resolved "https://registry.npmmirror.com/@craco/craco/-/craco-6.4.3.tgz"
+ integrity sha512-RzkXYmNzRCGUyG7mM+IUMM+nvrpSfA34352sPSGQN76UivAmCAht3sI4v5JKgzO05oUK9Zwi6abCKD7iKXI8hQ==
+ dependencies:
+ cosmiconfig "^7.0.1"
+ cosmiconfig-typescript-loader "^1.0.0"
+ cross-spawn "^7.0.0"
+ lodash "^4.17.15"
+ semver "^7.3.2"
+ webpack-merge "^4.2.2"
+
+"@cspotcode/source-map-support@^0.8.0":
+ version "0.8.1"
+ resolved "https://registry.npmmirror.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz"
+ integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
+ dependencies:
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
"@jridgewell/trace-mapping" "0.3.9"
"@csstools/normalize.css@*":
@@ -1986,6 +2063,7 @@
integrity sha512-woKaLO///4bb+zZC2s80l+7cm07M7268MsyG3M0ActXXEFi6SuhvriQYcb58iiKGbjwwIU7n45iRLEHypB47Og==
dependencies:
postcss-value-parser "^4.2.0"
+<<<<<<< HEAD
"@csstools/postcss-unset-value@^1.0.2":
version "1.0.2"
@@ -2002,6 +2080,24 @@
resolved "https://registry.npmmirror.com/@ctrl/tinycolor/-/tinycolor-3.6.1.tgz"
integrity sha512-SITSV6aIXsuVNV3f3O0f2n/cgyEDWoSqtZMYiAmcsYHydcKrOz3gUxB/iXd/Qf08+IZX4KpgNbvUdMBmWz+kcA==
+=======
+
+"@csstools/postcss-unset-value@^1.0.2":
+ version "1.0.2"
+ resolved "https://registry.npmmirror.com/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz"
+ integrity sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==
+
+"@csstools/selector-specificity@^2.0.0", "@csstools/selector-specificity@^2.0.2":
+ version "2.2.0"
+ resolved "https://registry.npmmirror.com/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz"
+ integrity sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==
+
+"@ctrl/tinycolor@^3.4.0", "@ctrl/tinycolor@^3.6.1":
+ version "3.6.1"
+ resolved "https://registry.npmmirror.com/@ctrl/tinycolor/-/tinycolor-3.6.1.tgz"
+ integrity sha512-SITSV6aIXsuVNV3f3O0f2n/cgyEDWoSqtZMYiAmcsYHydcKrOz3gUxB/iXd/Qf08+IZX4KpgNbvUdMBmWz+kcA==
+
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
"@dagrejs/graphlib@2.1.4":
version "2.1.4"
resolved "https://registry.npmmirror.com/@dagrejs/graphlib/-/graphlib-2.1.4.tgz"
@@ -2287,6 +2383,7 @@
"@types/node" "*"
"@types/yargs" "^17.0.8"
chalk "^4.0.0"
+<<<<<<< HEAD
"@jridgewell/gen-mapping@^0.3.2", "@jridgewell/gen-mapping@^0.3.5":
version "0.3.5"
@@ -2302,6 +2399,23 @@
resolved "https://registry.npmmirror.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz"
integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
+=======
+
+"@jridgewell/gen-mapping@^0.3.2", "@jridgewell/gen-mapping@^0.3.5":
+ version "0.3.5"
+ resolved "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz"
+ integrity sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==
+ dependencies:
+ "@jridgewell/set-array" "^1.2.1"
+ "@jridgewell/sourcemap-codec" "^1.4.10"
+ "@jridgewell/trace-mapping" "^0.3.24"
+
+"@jridgewell/resolve-uri@^3.0.3", "@jridgewell/resolve-uri@^3.1.0":
+ version "3.1.2"
+ resolved "https://registry.npmmirror.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz"
+ integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
+
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
"@jridgewell/set-array@^1.2.1":
version "1.2.1"
resolved "https://registry.npmmirror.com/@jridgewell/set-array/-/set-array-1.2.1.tgz"
@@ -2319,6 +2433,7 @@
version "1.5.0"
resolved "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz"
integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==
+<<<<<<< HEAD
"@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
version "0.3.25"
@@ -2328,6 +2443,17 @@
"@jridgewell/resolve-uri" "^3.1.0"
"@jridgewell/sourcemap-codec" "^1.4.14"
+=======
+
+"@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
+ version "0.3.25"
+ resolved "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz"
+ integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==
+ dependencies:
+ "@jridgewell/resolve-uri" "^3.1.0"
+ "@jridgewell/sourcemap-codec" "^1.4.14"
+
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
"@jridgewell/trace-mapping@0.3.9":
version "0.3.9"
resolved "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz"
@@ -3164,6 +3290,7 @@
"@types/yargs-parser" "*"
"@types/yargs@^17.0.8":
+<<<<<<< HEAD
version "17.0.32"
resolved "https://registry.npmmirror.com/@types/yargs/-/yargs-17.0.32.tgz"
integrity sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==
@@ -3186,6 +3313,30 @@
semver "^7.3.7"
tsutils "^3.21.0"
+=======
+ version "17.0.33"
+ resolved "https://registry.npmmirror.com/@types/yargs/-/yargs-17.0.33.tgz"
+ integrity sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==
+ dependencies:
+ "@types/yargs-parser" "*"
+
+"@typescript-eslint/eslint-plugin@^5.5.0":
+ version "5.62.0"
+ resolved "https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz"
+ integrity sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==
+ dependencies:
+ "@eslint-community/regexpp" "^4.4.0"
+ "@typescript-eslint/scope-manager" "5.62.0"
+ "@typescript-eslint/type-utils" "5.62.0"
+ "@typescript-eslint/utils" "5.62.0"
+ debug "^4.3.4"
+ graphemer "^1.4.0"
+ ignore "^5.2.0"
+ natural-compare-lite "^1.4.0"
+ semver "^7.3.7"
+ tsutils "^3.21.0"
+
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
"@typescript-eslint/experimental-utils@^5.0.0":
version "5.62.0"
resolved "https://registry.npmmirror.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.62.0.tgz"
@@ -3661,7 +3812,11 @@
resolved "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-6.2.1.tgz"
integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
+<<<<<<< HEAD
antd@^4.19.2:
+=======
+antd@^4.19.5:
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
version "4.19.5"
resolved "https://registry.npmmirror.com/antd/-/antd-4.19.5.tgz"
integrity sha512-C4H/VJqlVO5iMvHZyiV27R8SbPs4jsOKCGPhDXIHUry/RnUCbMmVeQaPRfUIxSI1NbqDflsuQfevPtz1svyIlg==
@@ -3879,10 +4034,17 @@
resolved "https://registry.npmmirror.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz"
integrity sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==
+<<<<<<< HEAD
async-validator@^4.0.2:
version "4.0.7"
resolved "https://registry.npmmirror.com/async-validator/-/async-validator-4.0.7.tgz"
integrity sha512-Pj2IR7u8hmUEDOwB++su6baaRi+QvsgajuFB9j95foM1N2gy5HM4z60hfusIO0fBPG5uLAEl6yCJr1jNSVugEQ==
+=======
+async-validator@^4.0.2, async-validator@^4.1.0:
+ version "4.2.5"
+ resolved "https://registry.npmmirror.com/async-validator/-/async-validator-4.2.5.tgz"
+ integrity sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
async@^3.1.1, async@^3.2.3:
version "3.2.4"
@@ -3935,6 +4097,19 @@
resolved "https://registry.npmmirror.com/axobject-query/-/axobject-query-2.2.0.tgz"
integrity sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==
+<<<<<<< HEAD
+=======
+b-tween@^0.3.3:
+ version "0.3.3"
+ resolved "https://registry.npmmirror.com/b-tween/-/b-tween-0.3.3.tgz"
+ integrity sha512-oEHegcRpA7fAuc9KC4nktucuZn2aS8htymCPcP3qkEGPqiBH+GfqtqoG2l7LxHngg6O0HFM7hOeOYExl1Oz4ZA==
+
+b-validate@^1.4.2:
+ version "1.5.3"
+ resolved "https://registry.npmmirror.com/b-validate/-/b-validate-1.5.3.tgz"
+ integrity sha512-iCvCkGFskbaYtfQ0a3GmcQCHl/Sv1GufXFGuUQ+FE+WJa7A/espLOuFIn09B944V8/ImPj71T4+rTASxO2PAuA==
+
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
babel-jest@^27.4.2, babel-jest@^27.5.1:
version "27.5.1"
resolved "https://registry.npmmirror.com/babel-jest/-/babel-jest-27.5.1.tgz"
@@ -4263,9 +4438,15 @@
lodash.uniq "^4.5.0"
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001646:
+<<<<<<< HEAD
version "1.0.30001649"
resolved "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001649.tgz"
integrity sha512-fJegqZZ0ZX8HOWr6rcafGr72+xcgJKI9oWfDW5DrD7ExUtgZC7a7R7ZYmZqplh7XDocFdGeIFn7roAxhOeYrPQ==
+=======
+ version "1.0.30001650"
+ resolved "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001650.tgz"
+ integrity sha512-fgEc7hP/LB7iicdXHUI9VsBsMZmUmlVJeQP2qqQW+3lkqVhbmjEU8zp+h5stWeilX+G7uXuIUIIlWlDw9jdt8g==
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
case-sensitive-paths-webpack-plugin@^2.4.0:
version "2.4.0"
@@ -4400,9 +4581,15 @@
integrity sha512-kgMuFyE78OC6Dyu3Dy7vcx4uy97EIbVxJB/B0eJ3bUNAkwdNcxYzgKltnyADiYwsR7SEqkkUPsEUT//OVS6XMA==
classnames@^2.2.1, classnames@^2.2.3, classnames@^2.2.5, classnames@^2.2.6, classnames@^2.3.1, classnames@2.x:
+<<<<<<< HEAD
version "2.3.1"
resolved "https://registry.npmmirror.com/classnames/-/classnames-2.3.1.tgz"
integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==
+=======
+ version "2.5.1"
+ resolved "https://registry.npmmirror.com/classnames/-/classnames-2.5.1.tgz"
+ integrity sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
clean-css@^5.2.2:
version "5.3.3"
@@ -4562,10 +4749,22 @@
safe-buffer "5.1.2"
vary "~1.1.2"
+<<<<<<< HEAD
compute-scroll-into-view@^1.0.17:
version "1.0.17"
resolved "https://registry.npmmirror.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.17.tgz"
integrity sha512-j4dx+Fb0URmzbwwMUrhqWM2BEWHdFGx+qZ9qqASHRPqvTYdqvWnHg0H1hIbcyLnvgnoNAVMlwkepyqM3DaIFUg==
+=======
+compute-scroll-into-view@^1.0.17, compute-scroll-into-view@^1.0.20:
+ version "1.0.20"
+ resolved "https://registry.npmmirror.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz"
+ integrity sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==
+
+compute-scroll-into-view@1.0.11:
+ version "1.0.11"
+ resolved "https://registry.npmmirror.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.11.tgz"
+ integrity sha512-uUnglJowSe0IPmWOdDtrlHXof5CTIJitfJEyITHBW6zDVOGu9Pjk5puaLM73SLcwak0L4hEjO7Td88/a6P5i7A==
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
concat-map@0.0.1:
version "0.0.1"
@@ -4643,9 +4842,15 @@
is-what "^3.14.1"
copy-to-clipboard@^3.2.0, copy-to-clipboard@^3.3.1:
+<<<<<<< HEAD
version "3.3.1"
resolved "https://registry.npmmirror.com/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz"
integrity sha512-i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw==
+=======
+ version "3.3.3"
+ resolved "https://registry.npmmirror.com/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz"
+ integrity sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
dependencies:
toggle-selection "^1.0.6"
@@ -4666,6 +4871,7 @@
version "3.21.1"
resolved "https://registry.npmmirror.com/core-js/-/core-js-3.21.1.tgz"
integrity sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig==
+<<<<<<< HEAD
core-util-is@~1.0.0:
version "1.0.3"
@@ -4680,6 +4886,22 @@
cosmiconfig "^7"
ts-node "^10.7.0"
+=======
+
+core-util-is@~1.0.0:
+ version "1.0.3"
+ resolved "https://registry.npmmirror.com/core-util-is/-/core-util-is-1.0.3.tgz"
+ integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
+
+cosmiconfig-typescript-loader@^1.0.0:
+ version "1.0.9"
+ resolved "https://registry.npmmirror.com/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-1.0.9.tgz"
+ integrity sha512-tRuMRhxN4m1Y8hP9SNYfz7jRwt8lZdWxdjg/ohg5esKmsndJIn4yT96oJVcf5x0eA11taXl+sIp+ielu529k6g==
+ dependencies:
+ cosmiconfig "^7"
+ ts-node "^10.7.0"
+
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
cosmiconfig@^6.0.0:
version "6.0.0"
resolved "https://registry.npmmirror.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz"
@@ -5100,6 +5322,7 @@
is-data-view "^1.0.1"
date-fns@2.x:
+<<<<<<< HEAD
version "2.28.0"
resolved "https://registry.npmmirror.com/date-fns/-/date-fns-2.28.0.tgz"
integrity sha512-8d35hViGYx/QH0icHYCeLmsLmMUheMmTyV9Fcm6gvNwdw31yXXH+O85sOBJ+OLnLQMKZowvpKb6FgMIQjcpvQw==
@@ -5108,6 +5331,18 @@
version "1.11.1"
resolved "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.1.tgz"
integrity sha512-ER7EjqVAMkRRsxNCC5YqJ9d9VQYuWdGt7aiH2qA5R5wt8ZmWaP2dLUSIK6y/kVzLMlmh1Tvu5xUf4M/wdGJ5KA==
+=======
+ version "2.30.0"
+ resolved "https://registry.npmmirror.com/date-fns/-/date-fns-2.30.0.tgz"
+ integrity sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==
+ dependencies:
+ "@babel/runtime" "^7.21.0"
+
+dayjs@^1.10.5, dayjs@1.x:
+ version "1.11.12"
+ resolved "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.12.tgz"
+ integrity sha512-Rt2g+nTbLlDWZTwwrIXjy9MeiZmSDI375FvZs72ngxx8PDC6YXOeR3q5LAuPzjZQxhiWdRKac7RKV+YyQYfYIg==
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
debug@^2.6.0:
version "2.6.9"
@@ -5298,6 +5533,14 @@
resolved "https://registry.npmmirror.com/detect-newline/-/detect-newline-3.1.0.tgz"
integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
+<<<<<<< HEAD
+=======
+detect-node-es@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.npmmirror.com/detect-node-es/-/detect-node-es-1.1.0.tgz"
+ integrity sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==
+
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
detect-node@^2.0.4:
version "2.1.0"
resolved "https://registry.npmmirror.com/detect-node/-/detect-node-2.1.0.tgz"
@@ -5381,6 +5624,17 @@
dependencies:
utila "~0.4"
+<<<<<<< HEAD
+=======
+dom-helpers@^5.0.1:
+ version "5.2.1"
+ resolved "https://registry.npmmirror.com/dom-helpers/-/dom-helpers-5.2.1.tgz"
+ integrity sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==
+ dependencies:
+ "@babel/runtime" "^7.8.7"
+ csstype "^3.0.2"
+
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
dom-serializer@^1.0.1:
version "1.4.1"
resolved "https://registry.npmmirror.com/dom-serializer/-/dom-serializer-1.4.1.tgz"
@@ -5500,9 +5754,15 @@
jake "^10.6.1"
electron-to-chromium@^1.5.4:
+<<<<<<< HEAD
version "1.5.4"
resolved "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.5.4.tgz"
integrity sha512-orzA81VqLyIGUEA77YkVA1D+N+nNfl2isJVjjmOyrlxuooZ19ynb+dOlaDTqd/idKRS9lDCSBmtzM+kyCsMnkA==
+=======
+ version "1.5.5"
+ resolved "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.5.5.tgz"
+ integrity sha512-QR7/A7ZkMS8tZuoftC/jfqNkZLQO779SSW3YuZHP4eXpj3EffGLFcB/Xu9AAZQzLccTiCV+EmUo3ha4mQ9wnlA==
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
element-resize-event@^3.0.3:
version "3.0.6"
@@ -6296,6 +6556,16 @@
tape "^4.5.1"
uglify-js "^2.6.2"
+<<<<<<< HEAD
+=======
+focus-lock@^1.3.5:
+ version "1.3.5"
+ resolved "https://registry.npmmirror.com/focus-lock/-/focus-lock-1.3.5.tgz"
+ integrity sha512-QFaHbhv9WPUeLYBDe/PAuLKJ4Dd9OPvKs9xZBr3yLXnUrDNaVXKu2baDBXe3naPY30hgHYSsf2JW4jzas2mDEQ==
+ dependencies:
+ tslib "^2.0.3"
+
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
follow-redirects@^1.0.0, follow-redirects@^1.14.8:
version "1.15.6"
resolved "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.6.tgz"
@@ -7487,6 +7757,7 @@
"@types/node" "*"
jest-mock "^27.5.1"
jest-util "^27.5.1"
+<<<<<<< HEAD
jest-get-type@^27.5.1:
version "27.5.1"
@@ -7498,6 +7769,19 @@
resolved "https://registry.npmmirror.com/jest-get-type/-/jest-get-type-29.6.3.tgz"
integrity sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==
+=======
+
+jest-get-type@^27.5.1:
+ version "27.5.1"
+ resolved "https://registry.npmmirror.com/jest-get-type/-/jest-get-type-27.5.1.tgz"
+ integrity sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==
+
+jest-get-type@^29.6.3:
+ version "29.6.3"
+ resolved "https://registry.npmmirror.com/jest-get-type/-/jest-get-type-29.6.3.tgz"
+ integrity sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==
+
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
jest-haste-map@^27.5.1:
version "27.5.1"
resolved "https://registry.npmmirror.com/jest-haste-map/-/jest-haste-map-27.5.1.tgz"
@@ -7744,6 +8028,7 @@
ci-info "^3.2.0"
graceful-fs "^4.2.9"
picomatch "^2.2.3"
+<<<<<<< HEAD
jest-util@^29.7.0:
version "29.7.0"
@@ -7757,6 +8042,21 @@
graceful-fs "^4.2.9"
picomatch "^2.2.3"
+=======
+
+jest-util@^29.7.0:
+ version "29.7.0"
+ resolved "https://registry.npmmirror.com/jest-util/-/jest-util-29.7.0.tgz"
+ integrity sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==
+ dependencies:
+ "@jest/types" "^29.6.3"
+ "@types/node" "*"
+ chalk "^4.0.0"
+ ci-info "^3.2.0"
+ graceful-fs "^4.2.9"
+ picomatch "^2.2.3"
+
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
jest-validate@^27.5.1:
version "27.5.1"
resolved "https://registry.npmmirror.com/jest-validate/-/jest-validate-27.5.1.tgz"
@@ -8661,6 +8961,14 @@
dependencies:
boolbase "^1.0.0"
+<<<<<<< HEAD
+=======
+number-precision@^1.3.1:
+ version "1.6.0"
+ resolved "https://registry.npmmirror.com/number-precision/-/number-precision-1.6.0.tgz"
+ integrity sha512-05OLPgbgmnixJw+VvEh18yNPUo3iyp4BEWJcrLu4X9W05KmMifN7Mu5exYvQXqxxeNWhvIF+j3Rij+HmddM/hQ==
+
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
nwsapi@^2.2.0:
version "2.2.0"
resolved "https://registry.npmmirror.com/nwsapi/-/nwsapi-2.2.0.tgz"
@@ -8832,6 +9140,7 @@
integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
dependencies:
p-try "^2.0.0"
+<<<<<<< HEAD
p-limit@^3.0.2:
version "3.1.0"
@@ -8840,6 +9149,16 @@
dependencies:
yocto-queue "^0.1.0"
+=======
+
+p-limit@^3.0.2:
+ version "3.1.0"
+ resolved "https://registry.npmmirror.com/p-limit/-/p-limit-3.1.0.tgz"
+ integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
+ dependencies:
+ yocto-queue "^0.1.0"
+
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
p-locate@^3.0.0:
version "3.0.0"
resolved "https://registry.npmmirror.com/p-locate/-/p-locate-3.0.0.tgz"
@@ -8851,6 +9170,7 @@
version "4.1.0"
resolved "https://registry.npmmirror.com/p-locate/-/p-locate-4.1.0.tgz"
integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
+<<<<<<< HEAD
dependencies:
p-limit "^2.2.0"
@@ -8861,6 +9181,18 @@
dependencies:
p-limit "^3.0.2"
+=======
+ dependencies:
+ p-limit "^2.2.0"
+
+p-locate@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.npmmirror.com/p-locate/-/p-locate-5.0.0.tgz"
+ integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
+ dependencies:
+ p-limit "^3.0.2"
+
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
p-retry@^4.5.0:
version "4.6.1"
resolved "https://registry.npmmirror.com/p-retry/-/p-retry-4.6.1.tgz"
@@ -9057,6 +9389,7 @@
version "1.0.0"
resolved "https://registry.npmmirror.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz"
integrity sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==
+<<<<<<< HEAD
postcss-attribute-case-insensitive@^5.0.2:
version "5.0.2"
@@ -9152,6 +9485,103 @@
dependencies:
postcss-selector-parser "^6.0.10"
+=======
+
+postcss-attribute-case-insensitive@^5.0.2:
+ version "5.0.2"
+ resolved "https://registry.npmmirror.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz"
+ integrity sha512-XIidXV8fDr0kKt28vqki84fRK8VW8eTuIa4PChv2MqKuT6C9UjmSKzen6KaWhWEoYvwxFCa7n/tC1SZ3tyq4SQ==
+ dependencies:
+ postcss-selector-parser "^6.0.10"
+
+postcss-browser-comments@^4:
+ version "4.0.0"
+ resolved "https://registry.npmmirror.com/postcss-browser-comments/-/postcss-browser-comments-4.0.0.tgz"
+ integrity sha512-X9X9/WN3KIvY9+hNERUqX9gncsgBA25XaeR+jshHz2j8+sYyHktHw1JdKuMjeLpGktXidqDhA7b/qm1mrBDmgg==
+
+postcss-calc@^8.2.3:
+ version "8.2.4"
+ resolved "https://registry.npmmirror.com/postcss-calc/-/postcss-calc-8.2.4.tgz"
+ integrity sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==
+ dependencies:
+ postcss-selector-parser "^6.0.9"
+ postcss-value-parser "^4.2.0"
+
+postcss-clamp@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.npmmirror.com/postcss-clamp/-/postcss-clamp-4.1.0.tgz"
+ integrity sha512-ry4b1Llo/9zz+PKC+030KUnPITTJAHeOwjfAyyB60eT0AorGLdzp52s31OsPRHRf8NchkgFoG2y6fCfn1IV1Ow==
+ dependencies:
+ postcss-value-parser "^4.2.0"
+
+postcss-color-functional-notation@^4.2.4:
+ version "4.2.4"
+ resolved "https://registry.npmmirror.com/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.4.tgz"
+ integrity sha512-2yrTAUZUab9s6CpxkxC4rVgFEVaR6/2Pipvi6qcgvnYiVqZcbDHEoBDhrXzyb7Efh2CCfHQNtcqWcIruDTIUeg==
+ dependencies:
+ postcss-value-parser "^4.2.0"
+
+postcss-color-hex-alpha@^8.0.4:
+ version "8.0.4"
+ resolved "https://registry.npmmirror.com/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.4.tgz"
+ integrity sha512-nLo2DCRC9eE4w2JmuKgVA3fGL3d01kGq752pVALF68qpGLmx2Qrk91QTKkdUqqp45T1K1XV8IhQpcu1hoAQflQ==
+ dependencies:
+ postcss-value-parser "^4.2.0"
+
+postcss-color-rebeccapurple@^7.1.1:
+ version "7.1.1"
+ resolved "https://registry.npmmirror.com/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.1.1.tgz"
+ integrity sha512-pGxkuVEInwLHgkNxUc4sdg4g3py7zUeCQ9sMfwyHAT+Ezk8a4OaaVZ8lIY5+oNqA/BXXgLyXv0+5wHP68R79hg==
+ dependencies:
+ postcss-value-parser "^4.2.0"
+
+postcss-colormin@^5.3.1:
+ version "5.3.1"
+ resolved "https://registry.npmmirror.com/postcss-colormin/-/postcss-colormin-5.3.1.tgz"
+ integrity sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ==
+ dependencies:
+ browserslist "^4.21.4"
+ caniuse-api "^3.0.0"
+ colord "^2.9.1"
+ postcss-value-parser "^4.2.0"
+
+postcss-convert-values@^5.1.3:
+ version "5.1.3"
+ resolved "https://registry.npmmirror.com/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz"
+ integrity sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==
+ dependencies:
+ browserslist "^4.21.4"
+ postcss-value-parser "^4.2.0"
+
+postcss-custom-media@^8.0.2:
+ version "8.0.2"
+ resolved "https://registry.npmmirror.com/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz"
+ integrity sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg==
+ dependencies:
+ postcss-value-parser "^4.2.0"
+
+postcss-custom-properties@^12.1.10:
+ version "12.1.11"
+ resolved "https://registry.npmmirror.com/postcss-custom-properties/-/postcss-custom-properties-12.1.11.tgz"
+ integrity sha512-0IDJYhgU8xDv1KY6+VgUwuQkVtmYzRwu+dMjnmdMafXYv86SWqfxkc7qdDvWS38vsjaEtv8e0vGOUQrAiMBLpQ==
+ dependencies:
+ postcss-value-parser "^4.2.0"
+
+postcss-custom-selectors@^6.0.3:
+ version "6.0.3"
+ resolved "https://registry.npmmirror.com/postcss-custom-selectors/-/postcss-custom-selectors-6.0.3.tgz"
+ integrity sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg==
+ dependencies:
+ postcss-selector-parser "^6.0.4"
+
+postcss-dir-pseudo-class@^6.0.5:
+ version "6.0.5"
+ resolved "https://registry.npmmirror.com/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.5.tgz"
+ integrity sha512-eqn4m70P031PF7ZQIvSgy9RSJ5uI2171O/OO/zcRNYpJbvaeKFUlar1aJ7rmgiQtbm0FSPsRewjpdS0Oew7MPA==
+ dependencies:
+ postcss-selector-parser "^6.0.10"
+
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
postcss-discard-comments@^5.1.2:
version "5.1.2"
resolved "https://registry.npmmirror.com/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz"
@@ -9205,6 +9635,7 @@
integrity sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==
dependencies:
postcss-selector-parser "^6.0.9"
+<<<<<<< HEAD
postcss-font-variant@^5.0.0:
version "5.0.0"
@@ -9232,6 +9663,35 @@
read-cache "^1.0.0"
resolve "^1.1.7"
+=======
+
+postcss-font-variant@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.npmmirror.com/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz"
+ integrity sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==
+
+postcss-gap-properties@^3.0.5:
+ version "3.0.5"
+ resolved "https://registry.npmmirror.com/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz"
+ integrity sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg==
+
+postcss-image-set-function@^4.0.7:
+ version "4.0.7"
+ resolved "https://registry.npmmirror.com/postcss-image-set-function/-/postcss-image-set-function-4.0.7.tgz"
+ integrity sha512-9T2r9rsvYzm5ndsBE8WgtrMlIT7VbtTfE7b3BQnudUqnBcBo7L758oc+o+pdj/dUV0l5wjwSdjeOH2DZtfv8qw==
+ dependencies:
+ postcss-value-parser "^4.2.0"
+
+postcss-import@^15.1.0:
+ version "15.1.0"
+ resolved "https://registry.npmmirror.com/postcss-import/-/postcss-import-15.1.0.tgz"
+ integrity sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==
+ dependencies:
+ postcss-value-parser "^4.0.0"
+ read-cache "^1.0.0"
+ resolve "^1.1.7"
+
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
postcss-initial@^4.0.1:
version "4.0.1"
resolved "https://registry.npmmirror.com/postcss-initial/-/postcss-initial-4.0.1.tgz"
@@ -9695,7 +10155,11 @@
kleur "^3.0.3"
sisteransi "^1.0.5"
+<<<<<<< HEAD
prop-types@^15.5.10, prop-types@^15.8.1:
+=======
+prop-types@^15.5.10, prop-types@^15.6.2, prop-types@^15.8.1:
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
version "15.8.1"
resolved "https://registry.npmmirror.com/prop-types/-/prop-types-15.8.1.tgz"
integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
@@ -9855,7 +10319,20 @@
rc-trigger "^5.0.4"
rc-util "^5.17.0"
+<<<<<<< HEAD
rc-field-form@^1.22.0, rc-field-form@~1.25.0:
+=======
+rc-field-form@^1.22.0:
+ version "1.38.2"
+ resolved "https://registry.npmmirror.com/rc-field-form/-/rc-field-form-1.38.2.tgz"
+ integrity sha512-O83Oi1qPyEv31Sg+Jwvsj6pXc8uQI2BtIAkURr5lvEYHVggXJhdU/nynK8wY1gbw0qR48k731sN5ON4egRCROA==
+ dependencies:
+ "@babel/runtime" "^7.18.0"
+ async-validator "^4.1.0"
+ rc-util "^5.32.2"
+
+rc-field-form@~1.25.0:
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
version "1.25.2"
resolved "https://registry.npmmirror.com/rc-field-form/-/rc-field-form-1.25.2.tgz"
integrity sha512-FXGScWibDlwIlKY15T1YOA7VTtMJwqxxXdDjHB56ZNx7wGbE4vK+Fe2zcymyakGZD0ej8NUP5LGr7qBVWaVpUQ==
@@ -9875,6 +10352,7 @@
rc-util "^5.0.6"
rc-input-number@~7.3.0:
+<<<<<<< HEAD
version "7.3.4"
resolved "https://registry.npmmirror.com/rc-input-number/-/rc-input-number-7.3.4.tgz"
integrity sha512-W9uqSzuvJUnz8H8vsVY4kx+yK51SsAxNTwr8SNH4G3XqQNocLVmKIibKFRjocnYX1RDHMND9FFbgj2h7E7nvGA==
@@ -9887,6 +10365,20 @@
version "0.0.1-alpha.6"
resolved "https://registry.npmmirror.com/rc-input/-/rc-input-0.0.1-alpha.6.tgz"
integrity sha512-kgpmbxa9vp6kPLW7IP5/Lf6wuaMq+pUq+dPz98vIM58h4wkEKgBQlkMIg9OCEVQIiR8rEPEoe4dO2fc9R0aypQ==
+=======
+ version "7.3.11"
+ resolved "https://registry.npmmirror.com/rc-input-number/-/rc-input-number-7.3.11.tgz"
+ integrity sha512-aMWPEjFeles6PQnMqP5eWpxzsvHm9rh1jQOWXExUEIxhX62Fyl/ptifLHOn17+waDG1T/YUb6flfJbvwRhHrbA==
+ dependencies:
+ "@babel/runtime" "^7.10.1"
+ classnames "^2.2.5"
+ rc-util "^5.23.0"
+
+rc-input@~0.0.1-alpha.5:
+ version "0.0.1-alpha.7"
+ resolved "https://registry.npmmirror.com/rc-input/-/rc-input-0.0.1-alpha.7.tgz"
+ integrity sha512-eozaqpCYWSY5LBMwlHgC01GArkVEP+XlJ84OMvdkwUnJBSv83Yxa15pZpn7vACAj84uDC4xOA2CoFdbLuqB08Q==
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
dependencies:
"@babel/runtime" "^7.11.1"
classnames "^2.2.1"
@@ -9947,17 +10439,29 @@
rc-util "^5.37.0"
rc-pagination@~3.1.9:
+<<<<<<< HEAD
version "3.1.15"
resolved "https://registry.npmmirror.com/rc-pagination/-/rc-pagination-3.1.15.tgz"
integrity sha512-4L3fot8g4E+PjWEgoVGX0noFCg+8ZFZmeLH4vsnZpB3O2T2zThtakjNxG+YvSaYtyMVT4B+GLayjKrKbXQpdAg==
+=======
+ version "3.1.17"
+ resolved "https://registry.npmmirror.com/rc-pagination/-/rc-pagination-3.1.17.tgz"
+ integrity sha512-/BQ5UxcBnW28vFAcP2hfh+Xg15W0QZn8TWYwdCApchMH1H0CxiaUUcULP8uXcFM1TygcdKWdt3JqsL9cTAfdkQ==
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
dependencies:
"@babel/runtime" "^7.10.1"
classnames "^2.2.1"
rc-picker@~2.6.4:
+<<<<<<< HEAD
version "2.6.7"
resolved "https://registry.npmmirror.com/rc-picker/-/rc-picker-2.6.7.tgz"
integrity sha512-+P2Grt0r2kmCkw2XTp9ew3zTCwBCFEOQLd5BYs+hFaGDSSZwEWJtlbGXAGqWnAUMFx6JrCsKYkDKXDxAWlRz3A==
+=======
+ version "2.6.11"
+ resolved "https://registry.npmmirror.com/rc-picker/-/rc-picker-2.6.11.tgz"
+ integrity sha512-INJ7ULu+Kj4UgqbcqE8Q+QpMw55xFf9kkyLBHJFk0ihjJpAV4glialRfqHE7k4KX2BWYPQfpILwhwR14x2EiRQ==
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
dependencies:
"@babel/runtime" "^7.10.1"
classnames "^2.2.1"
@@ -9978,15 +10482,22 @@
rc-util "^5.16.1"
rc-rate@~2.9.0:
+<<<<<<< HEAD
version "2.9.1"
resolved "https://registry.npmmirror.com/rc-rate/-/rc-rate-2.9.1.tgz"
integrity sha512-MmIU7FT8W4LYRRHJD1sgG366qKtSaKb67D0/vVvJYR0lrCuRrCiVQ5qhfT5ghVO4wuVIORGpZs7ZKaYu+KMUzA==
+=======
+ version "2.9.3"
+ resolved "https://registry.npmmirror.com/rc-rate/-/rc-rate-2.9.3.tgz"
+ integrity sha512-2THssUSnRhtqIouQIIXqsZGzRczvp4WsH4WvGuhiwm+LG2fVpDUJliP9O1zeDOZvYfBE/Bup4SgHun/eCkbjgQ==
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
dependencies:
"@babel/runtime" "^7.10.1"
classnames "^2.2.5"
rc-util "^5.0.1"
rc-resize-observer@^1.0.0, rc-resize-observer@^1.1.0, rc-resize-observer@^1.2.0:
+<<<<<<< HEAD
version "1.2.0"
resolved "https://registry.npmmirror.com/rc-resize-observer/-/rc-resize-observer-1.2.0.tgz"
integrity sha512-6W+UzT3PyDM0wVCEHfoW3qTHPTvbdSgiA43buiy8PzmeMnfgnDeb9NjdimMXMl3/TcrvvWl5RRVdp+NqcR47pQ==
@@ -9994,6 +10505,15 @@
"@babel/runtime" "^7.10.1"
classnames "^2.2.1"
rc-util "^5.15.0"
+=======
+ version "1.4.0"
+ resolved "https://registry.npmmirror.com/rc-resize-observer/-/rc-resize-observer-1.4.0.tgz"
+ integrity sha512-PnMVyRid9JLxFavTjeDXEXo65HCRqbmLBw9xX9gfC4BZiSzbLXKzW3jPz+J0P71pLbD5tBMTT+mkstV5gD0c9Q==
+ dependencies:
+ "@babel/runtime" "^7.20.7"
+ classnames "^2.2.1"
+ rc-util "^5.38.0"
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
resize-observer-polyfill "^1.5.1"
rc-select@~14.0.0-alpha.23, rc-select@~14.0.0-alpha.8, rc-select@~14.0.2:
@@ -10010,6 +10530,7 @@
rc-virtual-list "^3.2.0"
rc-slider@~10.0.0-alpha.4:
+<<<<<<< HEAD
version "10.0.0"
resolved "https://registry.npmmirror.com/rc-slider/-/rc-slider-10.0.0.tgz"
integrity sha512-Bk54UIKWW4wyhHcL8ehAxt+wX+n69dscnHTX6Uv0FMxSke/TGrlkZz1LSIWblCpfE2zr/dwR2Ca8nZGk3U+Tbg==
@@ -10017,6 +10538,14 @@
"@babel/runtime" "^7.10.1"
classnames "^2.2.5"
rc-tooltip "^5.0.1"
+=======
+ version "10.0.1"
+ resolved "https://registry.npmmirror.com/rc-slider/-/rc-slider-10.0.1.tgz"
+ integrity sha512-igTKF3zBet7oS/3yNiIlmU8KnZ45npmrmHlUUio8PNbIhzMcsh+oE/r2UD42Y6YD2D/s+kzCQkzQrPD6RY435Q==
+ dependencies:
+ "@babel/runtime" "^7.10.1"
+ classnames "^2.2.5"
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
rc-util "^5.18.1"
shallowequal "^1.1.0"
@@ -10072,7 +10601,11 @@
rc-util "^5.7.0"
shallowequal "^1.1.0"
+<<<<<<< HEAD
rc-tooltip@^5.0.1, rc-tooltip@~5.1.1:
+=======
+rc-tooltip@~5.1.1:
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
version "5.1.1"
resolved "https://registry.npmmirror.com/rc-tooltip/-/rc-tooltip-5.1.1.tgz"
integrity sha512-alt8eGMJulio6+4/uDm7nvV+rJq9bsfxFDCI0ljPdbuoygUscbsMYb6EQgwib/uqsXQUvzk+S7A59uYHmEgmDA==
@@ -10114,11 +10647,19 @@
rc-util "^5.19.2"
rc-upload@~4.3.0:
+<<<<<<< HEAD
version "4.3.3"
resolved "https://registry.npmmirror.com/rc-upload/-/rc-upload-4.3.3.tgz"
integrity sha512-YoJ0phCRenMj1nzwalXzciKZ9/FAaCrFu84dS5pphwucTC8GUWClcDID/WWNGsLFcM97NqIboDqrV82rVRhW/w==
dependencies:
"@babel/runtime" "^7.10.1"
+=======
+ version "4.3.6"
+ resolved "https://registry.npmmirror.com/rc-upload/-/rc-upload-4.3.6.tgz"
+ integrity sha512-Bt7ESeG5tT3IY82fZcP+s0tQU2xmo1W6P3S8NboUUliquJLQYLkUcsaExi3IlBVr43GQMCjo30RA2o0i70+NjA==
+ dependencies:
+ "@babel/runtime" "^7.18.3"
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
classnames "^2.2.5"
rc-util "^5.2.0"
@@ -10133,7 +10674,11 @@
react-lifecycles-compat "^3.0.4"
shallowequal "^1.1.0"
+<<<<<<< HEAD
rc-util@^5.0.1, rc-util@^5.0.6, rc-util@^5.12.0, rc-util@^5.14.0, rc-util@^5.15.0, rc-util@^5.16.1, rc-util@^5.17.0, rc-util@^5.18.1, rc-util@^5.19.2, rc-util@^5.19.3, rc-util@^5.2.0, rc-util@^5.2.1, rc-util@^5.3.0, rc-util@^5.36.0, rc-util@^5.37.0, rc-util@^5.4.0, rc-util@^5.43.0, rc-util@^5.5.0, rc-util@^5.6.1, rc-util@^5.7.0, rc-util@^5.8.0, rc-util@^5.9.4, rc-util@^5.9.8:
+=======
+rc-util@^5.0.1, rc-util@^5.0.6, rc-util@^5.12.0, rc-util@^5.14.0, rc-util@^5.16.1, rc-util@^5.17.0, rc-util@^5.18.1, rc-util@^5.19.2, rc-util@^5.19.3, rc-util@^5.2.0, rc-util@^5.2.1, rc-util@^5.23.0, rc-util@^5.3.0, rc-util@^5.32.2, rc-util@^5.36.0, rc-util@^5.37.0, rc-util@^5.38.0, rc-util@^5.4.0, rc-util@^5.43.0, rc-util@^5.5.0, rc-util@^5.6.1, rc-util@^5.7.0, rc-util@^5.8.0, rc-util@^5.9.4:
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
version "5.43.0"
resolved "https://registry.npmmirror.com/rc-util/-/rc-util-5.43.0.tgz"
integrity sha512-AzC7KKOXFqAdIBqdGWepL9Xn7cm3vnAmjlHqUnoQaTMZYhM4VlXGLkkHHxj/BZ7Td0+SOPKB4RGPboBVKT9htw==
@@ -10163,6 +10708,16 @@
regenerator-runtime "^0.13.9"
whatwg-fetch "^3.6.2"
+<<<<<<< HEAD
+=======
+react-clientside-effect@^1.2.6:
+ version "1.2.6"
+ resolved "https://registry.npmmirror.com/react-clientside-effect/-/react-clientside-effect-1.2.6.tgz"
+ integrity sha512-XGGGRQAKY+q25Lz9a/4EPqom7WRjz3z9R2k4jhVKA/puQFH/5Nt27vFZYql4m4NVNdUvX8PS3O7r/Zzm7cjUlg==
+ dependencies:
+ "@babel/runtime" "^7.12.13"
+
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
react-color@2.17.1:
version "2.17.1"
resolved "https://registry.npmmirror.com/react-color/-/react-color-2.17.1.tgz"
@@ -10236,6 +10791,21 @@
resolved "https://registry.npmmirror.com/react-error-overlay/-/react-error-overlay-6.0.11.tgz"
integrity sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg==
+<<<<<<< HEAD
+=======
+react-focus-lock@^2.9.1:
+ version "2.12.1"
+ resolved "https://registry.npmmirror.com/react-focus-lock/-/react-focus-lock-2.12.1.tgz"
+ integrity sha512-lfp8Dve4yJagkHiFrC1bGtib3mF2ktqwPJw4/WGcgPW+pJ/AVQA5X2vI7xgp13FcxFEpYBBHpXai/N2DBNC0Jw==
+ dependencies:
+ "@babel/runtime" "^7.0.0"
+ focus-lock "^1.3.5"
+ prop-types "^15.6.2"
+ react-clientside-effect "^1.2.6"
+ use-callback-ref "^1.3.2"
+ use-sidecar "^1.1.2"
+
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
react-infinite-scroll-component@^6.1.0:
version "6.1.0"
resolved "https://registry.npmmirror.com/react-infinite-scroll-component/-/react-infinite-scroll-component-6.1.0.tgz"
@@ -10354,6 +10924,19 @@
workbox-webpack-plugin "^6.4.1"
optionalDependencies:
fsevents "^2.3.2"
+<<<<<<< HEAD
+=======
+
+react-transition-group@^4.3.0:
+ version "4.4.5"
+ resolved "https://registry.npmmirror.com/react-transition-group/-/react-transition-group-4.4.5.tgz"
+ integrity sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==
+ dependencies:
+ "@babel/runtime" "^7.5.5"
+ dom-helpers "^5.0.1"
+ loose-envify "^1.4.0"
+ prop-types "^15.6.2"
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
react-universal-interface@^0.6.2:
version "0.6.2"
@@ -10722,6 +11305,7 @@
integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
dependencies:
queue-microtask "^1.2.2"
+<<<<<<< HEAD
rw@^1.3.2, rw@^1.3.3, rw@1:
version "1.3.3"
@@ -10745,6 +11329,31 @@
has-symbols "^1.0.3"
isarray "^2.0.5"
+=======
+
+rw@^1.3.2, rw@^1.3.3, rw@1:
+ version "1.3.3"
+ resolved "https://registry.npmmirror.com/rw/-/rw-1.3.3.tgz"
+ integrity sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==
+
+rxjs@^6.6.7:
+ version "6.6.7"
+ resolved "https://registry.npmmirror.com/rxjs/-/rxjs-6.6.7.tgz"
+ integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
+ dependencies:
+ tslib "^1.9.0"
+
+safe-array-concat@^1.1.2:
+ version "1.1.2"
+ resolved "https://registry.npmmirror.com/safe-array-concat/-/safe-array-concat-1.1.2.tgz"
+ integrity sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==
+ dependencies:
+ call-bind "^1.0.7"
+ get-intrinsic "^1.2.4"
+ has-symbols "^1.0.3"
+ isarray "^2.0.5"
+
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
safe-buffer@^5.1.0, safe-buffer@>=5.1.0, safe-buffer@~5.1.0, safe-buffer@~5.1.1, safe-buffer@5.1.2:
version "5.1.2"
resolved "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.2.tgz"
@@ -10864,11 +11473,26 @@
integrity sha512-9BakfsO2aUQN2K9Fdbj87RJIEZ82Q9IGim7FqM5OsebfoFC6ZHXgDq/KvniuLTPdeM8wY2o6Dj3WQ7KeQCj3cA==
scroll-into-view-if-needed@^2.2.25:
+<<<<<<< HEAD
version "2.2.29"
resolved "https://registry.npmmirror.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.29.tgz"
integrity sha512-hxpAR6AN+Gh53AdAimHM6C8oTN1ppwVZITihix+WqalywBeFcQ6LdQP5ABNl26nX8GTEL7VT+b8lKpdqq65wXg==
dependencies:
compute-scroll-into-view "^1.0.17"
+=======
+ version "2.2.31"
+ resolved "https://registry.npmmirror.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.31.tgz"
+ integrity sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==
+ dependencies:
+ compute-scroll-into-view "^1.0.20"
+
+scroll-into-view-if-needed@2.2.20:
+ version "2.2.20"
+ resolved "https://registry.npmmirror.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.20.tgz"
+ integrity sha512-P9kYMrhi9f6dvWwTGpO5I3HgjSU/8Mts7xL3lkoH5xlewK7O9Obdc5WmMCzppln7bCVGNmf3qfoZXrpCeyNJXw==
+ dependencies:
+ compute-scroll-into-view "1.0.11"
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
select-hose@^2.0.0:
version "2.0.0"
@@ -12062,6 +12686,24 @@
dependencies:
punycode "^2.1.0"
+<<<<<<< HEAD
+=======
+use-callback-ref@^1.3.2:
+ version "1.3.2"
+ resolved "https://registry.npmmirror.com/use-callback-ref/-/use-callback-ref-1.3.2.tgz"
+ integrity sha512-elOQwe6Q8gqZgDA8mrh44qRTQqpIHDcZ3hXTLjBe1i4ph8XpNJnO+aQf3NaG+lriLopI4HMx9VjQLfPQ6vhnoA==
+ dependencies:
+ tslib "^2.0.0"
+
+use-sidecar@^1.1.2:
+ version "1.1.2"
+ resolved "https://registry.npmmirror.com/use-sidecar/-/use-sidecar-1.1.2.tgz"
+ integrity sha512-epTbsLuzZ7lPClpz2TyryBfztm7m+28DlEv2ZCQ3MDr5ssiwyOwGH/e5F9CkfWjJ1t4clvI58yF822/GUkjjhw==
+ dependencies:
+ detect-node-es "^1.1.0"
+ tslib "^2.0.0"
+
+>>>>>>> 82ff331ef9fd19f533b77ff81861c0cf88d14fe5
util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
version "1.0.2"
resolved "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz"
--
Gitblit v1.8.0