diff --git a/docs/package-lock.json b/docs/package-lock.json
index 21eabf17..6795c72f 100644
--- a/docs/package-lock.json
+++ b/docs/package-lock.json
@@ -4,25 +4,25 @@
"packages": {
"": {
"dependencies": {
- "@babel/eslint-parser": "^7.22.5",
"@reach/router": "^1.3.4",
- "@typescript-eslint/eslint-plugin": "^5.59.0",
- "@typescript-eslint/parser": "^5.59.0",
"clipboardy": "^3.0.0",
- "eslint-plugin-flowtype": "^8.0.3",
- "eslint-plugin-import": "^2.27.5",
- "eslint-plugin-jsx-a11y": "^6.7.1",
- "eslint-plugin-react": "^7.32.2",
- "eslint-plugin-react-hooks": "^4.6.0",
"resolve-url-loader": "^5.0.0",
"swagger-jsdoc": "^5.0.1"
},
"devDependencies": {
+ "@babel/eslint-parser": "^7.22.5",
"@fortawesome/fontawesome-svg-core": "^1.2.32",
"@fortawesome/free-solid-svg-icons": "^5.15.1",
"@fortawesome/react-fontawesome": "^0.2.0",
+ "@typescript-eslint/eslint-plugin": "^5.59.0",
+ "@typescript-eslint/parser": "^5.59.0",
"classnames": "^2.2.6",
"eslint-config-react-app": "^7.0.1",
+ "eslint-plugin-flowtype": "^8.0.3",
+ "eslint-plugin-import": "^2.27.5",
+ "eslint-plugin-jsx-a11y": "^6.7.1",
+ "eslint-plugin-react": "^7.32.2",
+ "eslint-plugin-react-hooks": "^4.6.0",
"gatsby": "^5.9.0",
"gatsby-cli": "^5.9.0",
"gatsby-plugin-manifest": "^5.9.0",
@@ -54,12 +54,6 @@
"name": "crossfeed-docs",
"version": "1.0.0"
},
-<<<<<<< HEAD
- "node_modules/@ampproject/remapping": {
- "version": "2.2.1",
- "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
- "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
-=======
"node_modules/@aashutoshrathi/word-wrap": {
"dev": true,
"engines": {
@@ -70,7 +64,6 @@
"version": "1.2.6"
},
"node_modules/@ampproject/remapping": {
->>>>>>> develop
"dependencies": {
"@jridgewell/gen-mapping": "^0.3.0",
"@jridgewell/trace-mapping": "^0.3.9"
@@ -225,14 +218,9 @@
"version": "7.2.0"
},
"node_modules/@babel/code-frame": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz",
- "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==",
-=======
->>>>>>> develop
"dependencies": {
- "@babel/highlight": "^7.22.5"
+ "@babel/highlight": "^7.22.13",
+ "chalk": "^2.4.2"
},
"dev": true,
"engines": {
@@ -243,13 +231,7 @@
"version": "7.22.13"
},
"node_modules/@babel/compat-data": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.5.tgz",
- "integrity": "sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=6.9.0"
},
@@ -258,28 +240,22 @@
"version": "7.22.9"
},
"node_modules/@babel/core": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.5.tgz",
- "integrity": "sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==",
-=======
->>>>>>> develop
"dependencies": {
"@ampproject/remapping": "^2.2.0",
- "@babel/code-frame": "^7.22.5",
- "@babel/generator": "^7.22.5",
- "@babel/helper-compilation-targets": "^7.22.5",
- "@babel/helper-module-transforms": "^7.22.5",
- "@babel/helpers": "^7.22.5",
- "@babel/parser": "^7.22.5",
+ "@babel/code-frame": "^7.22.10",
+ "@babel/generator": "^7.22.10",
+ "@babel/helper-compilation-targets": "^7.22.10",
+ "@babel/helper-module-transforms": "^7.22.9",
+ "@babel/helpers": "^7.22.11",
+ "@babel/parser": "^7.22.11",
"@babel/template": "^7.22.5",
- "@babel/traverse": "^7.22.5",
- "@babel/types": "^7.22.5",
+ "@babel/traverse": "^7.22.11",
+ "@babel/types": "^7.22.11",
"convert-source-map": "^1.7.0",
"debug": "^4.1.0",
"gensync": "^1.0.0-beta.2",
- "json5": "^2.2.2",
- "semver": "^6.3.0"
+ "json5": "^2.2.3",
+ "semver": "^6.3.1"
},
"dev": true,
"engines": {
@@ -294,16 +270,10 @@
"version": "7.22.11"
},
"node_modules/@babel/eslint-parser": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.22.5.tgz",
- "integrity": "sha512-C69RWYNYtrgIRE5CmTd77ZiLDXqgBipahJc/jHP3sLcAGj6AJzxNIuKNpVnICqbyK7X3pFUfEvL++rvtbQpZkQ==",
-=======
->>>>>>> develop
"dependencies": {
"@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
"eslint-visitor-keys": "^2.1.0",
- "semver": "^6.3.0"
+ "semver": "^6.3.1"
},
"dev": true,
"engines": {
@@ -311,21 +281,15 @@
},
"integrity": "sha512-YjOYZ3j7TjV8OhLW6NCtyg8G04uStATEUe5eiLuCZaXz2VSDQ3dsAtm2D+TuQyAqNMUK2WacGo0/uma9Pein1w==",
"peerDependencies": {
- "@babel/core": ">=7.11.0",
+ "@babel/core": "^7.11.0",
"eslint": "^7.5.0 || ^8.0.0"
},
"resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.22.11.tgz",
"version": "7.22.11"
},
"node_modules/@babel/generator": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.5.tgz",
- "integrity": "sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA==",
-=======
->>>>>>> develop
- "dependencies": {
- "@babel/types": "^7.22.5",
+ "dependencies": {
+ "@babel/types": "^7.23.0",
"@jridgewell/gen-mapping": "^0.3.2",
"@jridgewell/trace-mapping": "^0.3.17",
"jsesc": "^2.5.1"
@@ -339,12 +303,6 @@
"version": "7.23.0"
},
"node_modules/@babel/helper-annotate-as-pure": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
- "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
-=======
->>>>>>> develop
"dependencies": {
"@babel/types": "^7.22.5"
},
@@ -357,15 +315,8 @@
"version": "7.22.5"
},
"node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.5.tgz",
- "integrity": "sha512-m1EP3lVOPptR+2DwD125gziZNcmoNSHGmJROKoy87loWUQyJaVXDgpmruWqDARZSmtYQ+Dl25okU8+qhVzuykw==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
- "@babel/types": "^7.22.5"
+ "@babel/types": "^7.22.10"
},
"dev": true,
"engines": {
@@ -376,50 +327,32 @@
"version": "7.22.10"
},
"node_modules/@babel/helper-compilation-targets": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.5.tgz",
- "integrity": "sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw==",
-=======
->>>>>>> develop
- "dependencies": {
- "@babel/compat-data": "^7.22.5",
+ "dependencies": {
+ "@babel/compat-data": "^7.22.9",
"@babel/helper-validator-option": "^7.22.5",
- "browserslist": "^4.21.3",
+ "browserslist": "^4.21.9",
"lru-cache": "^5.1.1",
- "semver": "^6.3.0"
+ "semver": "^6.3.1"
},
"dev": true,
"engines": {
"node": ">=6.9.0"
},
-<<<<<<< HEAD
- "peerDependencies": {
- "@babel/core": "^7.0.0"
- }
- },
- "node_modules/@babel/helper-create-class-features-plugin": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.5.tgz",
- "integrity": "sha512-xkb58MyOYIslxu3gKmVXmjTtUPvBU4odYzbiIQbWwLKIHCsx6UGZGX6F1IznMFVnDdirseUZopzN+ZRt8Xb33Q==",
- "dev": true,
-=======
"integrity": "sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==",
"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.10.tgz",
"version": "7.22.10"
},
"node_modules/@babel/helper-create-class-features-plugin": {
->>>>>>> develop
"dependencies": {
"@babel/helper-annotate-as-pure": "^7.22.5",
"@babel/helper-environment-visitor": "^7.22.5",
"@babel/helper-function-name": "^7.22.5",
"@babel/helper-member-expression-to-functions": "^7.22.5",
"@babel/helper-optimise-call-expression": "^7.22.5",
- "@babel/helper-replace-supers": "^7.22.5",
+ "@babel/helper-replace-supers": "^7.22.9",
"@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
- "@babel/helper-split-export-declaration": "^7.22.5",
- "semver": "^6.3.0"
+ "@babel/helper-split-export-declaration": "^7.22.6",
+ "semver": "^6.3.1"
},
"dev": true,
"engines": {
@@ -433,17 +366,10 @@
"version": "7.22.11"
},
"node_modules/@babel/helper-create-regexp-features-plugin": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.5.tgz",
- "integrity": "sha512-1VpEFOIbMRaXyDeUwUfmTIxExLwQ+zkW+Bh5zXpApA3oQedBx9v/updixWxnx/bZpKw7u8VxWjb/qWpIcmPq8A==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/helper-annotate-as-pure": "^7.22.5",
"regexpu-core": "^5.3.1",
- "semver": "^6.3.0"
+ "semver": "^6.3.1"
},
"dev": true,
"engines": {
@@ -457,33 +383,16 @@
"version": "7.22.9"
},
"node_modules/@babel/helper-define-polyfill-provider": {
-<<<<<<< HEAD
- "version": "0.4.0",
- "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.0.tgz",
- "integrity": "sha512-RnanLx5ETe6aybRi1cO/edaRH+bNYWaryCEmjDDYyNr4wnSzyOp8T0dWipmqVHKEY3AbVKUom50AKSlj1zmKbg==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
- "@babel/helper-compilation-targets": "^7.17.7",
- "@babel/helper-plugin-utils": "^7.16.7",
+ "@babel/helper-compilation-targets": "^7.22.6",
+ "@babel/helper-plugin-utils": "^7.22.5",
"debug": "^4.1.1",
"lodash.debounce": "^4.0.8",
- "resolve": "^1.14.2",
- "semver": "^6.1.2"
+ "resolve": "^1.14.2"
},
"dev": true,
"integrity": "sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw==",
"peerDependencies": {
-<<<<<<< HEAD
- "@babel/core": "^7.4.0-0"
- }
- },
- "node_modules/@babel/helper-environment-visitor": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
- "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==",
-=======
"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
},
"resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz",
@@ -491,7 +400,6 @@
},
"node_modules/@babel/helper-environment-visitor": {
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=6.9.0"
},
@@ -500,15 +408,9 @@
"version": "7.22.20"
},
"node_modules/@babel/helper-function-name": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz",
- "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==",
-=======
->>>>>>> develop
"dependencies": {
- "@babel/template": "^7.22.5",
- "@babel/types": "^7.22.5"
+ "@babel/template": "^7.22.15",
+ "@babel/types": "^7.23.0"
},
"dev": true,
"engines": {
@@ -519,12 +421,6 @@
"version": "7.23.0"
},
"node_modules/@babel/helper-hoist-variables": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
- "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
-=======
->>>>>>> develop
"dependencies": {
"@babel/types": "^7.22.5"
},
@@ -549,12 +445,6 @@
"version": "7.22.5"
},
"node_modules/@babel/helper-module-imports": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz",
- "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==",
-=======
->>>>>>> develop
"dependencies": {
"@babel/types": "^7.22.5"
},
@@ -567,28 +457,16 @@
"version": "7.22.5"
},
"node_modules/@babel/helper-module-transforms": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz",
- "integrity": "sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw==",
-=======
->>>>>>> develop
"dependencies": {
"@babel/helper-environment-visitor": "^7.22.5",
"@babel/helper-module-imports": "^7.22.5",
"@babel/helper-simple-access": "^7.22.5",
- "@babel/helper-split-export-declaration": "^7.22.5",
- "@babel/helper-validator-identifier": "^7.22.5",
- "@babel/template": "^7.22.5",
- "@babel/traverse": "^7.22.5",
- "@babel/types": "^7.22.5"
+ "@babel/helper-split-export-declaration": "^7.22.6",
+ "@babel/helper-validator-identifier": "^7.22.5"
},
"dev": true,
"engines": {
"node": ">=6.9.0"
-<<<<<<< HEAD
- }
-=======
},
"integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==",
"peerDependencies": {
@@ -596,7 +474,6 @@
},
"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz",
"version": "7.22.9"
->>>>>>> develop
},
"node_modules/@babel/helper-optimise-call-expression": {
"dependencies": {
@@ -611,13 +488,7 @@
"version": "7.22.5"
},
"node_modules/@babel/helper-plugin-utils": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
- "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=6.9.0"
},
@@ -626,18 +497,10 @@
"version": "7.22.5"
},
"node_modules/@babel/helper-remap-async-to-generator": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.5.tgz",
- "integrity": "sha512-cU0Sq1Rf4Z55fgz7haOakIyM7+x/uCFwXpLPaeRzfoUtAEAuUZjZvFPjL/rk5rW693dIgn2hng1W7xbT7lWT4g==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/helper-annotate-as-pure": "^7.22.5",
"@babel/helper-environment-visitor": "^7.22.5",
- "@babel/helper-wrap-function": "^7.22.5",
- "@babel/types": "^7.22.5"
+ "@babel/helper-wrap-function": "^7.22.9"
},
"dev": true,
"engines": {
@@ -651,32 +514,14 @@
"version": "7.22.9"
},
"node_modules/@babel/helper-replace-supers": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.5.tgz",
- "integrity": "sha512-aLdNM5I3kdI/V9xGNyKSF3X/gTyMUBohTZ+/3QdQKAA9vxIiy12E+8E2HoOP1/DjeqU+g6as35QHJNMDDYpuCg==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/helper-environment-visitor": "^7.22.5",
"@babel/helper-member-expression-to-functions": "^7.22.5",
- "@babel/helper-optimise-call-expression": "^7.22.5",
- "@babel/template": "^7.22.5",
- "@babel/traverse": "^7.22.5",
- "@babel/types": "^7.22.5"
+ "@babel/helper-optimise-call-expression": "^7.22.5"
},
"dev": true,
"engines": {
"node": ">=6.9.0"
-<<<<<<< HEAD
- }
- },
- "node_modules/@babel/helper-simple-access": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
- "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
-=======
},
"integrity": "sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==",
"peerDependencies": {
@@ -686,7 +531,6 @@
"version": "7.22.9"
},
"node_modules/@babel/helper-simple-access": {
->>>>>>> develop
"dependencies": {
"@babel/types": "^7.22.5"
},
@@ -711,12 +555,6 @@
"version": "7.22.5"
},
"node_modules/@babel/helper-split-export-declaration": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.5.tgz",
- "integrity": "sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ==",
-=======
->>>>>>> develop
"dependencies": {
"@babel/types": "^7.22.5"
},
@@ -729,13 +567,7 @@
"version": "7.22.6"
},
"node_modules/@babel/helper-string-parser": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
- "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=6.9.0"
},
@@ -744,13 +576,7 @@
"version": "7.22.5"
},
"node_modules/@babel/helper-validator-identifier": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
- "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=6.9.0"
},
@@ -759,13 +585,7 @@
"version": "7.22.20"
},
"node_modules/@babel/helper-validator-option": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz",
- "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=6.9.0"
},
@@ -774,18 +594,10 @@
"version": "7.22.5"
},
"node_modules/@babel/helper-wrap-function": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.5.tgz",
- "integrity": "sha512-bYqLIBSEshYcYQyfks8ewYA8S30yaGSeRslcvKMvoUk6HHPySbxHq9YRi6ghhzEU+yhQv9bP/jXnygkStOcqZw==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/helper-function-name": "^7.22.5",
"@babel/template": "^7.22.5",
- "@babel/traverse": "^7.22.5",
- "@babel/types": "^7.22.5"
+ "@babel/types": "^7.22.10"
},
"dev": true,
"engines": {
@@ -796,16 +608,10 @@
"version": "7.22.10"
},
"node_modules/@babel/helpers": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.5.tgz",
- "integrity": "sha512-pSXRmfE1vzcUIDFQcSGA5Mr+GxBV9oiRKDuDxXvWQQBCh8HoIjs/2DlDB7H8smac1IVrB9/xdXj2N3Wol9Cr+Q==",
-=======
->>>>>>> develop
"dependencies": {
"@babel/template": "^7.22.5",
- "@babel/traverse": "^7.22.5",
- "@babel/types": "^7.22.5"
+ "@babel/traverse": "^7.22.11",
+ "@babel/types": "^7.22.11"
},
"dev": true,
"engines": {
@@ -816,15 +622,9 @@
"version": "7.22.11"
},
"node_modules/@babel/highlight": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz",
- "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==",
-=======
->>>>>>> develop
"dependencies": {
"@babel/helper-validator-identifier": "^7.22.5",
- "chalk": "^2.0.0",
+ "chalk": "^2.4.2",
"js-tokens": "^4.0.0"
},
"dev": true,
@@ -836,12 +636,6 @@
"version": "7.22.13"
},
"node_modules/@babel/parser": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.5.tgz",
- "integrity": "sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q==",
-=======
->>>>>>> develop
"bin": {
"parser": "bin/babel-parser.js"
},
@@ -902,19 +696,12 @@
"version": "7.18.6"
},
"node_modules/@babel/plugin-proposal-decorators": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.22.5.tgz",
- "integrity": "sha512-h8hlezQ4dl6ixodgXkH8lUfcD7x+WAuIqPUjwGoItynrXOAv4a4Tci1zA/qjzQjjcl0v3QpLdc2LM6ZACQuY7A==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
- "@babel/helper-create-class-features-plugin": "^7.22.5",
+ "@babel/helper-create-class-features-plugin": "^7.22.10",
"@babel/helper-plugin-utils": "^7.22.5",
- "@babel/helper-replace-supers": "^7.22.5",
- "@babel/helper-split-export-declaration": "^7.22.5",
- "@babel/plugin-syntax-decorators": "^7.22.5"
+ "@babel/helper-replace-supers": "^7.22.9",
+ "@babel/helper-split-export-declaration": "^7.22.6",
+ "@babel/plugin-syntax-decorators": "^7.22.10"
},
"dev": true,
"engines": {
@@ -1023,22 +810,6 @@
"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
"version": "7.21.0-placeholder-for-preset-env.2"
},
- "node_modules/@babel/plugin-proposal-unicode-property-regex": {
- "version": "7.18.6",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
- "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==",
- "dev": true,
- "dependencies": {
- "@babel/helper-create-regexp-features-plugin": "^7.18.6",
- "@babel/helper-plugin-utils": "^7.18.6"
- },
- "engines": {
- "node": ">=4"
- },
- "peerDependencies": {
- "@babel/core": "^7.0.0-0"
- }
- },
"node_modules/@babel/plugin-syntax-async-generators": {
"dependencies": {
"@babel/helper-plugin-utils": "^7.8.0"
@@ -1079,13 +850,6 @@
"version": "7.14.5"
},
"node_modules/@babel/plugin-syntax-decorators": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.22.5.tgz",
- "integrity": "sha512-avpUOBS7IU6al8MmF1XpAyj9QYeLPuSDJI5D4pVMSMdL7xQokKqJPYQC67RCT0aCTashUXPiGwMJ0DEXXCEmMA==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/helper-plugin-utils": "^7.22.5"
},
@@ -1125,12 +889,6 @@
"version": "7.8.3"
},
"node_modules/@babel/plugin-syntax-flow": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.22.5.tgz",
- "integrity": "sha512-9RdCl0i+q0QExayk2nOS7853w08yLucnnPML6EN9S8fgMPVtdLDCdx/cOQ/i44Lb9UeQX9A35yaqBBOMMZxPxQ==",
-=======
->>>>>>> develop
"dependencies": {
"@babel/helper-plugin-utils": "^7.22.5"
},
@@ -1200,12 +958,6 @@
"version": "7.8.3"
},
"node_modules/@babel/plugin-syntax-jsx": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz",
- "integrity": "sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==",
-=======
->>>>>>> develop
"dependencies": {
"@babel/helper-plugin-utils": "^7.22.5"
},
@@ -1369,17 +1121,10 @@
"version": "7.22.5"
},
"node_modules/@babel/plugin-transform-async-generator-functions": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.5.tgz",
- "integrity": "sha512-gGOEvFzm3fWoyD5uZq7vVTD57pPJ3PczPUD/xCFGjzBpUosnklmXyKnGQbbbGs1NPNPskFex0j93yKbHt0cHyg==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/helper-environment-visitor": "^7.22.5",
"@babel/helper-plugin-utils": "^7.22.5",
- "@babel/helper-remap-async-to-generator": "^7.22.5",
+ "@babel/helper-remap-async-to-generator": "^7.22.9",
"@babel/plugin-syntax-async-generators": "^7.8.4"
},
"dev": true,
@@ -1426,13 +1171,6 @@
"version": "7.22.5"
},
"node_modules/@babel/plugin-transform-block-scoping": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.5.tgz",
- "integrity": "sha512-EcACl1i5fSQ6bt+YGuU/XGCeZKStLmyVGytWkpyhCLeQVA0eu6Wtiw92V+I1T/hnezUv7j74dA/Ro69gWcU+hg==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/helper-plugin-utils": "^7.22.5"
},
@@ -1464,15 +1202,8 @@
"version": "7.22.5"
},
"node_modules/@babel/plugin-transform-class-static-block": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.5.tgz",
- "integrity": "sha512-SPToJ5eYZLxlnp1UzdARpOGeC2GbHvr9d/UV0EukuVx8atktg194oe+C5BqQ8jRTkgLRVOPYeXRSBg1IlMoVRA==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
- "@babel/helper-create-class-features-plugin": "^7.22.5",
+ "@babel/helper-create-class-features-plugin": "^7.22.11",
"@babel/helper-plugin-utils": "^7.22.5",
"@babel/plugin-syntax-class-static-block": "^7.14.5"
},
@@ -1488,22 +1219,15 @@
"version": "7.22.11"
},
"node_modules/@babel/plugin-transform-classes": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.5.tgz",
- "integrity": "sha512-2edQhLfibpWpsVBx2n/GKOz6JdGQvLruZQfGr9l1qes2KQaWswjBzhQF7UDUZMNaMMQeYnQzxwOMPsbYF7wqPQ==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/helper-annotate-as-pure": "^7.22.5",
- "@babel/helper-compilation-targets": "^7.22.5",
+ "@babel/helper-compilation-targets": "^7.22.6",
"@babel/helper-environment-visitor": "^7.22.5",
"@babel/helper-function-name": "^7.22.5",
"@babel/helper-optimise-call-expression": "^7.22.5",
"@babel/helper-plugin-utils": "^7.22.5",
"@babel/helper-replace-supers": "^7.22.5",
- "@babel/helper-split-export-declaration": "^7.22.5",
+ "@babel/helper-split-export-declaration": "^7.22.6",
"globals": "^11.1.0"
},
"dev": true,
@@ -1534,13 +1258,6 @@
"version": "7.22.5"
},
"node_modules/@babel/plugin-transform-destructuring": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.5.tgz",
- "integrity": "sha512-GfqcFuGW8vnEqTUBM7UtPd5A4q797LTvvwKxXTgRsFjoqaJiEg9deBG6kWeQYkVEL569NpnmpC0Pkr/8BLKGnQ==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/helper-plugin-utils": "^7.22.5"
},
@@ -1587,13 +1304,6 @@
"version": "7.22.5"
},
"node_modules/@babel/plugin-transform-dynamic-import": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.5.tgz",
- "integrity": "sha512-0MC3ppTB1AMxd8fXjSrbPa7LT9hrImt+/fcj+Pg5YMD7UQyWp/02+JWpdnCymmsXwIx5Z+sYn1bwCn4ZJNvhqQ==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/helper-plugin-utils": "^7.22.5",
"@babel/plugin-syntax-dynamic-import": "^7.8.3"
@@ -1626,13 +1336,6 @@
"version": "7.22.5"
},
"node_modules/@babel/plugin-transform-export-namespace-from": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.5.tgz",
- "integrity": "sha512-X4hhm7FRnPgd4nDA4b/5V280xCx6oL7Oob5+9qVS5C13Zq4bh1qq7LU0GgRU6b5dBWBvhGaXYVB4AcN6+ol6vg==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/helper-plugin-utils": "^7.22.5",
"@babel/plugin-syntax-export-namespace-from": "^7.8.3"
@@ -1697,13 +1400,6 @@
"version": "7.22.5"
},
"node_modules/@babel/plugin-transform-json-strings": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.5.tgz",
- "integrity": "sha512-DuCRB7fu8MyTLbEQd1ew3R85nx/88yMoqo2uPSjevMj3yoN7CDM8jkgrY0wmVxfJZyJ/B9fE1iq7EQppWQmR5A==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/helper-plugin-utils": "^7.22.5",
"@babel/plugin-syntax-json-strings": "^7.8.3"
@@ -1735,13 +1431,6 @@
"version": "7.22.5"
},
"node_modules/@babel/plugin-transform-logical-assignment-operators": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.5.tgz",
- "integrity": "sha512-MQQOUW1KL8X0cDWfbwYP+TbVbZm16QmQXJQ+vndPtH/BoO0lOKpVoEDMI7+PskYxH+IiE0tS8xZye0qr1lGzSA==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/helper-plugin-utils": "^7.22.5",
"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
@@ -1789,15 +1478,8 @@
"version": "7.22.5"
},
"node_modules/@babel/plugin-transform-modules-commonjs": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz",
- "integrity": "sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
- "@babel/helper-module-transforms": "^7.22.5",
+ "@babel/helper-module-transforms": "^7.22.9",
"@babel/helper-plugin-utils": "^7.22.5",
"@babel/helper-simple-access": "^7.22.5"
},
@@ -1813,16 +1495,9 @@
"version": "7.22.11"
},
"node_modules/@babel/plugin-transform-modules-systemjs": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz",
- "integrity": "sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/helper-hoist-variables": "^7.22.5",
- "@babel/helper-module-transforms": "^7.22.5",
+ "@babel/helper-module-transforms": "^7.22.9",
"@babel/helper-plugin-utils": "^7.22.5",
"@babel/helper-validator-identifier": "^7.22.5"
},
@@ -1885,13 +1560,6 @@
"version": "7.22.5"
},
"node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.5.tgz",
- "integrity": "sha512-6CF8g6z1dNYZ/VXok5uYkkBBICHZPiGEl7oDnAx2Mt1hlHVHOSIKWJaXHjQJA5VB43KZnXZDIexMchY4y2PGdA==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/helper-plugin-utils": "^7.22.5",
"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
@@ -1908,13 +1576,6 @@
"version": "7.22.11"
},
"node_modules/@babel/plugin-transform-numeric-separator": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.5.tgz",
- "integrity": "sha512-NbslED1/6M+sXiwwtcAB/nieypGw02Ejf4KtDeMkCEpP6gWFMX1wI9WKYua+4oBneCCEmulOkRpwywypVZzs/g==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/helper-plugin-utils": "^7.22.5",
"@babel/plugin-syntax-numeric-separator": "^7.10.4"
@@ -1931,16 +1592,9 @@
"version": "7.22.11"
},
"node_modules/@babel/plugin-transform-object-rest-spread": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.5.tgz",
- "integrity": "sha512-Kk3lyDmEslH9DnvCDA1s1kkd3YWQITiBOHngOtDL9Pt6BZjzqb6hiOlb8VfjiiQJ2unmegBqZu0rx5RxJb5vmQ==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
- "@babel/compat-data": "^7.22.5",
- "@babel/helper-compilation-targets": "^7.22.5",
+ "@babel/compat-data": "^7.22.9",
+ "@babel/helper-compilation-targets": "^7.22.10",
"@babel/helper-plugin-utils": "^7.22.5",
"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
"@babel/plugin-transform-parameters": "^7.22.5"
@@ -1973,13 +1627,6 @@
"version": "7.22.5"
},
"node_modules/@babel/plugin-transform-optional-catch-binding": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.5.tgz",
- "integrity": "sha512-pH8orJahy+hzZje5b8e2QIlBWQvGpelS76C63Z+jhZKsmzfNaPQ+LaW6dcJ9bxTpo1mtXbgHwy765Ro3jftmUg==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/helper-plugin-utils": "^7.22.5",
"@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
@@ -1996,13 +1643,6 @@
"version": "7.22.11"
},
"node_modules/@babel/plugin-transform-optional-chaining": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.5.tgz",
- "integrity": "sha512-AconbMKOMkyG+xCng2JogMCDcqW8wedQAqpVIL4cOSescZ7+iW8utC6YDZLMCSUIReEA733gzRSaOSXMAt/4WQ==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/helper-plugin-utils": "^7.22.5",
"@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
@@ -2051,16 +1691,9 @@
"version": "7.22.5"
},
"node_modules/@babel/plugin-transform-private-property-in-object": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.5.tgz",
- "integrity": "sha512-/9xnaTTJcVoBtSSmrVyhtSvO3kbqS2ODoh2juEU72c3aYonNF0OMGiaz2gjukyKM2wBBYJP38S4JiE0Wfb5VMQ==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/helper-annotate-as-pure": "^7.22.5",
- "@babel/helper-create-class-features-plugin": "^7.22.5",
+ "@babel/helper-create-class-features-plugin": "^7.22.11",
"@babel/helper-plugin-utils": "^7.22.5",
"@babel/plugin-syntax-private-property-in-object": "^7.14.5"
},
@@ -2106,12 +1739,6 @@
"version": "7.22.5"
},
"node_modules/@babel/plugin-transform-react-jsx": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.22.5.tgz",
- "integrity": "sha512-rog5gZaVbUip5iWDMTYbVM15XQq+RkUKhET/IHR6oizR+JEoN6CAfTTuHcK4vwUyzca30qqHqEpzBOnaRMWYMA==",
-=======
->>>>>>> develop
"dependencies": {
"@babel/helper-annotate-as-pure": "^7.22.5",
"@babel/helper-module-imports": "^7.22.5",
@@ -2162,16 +1789,9 @@
"version": "7.22.5"
},
"node_modules/@babel/plugin-transform-regenerator": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.5.tgz",
- "integrity": "sha512-rR7KePOE7gfEtNTh9Qw+iO3Q/e4DEsoQ+hdvM6QUDH7JRJ5qxq5AA52ZzBWbI5i9lfNuvySgOGP8ZN7LAmaiPw==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/helper-plugin-utils": "^7.22.5",
- "regenerator-transform": "^0.15.1"
+ "regenerator-transform": "^0.15.2"
},
"dev": true,
"engines": {
@@ -2200,20 +1820,13 @@
"version": "7.22.5"
},
"node_modules/@babel/plugin-transform-runtime": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.5.tgz",
- "integrity": "sha512-bg4Wxd1FWeFx3daHFTWk1pkSWK/AyQuiyAoeZAOkAOUBjnZPH6KT7eMxouV47tQ6hl6ax2zyAWBdWZXbrvXlaw==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/helper-module-imports": "^7.22.5",
"@babel/helper-plugin-utils": "^7.22.5",
- "babel-plugin-polyfill-corejs2": "^0.4.3",
- "babel-plugin-polyfill-corejs3": "^0.8.1",
- "babel-plugin-polyfill-regenerator": "^0.5.0",
- "semver": "^6.3.0"
+ "babel-plugin-polyfill-corejs2": "^0.4.5",
+ "babel-plugin-polyfill-corejs3": "^0.8.3",
+ "babel-plugin-polyfill-regenerator": "^0.5.2",
+ "semver": "^6.3.1"
},
"dev": true,
"engines": {
@@ -2303,16 +1916,9 @@
"version": "7.22.5"
},
"node_modules/@babel/plugin-transform-typescript": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.5.tgz",
- "integrity": "sha512-SMubA9S7Cb5sGSFFUlqxyClTA9zWJ8qGQrppNUm05LtFuN1ELRFNndkix4zUJrC9F+YivWwa1dHMSyo0e0N9dA==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/helper-annotate-as-pure": "^7.22.5",
- "@babel/helper-create-class-features-plugin": "^7.22.5",
+ "@babel/helper-create-class-features-plugin": "^7.22.11",
"@babel/helper-plugin-utils": "^7.22.5",
"@babel/plugin-syntax-typescript": "^7.22.5"
},
@@ -2328,13 +1934,6 @@
"version": "7.22.11"
},
"node_modules/@babel/plugin-transform-unicode-escapes": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.5.tgz",
- "integrity": "sha512-biEmVg1IYB/raUO5wT1tgfacCef15Fbzhkx493D3urBI++6hpJ+RFG4SrWMn0NEZLfvilqKf3QDrRVZHo08FYg==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/helper-plugin-utils": "^7.22.5"
},
@@ -2398,16 +1997,9 @@
"version": "7.22.5"
},
"node_modules/@babel/preset-env": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.5.tgz",
- "integrity": "sha512-fj06hw89dpiZzGZtxn+QybifF07nNiZjZ7sazs2aVDcysAZVGjW7+7iFYxg6GLNM47R/thYfLdrXc+2f11Vi9A==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
- "@babel/compat-data": "^7.22.5",
- "@babel/helper-compilation-targets": "^7.22.5",
+ "@babel/compat-data": "^7.22.9",
+ "@babel/helper-compilation-targets": "^7.22.10",
"@babel/helper-plugin-utils": "^7.22.5",
"@babel/helper-validator-option": "^7.22.5",
"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5",
@@ -2432,15 +2024,15 @@
"@babel/plugin-syntax-top-level-await": "^7.14.5",
"@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
"@babel/plugin-transform-arrow-functions": "^7.22.5",
- "@babel/plugin-transform-async-generator-functions": "^7.22.5",
+ "@babel/plugin-transform-async-generator-functions": "^7.22.10",
"@babel/plugin-transform-async-to-generator": "^7.22.5",
"@babel/plugin-transform-block-scoped-functions": "^7.22.5",
- "@babel/plugin-transform-block-scoping": "^7.22.5",
+ "@babel/plugin-transform-block-scoping": "^7.22.10",
"@babel/plugin-transform-class-properties": "^7.22.5",
"@babel/plugin-transform-class-static-block": "^7.22.5",
- "@babel/plugin-transform-classes": "^7.22.5",
+ "@babel/plugin-transform-classes": "^7.22.6",
"@babel/plugin-transform-computed-properties": "^7.22.5",
- "@babel/plugin-transform-destructuring": "^7.22.5",
+ "@babel/plugin-transform-destructuring": "^7.22.10",
"@babel/plugin-transform-dotall-regex": "^7.22.5",
"@babel/plugin-transform-duplicate-keys": "^7.22.5",
"@babel/plugin-transform-dynamic-import": "^7.22.5",
@@ -2463,29 +2055,29 @@
"@babel/plugin-transform-object-rest-spread": "^7.22.5",
"@babel/plugin-transform-object-super": "^7.22.5",
"@babel/plugin-transform-optional-catch-binding": "^7.22.5",
- "@babel/plugin-transform-optional-chaining": "^7.22.5",
+ "@babel/plugin-transform-optional-chaining": "^7.22.10",
"@babel/plugin-transform-parameters": "^7.22.5",
"@babel/plugin-transform-private-methods": "^7.22.5",
"@babel/plugin-transform-private-property-in-object": "^7.22.5",
"@babel/plugin-transform-property-literals": "^7.22.5",
- "@babel/plugin-transform-regenerator": "^7.22.5",
+ "@babel/plugin-transform-regenerator": "^7.22.10",
"@babel/plugin-transform-reserved-words": "^7.22.5",
"@babel/plugin-transform-shorthand-properties": "^7.22.5",
"@babel/plugin-transform-spread": "^7.22.5",
"@babel/plugin-transform-sticky-regex": "^7.22.5",
"@babel/plugin-transform-template-literals": "^7.22.5",
"@babel/plugin-transform-typeof-symbol": "^7.22.5",
- "@babel/plugin-transform-unicode-escapes": "^7.22.5",
+ "@babel/plugin-transform-unicode-escapes": "^7.22.10",
"@babel/plugin-transform-unicode-property-regex": "^7.22.5",
"@babel/plugin-transform-unicode-regex": "^7.22.5",
"@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
- "@babel/preset-modules": "^0.1.5",
- "@babel/types": "^7.22.5",
- "babel-plugin-polyfill-corejs2": "^0.4.3",
- "babel-plugin-polyfill-corejs3": "^0.8.1",
- "babel-plugin-polyfill-regenerator": "^0.5.0",
- "core-js-compat": "^3.30.2",
- "semver": "^6.3.0"
+ "@babel/preset-modules": "0.1.6-no-external-plugins",
+ "@babel/types": "^7.22.10",
+ "babel-plugin-polyfill-corejs2": "^0.4.5",
+ "babel-plugin-polyfill-corejs3": "^0.8.3",
+ "babel-plugin-polyfill-regenerator": "^0.5.2",
+ "core-js-compat": "^3.31.0",
+ "semver": "^6.3.1"
},
"dev": true,
"engines": {
@@ -2499,32 +2091,18 @@
"version": "7.22.10"
},
"node_modules/@babel/preset-modules": {
-<<<<<<< HEAD
- "version": "0.1.5",
- "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
- "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/helper-plugin-utils": "^7.0.0",
- "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
- "@babel/plugin-transform-dotall-regex": "^7.4.4",
"@babel/types": "^7.4.4",
"esutils": "^2.0.2"
},
"dev": true,
"integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==",
"peerDependencies": {
-<<<<<<< HEAD
- "@babel/core": "^7.0.0-0"
- }
-=======
"@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0"
},
"resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
"version": "0.1.6-no-external-plugins"
->>>>>>> develop
},
"node_modules/@babel/preset-react": {
"dependencies": {
@@ -2547,19 +2125,12 @@
"version": "7.22.5"
},
"node_modules/@babel/preset-typescript": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.22.5.tgz",
- "integrity": "sha512-YbPaal9LxztSGhmndR46FmAbkJ/1fAsw293tSU+I5E5h+cnJ3d4GTwyUgGYmOXJYdGA+uNePle4qbaRzj2NISQ==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/helper-plugin-utils": "^7.22.5",
"@babel/helper-validator-option": "^7.22.5",
"@babel/plugin-syntax-jsx": "^7.22.5",
- "@babel/plugin-transform-modules-commonjs": "^7.22.5",
- "@babel/plugin-transform-typescript": "^7.22.5"
+ "@babel/plugin-transform-modules-commonjs": "^7.22.11",
+ "@babel/plugin-transform-typescript": "^7.22.11"
},
"dev": true,
"engines": {
@@ -2579,14 +2150,8 @@
"version": "0.8.0"
},
"node_modules/@babel/runtime": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.5.tgz",
- "integrity": "sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==",
-=======
->>>>>>> develop
"dependencies": {
- "regenerator-runtime": "^0.13.11"
+ "regenerator-runtime": "^0.14.0"
},
"dev": true,
"engines": {
@@ -2597,16 +2162,9 @@
"version": "7.22.11"
},
"node_modules/@babel/runtime-corejs3": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.22.5.tgz",
- "integrity": "sha512-TNPDN6aBFaUox2Lu+H/Y1dKKQgr4ucz/FGyCz67RVYLsBpVpUFf1dDngzg+Od8aqbrqwyztkaZjtWCZEUOT8zA==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"core-js-pure": "^3.30.2",
- "regenerator-runtime": "^0.13.11"
+ "regenerator-runtime": "^0.14.0"
},
"dev": true,
"engines": {
@@ -2617,16 +2175,10 @@
"version": "7.22.11"
},
"node_modules/@babel/template": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz",
- "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==",
-=======
->>>>>>> develop
- "dependencies": {
- "@babel/code-frame": "^7.22.5",
- "@babel/parser": "^7.22.5",
- "@babel/types": "^7.22.5"
+ "dependencies": {
+ "@babel/code-frame": "^7.22.13",
+ "@babel/parser": "^7.22.15",
+ "@babel/types": "^7.22.15"
},
"dev": true,
"engines": {
@@ -2637,21 +2189,15 @@
"version": "7.22.15"
},
"node_modules/@babel/traverse": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.5.tgz",
- "integrity": "sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==",
-=======
->>>>>>> develop
- "dependencies": {
- "@babel/code-frame": "^7.22.5",
- "@babel/generator": "^7.22.5",
- "@babel/helper-environment-visitor": "^7.22.5",
- "@babel/helper-function-name": "^7.22.5",
+ "dependencies": {
+ "@babel/code-frame": "^7.22.13",
+ "@babel/generator": "^7.23.0",
+ "@babel/helper-environment-visitor": "^7.22.20",
+ "@babel/helper-function-name": "^7.23.0",
"@babel/helper-hoist-variables": "^7.22.5",
- "@babel/helper-split-export-declaration": "^7.22.5",
- "@babel/parser": "^7.22.5",
- "@babel/types": "^7.22.5",
+ "@babel/helper-split-export-declaration": "^7.22.6",
+ "@babel/parser": "^7.23.0",
+ "@babel/types": "^7.23.0",
"debug": "^4.1.0",
"globals": "^11.1.0"
},
@@ -2664,15 +2210,9 @@
"version": "7.23.2"
},
"node_modules/@babel/types": {
-<<<<<<< HEAD
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz",
- "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==",
-=======
->>>>>>> develop
"dependencies": {
"@babel/helper-string-parser": "^7.22.5",
- "@babel/helper-validator-identifier": "^7.22.5",
+ "@babel/helper-validator-identifier": "^7.22.20",
"to-fast-properties": "^2.0.0"
},
"dev": true,
@@ -2699,12 +2239,6 @@
"version": "0.7.6"
},
"node_modules/@eslint-community/eslint-utils": {
-<<<<<<< HEAD
- "version": "4.4.0",
- "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
- "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
-=======
->>>>>>> develop
"dependencies": {
"eslint-visitor-keys": "^3.3.0"
},
@@ -2720,13 +2254,7 @@
"version": "4.4.0"
},
"node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": {
-<<<<<<< HEAD
- "version": "3.4.1",
- "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
- "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
},
@@ -2738,13 +2266,7 @@
"version": "3.4.3"
},
"node_modules/@eslint-community/regexpp": {
-<<<<<<< HEAD
- "version": "4.5.1",
- "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.1.tgz",
- "integrity": "sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": "^12.0.0 || ^14.0.0 || >=16.0.0"
},
@@ -2753,17 +2275,10 @@
"version": "4.8.0"
},
"node_modules/@eslint/eslintrc": {
-<<<<<<< HEAD
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.3.tgz",
- "integrity": "sha512-+5gy6OQfk+xx3q0d6jGZZC3f3KzAkXc/IanVxd1is/VIIziRqqt3ongQz0FiTUXqTk0c7aDB3OaFuKnuSoJicQ==",
- "peer": true,
-=======
->>>>>>> develop
"dependencies": {
"ajv": "^6.12.4",
"debug": "^4.3.2",
- "espree": "^9.5.2",
+ "espree": "^9.6.0",
"globals": "^13.19.0",
"ignore": "^5.2.0",
"import-fresh": "^3.2.1",
@@ -2784,13 +2299,6 @@
"version": "2.1.2"
},
"node_modules/@eslint/eslintrc/node_modules/globals": {
-<<<<<<< HEAD
- "version": "13.20.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
- "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
- "peer": true,
-=======
->>>>>>> develop
"dependencies": {
"type-fest": "^0.20.2"
},
@@ -2807,14 +2315,7 @@
"version": "13.21.0"
},
"node_modules/@eslint/js": {
-<<<<<<< HEAD
- "version": "8.42.0",
- "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.42.0.tgz",
- "integrity": "sha512-6SWlXpWU5AvId8Ac7zjzmIOqMOba/JWY8XZ4A7q7Gn1Vlfg/SFFIlrtHXt9nPn4op9ZPAkl91Jao+QQv3r/ukw==",
- "peer": true,
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
},
@@ -2873,18 +2374,11 @@
"version": "0.2.0"
},
"node_modules/@gatsbyjs/parcel-namer-relative-to-cwd": {
-<<<<<<< HEAD
- "version": "2.10.0",
- "resolved": "https://registry.npmjs.org/@gatsbyjs/parcel-namer-relative-to-cwd/-/parcel-namer-relative-to-cwd-2.10.0.tgz",
- "integrity": "sha512-HRHJua+grDQbYYg7jeOecT0CwVrDTalZq8Zq9leyszF5PlaVx/4IjXovoO4DwY0LNvRXIBk0vYAozuMB4yGqBQ==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/runtime": "^7.20.13",
"@parcel/namer-default": "2.8.3",
"@parcel/plugin": "2.8.3",
- "gatsby-core-utils": "^4.10.0"
+ "gatsby-core-utils": "^4.12.0"
},
"dev": true,
"engines": {
@@ -3394,13 +2888,6 @@
"version": "5.1.0"
},
"node_modules/@humanwhocodes/config-array": {
-<<<<<<< HEAD
- "version": "0.11.10",
- "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz",
- "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==",
- "peer": true,
-=======
->>>>>>> develop
"dependencies": {
"@humanwhocodes/object-schema": "^1.2.1",
"debug": "^4.1.1",
@@ -3416,14 +2903,7 @@
"version": "0.11.10"
},
"node_modules/@humanwhocodes/module-importer": {
-<<<<<<< HEAD
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
- "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
- "peer": true,
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=12.22"
},
@@ -3437,26 +2917,14 @@
"version": "1.0.1"
},
"node_modules/@humanwhocodes/object-schema": {
-<<<<<<< HEAD
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
- "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="
- },
- "node_modules/@jest/schemas": {
- "version": "29.4.3",
- "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.4.3.tgz",
- "integrity": "sha512-VLYKXQmtmuEz6IxJsrZwzG9NvtkQsWNnWMsKxqWNu3+CnfzJQhp0WDDKWLVV9hLKr0l3SLLFRqcYHjhtyuDVxg==",
- "dev": true,
-=======
"dev": true,
"integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
"version": "1.2.1"
},
"node_modules/@jest/schemas": {
->>>>>>> develop
"dependencies": {
- "@sinclair/typebox": "^0.25.16"
+ "@sinclair/typebox": "^0.27.8"
},
"dev": true,
"engines": {
@@ -3467,15 +2935,8 @@
"version": "29.6.3"
},
"node_modules/@jest/types": {
-<<<<<<< HEAD
- "version": "29.5.0",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
- "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
- "@jest/schemas": "^29.4.3",
+ "@jest/schemas": "^29.6.3",
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^3.0.0",
"@types/node": "*",
@@ -3561,12 +3022,6 @@
"version": "7.2.0"
},
"node_modules/@jridgewell/gen-mapping": {
-<<<<<<< HEAD
- "version": "0.3.3",
- "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
- "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
-=======
->>>>>>> develop
"dependencies": {
"@jridgewell/set-array": "^1.0.1",
"@jridgewell/sourcemap-codec": "^1.4.10",
@@ -3581,13 +3036,7 @@
"version": "0.3.3"
},
"node_modules/@jridgewell/resolve-uri": {
-<<<<<<< HEAD
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
- "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=6.0.0"
},
@@ -3596,13 +3045,7 @@
"version": "3.1.1"
},
"node_modules/@jridgewell/set-array": {
-<<<<<<< HEAD
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
- "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=6.0.0"
},
@@ -3611,13 +3054,6 @@
"version": "1.1.2"
},
"node_modules/@jridgewell/source-map": {
-<<<<<<< HEAD
- "version": "0.3.3",
- "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.3.tgz",
- "integrity": "sha512-b+fsZXeLYi9fEULmfBrhxn4IrPlINf8fiNarzTof004v3lFdntdwa9PF7vFJqm3mg7s+ScJMxXaE3Acp1irZcg==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@jridgewell/gen-mapping": "^0.3.0",
"@jridgewell/trace-mapping": "^0.3.9"
@@ -3628,20 +3064,6 @@
"version": "0.3.5"
},
"node_modules/@jridgewell/sourcemap-codec": {
-<<<<<<< HEAD
- "version": "1.4.15",
- "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
- "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
- },
- "node_modules/@jridgewell/trace-mapping": {
- "version": "0.3.18",
- "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
- "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
- "dependencies": {
- "@jridgewell/resolve-uri": "3.1.0",
- "@jridgewell/sourcemap-codec": "1.4.14"
- }
-=======
"dev": true,
"integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
@@ -3656,12 +3078,6 @@
"integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==",
"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz",
"version": "0.3.19"
->>>>>>> develop
- },
- "node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec": {
- "version": "1.4.14",
- "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
- "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
},
"node_modules/@jsdevtools/ono": {
"integrity": "sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==",
@@ -3854,12 +3270,6 @@
"version": "3.0.2"
},
"node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
-<<<<<<< HEAD
- "version": "5.1.1-v1",
- "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
- "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
-=======
->>>>>>> develop
"dependencies": {
"eslint-scope": "5.1.1"
},
@@ -3869,12 +3279,6 @@
"version": "5.1.1-v1"
},
"node_modules/@nodelib/fs.scandir": {
-<<<<<<< HEAD
- "version": "2.1.5",
- "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
- "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-=======
->>>>>>> develop
"dependencies": {
"@nodelib/fs.stat": "2.0.5",
"run-parallel": "^1.1.9"
@@ -3888,13 +3292,7 @@
"version": "2.1.5"
},
"node_modules/@nodelib/fs.stat": {
-<<<<<<< HEAD
- "version": "2.0.5",
- "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
- "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">= 8"
},
@@ -3903,12 +3301,6 @@
"version": "2.0.5"
},
"node_modules/@nodelib/fs.walk": {
-<<<<<<< HEAD
- "version": "1.2.8",
- "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
- "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-=======
->>>>>>> develop
"dependencies": {
"@nodelib/fs.scandir": "2.1.5",
"fastq": "^1.6.0"
@@ -4223,13 +3615,6 @@
"version": "7.0.0"
},
"node_modules/@parcel/core/node_modules/semver": {
-<<<<<<< HEAD
- "version": "5.7.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
- "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
- "dev": true,
-=======
->>>>>>> develop
"bin": {
"semver": "bin/semver"
},
@@ -4482,13 +3867,6 @@
"version": "2.8.3"
},
"node_modules/@parcel/node-resolver-core/node_modules/semver": {
-<<<<<<< HEAD
- "version": "5.7.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
- "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
- "dev": true,
-=======
->>>>>>> develop
"bin": {
"semver": "bin/semver"
},
@@ -4545,13 +3923,6 @@
"version": "2.8.3"
},
"node_modules/@parcel/package-manager/node_modules/semver": {
-<<<<<<< HEAD
- "version": "5.7.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
- "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
- "dev": true,
-=======
->>>>>>> develop
"bin": {
"semver": "bin/semver"
},
@@ -4584,13 +3955,6 @@
"version": "2.8.3"
},
"node_modules/@parcel/packager-js/node_modules/globals": {
-<<<<<<< HEAD
- "version": "13.20.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
- "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"type-fest": "^0.20.2"
},
@@ -4735,13 +4099,6 @@
"resolved": "https://registry.npmjs.org/@parcel/transformer-js/-/transformer-js-2.8.3.tgz",
"version": "2.8.3"
},
-<<<<<<< HEAD
- "node_modules/@parcel/transformer-js/node_modules/semver": {
- "version": "5.7.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
- "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
- "dev": true,
-=======
"node_modules/@parcel/transformer-js/node_modules/regenerator-runtime": {
"dev": true,
"integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
@@ -4749,7 +4106,6 @@
"version": "0.13.11"
},
"node_modules/@parcel/transformer-js/node_modules/semver": {
->>>>>>> develop
"bin": {
"semver": "bin/semver"
},
@@ -4884,19 +4240,11 @@
"version": "7.2.0"
},
"node_modules/@parcel/watcher": {
-<<<<<<< HEAD
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.1.0.tgz",
- "integrity": "sha512-8s8yYjd19pDSsBpbkOHnT6Z2+UJSuLQx61pCFM0s5wSRvKCEMDjd/cHY3/GI1szHIWbpXpsJdg3V6ISGGx9xDw==",
- "dev": true,
- "hasInstallScript": true,
-=======
->>>>>>> develop
"dependencies": {
+ "detect-libc": "^1.0.3",
"is-glob": "^4.0.3",
"micromatch": "^4.0.5",
- "node-addon-api": "^3.2.1",
- "node-gyp-build": "^4.3.0"
+ "node-addon-api": "^7.0.0"
},
"dev": true,
"engines": {
@@ -4905,9 +4253,6 @@
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
-<<<<<<< HEAD
- }
-=======
},
"hasInstallScript": true,
"integrity": "sha512-pW7QaFiL11O0BphO+bq3MgqeX/INAk9jgBldVDYjlQPO4VddoZnF22TcF9onMhnLVHuNqBJeRf+Fj7eezi/+rQ==",
@@ -5167,7 +4512,6 @@
],
"resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.3.0.tgz",
"version": "2.3.0"
->>>>>>> develop
},
"node_modules/@parcel/workers": {
"dependencies": {
@@ -5194,13 +4538,6 @@
"version": "2.8.3"
},
"node_modules/@pmmmwh/react-refresh-webpack-plugin": {
-<<<<<<< HEAD
- "version": "0.5.10",
- "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.10.tgz",
- "integrity": "sha512-j0Ya0hCFZPd4x40qLzbhGsh9TMtdb+CJQiso+WxLOPNasohq9cc5SNUcwsZaRH6++Xh91Xkm/xHCkuIiIu0LUA==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"ansi-html-community": "^0.0.8",
"common-path-prefix": "^3.0.0",
@@ -5221,7 +4558,7 @@
"@types/webpack": "4.x || 5.x",
"react-refresh": ">=0.10.0 <1.0.0",
"sockjs-client": "^1.4.0",
- "type-fest": ">=0.17.0 <4.0.0",
+ "type-fest": ">=0.17.0 <5.0.0",
"webpack": ">=4.43.0 <6.0.0",
"webpack-dev-server": "3.x || 4.x",
"webpack-hot-middleware": "2.x",
@@ -5278,13 +4615,6 @@
"version": "4.2.10"
},
"node_modules/@pnpm/npm-conf": {
-<<<<<<< HEAD
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/@pnpm/npm-conf/-/npm-conf-2.2.0.tgz",
- "integrity": "sha512-roLI1ul/GwzwcfcVpZYPdrgW2W/drLriObl1h+yLF5syc8/5ULWw2ALbCHUWF+4YltIqA3xFSbG4IwyJz37e9g==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@pnpm/config.env-replace": "^1.1.0",
"@pnpm/network.ca-file": "^1.0.1",
@@ -5314,17 +4644,10 @@
"version": "1.3.4"
},
"node_modules/@rushstack/eslint-patch": {
-<<<<<<< HEAD
- "version": "1.3.1",
- "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.3.1.tgz",
- "integrity": "sha512-RkmuBcqiNioeeBKbgzMlOdreUkJfYaSjwgx9XDgGGpjvWgyaxWvDmZVSN9CS6LjEASadhgPv2BcFp+SeouWXXA==",
- "dev": true
-=======
"dev": true,
"integrity": "sha512-0xd7qez0AQ+MbHatZTlI1gu5vkG8r7MYRUJAHPAHJBmGLs16zpkrpAVLvjQKQOqaXPDUBwOiJzNc00znHSCVBw==",
"resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.3.3.tgz",
"version": "1.3.3"
->>>>>>> develop
},
"node_modules/@sideway/address": {
"dependencies": {
@@ -5348,17 +4671,10 @@
"version": "2.0.0"
},
"node_modules/@sinclair/typebox": {
-<<<<<<< HEAD
- "version": "0.25.24",
- "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.25.24.tgz",
- "integrity": "sha512-XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ==",
- "dev": true
-=======
"dev": true,
"integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
"version": "0.27.8"
->>>>>>> develop
},
"node_modules/@sindresorhus/is": {
"dev": true,
@@ -5432,29 +4748,12 @@
"version": "3.1.0"
},
"node_modules/@swagger-api/apidom-ast": {
-<<<<<<< HEAD
- "version": "0.70.0",
- "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ast/-/apidom-ast-0.70.0.tgz",
- "integrity": "sha512-zQ1RUkXjx5NPYv1bmkoXwlQi7oJC7DJqYi0syTQKswJZDbOkHCwz8cDP/YystOEOL+yyIN7i5EQBIHfy5yAMmA==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/runtime-corejs3": "^7.20.7",
- "@types/ramda": "~0.29.1",
+ "@types/ramda": "~0.29.3",
"ramda": "~0.29.0",
- "ramda-adjunct": "^4.0.0",
+ "ramda-adjunct": "^4.1.1",
"stampit": "^4.3.2",
-<<<<<<< HEAD
- "unraw": "^2.0.1"
- }
- },
- "node_modules/@swagger-api/apidom-core": {
- "version": "0.70.0",
- "resolved": "https://registry.npmjs.org/@swagger-api/apidom-core/-/apidom-core-0.70.0.tgz",
- "integrity": "sha512-nUw0aehnhm2BUd17pbCLUuyd4E5bsn+K3teYLGs8Z/LGo9gpjZ/BMTL3H/3+F42ZRux79/3b6QksDj4f9yeSpg==",
- "dev": true,
-=======
"unraw": "^3.0.0"
},
"dev": true,
@@ -5463,14 +4762,13 @@
"version": "0.75.0"
},
"node_modules/@swagger-api/apidom-core": {
->>>>>>> develop
"dependencies": {
"@babel/runtime-corejs3": "^7.20.7",
- "@swagger-api/apidom-ast": "^0.70.0",
- "@types/ramda": "~0.29.1",
+ "@swagger-api/apidom-ast": "^0.75.0",
+ "@types/ramda": "~0.29.3",
"minim": "~0.23.8",
"ramda": "~0.29.0",
- "ramda-adjunct": "^4.0.0",
+ "ramda-adjunct": "^4.1.1",
"short-unique-id": "^4.4.4",
"stampit": "^4.3.2"
},
@@ -5480,17 +4778,10 @@
"version": "0.75.0"
},
"node_modules/@swagger-api/apidom-json-pointer": {
-<<<<<<< HEAD
- "version": "0.70.0",
- "resolved": "https://registry.npmjs.org/@swagger-api/apidom-json-pointer/-/apidom-json-pointer-0.70.0.tgz",
- "integrity": "sha512-6MSgWgl1juBMiK4lFp/IBuWO21FB6dm+T9PnRIl2D8tSESndhNHfk3EPkfrfXDOtCK2gqij52w9JorRKEfxfWw==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/runtime-corejs3": "^7.20.7",
- "@swagger-api/apidom-core": "^0.70.0",
- "@types/ramda": "~0.29.1",
+ "@swagger-api/apidom-core": "^0.75.0",
+ "@types/ramda": "~0.29.3",
"ramda": "~0.29.0",
"ramda-adjunct": "^4.0.0"
},
@@ -5500,21 +4791,13 @@
"version": "0.75.0"
},
"node_modules/@swagger-api/apidom-ns-api-design-systems": {
-<<<<<<< HEAD
- "version": "0.70.0",
- "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-api-design-systems/-/apidom-ns-api-design-systems-0.70.0.tgz",
- "integrity": "sha512-CA/5cyLWr1lC4oqoEm3BNbQ7ZLXQWhCK6ddTGckgrFNj4j6TxJycC83JGFvt8K2M9uSNRTh7t6b1o1kRzQ+Scg==",
- "dev": true,
- "optional": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/runtime-corejs3": "^7.20.7",
- "@swagger-api/apidom-core": "^0.70.0",
- "@swagger-api/apidom-ns-openapi-3-1": "^0.70.0",
- "@types/ramda": "~0.29.1",
+ "@swagger-api/apidom-core": "^0.75.0",
+ "@swagger-api/apidom-ns-openapi-3-1": "^0.75.0",
+ "@types/ramda": "~0.29.3",
"ramda": "~0.29.0",
- "ramda-adjunct": "^4.0.0",
+ "ramda-adjunct": "^4.1.1",
"stampit": "^4.3.2"
},
"dev": true,
@@ -5524,21 +4807,13 @@
"version": "0.75.0"
},
"node_modules/@swagger-api/apidom-ns-asyncapi-2": {
-<<<<<<< HEAD
- "version": "0.70.0",
- "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-asyncapi-2/-/apidom-ns-asyncapi-2-0.70.0.tgz",
- "integrity": "sha512-P7r6LZR1o8BVGcY+j4HWWlIk1XhP8H2tL7XCHJ3fmYCgqrbdyo3pJxZujfddbvI/TT4/8YMfq2fat6MMu0DhfQ==",
- "dev": true,
- "optional": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/runtime-corejs3": "^7.20.7",
- "@swagger-api/apidom-core": "^0.70.0",
- "@swagger-api/apidom-ns-json-schema-draft-7": "^0.70.0",
- "@types/ramda": "~0.29.1",
+ "@swagger-api/apidom-core": "^0.75.0",
+ "@swagger-api/apidom-ns-json-schema-draft-7": "^0.75.0",
+ "@types/ramda": "~0.29.3",
"ramda": "~0.29.0",
- "ramda-adjunct": "^4.0.0",
+ "ramda-adjunct": "^4.1.1",
"stampit": "^4.3.2"
},
"dev": true,
@@ -5548,19 +4823,13 @@
"version": "0.75.0"
},
"node_modules/@swagger-api/apidom-ns-json-schema-draft-4": {
-<<<<<<< HEAD
- "version": "0.70.0",
- "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-json-schema-draft-4/-/apidom-ns-json-schema-draft-4-0.70.0.tgz",
- "integrity": "sha512-Y8O8Xl4P2cKDIunsvDV5Gvq+BVN/uIN5rJ5axHsZt0PL1D0c2Ypu6uCBDNb6iPdUZ3REpzemYNi2eZanL5gKtQ==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/runtime-corejs3": "^7.20.7",
- "@swagger-api/apidom-core": "^0.70.0",
- "@types/ramda": "~0.29.1",
+ "@swagger-api/apidom-ast": "^0.75.0",
+ "@swagger-api/apidom-core": "^0.75.0",
+ "@types/ramda": "~0.29.3",
"ramda": "~0.29.0",
- "ramda-adjunct": "^4.0.0",
+ "ramda-adjunct": "^4.1.1",
"stampit": "^4.3.2"
},
"dev": true,
@@ -5569,21 +4838,13 @@
"version": "0.75.0"
},
"node_modules/@swagger-api/apidom-ns-json-schema-draft-6": {
-<<<<<<< HEAD
- "version": "0.70.0",
- "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-json-schema-draft-6/-/apidom-ns-json-schema-draft-6-0.70.0.tgz",
- "integrity": "sha512-xaYZ7NeivNZreYzaufNLpxAqusjAXji8Ls+HArzgZWdpjddnN2wvHDEkF8gPBdYMRWiXWLKzXFey/ZhOSwLi9Q==",
- "dev": true,
- "optional": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/runtime-corejs3": "^7.20.7",
- "@swagger-api/apidom-core": "^0.70.0",
- "@swagger-api/apidom-ns-json-schema-draft-4": "^0.70.0",
- "@types/ramda": "~0.29.1",
+ "@swagger-api/apidom-core": "^0.75.0",
+ "@swagger-api/apidom-ns-json-schema-draft-4": "^0.75.0",
+ "@types/ramda": "~0.29.3",
"ramda": "~0.29.0",
- "ramda-adjunct": "^4.0.0",
+ "ramda-adjunct": "^4.1.1",
"stampit": "^4.3.2"
},
"dev": true,
@@ -5593,21 +4854,13 @@
"version": "0.75.0"
},
"node_modules/@swagger-api/apidom-ns-json-schema-draft-7": {
-<<<<<<< HEAD
- "version": "0.70.0",
- "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-json-schema-draft-7/-/apidom-ns-json-schema-draft-7-0.70.0.tgz",
- "integrity": "sha512-yy1cha8GiIHBfhK31ycTSd3UwWzQGjWcSLAl7dfT/UpemcHn4wGzJtoFx+tqpGHwpUie3qpEm7ReLRrYzeg0Ew==",
- "dev": true,
- "optional": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/runtime-corejs3": "^7.20.7",
- "@swagger-api/apidom-core": "^0.70.0",
- "@swagger-api/apidom-ns-json-schema-draft-6": "^0.70.0",
- "@types/ramda": "~0.29.1",
+ "@swagger-api/apidom-core": "^0.75.0",
+ "@swagger-api/apidom-ns-json-schema-draft-6": "^0.75.0",
+ "@types/ramda": "~0.29.3",
"ramda": "~0.29.0",
- "ramda-adjunct": "^4.0.0",
+ "ramda-adjunct": "^4.1.1",
"stampit": "^4.3.2"
},
"dev": true,
@@ -5617,20 +4870,13 @@
"version": "0.75.0"
},
"node_modules/@swagger-api/apidom-ns-openapi-3-0": {
-<<<<<<< HEAD
- "version": "0.70.0",
- "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-openapi-3-0/-/apidom-ns-openapi-3-0-0.70.0.tgz",
- "integrity": "sha512-wEw5uHd1/XqgkwvGM1DrhwPsDWcMNedxHybq0b7Bp2ZE7QWI4V/OS1gOnYpBvB6OUpHkEc5c2z++hr6fd0FhHQ==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/runtime-corejs3": "^7.20.7",
- "@swagger-api/apidom-core": "^0.70.0",
- "@swagger-api/apidom-ns-json-schema-draft-4": "^0.70.0",
- "@types/ramda": "~0.29.1",
+ "@swagger-api/apidom-core": "^0.75.0",
+ "@swagger-api/apidom-ns-json-schema-draft-4": "^0.75.0",
+ "@types/ramda": "~0.29.3",
"ramda": "~0.29.0",
- "ramda-adjunct": "^4.0.0",
+ "ramda-adjunct": "^4.1.1",
"stampit": "^4.3.2"
},
"dev": true,
@@ -5639,20 +4885,14 @@
"version": "0.75.0"
},
"node_modules/@swagger-api/apidom-ns-openapi-3-1": {
-<<<<<<< HEAD
- "version": "0.70.0",
- "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-openapi-3-1/-/apidom-ns-openapi-3-1-0.70.0.tgz",
- "integrity": "sha512-0d8IPy7A9lCjscXsw260j07xTQu8ExG3OpFxSJPOwQsrZ6X2Oooaq/0e0hnK15ngaVQzv9Iq8pBXSpJ/oJD8Ww==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/runtime-corejs3": "^7.20.7",
- "@swagger-api/apidom-core": "^0.70.0",
- "@swagger-api/apidom-ns-openapi-3-0": "^0.70.0",
- "@types/ramda": "~0.29.1",
+ "@swagger-api/apidom-ast": "^0.75.0",
+ "@swagger-api/apidom-core": "^0.75.0",
+ "@swagger-api/apidom-ns-openapi-3-0": "^0.75.0",
+ "@types/ramda": "~0.29.3",
"ramda": "~0.29.0",
- "ramda-adjunct": "^4.0.0",
+ "ramda-adjunct": "^4.1.1",
"stampit": "^4.3.2"
},
"dev": true,
@@ -5661,20 +4901,12 @@
"version": "0.75.0"
},
"node_modules/@swagger-api/apidom-parser-adapter-api-design-systems-json": {
-<<<<<<< HEAD
- "version": "0.70.0",
- "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-api-design-systems-json/-/apidom-parser-adapter-api-design-systems-json-0.70.0.tgz",
- "integrity": "sha512-mXR+0EjOa+1trve5xGKmhDSXdIs8zMMJAN9KlnPvAVVezpoDLgg8s687qfPyNmfRmYcnO/18X8pn3/WhQCVFHA==",
- "dev": true,
- "optional": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/runtime-corejs3": "^7.20.7",
- "@swagger-api/apidom-core": "^0.70.0",
- "@swagger-api/apidom-ns-api-design-systems": "^0.70.0",
- "@swagger-api/apidom-parser-adapter-json": "^0.70.0",
- "@types/ramda": "~0.29.1",
+ "@swagger-api/apidom-core": "^0.75.0",
+ "@swagger-api/apidom-ns-api-design-systems": "^0.75.0",
+ "@swagger-api/apidom-parser-adapter-json": "^0.75.0",
+ "@types/ramda": "~0.29.3",
"ramda": "~0.29.0",
"ramda-adjunct": "^4.0.0"
},
@@ -5685,20 +4917,12 @@
"version": "0.75.0"
},
"node_modules/@swagger-api/apidom-parser-adapter-api-design-systems-yaml": {
-<<<<<<< HEAD
- "version": "0.70.0",
- "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-api-design-systems-yaml/-/apidom-parser-adapter-api-design-systems-yaml-0.70.0.tgz",
- "integrity": "sha512-sfQq2cetMAH9CWS9UINTDdZ+Hs735C6CojtG6dkeA+BJe0gJg+NmQI2qwePQ1jY9p9D+lHMMl56ispYQQnaCjg==",
- "dev": true,
- "optional": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/runtime-corejs3": "^7.20.7",
- "@swagger-api/apidom-core": "^0.70.0",
- "@swagger-api/apidom-ns-api-design-systems": "^0.70.0",
- "@swagger-api/apidom-parser-adapter-yaml-1-2": "^0.70.0",
- "@types/ramda": "~0.29.1",
+ "@swagger-api/apidom-core": "^0.75.0",
+ "@swagger-api/apidom-ns-api-design-systems": "^0.75.0",
+ "@swagger-api/apidom-parser-adapter-yaml-1-2": "^0.75.0",
+ "@types/ramda": "~0.29.3",
"ramda": "~0.29.0",
"ramda-adjunct": "^4.0.0"
},
@@ -5709,20 +4933,12 @@
"version": "0.75.0"
},
"node_modules/@swagger-api/apidom-parser-adapter-asyncapi-json-2": {
-<<<<<<< HEAD
- "version": "0.70.0",
- "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-asyncapi-json-2/-/apidom-parser-adapter-asyncapi-json-2-0.70.0.tgz",
- "integrity": "sha512-u35roIPmq9zvXKfuGyMzY9gZMj1kTLmFSdCvOA5JvysEQLSx59s/Qs4um+BLvH2Z9/D5DYVb2cnyujTIVmoMYg==",
- "dev": true,
- "optional": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/runtime-corejs3": "^7.20.7",
- "@swagger-api/apidom-core": "^0.70.0",
- "@swagger-api/apidom-ns-asyncapi-2": "^0.70.0",
- "@swagger-api/apidom-parser-adapter-json": "^0.70.0",
- "@types/ramda": "~0.29.1",
+ "@swagger-api/apidom-core": "^0.75.0",
+ "@swagger-api/apidom-ns-asyncapi-2": "^0.75.0",
+ "@swagger-api/apidom-parser-adapter-json": "^0.75.0",
+ "@types/ramda": "~0.29.3",
"ramda": "~0.29.0",
"ramda-adjunct": "^4.0.0"
},
@@ -5733,20 +4949,12 @@
"version": "0.75.0"
},
"node_modules/@swagger-api/apidom-parser-adapter-asyncapi-yaml-2": {
-<<<<<<< HEAD
- "version": "0.70.0",
- "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-asyncapi-yaml-2/-/apidom-parser-adapter-asyncapi-yaml-2-0.70.0.tgz",
- "integrity": "sha512-NYxbr+BFDf6y92+o8sFaQ0UWxh72jNo8TkCl1/JYSrc5QuLSIu5UIMbjtLPGY+82okMRxCwjG7dCd8h62/KpiQ==",
- "dev": true,
- "optional": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/runtime-corejs3": "^7.20.7",
- "@swagger-api/apidom-core": "^0.70.0",
- "@swagger-api/apidom-ns-asyncapi-2": "^0.70.0",
- "@swagger-api/apidom-parser-adapter-yaml-1-2": "^0.70.0",
- "@types/ramda": "~0.29.1",
+ "@swagger-api/apidom-core": "^0.75.0",
+ "@swagger-api/apidom-ns-asyncapi-2": "^0.75.0",
+ "@swagger-api/apidom-parser-adapter-yaml-1-2": "^0.75.0",
+ "@types/ramda": "~0.29.3",
"ramda": "~0.29.0",
"ramda-adjunct": "^4.0.0"
},
@@ -5757,35 +4965,16 @@
"version": "0.75.0"
},
"node_modules/@swagger-api/apidom-parser-adapter-json": {
-<<<<<<< HEAD
- "version": "0.70.0",
- "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-json/-/apidom-parser-adapter-json-0.70.0.tgz",
- "integrity": "sha512-j0Pb4Xg1VdFaCwYInF9qQxCDpaznzgse4oSUy1uJkLK0W/eC6bLNHyDGJmxR/TAqxY4yzb5zNCJnlJkjZqKxkQ==",
- "dev": true,
- "optional": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/runtime-corejs3": "^7.20.7",
- "@swagger-api/apidom-ast": "^0.70.0",
- "@swagger-api/apidom-core": "^0.70.0",
- "@types/ramda": "~0.29.1",
+ "@swagger-api/apidom-ast": "^0.75.0",
+ "@swagger-api/apidom-core": "^0.75.0",
+ "@types/ramda": "~0.29.3",
"ramda": "~0.29.0",
- "ramda-adjunct": "^4.0.0",
+ "ramda-adjunct": "^4.1.1",
"stampit": "^4.3.2",
- "tree-sitter": "=0.20.1",
+ "tree-sitter": "=0.20.4",
"tree-sitter-json": "=0.20.0",
-<<<<<<< HEAD
- "web-tree-sitter": "=0.20.7"
- }
- },
- "node_modules/@swagger-api/apidom-parser-adapter-openapi-json-3-0": {
- "version": "0.70.0",
- "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-openapi-json-3-0/-/apidom-parser-adapter-openapi-json-3-0-0.70.0.tgz",
- "integrity": "sha512-GsQH3GaOWVnGYtd+jajrsXjn1N0JqH1cQz/RoyxaD2zeI0LDW3efXGfa2zr3tFWqxTPrdOIMu6irH8aWtiC5sA==",
- "dev": true,
- "optional": true,
-=======
"web-tree-sitter": "=0.20.3"
},
"dev": true,
@@ -5795,13 +4984,12 @@
"version": "0.75.0"
},
"node_modules/@swagger-api/apidom-parser-adapter-openapi-json-3-0": {
->>>>>>> develop
"dependencies": {
"@babel/runtime-corejs3": "^7.20.7",
- "@swagger-api/apidom-core": "^0.70.0",
- "@swagger-api/apidom-ns-openapi-3-0": "^0.70.0",
- "@swagger-api/apidom-parser-adapter-json": "^0.70.0",
- "@types/ramda": "~0.29.1",
+ "@swagger-api/apidom-core": "^0.75.0",
+ "@swagger-api/apidom-ns-openapi-3-0": "^0.75.0",
+ "@swagger-api/apidom-parser-adapter-json": "^0.75.0",
+ "@types/ramda": "~0.29.3",
"ramda": "~0.29.0",
"ramda-adjunct": "^4.0.0"
},
@@ -5812,20 +5000,12 @@
"version": "0.75.0"
},
"node_modules/@swagger-api/apidom-parser-adapter-openapi-json-3-1": {
-<<<<<<< HEAD
- "version": "0.70.0",
- "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-openapi-json-3-1/-/apidom-parser-adapter-openapi-json-3-1-0.70.0.tgz",
- "integrity": "sha512-e8bUiTa+q4xTS77hZC9pyg6U91rWlbfXBhzUGAn6fB+JF4PXxyep6sH+8JbJvGjI6DFvvuiwzRvVFt6DyKFhZg==",
- "dev": true,
- "optional": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/runtime-corejs3": "^7.20.7",
- "@swagger-api/apidom-core": "^0.70.0",
- "@swagger-api/apidom-ns-openapi-3-1": "^0.70.0",
- "@swagger-api/apidom-parser-adapter-json": "^0.70.0",
- "@types/ramda": "~0.29.1",
+ "@swagger-api/apidom-core": "^0.75.0",
+ "@swagger-api/apidom-ns-openapi-3-1": "^0.75.0",
+ "@swagger-api/apidom-parser-adapter-json": "^0.75.0",
+ "@types/ramda": "~0.29.3",
"ramda": "~0.29.0",
"ramda-adjunct": "^4.0.0"
},
@@ -5836,20 +5016,12 @@
"version": "0.75.0"
},
"node_modules/@swagger-api/apidom-parser-adapter-openapi-yaml-3-0": {
-<<<<<<< HEAD
- "version": "0.70.0",
- "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-openapi-yaml-3-0/-/apidom-parser-adapter-openapi-yaml-3-0-0.70.0.tgz",
- "integrity": "sha512-4dwRV9uhjuIziV5Z9742RpVCo+QtrQDrGxh5pQaTbU8mNvXdrZ7ebFOxYQIPmxGcPAbxm1x6dvicUvhs97Lsrg==",
- "dev": true,
- "optional": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/runtime-corejs3": "^7.20.7",
- "@swagger-api/apidom-core": "^0.70.0",
- "@swagger-api/apidom-ns-openapi-3-0": "^0.70.0",
- "@swagger-api/apidom-parser-adapter-yaml-1-2": "^0.70.0",
- "@types/ramda": "~0.29.1",
+ "@swagger-api/apidom-core": "^0.75.0",
+ "@swagger-api/apidom-ns-openapi-3-0": "^0.75.0",
+ "@swagger-api/apidom-parser-adapter-yaml-1-2": "^0.75.0",
+ "@types/ramda": "~0.29.3",
"ramda": "~0.29.0",
"ramda-adjunct": "^4.0.0"
},
@@ -5860,20 +5032,12 @@
"version": "0.75.0"
},
"node_modules/@swagger-api/apidom-parser-adapter-openapi-yaml-3-1": {
-<<<<<<< HEAD
- "version": "0.70.0",
- "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-openapi-yaml-3-1/-/apidom-parser-adapter-openapi-yaml-3-1-0.70.0.tgz",
- "integrity": "sha512-u/JE8maz+PSm3prCTE9jx0XaK1/+kxoFT1v7l9AXqAyczsyQ/FMPNUvQ8Qyr/Jad5wHW6IcIIhqG79n4e819JQ==",
- "dev": true,
- "optional": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/runtime-corejs3": "^7.20.7",
- "@swagger-api/apidom-core": "^0.70.0",
- "@swagger-api/apidom-ns-openapi-3-1": "^0.70.0",
- "@swagger-api/apidom-parser-adapter-yaml-1-2": "^0.70.0",
- "@types/ramda": "~0.29.1",
+ "@swagger-api/apidom-core": "^0.75.0",
+ "@swagger-api/apidom-ns-openapi-3-1": "^0.75.0",
+ "@swagger-api/apidom-parser-adapter-yaml-1-2": "^0.75.0",
+ "@types/ramda": "~0.29.3",
"ramda": "~0.29.0",
"ramda-adjunct": "^4.0.0"
},
@@ -5884,34 +5048,16 @@
"version": "0.75.0"
},
"node_modules/@swagger-api/apidom-parser-adapter-yaml-1-2": {
-<<<<<<< HEAD
- "version": "0.70.0",
- "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-yaml-1-2/-/apidom-parser-adapter-yaml-1-2-0.70.0.tgz",
- "integrity": "sha512-DfJ9f7Qm6QdmGJMMHicksEZKRJYR0yY9KTF+UKPBGChakXxr9Gt6ZkxWwRz0ataPFJZbW+Q8/P56Mrp/ETH+WQ==",
- "dev": true,
- "optional": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/runtime-corejs3": "^7.20.7",
- "@swagger-api/apidom-ast": "^0.70.0",
- "@swagger-api/apidom-core": "^0.70.0",
- "@types/ramda": "~0.29.1",
+ "@swagger-api/apidom-ast": "^0.75.0",
+ "@swagger-api/apidom-core": "^0.75.0",
+ "@types/ramda": "~0.29.3",
"ramda": "~0.29.0",
- "ramda-adjunct": "^4.0.0",
+ "ramda-adjunct": "^4.1.1",
"stampit": "^4.3.2",
- "tree-sitter": "=0.20.1",
+ "tree-sitter": "=0.20.4",
"tree-sitter-yaml": "=0.5.0",
-<<<<<<< HEAD
- "web-tree-sitter": "=0.20.7"
- }
- },
- "node_modules/@swagger-api/apidom-reference": {
- "version": "0.70.0",
- "resolved": "https://registry.npmjs.org/@swagger-api/apidom-reference/-/apidom-reference-0.70.0.tgz",
- "integrity": "sha512-HKfDmfQQc/RmdSdOpN/WtGF+97WjgRmvIdt3FmuPTqFRM4CeGpDM/MXvcxa71sN1yUx/o6LkRRwYSqDlYfutIw==",
- "dev": true,
-=======
"web-tree-sitter": "=0.20.3"
},
"dev": true,
@@ -5921,44 +5067,20 @@
"version": "0.75.0"
},
"node_modules/@swagger-api/apidom-reference": {
->>>>>>> develop
"dependencies": {
"@babel/runtime-corejs3": "^7.20.7",
- "@swagger-api/apidom-core": "^0.70.0",
- "@types/ramda": "~0.29.1",
+ "@swagger-api/apidom-core": "^0.75.0",
+ "@types/ramda": "~0.29.3",
"axios": "^1.4.0",
"minimatch": "^7.4.3",
"process": "^0.11.10",
"ramda": "~0.29.0",
- "ramda-adjunct": "^4.0.0",
+ "ramda-adjunct": "^4.1.1",
"stampit": "^4.3.2"
},
"dev": true,
"integrity": "sha512-3eqMfGaNBa3+Ao/9zrRPfxCuz9/3jag3W2XV8xuS4Xq2g3xqCEzPPUeraf6zoerk5EdXMSSoO6O8v074E4R4dg==",
"optionalDependencies": {
-<<<<<<< HEAD
- "@swagger-api/apidom-json-pointer": "^0.70.0",
- "@swagger-api/apidom-ns-asyncapi-2": "^0.70.0",
- "@swagger-api/apidom-ns-openapi-3-0": "^0.70.0",
- "@swagger-api/apidom-ns-openapi-3-1": "^0.70.0",
- "@swagger-api/apidom-parser-adapter-api-design-systems-json": "^0.70.0",
- "@swagger-api/apidom-parser-adapter-api-design-systems-yaml": "^0.70.0",
- "@swagger-api/apidom-parser-adapter-asyncapi-json-2": "^0.70.0",
- "@swagger-api/apidom-parser-adapter-asyncapi-yaml-2": "^0.70.0",
- "@swagger-api/apidom-parser-adapter-json": "^0.70.0",
- "@swagger-api/apidom-parser-adapter-openapi-json-3-0": "^0.70.0",
- "@swagger-api/apidom-parser-adapter-openapi-json-3-1": "^0.70.0",
- "@swagger-api/apidom-parser-adapter-openapi-yaml-3-0": "^0.70.0",
- "@swagger-api/apidom-parser-adapter-openapi-yaml-3-1": "^0.70.0",
- "@swagger-api/apidom-parser-adapter-yaml-1-2": "^0.70.0"
- }
- },
- "node_modules/@swagger-api/apidom-reference/node_modules/axios": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/axios/-/axios-1.4.0.tgz",
- "integrity": "sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==",
- "dev": true,
-=======
"@swagger-api/apidom-json-pointer": "^0.75.0",
"@swagger-api/apidom-ns-asyncapi-2": "^0.75.0",
"@swagger-api/apidom-ns-openapi-3-0": "^0.75.0",
@@ -5978,7 +5100,6 @@
"version": "0.75.0"
},
"node_modules/@swagger-api/apidom-reference/node_modules/axios": {
->>>>>>> develop
"dependencies": {
"follow-redirects": "^1.15.0",
"form-data": "^4.0.0",
@@ -6028,14 +5149,8 @@
"version": "7.4.6"
},
"node_modules/@swc/helpers": {
-<<<<<<< HEAD
- "version": "0.4.14",
- "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.14.tgz",
- "integrity": "sha512-4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
+ "legacy-swc-helpers": "npm:@swc/helpers@=0.4.14",
"tslib": "^2.4.0"
},
"dev": true,
@@ -6176,15 +5291,6 @@
"version": "5.0.38"
},
"node_modules/@types/hast": {
-<<<<<<< HEAD
- "version": "2.3.4",
- "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.4.tgz",
- "integrity": "sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g==",
- "dev": true,
- "dependencies": {
- "@types/unist": "*"
- }
-=======
"dependencies": {
"@types/unist": "^2"
},
@@ -6192,7 +5298,6 @@
"integrity": "sha512-SvQi0L/lNpThgPoleH53cdjB3y9zpLlVjRbqB3rH8hx1jiRSBGAhyjV3H+URFjNVRqt2EdYNrbZE5IsGlNfpRg==",
"resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.5.tgz",
"version": "2.3.5"
->>>>>>> develop
},
"node_modules/@types/hoist-non-react-statics": {
"dependencies": {
@@ -6249,16 +5354,10 @@
"version": "7.0.12"
},
"node_modules/@types/json5": {
-<<<<<<< HEAD
- "version": "0.0.29",
- "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
- "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="
-=======
"dev": true,
"integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
"resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
"version": "0.0.29"
->>>>>>> develop
},
"node_modules/@types/keyv": {
"dependencies": {
@@ -6270,21 +5369,6 @@
"version": "3.1.4"
},
"node_modules/@types/lodash": {
-<<<<<<< HEAD
- "version": "4.14.195",
- "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.195.tgz",
- "integrity": "sha512-Hwx9EUgdwf2GLarOjQp5ZH8ZmblzcbTBC2wtQWNKARBSxM9ezRIAUpeDTgoQRAFB0+8CNWXVA9+MaSOzOF3nPg==",
- "dev": true
- },
- "node_modules/@types/mdast": {
- "version": "3.0.11",
- "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.11.tgz",
- "integrity": "sha512-Y/uImid8aAwrEA24/1tcRZwpxX3pIFTSilcNDKSPn+Y2iDywSEachzRuvgAYYLR3wpGXAsMbv5lvKLDZLeYPAw==",
- "dev": true,
- "dependencies": {
- "@types/unist": "*"
- }
-=======
"dev": true,
"integrity": "sha512-BMVOiWs0uNxHVlHBgzTIqJYmj+PgCo4euloGF+5m4okL3rEYzM2EEv78mw8zWSMM57dM7kVIgJ2QDvwHSoCI5g==",
"resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.197.tgz",
@@ -6298,7 +5382,6 @@
"integrity": "sha512-DT+iNIRNX884cx0/Q1ja7NyUPpZuv0KPyL5rGNxm1WC1OtHstl7n4Jb7nk+xacNShQMbczJjt8uFzznpp6kYBg==",
"resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.12.tgz",
"version": "3.0.12"
->>>>>>> develop
},
"node_modules/@types/minimatch": {
"dev": true,
@@ -6316,17 +5399,10 @@
"version": "0.5.2"
},
"node_modules/@types/node": {
-<<<<<<< HEAD
- "version": "20.2.5",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-20.2.5.tgz",
- "integrity": "sha512-JJulVEQXmiY9Px5axXHeYGLSjhkZEnD+MDPDGbCbIAbMslkKwmygtZFy1X6s/075Yo94sf8GuSlFfPzysQrWZQ==",
- "dev": true
-=======
"dev": true,
"integrity": "sha512-dP7f3LdZIysZnmvP3ANJYTSwg+wLLl8p7RqniVlV7j+oXSXAbt9h0WIBFmJy5inWZoX9wZN6eXx+YXd9Rh3RBA==",
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.7.tgz",
"version": "20.5.7"
->>>>>>> develop
},
"node_modules/@types/node-fetch": {
"dependencies": {
@@ -6357,15 +5433,6 @@
"version": "15.7.5"
},
"node_modules/@types/ramda": {
-<<<<<<< HEAD
- "version": "0.29.2",
- "resolved": "https://registry.npmjs.org/@types/ramda/-/ramda-0.29.2.tgz",
- "integrity": "sha512-JxvBGR3G4gV3RTOBugVHAAOD6iiv2WjlJ8BHr0s7KALdPpx2l+didoTuoJMmrA0eqpUaCm/slKP4TmxMRihd8g==",
- "dev": true,
- "dependencies": {
- "types-ramda": "^0.29.3"
- }
-=======
"dependencies": {
"types-ramda": "^0.29.4"
},
@@ -6373,7 +5440,6 @@
"integrity": "sha512-Yh/RHkjN0ru6LVhSQtTkCRo6HXkfL9trot/2elzM/yXLJmbLm2v6kJc8yftTnwv1zvUob6TEtqI2cYjdqG3U0Q==",
"resolved": "https://registry.npmjs.org/@types/ramda/-/ramda-0.29.3.tgz",
"version": "0.29.3"
->>>>>>> develop
},
"node_modules/@types/reach__router": {
"dependencies": {
@@ -6385,13 +5451,6 @@
"version": "1.3.11"
},
"node_modules/@types/react": {
-<<<<<<< HEAD
- "version": "18.2.9",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.9.tgz",
- "integrity": "sha512-pL3JAesUkF7PEQGxh5XOwdXGV907te6m1/Qe1ERJLgomojS6Ne790QiA7GUl434JEkFA2aAaB6qJ5z4e1zJn/w==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@types/prop-types": "*",
"@types/scheduler": "*",
@@ -6428,16 +5487,10 @@
"version": "0.16.3"
},
"node_modules/@types/semver": {
-<<<<<<< HEAD
- "version": "7.5.0",
- "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz",
- "integrity": "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw=="
-=======
"dev": true,
"integrity": "sha512-cJRQXpObxfNKkFAZbJl2yjWtJCqELQIdShsogr1d2MilP8dKD9TE/nEKHkJgUNHdGKCQaf9HbIynuV2csLGVLg==",
"resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.1.tgz",
"version": "7.5.1"
->>>>>>> develop
},
"node_modules/@types/tmp": {
"dev": true,
@@ -6446,17 +5499,10 @@
"version": "0.0.33"
},
"node_modules/@types/unist": {
-<<<<<<< HEAD
- "version": "2.0.6",
- "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz",
- "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==",
- "dev": true
-=======
"dev": true,
"integrity": "sha512-cputDpIbFgLUaGQn6Vqg3/YsJwxUwHLO13v3i5ouxT4lat0khip9AEWxtERujXV9wxIB1EyF97BSJFt6vpdI8g==",
"resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.7.tgz",
"version": "2.0.7"
->>>>>>> develop
},
"node_modules/@types/use-sync-external-store": {
"dev": true,
@@ -6486,19 +5532,13 @@
"version": "1.9.2"
},
"node_modules/@typescript-eslint/eslint-plugin": {
-<<<<<<< HEAD
- "version": "5.59.9",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.9.tgz",
- "integrity": "sha512-4uQIBq1ffXd2YvF7MAvehWKW3zVv/w+mSfRAu+8cKbfj3nwzyqJLNcZJpQ/WZ1HLbJDiowwmQ6NO+63nCA+fqA==",
-=======
->>>>>>> develop
"dependencies": {
"@eslint-community/regexpp": "^4.4.0",
- "@typescript-eslint/scope-manager": "5.59.9",
- "@typescript-eslint/type-utils": "5.59.9",
- "@typescript-eslint/utils": "5.59.9",
+ "@typescript-eslint/scope-manager": "5.62.0",
+ "@typescript-eslint/type-utils": "5.62.0",
+ "@typescript-eslint/utils": "5.62.0",
"debug": "^4.3.4",
- "grapheme-splitter": "^1.0.4",
+ "graphemer": "^1.4.0",
"ignore": "^5.2.0",
"natural-compare-lite": "^1.4.0",
"semver": "^7.3.7",
@@ -6526,12 +5566,6 @@
"version": "5.62.0"
},
"node_modules/@typescript-eslint/eslint-plugin/node_modules/lru-cache": {
-<<<<<<< HEAD
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-=======
->>>>>>> develop
"dependencies": {
"yallist": "^4.0.0"
},
@@ -6544,15 +5578,6 @@
"version": "6.0.0"
},
"node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
-<<<<<<< HEAD
- "version": "7.5.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz",
- "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==",
- "dependencies": {
- "lru-cache": "^6.0.0"
- },
-=======
->>>>>>> develop
"bin": {
"semver": "bin/semver.js"
},
@@ -6568,26 +5593,14 @@
"version": "7.5.4"
},
"node_modules/@typescript-eslint/eslint-plugin/node_modules/yallist": {
-<<<<<<< HEAD
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
- },
- "node_modules/@typescript-eslint/experimental-utils": {
- "version": "5.59.9",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.59.9.tgz",
- "integrity": "sha512-eZTK/Ci0QAqNc/q2MqMwI2+QI5ZI9HM12FcfGwbEvKif5ev/CIIYLmrlckvgPrC8XSbl39HtErR5NJiQkRkvWg==",
- "dev": true,
-=======
"dev": true,
"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
"version": "4.0.0"
},
"node_modules/@typescript-eslint/experimental-utils": {
->>>>>>> develop
"dependencies": {
- "@typescript-eslint/utils": "5.59.9"
+ "@typescript-eslint/utils": "5.62.0"
},
"dev": true,
"engines": {
@@ -6605,16 +5618,10 @@
"version": "5.62.0"
},
"node_modules/@typescript-eslint/parser": {
-<<<<<<< HEAD
- "version": "5.59.9",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.9.tgz",
- "integrity": "sha512-FsPkRvBtcLQ/eVK1ivDiNYBjn3TGJdXy2fhXX+rc7czWl4ARwnpArwbihSOHI2Peg9WbtGHrbThfBUkZZGTtvQ==",
-=======
->>>>>>> develop
- "dependencies": {
- "@typescript-eslint/scope-manager": "5.59.9",
- "@typescript-eslint/types": "5.59.9",
- "@typescript-eslint/typescript-estree": "5.59.9",
+ "dependencies": {
+ "@typescript-eslint/scope-manager": "5.62.0",
+ "@typescript-eslint/types": "5.62.0",
+ "@typescript-eslint/typescript-estree": "5.62.0",
"debug": "^4.3.4"
},
"dev": true,
@@ -6638,15 +5645,9 @@
"version": "5.62.0"
},
"node_modules/@typescript-eslint/scope-manager": {
-<<<<<<< HEAD
- "version": "5.59.9",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.9.tgz",
- "integrity": "sha512-8RA+E+w78z1+2dzvK/tGZ2cpGigBZ58VMEHDZtpE1v+LLjzrYGc8mMaTONSxKyEkz3IuXFM0IqYiGHlCsmlZxQ==",
-=======
->>>>>>> develop
"dependencies": {
- "@typescript-eslint/types": "5.59.9",
- "@typescript-eslint/visitor-keys": "5.59.9"
+ "@typescript-eslint/types": "5.62.0",
+ "@typescript-eslint/visitor-keys": "5.62.0"
},
"dev": true,
"engines": {
@@ -6661,15 +5662,9 @@
"version": "5.62.0"
},
"node_modules/@typescript-eslint/type-utils": {
-<<<<<<< HEAD
- "version": "5.59.9",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.9.tgz",
- "integrity": "sha512-ksEsT0/mEHg9e3qZu98AlSrONAQtrSTljL3ow9CGej8eRo7pe+yaC/mvTjptp23Xo/xIf2mLZKC6KPv4Sji26Q==",
-=======
->>>>>>> develop
- "dependencies": {
- "@typescript-eslint/typescript-estree": "5.59.9",
- "@typescript-eslint/utils": "5.59.9",
+ "dependencies": {
+ "@typescript-eslint/typescript-estree": "5.62.0",
+ "@typescript-eslint/utils": "5.62.0",
"debug": "^4.3.4",
"tsutils": "^3.21.0"
},
@@ -6694,13 +5689,7 @@
"version": "5.62.0"
},
"node_modules/@typescript-eslint/types": {
-<<<<<<< HEAD
- "version": "5.59.9",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.9.tgz",
- "integrity": "sha512-uW8H5NRgTVneSVTfiCVffBb8AbwWSKg7qcA4Ot3JI3MPCJGsB4Db4BhvAODIIYE5mNj7Q+VJkK7JxmRhk2Lyjw==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
},
@@ -6713,15 +5702,9 @@
"version": "5.62.0"
},
"node_modules/@typescript-eslint/typescript-estree": {
-<<<<<<< HEAD
- "version": "5.59.9",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.9.tgz",
- "integrity": "sha512-pmM0/VQ7kUhd1QyIxgS+aRvMgw+ZljB3eDb+jYyp6d2bC0mQWLzUDF+DLwCTkQ3tlNyVsvZRXjFyV0LkU/aXjA==",
-=======
->>>>>>> develop
- "dependencies": {
- "@typescript-eslint/types": "5.59.9",
- "@typescript-eslint/visitor-keys": "5.59.9",
+ "dependencies": {
+ "@typescript-eslint/types": "5.62.0",
+ "@typescript-eslint/visitor-keys": "5.62.0",
"debug": "^4.3.4",
"globby": "^11.1.0",
"is-glob": "^4.0.3",
@@ -6746,12 +5729,6 @@
"version": "5.62.0"
},
"node_modules/@typescript-eslint/typescript-estree/node_modules/lru-cache": {
-<<<<<<< HEAD
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-=======
->>>>>>> develop
"dependencies": {
"yallist": "^4.0.0"
},
@@ -6764,15 +5741,6 @@
"version": "6.0.0"
},
"node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
-<<<<<<< HEAD
- "version": "7.5.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz",
- "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==",
- "dependencies": {
- "lru-cache": "^6.0.0"
- },
-=======
->>>>>>> develop
"bin": {
"semver": "bin/semver.js"
},
@@ -6788,30 +5756,19 @@
"version": "7.5.4"
},
"node_modules/@typescript-eslint/typescript-estree/node_modules/yallist": {
-<<<<<<< HEAD
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
- },
- "node_modules/@typescript-eslint/utils": {
- "version": "5.59.9",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.9.tgz",
- "integrity": "sha512-1PuMYsju/38I5Ggblaeb98TOoUvjhRvLpLa1DoTOFaLWqaXl/1iQ1eGurTXgBY58NUdtfTXKP5xBq7q9NDaLKg==",
-=======
"dev": true,
"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
"version": "4.0.0"
},
"node_modules/@typescript-eslint/utils": {
->>>>>>> develop
"dependencies": {
"@eslint-community/eslint-utils": "^4.2.0",
"@types/json-schema": "^7.0.9",
"@types/semver": "^7.3.12",
- "@typescript-eslint/scope-manager": "5.59.9",
- "@typescript-eslint/types": "5.59.9",
- "@typescript-eslint/typescript-estree": "5.59.9",
+ "@typescript-eslint/scope-manager": "5.62.0",
+ "@typescript-eslint/types": "5.62.0",
+ "@typescript-eslint/typescript-estree": "5.62.0",
"eslint-scope": "^5.1.1",
"semver": "^7.3.7"
},
@@ -6831,12 +5788,6 @@
"version": "5.62.0"
},
"node_modules/@typescript-eslint/utils/node_modules/lru-cache": {
-<<<<<<< HEAD
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-=======
->>>>>>> develop
"dependencies": {
"yallist": "^4.0.0"
},
@@ -6849,15 +5800,6 @@
"version": "6.0.0"
},
"node_modules/@typescript-eslint/utils/node_modules/semver": {
-<<<<<<< HEAD
- "version": "7.5.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz",
- "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==",
- "dependencies": {
- "lru-cache": "^6.0.0"
- },
-=======
->>>>>>> develop
"bin": {
"semver": "bin/semver.js"
},
@@ -6873,25 +5815,14 @@
"version": "7.5.4"
},
"node_modules/@typescript-eslint/utils/node_modules/yallist": {
-<<<<<<< HEAD
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
- },
- "node_modules/@typescript-eslint/visitor-keys": {
- "version": "5.59.9",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.9.tgz",
- "integrity": "sha512-bT7s0td97KMaLwpEBckbzj/YohnvXtqbe2XgqNvTl6RJVakY5mvENOTPvw5u66nljfZxthESpDozs86U+oLY8Q==",
-=======
"dev": true,
"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
"version": "4.0.0"
},
"node_modules/@typescript-eslint/visitor-keys": {
->>>>>>> develop
"dependencies": {
- "@typescript-eslint/types": "5.59.9",
+ "@typescript-eslint/types": "5.62.0",
"eslint-visitor-keys": "^3.3.0"
},
"dev": true,
@@ -6907,13 +5838,7 @@
"version": "5.62.0"
},
"node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
-<<<<<<< HEAD
- "version": "3.4.1",
- "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
- "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
},
@@ -7117,12 +6042,6 @@
"version": "1.3.8"
},
"node_modules/acorn": {
-<<<<<<< HEAD
- "version": "8.8.2",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
- "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
-=======
->>>>>>> develop
"bin": {
"acorn": "bin/acorn"
},
@@ -7144,12 +6063,7 @@
"version": "1.9.0"
},
"node_modules/acorn-jsx": {
-<<<<<<< HEAD
- "version": "5.3.2",
- "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-=======
"dev": true,
->>>>>>> develop
"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
"peerDependencies": {
"acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
@@ -7200,12 +6114,6 @@
"version": "4.0.0"
},
"node_modules/ajv": {
-<<<<<<< HEAD
- "version": "6.12.6",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
- "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-=======
->>>>>>> develop
"dependencies": {
"fast-deep-equal": "^3.1.1",
"fast-json-stable-stringify": "^2.0.0",
@@ -7294,15 +6202,6 @@
"version": "4.1.3"
},
"node_modules/ansi-escapes": {
-<<<<<<< HEAD
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
- "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
- "dev": true,
- "engines": {
- "node": ">=4"
- }
-=======
"dependencies": {
"type-fest": "^0.21.3"
},
@@ -7328,7 +6227,6 @@
"integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
"version": "0.21.3"
->>>>>>> develop
},
"node_modules/ansi-html-community": {
"bin": {
@@ -7343,13 +6241,7 @@
"version": "0.0.8"
},
"node_modules/ansi-regex": {
-<<<<<<< HEAD
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
- "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=8"
},
@@ -7358,12 +6250,6 @@
"version": "5.0.1"
},
"node_modules/ansi-styles": {
-<<<<<<< HEAD
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
- "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-=======
->>>>>>> develop
"dependencies": {
"color-convert": "^1.9.0"
},
@@ -7400,13 +6286,6 @@
"resolved": "https://registry.npmjs.org/application-config-path/-/application-config-path-0.1.1.tgz",
"version": "0.1.1"
},
- "node_modules/aproba": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
- "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
- "dev": true,
- "optional": true
- },
"node_modules/arch": {
"funding": [
{
@@ -7426,36 +6305,12 @@
"resolved": "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz",
"version": "2.2.0"
},
- "node_modules/are-we-there-yet": {
- "version": "1.1.7",
- "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz",
- "integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==",
- "dev": true,
- "optional": true,
- "dependencies": {
- "delegates": "^1.0.0",
- "readable-stream": "^2.0.6"
- }
- },
"node_modules/argparse": {
"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
"version": "2.0.1"
},
"node_modules/aria-query": {
-<<<<<<< HEAD
- "version": "5.1.3",
- "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz",
- "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==",
- "dependencies": {
- "deep-equal": "^2.0.5"
- }
- },
- "node_modules/array-buffer-byte-length": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
- "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
-=======
"dependencies": {
"dequal": "^2.0.3"
},
@@ -7465,7 +6320,6 @@
"version": "5.3.0"
},
"node_modules/array-buffer-byte-length": {
->>>>>>> develop
"dependencies": {
"call-bind": "^1.0.2",
"is-array-buffer": "^3.0.1"
@@ -7485,12 +6339,6 @@
"version": "1.1.1"
},
"node_modules/array-includes": {
-<<<<<<< HEAD
- "version": "3.1.6",
- "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
- "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
-=======
->>>>>>> develop
"dependencies": {
"call-bind": "^1.0.2",
"define-properties": "^1.1.4",
@@ -7520,13 +6368,7 @@
"version": "1.1.4"
},
"node_modules/array-union": {
-<<<<<<< HEAD
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
- "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=8"
},
@@ -7534,12 +6376,6 @@
"resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
"version": "2.1.0"
},
-<<<<<<< HEAD
- "node_modules/array.prototype.flat": {
- "version": "1.3.1",
- "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
- "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
-=======
"node_modules/array.prototype.findlastindex": {
"dependencies": {
"call-bind": "^1.0.2",
@@ -7560,7 +6396,6 @@
"version": "1.2.2"
},
"node_modules/array.prototype.flat": {
->>>>>>> develop
"dependencies": {
"call-bind": "^1.0.2",
"define-properties": "^1.1.4",
@@ -7579,12 +6414,6 @@
"version": "1.3.1"
},
"node_modules/array.prototype.flatmap": {
-<<<<<<< HEAD
- "version": "1.3.1",
- "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
- "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
-=======
->>>>>>> develop
"dependencies": {
"call-bind": "^1.0.2",
"define-properties": "^1.1.4",
@@ -7603,12 +6432,6 @@
"version": "1.3.1"
},
"node_modules/array.prototype.tosorted": {
-<<<<<<< HEAD
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz",
- "integrity": "sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==",
-=======
->>>>>>> develop
"dependencies": {
"call-bind": "^1.0.2",
"define-properties": "^1.1.4",
@@ -7621,8 +6444,6 @@
"resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz",
"version": "1.1.1"
},
-<<<<<<< HEAD
-=======
"node_modules/arraybuffer.prototype.slice": {
"dependencies": {
"array-buffer-byte-length": "^1.0.0",
@@ -7643,7 +6464,6 @@
"resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz",
"version": "1.0.1"
},
->>>>>>> develop
"node_modules/arrify": {
"dev": true,
"engines": {
@@ -7660,16 +6480,10 @@
"version": "2.0.6"
},
"node_modules/ast-types-flow": {
-<<<<<<< HEAD
- "version": "0.0.7",
- "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
- "integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag=="
-=======
"dev": true,
"integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==",
"resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
"version": "0.0.7"
->>>>>>> develop
},
"node_modules/astral-regex": {
"dev": true,
@@ -7686,8 +6500,6 @@
"resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
"version": "3.2.4"
},
-<<<<<<< HEAD
-=======
"node_modules/asynciterator.prototype": {
"dependencies": {
"has-symbols": "^1.0.3"
@@ -7697,7 +6509,6 @@
"resolved": "https://registry.npmjs.org/asynciterator.prototype/-/asynciterator.prototype-1.0.0.tgz",
"version": "1.0.0"
},
->>>>>>> develop
"node_modules/asynckit": {
"dev": true,
"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
@@ -7735,11 +6546,6 @@
"version": "3.16.2"
},
"node_modules/autoprefixer": {
-<<<<<<< HEAD
- "version": "10.4.14",
- "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz",
- "integrity": "sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==",
-=======
"bin": {
"autoprefixer": "bin/autoprefixer"
},
@@ -7751,7 +6557,6 @@
"picocolors": "^1.0.0",
"postcss-value-parser": "^4.2.0"
},
->>>>>>> develop
"dev": true,
"engines": {
"node": "^10 || ^12 || >=14"
@@ -7764,26 +6569,13 @@
{
"type": "tidelift",
"url": "https://tidelift.com/funding/github/npm/autoprefixer"
+ },
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
}
],
-<<<<<<< HEAD
- "dependencies": {
- "browserslist": "^4.21.5",
- "caniuse-lite": "^1.0.30001464",
- "fraction.js": "^4.2.0",
- "normalize-range": "^0.1.2",
- "picocolors": "^1.0.0",
- "postcss-value-parser": "^4.2.0"
- },
- "bin": {
- "autoprefixer": "bin/autoprefixer"
- },
- "engines": {
- "node": "^10 || ^12 || >=14"
- },
-=======
"integrity": "sha512-KCuPB8ZCIqFdA4HwKXsvz7j6gvSDNhDP7WnUjBleRkKjPdvCmHFuQ77ocavI8FT6NdvlBnE2UFr2H4Mycn8Vew==",
->>>>>>> develop
"peerDependencies": {
"postcss": "^8.1.0"
},
@@ -7791,13 +6583,7 @@
"version": "10.4.15"
},
"node_modules/available-typed-arrays": {
-<<<<<<< HEAD
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
- "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">= 0.4"
},
@@ -7809,13 +6595,7 @@
"version": "1.0.5"
},
"node_modules/axe-core": {
-<<<<<<< HEAD
- "version": "4.7.2",
- "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.7.2.tgz",
- "integrity": "sha512-zIURGIS1E1Q4pcrMjp+nnEh+16G56eG/MUllJH8yEvw7asDo7Ac9uhC9KIH5jzpITueEZolfYglnCGIuSBz39g==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=4"
},
@@ -7833,22 +6613,6 @@
"version": "0.21.4"
},
"node_modules/axobject-query": {
-<<<<<<< HEAD
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.1.1.tgz",
- "integrity": "sha512-goKlv8DZrK9hUh975fnHzhNIO4jUnFCfv/dszV5VwUGDFjI6vQ2VwoyjYjYNEbBE8AH87TduWP5uyDR1D+Iteg==",
- "dependencies": {
- "deep-equal": "^2.0.5"
- }
- },
- "node_modules/babel-eslint": {
- "name": "@babel/eslint-parser",
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.22.5.tgz",
- "integrity": "sha512-C69RWYNYtrgIRE5CmTd77ZiLDXqgBipahJc/jHP3sLcAGj6AJzxNIuKNpVnICqbyK7X3pFUfEvL++rvtbQpZkQ==",
- "dev": true,
- "peer": true,
-=======
"dependencies": {
"dequal": "^2.0.3"
},
@@ -7864,11 +6628,10 @@
"version": "1.6.4"
},
"node_modules/babel-eslint": {
->>>>>>> develop
"dependencies": {
"@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
"eslint-visitor-keys": "^2.1.0",
- "semver": "^6.3.0"
+ "semver": "^6.3.1"
},
"dev": true,
"engines": {
@@ -7878,7 +6641,7 @@
"name": "@babel/eslint-parser",
"peer": true,
"peerDependencies": {
- "@babel/core": ">=7.11.0",
+ "@babel/core": "^7.11.0",
"eslint": "^7.5.0 || ^8.0.0"
},
"resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.22.11.tgz",
@@ -7971,89 +6734,49 @@
"version": "3.1.0"
},
"node_modules/babel-plugin-polyfill-corejs2": {
-<<<<<<< HEAD
- "version": "0.4.3",
- "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.3.tgz",
- "integrity": "sha512-bM3gHc337Dta490gg+/AseNB9L4YLHxq1nGKZZSHbhXv4aTYU2MD2cjza1Ru4S6975YLTaL1K8uJf6ukJhhmtw==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
- "@babel/compat-data": "^7.17.7",
- "@babel/helper-define-polyfill-provider": "^0.4.0",
- "semver": "^6.1.1"
+ "@babel/compat-data": "^7.22.6",
+ "@babel/helper-define-polyfill-provider": "^0.4.2",
+ "semver": "^6.3.1"
},
"dev": true,
"integrity": "sha512-19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg==",
"peerDependencies": {
-<<<<<<< HEAD
- "@babel/core": "^7.0.0-0"
- }
- },
- "node_modules/babel-plugin-polyfill-corejs3": {
- "version": "0.8.1",
- "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.1.tgz",
- "integrity": "sha512-ikFrZITKg1xH6pLND8zT14UPgjKHiGLqex7rGEZCH2EvhsneJaJPemmpQaIZV5AL03II+lXylw3UmddDK8RU5Q==",
- "dev": true,
-=======
"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
},
"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.5.tgz",
"version": "0.4.5"
},
"node_modules/babel-plugin-polyfill-corejs3": {
->>>>>>> develop
"dependencies": {
- "@babel/helper-define-polyfill-provider": "^0.4.0",
- "core-js-compat": "^3.30.1"
+ "@babel/helper-define-polyfill-provider": "^0.4.2",
+ "core-js-compat": "^3.31.0"
},
"dev": true,
"integrity": "sha512-z41XaniZL26WLrvjy7soabMXrfPWARN25PZoriDEiLMxAp50AUW3t35BGQUMg5xK3UrpVTtagIDklxYa+MhiNA==",
"peerDependencies": {
-<<<<<<< HEAD
- "@babel/core": "^7.0.0-0"
- }
- },
- "node_modules/babel-plugin-polyfill-regenerator": {
- "version": "0.5.0",
- "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.0.tgz",
- "integrity": "sha512-hDJtKjMLVa7Z+LwnTCxoDLQj6wdc+B8dun7ayF2fYieI6OzfuvcLMB32ihJZ4UhCBwNYGl5bg/x/P9cMdnkc2g==",
- "dev": true,
-=======
"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
},
"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.3.tgz",
"version": "0.8.3"
},
"node_modules/babel-plugin-polyfill-regenerator": {
->>>>>>> develop
"dependencies": {
- "@babel/helper-define-polyfill-provider": "^0.4.0"
+ "@babel/helper-define-polyfill-provider": "^0.4.2"
},
"dev": true,
"integrity": "sha512-tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA==",
"peerDependencies": {
-<<<<<<< HEAD
- "@babel/core": "^7.0.0-0"
- }
- },
- "node_modules/babel-plugin-remove-graphql-queries": {
- "version": "5.10.0",
- "resolved": "https://registry.npmjs.org/babel-plugin-remove-graphql-queries/-/babel-plugin-remove-graphql-queries-5.10.0.tgz",
- "integrity": "sha512-YVjBg0RD6aHE8LOWeuDSqadOB2lPV9FeGpc32rLClaDK+wHdIPaXYqUd9ty30UY30PfB/gDclyexXlfv7qgcxA==",
- "dev": true,
-=======
"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
},
"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.2.tgz",
"version": "0.5.2"
},
"node_modules/babel-plugin-remove-graphql-queries": {
->>>>>>> develop
"dependencies": {
"@babel/runtime": "^7.20.13",
"@babel/types": "^7.20.7",
- "gatsby-core-utils": "^4.10.0"
+ "gatsby-core-utils": "^4.12.0"
},
"dev": true,
"engines": {
@@ -8118,13 +6841,6 @@
"version": "3.4.0"
},
"node_modules/babel-preset-gatsby": {
-<<<<<<< HEAD
- "version": "3.10.0",
- "resolved": "https://registry.npmjs.org/babel-preset-gatsby/-/babel-preset-gatsby-3.10.0.tgz",
- "integrity": "sha512-sogPa6DBrH2fZpiVOD6mYDCbnX/OEExl4jtZzfYPuKjcFDKPs8hs6lmmeLIdXKZhLIM2tJhJXQV/bqYlwWRARw==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
@@ -8139,8 +6855,8 @@
"babel-plugin-dynamic-import-node": "^2.3.3",
"babel-plugin-macros": "^3.1.0",
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
- "gatsby-core-utils": "^4.10.0",
- "gatsby-legacy-polyfills": "^3.10.0"
+ "gatsby-core-utils": "^4.12.0",
+ "gatsby-legacy-polyfills": "^3.12.0"
},
"dev": true,
"engines": {
@@ -8315,15 +7031,6 @@
"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
"version": "1.20.1"
},
- "node_modules/body-parser/node_modules/bytes": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
- "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
- "dev": true,
- "engines": {
- "node": ">= 0.8"
- }
- },
"node_modules/body-parser/node_modules/debug": {
"dependencies": {
"ms": "2.0.0"
@@ -8447,12 +7154,6 @@
"version": "1.1.11"
},
"node_modules/braces": {
-<<<<<<< HEAD
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
- "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-=======
->>>>>>> develop
"dependencies": {
"fill-range": "^7.0.1"
},
@@ -8465,11 +7166,6 @@
"version": "3.0.2"
},
"node_modules/browserslist": {
-<<<<<<< HEAD
- "version": "4.21.7",
- "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.7.tgz",
- "integrity": "sha512-BauCXrQ7I2ftSqd2mvKHGo85XR0u7Ru3C/Hxsy/0TkfCtjrmAbPdzLGasmoiBxplpDXlPvdjX9u7srIMfgasNA==",
-=======
"bin": {
"browserslist": "cli.js"
},
@@ -8483,7 +7179,6 @@
"engines": {
"node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
},
->>>>>>> develop
"funding": [
{
"type": "opencollective",
@@ -8498,24 +7193,9 @@
"url": "https://github.com/sponsors/ai"
}
],
-<<<<<<< HEAD
- "dependencies": {
- "caniuse-lite": "^1.0.30001489",
- "electron-to-chromium": "^1.4.411",
- "node-releases": "^2.0.12",
- "update-browserslist-db": "^1.0.11"
- },
- "bin": {
- "browserslist": "cli.js"
- },
- "engines": {
- "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
- }
-=======
"integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz",
"version": "4.21.10"
->>>>>>> develop
},
"node_modules/bser": {
"dependencies": {
@@ -8569,12 +7249,6 @@
"version": "1.6.0"
},
"node_modules/bytes": {
-<<<<<<< HEAD
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
- "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
-=======
->>>>>>> develop
"dev": true,
"engines": {
"node": ">= 0.8"
@@ -8584,16 +7258,6 @@
"version": "3.1.2"
},
"node_modules/cache-manager": {
-<<<<<<< HEAD
- "version": "5.2.2",
- "resolved": "https://registry.npmjs.org/cache-manager/-/cache-manager-5.2.2.tgz",
- "integrity": "sha512-QYEct/rVt5HfNvyWpHQurOa1IgpjP9V0X3E5O8rdEmuKcucpnMs7CwK0bHvv92svxZXlN2w5hgMFdrbiYoHeIQ==",
- "dev": true,
- "dependencies": {
- "lodash.clonedeep": "^4.5.0",
- "lru-cache": "~9.1.1"
- }
-=======
"dependencies": {
"lodash.clonedeep": "^4.5.0",
"lru-cache": "^9.1.2"
@@ -8602,7 +7266,6 @@
"integrity": "sha512-9OErI8fksFkxAMJ8Mco0aiZSdphyd90HcKiOMJQncSlU1yq/9lHHxrT8PDayxrmr9IIIZPOAEfXuGSD7g29uog==",
"resolved": "https://registry.npmjs.org/cache-manager/-/cache-manager-5.2.3.tgz",
"version": "5.2.3"
->>>>>>> develop
},
"node_modules/cache-manager/node_modules/lru-cache": {
"dev": true,
@@ -8656,12 +7319,6 @@
"version": "5.2.0"
},
"node_modules/call-bind": {
-<<<<<<< HEAD
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
- "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-=======
->>>>>>> develop
"dependencies": {
"function-bind": "^1.1.1",
"get-intrinsic": "^1.0.2"
@@ -8680,13 +7337,7 @@
"version": "1.0.2"
},
"node_modules/callsites": {
-<<<<<<< HEAD
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
- "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=6"
},
@@ -8729,13 +7380,7 @@
"version": "3.0.0"
},
"node_modules/caniuse-lite": {
-<<<<<<< HEAD
- "version": "1.0.30001497",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001497.tgz",
- "integrity": "sha512-I4/duVK4wL6rAK/aKZl3HXB4g+lIZvaT4VLAn2rCgJ38jVLb0lv2Xug6QuqmxXFVRJMF74SPPWPJ/1Sdm3vCzw==",
-=======
"dev": true,
->>>>>>> develop
"funding": [
{
"type": "opencollective",
@@ -8776,12 +7421,6 @@
"version": "1.1.0"
},
"node_modules/chalk": {
-<<<<<<< HEAD
- "version": "2.4.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
- "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-=======
->>>>>>> develop
"dependencies": {
"ansi-styles": "^3.2.1",
"escape-string-regexp": "^1.0.5",
@@ -9164,16 +7803,6 @@
"resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
"version": "1.0.3"
},
- "node_modules/code-point-at": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
- "integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==",
- "dev": true,
- "optional": true,
- "engines": {
- "node": ">=0.10.0"
- }
- },
"node_modules/color": {
"dependencies": {
"color-convert": "^2.0.1",
@@ -9188,12 +7817,6 @@
"version": "4.2.3"
},
"node_modules/color-convert": {
-<<<<<<< HEAD
- "version": "1.9.3",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
- "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-=======
->>>>>>> develop
"dependencies": {
"color-name": "1.1.3"
},
@@ -9203,16 +7826,10 @@
"version": "1.9.3"
},
"node_modules/color-name": {
-<<<<<<< HEAD
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
- "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
-=======
"dev": true,
"integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
"version": "1.1.3"
->>>>>>> develop
},
"node_modules/color-string": {
"dependencies": {
@@ -9342,8 +7959,6 @@
"resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
"version": "1.7.4"
},
-<<<<<<< HEAD
-=======
"node_modules/compression/node_modules/bytes": {
"dev": true,
"engines": {
@@ -9353,7 +7968,6 @@
"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
"version": "3.0.0"
},
->>>>>>> develop
"node_modules/compression/node_modules/debug": {
"dependencies": {
"ms": "2.0.0"
@@ -9428,13 +8042,6 @@
"resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
"version": "1.0.11"
},
- "node_modules/console-control-strings": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
- "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
- "dev": true,
- "optional": true
- },
"node_modules/constant-case": {
"dependencies": {
"no-case": "^3.0.4",
@@ -9506,12 +8113,6 @@
"version": "3.3.3"
},
"node_modules/core-js": {
-<<<<<<< HEAD
- "version": "3.30.2",
- "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.30.2.tgz",
- "integrity": "sha512-uBJiDmwqsbJCWHAwjrx3cvjbMXP7xD72Dmsn5LOJpiRmE3WbBbN5rCqQ2Qh6Ek6/eOrjlWngEynBWo4VxerQhg==",
-=======
->>>>>>> develop
"dev": true,
"funding": {
"type": "opencollective",
@@ -9523,15 +8124,8 @@
"version": "3.32.1"
},
"node_modules/core-js-compat": {
-<<<<<<< HEAD
- "version": "3.30.2",
- "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.30.2.tgz",
- "integrity": "sha512-nriW1nuJjUgvkEjIot1Spwakz52V9YkYHZAQG6A1eCgC8AA1p0zngrQEP9R0+V6hji5XilWKG1Bd0YRppmGimA==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
- "browserslist": "^4.21.5"
+ "browserslist": "^4.21.10"
},
"dev": true,
"funding": {
@@ -9543,12 +8137,6 @@
"version": "3.32.1"
},
"node_modules/core-js-pure": {
-<<<<<<< HEAD
- "version": "3.30.2",
- "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.30.2.tgz",
- "integrity": "sha512-p/npFUJXXBkCCTIlEGBdghofn00jWG6ZOtdoIXSJmAu2QBvN0IqpZXWweOytcwE6cfx8ZvVUy1vw8zxhe4Y2vg==",
-=======
->>>>>>> develop
"dev": true,
"funding": {
"type": "opencollective",
@@ -9595,16 +8183,9 @@
"version": "7.1.0"
},
"node_modules/create-gatsby": {
-<<<<<<< HEAD
- "version": "3.10.0",
- "resolved": "https://registry.npmjs.org/create-gatsby/-/create-gatsby-3.10.0.tgz",
- "integrity": "sha512-ZKkibIo8B75yxw0/IobjMITZKdZJ+m24mbFY/nLwrMcN6RfkZ98Pa4DNTmUIyfA4AFF4nZCDgVkl+3sfoNk8iQ==",
- "dev": true,
-=======
"bin": {
"create-gatsby": "cli.js"
},
->>>>>>> develop
"dependencies": {
"@babel/runtime": "^7.20.13"
},
@@ -9627,15 +8208,6 @@
"version": "0.3.0"
},
"node_modules/cross-fetch": {
-<<<<<<< HEAD
- "version": "3.1.6",
- "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.6.tgz",
- "integrity": "sha512-riRvo06crlE8HiqOwIpQhxwdOk4fOeR7FVM/wXoxchFEqMNUjvbs3bfo4OTgMEMHzppd4DxFBDbyySj8Cv781g==",
- "dev": true,
- "dependencies": {
- "node-fetch": "^2.6.11"
- }
-=======
"dependencies": {
"node-fetch": "^2.6.12"
},
@@ -9643,7 +8215,6 @@
"integrity": "sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==",
"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz",
"version": "3.1.8"
->>>>>>> develop
},
"node_modules/cross-spawn": {
"dependencies": {
@@ -9668,12 +8239,6 @@
"version": "2.0.0"
},
"node_modules/css-declaration-sorter": {
-<<<<<<< HEAD
- "version": "6.4.0",
- "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz",
- "integrity": "sha512-jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew==",
-=======
->>>>>>> develop
"dev": true,
"engines": {
"node": "^10 || ^12 || >=14"
@@ -9726,16 +8291,6 @@
"version": "6.0.0"
},
"node_modules/css-loader/node_modules/semver": {
-<<<<<<< HEAD
- "version": "7.5.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz",
- "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==",
- "dev": true,
- "dependencies": {
- "lru-cache": "^6.0.0"
- },
-=======
->>>>>>> develop
"bin": {
"semver": "bin/semver.js"
},
@@ -9757,20 +8312,13 @@
"version": "4.0.0"
},
"node_modules/css-minimizer-webpack-plugin": {
-<<<<<<< HEAD
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-5.0.0.tgz",
- "integrity": "sha512-1wZ/PYvg+ZKwi5FX6YrvbB31jMAdurS+CmRQLwWCVSlfzJC85l/a6RVICqUHFa+jXyhilfnCyjafzJGbmz5tcA==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
- "cssnano": "^6.0.0",
+ "@jridgewell/trace-mapping": "^0.3.18",
+ "cssnano": "^6.0.1",
"jest-worker": "^29.4.3",
- "postcss": "^8.4.21",
- "schema-utils": "^4.0.0",
- "serialize-javascript": "^6.0.1",
- "source-map": "^0.6.1"
+ "postcss": "^8.4.24",
+ "schema-utils": "^4.0.1",
+ "serialize-javascript": "^6.0.1"
},
"dev": true,
"engines": {
@@ -9842,13 +8390,6 @@
"version": "1.0.0"
},
"node_modules/css-minimizer-webpack-plugin/node_modules/schema-utils": {
-<<<<<<< HEAD
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.1.0.tgz",
- "integrity": "sha512-Jw+GZVbP5IggB2WAn6UHI02LBwGmsIeYN/lNbSMZyDziQ7jmtAUrqKqDja+W89YHVs+KL/3IkIMltAklqB1vAw==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@types/json-schema": "^7.0.9",
"ajv": "^8.9.0",
@@ -9867,15 +8408,6 @@
"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
"version": "4.2.0"
},
- "node_modules/css-minimizer-webpack-plugin/node_modules/source-map": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
- "dev": true,
- "engines": {
- "node": ">=0.10.0"
- }
- },
"node_modules/css-select": {
"dependencies": {
"boolbase": "^1.0.0",
@@ -10066,16 +8598,10 @@
"version": "1.0.1"
},
"node_modules/damerau-levenshtein": {
-<<<<<<< HEAD
- "version": "1.0.8",
- "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
- "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA=="
-=======
"dev": true,
"integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==",
"resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
"version": "1.0.8"
->>>>>>> develop
},
"node_modules/date-fns": {
"dependencies": {
@@ -10094,12 +8620,6 @@
"version": "2.30.0"
},
"node_modules/debug": {
-<<<<<<< HEAD
- "version": "4.3.4",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
- "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-=======
->>>>>>> develop
"dependencies": {
"ms": "2.1.2"
},
@@ -10161,34 +8681,6 @@
"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
"version": "3.1.0"
},
- "node_modules/deep-equal": {
- "version": "2.2.1",
- "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.1.tgz",
- "integrity": "sha512-lKdkdV6EOGoVn65XaOsPdH4rMxTZOnmFyuIkMjM1i5HHCbfjC97dawgTAy0deYNfuqUqW+Q5VrVaQYtUpSd6yQ==",
- "dependencies": {
- "array-buffer-byte-length": "^1.0.0",
- "call-bind": "^1.0.2",
- "es-get-iterator": "^1.1.3",
- "get-intrinsic": "^1.2.0",
- "is-arguments": "^1.1.1",
- "is-array-buffer": "^3.0.2",
- "is-date-object": "^1.0.5",
- "is-regex": "^1.1.4",
- "is-shared-array-buffer": "^1.0.2",
- "isarray": "^2.0.5",
- "object-is": "^1.1.5",
- "object-keys": "^1.1.1",
- "object.assign": "^4.1.4",
- "regexp.prototype.flags": "^1.5.0",
- "side-channel": "^1.0.4",
- "which-boxed-primitive": "^1.0.2",
- "which-collection": "^1.0.1",
- "which-typed-array": "^1.1.9"
- },
- "funding": {
- "url": "https://github.com/sponsors/ljharb"
- }
- },
"node_modules/deep-extend": {
"dev": true,
"engines": {
@@ -10199,16 +8691,10 @@
"version": "0.6.0"
},
"node_modules/deep-is": {
-<<<<<<< HEAD
- "version": "0.1.4",
- "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
- "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
-=======
"dev": true,
"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
"version": "0.1.4"
->>>>>>> develop
},
"node_modules/deepmerge": {
"dev": true,
@@ -10238,12 +8724,6 @@
"version": "2.0.0"
},
"node_modules/define-properties": {
-<<<<<<< HEAD
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
- "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
-=======
->>>>>>> develop
"dependencies": {
"has-property-descriptors": "^1.0.0",
"object-keys": "^1.1.1"
@@ -10268,13 +8748,6 @@
"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
"version": "1.0.0"
},
- "node_modules/delegates": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
- "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
- "dev": true,
- "optional": true
- },
"node_modules/depd": {
"dev": true,
"engines": {
@@ -10293,8 +8766,6 @@
"resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.11.0.tgz",
"version": "0.11.0"
},
-<<<<<<< HEAD
-=======
"node_modules/dequal": {
"dev": true,
"engines": {
@@ -10304,7 +8775,6 @@
"resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
"version": "2.0.3"
},
->>>>>>> develop
"node_modules/destroy": {
"dev": true,
"engines": {
@@ -10450,12 +8920,6 @@
"version": "1.14.1"
},
"node_modules/dir-glob": {
-<<<<<<< HEAD
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
- "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-=======
->>>>>>> develop
"dependencies": {
"path-type": "^4.0.0"
},
@@ -10613,16 +9077,10 @@
"version": "1.1.1"
},
"node_modules/electron-to-chromium": {
-<<<<<<< HEAD
- "version": "1.4.427",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.427.tgz",
- "integrity": "sha512-HK3r9l+Jm8dYAm1ctXEWIC+hV60zfcjS9UA5BDlYvnI5S7PU/yytjpvSrTNrSSRRkuu3tDyZhdkwIczh+0DWaw=="
-=======
"dev": true,
"integrity": "sha512-cSMwIAd8yUh54VwitVRVvHK66QqHWE39C3DRj8SWiXitEpVSY3wNPD9y1pxQtLIi4w3UdzF9klLsmuPshz09DQ==",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.504.tgz",
"version": "1.4.504"
->>>>>>> develop
},
"node_modules/element-closest": {
"dev": true,
@@ -10634,16 +9092,10 @@
"version": "2.0.2"
},
"node_modules/emoji-regex": {
-<<<<<<< HEAD
- "version": "9.2.2",
- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
- "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
-=======
"dev": true,
"integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
"version": "9.2.2"
->>>>>>> develop
},
"node_modules/emojis-list": {
"engines": {
@@ -10693,17 +9145,10 @@
"version": "6.4.2"
},
"node_modules/engine.io-client": {
-<<<<<<< HEAD
- "version": "6.4.0",
- "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.4.0.tgz",
- "integrity": "sha512-GyKPDyoEha+XZ7iEqam49vz6auPnNJ9ZBfy89f+rMMas8AuiMWOZ9PVzu8xb9ZC6rafUqiGHSCfu22ih66E+1g==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@socket.io/component-emitter": "~3.1.0",
"debug": "~4.3.1",
- "engine.io-parser": "~5.0.3",
+ "engine.io-parser": "~5.2.1",
"ws": "~8.11.0",
"xmlhttprequest-ssl": "~2.0.0"
},
@@ -10712,8 +9157,6 @@
"resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.5.2.tgz",
"version": "6.5.2"
},
-<<<<<<< HEAD
-=======
"node_modules/engine.io-client/node_modules/engine.io-parser": {
"dev": true,
"engines": {
@@ -10723,7 +9166,6 @@
"resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.1.tgz",
"version": "5.2.1"
},
->>>>>>> develop
"node_modules/engine.io-parser": {
"dev": true,
"engines": {
@@ -10743,13 +9185,6 @@
"version": "0.4.2"
},
"node_modules/enhanced-resolve": {
-<<<<<<< HEAD
- "version": "5.14.1",
- "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.14.1.tgz",
- "integrity": "sha512-Vklwq2vDKtl0y/vtwjSesgJ5MYS7Etuk5txS8VdKL4AOS1aUlD96zqIfsOSLQsdv3xgMRbtkWM8eG9XDfKUPow==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"graceful-fs": "^4.2.4",
"tapable": "^2.2.0"
@@ -10763,15 +9198,9 @@
"version": "5.15.0"
},
"node_modules/enquirer": {
-<<<<<<< HEAD
- "version": "2.3.6",
- "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
- "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
- "ansi-colors": "^4.1.1"
+ "ansi-colors": "^4.1.1",
+ "strip-ansi": "^6.0.1"
},
"dev": true,
"engines": {
@@ -10794,13 +9223,6 @@
"version": "4.5.0"
},
"node_modules/envinfo": {
-<<<<<<< HEAD
- "version": "7.8.1",
- "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz",
- "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==",
- "dev": true,
-=======
->>>>>>> develop
"bin": {
"envinfo": "dist/cli.js"
},
@@ -10837,20 +9259,15 @@
"version": "2.1.4"
},
"node_modules/es-abstract": {
-<<<<<<< HEAD
- "version": "1.21.2",
- "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz",
- "integrity": "sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==",
-=======
->>>>>>> develop
"dependencies": {
"array-buffer-byte-length": "^1.0.0",
+ "arraybuffer.prototype.slice": "^1.0.1",
"available-typed-arrays": "^1.0.5",
"call-bind": "^1.0.2",
"es-set-tostringtag": "^2.0.1",
"es-to-primitive": "^1.2.1",
"function.prototype.name": "^1.1.5",
- "get-intrinsic": "^1.2.0",
+ "get-intrinsic": "^1.2.1",
"get-symbol-description": "^1.0.0",
"globalthis": "^1.0.3",
"gopd": "^1.0.1",
@@ -10870,14 +9287,18 @@
"object-inspect": "^1.12.3",
"object-keys": "^1.1.1",
"object.assign": "^4.1.4",
- "regexp.prototype.flags": "^1.4.3",
+ "regexp.prototype.flags": "^1.5.0",
+ "safe-array-concat": "^1.0.0",
"safe-regex-test": "^1.0.0",
"string.prototype.trim": "^1.2.7",
"string.prototype.trimend": "^1.0.6",
"string.prototype.trimstart": "^1.0.6",
+ "typed-array-buffer": "^1.0.0",
+ "typed-array-byte-length": "^1.0.0",
+ "typed-array-byte-offset": "^1.0.0",
"typed-array-length": "^1.0.4",
"unbox-primitive": "^1.0.2",
- "which-typed-array": "^1.1.9"
+ "which-typed-array": "^1.1.10"
},
"dev": true,
"engines": {
@@ -10890,41 +9311,19 @@
"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz",
"version": "1.22.1"
},
-<<<<<<< HEAD
- "node_modules/es-get-iterator": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz",
- "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==",
-=======
"node_modules/es-iterator-helpers": {
->>>>>>> develop
"dependencies": {
+ "asynciterator.prototype": "^1.0.0",
"call-bind": "^1.0.2",
- "get-intrinsic": "^1.1.3",
+ "define-properties": "^1.2.0",
+ "es-abstract": "^1.22.1",
+ "es-set-tostringtag": "^2.0.1",
+ "function-bind": "^1.1.1",
+ "get-intrinsic": "^1.2.1",
+ "globalthis": "^1.0.3",
+ "has-property-descriptors": "^1.0.0",
+ "has-proto": "^1.0.1",
"has-symbols": "^1.0.3",
-<<<<<<< HEAD
- "is-arguments": "^1.1.1",
- "is-map": "^2.0.2",
- "is-set": "^2.0.2",
- "is-string": "^1.0.7",
- "isarray": "^2.0.5",
- "stop-iteration-iterator": "^1.0.0"
- },
- "funding": {
- "url": "https://github.com/sponsors/ljharb"
- }
- },
- "node_modules/es-module-lexer": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.2.1.tgz",
- "integrity": "sha512-9978wrXM50Y4rTMmW5kXIC09ZdXQZqkE4mxhwkd8VbzsGkXGPgV4zWuqQJgCEzYngdo2dYDa0l8xhX4fkSwJSg==",
- "dev": true
- },
- "node_modules/es-set-tostringtag": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
- "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
-=======
"internal-slot": "^1.0.5",
"iterator.prototype": "^1.1.0",
"safe-array-concat": "^1.0.0"
@@ -10941,7 +9340,6 @@
"version": "1.3.0"
},
"node_modules/es-set-tostringtag": {
->>>>>>> develop
"dependencies": {
"get-intrinsic": "^1.1.3",
"has": "^1.0.3",
@@ -10956,12 +9354,6 @@
"version": "2.0.1"
},
"node_modules/es-shim-unscopables": {
-<<<<<<< HEAD
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
- "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
-=======
->>>>>>> develop
"dependencies": {
"has": "^1.0.3"
},
@@ -10971,12 +9363,6 @@
"version": "1.0.0"
},
"node_modules/es-to-primitive": {
-<<<<<<< HEAD
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
- "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-=======
->>>>>>> develop
"dependencies": {
"is-callable": "^1.1.4",
"is-date-object": "^1.0.1",
@@ -11048,13 +9434,7 @@
"version": "2.0.3"
},
"node_modules/escalade": {
-<<<<<<< HEAD
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
- "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=6"
},
@@ -11069,13 +9449,7 @@
"version": "1.0.3"
},
"node_modules/escape-string-regexp": {
-<<<<<<< HEAD
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
- "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=0.8.0"
},
@@ -11084,33 +9458,26 @@
"version": "1.0.5"
},
"node_modules/eslint": {
-<<<<<<< HEAD
- "version": "8.42.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.42.0.tgz",
- "integrity": "sha512-ulg9Ms6E1WPf67PHaEY4/6E2tEn5/f7FXGzr3t9cBMugOmf1INYvuUwwh1aXQN4MfJ6a5K2iNwP3w4AColvI9A==",
- "peer": true,
-=======
"bin": {
"eslint": "bin/eslint.js"
},
->>>>>>> develop
"dependencies": {
"@eslint-community/eslint-utils": "^4.2.0",
- "@eslint-community/regexpp": "^4.4.0",
- "@eslint/eslintrc": "^2.0.3",
- "@eslint/js": "8.42.0",
+ "@eslint-community/regexpp": "^4.6.1",
+ "@eslint/eslintrc": "^2.1.2",
+ "@eslint/js": "8.48.0",
"@humanwhocodes/config-array": "^0.11.10",
"@humanwhocodes/module-importer": "^1.0.1",
"@nodelib/fs.walk": "^1.2.8",
- "ajv": "^6.10.0",
+ "ajv": "^6.12.4",
"chalk": "^4.0.0",
"cross-spawn": "^7.0.2",
"debug": "^4.3.2",
"doctrine": "^3.0.0",
"escape-string-regexp": "^4.0.0",
- "eslint-scope": "^7.2.0",
- "eslint-visitor-keys": "^3.4.1",
- "espree": "^9.5.2",
+ "eslint-scope": "^7.2.2",
+ "eslint-visitor-keys": "^3.4.3",
+ "espree": "^9.6.1",
"esquery": "^1.4.2",
"esutils": "^2.0.2",
"fast-deep-equal": "^3.1.3",
@@ -11120,7 +9487,6 @@
"globals": "^13.19.0",
"graphemer": "^1.4.0",
"ignore": "^5.2.0",
- "import-fresh": "^3.0.0",
"imurmurhash": "^0.1.4",
"is-glob": "^4.0.0",
"is-path-inside": "^3.0.3",
@@ -11130,9 +9496,8 @@
"lodash.merge": "^4.6.2",
"minimatch": "^3.1.2",
"natural-compare": "^1.4.0",
- "optionator": "^0.9.1",
+ "optionator": "^0.9.3",
"strip-ansi": "^6.0.1",
- "strip-json-comments": "^3.1.0",
"text-table": "^0.2.0"
},
"dev": true,
@@ -11176,21 +9541,6 @@
"version": "7.0.1"
},
"node_modules/eslint-import-resolver-node": {
-<<<<<<< HEAD
- "version": "0.3.7",
- "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz",
- "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==",
- "dependencies": {
- "debug": "^3.2.7",
- "is-core-module": "^2.11.0",
- "resolve": "^1.22.1"
- }
- },
- "node_modules/eslint-import-resolver-node/node_modules/debug": {
- "version": "3.2.7",
- "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
- "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-=======
"dependencies": {
"debug": "^3.2.7",
"is-core-module": "^2.13.0",
@@ -11202,7 +9552,6 @@
"version": "0.3.9"
},
"node_modules/eslint-import-resolver-node/node_modules/debug": {
->>>>>>> develop
"dependencies": {
"ms": "^2.1.1"
},
@@ -11212,12 +9561,6 @@
"version": "3.2.7"
},
"node_modules/eslint-module-utils": {
-<<<<<<< HEAD
- "version": "2.8.0",
- "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz",
- "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==",
-=======
->>>>>>> develop
"dependencies": {
"debug": "^3.2.7"
},
@@ -11235,12 +9578,6 @@
"version": "2.8.0"
},
"node_modules/eslint-module-utils/node_modules/debug": {
-<<<<<<< HEAD
- "version": "3.2.7",
- "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
- "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-=======
->>>>>>> develop
"dependencies": {
"ms": "^2.1.1"
},
@@ -11250,12 +9587,6 @@
"version": "3.2.7"
},
"node_modules/eslint-plugin-flowtype": {
-<<<<<<< HEAD
- "version": "8.0.3",
- "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-8.0.3.tgz",
- "integrity": "sha512-dX8l6qUL6O+fYPtpNRideCFSpmWOUVx5QcaGLVqe/vlDiBSe4vYljDWDETwnyFzpl7By/WVIu6rcrniCgH9BqQ==",
-=======
->>>>>>> develop
"dependencies": {
"lodash": "^4.17.21",
"string-natural-compare": "^3.0.1"
@@ -11274,28 +9605,24 @@
"version": "8.0.3"
},
"node_modules/eslint-plugin-import": {
-<<<<<<< HEAD
- "version": "2.27.5",
- "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz",
- "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==",
-=======
->>>>>>> develop
"dependencies": {
"array-includes": "^3.1.6",
+ "array.prototype.findlastindex": "^1.2.2",
"array.prototype.flat": "^1.3.1",
"array.prototype.flatmap": "^1.3.1",
"debug": "^3.2.7",
"doctrine": "^2.1.0",
"eslint-import-resolver-node": "^0.3.7",
- "eslint-module-utils": "^2.7.4",
+ "eslint-module-utils": "^2.8.0",
"has": "^1.0.3",
- "is-core-module": "^2.11.0",
+ "is-core-module": "^2.13.0",
"is-glob": "^4.0.3",
"minimatch": "^3.1.2",
+ "object.fromentries": "^2.0.6",
+ "object.groupby": "^1.0.0",
"object.values": "^1.1.6",
- "resolve": "^1.22.1",
- "semver": "^6.3.0",
- "tsconfig-paths": "^3.14.1"
+ "semver": "^6.3.1",
+ "tsconfig-paths": "^3.14.2"
},
"dev": true,
"engines": {
@@ -11309,12 +9636,6 @@
"version": "2.28.1"
},
"node_modules/eslint-plugin-import/node_modules/debug": {
-<<<<<<< HEAD
- "version": "3.2.7",
- "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
- "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-=======
->>>>>>> develop
"dependencies": {
"ms": "^2.1.1"
},
@@ -11324,12 +9645,6 @@
"version": "3.2.7"
},
"node_modules/eslint-plugin-import/node_modules/doctrine": {
-<<<<<<< HEAD
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
- "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-=======
->>>>>>> develop
"dependencies": {
"esutils": "^2.0.2"
},
@@ -11366,12 +9681,6 @@
"version": "25.7.0"
},
"node_modules/eslint-plugin-jsx-a11y": {
-<<<<<<< HEAD
- "version": "6.7.1",
- "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.7.1.tgz",
- "integrity": "sha512-63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA==",
-=======
->>>>>>> develop
"dependencies": {
"@babel/runtime": "^7.20.7",
"aria-query": "^5.1.3",
@@ -11402,17 +9711,12 @@
"version": "6.7.1"
},
"node_modules/eslint-plugin-react": {
-<<<<<<< HEAD
- "version": "7.32.2",
- "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.2.tgz",
- "integrity": "sha512-t2fBMa+XzonrrNkyVirzKlvn5RXzzPwRHtMvLAtVZrt8oxgnTQaYbU6SXTOO1mwQgp1y5+toMSKInnzGr0Knqg==",
-=======
->>>>>>> develop
"dependencies": {
"array-includes": "^3.1.6",
"array.prototype.flatmap": "^1.3.1",
"array.prototype.tosorted": "^1.1.1",
"doctrine": "^2.1.0",
+ "es-iterator-helpers": "^1.0.12",
"estraverse": "^5.3.0",
"jsx-ast-utils": "^2.4.1 || ^3.0.0",
"minimatch": "^3.1.2",
@@ -11422,7 +9726,7 @@
"object.values": "^1.1.6",
"prop-types": "^15.8.1",
"resolve": "^2.0.0-next.4",
- "semver": "^6.3.0",
+ "semver": "^6.3.1",
"string.prototype.matchall": "^4.0.8"
},
"dev": true,
@@ -11437,13 +9741,7 @@
"version": "7.33.2"
},
"node_modules/eslint-plugin-react-hooks": {
-<<<<<<< HEAD
- "version": "4.6.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz",
- "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=10"
},
@@ -11455,12 +9753,6 @@
"version": "4.6.0"
},
"node_modules/eslint-plugin-react/node_modules/doctrine": {
-<<<<<<< HEAD
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
- "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-=======
->>>>>>> develop
"dependencies": {
"esutils": "^2.0.2"
},
@@ -11473,15 +9765,9 @@
"version": "2.1.0"
},
"node_modules/eslint-plugin-react/node_modules/resolve": {
-<<<<<<< HEAD
- "version": "2.0.0-next.4",
- "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz",
- "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==",
-=======
"bin": {
"resolve": "bin/resolve"
},
->>>>>>> develop
"dependencies": {
"is-core-module": "^2.9.0",
"path-parse": "^1.0.7",
@@ -11496,13 +9782,6 @@
"version": "2.0.0-next.4"
},
"node_modules/eslint-plugin-testing-library": {
-<<<<<<< HEAD
- "version": "5.11.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.11.0.tgz",
- "integrity": "sha512-ELY7Gefo+61OfXKlQeXNIDVVLPcvKTeiQOoMZG9TeuWa7Ln4dUNRv8JdRWBQI9Mbb427XGlVB1aa1QPZxBJM8Q==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@typescript-eslint/utils": "^5.58.0"
},
@@ -11519,12 +9798,6 @@
"version": "5.11.1"
},
"node_modules/eslint-scope": {
-<<<<<<< HEAD
- "version": "5.1.1",
- "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
- "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-=======
->>>>>>> develop
"dependencies": {
"esrecurse": "^4.3.0",
"estraverse": "^4.1.1"
@@ -11538,13 +9811,7 @@
"version": "5.1.1"
},
"node_modules/eslint-scope/node_modules/estraverse": {
-<<<<<<< HEAD
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
- "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=4.0"
},
@@ -11577,13 +9844,7 @@
"version": "1.3.0"
},
"node_modules/eslint-visitor-keys": {
-<<<<<<< HEAD
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
- "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=10"
},
@@ -11655,13 +9916,6 @@
"version": "8.1.1"
},
"node_modules/eslint/node_modules/ansi-styles": {
-<<<<<<< HEAD
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
- "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
- "peer": true,
-=======
->>>>>>> develop
"dependencies": {
"color-convert": "^2.0.1"
},
@@ -11678,13 +9932,6 @@
"version": "4.3.0"
},
"node_modules/eslint/node_modules/chalk": {
-<<<<<<< HEAD
- "version": "4.1.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
- "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
- "peer": true,
-=======
->>>>>>> develop
"dependencies": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
@@ -11702,13 +9949,6 @@
"version": "4.1.2"
},
"node_modules/eslint/node_modules/color-convert": {
-<<<<<<< HEAD
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
- "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
- "peer": true,
-=======
->>>>>>> develop
"dependencies": {
"color-name": "~1.1.4"
},
@@ -11722,18 +9962,6 @@
"version": "2.0.1"
},
"node_modules/eslint/node_modules/color-name": {
-<<<<<<< HEAD
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
- "peer": true
- },
- "node_modules/eslint/node_modules/escape-string-regexp": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
- "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
- "peer": true,
-=======
"dev": true,
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
"peer": true,
@@ -11742,7 +9970,6 @@
},
"node_modules/eslint/node_modules/escape-string-regexp": {
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=10"
},
@@ -11755,13 +9982,6 @@
"version": "4.0.0"
},
"node_modules/eslint/node_modules/eslint-scope": {
-<<<<<<< HEAD
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz",
- "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==",
- "peer": true,
-=======
->>>>>>> develop
"dependencies": {
"esrecurse": "^4.3.0",
"estraverse": "^5.2.0"
@@ -11779,14 +9999,7 @@
"version": "7.2.2"
},
"node_modules/eslint/node_modules/eslint-visitor-keys": {
-<<<<<<< HEAD
- "version": "3.4.1",
- "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
- "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
- "peer": true,
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
},
@@ -11799,13 +10012,6 @@
"version": "3.4.3"
},
"node_modules/eslint/node_modules/globals": {
-<<<<<<< HEAD
- "version": "13.20.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
- "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
- "peer": true,
-=======
->>>>>>> develop
"dependencies": {
"type-fest": "^0.20.2"
},
@@ -11822,14 +10028,7 @@
"version": "13.21.0"
},
"node_modules/eslint/node_modules/has-flag": {
-<<<<<<< HEAD
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
- "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
- "peer": true,
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=8"
},
@@ -11839,13 +10038,6 @@
"version": "4.0.0"
},
"node_modules/eslint/node_modules/supports-color": {
-<<<<<<< HEAD
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
- "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
- "peer": true,
-=======
->>>>>>> develop
"dependencies": {
"has-flag": "^4.0.0"
},
@@ -11859,15 +10051,8 @@
"version": "7.2.0"
},
"node_modules/espree": {
-<<<<<<< HEAD
- "version": "9.5.2",
- "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.2.tgz",
- "integrity": "sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==",
- "peer": true,
-=======
->>>>>>> develop
"dependencies": {
- "acorn": "^8.8.0",
+ "acorn": "^8.9.0",
"acorn-jsx": "^5.3.2",
"eslint-visitor-keys": "^3.4.1"
},
@@ -11884,14 +10069,7 @@
"version": "9.6.1"
},
"node_modules/espree/node_modules/eslint-visitor-keys": {
-<<<<<<< HEAD
- "version": "3.4.1",
- "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
- "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
- "peer": true,
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
},
@@ -11916,12 +10094,6 @@
"version": "4.0.1"
},
"node_modules/esquery": {
-<<<<<<< HEAD
- "version": "1.5.0",
- "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
- "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
-=======
->>>>>>> develop
"dependencies": {
"estraverse": "^5.1.0"
},
@@ -11934,27 +10106,10 @@
"version": "1.5.0"
},
"node_modules/esrecurse": {
-<<<<<<< HEAD
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
- "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
- "dependencies": {
- "estraverse": "^5.2.0"
- },
- "engines": {
- "node": ">=4.0"
- }
- },
- "node_modules/estraverse": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
- "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-=======
"dependencies": {
"estraverse": "^5.2.0"
},
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=4.0"
},
@@ -12184,16 +10339,6 @@
"version": "0.0.33"
},
"node_modules/fast-deep-equal": {
-<<<<<<< HEAD
- "version": "3.1.3",
- "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
- "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
- },
- "node_modules/fast-glob": {
- "version": "3.2.12",
- "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
- "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
-=======
"dev": true,
"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -12206,7 +10351,6 @@
"version": "1.3.2"
},
"node_modules/fast-glob": {
->>>>>>> develop
"dependencies": {
"@nodelib/fs.stat": "^2.0.2",
"@nodelib/fs.walk": "^1.2.3",
@@ -12223,12 +10367,6 @@
"version": "3.3.1"
},
"node_modules/fast-glob/node_modules/glob-parent": {
-<<<<<<< HEAD
- "version": "5.1.2",
- "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
- "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-=======
->>>>>>> develop
"dependencies": {
"is-glob": "^4.0.1"
},
@@ -12247,16 +10385,6 @@
"version": "3.1.1"
},
"node_modules/fast-json-stable-stringify": {
-<<<<<<< HEAD
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
- "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
- },
- "node_modules/fast-levenshtein": {
- "version": "2.0.6",
- "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
- "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
-=======
"dev": true,
"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@@ -12267,7 +10395,6 @@
"integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
"version": "2.0.6"
->>>>>>> develop
},
"node_modules/fastest-levenshtein": {
"dev": true,
@@ -12279,12 +10406,6 @@
"version": "1.0.16"
},
"node_modules/fastq": {
-<<<<<<< HEAD
- "version": "1.15.0",
- "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
- "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
-=======
->>>>>>> develop
"dependencies": {
"reusify": "^1.0.4"
},
@@ -12352,12 +10473,6 @@
"version": "3.2.0"
},
"node_modules/file-entry-cache": {
-<<<<<<< HEAD
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
- "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-=======
->>>>>>> develop
"dependencies": {
"flat-cache": "^3.0.4"
},
@@ -12442,12 +10557,6 @@
"version": "8.0.7"
},
"node_modules/fill-range": {
-<<<<<<< HEAD
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
- "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-=======
->>>>>>> develop
"dependencies": {
"to-regex-range": "^5.0.1"
},
@@ -12519,12 +10628,6 @@
"version": "3.3.2"
},
"node_modules/find-up": {
-<<<<<<< HEAD
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
- "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-=======
->>>>>>> develop
"dependencies": {
"locate-path": "^6.0.0",
"path-exists": "^4.0.0"
@@ -12550,27 +10653,13 @@
"version": "2.0.0"
},
"node_modules/flat-cache": {
-<<<<<<< HEAD
- "version": "3.0.4",
- "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
- "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-=======
->>>>>>> develop
- "dependencies": {
- "flatted": "^3.1.0",
+ "dependencies": {
+ "flatted": "^3.2.7",
+ "keyv": "^4.5.3",
"rimraf": "^3.0.2"
},
"dev": true,
"engines": {
-<<<<<<< HEAD
- "node": "^10.12.0 || >=12.0.0"
- }
- },
- "node_modules/flatted": {
- "version": "3.2.7",
- "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
- "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="
-=======
"node": ">=12.0.0"
},
"integrity": "sha512-OHx4Qwrrt0E4jEIcI5/Xb+f+QmJYNj2rrK8wiIdQOIrB9WrrJL8cjZvXdXuBTkkEwEqLycb5BeZDV1o2i9bTew==",
@@ -12582,7 +10671,6 @@
"integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
"version": "3.2.7"
->>>>>>> develop
},
"node_modules/follow-redirects": {
"dev": true,
@@ -12605,12 +10693,6 @@
"version": "1.15.2"
},
"node_modules/for-each": {
-<<<<<<< HEAD
- "version": "0.3.3",
- "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
- "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
-=======
->>>>>>> develop
"dependencies": {
"is-callable": "^1.1.3"
},
@@ -12778,16 +10860,6 @@
"version": "2.7.0"
},
"node_modules/fork-ts-checker-webpack-plugin/node_modules/semver": {
-<<<<<<< HEAD
- "version": "7.5.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz",
- "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==",
- "dev": true,
- "dependencies": {
- "lru-cache": "^6.0.0"
- },
-=======
->>>>>>> develop
"bin": {
"semver": "bin/semver.js"
},
@@ -12881,12 +10953,6 @@
"version": "0.2.0"
},
"node_modules/fraction.js": {
-<<<<<<< HEAD
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
- "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",
-=======
->>>>>>> develop
"dev": true,
"engines": {
"node": "*"
@@ -12946,12 +11012,6 @@
"version": "1.0.0"
},
"node_modules/fsevents": {
-<<<<<<< HEAD
- "version": "2.3.2",
- "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
- "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-=======
->>>>>>> develop
"dev": true,
"engines": {
"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
@@ -12966,28 +11026,17 @@
"version": "2.3.3"
},
"node_modules/function-bind": {
-<<<<<<< HEAD
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
- "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
- },
- "node_modules/function.prototype.name": {
- "version": "1.1.5",
- "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
- "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
-=======
"dev": true,
"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
"version": "1.1.1"
},
"node_modules/function.prototype.name": {
->>>>>>> develop
"dependencies": {
"call-bind": "^1.0.2",
- "define-properties": "^1.1.3",
- "es-abstract": "^1.19.0",
- "functions-have-names": "^1.2.2"
+ "define-properties": "^1.2.0",
+ "es-abstract": "^1.22.1",
+ "functions-have-names": "^1.2.3"
},
"dev": true,
"engines": {
@@ -13007,13 +11056,7 @@
"version": "1.0.1"
},
"node_modules/functions-have-names": {
-<<<<<<< HEAD
- "version": "1.2.3",
- "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
- "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
-=======
"dev": true,
->>>>>>> develop
"funding": {
"url": "https://github.com/sponsors/ljharb"
},
@@ -13022,17 +11065,9 @@
"version": "1.2.3"
},
"node_modules/gatsby": {
-<<<<<<< HEAD
- "version": "5.10.0",
- "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-5.10.0.tgz",
- "integrity": "sha512-/CsCBskAzrit4olmzzN58v6ayvUYUwVRwQVxkHTDb8b9bGRy0VBG9Ntsq/IvGtEYRvYd6VrWpj/U0Xfcf+pnDg==",
- "dev": true,
- "hasInstallScript": true,
-=======
"bin": {
"gatsby": "cli.js"
},
->>>>>>> develop
"dependencies": {
"@babel/code-frame": "^7.18.6",
"@babel/core": "^7.20.12",
@@ -13058,8 +11093,8 @@
"@parcel/core": "2.8.3",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",
"@types/http-proxy": "^1.17.11",
- "@typescript-eslint/eslint-plugin": "^5.57.0",
- "@typescript-eslint/parser": "^5.57.0",
+ "@typescript-eslint/eslint-plugin": "^5.60.1",
+ "@typescript-eslint/parser": "^5.60.1",
"@vercel/webpack-asset-relocator-loader": "^1.7.3",
"acorn-loose": "^8.3.0",
"acorn-walk": "^8.2.0",
@@ -13072,18 +11107,19 @@
"babel-plugin-add-module-exports": "^1.0.4",
"babel-plugin-dynamic-import-node": "^2.3.3",
"babel-plugin-lodash": "^3.3.4",
- "babel-plugin-remove-graphql-queries": "^5.10.0",
- "babel-preset-gatsby": "^3.10.0",
+ "babel-plugin-remove-graphql-queries": "^5.12.0",
+ "babel-preset-gatsby": "^3.12.0",
"better-opn": "^2.1.1",
"bluebird": "^3.7.2",
- "browserslist": "^4.21.5",
+ "body-parser": "1.20.1",
+ "browserslist": "^4.21.9",
"cache-manager": "^2.11.1",
"chalk": "^4.1.2",
"chokidar": "^3.5.3",
"common-tags": "^1.8.2",
"compression": "^1.7.4",
"cookie": "^0.5.0",
- "core-js": "^3.30.1",
+ "core-js": "^3.31.0",
"cors": "^2.8.5",
"css-loader": "^5.2.7",
"css-minimizer-webpack-plugin": "^2.0.0",
@@ -13094,7 +11130,7 @@
"detect-port": "^1.5.1",
"devcert": "^1.2.2",
"dotenv": "^8.6.0",
- "enhanced-resolve": "^5.13.0",
+ "enhanced-resolve": "^5.15.0",
"error-stack-parser": "^2.1.4",
"eslint": "^7.32.0",
"eslint-config-react-app": "^6.0.0",
@@ -13114,26 +11150,26 @@
"find-cache-dir": "^3.3.2",
"fs-exists-cached": "1.0.0",
"fs-extra": "^11.1.1",
- "gatsby-cli": "^5.10.0",
- "gatsby-core-utils": "^4.10.0",
- "gatsby-graphiql-explorer": "^3.10.0",
- "gatsby-legacy-polyfills": "^3.10.0",
- "gatsby-link": "^5.10.0",
- "gatsby-page-utils": "^3.10.0",
- "gatsby-parcel-config": "1.10.0",
- "gatsby-plugin-page-creator": "^5.10.0",
- "gatsby-plugin-typescript": "^5.10.0",
- "gatsby-plugin-utils": "^4.10.0",
- "gatsby-react-router-scroll": "^6.10.0",
- "gatsby-script": "^2.10.0",
- "gatsby-telemetry": "^4.10.0",
- "gatsby-worker": "^2.10.0",
+ "gatsby-cli": "^5.12.0",
+ "gatsby-core-utils": "^4.12.0",
+ "gatsby-graphiql-explorer": "^3.12.0",
+ "gatsby-legacy-polyfills": "^3.12.0",
+ "gatsby-link": "^5.12.0",
+ "gatsby-page-utils": "^3.12.0",
+ "gatsby-parcel-config": "1.12.0",
+ "gatsby-plugin-page-creator": "^5.12.0",
+ "gatsby-plugin-typescript": "^5.12.0",
+ "gatsby-plugin-utils": "^4.12.0",
+ "gatsby-react-router-scroll": "^6.12.0",
+ "gatsby-script": "^2.12.0",
+ "gatsby-telemetry": "^4.12.0",
+ "gatsby-worker": "^2.12.0",
"glob": "^7.2.3",
"globby": "^11.1.0",
"got": "^11.8.6",
- "graphql": "^16.6.0",
+ "graphql": "^16.7.1",
"graphql-compose": "^9.0.10",
- "graphql-http": "^1.18.0",
+ "graphql-http": "^1.19.0",
"graphql-tag": "^2.12.6",
"hasha": "^5.2.2",
"invariant": "^2.2.4",
@@ -13142,6 +11178,7 @@
"joi": "^17.9.2",
"json-loader": "^0.5.7",
"latest-version": "^7.0.0",
+ "linkfs": "^2.1.0",
"lmdb": "2.5.3",
"lodash": "^4.17.21",
"meant": "^1.0.3",
@@ -13152,7 +11189,7 @@
"mitt": "^1.2.0",
"moment": "^2.29.4",
"multer": "^1.4.5-lts.1",
- "node-fetch": "^2.6.9",
+ "node-fetch": "^2.6.11",
"node-html-parser": "^5.4.2",
"normalize-path": "^3.0.0",
"null-loader": "^4.0.1",
@@ -13161,7 +11198,7 @@
"parseurl": "^1.3.3",
"physical-cpu-count": "^2.0.0",
"platform": "^1.3.6",
- "postcss": "^8.4.23",
+ "postcss": "^8.4.24",
"postcss-flexbugs-fixes": "^5.0.2",
"postcss-loader": "^5.3.0",
"prompts": "^2.4.2",
@@ -13174,28 +11211,29 @@
"redux": "4.2.1",
"redux-thunk": "^2.4.2",
"resolve-from": "^5.0.0",
- "semver": "^7.5.0",
+ "semver": "^7.5.3",
"shallow-compare": "^1.2.2",
"signal-exit": "^3.0.7",
"slugify": "^1.6.6",
- "socket.io": "4.6.1",
- "socket.io-client": "4.6.1",
+ "socket.io": "4.7.1",
+ "socket.io-client": "4.7.1",
"stack-trace": "^0.0.10",
"string-similarity": "^1.2.2",
"strip-ansi": "^6.0.1",
"style-loader": "^2.0.0",
- "terser-webpack-plugin": "^5.3.7",
+ "style-to-object": "^0.4.1",
+ "terser-webpack-plugin": "^5.3.9",
"tmp": "^0.2.1",
"true-case-path": "^2.2.1",
"type-of": "^2.0.1",
"url-loader": "^4.1.1",
"uuid": "^8.3.2",
- "webpack": "^5.81.0",
+ "webpack": "^5.88.1",
"webpack-dev-middleware": "^4.3.0",
- "webpack-merge": "^5.8.0",
- "webpack-stats-plugin": "^1.1.1",
+ "webpack-merge": "^5.9.0",
+ "webpack-stats-plugin": "^1.1.3",
"webpack-virtual-modules": "^0.5.0",
- "xstate": "^4.37.2",
+ "xstate": "^4.38.0",
"yaml-loader": "^0.8.0"
},
"dev": true,
@@ -13205,7 +11243,7 @@
"hasInstallScript": true,
"integrity": "sha512-+qO2gKA95HH+b4RCf3AYHOW3Pz8YC1t3W9MOwbUQe7QgDXd0D9lRc7YAqk8XuXp8Pkp/NWuoeZY3d/1B8d8nng==",
"optionalDependencies": {
- "gatsby-sharp": "^1.10.0"
+ "gatsby-sharp": "^1.12.0"
},
"peerDependencies": {
"react": "^18.0.0 || ^0.0.0",
@@ -13215,17 +11253,9 @@
"version": "5.12.3"
},
"node_modules/gatsby-cli": {
-<<<<<<< HEAD
- "version": "5.10.0",
- "resolved": "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-5.10.0.tgz",
- "integrity": "sha512-k8Z5l+2pAzf09/w1YgODAExjJKnZCd8WON6pxsHV1nht9I+zXE3sqB5FbsitckufaHhoOer6ezsQjxLVAe4+mA==",
- "dev": true,
- "hasInstallScript": true,
-=======
"bin": {
"gatsby": "cli.js"
},
->>>>>>> develop
"dependencies": {
"@babel/code-frame": "^7.18.6",
"@babel/core": "^7.20.12",
@@ -13243,25 +11273,25 @@
"clipboardy": "^2.3.0",
"common-tags": "^1.8.2",
"convert-hrtime": "^3.0.0",
- "create-gatsby": "^3.10.0",
- "envinfo": "^7.8.1",
+ "create-gatsby": "^3.12.0",
+ "envinfo": "^7.10.0",
"execa": "^5.1.1",
"fs-exists-cached": "^1.0.0",
"fs-extra": "^11.1.1",
- "gatsby-core-utils": "^4.10.0",
- "gatsby-telemetry": "^4.10.0",
+ "gatsby-core-utils": "^4.12.0",
+ "gatsby-telemetry": "^4.12.0",
"hosted-git-info": "^3.0.8",
"is-valid-path": "^0.1.1",
"joi": "^17.9.2",
"lodash": "^4.17.21",
- "node-fetch": "^2.6.9",
+ "node-fetch": "^2.6.11",
"opentracing": "^0.14.7",
"pretty-error": "^2.1.2",
"progress": "^2.0.3",
"prompts": "^2.4.2",
"redux": "4.2.1",
"resolve-cwd": "^3.0.0",
- "semver": "^7.5.0",
+ "semver": "^7.5.3",
"signal-exit": "^3.0.7",
"stack-trace": "^0.0.10",
"strip-ansi": "^6.0.1",
@@ -13363,16 +11393,6 @@
"version": "6.0.0"
},
"node_modules/gatsby-cli/node_modules/semver": {
-<<<<<<< HEAD
- "version": "7.5.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz",
- "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==",
- "dev": true,
- "dependencies": {
- "lru-cache": "^6.0.0"
- },
-=======
->>>>>>> develop
"bin": {
"semver": "bin/semver.js"
},
@@ -13406,13 +11426,6 @@
"version": "4.0.0"
},
"node_modules/gatsby-core-utils": {
-<<<<<<< HEAD
- "version": "4.10.0",
- "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-4.10.0.tgz",
- "integrity": "sha512-7wNANRPzxyTsZMnZFyCq1f2D0T6299l1qUew8q8Ax2QJM0kzFY/4uuJaV/fnrC0RdjWnkwGIAiZ1ZnGK4E8HSA==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/runtime": "^7.20.13",
"ci-info": "2.0.0",
@@ -13440,12 +11453,6 @@
"version": "4.12.0"
},
"node_modules/gatsby-graphiql-explorer": {
-<<<<<<< HEAD
- "version": "3.10.0",
- "resolved": "https://registry.npmjs.org/gatsby-graphiql-explorer/-/gatsby-graphiql-explorer-3.10.0.tgz",
- "integrity": "sha512-KUYzObIk+W0zRlyVjOWdNLTTL4KyozygT54TOhbBMq4LgUf0mFtnA50UzwV/SqfjksUwE9Xtv7278K1z1Hjuiw==",
-=======
->>>>>>> develop
"dev": true,
"engines": {
"node": ">=18.0.0"
@@ -13455,22 +11462,6 @@
"version": "3.12.0"
},
"node_modules/gatsby-legacy-polyfills": {
-<<<<<<< HEAD
- "version": "3.10.0",
- "resolved": "https://registry.npmjs.org/gatsby-legacy-polyfills/-/gatsby-legacy-polyfills-3.10.0.tgz",
- "integrity": "sha512-b1uNl/Fdfry+7cHjRNa9mtQcmN6xQgqgAOf5F9Z1rJ9vKCylNny4Fs1qkmI8H6UiZYyI33lZq+G1C0SYbhwgxA==",
- "dev": true,
- "dependencies": {
- "@babel/runtime": "^7.20.13",
- "core-js-compat": "3.30.1"
- }
- },
- "node_modules/gatsby-legacy-polyfills/node_modules/core-js-compat": {
- "version": "3.30.1",
- "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.30.1.tgz",
- "integrity": "sha512-d690npR7MC6P0gq4npTl5n2VQeNAmUrJ90n+MHiKS7W2+xno4o3F5GDEuylSdi6EJ3VssibSGXOa1r3YXD3Mhw==",
- "dev": true,
-=======
"dependencies": {
"@babel/runtime": "^7.20.13",
"core-js-compat": "3.31.0"
@@ -13481,7 +11472,6 @@
"version": "3.12.0"
},
"node_modules/gatsby-legacy-polyfills/node_modules/core-js-compat": {
->>>>>>> develop
"dependencies": {
"browserslist": "^4.21.5"
},
@@ -13495,16 +11485,9 @@
"version": "3.31.0"
},
"node_modules/gatsby-link": {
-<<<<<<< HEAD
- "version": "5.10.0",
- "resolved": "https://registry.npmjs.org/gatsby-link/-/gatsby-link-5.10.0.tgz",
- "integrity": "sha512-bcPFOcBQNJuSPRyqYE7ELBB4FEmQ7x/xWATzzs2ZCRMzp+SO13iZb5Vi+i0Obdu/YLJZhJ0f+pOIjlio4XNEZA==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@types/reach__router": "^1.3.10",
- "gatsby-page-utils": "^3.10.0",
+ "gatsby-page-utils": "^3.12.0",
"prop-types": "^15.8.1"
},
"dev": true,
@@ -13521,19 +11504,12 @@
"version": "5.12.0"
},
"node_modules/gatsby-page-utils": {
-<<<<<<< HEAD
- "version": "3.10.0",
- "resolved": "https://registry.npmjs.org/gatsby-page-utils/-/gatsby-page-utils-3.10.0.tgz",
- "integrity": "sha512-tpbcPhpi1CNQVc/dZiroktSY3wGk0iQ57HpSGL6Xo92XOLtjNXl0ipkYQhz0ecWABDcsKKn7H+E+GBbi9XHYqw==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/runtime": "^7.20.13",
"bluebird": "^3.7.2",
"chokidar": "^3.5.3",
"fs-exists-cached": "^1.0.0",
- "gatsby-core-utils": "^4.10.0",
+ "gatsby-core-utils": "^4.12.0",
"glob": "^7.2.3",
"lodash": "^4.17.21",
"micromatch": "^4.0.5"
@@ -13547,15 +11523,8 @@
"version": "3.12.0"
},
"node_modules/gatsby-parcel-config": {
-<<<<<<< HEAD
- "version": "1.10.0",
- "resolved": "https://registry.npmjs.org/gatsby-parcel-config/-/gatsby-parcel-config-1.10.0.tgz",
- "integrity": "sha512-F1ESLH7/RxdPsCHnpbB2tZ78+NDvUoawHi/3+QHLSt8p9PrejY9qFKV9vKBS9S4qI1k713enFF54zJo1O80aeQ==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
- "@gatsbyjs/parcel-namer-relative-to-cwd": "^2.10.0",
+ "@gatsbyjs/parcel-namer-relative-to-cwd": "^2.12.0",
"@parcel/bundler-default": "2.8.3",
"@parcel/compressor-raw": "2.8.3",
"@parcel/namer-default": "2.8.3",
@@ -13580,18 +11549,11 @@
"version": "1.12.0"
},
"node_modules/gatsby-plugin-manifest": {
-<<<<<<< HEAD
- "version": "5.10.0",
- "resolved": "https://registry.npmjs.org/gatsby-plugin-manifest/-/gatsby-plugin-manifest-5.10.0.tgz",
- "integrity": "sha512-y3TUARyNaK29oD/8ZJOVvLVRvSvfKNjLHmNc0D6KPJRQld7T+ZKCZh4ylwN+Hor8vHnXKHyVoBZd+BIEjTBVAg==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/runtime": "^7.20.13",
- "gatsby-core-utils": "^4.10.0",
- "gatsby-plugin-utils": "^4.10.0",
- "semver": "^7.5.0",
+ "gatsby-core-utils": "^4.12.0",
+ "gatsby-plugin-utils": "^4.12.0",
+ "semver": "^7.5.3",
"sharp": "^0.32.1"
},
"dev": true,
@@ -13618,16 +11580,6 @@
"version": "6.0.0"
},
"node_modules/gatsby-plugin-manifest/node_modules/semver": {
-<<<<<<< HEAD
- "version": "7.5.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz",
- "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==",
- "dev": true,
- "dependencies": {
- "lru-cache": "^6.0.0"
- },
-=======
->>>>>>> develop
"bin": {
"semver": "bin/semver.js"
},
@@ -13693,13 +11645,6 @@
"version": "0.1.2"
},
"node_modules/gatsby-plugin-page-creator": {
-<<<<<<< HEAD
- "version": "5.10.0",
- "resolved": "https://registry.npmjs.org/gatsby-plugin-page-creator/-/gatsby-plugin-page-creator-5.10.0.tgz",
- "integrity": "sha512-Vji1iC9CabZExrJZkWvDNPbqJ8nwLJ1kE1u04HN+IopA+hheJ8natBucNf8Xol/40R/xk62peJXlkuV/s5jM1g==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/runtime": "^7.20.13",
"@babel/traverse": "^7.20.13",
@@ -13707,10 +11652,10 @@
"chokidar": "^3.5.3",
"fs-exists-cached": "^1.0.0",
"fs-extra": "^11.1.1",
- "gatsby-core-utils": "^4.10.0",
- "gatsby-page-utils": "^3.10.0",
- "gatsby-plugin-utils": "^4.10.0",
- "gatsby-telemetry": "^4.10.0",
+ "gatsby-core-utils": "^4.12.0",
+ "gatsby-page-utils": "^3.12.0",
+ "gatsby-plugin-utils": "^4.12.0",
+ "gatsby-telemetry": "^4.12.0",
"globby": "^11.1.0",
"lodash": "^4.17.21"
},
@@ -13726,13 +11671,6 @@
"version": "5.12.0"
},
"node_modules/gatsby-plugin-react-helmet": {
-<<<<<<< HEAD
- "version": "6.10.0",
- "resolved": "https://registry.npmjs.org/gatsby-plugin-react-helmet/-/gatsby-plugin-react-helmet-6.10.0.tgz",
- "integrity": "sha512-js/XJdx1wGA6ht306PXV5mhk+traQ7rOcoLBzcHAiIC6nS+7M4AuFDu+Sb4fLXd8S666UBoCA+b0P5CSP27ntQ==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/runtime": "^7.20.13"
},
@@ -13749,13 +11687,6 @@
"version": "6.12.0"
},
"node_modules/gatsby-plugin-sass": {
-<<<<<<< HEAD
- "version": "6.10.0",
- "resolved": "https://registry.npmjs.org/gatsby-plugin-sass/-/gatsby-plugin-sass-6.10.0.tgz",
- "integrity": "sha512-DRGG4AaDYcH07/UL75ciF1cm+wyihOMWWUBhY3lFCEJsS52r/j5GbWBlJgmSh7mDu5tNu5kbmlcZUVoe3S6pRQ==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/runtime": "^7.20.13",
"resolve-url-loader": "^3.1.5",
@@ -13774,13 +11705,6 @@
"version": "6.12.0"
},
"node_modules/gatsby-plugin-sharp": {
-<<<<<<< HEAD
- "version": "5.10.0",
- "resolved": "https://registry.npmjs.org/gatsby-plugin-sharp/-/gatsby-plugin-sharp-5.10.0.tgz",
- "integrity": "sha512-hG95JQrpByH8w7Ey25zlFsvgyi99NFmk1+0hmKjMkfh43BxNsTuvhcB2kcbcO2FaZdO9OK89pilRGbLaeA0gew==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/runtime": "^7.20.13",
"async": "^3.2.4",
@@ -13788,11 +11712,11 @@
"debug": "^4.3.4",
"filenamify": "^4.3.0",
"fs-extra": "^11.1.1",
- "gatsby-core-utils": "^4.10.0",
- "gatsby-plugin-utils": "^4.10.0",
+ "gatsby-core-utils": "^4.12.0",
+ "gatsby-plugin-utils": "^4.12.0",
"lodash": "^4.17.21",
"probe-image-size": "^7.2.3",
- "semver": "^7.5.0",
+ "semver": "^7.5.3",
"sharp": "^0.32.1"
},
"dev": true,
@@ -13819,16 +11743,6 @@
"version": "6.0.0"
},
"node_modules/gatsby-plugin-sharp/node_modules/semver": {
-<<<<<<< HEAD
- "version": "7.5.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz",
- "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==",
- "dev": true,
- "dependencies": {
- "lru-cache": "^6.0.0"
- },
-=======
->>>>>>> develop
"bin": {
"semver": "bin/semver.js"
},
@@ -13850,13 +11764,6 @@
"version": "4.0.0"
},
"node_modules/gatsby-plugin-typescript": {
-<<<<<<< HEAD
- "version": "5.10.0",
- "resolved": "https://registry.npmjs.org/gatsby-plugin-typescript/-/gatsby-plugin-typescript-5.10.0.tgz",
- "integrity": "sha512-e/jkoRHUxHlswOWTJBwkQCI9iBh8JcRq9YZaibfWwY9cZBEtBHjMDiic8zhQvyObnUKhke5IYDqLLCignrvC7A==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/core": "^7.20.12",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
@@ -13864,7 +11771,7 @@
"@babel/plugin-proposal-optional-chaining": "^7.20.7",
"@babel/preset-typescript": "^7.18.6",
"@babel/runtime": "^7.20.13",
- "babel-plugin-remove-graphql-queries": "^5.10.0"
+ "babel-plugin-remove-graphql-queries": "^5.12.0"
},
"dev": true,
"engines": {
@@ -13878,19 +11785,12 @@
"version": "5.12.0"
},
"node_modules/gatsby-plugin-utils": {
-<<<<<<< HEAD
- "version": "4.10.0",
- "resolved": "https://registry.npmjs.org/gatsby-plugin-utils/-/gatsby-plugin-utils-4.10.0.tgz",
- "integrity": "sha512-+hQ4wVvdai8cNI+Mg0CoJbZGJVXAda7hPEekiI9oTSbqGxtTkIw0L3s4EADUEJ5jTuuJhNQzuuueOBkwJVioIw==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/runtime": "^7.20.13",
"fastq": "^1.15.0",
"fs-extra": "^11.1.1",
- "gatsby-core-utils": "^4.10.0",
- "gatsby-sharp": "^1.10.0",
+ "gatsby-core-utils": "^4.12.0",
+ "gatsby-sharp": "^1.12.0",
"graphql-compose": "^9.0.10",
"import-from": "^4.0.0",
"joi": "^17.9.2",
@@ -13909,13 +11809,6 @@
"version": "4.12.0"
},
"node_modules/gatsby-react-router-scroll": {
-<<<<<<< HEAD
- "version": "6.10.0",
- "resolved": "https://registry.npmjs.org/gatsby-react-router-scroll/-/gatsby-react-router-scroll-6.10.0.tgz",
- "integrity": "sha512-jiI8Q2VDa2rAyK+NCuzCX23tYuCc6Me1kNOSMLDT6pto6x2+P/arnbNq+SL1G1u8u5bnijEwNm5fD/ivd6sqtg==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/runtime": "^7.20.13",
"prop-types": "^15.8.1"
@@ -13934,13 +11827,6 @@
"version": "6.12.0"
},
"node_modules/gatsby-remark-autolink-headers": {
-<<<<<<< HEAD
- "version": "6.10.0",
- "resolved": "https://registry.npmjs.org/gatsby-remark-autolink-headers/-/gatsby-remark-autolink-headers-6.10.0.tgz",
- "integrity": "sha512-ZxGbOEBAVtdhlJChgmzFsHthdNt5G3sGaFQxW7/YcbzR5L5+NTtOzZmUXNM61hBUjcG1v4z5ABfcPkgq383oNg==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/runtime": "^7.20.13",
"github-slugger": "^1.5.0",
@@ -13962,18 +11848,11 @@
"version": "6.12.0"
},
"node_modules/gatsby-remark-images": {
-<<<<<<< HEAD
- "version": "7.10.0",
- "resolved": "https://registry.npmjs.org/gatsby-remark-images/-/gatsby-remark-images-7.10.0.tgz",
- "integrity": "sha512-Oh2cTlsGn0gDZug8wuW+eiQn3EU0476B/U8ieyE6eiLy0kTybpUbF9Ic8InnIFJfDOB+hCX5Ve9Ao8nj+PnytQ==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/runtime": "^7.20.13",
"chalk": "^4.1.2",
"cheerio": "^1.0.0-rc.10",
- "gatsby-core-utils": "^4.10.0",
+ "gatsby-core-utils": "^4.12.0",
"is-relative-url": "^3.0.0",
"lodash": "^4.17.21",
"mdast-util-definitions": "^4.0.0",
@@ -14064,33 +11943,11 @@
"version": "7.2.0"
},
"node_modules/gatsby-remark-prismjs": {
-<<<<<<< HEAD
- "version": "7.10.0",
- "resolved": "https://registry.npmjs.org/gatsby-remark-prismjs/-/gatsby-remark-prismjs-7.10.0.tgz",
- "integrity": "sha512-J9a52Cbl+GrX4l2XHiO8OnBIJvs0FEtKhXlfzyKH5MipREkGFbq6ppm0YAXr2i2LSVvT71sXAJpKThStsq0Efw==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/runtime": "^7.20.13",
"parse-numeric-range": "^1.3.0",
"unist-util-visit": "^2.0.3"
},
-<<<<<<< HEAD
- "engines": {
- "node": ">=18.0.0"
- },
- "peerDependencies": {
- "gatsby": "^5.0.0-next",
- "prismjs": "^1.15.0"
- }
- },
- "node_modules/gatsby-script": {
- "version": "2.10.0",
- "resolved": "https://registry.npmjs.org/gatsby-script/-/gatsby-script-2.10.0.tgz",
- "integrity": "sha512-VeHXBNP3nZZCMILcVi8W+50clgH0b2X/Z6k2q3GNH6QNYxMy+Uyf9hgen0jPMH4B+O8anruAumOlDaO5srDY2g==",
-=======
->>>>>>> develop
"dev": true,
"engines": {
"node": ">=18.0.0"
@@ -14118,13 +11975,6 @@
"version": "2.12.0"
},
"node_modules/gatsby-sharp": {
-<<<<<<< HEAD
- "version": "1.10.0",
- "resolved": "https://registry.npmjs.org/gatsby-sharp/-/gatsby-sharp-1.10.0.tgz",
- "integrity": "sha512-9D1hYBRyr85RBCqbqXbKdGgSoNO5qrqhqs7F9igOEAT9Qv8m65gfBBg+rVz6eWhlCA7TvYRBIsUfpAbB2dfTUg==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"sharp": "^0.32.1"
},
@@ -14137,23 +11987,16 @@
"version": "1.12.0"
},
"node_modules/gatsby-source-filesystem": {
-<<<<<<< HEAD
- "version": "5.10.0",
- "resolved": "https://registry.npmjs.org/gatsby-source-filesystem/-/gatsby-source-filesystem-5.10.0.tgz",
- "integrity": "sha512-pTcqFvngUqap4NJfzG9VMmJ4T5TTf/WsMVTVORw18kprXZBchioLu0m5vVb9Tm7/MW7XPXvKJPZQkw+/otmVYw==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/runtime": "^7.20.13",
"chokidar": "^3.5.3",
"file-type": "^16.5.4",
"fs-extra": "^11.1.1",
- "gatsby-core-utils": "^4.10.0",
+ "gatsby-core-utils": "^4.12.0",
"mime": "^3.0.0",
"pretty-bytes": "^5.6.0",
"valid-url": "^1.0.9",
- "xstate": "^4.37.2"
+ "xstate": "^4.38.0"
},
"dev": true,
"engines": {
@@ -14167,14 +12010,6 @@
"version": "5.12.0"
},
"node_modules/gatsby-telemetry": {
-<<<<<<< HEAD
- "version": "4.10.0",
- "resolved": "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-4.10.0.tgz",
- "integrity": "sha512-t3QRGZdRWIxMQ3yHtdON8KgihkMgq1VROjRb+fqzJtHRFIQu8wsrpXCrYmaYv2oWoWH9fWymMu5PhrSywjGuGQ==",
- "dev": true,
- "hasInstallScript": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/code-frame": "^7.18.6",
"@babel/runtime": "^7.20.13",
@@ -14183,11 +12018,11 @@
"boxen": "^5.1.2",
"configstore": "^5.0.1",
"fs-extra": "^11.1.1",
- "gatsby-core-utils": "^4.10.0",
+ "gatsby-core-utils": "^4.12.0",
"git-up": "^7.0.0",
"is-docker": "^2.2.1",
"lodash": "^4.17.21",
- "node-fetch": "^2.6.9"
+ "node-fetch": "^2.6.11"
},
"dev": true,
"engines": {
@@ -14199,16 +12034,9 @@
"version": "4.12.0"
},
"node_modules/gatsby-transformer-remark": {
-<<<<<<< HEAD
- "version": "6.10.0",
- "resolved": "https://registry.npmjs.org/gatsby-transformer-remark/-/gatsby-transformer-remark-6.10.0.tgz",
- "integrity": "sha512-Je8K75eNuVeGClegqb09KNbF3bSzNJSslEdzlH6AyyJYsh4A3DxFotA+5qshWCVx3J5psQ0cYoXGBXBbAltXOw==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/runtime": "^7.20.13",
- "gatsby-core-utils": "^4.10.0",
+ "gatsby-core-utils": "^4.12.0",
"gray-matter": "^4.0.3",
"hast-util-raw": "^6.1.0",
"hast-util-to-html": "^7.1.3",
@@ -14223,7 +12051,7 @@
"remark-retext": "^4.0.0",
"remark-stringify": "^9.0.1",
"retext-english": "^3.0.4",
- "sanitize-html": "^2.10.0",
+ "sanitize-html": "^2.11.0",
"underscore.string": "^3.3.6",
"unified": "^9.2.2",
"unist-util-remove-position": "^3.0.0",
@@ -14242,13 +12070,6 @@
"version": "6.12.0"
},
"node_modules/gatsby-worker": {
-<<<<<<< HEAD
- "version": "2.10.0",
- "resolved": "https://registry.npmjs.org/gatsby-worker/-/gatsby-worker-2.10.0.tgz",
- "integrity": "sha512-LWsfp/NC4DljuQx5LxBwiz24yp8FpY1WLyZB61idc1Xqf2mhIYUKkeqpmPNzMiuICm44XkJadzdn77AdSEgw0Q==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/core": "^7.20.12",
"@babel/runtime": "^7.20.13",
@@ -14798,13 +12619,6 @@
"version": "5.1.2"
},
"node_modules/gatsby/node_modules/globals": {
-<<<<<<< HEAD
- "version": "13.20.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
- "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"type-fest": "^0.20.2"
},
@@ -14863,16 +12677,6 @@
"version": "6.0.0"
},
"node_modules/gatsby/node_modules/semver": {
-<<<<<<< HEAD
- "version": "7.5.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz",
- "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==",
- "dev": true,
- "dependencies": {
- "lru-cache": "^6.0.0"
- },
-=======
->>>>>>> develop
"bin": {
"semver": "bin/semver.js"
},
@@ -14911,82 +12715,8 @@
"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
"version": "4.0.0"
},
- "node_modules/gauge": {
- "version": "2.7.4",
- "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
- "integrity": "sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==",
- "dev": true,
- "optional": true,
- "dependencies": {
- "aproba": "^1.0.3",
- "console-control-strings": "^1.0.0",
- "has-unicode": "^2.0.0",
- "object-assign": "^4.1.0",
- "signal-exit": "^3.0.0",
- "string-width": "^1.0.1",
- "strip-ansi": "^3.0.1",
- "wide-align": "^1.1.0"
- }
- },
- "node_modules/gauge/node_modules/ansi-regex": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
- "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
- "dev": true,
- "optional": true,
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/gauge/node_modules/is-fullwidth-code-point": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
- "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
- "dev": true,
- "optional": true,
- "dependencies": {
- "number-is-nan": "^1.0.0"
- },
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/gauge/node_modules/string-width": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
- "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
- "dev": true,
- "optional": true,
- "dependencies": {
- "code-point-at": "^1.0.0",
- "is-fullwidth-code-point": "^1.0.0",
- "strip-ansi": "^3.0.0"
- },
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/gauge/node_modules/strip-ansi": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
- "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
- "dev": true,
- "optional": true,
- "dependencies": {
- "ansi-regex": "^2.0.0"
- },
- "engines": {
- "node": ">=0.10.0"
- }
- },
"node_modules/gensync": {
-<<<<<<< HEAD
- "version": "1.0.0-beta.2",
- "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
- "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=6.9.0"
},
@@ -15004,12 +12734,6 @@
"version": "2.0.5"
},
"node_modules/get-intrinsic": {
-<<<<<<< HEAD
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
- "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
-=======
->>>>>>> develop
"dependencies": {
"function-bind": "^1.1.1",
"has": "^1.0.3",
@@ -15045,12 +12769,6 @@
"version": "6.0.1"
},
"node_modules/get-symbol-description": {
-<<<<<<< HEAD
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
- "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-=======
->>>>>>> develop
"dependencies": {
"call-bind": "^1.0.2",
"get-intrinsic": "^1.1.1"
@@ -15089,12 +12807,6 @@
"version": "1.5.0"
},
"node_modules/glob": {
-<<<<<<< HEAD
- "version": "7.2.3",
- "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
- "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-=======
->>>>>>> develop
"dependencies": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
@@ -15115,13 +12827,6 @@
"version": "7.2.3"
},
"node_modules/glob-parent": {
-<<<<<<< HEAD
- "version": "6.0.2",
- "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
- "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
- "peer": true,
-=======
->>>>>>> develop
"dependencies": {
"is-glob": "^4.0.3"
},
@@ -15179,13 +12884,7 @@
"version": "1.3.1"
},
"node_modules/globals": {
-<<<<<<< HEAD
- "version": "11.12.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
- "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=4"
},
@@ -15194,12 +12893,6 @@
"version": "11.12.0"
},
"node_modules/globalthis": {
-<<<<<<< HEAD
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
- "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
-=======
->>>>>>> develop
"dependencies": {
"define-properties": "^1.1.3"
},
@@ -15215,12 +12908,6 @@
"version": "1.0.3"
},
"node_modules/globby": {
-<<<<<<< HEAD
- "version": "11.1.0",
- "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
- "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-=======
->>>>>>> develop
"dependencies": {
"array-union": "^2.1.0",
"dir-glob": "^3.0.1",
@@ -15241,12 +12928,6 @@
"version": "11.1.0"
},
"node_modules/gopd": {
-<<<<<<< HEAD
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
- "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-=======
->>>>>>> develop
"dependencies": {
"get-intrinsic": "^1.1.3"
},
@@ -15289,27 +12970,13 @@
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
"version": "4.2.11"
},
- "node_modules/grapheme-splitter": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
- "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ=="
- },
"node_modules/graphemer": {
"dev": true,
"integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-<<<<<<< HEAD
- "peer": true
- },
- "node_modules/graphql": {
- "version": "16.6.0",
- "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.6.0.tgz",
- "integrity": "sha512-KPIBPDlW7NxrbT/eh4qPXz5FiFdL5UbaA0XUNz2Rp3Z3hqBSkbj0GVjwFDztsWVauZUWsbKHgMg++sk8UX0bkw==",
-=======
"resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
"version": "1.4.0"
},
"node_modules/graphql": {
->>>>>>> develop
"dev": true,
"engines": {
"node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0"
@@ -15328,12 +12995,6 @@
"version": "9.0.10"
},
"node_modules/graphql-http": {
-<<<<<<< HEAD
- "version": "1.19.0",
- "resolved": "https://registry.npmjs.org/graphql-http/-/graphql-http-1.19.0.tgz",
- "integrity": "sha512-fOD3hfp/G+Lhx2FWW5HsfmtJSsw6CikcpOboG7/mFo/pPUzn3yOwKdTFRnJ8MVY4ru69MT1nSPr/1gI/iuGNlw==",
-=======
->>>>>>> develop
"dev": true,
"engines": {
"node": ">=12"
@@ -15433,12 +13094,6 @@
"version": "6.0.0"
},
"node_modules/has": {
-<<<<<<< HEAD
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
- "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-=======
->>>>>>> develop
"dependencies": {
"function-bind": "^1.1.1"
},
@@ -15451,13 +13106,7 @@
"version": "1.0.3"
},
"node_modules/has-bigints": {
-<<<<<<< HEAD
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
- "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-=======
"dev": true,
->>>>>>> develop
"funding": {
"url": "https://github.com/sponsors/ljharb"
},
@@ -15466,13 +13115,7 @@
"version": "1.0.2"
},
"node_modules/has-flag": {
-<<<<<<< HEAD
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
- "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=4"
},
@@ -15481,12 +13124,6 @@
"version": "3.0.0"
},
"node_modules/has-property-descriptors": {
-<<<<<<< HEAD
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
- "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
-=======
->>>>>>> develop
"dependencies": {
"get-intrinsic": "^1.1.1"
},
@@ -15499,13 +13136,7 @@
"version": "1.0.0"
},
"node_modules/has-proto": {
-<<<<<<< HEAD
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
- "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">= 0.4"
},
@@ -15517,13 +13148,7 @@
"version": "1.0.1"
},
"node_modules/has-symbols": {
-<<<<<<< HEAD
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
- "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">= 0.4"
},
@@ -15535,12 +13160,6 @@
"version": "1.0.3"
},
"node_modules/has-tostringtag": {
-<<<<<<< HEAD
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
- "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-=======
->>>>>>> develop
"dependencies": {
"has-symbols": "^1.0.2"
},
@@ -15555,13 +13174,6 @@
"resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
"version": "1.0.0"
},
- "node_modules/has-unicode": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
- "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
- "dev": true,
- "optional": true
- },
"node_modules/hash-wasm": {
"dev": true,
"integrity": "sha512-7SW7ejyfnRxuOc7ptQHSf4LDoZaWOivfzqw+5rpcQku0nHfmicPKE51ra9BiRLAmT8+gGLestr1XroUkqdjL6w==",
@@ -15612,8 +13224,6 @@
"resolved": "https://registry.npmjs.org/hast-to-hyperscript/-/hast-to-hyperscript-9.0.1.tgz",
"version": "9.0.1"
},
-<<<<<<< HEAD
-=======
"node_modules/hast-to-hyperscript/node_modules/style-to-object": {
"dependencies": {
"inline-style-parser": "0.1.1"
@@ -15623,7 +13233,6 @@
"resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-0.3.0.tgz",
"version": "0.3.0"
},
->>>>>>> develop
"node_modules/hast-util-from-parse5": {
"dependencies": {
"@types/parse5": "^5.0.0",
@@ -15825,12 +13434,6 @@
"version": "4.0.0"
},
"node_modules/html-entities": {
-<<<<<<< HEAD
- "version": "2.3.5",
- "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.5.tgz",
- "integrity": "sha512-72TJlcMkYsEJASa/3HnX7VT59htM7iSHbH59NSZbtc+22Ap0Txnlx91sfeB+/A7wNZg7UxtZdhAW4y+/jimrdg==",
- "dev": true
-=======
"dev": true,
"funding": [
{
@@ -15845,7 +13448,6 @@
"integrity": "sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==",
"resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.4.0.tgz",
"version": "2.4.0"
->>>>>>> develop
},
"node_modules/html-loader": {
"dependencies": {
@@ -16005,13 +13607,7 @@
"version": "1.2.1"
},
"node_modules/ignore": {
-<<<<<<< HEAD
- "version": "5.2.4",
- "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
- "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">= 4"
},
@@ -16039,12 +13635,6 @@
"version": "3.7.6"
},
"node_modules/import-fresh": {
-<<<<<<< HEAD
- "version": "3.3.0",
- "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
- "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-=======
->>>>>>> develop
"dependencies": {
"parent-module": "^1.0.0",
"resolve-from": "^4.0.0"
@@ -16061,13 +13651,7 @@
"version": "3.3.0"
},
"node_modules/import-fresh/node_modules/resolve-from": {
-<<<<<<< HEAD
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
- "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=4"
},
@@ -16088,13 +13672,7 @@
"version": "4.0.0"
},
"node_modules/imurmurhash": {
-<<<<<<< HEAD
- "version": "0.1.4",
- "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
- "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=0.8.19"
},
@@ -16152,21 +13730,6 @@
"resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
"version": "7.3.3"
},
- "node_modules/inquirer/node_modules/ansi-escapes": {
- "version": "4.3.2",
- "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
- "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
- "dev": true,
- "dependencies": {
- "type-fest": "^0.21.3"
- },
- "engines": {
- "node": ">=8"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
"node_modules/inquirer/node_modules/ansi-styles": {
"dependencies": {
"color-convert": "^2.0.1"
@@ -16237,25 +13800,7 @@
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"version": "7.2.0"
},
- "node_modules/inquirer/node_modules/type-fest": {
- "version": "0.21.3",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
- "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
- "dev": true,
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
"node_modules/internal-slot": {
-<<<<<<< HEAD
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
- "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
-=======
->>>>>>> develop
"dependencies": {
"get-intrinsic": "^1.2.0",
"has": "^1.0.3",
@@ -16332,28 +13877,7 @@
"resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz",
"version": "1.0.4"
},
- "node_modules/is-arguments": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
- "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
- "dependencies": {
- "call-bind": "^1.0.2",
- "has-tostringtag": "^1.0.0"
- },
- "engines": {
- "node": ">= 0.4"
- },
- "funding": {
- "url": "https://github.com/sponsors/ljharb"
- }
- },
"node_modules/is-array-buffer": {
-<<<<<<< HEAD
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
- "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
-=======
->>>>>>> develop
"dependencies": {
"call-bind": "^1.0.2",
"get-intrinsic": "^1.2.0",
@@ -16373,12 +13897,6 @@
"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
"version": "0.2.1"
},
-<<<<<<< HEAD
- "node_modules/is-bigint": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
- "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-=======
"node_modules/is-async-function": {
"dependencies": {
"has-tostringtag": "^1.0.0"
@@ -16395,7 +13913,6 @@
"version": "2.0.0"
},
"node_modules/is-bigint": {
->>>>>>> develop
"dependencies": {
"has-bigints": "^1.0.1"
},
@@ -16420,12 +13937,6 @@
"version": "2.1.0"
},
"node_modules/is-boolean-object": {
-<<<<<<< HEAD
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
- "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-=======
->>>>>>> develop
"dependencies": {
"call-bind": "^1.0.2",
"has-tostringtag": "^1.0.0"
@@ -16465,13 +13976,7 @@
"version": "2.0.5"
},
"node_modules/is-callable": {
-<<<<<<< HEAD
- "version": "1.2.7",
- "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
- "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">= 0.4"
},
@@ -16495,12 +14000,6 @@
"version": "2.0.0"
},
"node_modules/is-core-module": {
-<<<<<<< HEAD
- "version": "2.12.1",
- "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
- "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
-=======
->>>>>>> develop
"dependencies": {
"has": "^1.0.3"
},
@@ -16513,12 +14012,6 @@
"version": "2.13.0"
},
"node_modules/is-date-object": {
-<<<<<<< HEAD
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
- "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-=======
->>>>>>> develop
"dependencies": {
"has-tostringtag": "^1.0.0"
},
@@ -16567,13 +14060,7 @@
"version": "0.1.1"
},
"node_modules/is-extglob": {
-<<<<<<< HEAD
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
- "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=0.10.0"
},
@@ -16581,8 +14068,6 @@
"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
"version": "2.1.1"
},
-<<<<<<< HEAD
-=======
"node_modules/is-finalizationregistry": {
"dependencies": {
"call-bind": "^1.0.2"
@@ -16595,7 +14080,6 @@
"resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz",
"version": "1.0.2"
},
->>>>>>> develop
"node_modules/is-fullwidth-code-point": {
"dev": true,
"engines": {
@@ -16605,12 +14089,6 @@
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
"version": "3.0.0"
},
-<<<<<<< HEAD
- "node_modules/is-glob": {
- "version": "4.0.3",
- "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
- "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-=======
"node_modules/is-generator-function": {
"dependencies": {
"has-tostringtag": "^1.0.0"
@@ -16627,7 +14105,6 @@
"version": "1.0.10"
},
"node_modules/is-glob": {
->>>>>>> develop
"dependencies": {
"is-extglob": "^2.1.1"
},
@@ -16692,13 +14169,7 @@
"version": "2.0.2"
},
"node_modules/is-map": {
-<<<<<<< HEAD
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
- "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==",
-=======
"dev": true,
->>>>>>> develop
"funding": {
"url": "https://github.com/sponsors/ljharb"
},
@@ -16707,13 +14178,7 @@
"version": "2.0.2"
},
"node_modules/is-negative-zero": {
-<<<<<<< HEAD
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
- "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">= 0.4"
},
@@ -16725,13 +14190,7 @@
"version": "2.0.2"
},
"node_modules/is-number": {
-<<<<<<< HEAD
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
- "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=0.12.0"
},
@@ -16740,12 +14199,6 @@
"version": "7.0.0"
},
"node_modules/is-number-object": {
-<<<<<<< HEAD
- "version": "1.0.7",
- "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
- "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
-=======
->>>>>>> develop
"dependencies": {
"has-tostringtag": "^1.0.0"
},
@@ -16770,14 +14223,7 @@
"version": "2.0.0"
},
"node_modules/is-path-inside": {
-<<<<<<< HEAD
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
- "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
- "peer": true,
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=8"
},
@@ -16811,12 +14257,6 @@
"version": "2.2.2"
},
"node_modules/is-regex": {
-<<<<<<< HEAD
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
- "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-=======
->>>>>>> develop
"dependencies": {
"call-bind": "^1.0.2",
"has-tostringtag": "^1.0.0"
@@ -16866,13 +14306,7 @@
"version": "2.1.0"
},
"node_modules/is-set": {
-<<<<<<< HEAD
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
- "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==",
-=======
"dev": true,
->>>>>>> develop
"funding": {
"url": "https://github.com/sponsors/ljharb"
},
@@ -16881,12 +14315,6 @@
"version": "2.0.2"
},
"node_modules/is-shared-array-buffer": {
-<<<<<<< HEAD
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
- "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-=======
->>>>>>> develop
"dependencies": {
"call-bind": "^1.0.2"
},
@@ -16919,12 +14347,6 @@
"version": "2.0.1"
},
"node_modules/is-string": {
-<<<<<<< HEAD
- "version": "1.0.7",
- "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
- "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-=======
->>>>>>> develop
"dependencies": {
"has-tostringtag": "^1.0.0"
},
@@ -16940,12 +14362,6 @@
"version": "1.0.7"
},
"node_modules/is-symbol": {
-<<<<<<< HEAD
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
- "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-=======
->>>>>>> develop
"dependencies": {
"has-symbols": "^1.0.2"
},
@@ -16961,18 +14377,8 @@
"version": "1.0.4"
},
"node_modules/is-typed-array": {
-<<<<<<< HEAD
- "version": "1.1.10",
- "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz",
- "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==",
-=======
->>>>>>> develop
"dependencies": {
- "available-typed-arrays": "^1.0.5",
- "call-bind": "^1.0.2",
- "for-each": "^0.3.3",
- "gopd": "^1.0.1",
- "has-tostringtag": "^1.0.0"
+ "which-typed-array": "^1.1.11"
},
"dev": true,
"engines": {
@@ -17034,13 +14440,7 @@
"version": "0.1.1"
},
"node_modules/is-weakmap": {
-<<<<<<< HEAD
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
- "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==",
-=======
"dev": true,
->>>>>>> develop
"funding": {
"url": "https://github.com/sponsors/ljharb"
},
@@ -17049,12 +14449,6 @@
"version": "2.0.1"
},
"node_modules/is-weakref": {
-<<<<<<< HEAD
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
- "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-=======
->>>>>>> develop
"dependencies": {
"call-bind": "^1.0.2"
},
@@ -17067,12 +14461,6 @@
"version": "1.0.2"
},
"node_modules/is-weakset": {
-<<<<<<< HEAD
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz",
- "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==",
-=======
->>>>>>> develop
"dependencies": {
"call-bind": "^1.0.2",
"get-intrinsic": "^1.1.1"
@@ -17106,16 +14494,10 @@
"version": "2.2.0"
},
"node_modules/isarray": {
-<<<<<<< HEAD
- "version": "2.0.5",
- "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
- "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
-=======
"dev": true,
"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
"version": "1.0.0"
->>>>>>> develop
},
"node_modules/isexe": {
"integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
@@ -17131,8 +14513,6 @@
"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
"version": "3.0.1"
},
-<<<<<<< HEAD
-=======
"node_modules/iterator.prototype": {
"dependencies": {
"define-properties": "^1.1.4",
@@ -17146,7 +14526,6 @@
"resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.0.tgz",
"version": "1.1.0"
},
->>>>>>> develop
"node_modules/javascript-stringify": {
"dev": true,
"integrity": "sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg==",
@@ -17154,15 +14533,8 @@
"version": "2.1.0"
},
"node_modules/jest-util": {
-<<<<<<< HEAD
- "version": "29.5.0",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.5.0.tgz",
- "integrity": "sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
- "@jest/types": "^29.5.0",
+ "@jest/types": "^29.6.3",
"@types/node": "*",
"chalk": "^4.0.0",
"ci-info": "^3.2.0",
@@ -17263,16 +14635,9 @@
"version": "7.2.0"
},
"node_modules/jest-worker": {
-<<<<<<< HEAD
- "version": "29.5.0",
- "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.5.0.tgz",
- "integrity": "sha512-NcrQnevGoSp4b5kg+akIpthoAFHxPBcb5P6mYPY0fUNT+sSvmtu6jlkEle3anczUKIKEbMxFimk9oTP/tpIPgA==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@types/node": "*",
- "jest-util": "^29.5.0",
+ "jest-util": "^29.6.3",
"merge-stream": "^2.0.0",
"supports-color": "^8.0.0"
},
@@ -17309,13 +14674,6 @@
"version": "8.1.1"
},
"node_modules/joi": {
-<<<<<<< HEAD
- "version": "17.9.2",
- "resolved": "https://registry.npmjs.org/joi/-/joi-17.9.2.tgz",
- "integrity": "sha512-Itk/r+V4Dx0V3c7RLFdRh12IOjySm2/WGPMubBT92cQvRfYZhPM2W0hZlctjj72iES8jsRCwp7S/cRmWBnJ4nw==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@hapi/hoek": "^9.0.0",
"@hapi/topo": "^5.0.0",
@@ -17351,12 +14709,6 @@
"version": "4.1.0"
},
"node_modules/jsesc": {
-<<<<<<< HEAD
- "version": "2.5.2",
- "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
- "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-=======
->>>>>>> develop
"bin": {
"jsesc": "bin/jsesc"
},
@@ -17387,16 +14739,6 @@
"version": "2.3.1"
},
"node_modules/json-schema-traverse": {
-<<<<<<< HEAD
- "version": "0.4.1",
- "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
- "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
- },
- "node_modules/json-stable-stringify-without-jsonify": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
- "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="
-=======
"dev": true,
"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -17407,7 +14749,6 @@
"integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
"version": "1.0.1"
->>>>>>> develop
},
"node_modules/json5": {
"bin": {
@@ -17433,15 +14774,11 @@
"version": "6.1.0"
},
"node_modules/jsx-ast-utils": {
-<<<<<<< HEAD
- "version": "3.3.3",
- "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz",
- "integrity": "sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw==",
-=======
->>>>>>> develop
"dependencies": {
- "array-includes": "^3.1.5",
- "object.assign": "^4.1.3"
+ "array-includes": "^3.1.6",
+ "array.prototype.flat": "^1.3.1",
+ "object.assign": "^4.1.4",
+ "object.values": "^1.1.6"
},
"dev": true,
"engines": {
@@ -17458,13 +14795,6 @@
"version": "1.1.0"
},
"node_modules/keyv": {
-<<<<<<< HEAD
- "version": "4.5.2",
- "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.2.tgz",
- "integrity": "sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"json-buffer": "3.0.1"
},
@@ -17510,23 +14840,12 @@
"version": "2.0.6"
},
"node_modules/language-subtag-registry": {
-<<<<<<< HEAD
- "version": "0.3.22",
- "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz",
- "integrity": "sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w=="
- },
- "node_modules/language-tags": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz",
- "integrity": "sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==",
-=======
"dev": true,
"integrity": "sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w==",
"resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz",
"version": "0.3.22"
},
"node_modules/language-tags": {
->>>>>>> develop
"dependencies": {
"language-subtag-registry": "~0.3.2"
},
@@ -17550,12 +14869,6 @@
"resolved": "https://registry.npmjs.org/latest-version/-/latest-version-7.0.0.tgz",
"version": "7.0.0"
},
-<<<<<<< HEAD
- "node_modules/levn": {
- "version": "0.4.1",
- "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
- "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-=======
"node_modules/legacy-swc-helpers": {
"dependencies": {
"tslib": "^2.4.0"
@@ -17567,7 +14880,6 @@
"version": "0.4.14"
},
"node_modules/levn": {
->>>>>>> develop
"dependencies": {
"prelude-ls": "^1.2.1",
"type-check": "~0.4.0"
@@ -17595,15 +14907,12 @@
"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
"version": "1.2.4"
},
-<<<<<<< HEAD
-=======
"node_modules/linkfs": {
"dev": true,
"integrity": "sha512-kmsGcmpvjStZ0ATjuHycBujtNnXiZR28BTivEu0gAMDTT7GEyodcK6zSRtu6xsrdorrPZEIN380x7BD7xEYkew==",
"resolved": "https://registry.npmjs.org/linkfs/-/linkfs-2.1.0.tgz",
"version": "2.1.0"
},
->>>>>>> develop
"node_modules/lmdb": {
"dependencies": {
"msgpackr": "^1.5.4",
@@ -17655,12 +14964,6 @@
"version": "2.0.4"
},
"node_modules/locate-path": {
-<<<<<<< HEAD
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
- "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-=======
->>>>>>> develop
"dependencies": {
"p-locate": "^5.0.0"
},
@@ -17682,16 +14985,10 @@
"version": "1.1.0"
},
"node_modules/lodash": {
-<<<<<<< HEAD
- "version": "4.17.21",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
- "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-=======
"dev": true,
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
"version": "4.17.21"
->>>>>>> develop
},
"node_modules/lodash.clonedeep": {
"dev": true,
@@ -17758,16 +15055,10 @@
"version": "4.1.2"
},
"node_modules/lodash.merge": {
-<<<<<<< HEAD
- "version": "4.6.2",
- "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
- "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
-=======
"dev": true,
"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
"version": "4.6.2"
->>>>>>> develop
},
"node_modules/lodash.truncate": {
"dev": true,
@@ -17844,12 +15135,6 @@
"version": "1.20.0"
},
"node_modules/lru-cache": {
-<<<<<<< HEAD
- "version": "5.1.1",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
- "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-=======
->>>>>>> develop
"dependencies": {
"yallist": "^3.0.2"
},
@@ -18249,13 +15534,7 @@
"version": "2.0.0"
},
"node_modules/merge2": {
-<<<<<<< HEAD
- "version": "1.4.1",
- "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
- "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">= 8"
},
@@ -18386,12 +15665,6 @@
"version": "0.3.3"
},
"node_modules/micromatch": {
-<<<<<<< HEAD
- "version": "4.0.5",
- "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
- "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-=======
->>>>>>> develop
"dependencies": {
"braces": "^3.0.2",
"picomatch": "^2.3.1"
@@ -18499,13 +15772,7 @@
"version": "3.1.2"
},
"node_modules/minimist": {
-<<<<<<< HEAD
- "version": "1.2.8",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
- "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-=======
"dev": true,
->>>>>>> develop
"funding": {
"url": "https://github.com/sponsors/ljharb"
},
@@ -18547,23 +15814,12 @@
"version": "2.29.4"
},
"node_modules/ms": {
-<<<<<<< HEAD
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
- "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
- },
- "node_modules/msgpackr": {
- "version": "1.9.5",
- "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.9.5.tgz",
- "integrity": "sha512-/IJ3cFSN6Ci3eG2wLhbFEL6GT63yEaoN/R5My2QkV6zro+OJaVRLPlwvxY7EtHYSmDlQpk8stvOQTL2qJFkDRg==",
-=======
"dev": true,
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"version": "2.1.2"
},
"node_modules/msgpackr": {
->>>>>>> develop
"dev": true,
"integrity": "sha512-baUNaLvKQvVhzfWTNO07njwbZK1Lxjtb0P1JL6/EhXdLTHzR57/mZqqJC39TtQKvOmkJA4pcejS4dbk7BDgLLA==",
"optionalDependencies": {
@@ -18661,16 +15917,6 @@
"version": "1.0.2"
},
"node_modules/natural-compare": {
-<<<<<<< HEAD
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
- "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
- },
- "node_modules/natural-compare-lite": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
- "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g=="
-=======
"dev": true,
"integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -18681,7 +15927,6 @@
"integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
"resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
"version": "1.4.0"
->>>>>>> develop
},
"node_modules/needle": {
"bin": {
@@ -18757,13 +16002,6 @@
"version": "3.0.4"
},
"node_modules/node-abi": {
-<<<<<<< HEAD
- "version": "3.45.0",
- "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.45.0.tgz",
- "integrity": "sha512-iwXuFrMAcFVi/ZoZiqq8BzAdsLw9kxDfTC0HMyjXfSL/6CSDAGD5UmR7azrAgWV1zKYq7dUUMj4owusBWKLsiQ==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"semver": "^7.3.5"
},
@@ -18788,16 +16026,6 @@
"version": "6.0.0"
},
"node_modules/node-abi/node_modules/semver": {
-<<<<<<< HEAD
- "version": "7.5.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz",
- "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==",
- "dev": true,
- "dependencies": {
- "lru-cache": "^6.0.0"
- },
-=======
->>>>>>> develop
"bin": {
"semver": "bin/semver.js"
},
@@ -18819,17 +16047,10 @@
"version": "4.0.0"
},
"node_modules/node-addon-api": {
-<<<<<<< HEAD
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
- "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
- "dev": true
-=======
"dev": true,
"integrity": "sha512-vgbBJTS4m5/KkE16t5Ly0WW9hz46swAstv0hYYwMtbG7AznRhNyfLRe8HZAiWIpcHzoO7HxhLuBQj9rJ/Ho0ZA==",
"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.0.0.tgz",
"version": "7.0.0"
->>>>>>> develop
},
"node_modules/node-domexception": {
"dev": true,
@@ -18851,13 +16072,6 @@
"version": "1.0.0"
},
"node_modules/node-fetch": {
-<<<<<<< HEAD
- "version": "2.6.11",
- "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz",
- "integrity": "sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"whatwg-url": "^5.0.0"
},
@@ -18877,17 +16091,6 @@
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
"version": "2.7.0"
},
- "node_modules/node-gyp-build": {
- "version": "4.6.0",
- "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.0.tgz",
- "integrity": "sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ==",
- "dev": true,
- "bin": {
- "node-gyp-build": "bin.js",
- "node-gyp-build-optional": "optional.js",
- "node-gyp-build-test": "build-test.js"
- }
- },
"node_modules/node-gyp-build-optional-packages": {
"bin": {
"node-gyp-build-optional-packages": "bin.js",
@@ -18993,16 +16196,10 @@
"version": "2.3.10"
},
"node_modules/node-releases": {
-<<<<<<< HEAD
- "version": "2.0.12",
- "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.12.tgz",
- "integrity": "sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ=="
-=======
"dev": true,
"integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==",
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
"version": "2.0.13"
->>>>>>> develop
},
"node_modules/normalize-path": {
"dev": true,
@@ -19051,19 +16248,6 @@
"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
"version": "4.0.1"
},
- "node_modules/npmlog": {
- "version": "4.1.2",
- "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
- "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
- "dev": true,
- "optional": true,
- "dependencies": {
- "are-we-there-yet": "~1.1.2",
- "console-control-strings": "~1.1.0",
- "gauge": "~2.7.3",
- "set-blocking": "~2.0.0"
- }
- },
"node_modules/nth-check": {
"dependencies": {
"boolbase": "^1.0.0"
@@ -19102,16 +16286,6 @@
"resolved": "https://registry.npmjs.org/nullthrows/-/nullthrows-1.1.1.tgz",
"version": "1.1.1"
},
- "node_modules/number-is-nan": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
- "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==",
- "dev": true,
- "optional": true,
- "engines": {
- "node": ">=0.10.0"
- }
- },
"node_modules/object-assign": {
"engines": {
"node": ">=0.10.0"
@@ -19121,28 +16295,7 @@
"version": "4.1.1"
},
"node_modules/object-inspect": {
-<<<<<<< HEAD
- "version": "1.12.3",
- "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
- "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
- "funding": {
- "url": "https://github.com/sponsors/ljharb"
- }
- },
- "node_modules/object-is": {
- "version": "1.1.5",
- "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
- "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
- "dependencies": {
- "call-bind": "^1.0.2",
- "define-properties": "^1.1.3"
- },
- "engines": {
- "node": ">= 0.4"
- },
-=======
"dev": true,
->>>>>>> develop
"funding": {
"url": "https://github.com/sponsors/ljharb"
},
@@ -19151,13 +16304,7 @@
"version": "1.12.3"
},
"node_modules/object-keys": {
-<<<<<<< HEAD
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
- "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">= 0.4"
},
@@ -19166,12 +16313,6 @@
"version": "1.1.1"
},
"node_modules/object.assign": {
-<<<<<<< HEAD
- "version": "4.1.4",
- "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
- "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-=======
->>>>>>> develop
"dependencies": {
"call-bind": "^1.0.2",
"define-properties": "^1.1.4",
@@ -19190,16 +16331,10 @@
"version": "4.1.4"
},
"node_modules/object.entries": {
-<<<<<<< HEAD
- "version": "1.1.6",
- "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
- "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
-=======
->>>>>>> develop
"dependencies": {
"call-bind": "^1.0.2",
- "define-properties": "^1.1.4",
- "es-abstract": "^1.20.4"
+ "define-properties": "^1.2.0",
+ "es-abstract": "^1.22.1"
},
"dev": true,
"engines": {
@@ -19210,12 +16345,6 @@
"version": "1.1.7"
},
"node_modules/object.fromentries": {
-<<<<<<< HEAD
- "version": "2.0.6",
- "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
- "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==",
-=======
->>>>>>> develop
"dependencies": {
"call-bind": "^1.0.2",
"define-properties": "^1.1.4",
@@ -19232,12 +16361,6 @@
"resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
"version": "2.0.6"
},
-<<<<<<< HEAD
- "node_modules/object.hasown": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz",
- "integrity": "sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==",
-=======
"node_modules/object.groupby": {
"dependencies": {
"call-bind": "^1.0.2",
@@ -19251,10 +16374,9 @@
"version": "1.0.1"
},
"node_modules/object.hasown": {
->>>>>>> develop
"dependencies": {
- "define-properties": "^1.1.4",
- "es-abstract": "^1.20.4"
+ "define-properties": "^1.2.0",
+ "es-abstract": "^1.22.1"
},
"dev": true,
"funding": {
@@ -19265,16 +16387,10 @@
"version": "1.1.3"
},
"node_modules/object.values": {
-<<<<<<< HEAD
- "version": "1.1.6",
- "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
- "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
-=======
->>>>>>> develop
"dependencies": {
"call-bind": "^1.0.2",
- "define-properties": "^1.1.4",
- "es-abstract": "^1.20.4"
+ "define-properties": "^1.2.0",
+ "es-abstract": "^1.22.1"
},
"dev": true,
"engines": {
@@ -19362,19 +16478,13 @@
"version": "0.14.7"
},
"node_modules/optionator": {
-<<<<<<< HEAD
- "version": "0.9.1",
- "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
- "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-=======
->>>>>>> develop
"dependencies": {
+ "@aashutoshrathi/word-wrap": "^1.2.3",
"deep-is": "^0.1.3",
"fast-levenshtein": "^2.0.6",
"levn": "^0.4.1",
"prelude-ls": "^1.2.1",
- "type-check": "^0.4.0",
- "word-wrap": "^1.2.3"
+ "type-check": "^0.4.0"
},
"dev": true,
"engines": {
@@ -19385,17 +16495,10 @@
"version": "0.9.3"
},
"node_modules/ordered-binary": {
-<<<<<<< HEAD
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/ordered-binary/-/ordered-binary-1.4.0.tgz",
- "integrity": "sha512-EHQ/jk4/a9hLupIKxTfUsQRej1Yd/0QLQs3vGvIqg5ZtCYSzNhkzHoZc7Zf4e4kUlDaC3Uw8Q/1opOLNN2OKRQ==",
- "dev": true
-=======
"dev": true,
"integrity": "sha512-9LtiGlPy982CsgxZvJGNNp2/NnrgEr6EAyN3iIEP3/8vd3YLgAZQHbQ75ZrkfBRGrNg37Dk3U6tuVb+B4Xfslg==",
"resolved": "https://registry.npmjs.org/ordered-binary/-/ordered-binary-1.4.1.tgz",
"version": "1.4.1"
->>>>>>> develop
},
"node_modules/os-tmpdir": {
"dev": true,
@@ -19425,12 +16528,6 @@
"version": "3.0.0"
},
"node_modules/p-limit": {
-<<<<<<< HEAD
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
- "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-=======
->>>>>>> develop
"dependencies": {
"yocto-queue": "^0.1.0"
},
@@ -19446,12 +16543,6 @@
"version": "3.1.0"
},
"node_modules/p-locate": {
-<<<<<<< HEAD
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
- "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-=======
->>>>>>> develop
"dependencies": {
"p-limit": "^3.0.2"
},
@@ -19476,13 +16567,6 @@
"version": "2.2.0"
},
"node_modules/package-json": {
-<<<<<<< HEAD
- "version": "8.1.0",
- "resolved": "https://registry.npmjs.org/package-json/-/package-json-8.1.0.tgz",
- "integrity": "sha512-hySwcV8RAWeAfPsXb9/HGSPn8lwDnv6fabH+obUZKX169QknRkRhPxd1yMubpKDskLFATkl3jHpNtVtDPFA0Wg==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"got": "^12.1.0",
"registry-auth-token": "^5.0.1",
@@ -19501,12 +16585,6 @@
"version": "8.1.1"
},
"node_modules/package-json/node_modules/@sindresorhus/is": {
-<<<<<<< HEAD
- "version": "5.4.1",
- "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.4.1.tgz",
- "integrity": "sha512-axlrvsHlHlFmKKMEg4VyvMzFr93JWJj4eIfXY1STVuO2fsImCa7ncaiG5gC8HKOX590AW5RtRsC41/B+OfrSqw==",
-=======
->>>>>>> develop
"dev": true,
"engines": {
"node": ">=14.16"
@@ -19540,18 +16618,11 @@
"version": "7.0.0"
},
"node_modules/package-json/node_modules/cacheable-request": {
-<<<<<<< HEAD
- "version": "10.2.10",
- "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.10.tgz",
- "integrity": "sha512-v6WB+Epm/qO4Hdlio/sfUn69r5Shgh39SsE9DSd4bIezP0mblOlObI+I0kUEM7J0JFc+I7pSeMeYaOYtX1N/VQ==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@types/http-cache-semantics": "^4.0.1",
"get-stream": "^6.0.1",
"http-cache-semantics": "^4.1.1",
- "keyv": "^4.5.2",
+ "keyv": "^4.5.3",
"mimic-response": "^4.0.0",
"normalize-url": "^8.0.0",
"responselike": "^3.0.0"
@@ -19684,16 +16755,6 @@
"version": "3.0.0"
},
"node_modules/package-json/node_modules/semver": {
-<<<<<<< HEAD
- "version": "7.5.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz",
- "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==",
- "dev": true,
- "dependencies": {
- "lru-cache": "^6.0.0"
- },
-=======
->>>>>>> develop
"bin": {
"semver": "bin/semver.js"
},
@@ -19725,12 +16786,6 @@
"version": "3.0.4"
},
"node_modules/parent-module": {
-<<<<<<< HEAD
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
- "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-=======
->>>>>>> develop
"dependencies": {
"callsites": "^3.0.0"
},
@@ -19865,116 +16920,39 @@
"resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
"version": "7.1.2"
},
- "node_modules/parse5-htmlparser2-tree-adapter": {
- "dependencies": {
- "domhandler": "^5.0.2",
- "parse5": "^7.0.0"
- },
- "dev": true,
- "funding": {
- "url": "https://github.com/inikulin/parse5?sponsor=1"
- },
- "integrity": "sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g==",
- "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.0.0.tgz",
- "version": "7.0.0"
- },
- "node_modules/parseurl": {
- "dev": true,
- "engines": {
- "node": ">= 0.8"
- },
- "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
- "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
- "version": "1.3.3"
- },
- "node_modules/pascal-case": {
- "dependencies": {
- "no-case": "^3.0.4",
- "tslib": "^2.0.3"
- },
- "dev": true,
- "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
- "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
- "version": "3.1.2"
- },
- "node_modules/password-prompt": {
-<<<<<<< HEAD
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/password-prompt/-/password-prompt-1.1.2.tgz",
- "integrity": "sha512-bpuBhROdrhuN3E7G/koAju0WjVw9/uQOG5Co5mokNj0MiOSBVZS1JTwM4zl55hu0WFmIEFvO9cU9sJQiBIYeIA==",
- "dev": true,
- "dependencies": {
- "ansi-escapes": "^3.1.0",
- "cross-spawn": "^6.0.5"
- }
- },
- "node_modules/password-prompt/node_modules/cross-spawn": {
- "version": "6.0.5",
- "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
- "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
- "dev": true,
- "dependencies": {
- "nice-try": "^1.0.4",
- "path-key": "^2.0.1",
- "semver": "^5.5.0",
- "shebang-command": "^1.2.0",
- "which": "^1.2.9"
- },
- "engines": {
- "node": ">=4.8"
- }
- },
- "node_modules/password-prompt/node_modules/path-key": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
- "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
- "dev": true,
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/password-prompt/node_modules/semver": {
- "version": "5.7.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
- "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
- "dev": true,
- "bin": {
- "semver": "bin/semver"
- }
- },
- "node_modules/password-prompt/node_modules/shebang-command": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
- "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
- "dev": true,
+ "node_modules/parse5-htmlparser2-tree-adapter": {
"dependencies": {
- "shebang-regex": "^1.0.0"
+ "domhandler": "^5.0.2",
+ "parse5": "^7.0.0"
},
- "engines": {
- "node": ">=0.10.0"
- }
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/inikulin/parse5?sponsor=1"
+ },
+ "integrity": "sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g==",
+ "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.0.0.tgz",
+ "version": "7.0.0"
},
- "node_modules/password-prompt/node_modules/shebang-regex": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
- "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
+ "node_modules/parseurl": {
"dev": true,
"engines": {
- "node": ">=0.10.0"
- }
+ "node": ">= 0.8"
+ },
+ "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+ "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+ "version": "1.3.3"
},
- "node_modules/password-prompt/node_modules/which": {
- "version": "1.3.1",
- "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
- "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
- "dev": true,
+ "node_modules/pascal-case": {
"dependencies": {
- "isexe": "^2.0.0"
+ "no-case": "^3.0.4",
+ "tslib": "^2.0.3"
},
- "bin": {
- "which": "bin/which"
- }
-=======
+ "dev": true,
+ "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
+ "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
+ "version": "3.1.2"
+ },
+ "node_modules/password-prompt": {
"dependencies": {
"ansi-escapes": "^4.3.2",
"cross-spawn": "^7.0.3"
@@ -19983,7 +16961,6 @@
"integrity": "sha512-HkrjG2aJlvF0t2BMH0e2LB/EHf3Lcq3fNMzy4GYHcQblAvOl+QQji1Lx7WRBMqpVK8p+KR7bCg7oqAMXtdgqyw==",
"resolved": "https://registry.npmjs.org/password-prompt/-/password-prompt-1.1.3.tgz",
"version": "1.1.3"
->>>>>>> develop
},
"node_modules/patch-package": {
"bin": {
@@ -20125,13 +17102,6 @@
"version": "2.7.1"
},
"node_modules/patch-package/node_modules/semver": {
-<<<<<<< HEAD
- "version": "5.7.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
- "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
- "dev": true,
-=======
->>>>>>> develop
"bin": {
"semver": "bin/semver"
},
@@ -20217,13 +17187,7 @@
"version": "3.0.4"
},
"node_modules/path-exists": {
-<<<<<<< HEAD
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
- "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=8"
},
@@ -20248,16 +17212,10 @@
"version": "3.1.1"
},
"node_modules/path-parse": {
-<<<<<<< HEAD
- "version": "1.0.7",
- "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
- "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
-=======
"dev": true,
"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
"version": "1.0.7"
->>>>>>> develop
},
"node_modules/path-root": {
"dependencies": {
@@ -20287,13 +17245,7 @@
"version": "0.1.7"
},
"node_modules/path-type": {
-<<<<<<< HEAD
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
- "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=8"
},
@@ -20326,13 +17278,7 @@
"version": "1.0.0"
},
"node_modules/picomatch": {
-<<<<<<< HEAD
- "version": "2.3.1",
- "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
- "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=8.6"
},
@@ -20487,11 +17433,6 @@
"version": "1.3.6"
},
"node_modules/postcss": {
-<<<<<<< HEAD
- "version": "8.4.24",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.24.tgz",
- "integrity": "sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==",
-=======
"dependencies": {
"nanoid": "^3.3.6",
"picocolors": "^1.0.0",
@@ -20500,7 +17441,6 @@
"engines": {
"node": "^10 || ^12 || >=14"
},
->>>>>>> develop
"funding": [
{
"type": "opencollective",
@@ -20661,16 +17601,6 @@
"version": "6.0.0"
},
"node_modules/postcss-loader/node_modules/semver": {
-<<<<<<< HEAD
- "version": "7.5.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz",
- "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==",
- "dev": true,
- "dependencies": {
- "lru-cache": "^6.0.0"
- },
-=======
->>>>>>> develop
"bin": {
"semver": "bin/semver.js"
},
@@ -21105,12 +18035,6 @@
"version": "7.1.1"
},
"node_modules/prebuild-install/node_modules/detect-libc": {
-<<<<<<< HEAD
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
- "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==",
-=======
->>>>>>> develop
"dev": true,
"engines": {
"node": ">=8"
@@ -21119,12 +18043,6 @@
"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.2.tgz",
"version": "2.0.2"
},
-<<<<<<< HEAD
- "node_modules/prelude-ls": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
- "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-=======
"node_modules/prebuild-install/node_modules/readable-stream": {
"dependencies": {
"inherits": "^2.0.3",
@@ -21169,7 +18087,6 @@
},
"node_modules/prelude-ls": {
"dev": true,
->>>>>>> develop
"engines": {
"node": ">= 0.8.0"
},
@@ -21356,13 +18273,7 @@
"version": "3.0.0"
},
"node_modules/punycode": {
-<<<<<<< HEAD
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
- "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=6"
},
@@ -21403,16 +18314,6 @@
"resolved": "https://registry.npmjs.org/query-string/-/query-string-6.14.1.tgz",
"version": "6.14.1"
},
- "node_modules/querystring": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
- "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==",
- "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
- "dev": true,
- "engines": {
- "node": ">=0.4.x"
- }
- },
"node_modules/querystringify": {
"dev": true,
"integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
@@ -21420,13 +18321,7 @@
"version": "2.2.0"
},
"node_modules/queue-microtask": {
-<<<<<<< HEAD
- "version": "1.2.3",
- "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
- "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-=======
"dev": true,
->>>>>>> develop
"funding": [
{
"type": "github",
@@ -21445,15 +18340,12 @@
"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
"version": "1.2.3"
},
-<<<<<<< HEAD
-=======
"node_modules/queue-tick": {
"dev": true,
"integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==",
"resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
"version": "1.0.1"
},
->>>>>>> develop
"node_modules/quick-lru": {
"dev": true,
"engines": {
@@ -21477,12 +18369,6 @@
"version": "0.29.0"
},
"node_modules/ramda-adjunct": {
-<<<<<<< HEAD
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/ramda-adjunct/-/ramda-adjunct-4.0.0.tgz",
- "integrity": "sha512-W/NiJAlZdwZ/iUkWEQQgRdH5Szqqet1WoVH9cdqDVjFbVaZHuJfJRvsxqHhvq6tZse+yVbFatLDLdVa30wBlGQ==",
-=======
->>>>>>> develop
"dev": true,
"engines": {
"node": ">=0.10.3"
@@ -21544,15 +18430,6 @@
"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
"version": "2.5.1"
},
- "node_modules/raw-body/node_modules/bytes": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
- "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
- "dev": true,
- "engines": {
- "node": ">= 0.8"
- }
- },
"node_modules/raw-loader": {
"dependencies": {
"loader-utils": "^2.0.0",
@@ -21859,13 +18736,6 @@
"version": "3.0.4"
},
"node_modules/react-redux": {
-<<<<<<< HEAD
- "version": "8.0.7",
- "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-8.0.7.tgz",
- "integrity": "sha512-1vRQuCQI5Y2uNmrMXg81RXKiBHY3jBzvCvNmZF437O/Z9/pZ+ba2uYHbemYXb3g8rjsacBGo+/wmfrQKzMhJsg==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/runtime": "^7.12.1",
"@types/hoist-non-react-statics": "^3.3.1",
@@ -21877,7 +18747,6 @@
"dev": true,
"integrity": "sha512-xJKYI189VwfsFc4CJvHqHlDrzyFTY/3vZACbE+rr/zQ34Xx1wQfB4OTOSeOSNrF6BDVe8OOdxIrAnMGXA3ggfw==",
"peerDependencies": {
- "@reduxjs/toolkit": "^1 || ^2.0.0-beta.0",
"@types/react": "^16.8 || ^17.0 || ^18.0",
"@types/react-dom": "^16.8 || ^17.0 || ^18.0",
"react": "^16.8 || ^17.0 || ^18.0",
@@ -21886,9 +18755,6 @@
"redux": "^4 || ^5.0.0-beta.0"
},
"peerDependenciesMeta": {
- "@reduxjs/toolkit": {
- "optional": true
- },
"@types/react": {
"optional": true
},
@@ -22005,12 +18871,6 @@
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
"version": "2.3.8"
},
- "node_modules/readable-stream/node_modules/isarray": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
- "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
- "dev": true
- },
"node_modules/readable-stream/node_modules/safe-buffer": {
"dev": true,
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
@@ -22101,8 +18961,6 @@
"resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.4.2.tgz",
"version": "2.4.2"
},
-<<<<<<< HEAD
-=======
"node_modules/reflect.getprototypeof": {
"dependencies": {
"call-bind": "^1.0.2",
@@ -22123,7 +18981,6 @@
"resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.3.tgz",
"version": "1.0.3"
},
->>>>>>> develop
"node_modules/refractor": {
"dependencies": {
"hastscript": "^6.0.0",
@@ -22167,24 +19024,12 @@
"version": "10.1.0"
},
"node_modules/regenerator-runtime": {
-<<<<<<< HEAD
- "version": "0.13.11",
- "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
- "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
- },
- "node_modules/regenerator-transform": {
- "version": "0.15.1",
- "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz",
- "integrity": "sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==",
- "dev": true,
-=======
"dev": true,
"integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==",
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
"version": "0.14.0"
},
"node_modules/regenerator-transform": {
->>>>>>> develop
"dependencies": {
"@babel/runtime": "^7.8.4"
},
@@ -22199,12 +19044,6 @@
"version": "2.2.11"
},
"node_modules/regexp.prototype.flags": {
-<<<<<<< HEAD
- "version": "1.5.0",
- "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
- "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
-=======
->>>>>>> develop
"dependencies": {
"call-bind": "^1.0.2",
"define-properties": "^1.2.0",
@@ -22610,17 +19449,11 @@
"version": "4.1.8"
},
"node_modules/resolve": {
-<<<<<<< HEAD
- "version": "1.22.2",
- "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
- "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
-=======
"bin": {
"resolve": "bin/resolve"
},
->>>>>>> develop
"dependencies": {
- "is-core-module": "^2.11.0",
+ "is-core-module": "^2.13.0",
"path-parse": "^1.0.7",
"supports-preserve-symlinks-flag": "^1.0.0"
},
@@ -22746,13 +19579,7 @@
"version": "0.12.0"
},
"node_modules/reusify": {
-<<<<<<< HEAD
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
- "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"iojs": ">=1.0.0",
"node": ">=0.10.0"
@@ -22762,15 +19589,6 @@
"version": "1.0.4"
},
"node_modules/rimraf": {
-<<<<<<< HEAD
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
- "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
- "dependencies": {
- "glob": "^7.1.3"
- },
-=======
->>>>>>> develop
"bin": {
"rimraf": "bin.js"
},
@@ -22795,16 +19613,10 @@
"version": "2.4.1"
},
"node_modules/run-parallel": {
-<<<<<<< HEAD
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
- "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-=======
"dependencies": {
"queue-microtask": "^1.2.2"
},
"dev": true,
->>>>>>> develop
"funding": [
{
"type": "github",
@@ -22841,8 +19653,6 @@
"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
"version": "1.14.1"
},
-<<<<<<< HEAD
-=======
"node_modules/safe-array-concat": {
"dependencies": {
"call-bind": "^1.0.2",
@@ -22867,7 +19677,6 @@
"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
"version": "2.0.5"
},
->>>>>>> develop
"node_modules/safe-buffer": {
"dev": true,
"funding": [
@@ -22889,12 +19698,6 @@
"version": "5.2.1"
},
"node_modules/safe-regex-test": {
-<<<<<<< HEAD
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
- "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
-=======
->>>>>>> develop
"dependencies": {
"call-bind": "^1.0.2",
"get-intrinsic": "^1.1.3",
@@ -22915,13 +19718,6 @@
"version": "2.1.2"
},
"node_modules/sanitize-html": {
-<<<<<<< HEAD
- "version": "2.10.0",
- "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.10.0.tgz",
- "integrity": "sha512-JqdovUd81dG4k87vZt6uA6YhDfWkUGruUu/aPmXLxXi45gZExnt9Bnw/qeQU8oGf82vPyaE0vO4aH0PbobB9JQ==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"deepmerge": "^4.2.2",
"escape-string-regexp": "^4.0.0",
@@ -22948,16 +19744,9 @@
"version": "4.0.0"
},
"node_modules/sass": {
-<<<<<<< HEAD
- "version": "1.63.3",
- "resolved": "https://registry.npmjs.org/sass/-/sass-1.63.3.tgz",
- "integrity": "sha512-ySdXN+DVpfwq49jG1+hmtDslYqpS7SkOR5GpF6o2bmb1RL/xS+wvPmegMvMywyfsmAV6p7TgwXYGrCZIFFbAHg==",
- "dev": true,
-=======
"bin": {
"sass": "sass.js"
},
->>>>>>> develop
"dependencies": {
"chokidar": ">=3.0.0 <4.0.0",
"immutable": "^4.0.0",
@@ -23021,16 +19810,6 @@
"version": "6.0.0"
},
"node_modules/sass-loader/node_modules/semver": {
-<<<<<<< HEAD
- "version": "7.5.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz",
- "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==",
- "dev": true,
- "dependencies": {
- "lru-cache": "^6.0.0"
- },
-=======
->>>>>>> develop
"bin": {
"semver": "bin/semver.js"
},
@@ -23052,17 +19831,10 @@
"version": "4.0.0"
},
"node_modules/sass/node_modules/immutable": {
-<<<<<<< HEAD
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.0.tgz",
- "integrity": "sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg==",
- "dev": true
-=======
"dev": true,
"integrity": "sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA==",
"resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.4.tgz",
"version": "4.3.4"
->>>>>>> develop
},
"node_modules/sax": {
"dev": true,
@@ -23079,13 +19851,6 @@
"version": "0.23.0"
},
"node_modules/schema-utils": {
-<<<<<<< HEAD
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.2.0.tgz",
- "integrity": "sha512-0zTyLGyDJYd/MBxG1AhJkKa6fpEBds4OQO2ut0w7OYG+ZGhGea09lijvzsqegYSik88zc7cUtIlnnO+/BvD6gQ==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@types/json-schema": "^7.0.8",
"ajv": "^6.12.5",
@@ -23117,12 +19882,6 @@
"version": "1.0.0"
},
"node_modules/semver": {
-<<<<<<< HEAD
- "version": "6.3.0",
- "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
- "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-=======
->>>>>>> develop
"bin": {
"semver": "bin/semver.js"
},
@@ -23288,22 +20047,14 @@
"version": "1.2.2"
},
"node_modules/sharp": {
-<<<<<<< HEAD
- "version": "0.32.1",
- "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.32.1.tgz",
- "integrity": "sha512-kQTFtj7ldpUqSe8kDxoGLZc1rnMFU0AO2pqbX6pLy3b7Oj8ivJIdoKNwxHVQG2HN6XpHPJqCSM2nsma2gOXvOg==",
- "dev": true,
- "hasInstallScript": true,
-=======
->>>>>>> develop
"dependencies": {
"color": "^4.2.3",
- "detect-libc": "^2.0.1",
+ "detect-libc": "^2.0.2",
"node-addon-api": "^6.1.0",
"prebuild-install": "^7.1.1",
- "semver": "^7.5.0",
+ "semver": "^7.5.4",
"simple-get": "^4.0.1",
- "tar-fs": "^2.1.1",
+ "tar-fs": "^3.0.4",
"tunnel-agent": "^0.6.0"
},
"dev": true,
@@ -23319,12 +20070,6 @@
"version": "0.32.6"
},
"node_modules/sharp/node_modules/detect-libc": {
-<<<<<<< HEAD
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
- "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==",
-=======
->>>>>>> develop
"dev": true,
"engines": {
"node": ">=8"
@@ -23352,16 +20097,6 @@
"version": "6.1.0"
},
"node_modules/sharp/node_modules/semver": {
-<<<<<<< HEAD
- "version": "7.5.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz",
- "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==",
- "dev": true,
- "dependencies": {
- "lru-cache": "^6.0.0"
- },
-=======
->>>>>>> develop
"bin": {
"semver": "bin/semver.js"
},
@@ -23421,12 +20156,6 @@
"version": "4.4.4"
},
"node_modules/side-channel": {
-<<<<<<< HEAD
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
- "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-=======
->>>>>>> develop
"dependencies": {
"call-bind": "^1.0.0",
"get-intrinsic": "^1.0.2",
@@ -23518,13 +20247,7 @@
"version": "1.0.5"
},
"node_modules/slash": {
-<<<<<<< HEAD
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
- "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=8"
},
@@ -23628,18 +20351,11 @@
"version": "2.5.2"
},
"node_modules/socket.io-client": {
-<<<<<<< HEAD
- "version": "4.6.1",
- "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.6.1.tgz",
- "integrity": "sha512-5UswCV6hpaRsNg5kkEHVcbBIXEYoVbMQaHJBXJCyEQ+CiFPV1NIOY0XOFWG4XR4GZcB8Kn6AsRs/9cy9TbqVMQ==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@socket.io/component-emitter": "~3.1.0",
"debug": "~4.3.2",
- "engine.io-client": "~6.4.0",
- "socket.io-parser": "~4.2.1"
+ "engine.io-client": "~6.5.1",
+ "socket.io-parser": "~4.2.4"
},
"dev": true,
"engines": {
@@ -23768,17 +20484,6 @@
"resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
"version": "2.0.1"
},
- "node_modules/stop-iteration-iterator": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz",
- "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==",
- "dependencies": {
- "internal-slot": "^1.0.4"
- },
- "engines": {
- "node": ">= 0.4"
- }
- },
"node_modules/stream-parser": {
"dependencies": {
"debug": "2"
@@ -23812,8 +20517,6 @@
"resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz",
"version": "1.1.0"
},
-<<<<<<< HEAD
-=======
"node_modules/streamx": {
"dependencies": {
"fast-fifo": "^1.1.0",
@@ -23824,7 +20527,6 @@
"resolved": "https://registry.npmjs.org/streamx/-/streamx-2.15.1.tgz",
"version": "2.15.1"
},
->>>>>>> develop
"node_modules/strict-uri-encode": {
"dev": true,
"engines": {
@@ -23835,16 +20537,10 @@
"version": "2.0.0"
},
"node_modules/string-natural-compare": {
-<<<<<<< HEAD
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/string-natural-compare/-/string-natural-compare-3.0.1.tgz",
- "integrity": "sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw=="
-=======
"dev": true,
"integrity": "sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw==",
"resolved": "https://registry.npmjs.org/string-natural-compare/-/string-natural-compare-3.0.1.tgz",
"version": "3.0.1"
->>>>>>> develop
},
"node_modules/string-similarity": {
"dependencies": {
@@ -23881,12 +20577,6 @@
"version": "8.0.0"
},
"node_modules/string.prototype.matchall": {
-<<<<<<< HEAD
- "version": "4.0.8",
- "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz",
- "integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==",
-=======
->>>>>>> develop
"dependencies": {
"call-bind": "^1.0.2",
"define-properties": "^1.1.4",
@@ -23906,12 +20596,6 @@
"version": "4.0.8"
},
"node_modules/string.prototype.trim": {
-<<<<<<< HEAD
- "version": "1.2.7",
- "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
- "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
-=======
->>>>>>> develop
"dependencies": {
"call-bind": "^1.0.2",
"define-properties": "^1.1.4",
@@ -23929,12 +20613,6 @@
"version": "1.2.7"
},
"node_modules/string.prototype.trimend": {
-<<<<<<< HEAD
- "version": "1.0.6",
- "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
- "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
-=======
->>>>>>> develop
"dependencies": {
"call-bind": "^1.0.2",
"define-properties": "^1.1.4",
@@ -23949,12 +20627,6 @@
"version": "1.0.6"
},
"node_modules/string.prototype.trimstart": {
-<<<<<<< HEAD
- "version": "1.0.6",
- "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
- "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
-=======
->>>>>>> develop
"dependencies": {
"call-bind": "^1.0.2",
"define-properties": "^1.1.4",
@@ -23999,12 +20671,6 @@
"version": "3.1.0"
},
"node_modules/strip-ansi": {
-<<<<<<< HEAD
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
- "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-=======
->>>>>>> develop
"dependencies": {
"ansi-regex": "^5.0.1"
},
@@ -24017,13 +20683,7 @@
"version": "6.0.1"
},
"node_modules/strip-bom": {
-<<<<<<< HEAD
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
- "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=4"
},
@@ -24049,13 +20709,7 @@
"version": "2.0.0"
},
"node_modules/strip-json-comments": {
-<<<<<<< HEAD
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
- "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=8"
},
@@ -24116,13 +20770,6 @@
"version": "2.0.0"
},
"node_modules/style-to-object": {
-<<<<<<< HEAD
- "version": "0.3.0",
- "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-0.3.0.tgz",
- "integrity": "sha512-CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"inline-style-parser": "0.1.1"
},
@@ -24154,12 +20801,6 @@
"version": "8.2.5"
},
"node_modules/supports-color": {
-<<<<<<< HEAD
- "version": "5.5.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
- "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-=======
->>>>>>> develop
"dependencies": {
"has-flag": "^3.0.0"
},
@@ -24172,13 +20813,7 @@
"version": "5.5.0"
},
"node_modules/supports-preserve-symlinks-flag": {
-<<<<<<< HEAD
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
- "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">= 0.4"
},
@@ -24223,19 +20858,12 @@
"version": "7.2.0"
},
"node_modules/swagger-client": {
-<<<<<<< HEAD
- "version": "3.19.8",
- "resolved": "https://registry.npmjs.org/swagger-client/-/swagger-client-3.19.8.tgz",
- "integrity": "sha512-+zfLp+1U6kOK+o9QyYDWMXxMYGKiOK20LFjNDtZsVzscbg1S3REKW5BaH9zioWKtK1x2zZWeiqnhNKDL8WgLTQ==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"@babel/runtime-corejs3": "^7.20.13",
- "@swagger-api/apidom-core": ">=0.70.0 <1.0.0",
- "@swagger-api/apidom-json-pointer": ">=0.70.0 <1.0.0",
- "@swagger-api/apidom-ns-openapi-3-1": ">=0.70.0 <1.0.0",
- "@swagger-api/apidom-reference": ">=0.70.0 <1.0.0",
+ "@swagger-api/apidom-core": ">=0.74.1 <1.0.0",
+ "@swagger-api/apidom-json-pointer": ">=0.74.1 <1.0.0",
+ "@swagger-api/apidom-ns-openapi-3-1": ">=0.74.1 <1.0.0",
+ "@swagger-api/apidom-reference": ">=0.74.1 <1.0.0",
"cookie": "~0.5.0",
"cross-fetch": "^3.1.5",
"deepmerge": "~4.3.0",
@@ -24336,15 +20964,8 @@
"version": "10.0.2"
},
"node_modules/swagger-ui-react": {
-<<<<<<< HEAD
- "version": "4.19.0",
- "resolved": "https://registry.npmjs.org/swagger-ui-react/-/swagger-ui-react-4.19.0.tgz",
- "integrity": "sha512-DuGGmvYVqzfGUxvnC2WX9wPjHvBGewtw40mfzPxQYijQsx88UY9hCxRgomT+IojsG8AzSkUVmoXW486vn9V2uQ==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
- "@babel/runtime-corejs3": "^7.21.5",
+ "@babel/runtime-corejs3": "^7.22.5",
"@braintree/sanitize-url": "=6.0.2",
"base64-js": "^1.5.1",
"classnames": "^2.3.1",
@@ -24463,57 +21084,9 @@
"version": "2.2.1"
},
"node_modules/tar-fs": {
-<<<<<<< HEAD
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
- "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
- "chownr": "^1.1.1",
"mkdirp-classic": "^0.5.2",
"pump": "^3.0.0",
-<<<<<<< HEAD
- "tar-stream": "^2.1.4"
- }
- },
- "node_modules/tar-stream": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
- "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
- "dev": true,
- "dependencies": {
- "bl": "^4.0.3",
- "end-of-stream": "^1.4.1",
- "fs-constants": "^1.0.0",
- "inherits": "^2.0.3",
- "readable-stream": "^3.1.1"
- },
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/tar-stream/node_modules/readable-stream": {
- "version": "3.6.2",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
- "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
- "dev": true,
- "dependencies": {
- "inherits": "^2.0.3",
- "string_decoder": "^1.1.1",
- "util-deprecate": "^1.0.1"
- },
- "engines": {
- "node": ">= 6"
- }
- },
- "node_modules/terser": {
- "version": "5.17.7",
- "resolved": "https://registry.npmjs.org/terser/-/terser-5.17.7.tgz",
- "integrity": "sha512-/bi0Zm2C6VAexlGgLlVxA0P2lru/sdLyfCVaRMfKVo9nWxbmz7f/sD8VPybPeSUJaJcwmCJis9pBIhcVcG1QcQ==",
- "dev": true,
-=======
"tar-stream": "^3.1.5"
},
"dev": true,
@@ -24536,7 +21109,6 @@
"bin": {
"terser": "bin/terser"
},
->>>>>>> develop
"dependencies": {
"@jridgewell/source-map": "^0.3.3",
"acorn": "^8.8.2",
@@ -24630,16 +21202,10 @@
"version": "2.20.3"
},
"node_modules/text-table": {
-<<<<<<< HEAD
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
- "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
-=======
"dev": true,
"integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
"version": "0.2.0"
->>>>>>> develop
},
"node_modules/through": {
"dev": true,
@@ -24679,13 +21245,7 @@
"version": "0.2.1"
},
"node_modules/to-fast-properties": {
-<<<<<<< HEAD
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
- "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=4"
},
@@ -24694,12 +21254,6 @@
"version": "2.0.0"
},
"node_modules/to-regex-range": {
-<<<<<<< HEAD
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
- "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-=======
->>>>>>> develop
"dependencies": {
"is-number": "^7.0.0"
},
@@ -24759,18 +21313,6 @@
"version": "0.6.7"
},
"node_modules/tree-sitter": {
-<<<<<<< HEAD
- "version": "0.20.1",
- "resolved": "https://registry.npmjs.org/tree-sitter/-/tree-sitter-0.20.1.tgz",
- "integrity": "sha512-Cmb8V0ocamHbgWMVhZIa+78k/7r8VCQ6+ePG8eYEAO7AccwWi06Ct4ATNiI94KwhIkRl0+OwZ42/5nk3GnEMpQ==",
- "dev": true,
- "hasInstallScript": true,
- "optional": true,
- "dependencies": {
- "nan": "^2.14.0",
- "prebuild-install": "^6.0.1"
- }
-=======
"dependencies": {
"nan": "^2.17.0",
"prebuild-install": "^7.1.1"
@@ -24781,7 +21323,6 @@
"optional": true,
"resolved": "https://registry.npmjs.org/tree-sitter/-/tree-sitter-0.20.4.tgz",
"version": "0.20.4"
->>>>>>> develop
},
"node_modules/tree-sitter-json": {
"dependencies": {
@@ -24805,54 +21346,6 @@
"resolved": "https://registry.npmjs.org/tree-sitter-yaml/-/tree-sitter-yaml-0.5.0.tgz",
"version": "0.5.0"
},
- "node_modules/tree-sitter/node_modules/node-abi": {
- "version": "2.30.1",
- "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.30.1.tgz",
- "integrity": "sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w==",
- "dev": true,
- "optional": true,
- "dependencies": {
- "semver": "^5.4.1"
- }
- },
- "node_modules/tree-sitter/node_modules/prebuild-install": {
- "version": "6.1.4",
- "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.4.tgz",
- "integrity": "sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ==",
- "dev": true,
- "optional": true,
- "dependencies": {
- "detect-libc": "^1.0.3",
- "expand-template": "^2.0.3",
- "github-from-package": "0.0.0",
- "minimist": "^1.2.3",
- "mkdirp-classic": "^0.5.3",
- "napi-build-utils": "^1.0.1",
- "node-abi": "^2.21.0",
- "npmlog": "^4.0.1",
- "pump": "^3.0.0",
- "rc": "^1.2.7",
- "simple-get": "^3.0.3",
- "tar-fs": "^2.0.0",
- "tunnel-agent": "^0.6.0"
- },
- "bin": {
- "prebuild-install": "bin.js"
- },
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/tree-sitter/node_modules/semver": {
- "version": "5.7.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
- "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
- "dev": true,
- "optional": true,
- "bin": {
- "semver": "bin/semver"
- }
- },
"node_modules/trim-repeated": {
"dependencies": {
"escape-string-regexp": "^1.0.2"
@@ -24888,12 +21381,6 @@
"version": "9.6.0"
},
"node_modules/tsconfig-paths": {
-<<<<<<< HEAD
- "version": "3.14.2",
- "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
- "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",
-=======
->>>>>>> develop
"dependencies": {
"@types/json5": "^0.0.29",
"json5": "^1.0.2",
@@ -24906,15 +21393,9 @@
"version": "3.14.2"
},
"node_modules/tsconfig-paths/node_modules/json5": {
-<<<<<<< HEAD
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
- "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-=======
"bin": {
"json5": "lib/cli.js"
},
->>>>>>> develop
"dependencies": {
"minimist": "^1.2.0"
},
@@ -24930,12 +21411,6 @@
"version": "2.4.1"
},
"node_modules/tsutils": {
-<<<<<<< HEAD
- "version": "3.21.0",
- "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
- "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
-=======
->>>>>>> develop
"dependencies": {
"tslib": "^1.8.1"
},
@@ -24951,16 +21426,10 @@
"version": "3.21.0"
},
"node_modules/tsutils/node_modules/tslib": {
-<<<<<<< HEAD
- "version": "1.14.1",
- "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
- "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-=======
"dev": true,
"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
"version": "1.14.1"
->>>>>>> develop
},
"node_modules/tunnel-agent": {
"dependencies": {
@@ -24981,12 +21450,6 @@
"version": "1.2.0"
},
"node_modules/type-check": {
-<<<<<<< HEAD
- "version": "0.4.0",
- "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
- "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-=======
->>>>>>> develop
"dependencies": {
"prelude-ls": "^1.2.1"
},
@@ -24999,13 +21462,7 @@
"version": "0.4.0"
},
"node_modules/type-fest": {
-<<<<<<< HEAD
- "version": "0.20.2",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
- "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=10"
},
@@ -25035,12 +21492,6 @@
"resolved": "https://registry.npmjs.org/type-of/-/type-of-2.0.1.tgz",
"version": "2.0.1"
},
-<<<<<<< HEAD
- "node_modules/typed-array-length": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
- "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
-=======
"node_modules/typed-array-buffer": {
"dependencies": {
"call-bind": "^1.0.2",
@@ -25093,7 +21544,6 @@
"version": "1.0.0"
},
"node_modules/typed-array-length": {
->>>>>>> develop
"dependencies": {
"call-bind": "^1.0.2",
"for-each": "^0.3.3",
@@ -25123,13 +21573,6 @@
"version": "3.1.5"
},
"node_modules/types-ramda": {
-<<<<<<< HEAD
- "version": "0.29.3",
- "resolved": "https://registry.npmjs.org/types-ramda/-/types-ramda-0.29.3.tgz",
- "integrity": "sha512-6z8/UCI5/kRorQ91Mo+TUXImHpGAhmhg8ZIdT/tNrG+xSQvDwJXYyT5Nlw2U5VpoKetUZVqQXYYLQyq5Bzccsg==",
- "dev": true,
-=======
->>>>>>> develop
"dependencies": {
"ts-toolbelt": "^9.6.0"
},
@@ -25139,13 +21582,6 @@
"version": "0.29.4"
},
"node_modules/typescript": {
-<<<<<<< HEAD
- "version": "5.1.3",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.3.tgz",
- "integrity": "sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw==",
- "peer": true,
-=======
->>>>>>> develop
"bin": {
"tsc": "bin/tsc",
"tsserver": "bin/tsserver"
@@ -25179,12 +21615,6 @@
"version": "1.0.35"
},
"node_modules/unbox-primitive": {
-<<<<<<< HEAD
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
- "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-=======
->>>>>>> develop
"dependencies": {
"call-bind": "^1.0.2",
"has-bigints": "^1.0.2",
@@ -25483,17 +21913,6 @@
"version": "1.0.0"
},
"node_modules/unraw": {
-<<<<<<< HEAD
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/unraw/-/unraw-2.0.1.tgz",
- "integrity": "sha512-tdOvLfRzHolwYcHS6HIX860MkK9LQ4+oLuNwFYL7bpgTEO64PZrcQxkisgwJYCfF8sKiWLwwu1c83DvMkbefIQ==",
- "dev": true
- },
- "node_modules/update-browserslist-db": {
- "version": "1.0.11",
- "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz",
- "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==",
-=======
"dev": true,
"integrity": "sha512-08/DA66UF65OlpUDIQtbJyrqTR0jTAlJ+jsnkQ4jxR7+K5g5YG1APZKQSMCE1vqqmD+2pv6+IdEjmopFatacvg==",
"resolved": "https://registry.npmjs.org/unraw/-/unraw-3.0.0.tgz",
@@ -25508,7 +21927,6 @@
"picocolors": "^1.0.0"
},
"dev": true,
->>>>>>> develop
"funding": [
{
"type": "opencollective",
@@ -25549,12 +21967,6 @@
"version": "2.0.2"
},
"node_modules/uri-js": {
-<<<<<<< HEAD
- "version": "4.4.1",
- "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
- "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-=======
->>>>>>> develop
"dependencies": {
"punycode": "^2.1.0"
},
@@ -25564,16 +21976,6 @@
"version": "4.4.1"
},
"node_modules/url": {
-<<<<<<< HEAD
- "version": "0.11.0",
- "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
- "integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==",
- "dev": true,
- "dependencies": {
- "punycode": "1.3.2",
- "querystring": "0.2.0"
- }
-=======
"dependencies": {
"punycode": "^1.4.1",
"qs": "^6.11.0"
@@ -25582,7 +21984,6 @@
"integrity": "sha512-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA==",
"resolved": "https://registry.npmjs.org/url/-/url-0.11.1.tgz",
"version": "0.11.1"
->>>>>>> develop
},
"node_modules/url-loader": {
"dependencies": {
@@ -25622,17 +22023,10 @@
"version": "1.5.10"
},
"node_modules/url/node_modules/punycode": {
-<<<<<<< HEAD
- "version": "1.3.2",
- "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
- "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==",
- "dev": true
-=======
"dev": true,
"integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
"version": "1.4.1"
->>>>>>> develop
},
"node_modules/use-sync-external-store": {
"dev": true,
@@ -25699,17 +22093,10 @@
"version": "8.3.2"
},
"node_modules/v8-compile-cache": {
-<<<<<<< HEAD
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
- "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
- "dev": true
-=======
"dev": true,
"integrity": "sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw==",
"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz",
"version": "2.4.0"
->>>>>>> develop
},
"node_modules/valid-url": {
"dev": true,
@@ -25718,12 +22105,6 @@
"version": "1.0.9"
},
"node_modules/validator": {
-<<<<<<< HEAD
- "version": "13.9.0",
- "resolved": "https://registry.npmjs.org/validator/-/validator-13.9.0.tgz",
- "integrity": "sha512-B+dGG8U3fdtM0/aNK4/X8CXq/EcxU2WPrPEkJGslb47qyHsxmbggTWK0yEA4qnYVNF+nxNlN88o14hIcPmSIEA==",
-=======
->>>>>>> develop
"engines": {
"node": ">= 0.10"
},
@@ -25836,12 +22217,6 @@
"version": "4.0.0-beta.3"
},
"node_modules/web-tree-sitter": {
-<<<<<<< HEAD
- "version": "0.20.7",
- "resolved": "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.20.7.tgz",
- "integrity": "sha512-flC9JJmTII9uAeeYpWF8hxDJ7bfY+leldQryetll8Nv4WgI+MXc6h7TiyAZASWl9uC9TvmfdgOjZn1DAQecb3A==",
-=======
->>>>>>> develop
"dev": true,
"integrity": "sha512-zKGJW9r23y3BcJusbgvnOH2OYAW40MXAOi9bi3Gcc7T4Gms9WWgXF8m6adsJWpGJEhgOzCrfiz1IzKowJWrtYw==",
"optional": true,
@@ -25855,16 +22230,9 @@
"version": "3.0.1"
},
"node_modules/webpack": {
-<<<<<<< HEAD
- "version": "5.86.0",
- "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.86.0.tgz",
- "integrity": "sha512-3BOvworZ8SO/D4GVP+GoRC3fVeg5MO4vzmq8TJJEkdmopxyazGDxN8ClqN12uzrZW9Tv8EED8v5VSb6Sqyi0pg==",
- "dev": true,
-=======
"bin": {
"webpack": "bin/webpack.js"
},
->>>>>>> develop
"dependencies": {
"@types/eslint-scope": "^3.7.3",
"@types/estree": "^1.0.0",
@@ -25875,7 +22243,7 @@
"acorn-import-assertions": "^1.9.0",
"browserslist": "^4.14.5",
"chrome-trace-event": "^1.0.2",
- "enhanced-resolve": "^5.14.1",
+ "enhanced-resolve": "^5.15.0",
"es-module-lexer": "^1.2.1",
"eslint-scope": "5.1.1",
"events": "^3.2.0",
@@ -25885,7 +22253,7 @@
"loader-runner": "^4.2.0",
"mime-types": "^2.1.27",
"neo-async": "^2.6.2",
- "schema-utils": "^3.1.2",
+ "schema-utils": "^3.2.0",
"tapable": "^2.1.1",
"terser-webpack-plugin": "^5.3.7",
"watchpack": "^2.4.0",
@@ -26010,12 +22378,6 @@
"version": "2.0.2"
},
"node_modules/which-boxed-primitive": {
-<<<<<<< HEAD
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
- "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-=======
->>>>>>> develop
"dependencies": {
"is-bigint": "^1.0.1",
"is-boolean-object": "^1.1.0",
@@ -26031,12 +22393,6 @@
"resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
"version": "1.0.2"
},
-<<<<<<< HEAD
- "node_modules/which-collection": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz",
- "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==",
-=======
"node_modules/which-builtin-type": {
"dependencies": {
"function.prototype.name": "^1.1.5",
@@ -26070,7 +22426,6 @@
"version": "2.0.5"
},
"node_modules/which-collection": {
->>>>>>> develop
"dependencies": {
"is-map": "^2.0.1",
"is-set": "^2.0.1",
@@ -26092,19 +22447,12 @@
"version": "2.0.1"
},
"node_modules/which-typed-array": {
-<<<<<<< HEAD
- "version": "1.1.9",
- "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz",
- "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==",
-=======
->>>>>>> develop
"dependencies": {
"available-typed-arrays": "^1.0.5",
"call-bind": "^1.0.2",
"for-each": "^0.3.3",
"gopd": "^1.0.1",
- "has-tostringtag": "^1.0.0",
- "is-typed-array": "^1.1.10"
+ "has-tostringtag": "^1.0.0"
},
"dev": true,
"engines": {
@@ -26117,16 +22465,6 @@
"resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
"version": "1.1.11"
},
- "node_modules/wide-align": {
- "version": "1.1.5",
- "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
- "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
- "dev": true,
- "optional": true,
- "dependencies": {
- "string-width": "^1.0.2 || 2 || 3 || 4"
- }
- },
"node_modules/widest-line": {
"dependencies": {
"string-width": "^4.0.0"
@@ -26145,14 +22483,6 @@
"resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",
"version": "2.0.1"
},
- "node_modules/word-wrap": {
- "version": "1.2.3",
- "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
- "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
- "engines": {
- "node": ">=0.10.0"
- }
- },
"node_modules/wrap-ansi": {
"dependencies": {
"ansi-styles": "^4.0.0",
@@ -26275,12 +22605,6 @@
"version": "2.0.0"
},
"node_modules/xstate": {
-<<<<<<< HEAD
- "version": "4.37.2",
- "resolved": "https://registry.npmjs.org/xstate/-/xstate-4.37.2.tgz",
- "integrity": "sha512-Qm337O49CRTZ3PRyRuK6b+kvI+D3JGxXIZCTul+xEsyFCVkTFDt5jixaL1nBWcUBcaTQ9um/5CRGVItPi7fveg==",
-=======
->>>>>>> develop
"dev": true,
"funding": {
"type": "opencollective",
@@ -26312,23 +22636,12 @@
"version": "4.0.3"
},
"node_modules/yallist": {
-<<<<<<< HEAD
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
- "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
- },
- "node_modules/yaml": {
- "version": "2.3.1",
- "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz",
- "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==",
-=======
"dev": true,
"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
"version": "3.1.1"
},
"node_modules/yaml": {
->>>>>>> develop
"dev": true,
"engines": {
"node": ">= 14"
@@ -26448,13 +22761,7 @@
"version": "4.1.0"
},
"node_modules/yocto-queue": {
-<<<<<<< HEAD
- "version": "0.1.0",
- "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
- "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-=======
"dev": true,
->>>>>>> develop
"engines": {
"node": ">=10"
},
diff --git a/docs/src/pages/index.js b/docs/src/pages/index.js
index 81f22b42..f324abf0 100644
--- a/docs/src/pages/index.js
+++ b/docs/src/pages/index.js
@@ -15,4 +15,20 @@ const IndexPage = () => (
);
+export function Head() {
+ return (
+ <>
+
+
+
+
+ );
+}
+
export default IndexPage;