From d9f6103618d95ad296085105b6db5a34883fb8c3 Mon Sep 17 00:00:00 2001 From: leineveber Date: Mon, 6 Feb 2023 15:19:55 +0300 Subject: [PATCH] fix(yarn.lock): fix conflicts --- yarn.lock | 5633 +---------------------------------------------------- 1 file changed, 40 insertions(+), 5593 deletions(-) diff --git a/yarn.lock b/yarn.lock index d1905a8f..eeb231e4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6,29 +6,12 @@ __metadata: cacheKey: 8 "@ampproject/remapping@npm:^2.1.0": -<<<<<<< HEAD -<<<<<<< HEAD version: 2.2.0 resolution: "@ampproject/remapping@npm:2.2.0" dependencies: "@jridgewell/gen-mapping": ^0.1.0 "@jridgewell/trace-mapping": ^0.3.9 checksum: d74d170d06468913921d72430259424b7e4c826b5a7d39ff839a29d547efb97dc577caa8ba3fb5cf023624e9af9d09651afc3d4112a45e2050328abc9b3a2292 -======= - version: 2.1.2 - resolution: "@ampproject/remapping@npm:2.1.2" - dependencies: - "@jridgewell/trace-mapping": ^0.3.0 - checksum: e023f92cdd9723f3042cde3b4d922adfeef0e198aa73486b0b6c034ad36af5f96e5c0cc72b335b30b2eb9852d907efc92af6bfcd3f4b4d286177ee32a189cf92 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - version: 2.2.0 - resolution: "@ampproject/remapping@npm:2.2.0" - dependencies: - "@jridgewell/gen-mapping": ^0.1.0 - "@jridgewell/trace-mapping": ^0.3.9 - checksum: d74d170d06468913921d72430259424b7e4c826b5a7d39ff839a29d547efb97dc577caa8ba3fb5cf023624e9af9d09651afc3d4112a45e2050328abc9b3a2292 ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard @@ -106,31 +89,10 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"@babel/compat-data@npm:^7.17.7, @babel/compat-data@npm:^7.20.0, @babel/compat-data@npm:^7.20.1": - version: 7.20.5 - resolution: "@babel/compat-data@npm:7.20.5" - checksum: 523790c43ef6388fae91d1ca9acf1ab0e1b22208dcd39c0e5e7a6adf0b48a133f1831be8d5931a72ecd48860f3e3fb777cb89840794abd8647a5c8e5cfab484e -======= -"@babel/compat-data@npm:^7.13.11, @babel/compat-data@npm:^7.16.8, @babel/compat-data@npm:^7.17.0, @babel/compat-data@npm:^7.17.7": - version: 7.17.7 - resolution: "@babel/compat-data@npm:7.17.7" - checksum: bf13476676884ce9afc199747ff82f3bcd6d42a9cfb01ce91bdb762b83ea11ec619b6ec532d1a80469ab14f191f33b5d4b9f8796fa8be3bc728d42b0c5e737e3 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= -"@babel/compat-data@npm:^7.17.7, @babel/compat-data@npm:^7.18.8, @babel/compat-data@npm:^7.19.0": - version: 7.19.0 - resolution: "@babel/compat-data@npm:7.19.0" - checksum: f90d25a3779578c230ad0632e12ffd5ee1033614dee2786f7f1567823a78923da7185638eedd7166f31e4771a3398ae6a28ab8e680b96cc25bafb38a3b66ff11 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "@babel/compat-data@npm:^7.17.7, @babel/compat-data@npm:^7.20.1, @babel/compat-data@npm:^7.20.5": version: 7.20.14 resolution: "@babel/compat-data@npm:7.20.14" checksum: 6c9efe36232094e4ad0b70d165587f21ca718e5d011f7a52a77a18502a7524e90e2855aa5a2e086395bcfd21bd2c7c99128dcd8d9fdffe94316b72acf5c66f2c ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -158,56 +120,12 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -"@babel/core@npm:^7.1.0, @babel/core@npm:^7.12.3, @babel/core@npm:^7.16.0, @babel/core@npm:^7.17.9, @babel/core@npm:^7.7.5, @babel/core@npm:^7.8.4": - version: 7.20.5 - resolution: "@babel/core@npm:7.20.5" - dependencies: - "@ampproject/remapping": ^2.1.0 - "@babel/code-frame": ^7.18.6 - "@babel/generator": ^7.20.5 - "@babel/helper-compilation-targets": ^7.20.0 - "@babel/helper-module-transforms": ^7.20.2 - "@babel/helpers": ^7.20.5 - "@babel/parser": ^7.20.5 - "@babel/template": ^7.18.10 - "@babel/traverse": ^7.20.5 - "@babel/types": ^7.20.5 -======= -"@babel/core@npm:>=7.9.0, @babel/core@npm:^7.1.0, @babel/core@npm:^7.12.3, @babel/core@npm:^7.16.0, @babel/core@npm:^7.7.5, @babel/core@npm:^7.8.4": - version: 7.17.9 - resolution: "@babel/core@npm:7.17.9" - dependencies: - "@ampproject/remapping": ^2.1.0 - "@babel/code-frame": ^7.16.7 - "@babel/generator": ^7.17.9 - "@babel/helper-compilation-targets": ^7.17.7 - "@babel/helper-module-transforms": ^7.17.7 - "@babel/helpers": ^7.17.9 - "@babel/parser": ^7.17.9 - "@babel/template": ^7.16.7 - "@babel/traverse": ^7.17.9 - "@babel/types": ^7.17.0 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= "@babel/core@npm:^7.1.0, @babel/core@npm:^7.12.3, @babel/core@npm:^7.16.0, @babel/core@npm:^7.17.9, @babel/core@npm:^7.7.5, @babel/core@npm:^7.8.4": version: 7.20.12 resolution: "@babel/core@npm:7.20.12" dependencies: "@ampproject/remapping": ^2.1.0 "@babel/code-frame": ^7.18.6 -<<<<<<< HEAD - "@babel/generator": ^7.19.0 - "@babel/helper-compilation-targets": ^7.19.0 - "@babel/helper-module-transforms": ^7.19.0 - "@babel/helpers": ^7.19.0 - "@babel/parser": ^7.19.0 - "@babel/template": ^7.18.10 - "@babel/traverse": ^7.19.0 - "@babel/types": ^7.19.0 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "@babel/generator": ^7.20.7 "@babel/helper-compilation-targets": ^7.20.7 "@babel/helper-module-transforms": ^7.20.11 @@ -216,39 +134,12 @@ __metadata: "@babel/template": ^7.20.7 "@babel/traverse": ^7.20.12 "@babel/types": ^7.20.7 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) convert-source-map: ^1.7.0 debug: ^4.1.0 gensync: ^1.0.0-beta.2 json5: ^2.2.2 semver: ^6.3.0 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - checksum: 9547f1e6364bc58c3621e3b17ec17f0d034ff159e5a520091d9381608d40af3be4042dd27c20ad7d3e938422d75850ac56a3758d6801d65df701557af4bd244b - languageName: node - linkType: hard - -"@babel/generator@npm:^7.12.1, @babel/generator@npm:^7.20.5": - version: 7.20.5 - resolution: "@babel/generator@npm:7.20.5" - dependencies: - "@babel/types": ^7.20.5 - "@jridgewell/gen-mapping": ^0.3.2 - jsesc: ^2.5.1 - checksum: 31c10d1e122f08cf755a24bd6f5d197f47eceba03f1133759687d00ab72d210e60ba4011da42f368b6e9fa85cbfda7dc4adb9889c2c20cc5c34bb2d57c1deab7 -======= - checksum: 0e686b1be444d25494424065238931f2b3df908bf072b72bab973acfd6d27a481fc280c9cd8a3c6fe2c46beee50e0d2307468d8b15b64dc4036f025e75f6609d -======= - checksum: 2d301e4561a170bb584a735ec412de8fdc40b2052e12380d4a5e36781be5af1fd2a60552e7f0764b0a491a242f20105265bd2a10ff57b30c2842684f02dbb5a2 ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= - checksum: 0d5b52b552e215802d2fd7b266611c390d90b28dece09db8a142666c32928c5d404eb72a95630b4cb726c4d80a53fcdc2d6464cd7ad28bb26087475f1b2205e2 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: 62e6c3e2149a70b5c9729ef5f0d3e2e97e9dcde89fc039c8d8e3463d5d7ba9b29ee84d10faf79b61532ac1645aa62f2bd42338320617e6e3a8a4d8e2a27076e7 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -259,21 +150,7 @@ __metadata: "@babel/types": ^7.20.7 "@jridgewell/gen-mapping": ^0.3.2 jsesc: ^2.5.1 -<<<<<<< HEAD -<<<<<<< HEAD - source-map: ^0.5.0 -<<<<<<< HEAD - checksum: e7344b9b4559115f2754ecc2ae9508412ea6a8f617544cd3d3f17cabc727bd30630765f96c8a4ebc8901ded1492a3a6c23d695a4f1e8f3042f860b30c891985c ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - checksum: afbdd4afbf731ba0a17e7e2d9a2291e6461259af887f88f1178f63514a86e9c18cec462ae8f9cd6df9ba15a18296f47b0e151202bb4f834f7338ac0c07ec8dc8 ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= - checksum: aa3d5785cf8f8e81672dcc61aef351188efeadb20d9f66d79113d82cbcf3bbbdeb829989fa14582108572ddbc4e4027bdceb06ccaf5ec40fa93c2dda8fbcd4aa ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: 5f6aa2d86af26e76d276923a5c34191124a119b16ee9ccc34aef654a7dec84fbd7d2daed2e6458a6a06bf87f3661deb77c9fea59b8f67faff5c90793c96d76d6 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -296,40 +173,9 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"@babel/helper-compilation-targets@npm:^7.17.7, @babel/helper-compilation-targets@npm:^7.18.9, @babel/helper-compilation-targets@npm:^7.20.0": - version: 7.20.0 - resolution: "@babel/helper-compilation-targets@npm:7.20.0" - dependencies: - "@babel/compat-data": ^7.20.0 - "@babel/helper-validator-option": ^7.18.6 - browserslist: ^4.21.3 - semver: ^6.3.0 - peerDependencies: - "@babel/core": ^7.0.0 - checksum: bc183f2109648849c8fde0b3c5cf08adf2f7ad6dc617b546fd20f34c8ef574ee5ee293c8d1bd0ed0221212e8f5907cdc2c42097870f1dcc769a654107d82c95b - languageName: node - linkType: hard - -"@babel/helper-create-class-features-plugin@npm:^7.18.6, @babel/helper-create-class-features-plugin@npm:^7.20.2, @babel/helper-create-class-features-plugin@npm:^7.20.5": - version: 7.20.5 - resolution: "@babel/helper-create-class-features-plugin@npm:7.20.5" -======= -"@babel/helper-compilation-targets@npm:^7.13.0, @babel/helper-compilation-targets@npm:^7.16.7, @babel/helper-compilation-targets@npm:^7.17.7": - version: 7.17.7 - resolution: "@babel/helper-compilation-targets@npm:7.17.7" -======= -"@babel/helper-compilation-targets@npm:^7.17.7, @babel/helper-compilation-targets@npm:^7.18.9, @babel/helper-compilation-targets@npm:^7.19.0": - version: 7.19.0 - resolution: "@babel/helper-compilation-targets@npm:7.19.0" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "@babel/helper-compilation-targets@npm:^7.17.7, @babel/helper-compilation-targets@npm:^7.18.9, @babel/helper-compilation-targets@npm:^7.20.0, @babel/helper-compilation-targets@npm:^7.20.7": version: 7.20.7 resolution: "@babel/helper-compilation-targets@npm:7.20.7" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/compat-data": ^7.20.5 "@babel/helper-validator-option": ^7.18.6 @@ -342,53 +188,9 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"@babel/helper-create-class-features-plugin@npm:^7.16.10, @babel/helper-create-class-features-plugin@npm:^7.16.7, @babel/helper-create-class-features-plugin@npm:^7.17.6": - version: 7.17.6 - resolution: "@babel/helper-create-class-features-plugin@npm:7.17.6" ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) - dependencies: - "@babel/helper-annotate-as-pure": ^7.18.6 - "@babel/helper-environment-visitor": ^7.18.9 - "@babel/helper-function-name": ^7.19.0 - "@babel/helper-member-expression-to-functions": ^7.18.9 - "@babel/helper-optimise-call-expression": ^7.18.6 - "@babel/helper-replace-supers": ^7.19.1 - "@babel/helper-split-export-declaration": ^7.18.6 - peerDependencies: - "@babel/core": ^7.0.0 -<<<<<<< HEAD - checksum: 51b0662cc44ae5fe3691ed552f97312006709ec3f5321a5e5b5a139a5743eaaf65987f30ee7c171af80ab77460fb57c1970b0b1583dd70d90b58e4433b117a1b - languageName: node - linkType: hard - -"@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.20.5": - version: 7.20.5 - resolution: "@babel/helper-create-regexp-features-plugin@npm:7.20.5" - dependencies: - "@babel/helper-annotate-as-pure": ^7.18.6 - regexpu-core: ^5.2.1 - peerDependencies: - "@babel/core": ^7.0.0 - checksum: 7f29c3cb7447cca047b0d394f8ab98e4923d00e86a7afa56e5df9770c48ec107891505d2d1f06b720ecc94ed24bf58d90986cc35fe4a43b549eb7b7a5077b693 -======= - checksum: d85a5b3f9a18a661372d77462e6ea2a6a03f1083f8b3055ed165284214af9ea6ad677f6bcc4b5ce215da27f95fa93064580d4b6723b578c480ecf17dd31a4307 -======= -"@babel/helper-create-class-features-plugin@npm:^7.16.10, @babel/helper-create-class-features-plugin@npm:^7.16.7, @babel/helper-create-class-features-plugin@npm:^7.17.6, @babel/helper-create-class-features-plugin@npm:^7.17.9": - version: 7.17.9 - resolution: "@babel/helper-create-class-features-plugin@npm:7.17.9" -======= -"@babel/helper-create-class-features-plugin@npm:^7.18.6, @babel/helper-create-class-features-plugin@npm:^7.19.0": - version: 7.19.0 - resolution: "@babel/helper-create-class-features-plugin@npm:7.19.0" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "@babel/helper-create-class-features-plugin@npm:^7.18.6, @babel/helper-create-class-features-plugin@npm:^7.20.12, @babel/helper-create-class-features-plugin@npm:^7.20.5, @babel/helper-create-class-features-plugin@npm:^7.20.7": version: 7.20.12 resolution: "@babel/helper-create-class-features-plugin@npm:7.20.12" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/helper-annotate-as-pure": ^7.18.6 "@babel/helper-environment-visitor": ^7.18.9 @@ -400,16 +202,7 @@ __metadata: "@babel/helper-split-export-declaration": ^7.18.6 peerDependencies: "@babel/core": ^7.0.0 -<<<<<<< HEAD -<<<<<<< HEAD - checksum: db7be8852096084883dbbd096f925976695e5b34919a888fded9fd359d75d9994960e459f4eeb51ff6700109f83be6c1359e57809deb3fe36fc589b2a208b6d7 ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= - checksum: f0c6fb77b6f113d70f308e7093f60dd465b697818badf5df0519d8dd12b6bfb1f4ad300b923207ce9f9c1c940ef58bff12ac4270c0863eadf9e303b7dd6d01b6 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: 1e9ed4243b75278fa24deb40dc62bf537b79307987223a2d2d2ae5abf7ba6dc8435d6e3bb55d52ceb30d3e1eba88e7eb6a1885a8bb519e5cfc3e9dedb97d43e6 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -421,26 +214,6 @@ __metadata: regexpu-core: ^5.2.1 peerDependencies: "@babel/core": ^7.0.0 -<<<<<<< HEAD -<<<<<<< HEAD - checksum: eb66d9241544c705e9ce96d2d122b595ef52d926e6e031653e09af8a01050bd9d7e7fee168bf33a863342774d7d6a8cc7e8e9e5a45b955e9c01121c7a2d51708 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) - languageName: node - linkType: hard - -"@babel/helper-define-polyfill-provider@npm:^0.3.3": - version: 0.3.3 - resolution: "@babel/helper-define-polyfill-provider@npm:0.3.3" -======= - checksum: 811cc90afe9fc25a74ed37fc0c1361a4a91b0b940235dd3958e3f03b366d40a903b40fc93b51bcb93be774aba573219f8f215664bea1d1301f58797ca6854f3f - languageName: node - linkType: hard - -"@babel/helper-define-polyfill-provider@npm:^0.3.2": - version: 0.3.2 - resolution: "@babel/helper-define-polyfill-provider@npm:0.3.2" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: 7f29c3cb7447cca047b0d394f8ab98e4923d00e86a7afa56e5df9770c48ec107891505d2d1f06b720ecc94ed24bf58d90986cc35fe4a43b549eb7b7a5077b693 languageName: node linkType: hard @@ -448,7 +221,6 @@ __metadata: "@babel/helper-define-polyfill-provider@npm:^0.3.3": version: 0.3.3 resolution: "@babel/helper-define-polyfill-provider@npm:0.3.3" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/helper-compilation-targets": ^7.17.7 "@babel/helper-plugin-utils": ^7.16.7 @@ -458,15 +230,7 @@ __metadata: semver: ^6.1.2 peerDependencies: "@babel/core": ^7.4.0-0 -<<<<<<< HEAD -<<<<<<< HEAD - checksum: 8e3fe75513302e34f6d92bd67b53890e8545e6c5bca8fe757b9979f09d68d7e259f6daea90dc9e01e332c4f8781bda31c5fe551c82a277f9bc0bec007aed497c -======= - checksum: 8f693ab8e9d73873c2e547c7764c7d32d73c14f8dcefdd67fd3a038eb75527e2222aa53412ea673b9bfc01c32a8779a60e77a7381bbdd83452f05c9b7ef69c2c ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: 8e3fe75513302e34f6d92bd67b53890e8545e6c5bca8fe757b9979f09d68d7e259f6daea90dc9e01e332c4f8781bda31c5fe551c82a277f9bc0bec007aed497c ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -496,65 +260,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -"@babel/helper-hoist-variables@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/helper-hoist-variables@npm:7.18.6" - dependencies: - "@babel/types": ^7.18.6 - checksum: fd9c35bb435fda802bf9ff7b6f2df06308a21277c6dec2120a35b09f9de68f68a33972e2c15505c1a1a04b36ec64c9ace97d4a9e26d6097b76b4396b7c5fa20f - languageName: node - linkType: hard - -"@babel/helper-member-expression-to-functions@npm:^7.18.9": - version: 7.18.9 - resolution: "@babel/helper-member-expression-to-functions@npm:7.18.9" - dependencies: - "@babel/types": ^7.18.9 - checksum: fcf8184e3b55051c4286b2cbedf0eccc781d0f3c9b5cbaba582eca19bf0e8d87806cdb7efc8554fcb969ceaf2b187d5ea748d40022d06ec7739fbb18c1b19a7a -======= -"@babel/helper-function-name@npm:^7.16.7, @babel/helper-function-name@npm:^7.17.9": - version: 7.17.9 - resolution: "@babel/helper-function-name@npm:7.17.9" - dependencies: - "@babel/template": ^7.16.7 - "@babel/types": ^7.17.0 - checksum: a59b2e5af56d8f43b9b0019939a43774754beb7cb01a211809ca8031c71890999d07739e955343135ec566c4d8ff725435f1f60fb0af3bb546837c1f9f84f496 ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) - languageName: node - linkType: hard - -"@babel/helper-module-imports@npm:^7.0.0, @babel/helper-module-imports@npm:^7.16.0, @babel/helper-module-imports@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/helper-module-imports@npm:7.18.6" - dependencies: - "@babel/types": ^7.18.6 - checksum: f393f8a3b3304b1b7a288a38c10989de754f01d29caf62ce7c4e5835daf0a27b81f3ac687d9d2780d39685aae7b55267324b512150e7b2be967b0c493b6a1def - languageName: node - linkType: hard - -<<<<<<< HEAD -"@babel/helper-module-transforms@npm:^7.12.1, @babel/helper-module-transforms@npm:^7.18.6, @babel/helper-module-transforms@npm:^7.19.6, @babel/helper-module-transforms@npm:^7.20.2": - version: 7.20.2 - resolution: "@babel/helper-module-transforms@npm:7.20.2" - dependencies: - "@babel/helper-environment-visitor": ^7.18.9 - "@babel/helper-module-imports": ^7.18.6 - "@babel/helper-simple-access": ^7.20.2 - "@babel/helper-split-export-declaration": ^7.18.6 - "@babel/helper-validator-identifier": ^7.19.1 - "@babel/template": ^7.18.10 - "@babel/traverse": ^7.20.1 - "@babel/types": ^7.20.2 - checksum: 33a60ca115f6fce2c9d98e2a2e5649498aa7b23e2ae3c18745d7a021487708fc311458c33542f299387a0da168afccba94116e077f2cce49ae9e5ab83399e8a2 -"@babel/helper-member-expression-to-functions@npm:^7.16.7": -======= -"@babel/helper-member-expression-to-functions@npm:^7.16.7, @babel/helper-member-expression-to-functions@npm:^7.17.7": ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) - version: 7.17.7 - resolution: "@babel/helper-member-expression-to-functions@npm:7.17.7" -======= "@babel/helper-hoist-variables@npm:^7.18.6": version: 7.18.6 resolution: "@babel/helper-hoist-variables@npm:7.18.6" @@ -576,51 +281,15 @@ __metadata: "@babel/helper-module-imports@npm:^7.0.0, @babel/helper-module-imports@npm:^7.16.0, @babel/helper-module-imports@npm:^7.18.6": version: 7.18.6 resolution: "@babel/helper-module-imports@npm:7.18.6" ->>>>>>> 217c233f (fix(slider): fixes due to new version) dependencies: "@babel/types": ^7.18.6 checksum: f393f8a3b3304b1b7a288a38c10989de754f01d29caf62ce7c4e5835daf0a27b81f3ac687d9d2780d39685aae7b55267324b512150e7b2be967b0c493b6a1def languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -"@babel/helper-optimise-call-expression@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/helper-optimise-call-expression@npm:7.18.6" - dependencies: - "@babel/types": ^7.18.6 - checksum: e518fe8418571405e21644cfb39cf694f30b6c47b10b006609a92469ae8b8775cbff56f0b19732343e2ea910641091c5a2dc73b56ceba04e116a33b0f8bd2fbd - languageName: node - linkType: hard - -"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.16.7, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.18.9, @babel/helper-plugin-utils@npm:^7.19.0, @babel/helper-plugin-utils@npm:^7.20.2, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3": - version: 7.20.2 - resolution: "@babel/helper-plugin-utils@npm:7.20.2" - checksum: f6cae53b7fdb1bf3abd50fa61b10b4470985b400cc794d92635da1e7077bb19729f626adc0741b69403d9b6e411cddddb9c0157a709cc7c4eeb41e663be5d74b - languageName: node - linkType: hard - -"@babel/helper-remap-async-to-generator@npm:^7.18.6, @babel/helper-remap-async-to-generator@npm:^7.18.9": - version: 7.18.9 - resolution: "@babel/helper-remap-async-to-generator@npm:7.18.9" - dependencies: - "@babel/helper-annotate-as-pure": ^7.18.6 - "@babel/helper-environment-visitor": ^7.18.9 - "@babel/helper-wrap-function": ^7.18.9 - "@babel/types": ^7.18.9 -"@babel/helper-module-transforms@npm:^7.12.1, @babel/helper-module-transforms@npm:^7.16.7, @babel/helper-module-transforms@npm:^7.17.7": - version: 7.17.7 - resolution: "@babel/helper-module-transforms@npm:7.17.7" -======= -"@babel/helper-module-transforms@npm:^7.12.1, @babel/helper-module-transforms@npm:^7.18.6, @babel/helper-module-transforms@npm:^7.19.0": - version: 7.19.0 - resolution: "@babel/helper-module-transforms@npm:7.19.0" -======= "@babel/helper-module-transforms@npm:^7.12.1, @babel/helper-module-transforms@npm:^7.18.6, @babel/helper-module-transforms@npm:^7.20.11": version: 7.20.11 resolution: "@babel/helper-module-transforms@npm:7.20.11" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/helper-environment-visitor": ^7.18.9 "@babel/helper-module-imports": ^7.18.6 @@ -637,7 +306,6 @@ __metadata: "@babel/helper-optimise-call-expression@npm:^7.18.6": version: 7.18.6 resolution: "@babel/helper-optimise-call-expression@npm:7.18.6" ->>>>>>> 217c233f (fix(slider): fixes due to new version) dependencies: "@babel/types": ^7.18.6 checksum: e518fe8418571405e21644cfb39cf694f30b6c47b10b006609a92469ae8b8775cbff56f0b19732343e2ea910641091c5a2dc73b56ceba04e116a33b0f8bd2fbd @@ -665,49 +333,17 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -"@babel/helper-replace-supers@npm:^7.18.6, @babel/helper-replace-supers@npm:^7.19.1": - version: 7.19.1 - resolution: "@babel/helper-replace-supers@npm:7.19.1" -======= -"@babel/helper-replace-supers@npm:^7.18.6, @babel/helper-replace-supers@npm:^7.18.9": - version: 7.18.9 - resolution: "@babel/helper-replace-supers@npm:7.18.9" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "@babel/helper-replace-supers@npm:^7.18.6, @babel/helper-replace-supers@npm:^7.20.7": version: 7.20.7 resolution: "@babel/helper-replace-supers@npm:7.20.7" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/helper-environment-visitor": ^7.18.9 "@babel/helper-member-expression-to-functions": ^7.20.7 "@babel/helper-optimise-call-expression": ^7.18.6 -<<<<<<< HEAD -<<<<<<< HEAD - "@babel/traverse": ^7.19.1 - "@babel/types": ^7.19.0 - checksum: a0e4bf79ebe7d2bb5947169e47a0b4439c73fb0ec57d446cf3ea81b736721129ec373c3f94d2ebd2716b26dd65f8e6c083dac898170d42905e7ba815a2f52c25 - languageName: node - linkType: hard - -"@babel/helper-simple-access@npm:^7.19.4, @babel/helper-simple-access@npm:^7.20.2": - version: 7.20.2 - resolution: "@babel/helper-simple-access@npm:7.20.2" - dependencies: - "@babel/types": ^7.20.2 - checksum: ad1e96ee2e5f654ffee2369a586e5e8d2722bf2d8b028a121b4c33ebae47253f64d420157b9f0a8927aea3a9e0f18c0103e74fdd531815cf3650a0a4adca11a1 -======= - "@babel/traverse": ^7.18.9 - "@babel/types": ^7.18.9 - checksum: 2de8b29cc4bfa4e241da2de16abd5571709f6eb394206dc16e3a7816976d1691635dd4bc930881e9d798f44b48a5f1849dc7f51a62946f3e8270452be1ec5352 -======= "@babel/template": ^7.20.7 "@babel/traverse": ^7.20.7 "@babel/types": ^7.20.7 checksum: b8e0087c9b0c1446e3c6f3f72b73b7e03559c6b570e2cfbe62c738676d9ebd8c369a708cf1a564ef88113b4330750a50232ee1131d303d478b7a5e65e46fbc7c ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -715,28 +351,6 @@ __metadata: version: 7.20.2 resolution: "@babel/helper-simple-access@npm:7.20.2" dependencies: -<<<<<<< HEAD - "@babel/types": ^7.18.6 - checksum: 37cd36eef199e0517845763c1e6ff6ea5e7876d6d707a6f59c9267c547a50aa0e84260ba9285d49acfaf2cfa0a74a772d92967f32ac1024c961517d40b6c16a5 ->>>>>>> 217c233f (fix(slider): fixes due to new version) - languageName: node - linkType: hard - -"@babel/helper-skip-transparent-expression-wrappers@npm:^7.18.9": -<<<<<<< HEAD - version: 7.20.0 - resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.20.0" - dependencies: - "@babel/types": ^7.20.0 - checksum: 34da8c832d1c8a546e45d5c1d59755459ffe43629436707079989599b91e8c19e50e73af7a4bd09c95402d389266731b0d9c5f69e372d8ebd3a709c05c80d7dd -======= - version: 7.18.9 - resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.18.9" - dependencies: - "@babel/types": ^7.18.9 - checksum: 6e93ccd10248293082606a4b3e30eed32c6f796d378f6b662796c88f462f348aa368aadeb48eb410cfcc8250db93b2d6627c2e55662530f08fc25397e588d68a ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "@babel/types": ^7.20.2 checksum: ad1e96ee2e5f654ffee2369a586e5e8d2722bf2d8b028a121b4c33ebae47253f64d420157b9f0a8927aea3a9e0f18c0103e74fdd531815cf3650a0a4adca11a1 languageName: node @@ -748,7 +362,6 @@ __metadata: dependencies: "@babel/types": ^7.20.0 checksum: 34da8c832d1c8a546e45d5c1d59755459ffe43629436707079989599b91e8c19e50e73af7a4bd09c95402d389266731b0d9c5f69e372d8ebd3a709c05c80d7dd ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -761,15 +374,10 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) "@babel/helper-string-parser@npm:^7.19.4": version: 7.19.4 resolution: "@babel/helper-string-parser@npm:7.19.4" checksum: b2f8a3920b30dfac81ec282ac4ad9598ea170648f8254b10f475abe6d944808fb006aab325d3eb5a8ad3bea8dfa888cfa6ef471050dae5748497c110ec060943 -<<<<<<< HEAD languageName: node linkType: hard @@ -777,28 +385,6 @@ __metadata: version: 7.19.1 resolution: "@babel/helper-validator-identifier@npm:7.19.1" checksum: 0eca5e86a729162af569b46c6c41a63e18b43dbe09fda1d2a3c8924f7d617116af39cac5e4cd5d431bb760b4dca3c0970e0c444789b1db42bcf1fa41fbad0a3a -======= -"@babel/helper-string-parser@npm:^7.18.10": - version: 7.18.10 - resolution: "@babel/helper-string-parser@npm:7.18.10" - checksum: d554a4393365b624916b5c00a4cc21c990c6617e7f3fe30be7d9731f107f12c33229a7a3db9d829bfa110d2eb9f04790745d421640e3bd245bb412dc0ea123c1 - languageName: node - linkType: hard - -"@babel/helper-validator-identifier@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/helper-validator-identifier@npm:7.18.6" - checksum: e295254d616bbe26e48c196a198476ab4d42a73b90478c9842536cf910ead887f5af6b5c4df544d3052a25ccb3614866fa808dc1e3a5a4291acd444e243c0648 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= - languageName: node - linkType: hard - -"@babel/helper-validator-identifier@npm:^7.18.6, @babel/helper-validator-identifier@npm:^7.19.1": - version: 7.19.1 - resolution: "@babel/helper-validator-identifier@npm:7.19.1" - checksum: 0eca5e86a729162af569b46c6c41a63e18b43dbe09fda1d2a3c8924f7d617116af39cac5e4cd5d431bb760b4dca3c0970e0c444789b1db42bcf1fa41fbad0a3a ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -810,8 +396,6 @@ __metadata: linkType: hard "@babel/helper-wrap-function@npm:^7.18.9": -<<<<<<< HEAD -<<<<<<< HEAD version: 7.20.5 resolution: "@babel/helper-wrap-function@npm:7.20.5" dependencies: @@ -823,46 +407,14 @@ __metadata: languageName: node linkType: hard -"@babel/helpers@npm:^7.12.1, @babel/helpers@npm:^7.20.5": - version: 7.20.6 - resolution: "@babel/helpers@npm:7.20.6" - dependencies: - "@babel/template": ^7.18.10 - "@babel/traverse": ^7.20.5 - "@babel/types": ^7.20.5 - checksum: f03ec6eb2bf8dc7cdfe2569ee421fd9ba6c7bac6c862d90b608ccdd80281ebe858bc56ca175fc92b3ac50f63126b66bbd5ec86f9f361729289a20054518f1ac5 -======= - version: 7.19.0 - resolution: "@babel/helper-wrap-function@npm:7.19.0" -======= - version: 7.20.5 - resolution: "@babel/helper-wrap-function@npm:7.20.5" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) - dependencies: - "@babel/helper-function-name": ^7.19.0 - "@babel/template": ^7.18.10 - "@babel/traverse": ^7.20.5 - "@babel/types": ^7.20.5 - checksum: 11a6fc28334368a193a9cb3ad16f29cd7603bab958433efc82ebe59fa6556c227faa24f07ce43983f7a85df826f71d441638442c4315e90a554fe0a70ca5005b - languageName: node - linkType: hard - "@babel/helpers@npm:^7.12.1, @babel/helpers@npm:^7.20.7": version: 7.20.13 resolution: "@babel/helpers@npm:7.20.13" dependencies: -<<<<<<< HEAD - "@babel/template": ^7.18.10 - "@babel/traverse": ^7.19.0 - "@babel/types": ^7.19.0 - checksum: e50e78e0dbb0435075fa3f85021a6bcae529589800bca0292721afd7f7c874bea54508d6dc57eca16e5b8224f8142c6b0e32e3b0140029dc09865da747da4623 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "@babel/template": ^7.20.7 "@babel/traverse": ^7.20.13 "@babel/types": ^7.20.7 checksum: d62076fa834f342798f8c3fd7aec0870cc1725d273d99e540cbaa8d6c3ed10258228dd14601c8e66bfeabbb9424c3b31090ecc467fe855f7bd72c4734df7fb09 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -877,30 +429,12 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.12.3, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.18.10, @babel/parser@npm:^7.20.5, @babel/parser@npm:^7.7.0, @babel/parser@npm:^7.8.3": - version: 7.20.5 - resolution: "@babel/parser@npm:7.20.5" - bin: - parser: ./bin/babel-parser.js - checksum: e8d514ce0aa74d56725bd102919a49fa367afef9cd8208cf52f670f54b061c4672f51b4b7980058ab1f5fe73615fe4dc90720ab47bbcebae07ad08d667eda318 -======= -"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.12.3, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.18.10, @babel/parser@npm:^7.19.0, @babel/parser@npm:^7.7.0, @babel/parser@npm:^7.8.3": - version: 7.19.0 - resolution: "@babel/parser@npm:7.19.0" - bin: - parser: ./bin/babel-parser.js - checksum: af86d829bfeb60e0dcf54a43489c2514674b6c8d9bb24cf112706772125752fcd517877ad30501d533fa85f70a439d02eebeec3be9c2e95499853367184e0da7 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.12.3, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.13, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.7.0, @babel/parser@npm:^7.8.3": version: 7.20.15 resolution: "@babel/parser@npm:7.20.15" bin: parser: ./bin/babel-parser.js checksum: 1d0f47ca67ff2652f1c0ff1570bed8deccbc4b53509e7cd73476af9cc7ed23480c99f1179bd6d0be01612368b92b39e206d330ad6054009d699934848a89298b ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -928,21 +462,9 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -"@babel/plugin-proposal-async-generator-functions@npm:^7.20.1": - version: 7.20.1 - resolution: "@babel/plugin-proposal-async-generator-functions@npm:7.20.1" -======= -"@babel/plugin-proposal-async-generator-functions@npm:^7.19.0": - version: 7.19.0 - resolution: "@babel/plugin-proposal-async-generator-functions@npm:7.19.0" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "@babel/plugin-proposal-async-generator-functions@npm:^7.20.1": version: 7.20.7 resolution: "@babel/plugin-proposal-async-generator-functions@npm:7.20.7" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/helper-environment-visitor": ^7.18.9 "@babel/helper-plugin-utils": ^7.20.2 @@ -950,15 +472,7 @@ __metadata: "@babel/plugin-syntax-async-generators": ^7.8.4 peerDependencies: "@babel/core": ^7.0.0-0 -<<<<<<< HEAD -<<<<<<< HEAD - checksum: 518483a68c5618932109913eb7316ed5e656c575cbd9d22667bc0451e35a1be45f8eaeb8e2065834b36c8a93c4840f78cebf8f1d067b07c422f7be16d58eca60 -======= - checksum: f1876286d608650928f60ac6091b9a6e7839e005941be483df47693b98c90649202aa1793f28f6e9b4ce69bf0773552144fa40f38751f56dc5d02051a8ee0461 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: 111109ee118c9e69982f08d5e119eab04190b36a0f40e22e873802d941956eee66d2aa5a15f5321e51e3f9aa70a91136451b987fe15185ef8cc547ac88937723 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -974,8 +488,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD "@babel/plugin-proposal-class-static-block@npm:^7.18.6": version: 7.20.7 resolution: "@babel/plugin-proposal-class-static-block@npm:7.20.7" @@ -985,66 +497,13 @@ __metadata: "@babel/plugin-syntax-class-static-block": ^7.14.5 peerDependencies: "@babel/core": ^7.12.0 -<<<<<<< HEAD - checksum: b8d7ae99ed5ad784f39e7820e3ac03841f91d6ed60ab4a98c61d6112253da36013e12807bae4ffed0ef3cb318e47debac112ed614e03b403fb8b075b09a828ee -======= -"@babel/plugin-proposal-class-static-block@npm:^7.16.7": - version: 7.17.6 - resolution: "@babel/plugin-proposal-class-static-block@npm:7.17.6" -======= -"@babel/plugin-proposal-class-static-block@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/plugin-proposal-class-static-block@npm:7.18.6" ->>>>>>> 217c233f (fix(slider): fixes due to new version) - dependencies: - "@babel/helper-create-class-features-plugin": ^7.18.6 - "@babel/helper-plugin-utils": ^7.18.6 - "@babel/plugin-syntax-class-static-block": ^7.14.5 - peerDependencies: - "@babel/core": ^7.12.0 -<<<<<<< HEAD - checksum: 0ef00d73b4a7667059f71614669fb5ec989a0a6d5fe58118310c892507f2556a6f3ae66f0c547cd06e50bdf3ff528ef486e611079d41ef321300c967d2c26e1d ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - checksum: b8d7ae99ed5ad784f39e7820e3ac03841f91d6ed60ab4a98c61d6112253da36013e12807bae4ffed0ef3cb318e47debac112ed614e03b403fb8b075b09a828ee ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: ce1f3e8fd96437d820aa36323b7b3a0cb65b5f2600612665129880d5a4eb7194ce6a298ed2a5a4d3a9ea49bd33089ab95503c4c5b3ba9cea251a07d1706453d9 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard "@babel/plugin-proposal-decorators@npm:^7.16.4": -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 7.20.5 - resolution: "@babel/plugin-proposal-decorators@npm:7.20.5" - dependencies: - "@babel/helper-create-class-features-plugin": ^7.20.5 - "@babel/helper-plugin-utils": ^7.20.2 - "@babel/helper-replace-supers": ^7.19.1 - "@babel/helper-split-export-declaration": ^7.18.6 - "@babel/plugin-syntax-decorators": ^7.19.0 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 780696710dcd5f292a235dcc9dbb1fd6600a1b91c75b5c6efaf6d596520d54c750dabca5ebdb4592534f1572bdca3d424145741815554660335a10a4168ca19a -======= - version: 7.17.8 - resolution: "@babel/plugin-proposal-decorators@npm:7.17.8" -======= - version: 7.17.9 - resolution: "@babel/plugin-proposal-decorators@npm:7.17.9" ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= - version: 7.19.0 - resolution: "@babel/plugin-proposal-decorators@npm:7.19.0" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 7.20.13 resolution: "@babel/plugin-proposal-decorators@npm:7.20.13" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/helper-create-class-features-plugin": ^7.20.12 "@babel/helper-plugin-utils": ^7.20.2 @@ -1053,20 +512,7 @@ __metadata: "@babel/plugin-syntax-decorators": ^7.19.0 peerDependencies: "@babel/core": ^7.0.0-0 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - checksum: 8687de0ef0d671bc0c7e2ae0a7970055f8f6a0c8a50dcf81fe54bad85ffb59447ad7d75169f891244ef4a5a7bc2d146d753b7077635597fd998a44db632481ae ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - checksum: a3d177b88843bf73d798e4b21c1b8146bd33fd19ab56e5ab379d6670db84e172570e73bcf5a4e5a83193cfea49fed3db0015454e78f30f46d25d256c6e65a7b3 ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= - checksum: 0ea38430e6525b3d231c06f9383815aa3a3984505e21d3ef4818001b58815ae4cd4331a8b0cd514b83ff4f6c0aa3f4352b7c73fd5c4bd692eae3d02b4321cc51 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: 445723b410627d52ab2d195589eb9fe5fbd66a00ebfc9bedcf63b6cbfdfc42e163d77ac391f8738ab9f632779e6f2aa427fe468fbbd6661177ef0cdca735a7d5 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -1142,43 +588,9 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"@babel/plugin-proposal-object-rest-spread@npm:^7.20.2": - version: 7.20.2 - resolution: "@babel/plugin-proposal-object-rest-spread@npm:7.20.2" - dependencies: - "@babel/compat-data": ^7.20.1 - "@babel/helper-compilation-targets": ^7.20.0 - "@babel/helper-plugin-utils": ^7.20.2 -======= -"@babel/plugin-proposal-object-rest-spread@npm:^7.16.7": - version: 7.17.3 - resolution: "@babel/plugin-proposal-object-rest-spread@npm:7.17.3" - dependencies: - "@babel/compat-data": ^7.17.0 - "@babel/helper-compilation-targets": ^7.16.7 - "@babel/helper-plugin-utils": ^7.16.7 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) - "@babel/plugin-syntax-object-rest-spread": ^7.8.3 - "@babel/plugin-transform-parameters": ^7.20.1 - peerDependencies: - "@babel/core": ^7.0.0-0 -<<<<<<< HEAD - checksum: 9764d1a4735fcd384fdb9b6c6ccb20d1bea2f88f648640d26ce5d9cd5880ce1e389d2f852d7bea7e86ff343726225dc16e1deb92c7b3dc5c5721ed905a602318 -======= - checksum: 02810f158db4aaf6883131621b5d2c7d901ea3c034df2c2b78663f8b26813795d78a346c37e56770a720c54773732fd1d7fe40947dbf11d1d8de0e9a38e856d3 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= -"@babel/plugin-proposal-object-rest-spread@npm:^7.18.9": - version: 7.18.9 - resolution: "@babel/plugin-proposal-object-rest-spread@npm:7.18.9" -======= "@babel/plugin-proposal-object-rest-spread@npm:^7.20.2": version: 7.20.7 resolution: "@babel/plugin-proposal-object-rest-spread@npm:7.20.7" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/compat-data": ^7.20.5 "@babel/helper-compilation-targets": ^7.20.7 @@ -1187,12 +599,7 @@ __metadata: "@babel/plugin-transform-parameters": ^7.20.7 peerDependencies: "@babel/core": ^7.0.0-0 -<<<<<<< HEAD - checksum: 66b9bae741d46edf1c96776d26dfe5d335981e57164ec2450583e3d20dfaa08a5137ffebb897e443913207789f9816bfec4ae845f38762c0196a60949eaffdba ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: 1329db17009964bc644484c660eab717cb3ca63ac0ab0f67c651a028d1bc2ead51dc4064caea283e46994f1b7221670a35cbc0b4beb6273f55e915494b5aa0b2 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -1234,25 +641,8 @@ __metadata: linkType: hard "@babel/plugin-proposal-private-property-in-object@npm:^7.18.6": -<<<<<<< HEAD -<<<<<<< HEAD - version: 7.20.5 - resolution: "@babel/plugin-proposal-private-property-in-object@npm:7.20.5" - dependencies: - "@babel/helper-annotate-as-pure": ^7.18.6 - "@babel/helper-create-class-features-plugin": ^7.20.5 - "@babel/helper-plugin-utils": ^7.20.2 - "@babel/plugin-syntax-private-property-in-object": ^7.14.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 513b5e0e2c1b2846be5336cf680e932ae17924ef885aa1429e1a4f7924724bdd99b15f28d67187d0a006d5f18a0c4b61d96c3ecb4902fed3c8fe2f0abfc9753a -======= - version: 7.18.6 - resolution: "@babel/plugin-proposal-private-property-in-object@npm:7.18.6" -======= version: 7.20.5 resolution: "@babel/plugin-proposal-private-property-in-object@npm:7.20.5" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/helper-annotate-as-pure": ^7.18.6 "@babel/helper-create-class-features-plugin": ^7.20.5 @@ -1260,12 +650,7 @@ __metadata: "@babel/plugin-syntax-private-property-in-object": ^7.14.5 peerDependencies: "@babel/core": ^7.0.0-0 -<<<<<<< HEAD - checksum: c8e56a972930730345f39f2384916fd8e711b3f4b4eae2ca9740e99958980118120d5cc9b6ac150f0965a5a35f825910e2c3013d90be3e9993ab6111df444569 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: 513b5e0e2c1b2846be5336cf680e932ae17924ef885aa1429e1a4f7924724bdd99b15f28d67187d0a006d5f18a0c4b61d96c3ecb4902fed3c8fe2f0abfc9753a ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -1325,34 +710,14 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -"@babel/plugin-syntax-decorators@npm:^7.19.0": - version: 7.19.0 - resolution: "@babel/plugin-syntax-decorators@npm:7.19.0" -======= -"@babel/plugin-syntax-decorators@npm:^7.17.0": - version: 7.17.0 - resolution: "@babel/plugin-syntax-decorators@npm:7.17.0" ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= "@babel/plugin-syntax-decorators@npm:^7.19.0": version: 7.19.0 resolution: "@babel/plugin-syntax-decorators@npm:7.19.0" ->>>>>>> 217c233f (fix(slider): fixes due to new version) dependencies: "@babel/helper-plugin-utils": ^7.19.0 peerDependencies: "@babel/core": ^7.0.0-0 -<<<<<<< HEAD -<<<<<<< HEAD checksum: 105a13d581a8643ba145d4d0d31f34a492b352defa5b155e785702da6ce9c3ff0c1843ba9bee176e35f6e38afa19dc7bd12c120220af0495de4b128f1dd27f6e -======= - checksum: 745a3553c8ad4d2ea4805eaf50634cf0cb3036f1259fbfa1cd3cb04d685cec68b6f2f0b3ca1856091730e5aca630975283f9f910d87694141e81754fbc074a7a ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - checksum: 105a13d581a8643ba145d4d0d31f34a492b352defa5b155e785702da6ce9c3ff0c1843ba9bee176e35f6e38afa19dc7bd12c120220af0495de4b128f1dd27f6e ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard @@ -1389,35 +754,14 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -"@babel/plugin-syntax-import-assertions@npm:^7.20.0": - version: 7.20.0 - resolution: "@babel/plugin-syntax-import-assertions@npm:7.20.0" - dependencies: - "@babel/helper-plugin-utils": ^7.19.0 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 6a86220e0aae40164cd3ffaf80e7c076a1be02a8f3480455dddbae05fda8140f429290027604df7a11b3f3f124866e8a6d69dbfa1dda61ee7377b920ad144d5b -======= -"@babel/plugin-syntax-import-assertions@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/plugin-syntax-import-assertions@npm:7.18.6" -======= "@babel/plugin-syntax-import-assertions@npm:^7.20.0": version: 7.20.0 resolution: "@babel/plugin-syntax-import-assertions@npm:7.20.0" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/helper-plugin-utils": ^7.19.0 peerDependencies: "@babel/core": ^7.0.0-0 -<<<<<<< HEAD - checksum: 54918a05375325ba0c60bc81abfb261e6f118bed2de94e4c17dca9a2006fc25e13b1a8b5504b9a881238ea394fd2f098f60b2eb3a392585d6348874565445e7b ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: 6a86220e0aae40164cd3ffaf80e7c076a1be02a8f3480455dddbae05fda8140f429290027604df7a11b3f3f124866e8a6d69dbfa1dda61ee7377b920ad144d5b ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -1542,8 +886,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD "@babel/plugin-syntax-typescript@npm:^7.20.0": version: 7.20.0 resolution: "@babel/plugin-syntax-typescript@npm:7.20.0" @@ -1552,25 +894,6 @@ __metadata: peerDependencies: "@babel/core": ^7.0.0-0 checksum: 6189c0b5c32ba3c9a80a42338bd50719d783b20ef29b853d4f03929e971913d3cefd80184e924ae98ad6db09080be8fe6f1ffde9a6db8972523234f0274d36f7 -======= -"@babel/plugin-syntax-typescript@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/plugin-syntax-typescript@npm:7.18.6" -======= -"@babel/plugin-syntax-typescript@npm:^7.20.0": - version: 7.20.0 - resolution: "@babel/plugin-syntax-typescript@npm:7.20.0" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) - dependencies: - "@babel/helper-plugin-utils": ^7.19.0 - peerDependencies: - "@babel/core": ^7.0.0-0 -<<<<<<< HEAD - checksum: 2cde73725ec51118ebf410bf02d78781c03fa4d3185993fcc9d253b97443381b621c44810084c5dd68b92eb8bdfae0e5b163e91b32bebbb33852383d1815c05d ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= - checksum: 6189c0b5c32ba3c9a80a42338bd50719d783b20ef29b853d4f03929e971913d3cefd80184e924ae98ad6db09080be8fe6f1ffde9a6db8972523234f0274d36f7 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -1609,39 +932,9 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -"@babel/plugin-transform-block-scoping@npm:^7.20.2": - version: 7.20.5 - resolution: "@babel/plugin-transform-block-scoping@npm:7.20.5" - dependencies: - "@babel/helper-plugin-utils": ^7.20.2 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 03606bc6710c15cd4e4d1163e1cbab08799f852a5dd55a1f7e115032e9406ac9430ddc0cb6d09a51a4095446985640411f60683c6fcea9bc1a7b202462022e1c - languageName: node - linkType: hard - -"@babel/plugin-transform-classes@npm:^7.20.2": - version: 7.20.2 - resolution: "@babel/plugin-transform-classes@npm:7.20.2" - dependencies: - "@babel/helper-annotate-as-pure": ^7.18.6 - "@babel/helper-compilation-targets": ^7.20.0 - "@babel/helper-environment-visitor": ^7.18.9 - "@babel/helper-function-name": ^7.19.0 - "@babel/helper-optimise-call-expression": ^7.18.6 - "@babel/helper-plugin-utils": ^7.20.2 - "@babel/helper-replace-supers": ^7.19.1 -======= -"@babel/plugin-transform-block-scoping@npm:^7.18.9": - version: 7.18.9 - resolution: "@babel/plugin-transform-block-scoping@npm:7.18.9" -======= "@babel/plugin-transform-block-scoping@npm:^7.20.2": version: 7.20.15 resolution: "@babel/plugin-transform-block-scoping@npm:7.20.15" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/helper-plugin-utils": ^7.20.2 peerDependencies: @@ -1659,27 +952,13 @@ __metadata: "@babel/helper-environment-visitor": ^7.18.9 "@babel/helper-function-name": ^7.19.0 "@babel/helper-optimise-call-expression": ^7.18.6 -<<<<<<< HEAD - "@babel/helper-plugin-utils": ^7.19.0 - "@babel/helper-replace-supers": ^7.18.9 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "@babel/helper-plugin-utils": ^7.20.2 "@babel/helper-replace-supers": ^7.20.7 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) "@babel/helper-split-export-declaration": ^7.18.6 globals: ^11.1.0 peerDependencies: "@babel/core": ^7.0.0-0 -<<<<<<< HEAD -<<<<<<< HEAD - checksum: 57f3467a8eb7853cdb61cda963cfb6c6568ad276d77c9de2ff5a2194650010217aa318ef3733975537c6fb906b73a019afb6ea650b01852e7d2e1fab4034361b -======= - checksum: 5500953031fc3eae73f717c7b59ef406158a4a710d566a0f78a4944240bcf98f817f07cf1d6af0e749e21f0dfee29c36412b75d57b0a753c3ad823b70c596b79 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: 4cf55ad88e52c7c66a991add4c8e1c3324384bd52df7085962d396879561456a44352e5ab1725cc80f4e83737a2931e847c4a96c7aa4a549357f23631ff31799 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -1695,45 +974,14 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"@babel/plugin-transform-destructuring@npm:^7.20.2": - version: 7.20.2 - resolution: "@babel/plugin-transform-destructuring@npm:7.20.2" -======= -"@babel/plugin-transform-destructuring@npm:^7.16.7": - version: 7.17.7 - resolution: "@babel/plugin-transform-destructuring@npm:7.17.7" ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) - dependencies: - "@babel/helper-plugin-utils": ^7.20.2 - peerDependencies: - "@babel/core": ^7.0.0-0 -<<<<<<< HEAD - checksum: 09033e09b28ca1b0d46a8d82f5a677b1d718a739b3c199886908c3ef1af23369317d0c429b21507d480ee82721c15892a9893be18e50ad6fc219e69312f4b097 -======= - checksum: 767ecf6640fea9a06a4859f0c34daa30ac7d146a96476caa1f77081d5b6e43699f45e14acd52682078f2b7c230ff0814312b41f61b21ca2b5f9c5a2cc93c2b58 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= -"@babel/plugin-transform-destructuring@npm:^7.18.13": - version: 7.18.13 - resolution: "@babel/plugin-transform-destructuring@npm:7.18.13" -======= "@babel/plugin-transform-destructuring@npm:^7.20.2": version: 7.20.7 resolution: "@babel/plugin-transform-destructuring@npm:7.20.7" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/helper-plugin-utils": ^7.20.2 peerDependencies: "@babel/core": ^7.0.0-0 -<<<<<<< HEAD - checksum: 83e44ec93a4cfbf69376db8836d00ec803820081bf0f8b6cea73a9b3cd320b8285768d5b385744af4a27edda4b6502245c52d3ed026ea61356faf57bfe78effb ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: bd8affdb142c77662037215e37128b2110a786c92a67e1f00b38223c438c1610bd84cbc0386e9cd3479245ea811c5ca6c9838f49be4729b592159a30ce79add2 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -1830,58 +1078,9 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -"@babel/plugin-transform-modules-amd@npm:^7.19.6": - version: 7.19.6 - resolution: "@babel/plugin-transform-modules-amd@npm:7.19.6" - dependencies: - "@babel/helper-module-transforms": ^7.19.6 - "@babel/helper-plugin-utils": ^7.19.0 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 4236aad970025bc10c772c1589b1e2eab8b7681933bb5ffa6e395d4c1a52532b28c47c553e3011b4272ea81e5ab39fe969eb5349584e8390e59771055c467d42 - languageName: node - linkType: hard - -<<<<<<< HEAD -"@babel/plugin-transform-modules-commonjs@npm:^7.19.6": - version: 7.19.6 - resolution: "@babel/plugin-transform-modules-commonjs@npm:7.19.6" - dependencies: - "@babel/helper-module-transforms": ^7.19.6 - "@babel/helper-plugin-utils": ^7.19.0 - "@babel/helper-simple-access": ^7.19.4 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 85d46945ab5ba3fff89e962d560a5d40253f228b9659a697683db3de07c0236e8cd60e5eb41958007359951a42bc268bf32350fcdb5b4a86f58dff1e032c096e - languageName: node - linkType: hard - -"@babel/plugin-transform-modules-systemjs@npm:^7.19.6": - version: 7.19.6 - resolution: "@babel/plugin-transform-modules-systemjs@npm:7.19.6" - dependencies: - "@babel/helper-hoist-variables": ^7.18.6 - "@babel/helper-module-transforms": ^7.19.6 - "@babel/helper-plugin-utils": ^7.19.0 - "@babel/helper-validator-identifier": ^7.19.1 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 8526431cc81ea3eb232ad50862d0ed1cbb422b5251d14a8d6610d0ca0617f6e75f35179e98eb1235d0cccb980120350b9f112594e5646dd45378d41eaaf87342 -======= -"@babel/plugin-transform-modules-commonjs@npm:^7.16.8": - version: 7.17.9 - resolution: "@babel/plugin-transform-modules-commonjs@npm:7.17.9" -======= -"@babel/plugin-transform-modules-amd@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/plugin-transform-modules-amd@npm:7.18.6" -======= "@babel/plugin-transform-modules-amd@npm:^7.19.6": version: 7.20.11 resolution: "@babel/plugin-transform-modules-amd@npm:7.20.11" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/helper-module-transforms": ^7.20.11 "@babel/helper-plugin-utils": ^7.20.2 @@ -1891,16 +1090,9 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"@babel/plugin-transform-modules-commonjs@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/plugin-transform-modules-commonjs@npm:7.18.6" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "@babel/plugin-transform-modules-commonjs@npm:^7.19.6": version: 7.20.11 resolution: "@babel/plugin-transform-modules-commonjs@npm:7.20.11" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/helper-module-transforms": ^7.20.11 "@babel/helper-plugin-utils": ^7.20.2 @@ -1921,16 +1113,7 @@ __metadata: "@babel/helper-validator-identifier": ^7.19.1 peerDependencies: "@babel/core": ^7.0.0-0 -<<<<<<< HEAD -<<<<<<< HEAD - checksum: 058c0e7987aab64c4019bc9eab3f80c5dd05bec737e230e5c60e9222dfb3d01b2dfa3aa1db6cbb75a4095c40af3bba2e3a60170b1570a158d3e781376569ce49 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - checksum: a0742deee4a076d6fc303d036c1ea2bea9b7d91af390483fe91fc415f9cb43925bb5dd930fdcb8fcdc9d4c7a22774a3cec521c67f1422a9b473debcb85ee57f9 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: 4546c47587f88156d66c7eb7808e903cf4bb3f6ba6ac9bc8e3af2e29e92eb9f0b3f44d52043bfd24eb25fa7827fd7b6c8bfeac0cac7584e019b87e1ecbd0e673 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -1946,8 +1129,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD "@babel/plugin-transform-named-capturing-groups-regex@npm:^7.19.1": version: 7.20.5 resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.20.5" @@ -1957,26 +1138,6 @@ __metadata: peerDependencies: "@babel/core": ^7.0.0 checksum: 528c95fb1087e212f17e1c6456df041b28a83c772b9c93d2e407c9d03b72182b0d9d126770c1d6e0b23aab052599ceaf25ed6a2c0627f4249be34a83f6fae853 -======= -"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.19.0": - version: 7.19.0 - resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.19.0" -======= -"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.19.1": - version: 7.20.5 - resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.20.5" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) - dependencies: - "@babel/helper-create-regexp-features-plugin": ^7.20.5 - "@babel/helper-plugin-utils": ^7.20.2 - peerDependencies: - "@babel/core": ^7.0.0 -<<<<<<< HEAD - checksum: 60f7b2c537fa3e8392f19b1f1026ba68844c5dc7942867e7a96a636d8a52d4766629b898e59aa690d3806bf02a7fa52e12d1f7c1ca2ef4fa2b53f3fe0a835117 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= - checksum: 528c95fb1087e212f17e1c6456df041b28a83c772b9c93d2e407c9d03b72182b0d9d126770c1d6e0b23aab052599ceaf25ed6a2c0627f4249be34a83f6fae853 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -2003,35 +1164,14 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -"@babel/plugin-transform-parameters@npm:^7.20.1": - version: 7.20.5 - resolution: "@babel/plugin-transform-parameters@npm:7.20.5" - dependencies: - "@babel/helper-plugin-utils": ^7.20.2 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: fa588b0d8551e3e0cfde5fcb9d63a7acd38da199bee1851dd7e2abb34b3d754684defb1209a5669ecf0076d3d17ddc375b3f107da770b550a30402e4b9d7aa2f -======= -"@babel/plugin-transform-parameters@npm:^7.18.8": - version: 7.18.8 - resolution: "@babel/plugin-transform-parameters@npm:7.18.8" -======= "@babel/plugin-transform-parameters@npm:^7.20.1, @babel/plugin-transform-parameters@npm:^7.20.7": version: 7.20.7 resolution: "@babel/plugin-transform-parameters@npm:7.20.7" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/helper-plugin-utils": ^7.20.2 peerDependencies: "@babel/core": ^7.0.0-0 -<<<<<<< HEAD - checksum: 2b5863300da60face8a250d91da16294333bd5626e9721b13a3ba2078bd2a5a190e32c6e7a1323d5f547f579aeb2804ff49a62a55fcad2b1d099e55a55b788ea ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: 6ffe0dd9afb2d2b9bc247381aa2e95dd9997ff5568a0a11900528919a4e073ac68f46409431455badb8809644d47cff180045bc2b9700e3f36e3b23554978947 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -2047,41 +1187,13 @@ __metadata: linkType: hard "@babel/plugin-transform-react-constant-elements@npm:^7.12.1": -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 7.20.2 - resolution: "@babel/plugin-transform-react-constant-elements@npm:7.20.2" -======= - version: 7.17.6 - resolution: "@babel/plugin-transform-react-constant-elements@npm:7.17.6" ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) - dependencies: - "@babel/helper-plugin-utils": ^7.20.2 - peerDependencies: - "@babel/core": ^7.0.0-0 -<<<<<<< HEAD - checksum: 7b041b726e7c14b8c26a0dd240defac5f93a1f449371c6bdc5e6b46d581211300cc1a79da4140bdf20347f49e175dcb4f469812399206864024d1fdc81171193 -======= - checksum: 4c111328511c4dcb8d1d7970d7cccff463c0c34dfe3380f5bb80b692fa191b441fa8c6ef4229c5140dc0b8c69cc3f9aeb6dc05455c4367be93e784658ce11cc5 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - version: 7.18.12 - resolution: "@babel/plugin-transform-react-constant-elements@npm:7.18.12" -======= version: 7.20.2 resolution: "@babel/plugin-transform-react-constant-elements@npm:7.20.2" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/helper-plugin-utils": ^7.20.2 peerDependencies: "@babel/core": ^7.0.0-0 -<<<<<<< HEAD - checksum: d83fbc65e8eb32b64fc83c64436d85dba44e2c358b906e5eb3709d22b05bdeada2f92af1e85e26fda88bb8d688b06546b9a98fee17c82563ae00f19827ba0c79 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: 7b041b726e7c14b8c26a0dd240defac5f93a1f449371c6bdc5e6b46d581211300cc1a79da4140bdf20347f49e175dcb4f469812399206864024d1fdc81171193 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -2107,8 +1219,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD "@babel/plugin-transform-react-jsx@npm:^7.18.6": version: 7.20.13 resolution: "@babel/plugin-transform-react-jsx@npm:7.20.13" @@ -2120,34 +1230,7 @@ __metadata: "@babel/types": ^7.20.7 peerDependencies: "@babel/core": ^7.0.0-0 -<<<<<<< HEAD - checksum: d7d6f0b8f24b1f6b7cf8062c4e91c59af82489a993e51859bd49c2d62a2d2b77fd40b02a9a1d0e6d874cf4ce56a05fa3564b964587d00c94ebc62593524052ec -======= -"@babel/plugin-transform-react-jsx@npm:^7.16.7": - version: 7.17.3 - resolution: "@babel/plugin-transform-react-jsx@npm:7.17.3" -======= -"@babel/plugin-transform-react-jsx@npm:^7.18.6": - version: 7.19.0 - resolution: "@babel/plugin-transform-react-jsx@npm:7.19.0" ->>>>>>> 217c233f (fix(slider): fixes due to new version) - dependencies: - "@babel/helper-annotate-as-pure": ^7.18.6 - "@babel/helper-module-imports": ^7.18.6 - "@babel/helper-plugin-utils": ^7.19.0 - "@babel/plugin-syntax-jsx": ^7.18.6 - "@babel/types": ^7.19.0 - peerDependencies: - "@babel/core": ^7.0.0-0 -<<<<<<< HEAD - checksum: 7e33a3fb78a3b7352b56f48211160ae60dc3654bae314ea0352bfc179d10eaac789792ccb3701172388ec4e4dbdb94952cdf3386980f3af402d99ceadd91149b ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - checksum: d7d6f0b8f24b1f6b7cf8062c4e91c59af82489a993e51859bd49c2d62a2d2b77fd40b02a9a1d0e6d874cf4ce56a05fa3564b964587d00c94ebc62593524052ec ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: b1daaa9b093ab59f71572dde7ad05ed3490433a47de103fc866f60347da55fa7fe84cf9b4c9fa22917517d52f70ab5e05ec631bba1c348733c0d8ebbd7de8c68 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -2163,8 +1246,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD "@babel/plugin-transform-regenerator@npm:^7.18.6": version: 7.20.5 resolution: "@babel/plugin-transform-regenerator@npm:7.20.5" @@ -2174,35 +1255,6 @@ __metadata: peerDependencies: "@babel/core": ^7.0.0-0 checksum: 13164861e71fb23d84c6270ef5330b03c54d5d661c2c7468f28e21c4f8598558ca0c8c3cb1d996219352946e849d270a61372bc93c8fbe9676e78e3ffd0dea07 -======= -"@babel/plugin-transform-regenerator@npm:^7.16.7": - version: 7.17.9 - resolution: "@babel/plugin-transform-regenerator@npm:7.17.9" -======= -"@babel/plugin-transform-regenerator@npm:^7.18.6": -<<<<<<< HEAD - version: 7.18.6 - resolution: "@babel/plugin-transform-regenerator@npm:7.18.6" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= - version: 7.20.5 - resolution: "@babel/plugin-transform-regenerator@npm:7.20.5" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) - dependencies: - "@babel/helper-plugin-utils": ^7.20.2 - regenerator-transform: ^0.15.1 - peerDependencies: - "@babel/core": ^7.0.0-0 -<<<<<<< HEAD -<<<<<<< HEAD - checksum: bf92f7228397615f12fa62d1decbe854ee9065d44e55036f99bf312783d51b082981bab38ba61de9858f7e20513484a043bfa958c0ce4a0d4d1710710df029a9 ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= - checksum: 60bd482cb0343c714f85c3e19a13b3b5fa05ee336c079974091c0b35e263307f4e661f4555dff90707a87d5efe19b1d51835db44455405444ac1813e268ad750 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= - checksum: 13164861e71fb23d84c6270ef5330b03c54d5d661c2c7468f28e21c4f8598558ca0c8c3cb1d996219352946e849d270a61372bc93c8fbe9676e78e3ffd0dea07 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -2212,42 +1264,14 @@ __metadata: dependencies: "@babel/helper-plugin-utils": ^7.18.6 peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 0738cdc30abdae07c8ec4b233b30c31f68b3ff0eaa40eddb45ae607c066127f5fa99ddad3c0177d8e2832e3a7d3ad115775c62b431ebd6189c40a951b867a80c - languageName: node - linkType: hard - -"@babel/plugin-transform-runtime@npm:^7.16.4": -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 7.19.6 - resolution: "@babel/plugin-transform-runtime@npm:7.19.6" -======= - version: 7.17.0 - resolution: "@babel/plugin-transform-runtime@npm:7.17.0" ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) - dependencies: - "@babel/helper-module-imports": ^7.18.6 - "@babel/helper-plugin-utils": ^7.19.0 - babel-plugin-polyfill-corejs2: ^0.3.3 - babel-plugin-polyfill-corejs3: ^0.6.0 - babel-plugin-polyfill-regenerator: ^0.4.1 - semver: ^6.3.0 - peerDependencies: - "@babel/core": ^7.0.0-0 -<<<<<<< HEAD - checksum: ef93efbcbb00dcf4da6dcc55bda698a2a57fca3fb05a6a13e932ecfdb7c1c5d2f0b5b245c1c4faca0318853937caba0d82442f58b7653249f64275d08052fbd8 -======= - checksum: 9a469d4389cb265d50f1e83e6b524ceda7abd24a0bd7cda57e54a1e6103ca7c36efc99eebd485cf0a468f048739e21d940126df40b11db34f4692bdd2d5beacd ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - version: 7.18.10 - resolution: "@babel/plugin-transform-runtime@npm:7.18.10" -======= + "@babel/core": ^7.0.0-0 + checksum: 0738cdc30abdae07c8ec4b233b30c31f68b3ff0eaa40eddb45ae607c066127f5fa99ddad3c0177d8e2832e3a7d3ad115775c62b431ebd6189c40a951b867a80c + languageName: node + linkType: hard + +"@babel/plugin-transform-runtime@npm:^7.16.4": version: 7.19.6 resolution: "@babel/plugin-transform-runtime@npm:7.19.6" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/helper-module-imports": ^7.18.6 "@babel/helper-plugin-utils": ^7.19.0 @@ -2257,12 +1281,7 @@ __metadata: semver: ^6.3.0 peerDependencies: "@babel/core": ^7.0.0-0 -<<<<<<< HEAD - checksum: 98c18680b4258b8bd3f04926b73c72ae77037d5ea5b50761ca35de15896bf0d04bedabde39a81be56dbd4859c96ffaa7103fbefb5d5b58a36e0a80381e4a146c ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: ef93efbcbb00dcf4da6dcc55bda698a2a57fca3fb05a6a13e932ecfdb7c1c5d2f0b5b245c1c4faca0318853937caba0d82442f58b7653249f64275d08052fbd8 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -2323,36 +1342,15 @@ __metadata: linkType: hard "@babel/plugin-transform-typescript@npm:^7.18.6": -<<<<<<< HEAD -<<<<<<< HEAD - version: 7.20.2 - resolution: "@babel/plugin-transform-typescript@npm:7.20.2" - dependencies: - "@babel/helper-create-class-features-plugin": ^7.20.2 - "@babel/helper-plugin-utils": ^7.20.2 - "@babel/plugin-syntax-typescript": ^7.20.0 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 14434eb77cb3c8c4187a055eabdd5ff8b3e90a37ac95ecc7c9007ea8fc5660e0652c445646a2a25836a02d91944e0dc1e8b58ef55b063a901e54a24fdb4168af -======= - version: 7.19.0 - resolution: "@babel/plugin-transform-typescript@npm:7.19.0" -======= version: 7.20.13 resolution: "@babel/plugin-transform-typescript@npm:7.20.13" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/helper-create-class-features-plugin": ^7.20.12 "@babel/helper-plugin-utils": ^7.20.2 "@babel/plugin-syntax-typescript": ^7.20.0 peerDependencies: "@babel/core": ^7.0.0-0 -<<<<<<< HEAD - checksum: d5ed076c1cd7a41efe0da7d9afdcb6281db574b4307243b9f0f96ae255d9efdca47b4aeed5c306d1ad296e683498965c01ecaa147217559e01eceadc350ca4c2 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: 0b0c3a3e53268d4feb35eb17d57873f2488392e404a0b32735d51c49b08462dc738ebd860f0ff3a3dc5cd1b1fa70340bb6c072239c86afca635831b930593b3b ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -2380,25 +1378,8 @@ __metadata: linkType: hard "@babel/preset-env@npm:^7.12.1, @babel/preset-env@npm:^7.16.4, @babel/preset-env@npm:^7.8.4": -<<<<<<< HEAD -<<<<<<< HEAD - version: 7.20.2 - resolution: "@babel/preset-env@npm:7.20.2" - dependencies: - "@babel/compat-data": ^7.20.1 - "@babel/helper-compilation-targets": ^7.20.0 - "@babel/helper-plugin-utils": ^7.20.2 - "@babel/helper-validator-option": ^7.18.6 - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": ^7.18.6 - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": ^7.18.9 - "@babel/plugin-proposal-async-generator-functions": ^7.20.1 -======= - version: 7.19.0 - resolution: "@babel/preset-env@npm:7.19.0" -======= version: 7.20.2 resolution: "@babel/preset-env@npm:7.20.2" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/compat-data": ^7.20.1 "@babel/helper-compilation-targets": ^7.20.0 @@ -2406,12 +1387,7 @@ __metadata: "@babel/helper-validator-option": ^7.18.6 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": ^7.18.6 "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": ^7.18.9 -<<<<<<< HEAD - "@babel/plugin-proposal-async-generator-functions": ^7.19.0 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "@babel/plugin-proposal-async-generator-functions": ^7.20.1 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) "@babel/plugin-proposal-class-properties": ^7.18.6 "@babel/plugin-proposal-class-static-block": ^7.18.6 "@babel/plugin-proposal-dynamic-import": ^7.18.6 @@ -2420,15 +1396,7 @@ __metadata: "@babel/plugin-proposal-logical-assignment-operators": ^7.18.9 "@babel/plugin-proposal-nullish-coalescing-operator": ^7.18.6 "@babel/plugin-proposal-numeric-separator": ^7.18.6 -<<<<<<< HEAD -<<<<<<< HEAD "@babel/plugin-proposal-object-rest-spread": ^7.20.2 -======= - "@babel/plugin-proposal-object-rest-spread": ^7.18.9 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= - "@babel/plugin-proposal-object-rest-spread": ^7.20.2 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) "@babel/plugin-proposal-optional-catch-binding": ^7.18.6 "@babel/plugin-proposal-optional-chaining": ^7.18.9 "@babel/plugin-proposal-private-methods": ^7.18.6 @@ -2439,15 +1407,7 @@ __metadata: "@babel/plugin-syntax-class-static-block": ^7.14.5 "@babel/plugin-syntax-dynamic-import": ^7.8.3 "@babel/plugin-syntax-export-namespace-from": ^7.8.3 -<<<<<<< HEAD -<<<<<<< HEAD - "@babel/plugin-syntax-import-assertions": ^7.20.0 -======= - "@babel/plugin-syntax-import-assertions": ^7.18.6 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "@babel/plugin-syntax-import-assertions": ^7.20.0 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) "@babel/plugin-syntax-json-strings": ^7.8.3 "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4 "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3 @@ -2460,24 +1420,10 @@ __metadata: "@babel/plugin-transform-arrow-functions": ^7.18.6 "@babel/plugin-transform-async-to-generator": ^7.18.6 "@babel/plugin-transform-block-scoped-functions": ^7.18.6 -<<<<<<< HEAD -<<<<<<< HEAD - "@babel/plugin-transform-block-scoping": ^7.20.2 - "@babel/plugin-transform-classes": ^7.20.2 - "@babel/plugin-transform-computed-properties": ^7.18.9 - "@babel/plugin-transform-destructuring": ^7.20.2 -======= - "@babel/plugin-transform-block-scoping": ^7.18.9 - "@babel/plugin-transform-classes": ^7.19.0 - "@babel/plugin-transform-computed-properties": ^7.18.9 - "@babel/plugin-transform-destructuring": ^7.18.13 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "@babel/plugin-transform-block-scoping": ^7.20.2 "@babel/plugin-transform-classes": ^7.20.2 "@babel/plugin-transform-computed-properties": ^7.18.9 "@babel/plugin-transform-destructuring": ^7.20.2 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) "@babel/plugin-transform-dotall-regex": ^7.18.6 "@babel/plugin-transform-duplicate-keys": ^7.18.9 "@babel/plugin-transform-exponentiation-operator": ^7.18.6 @@ -2485,35 +1431,14 @@ __metadata: "@babel/plugin-transform-function-name": ^7.18.9 "@babel/plugin-transform-literals": ^7.18.9 "@babel/plugin-transform-member-expression-literals": ^7.18.6 -<<<<<<< HEAD -<<<<<<< HEAD - "@babel/plugin-transform-modules-amd": ^7.19.6 - "@babel/plugin-transform-modules-commonjs": ^7.19.6 - "@babel/plugin-transform-modules-systemjs": ^7.19.6 - "@babel/plugin-transform-modules-umd": ^7.18.6 - "@babel/plugin-transform-named-capturing-groups-regex": ^7.19.1 - "@babel/plugin-transform-new-target": ^7.18.6 - "@babel/plugin-transform-object-super": ^7.18.6 - "@babel/plugin-transform-parameters": ^7.20.1 -======= - "@babel/plugin-transform-modules-amd": ^7.18.6 - "@babel/plugin-transform-modules-commonjs": ^7.18.6 - "@babel/plugin-transform-modules-systemjs": ^7.19.0 -======= "@babel/plugin-transform-modules-amd": ^7.19.6 "@babel/plugin-transform-modules-commonjs": ^7.19.6 "@babel/plugin-transform-modules-systemjs": ^7.19.6 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) "@babel/plugin-transform-modules-umd": ^7.18.6 "@babel/plugin-transform-named-capturing-groups-regex": ^7.19.1 "@babel/plugin-transform-new-target": ^7.18.6 "@babel/plugin-transform-object-super": ^7.18.6 -<<<<<<< HEAD - "@babel/plugin-transform-parameters": ^7.18.8 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "@babel/plugin-transform-parameters": ^7.20.1 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) "@babel/plugin-transform-property-literals": ^7.18.6 "@babel/plugin-transform-regenerator": ^7.18.6 "@babel/plugin-transform-reserved-words": ^7.18.6 @@ -2525,37 +1450,15 @@ __metadata: "@babel/plugin-transform-unicode-escapes": ^7.18.10 "@babel/plugin-transform-unicode-regex": ^7.18.6 "@babel/preset-modules": ^0.1.5 -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) "@babel/types": ^7.20.2 babel-plugin-polyfill-corejs2: ^0.3.3 babel-plugin-polyfill-corejs3: ^0.6.0 babel-plugin-polyfill-regenerator: ^0.4.1 core-js-compat: ^3.25.1 -<<<<<<< HEAD - semver: ^6.3.0 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: ece2d7e9c7789db6116e962b8e1a55eb55c110c44c217f0c8f6ffea4ca234954e66557f7bd019b7affadf7fbb3a53ccc807e93fc935aacd48146234b73b6947e -======= - "@babel/types": ^7.19.0 - babel-plugin-polyfill-corejs2: ^0.3.2 - babel-plugin-polyfill-corejs3: ^0.5.3 - babel-plugin-polyfill-regenerator: ^0.4.0 - core-js-compat: ^3.22.1 - semver: ^6.3.0 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: ae1866b9a6c9749d52618f39aab8c369e0d6dc88e327341fae932411a0d51db2ec51b882cebc62ff3d49443261a6940e3fc03762ff3925d165884e7990eb612c ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= semver: ^6.3.0 peerDependencies: "@babel/core": ^7.0.0-0 checksum: ece2d7e9c7789db6116e962b8e1a55eb55c110c44c217f0c8f6ffea4ca234954e66557f7bd019b7affadf7fbb3a53ccc807e93fc935aacd48146234b73b6947e ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -2603,118 +1506,18 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"@babel/runtime-corejs3@npm:^7.10.2": -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 7.20.6 - resolution: "@babel/runtime-corejs3@npm:7.20.6" - dependencies: - core-js-pure: ^3.25.1 - regenerator-runtime: ^0.13.11 - checksum: d533d432216509426c4f9dad56db2fe453112b7d738433111944372fba4abd0b07bee3261f19a218530b435de46592121b2a6a57b98c0c7c3452d552ba009c3e -======= - version: 7.17.8 - resolution: "@babel/runtime-corejs3@npm:7.17.8" - dependencies: - core-js-pure: ^3.20.2 - regenerator-runtime: ^0.13.4 - checksum: 91f96437393b48c51000d1bb9d7a219de9394c5cf5227f1d263b6653fac3ff78e9d5e445e7c4410e9e3b24497715098ea6ade6fcad6cf964b0cf3ff161a85bd9 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) - languageName: node - linkType: hard - -"@babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.1, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.10.4, @babel/runtime@npm:^7.11.1, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.5, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.16.7, @babel/runtime@npm:^7.18.0, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.18.9, @babel/runtime@npm:^7.20.0, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2": - version: 7.20.6 - resolution: "@babel/runtime@npm:7.20.6" -======= - version: 7.17.9 - resolution: "@babel/runtime-corejs3@npm:7.17.9" -======= - version: 7.19.0 - resolution: "@babel/runtime-corejs3@npm:7.19.0" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "@babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.1, @babel/runtime@npm:^7.10.4, @babel/runtime@npm:^7.11.1, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.5, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.16.7, @babel/runtime@npm:^7.18.0, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.20.0, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2": version: 7.20.13 resolution: "@babel/runtime@npm:7.20.13" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: regenerator-runtime: ^0.13.11 checksum: 09b7a97a05c80540db6c9e4ddf8c5d2ebb06cae5caf3a87e33c33f27f8c4d49d9c67a2d72f1570e796045288fad569f98a26ceba0c4f5fad2af84b6ad855c4fb languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"@babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.5, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2": - version: 7.16.7 - resolution: "@babel/runtime@npm:7.16.7" ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= -"@babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.1, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.10.4, @babel/runtime@npm:^7.11.1, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.5, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.18.0, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.18.9, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2": - version: 7.19.0 - resolution: "@babel/runtime@npm:7.19.0" ->>>>>>> 217c233f (fix(slider): fixes due to new version) - dependencies: -<<<<<<< HEAD - regenerator-runtime: ^0.13.11 - checksum: 42a8504db21031b1859fbc0f52d698a3d2f5ada9519eb76c6f96a7e657d8d555732a18fe71ef428a67cc9fc81ca0d3562fb7afdc70549c5fec343190cbaa9b03 -======= - regenerator-runtime: ^0.13.4 -<<<<<<< HEAD - checksum: 68d195c1630bb91ac20e86635d292a17ebab7f361cfe79406b3f5a6cc2e59fa283ae5006568899abf869312c2b35b744bd407aea8ffdb650f1a68d07785d47e9 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) - languageName: node - linkType: hard - -<<<<<<< HEAD -"@babel/template@npm:^7.10.4, @babel/template@npm:^7.18.10, @babel/template@npm:^7.3.3": - version: 7.18.10 - resolution: "@babel/template@npm:7.18.10" - dependencies: - "@babel/code-frame": ^7.18.6 - "@babel/parser": ^7.18.10 - "@babel/types": ^7.18.10 - checksum: 93a6aa094af5f355a72bd55f67fa1828a046c70e46f01b1606e6118fa1802b6df535ca06be83cc5a5e834022be95c7b714f0a268b5f20af984465a71e28f1473 -======= -"@babel/runtime@npm:^7.10.1, @babel/runtime@npm:^7.10.4, @babel/runtime@npm:^7.11.1": - version: 7.17.8 - resolution: "@babel/runtime@npm:7.17.8" -======= -"@babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.1, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.10.4, @babel/runtime@npm:^7.11.1, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.5, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2": - version: 7.17.9 - resolution: "@babel/runtime@npm:7.17.9" ->>>>>>> aef305ce (fix(night-slider): fix distance between points) - dependencies: - regenerator-runtime: ^0.13.4 - checksum: 4d56bdb82890f386d5a57c40ef985a0ed7f0a78f789377a2d0c3e8826819e0f7f16ba0fe906d9b2241c5f7ca56630ef0653f5bb99f03771f7b87ff8af4bf5fe3 ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) - languageName: node - linkType: hard - -"@babel/traverse@npm:^7.1.0, @babel/traverse@npm:^7.12.1, @babel/traverse@npm:^7.19.1, @babel/traverse@npm:^7.20.1, @babel/traverse@npm:^7.20.5, @babel/traverse@npm:^7.4.5, @babel/traverse@npm:^7.7.0, @babel/traverse@npm:^7.8.3": - version: 7.20.5 - resolution: "@babel/traverse@npm:7.20.5" - dependencies: -<<<<<<< HEAD - "@babel/code-frame": ^7.18.6 - "@babel/generator": ^7.20.5 -======= - checksum: fa69c351bb05e1db3ceb9a02fdcf620c234180af68cdda02152d3561015f6d55277265d3109815992f96d910f3db709458cae4f8df1c3def66f32e0867d82294 - languageName: node - linkType: hard - -"@babel/template@npm:^7.10.4, @babel/template@npm:^7.18.10, @babel/template@npm:^7.3.3": - version: 7.18.10 - resolution: "@babel/template@npm:7.18.10" -======= "@babel/template@npm:^7.10.4, @babel/template@npm:^7.18.10, @babel/template@npm:^7.20.7, @babel/template@npm:^7.3.3": version: 7.20.7 resolution: "@babel/template@npm:7.20.7" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/code-frame": ^7.18.6 "@babel/parser": ^7.20.7 @@ -2728,106 +1531,27 @@ __metadata: resolution: "@babel/traverse@npm:7.20.13" dependencies: "@babel/code-frame": ^7.18.6 -<<<<<<< HEAD - "@babel/generator": ^7.19.0 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "@babel/generator": ^7.20.7 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) "@babel/helper-environment-visitor": ^7.18.9 "@babel/helper-function-name": ^7.19.0 "@babel/helper-hoist-variables": ^7.18.6 "@babel/helper-split-export-declaration": ^7.18.6 -<<<<<<< HEAD -<<<<<<< HEAD - "@babel/parser": ^7.20.5 - "@babel/types": ^7.20.5 - debug: ^4.1.0 - globals: ^11.1.0 - checksum: c7fed468614aab1cf762dda5df26e2cfcd2b1b448c9d3321ac44786c4ee773fb0e10357e6593c3c6a648ae2e0be6d90462d855998dc10e3abae84de99291e008 - languageName: node - linkType: hard - -"@babel/types@npm:^7.0.0, @babel/types@npm:^7.12.1, @babel/types@npm:^7.12.6, @babel/types@npm:^7.18.10, @babel/types@npm:^7.18.6, @babel/types@npm:^7.18.9, @babel/types@npm:^7.19.0, @babel/types@npm:^7.20.0, @babel/types@npm:^7.20.2, @babel/types@npm:^7.20.5, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.7.0, @babel/types@npm:^7.8.3": - version: 7.20.5 - resolution: "@babel/types@npm:7.20.5" -======= - regenerator-runtime: ^0.13.4 - checksum: 36dd736baba7164e82b3cc9d43e081f0cb2d05ff867ad39cac515d99546cee75b7f782018b02a3dcf5f2ef3d27f319faa68965fdfec49d4912c60c6002353a2e - languageName: node - linkType: hard - -"@babel/template@npm:^7.10.4, @babel/template@npm:^7.16.7, @babel/template@npm:^7.3.3": - version: 7.16.7 - resolution: "@babel/template@npm:7.16.7" - dependencies: - "@babel/code-frame": ^7.16.7 - "@babel/parser": ^7.16.7 - "@babel/types": ^7.16.7 - checksum: 10cd112e89276e00f8b11b55a51c8b2f1262c318283a980f4d6cdb0286dc05734b9aaeeb9f3ad3311900b09bc913e02343fcaa9d4a4f413964aaab04eb84ac4a - languageName: node - linkType: hard - -"@babel/traverse@npm:^7.1.0, @babel/traverse@npm:^7.12.1, @babel/traverse@npm:^7.13.0, @babel/traverse@npm:^7.16.7, @babel/traverse@npm:^7.16.8, @babel/traverse@npm:^7.17.3, @babel/traverse@npm:^7.17.9, @babel/traverse@npm:^7.4.5, @babel/traverse@npm:^7.7.0, @babel/traverse@npm:^7.8.3": - version: 7.17.9 - resolution: "@babel/traverse@npm:7.17.9" - dependencies: - "@babel/code-frame": ^7.16.7 - "@babel/generator": ^7.17.9 - "@babel/helper-environment-visitor": ^7.16.7 - "@babel/helper-function-name": ^7.17.9 - "@babel/helper-hoist-variables": ^7.16.7 - "@babel/helper-split-export-declaration": ^7.16.7 - "@babel/parser": ^7.17.9 - "@babel/types": ^7.17.0 -======= - "@babel/parser": ^7.19.0 - "@babel/types": ^7.19.0 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "@babel/parser": ^7.20.13 "@babel/types": ^7.20.7 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) debug: ^4.1.0 globals: ^11.1.0 checksum: 30ca6e0bd18233fda48fa09315efd14dfc61dcf5b8fa3712b343bfc61b32bc63b5e85ea1773cc9576c9b293b96f46b4589aaeb0a52e1f3eeac4edc076d049fc7 languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -"@babel/types@npm:^7.0.0, @babel/types@npm:^7.12.1, @babel/types@npm:^7.12.6, @babel/types@npm:^7.16.0, @babel/types@npm:^7.16.7, @babel/types@npm:^7.16.8, @babel/types@npm:^7.17.0, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.7.0, @babel/types@npm:^7.8.3": - version: 7.17.0 - resolution: "@babel/types@npm:7.17.0" ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) - dependencies: - "@babel/helper-string-parser": ^7.19.4 - "@babel/helper-validator-identifier": ^7.19.1 - to-fast-properties: ^2.0.0 -<<<<<<< HEAD - checksum: 773f0a1ad9f6ca5c5beaf751d1d8d81b9130de87689d1321fc911d73c3b1167326d66f0ae086a27fb5bfc8b4ee3ffebf1339be50d3b4d8015719692468c31f2d -======= - checksum: 12e5a287986fe557188e87b2c5202223f1dc83d9239a196ab936fdb9f8c1eb0be717ff19f934b5fad4e29a75586d5798f74bed209bccea1c20376b9952056f0e ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= -"@babel/types@npm:^7.0.0, @babel/types@npm:^7.12.1, @babel/types@npm:^7.12.6, @babel/types@npm:^7.18.10, @babel/types@npm:^7.18.6, @babel/types@npm:^7.18.9, @babel/types@npm:^7.19.0, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.7.0, @babel/types@npm:^7.8.3": - version: 7.19.0 - resolution: "@babel/types@npm:7.19.0" -======= "@babel/types@npm:^7.0.0, @babel/types@npm:^7.12.1, @babel/types@npm:^7.12.6, @babel/types@npm:^7.18.6, @babel/types@npm:^7.18.9, @babel/types@npm:^7.19.0, @babel/types@npm:^7.20.0, @babel/types@npm:^7.20.2, @babel/types@npm:^7.20.5, @babel/types@npm:^7.20.7, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.7.0, @babel/types@npm:^7.8.3": version: 7.20.7 resolution: "@babel/types@npm:7.20.7" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/helper-string-parser": ^7.19.4 "@babel/helper-validator-identifier": ^7.19.1 to-fast-properties: ^2.0.0 -<<<<<<< HEAD - checksum: 9b346715a68aeede70ba9c685a144b0b26c53bcd595d448e24c8fa8df4d5956a5712e56ebadb7c85dcc32f218ee42788e37b93d50d3295c992072224cb3ef3fe ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: b39af241f0b72bba67fd6d0d23914f6faec8c0eba8015c181cbd5ea92e59fc91a52a1ab490d3520c7dbd19ddb9ebb76c476308f6388764f16d8201e37fae6811 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -2899,45 +1623,18 @@ __metadata: linkType: hard "@emotion/is-prop-valid@npm:^1.1.0": -<<<<<<< HEAD -<<<<<<< HEAD - version: 1.2.0 - resolution: "@emotion/is-prop-valid@npm:1.2.0" - dependencies: - "@emotion/memoize": ^0.8.0 - checksum: cc7a19850a4c5b24f1514665289442c8c641709e6f7711067ad550e05df331da0692a16148e85eda6f47e31b3261b64d74c5e25194d053223be16231f969d633 - languageName: node - linkType: hard - -"@emotion/memoize@npm:^0.8.0": - version: 0.8.0 - resolution: "@emotion/memoize@npm:0.8.0" - checksum: c87bb110b829edd8e1c13b90a6bc37cebc39af29c7599a1e66a48e06f9bec43e8e53495ba86278cc52e7589549492c8dfdc81d19f4fdec0cee6ba13d2ad2c928 -======= - version: 1.1.2 - resolution: "@emotion/is-prop-valid@npm:1.1.2" -======= version: 1.2.0 resolution: "@emotion/is-prop-valid@npm:1.2.0" ->>>>>>> 217c233f (fix(slider): fixes due to new version) dependencies: "@emotion/memoize": ^0.8.0 checksum: cc7a19850a4c5b24f1514665289442c8c641709e6f7711067ad550e05df331da0692a16148e85eda6f47e31b3261b64d74c5e25194d053223be16231f969d633 languageName: node linkType: hard -<<<<<<< HEAD -"@emotion/memoize@npm:^0.7.4": - version: 0.7.5 - resolution: "@emotion/memoize@npm:0.7.5" - checksum: 83da8d4a7649a92c72f960817692bc6be13cc13e107b9f7e878d63766525ed4402881bfeb3cda61145c050281e7e260f114a0a2870515527346f2ef896b915b3 ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= "@emotion/memoize@npm:^0.8.0": version: 0.8.0 resolution: "@emotion/memoize@npm:0.8.0" checksum: c87bb110b829edd8e1c13b90a6bc37cebc39af29c7599a1e66a48e06f9bec43e8e53495ba86278cc52e7589549492c8dfdc81d19f4fdec0cee6ba13d2ad2c928 ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard @@ -2980,43 +1677,11 @@ __metadata: linkType: hard "@googlemaps/js-api-loader@npm:^1.7.0": -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 1.15.1 - resolution: "@googlemaps/js-api-loader@npm:1.15.1" - dependencies: - fast-deep-equal: ^3.1.3 - checksum: 0f359c6703116eee926afcf044be419358aee0c34d597c394f5b543ab8b6fb19a90a631f9bcb22e457605edfa08b5f6a29856149e63c4c9305be848d913ec013 -======= - version: 1.13.10 - resolution: "@googlemaps/js-api-loader@npm:1.13.10" - dependencies: - fast-deep-equal: ^3.1.3 - checksum: 32d6fd4f9042f77edb73638152c32abd6c83eabd6244a136686f2057c24c7f7575b556104456417616d0525cab89bf1f6297cb8049eee6d29e624c9a18b1bd3d ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - version: 1.13.11 - resolution: "@googlemaps/js-api-loader@npm:1.13.11" - dependencies: - fast-deep-equal: ^3.1.3 - checksum: aea6ad541ca483a5f9cdd7f27d08c9bb446d433e07736014b163619dd89c4cf6548f40cd13ae687d4b622cbc161eec264f6c91e2c14d4bf8ea62445e96e89663 ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= - version: 1.14.3 - resolution: "@googlemaps/js-api-loader@npm:1.14.3" - dependencies: - fast-deep-equal: ^3.1.3 - checksum: 55ec4519c3bd99a489fc55715bfe5c12a617eff75101c16f237d2c8d56852f607bb74d50ca2204fe371d6b793741db57e4c487658f0d284a5d3bd2ecbcc2a15d ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 1.15.1 resolution: "@googlemaps/js-api-loader@npm:1.15.1" dependencies: fast-deep-equal: ^3.1.3 checksum: 0f359c6703116eee926afcf044be419358aee0c34d597c394f5b543ab8b6fb19a90a631f9bcb22e457605edfa08b5f6a29856149e63c4c9305be848d913ec013 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -3390,78 +2055,6 @@ __metadata: languageName: node linkType: hard -"@jridgewell/gen-mapping@npm:^0.1.0": - version: 0.1.1 - resolution: "@jridgewell/gen-mapping@npm:0.1.1" - dependencies: - "@jridgewell/set-array": ^1.0.0 - "@jridgewell/sourcemap-codec": ^1.4.10 - checksum: 3bcc21fe786de6ffbf35c399a174faab05eb23ce6a03e8769569de28abbf4facc2db36a9ddb0150545ae23a8d35a7cf7237b2aa9e9356a7c626fb4698287d5cc - languageName: node - linkType: hard - -"@jridgewell/gen-mapping@npm:^0.3.0, @jridgewell/gen-mapping@npm:^0.3.2": - version: 0.3.2 - resolution: "@jridgewell/gen-mapping@npm:0.3.2" - dependencies: - "@jridgewell/set-array": ^1.0.1 - "@jridgewell/sourcemap-codec": ^1.4.10 - "@jridgewell/trace-mapping": ^0.3.9 - checksum: 1832707a1c476afebe4d0fbbd4b9434fdb51a4c3e009ab1e9938648e21b7a97049fa6009393bdf05cab7504108413441df26d8a3c12193996e65493a4efb6882 - languageName: node - linkType: hard - -"@jridgewell/resolve-uri@npm:3.1.0, @jridgewell/resolve-uri@npm:^3.0.3": - version: 3.1.0 - resolution: "@jridgewell/resolve-uri@npm:3.1.0" - checksum: b5ceaaf9a110fcb2780d1d8f8d4a0bfd216702f31c988d8042e5f8fbe353c55d9b0f55a1733afdc64806f8e79c485d2464680ac48a0d9fcadb9548ee6b81d267 - languageName: node - linkType: hard - -"@jridgewell/set-array@npm:^1.0.0, @jridgewell/set-array@npm:^1.0.1": - version: 1.1.2 - resolution: "@jridgewell/set-array@npm:1.1.2" - checksum: 69a84d5980385f396ff60a175f7177af0b8da4ddb81824cb7016a9ef914eee9806c72b6b65942003c63f7983d4f39a5c6c27185bbca88eb4690b62075602e28e - languageName: node - linkType: hard - -"@jridgewell/source-map@npm:^0.3.2": - version: 0.3.2 - resolution: "@jridgewell/source-map@npm:0.3.2" - dependencies: - "@jridgewell/gen-mapping": ^0.3.0 - "@jridgewell/trace-mapping": ^0.3.9 - checksum: 1b83f0eb944e77b70559a394d5d3b3f98a81fcc186946aceb3ef42d036762b52ef71493c6c0a3b7c1d2f08785f53ba2df1277fe629a06e6109588ff4cdcf7482 - languageName: node - linkType: hard - -"@jridgewell/sourcemap-codec@npm:1.4.14, @jridgewell/sourcemap-codec@npm:^1.4.10": - version: 1.4.14 - resolution: "@jridgewell/sourcemap-codec@npm:1.4.14" - checksum: 61100637b6d173d3ba786a5dff019e1a74b1f394f323c1fee337ff390239f053b87266c7a948777f4b1ee68c01a8ad0ab61e5ff4abb5a012a0b091bec391ab97 - languageName: node - linkType: hard - -"@jridgewell/trace-mapping@npm:0.3.9": - version: 0.3.9 - resolution: "@jridgewell/trace-mapping@npm:0.3.9" - dependencies: - "@jridgewell/resolve-uri": ^3.0.3 - "@jridgewell/sourcemap-codec": ^1.4.10 - checksum: d89597752fd88d3f3480845691a05a44bd21faac18e2185b6f436c3b0fd0c5a859fbbd9aaa92050c4052caf325ad3e10e2e1d1b64327517471b7d51babc0ddef - languageName: node - linkType: hard - -"@jridgewell/trace-mapping@npm:^0.3.9": - version: 0.3.17 - resolution: "@jridgewell/trace-mapping@npm:0.3.17" - dependencies: - "@jridgewell/resolve-uri": 3.1.0 - "@jridgewell/sourcemap-codec": 1.4.14 - checksum: 9d703b859cff5cd83b7308fd457a431387db5db96bd781a63bf48e183418dd9d3d44e76b9e4ae13237f6abeeb25d739ec9215c1d5bfdd08f66f750a50074a339 - languageName: node - linkType: hard - "@mapbox/point-geometry@npm:^0.1.0": version: 0.1.0 resolution: "@mapbox/point-geometry@npm:0.1.0" @@ -3503,19 +2096,6 @@ __metadata: "@gar/promisify": ^1.0.1 semver: ^7.3.5 checksum: f5ad92f157ed222e4e31c352333d0901df02c7c04311e42a81d8eb555d4ec4276ea9c635011757de20cc476755af33e91622838de573b17e52e2e7703f0a9965 -<<<<<<< HEAD - languageName: node - linkType: hard - -"@npmcli/fs@npm:^2.1.0": - version: 2.1.2 - resolution: "@npmcli/fs@npm:2.1.2" - dependencies: - "@gar/promisify": ^1.1.3 - semver: ^7.3.5 - checksum: 405074965e72d4c9d728931b64d2d38e6ea12066d4fad651ac253d175e413c06fe4350970c783db0d749181da8fe49c42d3880bd1cbc12cd68e3a7964d820225 -======= ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) languageName: node linkType: hard @@ -3540,30 +2120,12 @@ __metadata: linkType: hard "@npmcli/move-file@npm:^2.0.0": -<<<<<<< HEAD -<<<<<<< HEAD - version: 2.0.1 - resolution: "@npmcli/move-file@npm:2.0.1" - dependencies: - mkdirp: ^1.0.4 - rimraf: ^3.0.2 - checksum: 52dc02259d98da517fae4cb3a0a3850227bdae4939dda1980b788a7670636ca2b4a01b58df03dd5f65c1e3cb70c50fa8ce5762b582b3f499ec30ee5ce1fd9380 -======= - version: 2.0.0 - resolution: "@npmcli/move-file@npm:2.0.0" - dependencies: - mkdirp: ^1.0.4 - rimraf: ^3.0.2 - checksum: 1388777b507b0c592d53f41b9d182e1a8de7763bc625fc07999b8edbc22325f074e5b3ec90af79c89d6987fdb2325bc66d59f483258543c14a43661621f841b0 ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= version: 2.0.1 resolution: "@npmcli/move-file@npm:2.0.1" dependencies: mkdirp: ^1.0.4 rimraf: ^3.0.2 checksum: 52dc02259d98da517fae4cb3a0a3850227bdae4939dda1980b788a7670636ca2b4a01b58df03dd5f65c1e3cb70c50fa8ce5762b582b3f499ec30ee5ce1fd9380 ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard @@ -3610,42 +2172,13 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -"@rc-component/portal@npm:^1.0.0-6, @rc-component/portal@npm:^1.0.0-8, @rc-component/portal@npm:^1.0.2": - version: 1.0.3 - resolution: "@rc-component/portal@npm:1.0.3" -======= "@rc-component/portal@npm:^1.0.0-6, @rc-component/portal@npm:^1.0.0-8, @rc-component/portal@npm:^1.0.2": version: 1.1.0 resolution: "@rc-component/portal@npm:1.1.0" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/runtime": ^7.18.0 classnames: ^2.3.2 rc-util: ^5.24.4 -<<<<<<< HEAD - peerDependencies: - react: ">=16.9.0" - react-dom: ">=16.9.0" - checksum: e25a72042c4a7dfe8a25526972e1d024a8f5aac29963bed63ecdb356b238ae882575b2dc27de9f003618638c758dc669d5684549cf09125fce95d9227d78a75e - languageName: node - linkType: hard - -"@react-leaflet/core@npm:^2.0.0-beta.1": - version: 2.1.0 - resolution: "@react-leaflet/core@npm:2.1.0" - peerDependencies: - leaflet: ^1.9.0 - react: ^18.0.0 - react-dom: ^18.0.0 - checksum: c11a15fb71a9929b809f346d8f784d0f32afa373bc096aa1f0d0fa6a2ef0ce632a563c31876abf8b255a12a19d6e80ece31e2ef505f79a678bbf073e7a6c5c60 -======= -"@react-leaflet/core@npm:^2.0.0-beta.1": - version: 2.0.1 - resolution: "@react-leaflet/core@npm:2.0.1" -======= ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" @@ -3660,38 +2193,13 @@ __metadata: leaflet: ^1.9.0 react: ^18.0.0 react-dom: ^18.0.0 -<<<<<<< HEAD - checksum: 3fb90eeab42b47c370b2c19e2d7af94ae29ba4a98d59af646b7588a368841588eee0aed5429b5330eaa5bb4f56522d22668c613592573f492cfc1ababdd48a17 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: c11a15fb71a9929b809f346d8f784d0f32afa373bc096aa1f0d0fa6a2ef0ce632a563c31876abf8b255a12a19d6e80ece31e2ef505f79a678bbf073e7a6c5c60 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard "@reduxjs/toolkit@npm:^1.7.1": -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 1.9.1 - resolution: "@reduxjs/toolkit@npm:1.9.1" -======= - version: 1.8.0 - resolution: "@reduxjs/toolkit@npm:1.8.0" ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - version: 1.8.1 - resolution: "@reduxjs/toolkit@npm:1.8.1" ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= - version: 1.8.5 - resolution: "@reduxjs/toolkit@npm:1.8.5" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 1.9.2 resolution: "@reduxjs/toolkit@npm:1.9.2" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: immer: ^9.0.16 redux: ^4.2.0 @@ -3699,42 +2207,12 @@ __metadata: reselect: ^4.1.7 peerDependencies: react: ^16.9.0 || ^17.0.0 || ^18 -<<<<<<< HEAD -<<<<<<< HEAD react-redux: ^7.2.1 || ^8.0.2 -======= - react-redux: ^7.2.1 || ^8.0.0-beta ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= - react-redux: ^7.2.1 || ^8.0.2 ->>>>>>> 217c233f (fix(slider): fixes due to new version) peerDependenciesMeta: react: optional: true react-redux: optional: true -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - checksum: e6700a0d45198ab525c96ff0425fa0125fbdc37ce514f0c77c30225837113279ceec9190ac3da35cb20e77553e56342021788bbf17465819068c4db34cb3d87f - languageName: node - linkType: hard - -"@remix-run/router@npm:1.0.3": - version: 1.0.3 - resolution: "@remix-run/router@npm:1.0.3" - checksum: 7e535f3c24bf6b0a48aff3de70ee74e5402fe93105aa9bd01f275d5d8f5a9a8a7cadec08d18cf5544d4f24bc9d7a091abc1c9d4ea8efb2893e9077f104a51459 -======= - checksum: e229571b80d7f5c4407af2050ac2a26a22472541fef1705d5e8b73b93bfb2884072d79e1cea2cd81d89939cc6b6073ef3ddf1680950aac66ba34cd202a6cf371 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - checksum: be5cdea975a8a631fe2d88cafc7077554c7bc3621a4a7031556cc17e5dec26359018f2614c325895e7ab50865f5c511025d1e589ca01de7e2bd88d95e0a1a963 ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= - checksum: 831b5c74779262351d20efa0f4c06f794702bd55b14bd8f69362e29f82f7ad43aee66f39518914345ad9e9c6c93611acdeb576a70deda260733c3f098875aaca ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: 8eac4fb65aa5ef969545e4d72a81c5a7679935d08df8cc4dd955362beb0b0b8d3cb1e2252df256a50bbe0c887b797a0e2e271656d6b50cbec5d26f61da3a80d4 languageName: node linkType: hard @@ -3743,7 +2221,6 @@ __metadata: version: 1.3.1 resolution: "@remix-run/router@npm:1.3.1" checksum: c91cba100b13fbb83cdaf43ca66b0d9fc1ab9dfe0bc58ac80ff2a4889488bf518a111267c790350eac8c7f764cc7809402430de15bdf70282d0bd60acf06d9de ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -4014,33 +2491,15 @@ __metadata: linkType: hard "@types/babel__core@npm:^7.0.0, @types/babel__core@npm:^7.1.7": -<<<<<<< HEAD -<<<<<<< HEAD - version: 7.1.20 - resolution: "@types/babel__core@npm:7.1.20" -======= - version: 7.1.19 - resolution: "@types/babel__core@npm:7.1.19" ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= version: 7.20.0 resolution: "@types/babel__core@npm:7.20.0" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/parser": ^7.20.7 "@babel/types": ^7.20.7 "@types/babel__generator": "*" "@types/babel__template": "*" "@types/babel__traverse": "*" -<<<<<<< HEAD -<<<<<<< HEAD - checksum: a09c4f0456552547a5b8a5a009a3daec4d362f622168f8e08bda0ded2da0a65ab0b1642e23c433b3616721f5701dc34a996c5bde5baeaea53eda98f438043f2c -======= - checksum: 8c9fa87a1c2224cbec251683a58bebb0d74c497118034166aaa0491a4e2627998a6621fc71f8a60ffd27d9c0c52097defedf7637adc6618d0331c15adb302338 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= checksum: 49b601a0a7637f1f387442c8156bd086cfd10ff4b82b0e1994e73a6396643b5435366fb33d6b604eade8467cca594ef97adcbc412aede90bb112ebe88d0ad6df ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -4064,27 +2523,11 @@ __metadata: linkType: hard "@types/babel__traverse@npm:*, @types/babel__traverse@npm:^7.0.4, @types/babel__traverse@npm:^7.0.6": -<<<<<<< HEAD -<<<<<<< HEAD - version: 7.18.3 - resolution: "@types/babel__traverse@npm:7.18.3" - dependencies: - "@babel/types": ^7.3.0 - checksum: d20953338b2f012ab7750932ece0a78e7d1645b0a6ff42d49be90f55e9998085da1374a9786a7da252df89555c6586695ba4d1d4b4e88ab2b9f306bcd35e00d3 -======= - version: 7.18.1 - resolution: "@types/babel__traverse@npm:7.18.1" - dependencies: - "@babel/types": ^7.3.0 - checksum: a7158b13e5e4b844565217d04a0a09c1cf04e67de90972318960028effbd5e7400f2567b72c5f790acffdab9b4adce8d68f435a2f0c2b16e2c9c45994ace98f2 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 7.18.3 resolution: "@types/babel__traverse@npm:7.18.3" dependencies: "@babel/types": ^7.3.0 checksum: d20953338b2f012ab7750932ece0a78e7d1645b0a6ff42d49be90f55e9998085da1374a9786a7da252df89555c6586695ba4d1d4b4e88ab2b9f306bcd35e00d3 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -4148,21 +2591,9 @@ __metadata: linkType: hard "@types/estree@npm:*": -<<<<<<< HEAD -<<<<<<< HEAD version: 1.0.0 resolution: "@types/estree@npm:1.0.0" checksum: 910d97fb7092c6738d30a7430ae4786a38542023c6302b95d46f49420b797f21619cdde11fa92b338366268795884111c2eb10356e4bd2c8ad5b92941e9e6443 -======= - version: 0.0.51 - resolution: "@types/estree@npm:0.0.51" - checksum: e56a3bcf759fd9185e992e7fdb3c6a5f81e8ff120e871641607581fb3728d16c811702a7d40fa5f869b7f7b4437ab6a87eb8d98ffafeee51e85bbe955932a189 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - version: 1.0.0 - resolution: "@types/estree@npm:1.0.0" - checksum: 910d97fb7092c6738d30a7430ae4786a38542023c6302b95d46f49420b797f21619cdde11fa92b338366268795884111c2eb10356e4bd2c8ad5b92941e9e6443 ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard @@ -4191,27 +2622,11 @@ __metadata: linkType: hard "@types/google-map-react@npm:^2.1.3": -<<<<<<< HEAD -<<<<<<< HEAD - version: 2.1.7 - resolution: "@types/google-map-react@npm:2.1.7" - dependencies: - "@types/react": "*" - checksum: 0e8e014208e39624c861616021b4f8f8e085caaad3600418f33e6bf2481451ea97a1167ae4a2157cf3d1e397905721955a012b00e55d7c07d7e4bd95694dc69e -======= - version: 2.1.5 - resolution: "@types/google-map-react@npm:2.1.5" - dependencies: - "@types/react": "*" - checksum: 92cfc8fca9154d2f4f6b877ed9c242dc6ce252048f98591465d3e293f54b178a7727013cd7beac6825d7330367be6ae5019bd08157e26908d6318b59ea6fb0ab ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= version: 2.1.7 resolution: "@types/google-map-react@npm:2.1.7" dependencies: "@types/react": "*" checksum: 0e8e014208e39624c861616021b4f8f8e085caaad3600418f33e6bf2481451ea97a1167ae4a2157cf3d1e397905721955a012b00e55d7c07d7e4bd95694dc69e ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard @@ -4272,23 +2687,11 @@ __metadata: checksum: f1ad54bc68f37f60b30c7915886b92f86b847033e597f9b34f2415acdbe5ed742fa559a0a40050d74cdba3b6a63c342cac1f3a64dba5b68b66a6941f4abd7903 languageName: node linkType: hard - -"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.3, @types/json-schema@npm:^7.0.5, @types/json-schema@npm:^7.0.7, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9": -<<<<<<< HEAD -<<<<<<< HEAD - version: 7.0.11 - resolution: "@types/json-schema@npm:7.0.11" - checksum: 527bddfe62db9012fccd7627794bd4c71beb77601861055d87e3ee464f2217c85fca7a4b56ae677478367bbd248dbde13553312b7d4dbc702a2f2bbf60c4018d -======= - version: 7.0.10 - resolution: "@types/json-schema@npm:7.0.10" - checksum: 369f12207298e3c8931100ab86c9c60d9217ab930a8ae0b851495f4f30695d3f0eb431eedc8e8d9c69357869899ea0fe6f9d65ddde5ea70415d67ef340dfdd1f ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= + +"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.3, @types/json-schema@npm:^7.0.5, @types/json-schema@npm:^7.0.7, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9": version: 7.0.11 resolution: "@types/json-schema@npm:7.0.11" checksum: 527bddfe62db9012fccd7627794bd4c71beb77601861055d87e3ee464f2217c85fca7a4b56ae677478367bbd248dbde13553312b7d4dbc702a2f2bbf60c4018d ->>>>>>> fe15f957 (refactor(slider): set theme on load) languageName: node linkType: hard @@ -4300,27 +2703,11 @@ __metadata: linkType: hard "@types/leaflet@npm:^1.7.9": -<<<<<<< HEAD -<<<<<<< HEAD - version: 1.9.0 - resolution: "@types/leaflet@npm:1.9.0" - dependencies: - "@types/geojson": "*" - checksum: f3ee2e2fc8bd3480d77667471c8f774a3726ff7694a7d08d2423c05b40e28f00379c7d469b4cbd3b53a1bc96c75970c92f9da7908fc477cbac0eda2a9d17b6ad -======= - version: 1.7.11 - resolution: "@types/leaflet@npm:1.7.11" - dependencies: - "@types/geojson": "*" - checksum: 6613dbc91f174545ed39183a8564a344152f1884f02ab4dbc002b6bd4816d8525b5247e62217694763daf727ca5e589f40144dc809edb7194064e6bdc2f4369a ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 1.9.0 resolution: "@types/leaflet@npm:1.9.0" dependencies: "@types/geojson": "*" checksum: f3ee2e2fc8bd3480d77667471c8f774a3726ff7694a7d08d2423c05b40e28f00379c7d469b4cbd3b53a1bc96c75970c92f9da7908fc477cbac0eda2a9d17b6ad ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -4348,27 +2735,9 @@ __metadata: linkType: hard "@types/node@npm:*": -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 18.11.9 - resolution: "@types/node@npm:18.11.9" - checksum: cc0aae109e9b7adefc32eecb838d6fad931663bb06484b5e9cbbbf74865c721b03d16fd8d74ad90e31dbe093d956a7c2c306ba5429ba0c00f3f7505103d7a496 -======= - version: 17.0.23 - resolution: "@types/node@npm:17.0.23" - checksum: a3517554737cbb042e76c30d0e5482192ac4d9bea0eeb086e2622d9cabf460a0eb52a696b99fcd18e7fcc93c96db6cc7ae507f6608f256ef0b5c1d8c87a5a470 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - version: 18.7.15 - resolution: "@types/node@npm:18.7.15" - checksum: 1435fc7fe44744467a3ba8ace646455be228516530dbb3db64a03cca6abcfdc5ba2e48a3eafc71f25f836d2ca871132361c58a5e760237a53674cb09151147d9 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= - version: 18.11.18 - resolution: "@types/node@npm:18.11.18" - checksum: 03f17f9480f8d775c8a72da5ea7e9383db5f6d85aa5fefde90dd953a1449bd5e4ffde376f139da4f3744b4c83942166d2a7603969a6f8ea826edfb16e6e3b49d ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) + version: 18.11.19 + resolution: "@types/node@npm:18.11.19" + checksum: d7cd19fcfc59cbdd3f9ba0b4072cb7adc21bd575bd8eb7d7e698975e63564aaa83f03434f32b12331f84f73d0b369d9cbe2371e359d9d7f5c3361f4987f4f7da languageName: node linkType: hard @@ -4387,27 +2756,9 @@ __metadata: linkType: hard "@types/prettier@npm:^2.0.0": -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 2.7.1 - resolution: "@types/prettier@npm:2.7.1" - checksum: 5e3f58e229d6c73b5f5cae2e8f96c1c4a5b5805f83459e17a045ba8e96152b1d38e86b63e3172fb159dac923388699660862b75b2d37e54220805f0e691e26f1 -======= - version: 2.4.4 - resolution: "@types/prettier@npm:2.4.4" - checksum: 2c2cc57efd49c7d8907415a72f96c84a6dd8696dd3bf8aa4ca3a667427bebf71cbfbc912673624bdfc935d272d1c008c639cf155f6449315990a4dc110f0d216 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - version: 2.7.0 - resolution: "@types/prettier@npm:2.7.0" - checksum: bf5d0c7c1270909b39399539ac106d20ddaa85fe92eb1d59922dc99159604b4f8d5e41b0045fb29c8011585cf5bca2350b7441ef3d9816c08bd0e10ebd4b31d4 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 2.7.2 resolution: "@types/prettier@npm:2.7.2" checksum: b47d76a5252265f8d25dd2fe2a5a61dc43ba0e6a96ffdd00c594cb4fd74c1982c2e346497e3472805d97915407a09423804cc2110a0b8e1b22cffcab246479b7 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -4426,27 +2777,11 @@ __metadata: linkType: hard "@types/react-dom@npm:^17.0.14": -<<<<<<< HEAD -<<<<<<< HEAD - version: 17.0.18 - resolution: "@types/react-dom@npm:17.0.18" - dependencies: - "@types/react": ^17 - checksum: b74525b1a13a0e27fe20859ff7a7e8f7e4581fb9d45ed1b6447ad1534d86f813818353c39d0df2e28f9d2b9be2e3af1908c244b2214a979393d19f217665e614 -======= - version: 17.0.17 - resolution: "@types/react-dom@npm:17.0.17" - dependencies: - "@types/react": ^17 - checksum: 23caf98aa03e968811560f92a2c8f451694253ebe16b670929b24eaf0e7fa62ba549abe9db0ac028a9d8a9086acd6ab9c6c773f163fa21224845edbc00ba6232 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 17.0.18 resolution: "@types/react-dom@npm:17.0.18" dependencies: "@types/react": ^17 checksum: b74525b1a13a0e27fe20859ff7a7e8f7e4581fb9d45ed1b6447ad1534d86f813818353c39d0df2e28f9d2b9be2e3af1908c244b2214a979393d19f217665e614 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -4460,41 +2795,14 @@ __metadata: linkType: hard "@types/react-redux@npm:^7.1.20": -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 7.1.24 - resolution: "@types/react-redux@npm:7.1.24" -======= - version: 7.1.23 - resolution: "@types/react-redux@npm:7.1.23" ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - version: 7.1.24 - resolution: "@types/react-redux@npm:7.1.24" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 7.1.25 resolution: "@types/react-redux@npm:7.1.25" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@types/hoist-non-react-statics": ^3.3.0 "@types/react": "*" hoist-non-react-statics: ^3.3.0 redux: ^4.0.0 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - checksum: 6582246581331ac7fbbd44aa1f1c136c8a9c8febbcf462432ac81302263308c21e1a2e7868beb7f73bbcb52a8e67935d133cb37f5bdcb6564eaff3a811805101 -======= - checksum: 7cedb0f20806ce67255f676fab2d4d9534c12705d43636df95224cfa77fdf5a2e792dc76c6e072c02cad1c88030aea822c14f36fe85d459b898ee68fcff6f05c ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - checksum: 6582246581331ac7fbbd44aa1f1c136c8a9c8febbcf462432ac81302263308c21e1a2e7868beb7f73bbcb52a8e67935d133cb37f5bdcb6564eaff3a811805101 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: a61ec25cbf8bb3720850402d3c49493fcff4afb73ad447d161460b5d4c600c984ad48708e8564d2fd32052eaa3c3b3f655c5b300ce813429637cce9e5958329f ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -4530,21 +2838,12 @@ __metadata: linkType: hard "@types/react-router@npm:*": -<<<<<<< HEAD - version: 5.1.19 - resolution: "@types/react-router@npm:5.1.19" - dependencies: - "@types/history": ^4.7.11 - "@types/react": "*" - checksum: 3536c3dec7af1f12fed2bea246eb143bd893ee66d4e58c1d3fe734cbd67d8a0aedac0bba9255c58fc69dbd32ae17ad280d6866916aee32653a705178e4a544dc -======= version: 5.1.20 resolution: "@types/react-router@npm:5.1.20" dependencies: "@types/history": ^4.7.11 "@types/react": "*" checksum: 128764143473a5e9457ddc715436b5d49814b1c214dde48939b9bef23f0e77f52ffcdfa97eb8d3cc27e2c229869c0cdd90f637d887b62f2c9f065a87d6425419 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -4565,14 +2864,7 @@ __metadata: resolution: "@types/react-slick@npm:0.23.10" dependencies: "@types/react": "*" -<<<<<<< HEAD -<<<<<<< HEAD - checksum: 1e53fe8385e853881741a450d15c52d6433334b671fee4044939037f8e5b83968cb91fd9dbe7e6686e906882ebcf370b81bd55b6688f8e810020e23a968c0385 -======= - checksum: df71ab6b0f4d573add5c1e24b00885b94e1a3f1d78757cafa0f73a38c1c17e4ad46a75e450267e9f371a9d221e52ddaae5b59b4fd8ad9516676e8bca77c15709 -======= checksum: 1e53fe8385e853881741a450d15c52d6433334b671fee4044939037f8e5b83968cb91fd9dbe7e6686e906882ebcf370b81bd55b6688f8e810020e23a968c0385 ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard @@ -4583,41 +2875,7 @@ __metadata: "@types/prop-types": "*" "@types/scheduler": "*" csstype: ^3.0.2 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - checksum: 9a84374da1173901b5eba6b2dda9e70220842c8e70274628e5c93684fca59786b7f6215c93f492e34f8834983de096b2544f280c60da9b8fd4c3f20ffe7cc51e ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - checksum: 981b0993f5b3ea9d3488b8cc883201e8ae47ba7732929f788f450a79fd72829e658080d5084e67caa008e58d989b0abc1d5f36ff0a1cda09315ea3a3c0c9dc11 ->>>>>>> fe15f957 (refactor(slider): set theme on load) - languageName: node - linkType: hard - -"@types/react@npm:^17.0.43": - version: 17.0.52 - resolution: "@types/react@npm:17.0.52" -======= - checksum: 6d72d35ab3eecf382a5e0f225923f5a2c753045fce02e4e29713f36c99a24f0f770666a49dde96167f37c86271f93339d1b7e2b8969d011b137a9ebd24ee6806 - languageName: node - linkType: hard - -"@types/react@npm:^17, @types/react@npm:^17.0.43": - version: 17.0.49 - resolution: "@types/react@npm:17.0.49" ->>>>>>> 217c233f (fix(slider): fixes due to new version) - dependencies: - "@types/prop-types": "*" - "@types/scheduler": "*" - csstype: ^3.0.2 -<<<<<<< HEAD - checksum: a51b98dd87838d161278fdf9dd78e6a4ff8c018f406d6647f77963e144fb52a8beee40c89fd0e7e840eaeaa8bd9fe2f34519410540b1a52d43a6f8b4d2fbce33 -======= - checksum: e2e8001bb16fdf52dc92dbc2f64c8e49b1c6ab5d5da4725c0f27e3d925939e42b835554fecc306ca6b0951801eb784288b63c924bd703834662bbaccf89cb68a ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: dacfde02c260fd98bed2eb775ed0c7ce1397be4c0844f907a50763b081a4008f81f57071889a16eb1350ddcf0927f3cf1a6541702c8ad03de3c70383ef931e3f ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -4659,31 +2917,13 @@ __metadata: linkType: hard "@types/styled-components@npm:^5.1.10": -<<<<<<< HEAD -<<<<<<< HEAD - version: 5.1.26 - resolution: "@types/styled-components@npm:5.1.26" -======= - version: 5.1.24 - resolution: "@types/styled-components@npm:5.1.24" ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= version: 5.1.26 resolution: "@types/styled-components@npm:5.1.26" ->>>>>>> 217c233f (fix(slider): fixes due to new version) dependencies: "@types/hoist-non-react-statics": "*" "@types/react": "*" csstype: ^3.0.2 -<<<<<<< HEAD -<<<<<<< HEAD - checksum: 84f53b3101739b20d1731554fb7735bc2f3f5d050a8b392e9845403c8c8bbd729737d033978649f9195a97b557875b010d46e35a4538564a2d0dbcce661dbf76 -======= - checksum: 158c69085ad899622f558426c623d3052f7b521ede01c0fd342280c93ef2ac462a39c4c3b2374e7c7e2630fcc64dfcfd8f4446c8d4809cbac9a7b962a73357c0 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= checksum: 84f53b3101739b20d1731554fb7735bc2f3f5d050a8b392e9845403c8c8bbd729737d033978649f9195a97b557875b010d46e35a4538564a2d0dbcce661dbf76 ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard @@ -4702,27 +2942,11 @@ __metadata: linkType: hard "@types/uglify-js@npm:*": -<<<<<<< HEAD -<<<<<<< HEAD - version: 3.17.1 - resolution: "@types/uglify-js@npm:3.17.1" - dependencies: - source-map: ^0.6.1 - checksum: 76b9aa6b5c19690bee1fba29835ca580ec92db2b43cb8e2acd0278086138372a66e55bbd785c90d032bc890069f0cfde9c763f2d2860bb1a747b581a04d0999b -======= - version: 3.17.0 - resolution: "@types/uglify-js@npm:3.17.0" - dependencies: - source-map: ^0.6.1 - checksum: 931bc580083dccc5c5792422aebfc5f18454ce820b0eb9771b9d8a206f47718a77fe1fcdae59903d32a9fae5ef6c8974f6f0903c462a2c51d0ad34f2743083e2 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 3.17.1 resolution: "@types/uglify-js@npm:3.17.1" dependencies: source-map: ^0.6.1 checksum: 76b9aa6b5c19690bee1fba29835ca580ec92db2b43cb8e2acd0278086138372a66e55bbd785c90d032bc890069f0cfde9c763f2d2860bb1a747b581a04d0999b ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -4804,57 +3028,16 @@ __metadata: linkType: hard "@typescript-eslint/eslint-plugin@npm:^5.10.0": -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 5.45.0 - resolution: "@typescript-eslint/eslint-plugin@npm:5.45.0" - dependencies: - "@typescript-eslint/scope-manager": 5.45.0 - "@typescript-eslint/type-utils": 5.45.0 - "@typescript-eslint/utils": 5.45.0 - debug: ^4.3.4 - ignore: ^5.2.0 - natural-compare-lite: ^1.4.0 -======= - version: 5.16.0 - resolution: "@typescript-eslint/eslint-plugin@npm:5.16.0" -======= - version: 5.17.0 - resolution: "@typescript-eslint/eslint-plugin@npm:5.17.0" ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= - version: 5.18.0 - resolution: "@typescript-eslint/eslint-plugin@npm:5.18.0" ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= - version: 5.36.2 - resolution: "@typescript-eslint/eslint-plugin@npm:5.36.2" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 5.50.0 resolution: "@typescript-eslint/eslint-plugin@npm:5.50.0" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@typescript-eslint/scope-manager": 5.50.0 "@typescript-eslint/type-utils": 5.50.0 "@typescript-eslint/utils": 5.50.0 debug: ^4.3.4 -<<<<<<< HEAD - functional-red-black-tree: ^1.0.1 -<<<<<<< HEAD - ignore: ^5.1.8 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - ignore: ^5.2.0 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= grapheme-splitter: ^1.0.4 ignore: ^5.2.0 natural-compare-lite: ^1.4.0 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) regexpp: ^3.2.0 semver: ^7.3.7 tsutils: ^3.21.0 @@ -4864,27 +3047,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - checksum: 7cff671a9ba33afa86f0ece6d0ebaeb5fc16596fc659ef230f6f65bfddfef2ffb6434310e3a4444fb852e79e40c85c5e62c559df6ddc9312aac235a18afdd269 -======= - checksum: 4007cc1599503424037300e7401fb969ca441b122ef8a8f2fc8d70f84d656fdf7ab7b0d00e506a3aaf702871616c3756da17eb1508ff315dfb25170f2d28a904 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - checksum: 62ec611fb384f27fc5b101fc8a0642ae94b2975618d37d3157c2f887cf89b389624e9d476bff303073d038076c05e6c00f3b205af3b2302967e720e99cd18d38 ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= - checksum: e8f0e7cfa0d102b1006a0f674fbba6cfc3d5a609d3ebb07306d744d3db91080659cd2b9935ccbde2ad9bbbe9543bc47540df1ffada0e7676dd38957cdffd7436 ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= - checksum: edcd9fcecdeb22a689b421cafe3b7adc859bf2fd6227aecdd7412c319c808e7bab063c8f94af32116cfc971962f9780d181cb0a4aa999951c2d2be1f84c6c376 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: 351c4a157a7d717cc3835bdc09324b20d649463738a029c5701e5a38cdb162305ff7d56adff196a0c3245c24ea3167bbdac7f1c30399b8c1d495abbdbc1c53d6 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -4937,74 +3100,19 @@ __metadata: linkType: hard "@typescript-eslint/parser@npm:^5.8.0": -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 5.45.0 - resolution: "@typescript-eslint/parser@npm:5.45.0" - dependencies: - "@typescript-eslint/scope-manager": 5.45.0 - "@typescript-eslint/types": 5.45.0 - "@typescript-eslint/typescript-estree": 5.45.0 - debug: ^4.3.4 -======= - version: 5.16.0 - resolution: "@typescript-eslint/parser@npm:5.16.0" -======= - version: 5.17.0 - resolution: "@typescript-eslint/parser@npm:5.17.0" ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= - version: 5.18.0 - resolution: "@typescript-eslint/parser@npm:5.18.0" ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) - dependencies: - "@typescript-eslint/scope-manager": 5.18.0 - "@typescript-eslint/types": 5.18.0 - "@typescript-eslint/typescript-estree": 5.18.0 - debug: ^4.3.2 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - version: 5.36.2 - resolution: "@typescript-eslint/parser@npm:5.36.2" -======= version: 5.50.0 resolution: "@typescript-eslint/parser@npm:5.50.0" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@typescript-eslint/scope-manager": 5.50.0 "@typescript-eslint/types": 5.50.0 "@typescript-eslint/typescript-estree": 5.50.0 debug: ^4.3.4 ->>>>>>> 217c233f (fix(slider): fixes due to new version) peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - checksum: b8ce3af72de3ff22bb206c3299e728d37a836dbe1f75bcb66ad3bb7962204174b7fff834992b84f0e661de507729c01c7ad71ad2707c217cccc3c0f798a9dc23 -======= - checksum: 40006578e9ac451c80dc4b4b7e29af97b53fb9e9ea660d6ca17fb98b5c9858c648f9b17523c9de9b9b9e4155af17b65435e6163f02c4a2dfacf48274f45cba21 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - checksum: 15b855ea84e44371366d44b5add87ed0dc34b856ca8a6949ecc4066faaf3ea3d7e016ea92db06ab97a637530148c472c38c19cc5eff68b691701ff89dc5c1abc ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= - checksum: 8e007a4980eb8794621bf51404b6ecc923eeffc661d7da2fac9d5c79f6ea70735322953dd88ee4a9b06d916f43e4cc633d724a5cf70c0a10a8cd251d54e67ff4 ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= - checksum: d6cc22cbc7aacb5ecebf55eb1d681cb6b964b108e147b418295c3e48701a77768cff128c16da421ae50eabb9f1296ecec7fa3cc5f2ccb63a3febf79f98b4195f ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: 816a421ce9a5c61a2e92499d6d400aed4211ca5b685e0212844b6659f7acfeba1cca0418b462236c44eea6e8a2574cd51ccb7abc2bf4a8cad5b7a275d71ae9bf ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -5018,52 +3126,9 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"@typescript-eslint/scope-manager@npm:5.45.0": - version: 5.45.0 - resolution: "@typescript-eslint/scope-manager@npm:5.45.0" - dependencies: - "@typescript-eslint/types": 5.45.0 - "@typescript-eslint/visitor-keys": 5.45.0 - checksum: 8f686be8ee0c7ac49ee2a313570cddf86a1364b1ec129f50f8a531038a3bb241429734dc5e2c4e5dd76cc3ed149628aa3e8425cc092f37ca6885b1995c99c2d1 - languageName: node - linkType: hard - -"@typescript-eslint/type-utils@npm:5.45.0": - version: 5.45.0 - resolution: "@typescript-eslint/type-utils@npm:5.45.0" - dependencies: - "@typescript-eslint/typescript-estree": 5.45.0 - "@typescript-eslint/utils": 5.45.0 - debug: ^4.3.4 -======= -"@typescript-eslint/scope-manager@npm:5.16.0": - version: 5.16.0 - resolution: "@typescript-eslint/scope-manager@npm:5.16.0" -======= -"@typescript-eslint/scope-manager@npm:5.17.0": - version: 5.17.0 - resolution: "@typescript-eslint/scope-manager@npm:5.17.0" ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= -"@typescript-eslint/scope-manager@npm:5.18.0": - version: 5.18.0 - resolution: "@typescript-eslint/scope-manager@npm:5.18.0" ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= -"@typescript-eslint/scope-manager@npm:5.36.2": - version: 5.36.2 - resolution: "@typescript-eslint/scope-manager@npm:5.36.2" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "@typescript-eslint/scope-manager@npm:5.50.0": version: 5.50.0 resolution: "@typescript-eslint/scope-manager@npm:5.50.0" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@typescript-eslint/types": 5.50.0 "@typescript-eslint/visitor-keys": 5.50.0 @@ -5075,47 +3140,16 @@ __metadata: version: 5.50.0 resolution: "@typescript-eslint/type-utils@npm:5.50.0" dependencies: -<<<<<<< HEAD -<<<<<<< HEAD - "@typescript-eslint/utils": 5.18.0 - debug: ^4.3.2 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - "@typescript-eslint/typescript-estree": 5.36.2 - "@typescript-eslint/utils": 5.36.2 -======= "@typescript-eslint/typescript-estree": 5.50.0 "@typescript-eslint/utils": 5.50.0 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) debug: ^4.3.4 ->>>>>>> 217c233f (fix(slider): fixes due to new version) tsutils: ^3.21.0 peerDependencies: eslint: "*" peerDependenciesMeta: typescript: optional: true -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - checksum: be96c89b91116b8fbed160631f3cdd345d47e34248a38e8a730fa9e09a4aa21184259414547d3c7a741b83fa68d4a14f77e9fc93b84aba4752f67bd5a772bf27 -======= - checksum: 86d9f1dff6a096c8465453b8c7d0cc667b87a769f19073bfa9bbd36f8baa772c0384ec396b1132052383846bbbcf0d051345ed7d373260c1b506ed27100b383d ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - checksum: 9aad46ea7a757ec4584b9d9c995e94543bf40af7d85b2f502d66db08d7f03468c858320fccb4942238b0bb9e2d432df3d9861cf21624b0c57660c88b1d91a7d4 ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= - checksum: a9722e18635d98ed7b468b1915d4bc9ef3de6dd85bfe734d932465977f9952655171cb5c886c7d42145ebb8ef1b5b7fcf50e9937a9370080246a7bae4cbd1047 ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= - checksum: c202b7d2cd08ed7f7d1ad7e430e9e1596478e147f0d485d02babfda0211c55fa950de1dc4d1c950008a8a047a31c1e982e97fe5558f93d496830eb9d9532bc71 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: d2fc2fd10ef300865fd6a902ae92aef6c45cddc4359445f1e5c6dc9511063b52d2170cc6b525763395d4171c177b3d0fffd77cf9a2ab7e01fcd7109bd1a5a585 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -5133,45 +3167,10 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"@typescript-eslint/types@npm:5.45.0": - version: 5.45.0 - resolution: "@typescript-eslint/types@npm:5.45.0" - checksum: 43d533622995f002221e439ea517aa07dbce2067cc880a6eb9d26307c505b746975f334d76b35501a2f4dd06d7aaf79964d86ce5a95e76a4f309d6e54faf5213 -======= -"@typescript-eslint/types@npm:5.16.0": - version: 5.16.0 - resolution: "@typescript-eslint/types@npm:5.16.0" - checksum: 0450125741c3eef9581da0b75b4a987a633d77009cfb03507c3db29885b790ee80e3c0efc4f9a0dd3376ba758b49c7829722676153472616a57bb04bce5cc4fa ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= -"@typescript-eslint/types@npm:5.17.0": - version: 5.17.0 - resolution: "@typescript-eslint/types@npm:5.17.0" - checksum: 06ed4c3c3f0a05bee9c23b6cb5eb679336c0f4769beb28848e8ce674f726fec88adba059f20e0b0f7271685d7f5480931b3bcafcf6b60044b93da162e29f3f68 ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= -"@typescript-eslint/types@npm:5.18.0": - version: 5.18.0 - resolution: "@typescript-eslint/types@npm:5.18.0" - checksum: 25d8d6f2f70ac4e93f4759a4927290749f528bce2150a87cde08200d706a6147880ca2ceeb8c93e0f370aace096c878096cd45427a59538877ac2121df8aaa01 ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= -"@typescript-eslint/types@npm:5.36.2": - version: 5.36.2 - resolution: "@typescript-eslint/types@npm:5.36.2" - checksum: 736cb8a76b58f2f9a7d066933094c5510ffe31479ea8b804a829ec85942420f1b55e0eb2688fbdaaaa9c0e5b3b590fb8f14bbd745353696b4fd33fda620d417b ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "@typescript-eslint/types@npm:5.50.0": version: 5.50.0 resolution: "@typescript-eslint/types@npm:5.50.0" checksum: 1189c63d35abeec685dd519fd923926b884e63d5e10e4a9fe995aebfde59b8a2e10773090ec3ba32a0ec408746b18f6a454d9bedb0b6c7ce8b6066547144fb4d ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -5212,92 +3211,21 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"@typescript-eslint/typescript-estree@npm:5.45.0": - version: 5.45.0 - resolution: "@typescript-eslint/typescript-estree@npm:5.45.0" - dependencies: - "@typescript-eslint/types": 5.45.0 - "@typescript-eslint/visitor-keys": 5.45.0 - debug: ^4.3.4 - globby: ^11.1.0 -======= -"@typescript-eslint/typescript-estree@npm:5.16.0": - version: 5.16.0 - resolution: "@typescript-eslint/typescript-estree@npm:5.16.0" -======= -"@typescript-eslint/typescript-estree@npm:5.17.0": - version: 5.17.0 - resolution: "@typescript-eslint/typescript-estree@npm:5.17.0" ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= -"@typescript-eslint/typescript-estree@npm:5.18.0": - version: 5.18.0 - resolution: "@typescript-eslint/typescript-estree@npm:5.18.0" ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) - dependencies: - "@typescript-eslint/types": 5.18.0 - "@typescript-eslint/visitor-keys": 5.18.0 - debug: ^4.3.2 - globby: ^11.0.4 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= -"@typescript-eslint/typescript-estree@npm:5.36.2": - version: 5.36.2 - resolution: "@typescript-eslint/typescript-estree@npm:5.36.2" -======= "@typescript-eslint/typescript-estree@npm:5.50.0": version: 5.50.0 resolution: "@typescript-eslint/typescript-estree@npm:5.50.0" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@typescript-eslint/types": 5.50.0 "@typescript-eslint/visitor-keys": 5.50.0 debug: ^4.3.4 globby: ^11.1.0 ->>>>>>> 217c233f (fix(slider): fixes due to new version) is-glob: ^4.0.3 semver: ^7.3.7 tsutils: ^3.21.0 peerDependenciesMeta: typescript: optional: true -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - checksum: 8f48b3c75c155491ee49436c470e491f9fe48e6e7c95190c4d0c0ab64ce24e8bc6715de86996baf57fc9f0c6dae986ce9ae075e656664489bfa1dc706eaafcd7 - languageName: node - linkType: hard - -"@typescript-eslint/utils@npm:5.45.0": - version: 5.45.0 - resolution: "@typescript-eslint/utils@npm:5.45.0" - dependencies: - "@types/json-schema": ^7.0.9 - "@types/semver": ^7.3.12 - "@typescript-eslint/scope-manager": 5.45.0 - "@typescript-eslint/types": 5.45.0 - "@typescript-eslint/typescript-estree": 5.45.0 -======= - checksum: 930ead4655712c3bd40885fb6b2074cd3c10fb03da864dd7a7dd2e43abfd330bb07e505f0aec8b4846178bff8befbb017f9f3370c67e9c717e4cb8d3df6e16ef -======= - checksum: 589829b1bb1d7e704de6a35dd9a39c70a3ca54b0885b68aad54a864bc5e5a11ce43f917c3f15f0afe9bc734a250288efdf03dfbed70b8fe0cc12f759e2e1f8ef ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= - checksum: 2fc564062180a0623966061ecd0c9ecf4dfaa2350cc9b7584444cdc71afa615c2bafe75f7ea684289e38b4fd73d33766f4a99f2c1999321ba3826ad7ccbf4ea9 ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= - checksum: 2827ff57a114b6107ea6d555f3855007133b08a7c2bafba0cfa0c935d8b99fd7b49e982d48cccc1c5ba550d95748d0239f5e2109893f12a165d76ed64a0d261b ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: cb1ac8d39647da6d52750c713d9635750ed41245ec82f937a159a71ad3bf490ebabfad3b43eeca07bca39d60df30d3a2f31f8bed0061381731d92a62e284b867 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -5306,61 +3234,16 @@ __metadata: resolution: "@typescript-eslint/utils@npm:5.50.0" dependencies: "@types/json-schema": ^7.0.9 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "@typescript-eslint/scope-manager": 5.16.0 - "@typescript-eslint/types": 5.16.0 - "@typescript-eslint/typescript-estree": 5.16.0 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - "@typescript-eslint/scope-manager": 5.17.0 - "@typescript-eslint/types": 5.17.0 - "@typescript-eslint/typescript-estree": 5.17.0 ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= - "@typescript-eslint/scope-manager": 5.18.0 - "@typescript-eslint/types": 5.18.0 - "@typescript-eslint/typescript-estree": 5.18.0 ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= - "@typescript-eslint/scope-manager": 5.36.2 - "@typescript-eslint/types": 5.36.2 - "@typescript-eslint/typescript-estree": 5.36.2 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "@types/semver": ^7.3.12 "@typescript-eslint/scope-manager": 5.50.0 "@typescript-eslint/types": 5.50.0 "@typescript-eslint/typescript-estree": 5.50.0 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) eslint-scope: ^5.1.1 eslint-utils: ^3.0.0 semver: ^7.3.7 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - checksum: 33a383881efb6c6e0ecd32f74810ca18bb5e85d4839f607409047d6e3d64a98b3cd1e811d027638d051b3741981de50a652c3abe0fcbb70fac80d7d93cd3e36f -======= - checksum: 46749091a204d7cf80d81b04704e23a86903a142a7e35cc5068a821c147c3bf098a7eff99af2b0e2ea7310013ca90300db9bab33ae5e3b5f773ed1d2961a5ed4 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - checksum: 88de02eafb7d39950c520c53aa07ffe63c95ca7ef2262c39d2afd3c6aabcd5d717ba61f74314f5bc9c27588b721ff016b45af6fc1de88801c6ac4bf5ebaf8775 ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= - checksum: f0b03a7fe557ce97480b3824043900e563c173d46a759c8272d92ecaf32ff96e98212df76dbd2d20dc91ce512e6219bb69c9036896b8d7e22eec22366f80381b ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= - checksum: 45356cf55a8733e3ab1f2c3c19cdaefdb79857e35eb1433c29b81f3df071e9cef8a286bc407abe243889a21d9e793e999f92f03b9c727a0fac1c17a48e64c42a ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: 4471ae8b24449300e009f1cc09ee0d38cce20ae9171e8fbf4ef752ce4eb87104cc0d813d8f7051b619fa05e1e7c12b748dad49832911685297b1bbfef3c01f0b ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -5383,63 +3266,13 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"@typescript-eslint/visitor-keys@npm:5.45.0": - version: 5.45.0 - resolution: "@typescript-eslint/visitor-keys@npm:5.45.0" - dependencies: - "@typescript-eslint/types": 5.45.0 - eslint-visitor-keys: ^3.3.0 - checksum: 050cc4275d8a3638a106c2915410710e775382996130a6b2af732269e55cbbc4ed438c8662ddf409635d2d8bd0d8a4389b3980bc2cb38c6105c77c6835222af0 -======= -"@typescript-eslint/visitor-keys@npm:5.16.0": - version: 5.16.0 - resolution: "@typescript-eslint/visitor-keys@npm:5.16.0" -======= -"@typescript-eslint/visitor-keys@npm:5.17.0": - version: 5.17.0 - resolution: "@typescript-eslint/visitor-keys@npm:5.17.0" ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= -"@typescript-eslint/visitor-keys@npm:5.18.0": - version: 5.18.0 - resolution: "@typescript-eslint/visitor-keys@npm:5.18.0" ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) - dependencies: - "@typescript-eslint/types": 5.18.0 - eslint-visitor-keys: ^3.0.0 -<<<<<<< HEAD -<<<<<<< HEAD - checksum: b587bf3b0da95bb58ff877b75fefcee6472222de1e3ec76aa4b94cae66078b62a372c7d0343374a16aab15cdcbae3f9e019624028b35827f68ef6559389f7fd0 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - checksum: 333468277b50e2fc381ba1b99ccb410046c422e0329c791c51bea62e705edd16ba97f75b668c6945a3ea3dc43b89a1739693ea60bfa241c67ce42e8b474e5048 ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= - checksum: c856e3cf2fde3008e1d9bea3c73bc60d9060c7cb6d6ea186c20db9d74eff84986365f518dd1b4e142dca179e9a5cd7a6ed4381173d6abfd0ebd4d16d5cf50b94 ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= -"@typescript-eslint/visitor-keys@npm:5.36.2": - version: 5.36.2 - resolution: "@typescript-eslint/visitor-keys@npm:5.36.2" -======= "@typescript-eslint/visitor-keys@npm:5.50.0": version: 5.50.0 resolution: "@typescript-eslint/visitor-keys@npm:5.50.0" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@typescript-eslint/types": 5.50.0 eslint-visitor-keys: ^3.3.0 -<<<<<<< HEAD - checksum: 87ccdcfa5cdedaa3a1aac30d656969f4f5910b62bcaacdf80a514dbf0cbbd8e79b55f8e987eab34cc79ece8ce4b8c19d5caf8b0afb74e0b0d7ab39fb29aa8eba ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: 55319cb7ee7b78d07d9dc67a388d69fe0b7f11cbc79190e17e7f87a39c9992d08dab3b5872d5a7f01094dda28ad6ac61d3573e59015ef70bf138d4c4f8c45b88 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -5721,32 +3554,11 @@ __metadata: linkType: hard "acorn@npm:^8.0.4, acorn@npm:^8.2.4, acorn@npm:^8.4.1, acorn@npm:^8.5.0": -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 8.8.1 - resolution: "acorn@npm:8.8.1" -======= - version: 8.7.0 - resolution: "acorn@npm:8.7.0" ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) - bin: - acorn: bin/acorn - checksum: 4079b67283b94935157698831967642f24a075c52ce3feaaaafe095776dfbe15d86a1b33b1e53860fc0d062ed6c83f4284a5c87c85b9ad51853a01173da6097f -======= - version: 8.8.0 - resolution: "acorn@npm:8.8.0" - bin: - acorn: bin/acorn - checksum: 7270ca82b242eafe5687a11fea6e088c960af712683756abf0791b68855ea9cace3057bd5e998ffcef50c944810c1e0ca1da526d02b32110e13c722aa959afdc ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 8.8.2 resolution: "acorn@npm:8.8.2" bin: acorn: bin/acorn checksum: f790b99a1bf63ef160c967e23c46feea7787e531292bb827126334612c234ed489a0dc2c7ba33156416f0ffa8d25bf2b0fdb7f35c2ba60eb3e960572bece4001 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -5758,21 +3570,9 @@ __metadata: linkType: hard "address@npm:^1.0.1": -<<<<<<< HEAD -<<<<<<< HEAD - version: 1.2.1 - resolution: "address@npm:1.2.1" - checksum: e4c0f961464ccad09c3f7ed3a8d12f609354a87dd1ad379e43661e9684446fbf158be3edeef85e1590dfc6c88c0897c5908bc18f232eb86e43993a2ada5820fa -======= - version: 1.2.0 - resolution: "address@npm:1.2.0" - checksum: 2ef3aa9d23bbe0f9f2745a634b16f3a2f2b18c43146c0913c7b26c8be410e20d59b8c3808d0bb7fe94d50fc2448b4b91e65dd9f33deb4aed53c14f0dedc3ddd8 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 1.2.2 resolution: "address@npm:1.2.2" checksum: ace439960c1e3564d8f523aff23a841904bf33a2a7c2e064f7f60a064194075758b9690e65bd9785692a4ef698a998c57eb74d145881a1cecab8ba658ddb1607 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -5847,32 +3647,14 @@ __metadata: linkType: hard "ajv@npm:^8.0.1": -<<<<<<< HEAD -<<<<<<< HEAD - version: 8.11.2 - resolution: "ajv@npm:8.11.2" -======= - version: 8.11.0 - resolution: "ajv@npm:8.11.0" ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= version: 8.12.0 resolution: "ajv@npm:8.12.0" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: fast-deep-equal: ^3.1.1 json-schema-traverse: ^1.0.0 require-from-string: ^2.0.2 uri-js: ^4.2.2 -<<<<<<< HEAD -<<<<<<< HEAD - checksum: 53435bf79ee7d1eabba8085962dba4c08d08593334b304db7772887f0b7beebc1b3d957432f7437ed4b60e53b5d966a57b439869890209c50fed610459999e3e -======= - checksum: 5e0ff226806763be73e93dd7805b634f6f5921e3e90ca04acdf8db81eed9d8d3f0d4c5f1213047f45ebbf8047ffe0c840fa1ef2ec42c3a644899f69aa72b5bef ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= checksum: 4dc13714e316e67537c8b31bc063f99a1d9d9a497eb4bbd55191ac0dcd5e4985bbb71570352ad6f1e76684fb6d790928f96ba3b2d4fd6e10024be9612fe3f001 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -5972,36 +3754,8 @@ __metadata: linkType: hard "antd@npm:^4.22.4": -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 4.24.4 - resolution: "antd@npm:4.24.4" -======= - version: 4.22.4 - resolution: "antd@npm:4.22.4" -======= -"antd@npm:^4.17.0": -<<<<<<< HEAD - version: 4.19.4 - resolution: "antd@npm:4.19.4" ->>>>>>> 11b17047 (refactor(slider): set theme on load) -<<<<<<< HEAD ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= -======= - version: 4.19.5 - resolution: "antd@npm:4.19.5" ->>>>>>> aef305ce (fix(night-slider): fix distance between points) ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= - version: 4.23.0 - resolution: "antd@npm:4.23.0" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 4.24.7 resolution: "antd@npm:4.24.7" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@ant-design/colors": ^6.0.0 "@ant-design/icons": ^4.7.0 @@ -6014,39 +3768,6 @@ __metadata: moment: ^2.29.2 rc-cascader: ~3.7.0 rc-checkbox: ~2.3.0 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - rc-collapse: ~3.4.2 - rc-dialog: ~9.0.2 - rc-drawer: ~6.0.0 - rc-dropdown: ~4.0.0 - rc-field-form: ~1.27.0 - rc-image: ~5.12.0 - rc-input: ~0.1.4 - rc-input-number: ~7.3.9 - rc-mentions: ~1.13.1 - rc-menu: ~9.8.0 -======= -<<<<<<< HEAD -======= ->>>>>>> 217c233f (fix(slider): fixes due to new version) - rc-collapse: ~3.3.0 - rc-dialog: ~8.9.0 - rc-drawer: ~5.1.0 - rc-dropdown: ~4.0.0 - rc-field-form: ~1.27.0 - rc-image: ~5.7.0 - rc-input: ~0.1.2 - rc-input-number: ~7.3.5 - rc-mentions: ~1.9.1 -<<<<<<< HEAD - rc-menu: ~9.6.0 ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= - rc-menu: ~9.6.3 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= rc-collapse: ~3.4.2 rc-dialog: ~9.0.2 rc-drawer: ~6.1.0 @@ -6057,7 +3778,6 @@ __metadata: rc-input-number: ~7.3.9 rc-mentions: ~1.13.1 rc-menu: ~9.8.0 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) rc-motion: ^2.6.1 rc-notification: ~4.6.0 rc-pagination: ~3.2.0 @@ -6071,18 +3791,8 @@ __metadata: rc-steps: ~5.0.0-alpha.2 rc-switch: ~3.2.0 rc-table: ~7.26.0 -<<<<<<< HEAD -<<<<<<< HEAD - rc-tabs: ~12.4.1 - rc-textarea: ~0.4.5 -======= - rc-tabs: ~12.1.0-alpha.1 - rc-textarea: ~0.3.0 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= rc-tabs: ~12.5.0 rc-textarea: ~0.4.5 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) rc-tooltip: ~5.2.0 rc-tree: ~5.7.0 rc-tree-select: ~5.5.0 @@ -6093,32 +3803,7 @@ __metadata: peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - checksum: a32627ccfd12b2f12ee2653959c5276c6ad0751a036ad6e2345a3916d4aac44300fa89b8f4ddf264eb36b0e20ec560fb476129922d4a2704ba889aa41cc6771f -======= -======= ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -<<<<<<< HEAD - checksum: 6d3e543146c32d5aa607a1f16203fd6495956d6f1a4c1d86b6a6599d81f18cae56347da1a71d2c5b40a807042141ee227c7913bddcff7dbe6253126f8440f972 -======= - checksum: d565c251f6e6a3581d283a362aa73a6ed1dc23816cbb82f11ace836dac30ee660456a2cb2ef878c2789897e10aae9ca85eb8b05a021d26a43b1f167d8342a2b1 ->>>>>>> 11b17047 (refactor(slider): set theme on load) -<<<<<<< HEAD ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= -======= - checksum: 08f543da4712fc069d04f69295ac4d0088138a0e27d14692f4c6a8f9bdfa592eb4e239a0208fcd63871ea4bc84896e3e8fa39ab2c975ac5719a9efdf072332dd ->>>>>>> aef305ce (fix(night-slider): fix distance between points) ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= - checksum: 1500100022a74259f574336a25ae694371b4374697180cfda4a9e6672881ebf8844cd9935d9052ce92bf1dcb88ed750dd9cfb7b5e7671ee39fbc4b212e457ee0 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: 676752f2c69d856f2ab9f08d920df685b7c8e4d49c7c208d401d83657d352ec88c5b7f6088d0a55f8eb136253a12d41ec9976ead0fc2f3b41ad0ba1290d7dbe4 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -6157,30 +3842,12 @@ __metadata: linkType: hard "are-we-there-yet@npm:^3.0.0": -<<<<<<< HEAD -<<<<<<< HEAD - version: 3.0.1 - resolution: "are-we-there-yet@npm:3.0.1" - dependencies: - delegates: ^1.0.0 - readable-stream: ^3.6.0 - checksum: 52590c24860fa7173bedeb69a4c05fb573473e860197f618b9a28432ee4379049336727ae3a1f9c4cb083114601c1140cee578376164d0e651217a9843f9fe83 -======= - version: 3.0.0 - resolution: "are-we-there-yet@npm:3.0.0" - dependencies: - delegates: ^1.0.0 - readable-stream: ^3.6.0 - checksum: 348edfdd931b0b50868b55402c01c3f64df1d4c229ab6f063539a5025fd6c5f5bb8a0cab409bbed8d75d34762d22aa91b7c20b4204eb8177063158d9ba792981 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= version: 3.0.1 resolution: "are-we-there-yet@npm:3.0.1" dependencies: delegates: ^1.0.0 readable-stream: ^3.6.0 checksum: 52590c24860fa7173bedeb69a4c05fb573473e860197f618b9a28432ee4379049336727ae3a1f9c4cb083114601c1140cee578376164d0e651217a9843f9fe83 ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard @@ -6251,45 +3918,16 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"array-includes@npm:^3.1.4, array-includes@npm:^3.1.5, array-includes@npm:^3.1.6": - version: 3.1.6 - resolution: "array-includes@npm:3.1.6" -======= -"array-includes@npm:^3.1.4": - version: 3.1.4 - resolution: "array-includes@npm:3.1.4" ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) - dependencies: - call-bind: ^1.0.2 - define-properties: ^1.1.4 - es-abstract: ^1.20.4 - get-intrinsic: ^1.1.3 - is-string: ^1.0.7 - checksum: f22f8cd8ba8a6448d91eebdc69f04e4e55085d09232b5216ee2d476dab3ef59984e8d1889e662c6a0ed939dcb1b57fd05b2c0209c3370942fc41b752c82a2ca5 -======= -"array-includes@npm:^3.1.4, array-includes@npm:^3.1.5": - version: 3.1.5 - resolution: "array-includes@npm:3.1.5" -======= "array-includes@npm:^3.1.5, array-includes@npm:^3.1.6": version: 3.1.6 resolution: "array-includes@npm:3.1.6" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: call-bind: ^1.0.2 define-properties: ^1.1.4 es-abstract: ^1.20.4 get-intrinsic: ^1.1.3 is-string: ^1.0.7 -<<<<<<< HEAD - checksum: f6f24d834179604656b7bec3e047251d5cc87e9e87fab7c175c61af48e80e75acd296017abcde21fb52292ab6a2a449ab2ee37213ee48c8709f004d75983f9c5 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: f22f8cd8ba8a6448d91eebdc69f04e4e55085d09232b5216ee2d476dab3ef59984e8d1889e662c6a0ed939dcb1b57fd05b2c0209c3370942fc41b752c82a2ca5 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -6330,63 +3968,9 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"array.prototype.flat@npm:^1.2.5": -<<<<<<< HEAD - version: 1.3.1 - resolution: "array.prototype.flat@npm:1.3.1" - dependencies: - call-bind: ^1.0.2 - define-properties: ^1.1.4 - es-abstract: ^1.20.4 - es-shim-unscopables: ^1.0.0 - checksum: 5a8415949df79bf6e01afd7e8839bbde5a3581300e8ad5d8449dea52639e9e59b26a467665622783697917b43bf39940a6e621877c7dd9b3d1c1f97484b9b88b - languageName: node - linkType: hard - -"array.prototype.flatmap@npm:^1.3.1": - version: 1.3.1 - resolution: "array.prototype.flatmap@npm:1.3.1" - dependencies: - call-bind: ^1.0.2 - define-properties: ^1.1.4 - es-abstract: ^1.20.4 - es-shim-unscopables: ^1.0.0 - checksum: 8c1c43a4995f12cf12523436da28515184c753807b3f0bc2ca6c075f71c470b099e2090cc67dba8e5280958fea401c1d0c59e1db0143272aef6cd1103921a987 - languageName: node - linkType: hard - -"array.prototype.reduce@npm:^1.0.5": - version: 1.0.5 - resolution: "array.prototype.reduce@npm:1.0.5" - dependencies: - call-bind: ^1.0.2 - define-properties: ^1.1.4 - es-abstract: ^1.20.4 - es-array-method-boxes-properly: ^1.0.0 - is-string: ^1.0.7 - checksum: f44691395f9202aba5ec2446468d4c27209bfa81464f342ae024b7157dbf05b164e47cca01250b8c7c2a8219953fb57651cca16aab3d16f43b85c0d92c26eef3 - languageName: node - linkType: hard - -"array.prototype.tosorted@npm:^1.1.1": - version: 1.1.1 - resolution: "array.prototype.tosorted@npm:1.1.1" - dependencies: - call-bind: ^1.0.2 - define-properties: ^1.1.4 - es-abstract: ^1.20.4 - es-shim-unscopables: ^1.0.0 - get-intrinsic: ^1.1.3 - checksum: 7923324a67e70a2fc0a6e40237405d92395e45ebd76f5cb89c2a5cf1e66b47aca6baacd0cd628ffd88830b90d47fff268071493d09c9ae123645613dac2c2ca3 -======= - version: 1.3.0 - resolution: "array.prototype.flat@npm:1.3.0" -======= "array.prototype.flat@npm:^1.3.1": version: 1.3.1 resolution: "array.prototype.flat@npm:1.3.1" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: call-bind: ^1.0.2 define-properties: ^1.1.4 @@ -6417,10 +4001,6 @@ __metadata: es-abstract: ^1.20.4 es-array-method-boxes-properly: ^1.0.0 is-string: ^1.0.7 -<<<<<<< HEAD - checksum: 6a57a1a2d3b77a9543db139cd52211f43a5af8e8271cb3c173be802076e3a6f71204ba8f090f5937ebc0842d5876db282f0f63dffd0e86b153e6e5a45681e4a5 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: f44691395f9202aba5ec2446468d4c27209bfa81464f342ae024b7157dbf05b164e47cca01250b8c7c2a8219953fb57651cca16aab3d16f43b85c0d92c26eef3 languageName: node linkType: hard @@ -6435,7 +4015,6 @@ __metadata: es-shim-unscopables: ^1.0.0 get-intrinsic: ^1.1.3 checksum: 7923324a67e70a2fc0a6e40237405d92395e45ebd76f5cb89c2a5cf1e66b47aca6baacd0cd628ffd88830b90d47fff268071493d09c9ae123645613dac2c2ca3 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -6504,9 +4083,9 @@ __metadata: linkType: hard "async-each@npm:^1.0.1": - version: 1.0.5 - resolution: "async-each@npm:1.0.5" - checksum: 7bd386248c76eb180983d16e912f1b6f5623428c9910200f6a54e3bcc69b6539a6ccf69a026cdaa40060b8112669cc608814acb8fb009e3fa81d736a5a14ea95 + version: 1.0.6 + resolution: "async-each@npm:1.0.6" + checksum: d237e8c39348d5f1441edbd3893692912afbacaf83a2ccce8978ebeea804529a8838654b12208fbbc08c8b0411a1248948ee9bf9291ebe1921aabd5b613bc5db languageName: node linkType: hard @@ -6580,26 +4159,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"axe-core@npm:^4.4.3": - version: 4.5.2 - resolution: "axe-core@npm:4.5.2" - checksum: 4068f183b2ef1db7e5a75606032c238781abfaa34ab4c23177e17f7dff8cc83f175e887b52689d20d88d2d4f001cbf632bd98925850026fe1d9abc739cabcf16 -======= -"axe-core@npm:^4.3.5": - version: 4.4.1 - resolution: "axe-core@npm:4.4.1" - checksum: ad14c5b71059dc3d24ef2519b8cd96e98b4a572379396201ce449d1c4262181821d6ca9550df65b22371faf06d28bbe94d391fe5675f2a08e6550f7b5da8416d ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= -"axe-core@npm:^4.4.3": - version: 4.4.3 - resolution: "axe-core@npm:4.4.3" - checksum: c3ea000d9ace3ba0bc747c8feafc24b0de62a0f7d93021d0f77b19c73fca15341843510f6170da563d51535d6cfb7a46c5fc0ea36170549dbb44b170208450a2 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "available-typed-arrays@npm:^1.0.5": version: 1.0.5 resolution: "available-typed-arrays@npm:1.0.5" @@ -6611,7 +4170,6 @@ __metadata: version: 4.6.3 resolution: "axe-core@npm:4.6.3" checksum: d0c46be92b9707c48b88a53cd5f471b155a2bfc8bf6beffb514ecd14e30b4863e340b5fc4f496d82a3c562048088c1f3ff5b93b9b3b026cb9c3bfacfd535da10 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -6749,44 +4307,9 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -"babel-plugin-polyfill-corejs2@npm:^0.3.3": - version: 0.3.3 - resolution: "babel-plugin-polyfill-corejs2@npm:0.3.3" - dependencies: - "@babel/compat-data": ^7.17.7 - "@babel/helper-define-polyfill-provider": ^0.3.3 - semver: ^6.1.1 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 7db3044993f3dddb3cc3d407bc82e640964a3bfe22de05d90e1f8f7a5cb71460011ab136d3c03c6c1ba428359ebf635688cd6205e28d0469bba221985f5c6179 - languageName: node - linkType: hard - -<<<<<<< HEAD -"babel-plugin-polyfill-corejs3@npm:^0.6.0": - version: 0.6.0 - resolution: "babel-plugin-polyfill-corejs3@npm:0.6.0" - dependencies: - "@babel/helper-define-polyfill-provider": ^0.3.3 - core-js-compat: ^3.25.1 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 470bb8c59f7c0912bd77fe1b5a2e72f349b3f65bbdee1d60d6eb7e1f4a085c6f24b2dd5ab4ac6c2df6444a96b070ef6790eccc9edb6a2668c60d33133bfb62c6 -======= -"babel-plugin-polyfill-corejs3@npm:^0.5.0": - version: 0.5.2 - resolution: "babel-plugin-polyfill-corejs3@npm:0.5.2" -======= -"babel-plugin-polyfill-corejs2@npm:^0.3.2": - version: 0.3.2 - resolution: "babel-plugin-polyfill-corejs2@npm:0.3.2" -======= "babel-plugin-polyfill-corejs2@npm:^0.3.3": version: 0.3.3 resolution: "babel-plugin-polyfill-corejs2@npm:0.3.3" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/compat-data": ^7.17.7 "@babel/helper-define-polyfill-provider": ^0.3.3 @@ -6797,41 +4320,15 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"babel-plugin-polyfill-corejs3@npm:^0.5.3": - version: 0.5.3 - resolution: "babel-plugin-polyfill-corejs3@npm:0.5.3" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "babel-plugin-polyfill-corejs3@npm:^0.6.0": version: 0.6.0 resolution: "babel-plugin-polyfill-corejs3@npm:0.6.0" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/helper-define-polyfill-provider": ^0.3.3 core-js-compat: ^3.25.1 peerDependencies: "@babel/core": ^7.0.0-0 -<<<<<<< HEAD -<<<<<<< HEAD - checksum: 2f3184c73f80f00ac876a5ebcad945fd8d2ae70e5f85b7ab6cc3bc69bc74025f4f7070de7abbb2a7274c78e130bd34fc13f4c85342da28205930364a1ef0aa21 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) - languageName: node - linkType: hard - -"babel-plugin-polyfill-regenerator@npm:^0.4.1": - version: 0.4.1 - resolution: "babel-plugin-polyfill-regenerator@npm:0.4.1" - dependencies: - "@babel/helper-define-polyfill-provider": ^0.3.3 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: ab0355efbad17d29492503230387679dfb780b63b25408990d2e4cf421012dae61d6199ddc309f4d2409ce4e9d3002d187702700dd8f4f8770ebbba651ed066c -======= - checksum: 9c6644a1b0afbe59e402827fdafc6f44994ff92c5b2f258659cbbfd228f7075dea49e95114af10e66d70f36cbde12ff1d81263eb67be749b3ef0e2c18cf3c16d -======= checksum: 470bb8c59f7c0912bd77fe1b5a2e72f349b3f65bbdee1d60d6eb7e1f4a085c6f24b2dd5ab4ac6c2df6444a96b070ef6790eccc9edb6a2668c60d33133bfb62c6 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -6842,28 +4339,13 @@ __metadata: "@babel/helper-define-polyfill-provider": ^0.3.3 peerDependencies: "@babel/core": ^7.0.0-0 -<<<<<<< HEAD - checksum: 699aa9c0dc5a2259d7fa52b26613fa1e782439eee54cd98506991f87fddf0c00eec6c5b1917edf586c170731d9e318903bc41210225a691e7bb8087652bbda94 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: ab0355efbad17d29492503230387679dfb780b63b25408990d2e4cf421012dae61d6199ddc309f4d2409ce4e9d3002d187702700dd8f4f8770ebbba651ed066c ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard "babel-plugin-styled-components@npm:>= 1.12.0": -<<<<<<< HEAD -<<<<<<< HEAD - version: 2.0.7 - resolution: "babel-plugin-styled-components@npm:2.0.7" -======= - version: 2.0.6 - resolution: "babel-plugin-styled-components@npm:2.0.6" ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= version: 2.0.7 resolution: "babel-plugin-styled-components@npm:2.0.7" ->>>>>>> 217c233f (fix(slider): fixes due to new version) dependencies: "@babel/helper-annotate-as-pure": ^7.16.0 "@babel/helper-module-imports": ^7.16.0 @@ -6872,15 +4354,7 @@ __metadata: picomatch: ^2.3.0 peerDependencies: styled-components: ">= 2" -<<<<<<< HEAD -<<<<<<< HEAD checksum: 80b06b10db02d749432a0ac43a5feedd686f6b648628d7433a39b1844260b2b7c72431f6e705c82636ee025fcfd4f6c32fc05677e44033b8a39ddcd4488b3147 -======= - checksum: 7be16a06432e0acfdbef23688b0da7d2320f2c48b6639e6f18089d4cdba4784b68d99e9b90e6d2b6babfb5a370dbc71151f1160f2cd8ca611c1fbd2cb1aea0ab ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - checksum: 80b06b10db02d749432a0ac43a5feedd686f6b648628d7433a39b1844260b2b7c72431f6e705c82636ee025fcfd4f6c32fc05677e44033b8a39ddcd4488b3147 ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard @@ -7105,27 +4579,9 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"body-parser@npm:1.20.1": - version: 1.20.1 - resolution: "body-parser@npm:1.20.1" -======= -"body-parser@npm:1.19.2": - version: 1.19.2 - resolution: "body-parser@npm:1.19.2" ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= -"body-parser@npm:1.20.0": - version: 1.20.0 - resolution: "body-parser@npm:1.20.0" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "body-parser@npm:1.20.1": version: 1.20.1 resolution: "body-parser@npm:1.20.1" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: bytes: 3.1.2 content-type: ~1.0.4 @@ -7134,33 +4590,12 @@ __metadata: destroy: 1.2.0 http-errors: 2.0.0 iconv-lite: 0.4.24 -<<<<<<< HEAD -<<<<<<< HEAD - on-finished: 2.4.1 - qs: 6.11.0 - raw-body: 2.5.1 - type-is: ~1.6.18 - unpipe: 1.0.0 - checksum: f1050dbac3bede6a78f0b87947a8d548ce43f91ccc718a50dd774f3c81f2d8b04693e52acf62659fad23101827dd318da1fb1363444ff9a8482b886a3e4a5266 -======= - on-finished: ~2.3.0 - qs: 6.9.7 - raw-body: 2.4.3 - type-is: ~1.6.18 - checksum: 7f777ea65670e2622ca4a785b5dcb2a68451b3bb8d4d0f41091d307d56b640dba588a9ae04d85dda2cdd5e42788266a783528d5417e5643720fd611fd52522e7 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= on-finished: 2.4.1 qs: 6.11.0 raw-body: 2.5.1 type-is: ~1.6.18 unpipe: 1.0.0 -<<<<<<< HEAD - checksum: 12fffdeac82fe20dddcab7074215d5156e7d02a69ae90cbe9fee1ca3efa2f28ef52097cbea76685ee0a1509c71d85abd0056a08e612c09077cad6277a644cf88 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: f1050dbac3bede6a78f0b87947a8d548ce43f91ccc718a50dd774f3c81f2d8b04693e52acf62659fad23101827dd318da1fb1363444ff9a8482b886a3e4a5266 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -7332,34 +4767,9 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"browserslist@npm:^4.0.0, browserslist@npm:^4.12.0, browserslist@npm:^4.21.3, browserslist@npm:^4.21.4, browserslist@npm:^4.6.2, browserslist@npm:^4.6.4": - version: 4.21.4 - resolution: "browserslist@npm:4.21.4" - dependencies: - caniuse-lite: ^1.0.30001400 - electron-to-chromium: ^1.4.251 - node-releases: ^2.0.6 - update-browserslist-db: ^1.0.9 - bin: - browserslist: cli.js - checksum: 4af3793704dbb4615bcd29059ab472344dc7961c8680aa6c4bb84f05340e14038d06a5aead58724eae69455b8fade8b8c69f1638016e87e5578969d74c078b79 -======= -"browserslist@npm:^4.0.0, browserslist@npm:^4.12.0, browserslist@npm:^4.17.5, browserslist@npm:^4.19.1, browserslist@npm:^4.6.2, browserslist@npm:^4.6.4": - version: 4.20.2 - resolution: "browserslist@npm:4.20.2" -======= -"browserslist@npm:^4.0.0, browserslist@npm:^4.12.0, browserslist@npm:^4.20.2, browserslist@npm:^4.21.3, browserslist@npm:^4.6.2, browserslist@npm:^4.6.4": - version: 4.21.3 - resolution: "browserslist@npm:4.21.3" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "browserslist@npm:^4.0.0, browserslist@npm:^4.12.0, browserslist@npm:^4.21.3, browserslist@npm:^4.21.4, browserslist@npm:^4.6.2, browserslist@npm:^4.6.4": version: 4.21.5 resolution: "browserslist@npm:4.21.5" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: caniuse-lite: ^1.0.30001449 electron-to-chromium: ^1.4.284 @@ -7367,16 +4777,7 @@ __metadata: update-browserslist-db: ^1.0.10 bin: browserslist: cli.js -<<<<<<< HEAD -<<<<<<< HEAD - checksum: 18e09beeae32e69fea45fc3642240fb63027b1460d90e24da86377177dca3d82c80f8fa44469d95109e3962f08eb2a23e03037bd5e1f1ec38e4866e2a8572435 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - checksum: ff512a7bcca1c530e2854bbdfc7be2791d0fb524097a6340e56e1d5924164c7e4e0a9b070de04cdc4c149d15cb4d4275cb7c626ebbce954278a2823aaad2452a ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: 9755986b22e73a6a1497fd8797aedd88e04270be33ce66ed5d85a1c8a798292a65e222b0f251bafa1c2522261e237d73b08b58689d4920a607e5a53d56dc4706 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -7498,46 +4899,15 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"cacache@npm:^16.1.0": - version: 16.1.3 - resolution: "cacache@npm:16.1.3" - dependencies: - "@npmcli/fs": ^2.1.0 - "@npmcli/move-file": ^2.0.0 - chownr: ^2.0.0 - fs-minipass: ^2.1.0 - glob: ^8.0.1 -======= -"cacache@npm:^16.0.0": -======= -"cacache@npm:^16.0.2": -<<<<<<< HEAD ->>>>>>> fe15f957 (refactor(slider): set theme on load) - version: 16.0.3 - resolution: "cacache@npm:16.0.3" -======= - version: 16.0.4 - resolution: "cacache@npm:16.0.4" ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= "cacache@npm:^16.1.0": version: 16.1.3 resolution: "cacache@npm:16.1.3" ->>>>>>> 217c233f (fix(slider): fixes due to new version) dependencies: "@npmcli/fs": ^2.1.0 "@npmcli/move-file": ^2.0.0 chownr: ^2.0.0 fs-minipass: ^2.1.0 -<<<<<<< HEAD - glob: ^7.2.0 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= glob: ^8.0.1 ->>>>>>> 217c233f (fix(slider): fixes due to new version) infer-owner: ^1.0.4 lru-cache: ^7.7.1 minipass: ^3.1.6 @@ -7548,29 +4918,10 @@ __metadata: p-map: ^4.0.0 promise-inflight: ^1.0.1 rimraf: ^3.0.2 -<<<<<<< HEAD -<<<<<<< HEAD - ssri: ^9.0.0 - tar: ^6.1.11 - unique-filename: ^2.0.0 - checksum: d91409e6e57d7d9a3a25e5dcc589c84e75b178ae8ea7de05cbf6b783f77a5fae938f6e8fda6f5257ed70000be27a681e1e44829251bfffe4c10216002f8f14e6 -======= - ssri: ^8.0.1 - tar: ^6.1.11 - unique-filename: ^1.1.1 - checksum: 9bb9a0bd1b8bee3284c6fa9dcb4b28a62b528dd181f7cd482319611b5d6df295a3594dcefc24d1a4f16162bac50d6facc183ed21935f3d09af6d16f620ea54d3 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= ssri: ^9.0.0 tar: ^6.1.11 -<<<<<<< HEAD - unique-filename: ^1.1.1 - checksum: f5ddd45e5b1ff5001f9d1fcbc95f1dc210e6b04fbaf92782dd16a514e9a8082efba6eac43dac3d881e2ab5829f5ad857d7deda58cbef235e93d075e8f378214a ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= unique-filename: ^2.0.0 checksum: d91409e6e57d7d9a3a25e5dcc589c84e75b178ae8ea7de05cbf6b783f77a5fae938f6e8fda6f5257ed70000be27a681e1e44829251bfffe4c10216002f8f14e6 ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard @@ -7687,43 +5038,10 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30000981, caniuse-lite@npm:^1.0.30001109, caniuse-lite@npm:^1.0.30001125, caniuse-lite@npm:^1.0.30001400": - version: 1.0.30001435 - resolution: "caniuse-lite@npm:1.0.30001435" - checksum: ec88b9c37f66095e26ddb8b43110e9564ebccb6de77e495b8e8b9d64fdbfe37f7762be8fd2578c3ecc181a183a159578c9bd8e9b90eb15b44b78e8a6d0e92530 -======= -"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30000981, caniuse-lite@npm:^1.0.30001109, caniuse-lite@npm:^1.0.30001125, caniuse-lite@npm:^1.0.30001317": -<<<<<<< HEAD -<<<<<<< HEAD - version: 1.0.30001319 - resolution: "caniuse-lite@npm:1.0.30001319" - checksum: 1c03cc4ca019c410d197b76604cd8605077ef124906f3debd3f026568e01a1aa3888cdfcb0d23c0786115b0b3f790486f2aa8e0cce361d3dcc5c92ff3611f73e ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - version: 1.0.30001322 - resolution: "caniuse-lite@npm:1.0.30001322" - checksum: 48609d1808c69034a74ab6df9db8cffd847e12da6979e150f364cc8e2a4310fce1f2811382ca57b3b4111c0182f7c67edfde3cd4159c29537fc232596aecf48b ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= - version: 1.0.30001325 - resolution: "caniuse-lite@npm:1.0.30001325" - checksum: 383a86a513381e3927a30b578ac8616ce388af79dc5dced22e18fffaef17c0bed0e324eadba1b13a6c15b3ec39128fbcfbb097992d3aca206feef5a539c4639f ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= -"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30000981, caniuse-lite@npm:^1.0.30001109, caniuse-lite@npm:^1.0.30001125, caniuse-lite@npm:^1.0.30001370": - version: 1.0.30001390 - resolution: "caniuse-lite@npm:1.0.30001390" - checksum: 5ba4ae64e27c61e1c7d7125223159d6cf7fa3cdbf8f00b9ec83a06f274ff45ddcbfebe509716fa31ae2664b70ef9e1d1c4a5b9430e717852992358121d9ee9be ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30000981, caniuse-lite@npm:^1.0.30001109, caniuse-lite@npm:^1.0.30001125, caniuse-lite@npm:^1.0.30001449": version: 1.0.30001450 resolution: "caniuse-lite@npm:1.0.30001450" checksum: 511b360bfc907b2e437699364cf96b83507bc45043926450056642332bcd6f65a1e72540c828534ae15e0ac906e3e9af46cb2bb84458dd580bc31478e9dce282 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -8307,23 +5625,10 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> 217c233f (fix(slider): fixes due to new version) "cookie@npm:0.5.0": version: 0.5.0 resolution: "cookie@npm:0.5.0" checksum: 1f4bd2ca5765f8c9689a7e8954183f5332139eb72b6ff783d8947032ec1fdf43109852c178e21a953a30c0dd42257828185be01b49d1eb1a67fd054ca588a180 -<<<<<<< HEAD -======= -"cookie@npm:0.4.2": - version: 0.4.2 - resolution: "cookie@npm:0.4.2" - checksum: a00833c998bedf8e787b4c342defe5fa419abd96b32f4464f718b91022586b8f1bafbddd499288e75c037642493c83083da426c6a9080d309e3bd90fd11baa9b ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard @@ -8358,78 +5663,20 @@ __metadata: linkType: hard "copy-to-clipboard@npm:^3.2.0": -<<<<<<< HEAD -<<<<<<< HEAD - version: 3.3.3 - resolution: "copy-to-clipboard@npm:3.3.3" - dependencies: - toggle-selection: ^1.0.6 - checksum: e0a325e39b7615108e6c1c8ac110ae7b829cdc4ee3278b1df6a0e4228c490442cc86444cd643e2da344fbc424b3aab8909e2fec82f8bc75e7e5b190b7c24eecf - languageName: node - linkType: hard - -<<<<<<< HEAD -"core-js-compat@npm:^3.25.1": - version: 3.26.1 - resolution: "core-js-compat@npm:3.26.1" - dependencies: - browserslist: ^4.21.4 - checksum: f222bce0002eae405327d68286e1d566037e8ac21906a47d7ecd15858adca7b12e82140db11dc43c8cc1fc066c5306120f3c27bfb2d7dbc2d20a72a2d90d38dc - languageName: node - linkType: hard - -"core-js-pure@npm:^3.25.1": - version: 3.26.1 - resolution: "core-js-pure@npm:3.26.1" - checksum: d88c40e5e29e413c11d1ef991a8d5b6a63f00bd94707af0f649d3fc18b3524108b202f4ae75ce77620a1557d1ba340bc3362b4f25d590eccc37cf80fc75f7cd4 -======= -"core-js-compat@npm:^3.20.2, core-js-compat@npm:^3.21.0": - version: 3.21.1 - resolution: "core-js-compat@npm:3.21.1" -======= - version: 3.3.2 - resolution: "copy-to-clipboard@npm:3.3.2" -======= version: 3.3.3 resolution: "copy-to-clipboard@npm:3.3.3" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: toggle-selection: ^1.0.6 checksum: e0a325e39b7615108e6c1c8ac110ae7b829cdc4ee3278b1df6a0e4228c490442cc86444cd643e2da344fbc424b3aab8909e2fec82f8bc75e7e5b190b7c24eecf languageName: node linkType: hard -<<<<<<< HEAD -"core-js-compat@npm:^3.21.0, core-js-compat@npm:^3.22.1": - version: 3.25.0 - resolution: "core-js-compat@npm:3.25.0" ->>>>>>> 217c233f (fix(slider): fixes due to new version) - dependencies: - browserslist: ^4.21.3 - semver: 7.0.0 - checksum: a40e072a67e65f34cb4b3a85bfdbbfcb0f3e1e2e171718763b13da4da897b5b6228603468027a0920096f0ee7e2c3906de95e26c9b6fe8f9595552bf2bc8f852 - languageName: node - linkType: hard - -"core-js-pure@npm:^3.20.2": -<<<<<<< HEAD - version: 3.21.1 - resolution: "core-js-pure@npm:3.21.1" - checksum: 00a5dff599b7fb0b30746a638b9d0edbdc0df24ed1580ca56be595fbe3c78c375d37fc4e1bff23627109229702c9ee8ea2587a66b8280eb33b85160aa4e401e9 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - version: 3.25.0 - resolution: "core-js-pure@npm:3.25.0" - checksum: 041cef3c4fa03b30eea6aa8539db00a02ea264e8542b9b787428f43e727e67050c742f46dbd75bc9ab544524a54e1ee55d8b23602dc8a2da485a3741a5f95df7 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "core-js-compat@npm:^3.25.1": version: 3.27.2 resolution: "core-js-compat@npm:3.27.2" dependencies: browserslist: ^4.21.4 checksum: 4574d4507de8cba9a75e37401b3ca6e5908ab066ec717e3b34866d25f623e1aa614fb886e10973be64a6250f325dcba6809e4fae4ed43375cc3e4276c5514c13 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -8441,27 +5688,9 @@ __metadata: linkType: hard "core-js@npm:^3.6.5": -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 3.26.1 - resolution: "core-js@npm:3.26.1" - checksum: 0a01149f51ff1e9f41d1ea49cc4c9222047949ea597189ede7c4cf8cde3b097766b9c7615acc77c86fe65b4002f20b638a133dfba7b41dba830d707aeeed45ad -======= - version: 3.21.1 - resolution: "core-js@npm:3.21.1" - checksum: d68eddd831340ad5b24ac29c72fda022a43b17f194c4278b6b875a843283d316502cb4abd07f28631d6ebc4387f66aa06e2b1b3c8fd7e08096a751b5c63f6889 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - version: 3.25.0 - resolution: "core-js@npm:3.25.0" - checksum: 5a72740bf5babaf2e6203da4c0e831a0b97c3fe6f21b4c1aa8601d3a927660a22128dd8f0e86ce84778c4e5372ab0fc03c7944afa7e215c7fb13b2c79d5d5504 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 3.27.2 resolution: "core-js@npm:3.27.2" checksum: 718debd426f55a6b97cf9b757c936be258afd6d4f7052f89d0f96c982d7013e9000b0b006df42831a0cf32adad298e34d6a19052dce9ae1c7ab87162c0c665e0 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -8473,40 +5702,16 @@ __metadata: linkType: hard "cosmiconfig-typescript-loader@npm:^1.0.0": -<<<<<<< HEAD -<<<<<<< HEAD - version: 1.0.9 - resolution: "cosmiconfig-typescript-loader@npm:1.0.9" - dependencies: - cosmiconfig: ^7 - ts-node: ^10.7.0 -======= - version: 1.0.6 - resolution: "cosmiconfig-typescript-loader@npm:1.0.6" - dependencies: - cosmiconfig: ^7 - ts-node: ^10.6.0 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= version: 1.0.9 resolution: "cosmiconfig-typescript-loader@npm:1.0.9" dependencies: cosmiconfig: ^7 ts-node: ^10.7.0 ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) peerDependencies: "@types/node": "*" cosmiconfig: ">=7" typescript: ">=3" -<<<<<<< HEAD -<<<<<<< HEAD - checksum: 26a0198e03e81a9e7e1a6ce880d7309fdd056c7a3a23b587253e6d1d1224154d3f9edf727d9c0310628e89752353211b75de151b705298b4d0741fa1740c661e -======= - checksum: da1dbdffe341688d1ea953f2ef9d69ea6c480d17922c7eb4b5fcdc0b410bc4db633f261316df78623a1ea45496fb109b90ade974e910114f77a5f150b324f85d ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= checksum: 26a0198e03e81a9e7e1a6ce880d7309fdd056c7a3a23b587253e6d1d1224154d3f9edf727d9c0310628e89752353211b75de151b705298b4d0741fa1740c661e ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) languageName: node linkType: hard @@ -8535,23 +5740,10 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> 217c233f (fix(slider): fixes due to new version) "country-flag-icons@npm:^1.5.4": version: 1.5.5 resolution: "country-flag-icons@npm:1.5.5" checksum: 367f38330a7f0f94836c7859575e1ae75655a04e2104ba060de75827d82bd84413fd7752c9166efa93123eb0d1dd1db1658ef22683511dcfa1c16f2caffe892d -<<<<<<< HEAD -======= -"country-flag-icons@npm:^1.0.2": - version: 1.4.25 - resolution: "country-flag-icons@npm:1.4.25" - checksum: 6975725eb84197c8fae73454f2ed173ed5b52fdb515ccb6e4d78f74676755d1b2eb967ae0639733c79fc4a12e020d099eb874833def497e0c1dbaff7637c881d ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard @@ -8828,21 +6020,9 @@ __metadata: linkType: hard "css-what@npm:^6.0.1": -<<<<<<< HEAD -<<<<<<< HEAD version: 6.1.0 resolution: "css-what@npm:6.1.0" checksum: b975e547e1e90b79625918f84e67db5d33d896e6de846c9b584094e529f0c63e2ab85ee33b9daffd05bff3a146a1916bec664e18bb76dd5f66cbff9fc13b2bbe -======= - version: 6.0.1 - resolution: "css-what@npm:6.0.1" - checksum: d620866a85d19de5dac4e31e7856c8e80665c1ff23e3e241ccba23a2fd717c9e9cc08aec170447297cf2d0e13d74893320b08e3e8c8b5e783280a2ed50450eb6 ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= - version: 6.1.0 - resolution: "css-what@npm:6.1.0" - checksum: b975e547e1e90b79625918f84e67db5d33d896e6de846c9b584094e529f0c63e2ab85ee33b9daffd05bff3a146a1916bec664e18bb76dd5f66cbff9fc13b2bbe ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) languageName: node linkType: hard @@ -8996,27 +6176,9 @@ __metadata: linkType: hard "csstype@npm:^3.0.2": -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 3.1.1 - resolution: "csstype@npm:3.1.1" - checksum: 1f7b4f5fdd955b7444b18ebdddf3f5c699159f13e9cf8ac9027ae4a60ae226aef9bbb14a6e12ca7dba3358b007cee6354b116e720262867c398de6c955ea451d -======= - version: 3.0.11 - resolution: "csstype@npm:3.0.11" - checksum: 95e56abfe9ca219ae065acb4e43f61771a03170eed919127f558dfa168240867aba7629c8d98a201a0dd06d9a5ce82686f0570031c928516c61816adbc7c877f ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - version: 3.1.0 - resolution: "csstype@npm:3.1.0" - checksum: 644e986cefab86525f0b674a06889cfdbb1f117e5b7d1ce0fc55b0423ecc58807a1ea42ecc75c4f18999d14fc42d1d255f84662a45003a52bb5840e977eb2ffd ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 3.1.1 resolution: "csstype@npm:3.1.1" checksum: 1f7b4f5fdd955b7444b18ebdddf3f5c699159f13e9cf8ac9027ae4a60ae226aef9bbb14a6e12ca7dba3358b007cee6354b116e720262867c398de6c955ea451d ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -9156,40 +6318,16 @@ __metadata: linkType: hard "date-fns@npm:2.x": -<<<<<<< HEAD -<<<<<<< HEAD version: 2.29.3 resolution: "date-fns@npm:2.29.3" checksum: e01cf5b62af04e05dfff921bb9c9933310ed0e1ae9a81eb8653452e64dc841acf7f6e01e1a5ae5644d0337e9a7f936175fd2cb6819dc122fdd9c5e86c56be484 -======= - version: 2.29.2 - resolution: "date-fns@npm:2.29.2" - checksum: 08bebcceb0a5dbadae4c55e6592b9d5c07dbd7833433c7e9a1d4a424300db32589b8b48e5979b32863c9b00a48d9bab6663e580c2a4f9f203d46cbf9113b5664 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= - version: 2.29.3 - resolution: "date-fns@npm:2.29.3" - checksum: e01cf5b62af04e05dfff921bb9c9933310ed0e1ae9a81eb8653452e64dc841acf7f6e01e1a5ae5644d0337e9a7f936175fd2cb6819dc122fdd9c5e86c56be484 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard "dayjs@npm:1.x, dayjs@npm:^1.11.0": -<<<<<<< HEAD -<<<<<<< HEAD - version: 1.11.6 - resolution: "dayjs@npm:1.11.6" - checksum: 18bdfd927009b68eab08dca578e421d4a581cefcbe9337f54c5d9e0d941ffb6b221c4b2c1cab15cdd9d419940e768ac4c984531461a90bbe1c158b75fe160580 -======= - version: 1.11.5 - resolution: "dayjs@npm:1.11.5" - checksum: e3bbaa7b4883b31be4bf75a181f1447fbb19800c29b332852125aab96baeff3ac232dcba8b88c4ea17d3b636c99dac5fb9d1af4bb6ae26615698bbc4a852dffb ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 1.11.7 resolution: "dayjs@npm:1.11.7" checksum: 5003a7c1dd9ed51385beb658231c3548700b82d3548c0cfbe549d85f2d08e90e972510282b7506941452c58d32136d6362f009c77ca55381a09c704e9f177ebb ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -9202,15 +6340,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -"debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4": -======= -"debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2": ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= "debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4": ->>>>>>> 217c233f (fix(slider): fixes due to new version) version: 4.3.4 resolution: "debug@npm:4.3.4" dependencies: @@ -9249,21 +6379,9 @@ __metadata: linkType: hard "decimal.js@npm:^10.2.1": -<<<<<<< HEAD -<<<<<<< HEAD - version: 10.4.2 - resolution: "decimal.js@npm:10.4.2" - checksum: 536cd6816a3197f2e1aa3da4860856cb5a2db73f6fafe8cb3b924ccc63f9b7d78296acc13dccbd419bd958ccc6357921fb15467f883b37cab04bfba7044cada2 -======= - version: 10.4.0 - resolution: "decimal.js@npm:10.4.0" - checksum: 98702d9d817a9e5b3767ea6580e7f3b35544b9454e463a5dd5d3232131470f39067d02864c45cab009eb1200bc162cd26a33d34c622cd79e4657a3e25e95fb4e ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 10.4.3 resolution: "decimal.js@npm:10.4.3" checksum: 796404dcfa9d1dbfdc48870229d57f788b48c21c603c3f6554a1c17c10195fc1024de338b0cf9e1efe0c7c167eeb18f04548979bcc5fdfabebb7cc0ae3287bae ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -9555,21 +6673,9 @@ __metadata: linkType: hard "dom-align@npm:^1.7.0": -<<<<<<< HEAD -<<<<<<< HEAD - version: 1.12.4 - resolution: "dom-align@npm:1.12.4" - checksum: ff5cfdb6e9c9e03e6d67a61b4633f25845f2385f67b1bd84a28aa2cb2c6b58eea53fde347b0d2439f0ba49cd6b80a7463f98569731cb14ec2542ecdeef19d165 -======= - version: 1.12.3 - resolution: "dom-align@npm:1.12.3" - checksum: 5d67a20e7748c53d9337738fb5001870951e19db49d0a2d7875e03abd49843d600329c3fe0961adaf9bdb186a806e30a51e352b682495a790cc48a9fb63b0175 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 1.12.4 resolution: "dom-align@npm:1.12.4" checksum: ff5cfdb6e9c9e03e6d67a61b4633f25845f2385f67b1bd84a28aa2cb2c6b58eea53fde347b0d2439f0ba49cd6b80a7463f98569731cb14ec2542ecdeef19d165 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -9642,15 +6748,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD "domhandler@npm:^4.0.0, domhandler@npm:^4.2.0, domhandler@npm:^4.3.1": -======= -"domhandler@npm:^4.0.0, domhandler@npm:^4.2.0, domhandler@npm:^4.3.0": ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= -"domhandler@npm:^4.0.0, domhandler@npm:^4.2.0, domhandler@npm:^4.3.1": ->>>>>>> fe15f957 (refactor(slider): set theme on load) version: 4.3.1 resolution: "domhandler@npm:4.3.1" dependencies: @@ -9746,48 +6844,12 @@ __metadata: linkType: hard "echarts@npm:^5.1.2": -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 5.4.0 - resolution: "echarts@npm:5.4.0" - dependencies: - tslib: 2.3.0 - zrender: 5.4.0 - checksum: 81fb304e5304f1fd172fb419e178791213d2f2f0335a187a311bbe8888f2053dc4d9cd790135786ae09171185a1fd906453a5c93bf69097fff8c5b254873a322 -======= - version: 5.3.1 - resolution: "echarts@npm:5.3.1" - dependencies: - tslib: 2.3.0 - zrender: 5.3.1 - checksum: e67254f06ce6db6892c8d3a335e418fa0558d6ff7794f930769d8f90c3a4500c5b9595587da4249f62069f74cbb5b2fe6808f018bd7a0a989ed28d97a6179ba3 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - version: 5.3.2 - resolution: "echarts@npm:5.3.2" - dependencies: - tslib: 2.3.0 - zrender: 5.3.1 - checksum: a7c2007982809e03b18719d2bf2302d619937b4ada95b1a9a57b5b80383f5f96cf8284313679cc489c9093e9c0d37f21fa08fd555ff7d320611653ce0433b8d3 ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= - version: 5.3.3 - resolution: "echarts@npm:5.3.3" - dependencies: - tslib: 2.3.0 - zrender: 5.3.2 - checksum: d6feb97132418421de56c18ae1e9c103849156cde1aa41804d463cf1904eec1f8994f63c0c2cd87e48574556ab408c7a05eeacb6fea2cae5843dcf8c041de515 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 5.4.1 resolution: "echarts@npm:5.4.1" dependencies: tslib: 2.3.0 zrender: 5.4.1 checksum: 2868541087045d27691e99950a96896da48be2c758cb9cd6ab57244bfa40967edecc5a215e02f63a48fa9d56aa1dc91c8339982fdb8d2b1323b19852e91d9fa8 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -9805,49 +6867,10 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"electron-to-chromium@npm:^1.3.564, electron-to-chromium@npm:^1.4.251": - version: 1.4.284 - resolution: "electron-to-chromium@npm:1.4.284" - checksum: be496e9dca6509dbdbb54dc32146fc99f8eb716d28a7ee8ccd3eba0066561df36fc51418d8bd7cf5a5891810bf56c0def3418e74248f51ea4a843d423603d10a -======= -"electron-to-chromium@npm:^1.3.564, electron-to-chromium@npm:^1.4.84": -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 1.4.91 - resolution: "electron-to-chromium@npm:1.4.91" - checksum: 48396dc8b1aff87671853c9b39432402079e99f62da1c5f136231c292c43012965f0bc14ff7ae8fcad5a8af437c21912b0fc5399bde98ed3d4c2b871a0ae781d ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - version: 1.4.99 - resolution: "electron-to-chromium@npm:1.4.99" - checksum: 7efb73368db78b55bc1c9563364f69f2715f085ac2a0e9b8dab0f319025fbd6464e0eaf47eb5e447f1d4e76f9de919bec5e338bf87443ad8dcb34b2829fc82b7 ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= - version: 1.4.102 - resolution: "electron-to-chromium@npm:1.4.102" - checksum: 0df8d3d349e33f454b7b98db8397fffd29f17814a88bba82b9d49f562d3b87fba017115fed074ff2ee89ef00db0dfb5765eac35929fb0e03bc203dd1fa33d5a3 ->>>>>>> 0d3c577c (feat(slider): add border and shadow) -======= - version: 1.4.104 - resolution: "electron-to-chromium@npm:1.4.104" - checksum: 2570bcc175261b3c2780a788a18e8de86e11e4688a889ee7ea46322b6a78034895a4d7a352c2c332831cd16f78338a687f15e19caf08d5bd708c0721e1f10262 ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= -"electron-to-chromium@npm:^1.3.564, electron-to-chromium@npm:^1.4.202": - version: 1.4.242 - resolution: "electron-to-chromium@npm:1.4.242" - checksum: 8936942ddacb7406bef360110301741f7ab54012406b0b38ed2d36bf28440b3903d927399dfcb3bb059d2904f32a2bdd12353f46563ff08f5da472f3359ed862 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "electron-to-chromium@npm:^1.3.564, electron-to-chromium@npm:^1.4.284": - version: 1.4.285 - resolution: "electron-to-chromium@npm:1.4.285" - checksum: 70178de71211cfc0371d54231c3e3673db7eedeb66bbd71df0af6b0c7bff6fe80fe292fa409866ba354ff9b7cf7403936705bb8bbbc397d2e5941bb482301d8e ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) + version: 1.4.286 + resolution: "electron-to-chromium@npm:1.4.286" + checksum: 6b53e2aea63892cb4af85ea4ee5ed2b6d848713519987efcf4c1177a32e2fe6d04a7f591f5bcd1feab0b3c88890c6eaf65b6feb16c0e0319bf07e31de31930af languageName: node linkType: hard @@ -10014,33 +7037,6 @@ __metadata: linkType: hard "error-stack-parser@npm:^2.0.6": -<<<<<<< HEAD -<<<<<<< HEAD - version: 2.1.4 - resolution: "error-stack-parser@npm:2.1.4" - dependencies: - stackframe: ^1.3.4 - checksum: 3b916d2d14c6682f287c8bfa28e14672f47eafe832701080e420e7cdbaebb2c50293868256a95706ac2330fe078cf5664713158b49bc30d7a5f2ac229ded0e18 -======= - version: 2.0.7 - resolution: "error-stack-parser@npm:2.0.7" - dependencies: - stackframe: ^1.1.1 - checksum: fe30bba934db08487dd2c5a8dfe785f64debf4948b5c79a531b610b4468d96b918a806c0f3d44f634e70945533d23f44cb3af0a2d2f934b1c698930307d1b73b ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) - languageName: node - linkType: hard - -<<<<<<< HEAD -"es-abstract@npm:^1.17.2, es-abstract@npm:^1.19.0, es-abstract@npm:^1.20.4": - version: 1.20.4 - resolution: "es-abstract@npm:1.20.4" -======= -"es-abstract@npm:^1.17.2, es-abstract@npm:^1.19.0, es-abstract@npm:^1.19.1": - version: 1.19.2 - resolution: "es-abstract@npm:1.19.2" ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= version: 2.1.4 resolution: "error-stack-parser@npm:2.1.4" dependencies: @@ -10049,16 +7045,9 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"es-abstract@npm:^1.17.2, es-abstract@npm:^1.19.0, es-abstract@npm:^1.19.1, es-abstract@npm:^1.19.2, es-abstract@npm:^1.19.5, es-abstract@npm:^1.20.1": - version: 1.20.2 - resolution: "es-abstract@npm:1.20.2" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "es-abstract@npm:^1.17.2, es-abstract@npm:^1.19.0, es-abstract@npm:^1.20.4": version: 1.21.1 resolution: "es-abstract@npm:1.21.1" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: available-typed-arrays: ^1.0.5 call-bind: ^1.0.2 @@ -10066,83 +7055,23 @@ __metadata: es-to-primitive: ^1.2.1 function-bind: ^1.1.1 function.prototype.name: ^1.1.5 -<<<<<<< HEAD -<<<<<<< HEAD get-intrinsic: ^1.1.3 - get-symbol-description: ^1.0.0 - has: ^1.0.3 -<<<<<<< HEAD - has-property-descriptors: ^1.0.0 - has-symbols: ^1.0.3 - internal-slot: ^1.0.3 - is-callable: ^1.2.7 -======= -======= - get-intrinsic: ^1.1.2 -======= - get-intrinsic: ^1.1.3 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) get-symbol-description: ^1.0.0 globalthis: ^1.0.3 gopd: ^1.0.1 has: ^1.0.3 has-property-descriptors: ^1.0.0 -<<<<<<< HEAD ->>>>>>> 217c233f (fix(slider): fixes due to new version) - has-symbols: ^1.0.3 - internal-slot: ^1.0.3 - is-callable: ^1.2.4 ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= has-proto: ^1.0.1 has-symbols: ^1.0.3 internal-slot: ^1.0.4 is-array-buffer: ^3.0.1 is-callable: ^1.2.7 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) is-negative-zero: ^2.0.2 is-regex: ^1.1.4 is-shared-array-buffer: ^1.0.2 is-string: ^1.0.7 is-typed-array: ^1.1.10 is-weakref: ^1.0.2 -<<<<<<< HEAD -<<<<<<< HEAD - object-inspect: ^1.12.2 - object-keys: ^1.1.1 - object.assign: ^4.1.4 - regexp.prototype.flags: ^1.4.3 - safe-regex-test: ^1.0.0 - string.prototype.trimend: ^1.0.5 - string.prototype.trimstart: ^1.0.5 - unbox-primitive: ^1.0.2 - checksum: 89297cc785c31aedf961a603d5a07ed16471e435d3a1b6d070b54f157cf48454b95cda2ac55e4b86ff4fe3276e835fcffd2771578e6fa634337da49b26826141 - languageName: node - linkType: hard - -"es-array-method-boxes-properly@npm:^1.0.0": - version: 1.0.0 - resolution: "es-array-method-boxes-properly@npm:1.0.0" - checksum: 2537fcd1cecf187083890bc6f5236d3a26bf39237433587e5bf63392e88faae929dbba78ff0120681a3f6f81c23fe3816122982c160d63b38c95c830b633b826 - languageName: node - linkType: hard - -"es-shim-unscopables@npm:^1.0.0": - version: 1.0.0 - resolution: "es-shim-unscopables@npm:1.0.0" - dependencies: - has: ^1.0.3 - checksum: 83e95cadbb6ee44d3644dfad60dcad7929edbc42c85e66c3e99aefd68a3a5c5665f2686885cddb47dfeabfd77bd5ea5a7060f2092a955a729bbd8834f0d86fa1 -======= - object-inspect: ^1.12.0 - object-keys: ^1.1.1 - object.assign: ^4.1.2 - string.prototype.trimend: ^1.0.4 - string.prototype.trimstart: ^1.0.4 - unbox-primitive: ^1.0.1 - checksum: 4724811fd54b2cea959a8b08e49cd41cc65c77363c37bf5b42dc64a7c730e16a0dca80edc73e46ebf90a8de311622009a5a8dbe47e9f4e129c35f52c5020fe4e ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= object-inspect: ^1.12.2 object-keys: ^1.1.1 object.assign: ^4.1.4 @@ -10198,7 +7127,6 @@ __metadata: dependencies: has: ^1.0.3 checksum: 83e95cadbb6ee44d3644dfad60dcad7929edbc42c85e66c3e99aefd68a3a5c5665f2686885cddb47dfeabfd77bd5ea5a7060f2092a955a729bbd8834f0d86fa1 ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard @@ -10214,31 +7142,13 @@ __metadata: linkType: hard "es5-ext@npm:^0.10.35, es5-ext@npm:^0.10.50": -<<<<<<< HEAD -<<<<<<< HEAD version: 0.10.62 resolution: "es5-ext@npm:0.10.62" -======= - version: 0.10.59 - resolution: "es5-ext@npm:0.10.59" ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - version: 0.10.62 - resolution: "es5-ext@npm:0.10.62" ->>>>>>> 217c233f (fix(slider): fixes due to new version) dependencies: es6-iterator: ^2.0.3 es6-symbol: ^3.1.3 next-tick: ^1.1.0 -<<<<<<< HEAD -<<<<<<< HEAD checksum: 25f42f6068cfc6e393cf670bc5bba249132c5f5ec2dd0ed6e200e6274aca2fed8e9aec8a31c76031744c78ca283c57f0b41c7e737804c6328c7b8d3fbcba7983 -======= - checksum: 3b931910d90eec2c5266f714fdef2e71b58ba3e9139d054ac0cb1c90db5b4a41989dd490885e037665450f1a4fb778b2ee8daccb6e1a5d9a07f853fd92018da6 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - checksum: 25f42f6068cfc6e393cf670bc5bba249132c5f5ec2dd0ed6e200e6274aca2fed8e9aec8a31c76031744c78ca283c57f0b41c7e737804c6328c7b8d3fbcba7983 ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard @@ -10365,42 +7275,15 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"eslint-module-utils@npm:^2.7.3": -======= "eslint-module-utils@npm:^2.7.4": ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) version: 2.7.4 resolution: "eslint-module-utils@npm:2.7.4" -<<<<<<< HEAD - dependencies: - debug: ^3.2.7 - peerDependenciesMeta: - eslint: - optional: true - checksum: 5da13645daff145a5c922896b258f8bba560722c3767254e458d894ff5fbb505d6dfd945bffa932a5b0ae06714da2379bd41011c4c20d2d59cc83e23895360f7 -======= -"eslint-module-utils@npm:^2.7.2": -======= -"eslint-module-utils@npm:^2.7.3": ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) - version: 2.7.3 - resolution: "eslint-module-utils@npm:2.7.3" - dependencies: - debug: ^3.2.7 - find-up: ^2.1.0 - checksum: 77048263f309167a1e6a1e1b896bfb5ddd1d3859b2e2abbd9c32c432aee13d610d46e6820b1ca81b37fba437cf423a404bc6649be64ace9148a3062d1886a678 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= dependencies: debug: ^3.2.7 peerDependenciesMeta: eslint: optional: true checksum: 5da13645daff145a5c922896b258f8bba560722c3767254e458d894ff5fbb505d6dfd945bffa932a5b0ae06714da2379bd41011c4c20d2d59cc83e23895360f7 ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard @@ -10498,105 +7381,36 @@ __metadata: linkType: hard "eslint-plugin-react-hooks@npm:^4.2.0, eslint-plugin-react-hooks@npm:^4.3.0": -<<<<<<< HEAD -<<<<<<< HEAD - version: 4.6.0 - resolution: "eslint-plugin-react-hooks@npm:4.6.0" - peerDependencies: - eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 - checksum: 23001801f14c1d16bf0a837ca7970d9dd94e7b560384b41db378b49b6e32dc43d6e2790de1bd737a652a86f81a08d6a91f402525061b47719328f586a57e86c3 -======= - version: 4.4.0 - resolution: "eslint-plugin-react-hooks@npm:4.4.0" - peerDependencies: - eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 - checksum: 350b50d45677cb2df682b9e54475912746bd2f56fc342e4d47fad78d71eb1b2b742e702f1e6c04ab2196346d3d7a2e327b5eee826f5b96bfb84b5c41d35e44e9 ->>>>>>> 0d3c577c (feat(slider): add border and shadow) -======= version: 4.6.0 resolution: "eslint-plugin-react-hooks@npm:4.6.0" peerDependencies: eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 checksum: 23001801f14c1d16bf0a837ca7970d9dd94e7b560384b41db378b49b6e32dc43d6e2790de1bd737a652a86f81a08d6a91f402525061b47719328f586a57e86c3 ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard "eslint-plugin-react@npm:^7.21.5, eslint-plugin-react@npm:^7.24.0": -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 7.31.11 - resolution: "eslint-plugin-react@npm:7.31.11" -======= - version: 7.29.4 - resolution: "eslint-plugin-react@npm:7.29.4" ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) - dependencies: - array-includes: ^3.1.6 - array.prototype.flatmap: ^1.3.1 - array.prototype.tosorted: ^1.1.1 -======= - version: 7.31.7 - resolution: "eslint-plugin-react@npm:7.31.7" - dependencies: - array-includes: ^3.1.5 - array.prototype.flatmap: ^1.3.0 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 7.32.2 resolution: "eslint-plugin-react@npm:7.32.2" dependencies: array-includes: ^3.1.6 array.prototype.flatmap: ^1.3.1 array.prototype.tosorted: ^1.1.1 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) doctrine: ^2.1.0 estraverse: ^5.3.0 jsx-ast-utils: ^2.4.1 || ^3.0.0 minimatch: ^3.1.2 -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) object.entries: ^1.1.6 object.fromentries: ^2.0.6 object.hasown: ^1.1.2 object.values: ^1.1.6 -<<<<<<< HEAD -======= - object.entries: ^1.1.5 - object.fromentries: ^2.0.5 - object.hasown: ^1.1.1 - object.values: ^1.1.5 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) prop-types: ^15.8.1 resolve: ^2.0.0-next.4 semver: ^6.3.0 -<<<<<<< HEAD -<<<<<<< HEAD - string.prototype.matchall: ^4.0.8 - peerDependencies: - eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 -<<<<<<< HEAD - checksum: a3d612f6647bef33cf2a67c81a6b37b42c075300ed079cffecf5fb475c0d6ab855c1de340d1cbf361a0126429fb906dda597527235d2d12c4404453dbc712fc6 -======= - checksum: bb7d3715ccd7f3e0d7bfaa2125b26d96865695bcfea4a3d510a5763342a74ab5b99a88e13aad9245f9461ad87e4bce69c33fc946888115d576233f9b6e69700d ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - string.prototype.matchall: ^4.0.7 - peerDependencies: - eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 - checksum: 582d422f531d7d3894fc09ac941ef8b6ad595782cfca5e1d52af5895ce117def7a0ff8afeea0166bff7b6ceae8baec2313614b1571754f539575cfa9351cd2da ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= string.prototype.matchall: ^4.0.8 peerDependencies: eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 checksum: 2232b3b8945aa50b7773919c15cd96892acf35d2f82503667a79e2f55def90f728ed4f0e496f0f157acbe1bd4397c5615b676ae7428fe84488a544ca53feb944 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -10665,15 +7479,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD "eslint-visitor-keys@npm:^3.3.0": -======= -"eslint-visitor-keys@npm:^3.0.0": ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= -"eslint-visitor-keys@npm:^3.3.0": ->>>>>>> 217c233f (fix(slider): fixes due to new version) version: 3.3.0 resolution: "eslint-visitor-keys@npm:3.3.0" checksum: d59e68a7c5a6d0146526b0eec16ce87fbf97fe46b8281e0d41384224375c4e52f5ffb9e16d48f4ea50785cde93f766b0c898e31ab89978d88b0e1720fbfb7808 @@ -10842,25 +7648,10 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> 217c233f (fix(slider): fixes due to new version) "eventsource@npm:^2.0.2": version: 2.0.2 resolution: "eventsource@npm:2.0.2" checksum: c0072d972753e10c705d9b2285b559184bf29d011bc208973dde9c8b6b8b7b6fdad4ef0846cecb249f7b1585e860fdf324cbd2ac854a76bc53649e797496e99a -<<<<<<< HEAD -======= -"eventsource@npm:^1.1.0": - version: 1.1.0 - resolution: "eventsource@npm:1.1.0" - dependencies: - original: ^1.0.0 - checksum: 78338b7e75ec471cb793efb3319e0c4d2bf00fb638a2e3f888ad6d98cd1e3d4492a29f554c0921c7b2ac5130c3a732a1a0056739f6e2f548d714aec685e5da7e ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard @@ -10977,41 +7768,15 @@ __metadata: linkType: hard "express@npm:^4.17.1": -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 4.18.2 - resolution: "express@npm:4.18.2" - dependencies: - accepts: ~1.3.8 - array-flatten: 1.1.1 - body-parser: 1.20.1 - content-disposition: 0.5.4 - content-type: ~1.0.4 - cookie: 0.5.0 -======= - version: 4.17.3 - resolution: "express@npm:4.17.3" -======= - version: 4.18.1 - resolution: "express@npm:4.18.1" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 4.18.2 resolution: "express@npm:4.18.2" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: accepts: ~1.3.8 array-flatten: 1.1.1 body-parser: 1.20.1 content-disposition: 0.5.4 content-type: ~1.0.4 -<<<<<<< HEAD - cookie: 0.4.2 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= cookie: 0.5.0 ->>>>>>> 217c233f (fix(slider): fixes due to new version) cookie-signature: 1.0.6 debug: 2.6.9 depd: 2.0.0 @@ -11027,19 +7792,7 @@ __metadata: parseurl: ~1.3.3 path-to-regexp: 0.1.7 proxy-addr: ~2.0.7 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD qs: 6.11.0 -======= - qs: 6.9.7 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - qs: 6.10.3 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= - qs: 6.11.0 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) range-parser: ~1.2.1 safe-buffer: 5.2.1 send: 0.18.0 @@ -11049,19 +7802,7 @@ __metadata: type-is: ~1.6.18 utils-merge: 1.0.1 vary: ~1.1.2 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - checksum: 3c4b9b076879442f6b968fe53d85d9f1eeacbb4f4c41e5f16cc36d77ce39a2b0d81b3f250514982110d815b2f7173f5561367f9110fcc541f9371948e8c8b037 -======= - checksum: 967e53b74a37eafdf9789b9938c8df86102928b4985b1ad5e385c709deeab405a364de95ca744bc2cc5d05b5d9cc1efc69ae2ae17688a462038648d5a924bfad ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - checksum: c3d44c92e48226ef32ec978becfedb0ecf0ca21316bfd33674b3c5d20459840584f2325726a4f17f33d9c99f769636f728982d1c5433a5b6fe6eb95b8cf0c854 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: 3c4b9b076879442f6b968fe53d85d9f1eeacbb4f4c41e5f16cc36d77ce39a2b0d81b3f250514982110d815b2f7173f5561367f9110fcc541f9371948e8c8b037 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -11354,32 +8095,6 @@ __metadata: linkType: hard "follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.4": -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 1.15.2 - resolution: "follow-redirects@npm:1.15.2" - peerDependenciesMeta: - debug: - optional: true - checksum: faa66059b66358ba65c234c2f2a37fcec029dc22775f35d9ad6abac56003268baf41e55f9ee645957b32c7d9f62baf1f0b906e68267276f54ec4b4c597c2b190 -======= - version: 1.14.9 - resolution: "follow-redirects@npm:1.14.9" - peerDependenciesMeta: - debug: - optional: true - checksum: f5982e0eb481818642492d3ca35a86989c98af1128b8e1a62911a3410621bc15d2b079e8170b35b19d3bdee770b73ed431a257ed86195af773771145baa57845 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - version: 1.15.1 - resolution: "follow-redirects@npm:1.15.1" - peerDependenciesMeta: - debug: - optional: true - checksum: 6aa4e3e3cdfa3b9314801a1cd192ba756a53479d9d8cca65bf4db3a3e8834e62139245cd2f9566147c8dfe2efff1700d3e6aefd103de4004a7b99985e71dd533 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 1.15.2 resolution: "follow-redirects@npm:1.15.2" peerDependenciesMeta: @@ -11395,7 +8110,6 @@ __metadata: dependencies: is-callable: ^1.1.3 checksum: 6c48ff2bc63362319c65e2edca4a8e1e3483a2fabc72fbe7feaf8c73db94fc7861bd53bc02c8a66a0c1dd709da6b04eec42e0abdd6b40ce47305ae92a25e5d28 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -11593,10 +8307,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> 217c233f (fix(slider): fixes due to new version) "functions-have-names@npm:^1.2.2": version: 1.2.3 resolution: "functions-have-names@npm:1.2.3" @@ -11607,16 +8317,6 @@ __metadata: "gauge@npm:^4.0.3": version: 4.0.4 resolution: "gauge@npm:4.0.4" -======= -"gauge@npm:^4.0.0": -<<<<<<< HEAD - version: 4.0.3 - resolution: "gauge@npm:4.0.3" ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - version: 4.0.4 - resolution: "gauge@npm:4.0.4" ->>>>>>> fe15f957 (refactor(slider): set theme on load) dependencies: aproba: ^1.0.3 || ^2.0.0 color-support: ^1.1.3 @@ -11626,15 +8326,7 @@ __metadata: string-width: ^4.2.3 strip-ansi: ^6.0.1 wide-align: ^1.1.5 -<<<<<<< HEAD -<<<<<<< HEAD checksum: 788b6bfe52f1dd8e263cda800c26ac0ca2ff6de0b6eee2fe0d9e3abf15e149b651bd27bf5226be10e6e3edb5c4e5d5985a5a1a98137e7a892f75eff76467ad2d -======= - checksum: baf982238a5270def90a4895f2e083b5cf8e6f7df20b53b24a932845aec363a6cf411f88b33dcb016a43c9334fdfccd956e4514ee875d70af016bf6fead3d3ae ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - checksum: 788b6bfe52f1dd8e263cda800c26ac0ca2ff6de0b6eee2fe0d9e3abf15e149b651bd27bf5226be10e6e3edb5c4e5d5985a5a1a98137e7a892f75eff76467ad2d ->>>>>>> fe15f957 (refactor(slider): set theme on load) languageName: node linkType: hard @@ -11652,34 +8344,14 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.0, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3": - version: 1.1.3 - resolution: "get-intrinsic@npm:1.1.3" -======= -"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.0, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.2": - version: 1.1.2 - resolution: "get-intrinsic@npm:1.1.2" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3": version: 1.2.0 resolution: "get-intrinsic@npm:1.2.0" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: function-bind: ^1.1.1 has: ^1.0.3 has-symbols: ^1.0.3 -<<<<<<< HEAD -<<<<<<< HEAD - checksum: 152d79e87251d536cf880ba75cfc3d6c6c50e12b3a64e1ea960e73a3752b47c69f46034456eae1b0894359ce3bc64c55c186f2811f8a788b75b638b06fab228a -======= - checksum: 252f45491f2ba88ebf5b38018020c7cc3279de54b1d67ffb70c0cdf1dfa8ab31cd56467b5d117a8b4275b7a4dde91f86766b163a17a850f036528a7b2faafb2b ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: 78fc0487b783f5c58cf2dccafc3ae656ee8d2d8062a8831ce4a95e7057af4587a1d4882246c033aca0a7b4965276f4802b45cc300338d1b77a73d3e3e3f4877d ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -11765,21 +8437,9 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -"glob@npm:^7.0.3, glob@npm:^7.1.1, glob@npm:^7.1.2, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6": - version: 7.2.3 - resolution: "glob@npm:7.2.3" -======= -"glob@npm:^7.0.3, glob@npm:^7.1.1, glob@npm:^7.1.2, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.2.0": - version: 7.2.0 - resolution: "glob@npm:7.2.0" ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= "glob@npm:^7.0.3, glob@npm:^7.1.1, glob@npm:^7.1.2, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6": version: 7.2.3 resolution: "glob@npm:7.2.3" ->>>>>>> 217c233f (fix(slider): fixes due to new version) dependencies: fs.realpath: ^1.0.0 inflight: ^1.0.4 @@ -11832,35 +8492,11 @@ __metadata: linkType: hard "globals@npm:^13.6.0, globals@npm:^13.9.0": -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 13.18.0 - resolution: "globals@npm:13.18.0" - dependencies: - type-fest: ^0.20.2 - checksum: 9fdaa74cfd5d4ac91319662f512c29b11d1d2deb9c8a20d3998097671deba83d195f20730b2345887de3ddab958a6fa68952feed9ae836ee4594a82ace62fdb4 -======= - version: 13.13.0 - resolution: "globals@npm:13.13.0" - dependencies: - type-fest: ^0.20.2 - checksum: c55ea8fd3afecb72567bac41605577e19e68476993dfb0ca4c49b86075af5f0ae3f0f5502525f69010f7c5ea5db6a1c540a80a4f80ebdfb2f686d87b0f05d7e9 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - version: 13.17.0 - resolution: "globals@npm:13.17.0" - dependencies: - type-fest: ^0.20.2 - checksum: fbaf4112e59b92c9f5575e85ce65e9e17c0b82711196ec5f58beb08599bbd92fd72703d6dfc9b080381fd35b644e1b11dcf25b38cc2341ec21df942594cbc8ce ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 13.20.0 resolution: "globals@npm:13.20.0" dependencies: type-fest: ^0.20.2 checksum: ad1ecf914bd051325faad281d02ea2c0b1df5d01bd94d368dcc5513340eac41d14b3c61af325768e3c7f8d44576e72780ec0b6f2d366121f8eec6e03c3a3b97a ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -12045,10 +8681,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> 217c233f (fix(slider): fixes due to new version) "has-property-descriptors@npm:^1.0.0": version: 1.0.0 resolution: "has-property-descriptors@npm:1.0.0" @@ -12058,13 +8690,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "has-proto@npm:^1.0.1": version: 1.0.1 resolution: "has-proto@npm:1.0.1" @@ -12072,7 +8697,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) "has-symbols@npm:^1.0.1, has-symbols@npm:^1.0.2, has-symbols@npm:^1.0.3": version: 1.0.3 resolution: "has-symbols@npm:1.0.3" @@ -12181,21 +8805,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -======= -"history@npm:^5.2.0": - version: 5.3.0 - resolution: "history@npm:5.3.0" - dependencies: - "@babel/runtime": ^7.7.6 - checksum: d73c35df49d19ac172f9547d30a21a26793e83f16a78386d99583b5bf1429cc980799fcf1827eb215d31816a6600684fba9686ce78104e23bd89ec239e7c726f - languageName: node - linkType: hard - ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) "hmac-drbg@npm:^1.0.1": version: 1.0.1 resolution: "hmac-drbg@npm:1.0.1" @@ -12406,21 +9015,9 @@ __metadata: linkType: hard "http-parser-js@npm:>=0.5.1": -<<<<<<< HEAD -<<<<<<< HEAD - version: 0.5.8 - resolution: "http-parser-js@npm:0.5.8" - checksum: 6bbdf2429858e8cf13c62375b0bfb6dc3955ca0f32e58237488bc86cd2378f31d31785fd3ac4ce93f1c74e0189cf8823c91f5cb061696214fd368d2452dc871d -======= - version: 0.5.6 - resolution: "http-parser-js@npm:0.5.6" - checksum: 8a92f6782542211c77936104ea1eca3c86a95420eb286b100f6421630f29d8f94fd4cc7a245df8e078791d86cd9a237091094440ffb0cd1b44a3f85bfbf539fa ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= version: 0.5.8 resolution: "http-parser-js@npm:0.5.8" checksum: 6bbdf2429858e8cf13c62375b0bfb6dc3955ca0f32e58237488bc86cd2378f31d31785fd3ac4ce93f1c74e0189cf8823c91f5cb061696214fd368d2452dc871d ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard @@ -12592,15 +9189,9 @@ __metadata: linkType: hard "ignore@npm:^5.1.4, ignore@npm:^5.1.8, ignore@npm:^5.2.0": -<<<<<<< HEAD - version: 5.2.1 - resolution: "ignore@npm:5.2.1" - checksum: 7251d00cba49fe88c4f3565fadeb4aa726ba38294a9a79ffed542edc47bafd989d4b2ccf65700c5b1b26a1e91dfc7218fb23017937c79216025d5caeec0ee9d5 -======= version: 5.2.4 resolution: "ignore@npm:5.2.4" checksum: 3d4c309c6006e2621659311783eaea7ebcd41fe4ca1d78c91c473157ad6666a57a2df790fe0d07a12300d9aac2888204d7be8d59f9aaf665b1c7fcdb432517ef ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -12620,24 +9211,10 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -"immer@npm:^9.0.16": - version: 9.0.16 - resolution: "immer@npm:9.0.16" - checksum: e9a5ca65c929b329da7a3b7beccf7984271cda7bdd47b2cab619eac3277dcd56598c211b55cc340786b6eff0c06652ac018808d9fd744443f06882364dece6bc -======= -"immer@npm:^9.0.7": - version: 9.0.15 - resolution: "immer@npm:9.0.15" - checksum: 92e3d63e810e3c3c2bb61b70c45443e37ef983ad12924e3edaf03725ae5979618f5b473439bb3bb4a8c4769f25132f18dec10ea15c40f0b20da5691ff96ff611 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "immer@npm:^9.0.16": version: 9.0.19 resolution: "immer@npm:9.0.19" checksum: f02ee53989989c287cd548a3d817fccf0bfe56db919755ee94a72ea3ae78a00363fba93ee6c010fe54a664380c29c53d44ed4091c6a86cae60957ad2cfabc010 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -12994,11 +9571,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"is-callable@npm:^1.1.4, is-callable@npm:^1.2.7": -======= "is-callable@npm:^1.1.3, is-callable@npm:^1.1.4, is-callable@npm:^1.2.7": ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) version: 1.2.7 resolution: "is-callable@npm:1.2.7" checksum: 61fd57d03b0d984e2ed3720fb1c7a897827ea174bd44402878e059542ea8c4aeedee0ea0985998aa5cc2736b2fa6e271c08587addb5b3959ac52cf665173d1ac @@ -13030,36 +9603,12 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"is-core-module@npm:^2.0.0, is-core-module@npm:^2.5.0, is-core-module@npm:^2.8.1, is-core-module@npm:^2.9.0": - version: 2.11.0 - resolution: "is-core-module@npm:2.11.0" -======= -"is-core-module@npm:^2.0.0, is-core-module@npm:^2.2.0, is-core-module@npm:^2.5.0, is-core-module@npm:^2.8.1": - version: 2.8.1 - resolution: "is-core-module@npm:2.8.1" ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) - dependencies: - has: ^1.0.3 - checksum: f96fd490c6b48eb4f6d10ba815c6ef13f410b0ba6f7eb8577af51697de523e5f2cd9de1c441b51d27251bf0e4aebc936545e33a5d26d5d51f28d25698d4a8bab -======= -"is-core-module@npm:^2.0.0, is-core-module@npm:^2.5.0, is-core-module@npm:^2.8.1, is-core-module@npm:^2.9.0": - version: 2.10.0 - resolution: "is-core-module@npm:2.10.0" - dependencies: - has: ^1.0.3 - checksum: 0f3f77811f430af3256fa7bbc806f9639534b140f8ee69476f632c3e1eb4e28a38be0b9d1b8ecf596179c841b53576129279df95e7051d694dac4ceb6f967593 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "is-core-module@npm:^2.0.0, is-core-module@npm:^2.11.0, is-core-module@npm:^2.5.0, is-core-module@npm:^2.9.0": version: 2.11.0 resolution: "is-core-module@npm:2.11.0" dependencies: has: ^1.0.3 checksum: f96fd490c6b48eb4f6d10ba815c6ef13f410b0ba6f7eb8577af51697de523e5f2cd9de1c441b51d27251bf0e4aebc936545e33a5d26d5d51f28d25698d4a8bab ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -13364,10 +9913,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= "is-set@npm:^2.0.1, is-set@npm:^2.0.2": version: 2.0.2 resolution: "is-set@npm:2.0.2" @@ -13375,14 +9920,7 @@ __metadata: languageName: node linkType: hard ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) "is-shared-array-buffer@npm:^1.0.2": -======= -"is-shared-array-buffer@npm:^1.0.1": ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= -"is-shared-array-buffer@npm:^1.0.2": ->>>>>>> 217c233f (fix(slider): fixes due to new version) version: 1.0.2 resolution: "is-shared-array-buffer@npm:1.0.2" dependencies: @@ -13563,33 +10101,15 @@ __metadata: linkType: hard "istanbul-lib-instrument@npm:^5.0.4": -<<<<<<< HEAD -<<<<<<< HEAD - version: 5.2.1 - resolution: "istanbul-lib-instrument@npm:5.2.1" -======= - version: 5.2.0 - resolution: "istanbul-lib-instrument@npm:5.2.0" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 5.2.1 resolution: "istanbul-lib-instrument@npm:5.2.1" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/core": ^7.12.3 "@babel/parser": ^7.14.7 "@istanbuljs/schema": ^0.1.2 istanbul-lib-coverage: ^3.2.0 semver: ^6.3.0 -<<<<<<< HEAD -<<<<<<< HEAD checksum: bf16f1803ba5e51b28bbd49ed955a736488381e09375d830e42ddeb403855b2006f850711d95ad726f2ba3f1ae8e7366de7e51d2b9ac67dc4d80191ef7ddf272 -======= - checksum: 7c242ed782b6bf7b655656576afae8b6bd23dcc020e5fdc1472cca3dfb6ddb196a478385206d0df5219b9babf46ac4f21fea5d8ea9a431848b6cca6007012353 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= - checksum: bf16f1803ba5e51b28bbd49ed955a736488381e09375d830e42ddeb403855b2006f850711d95ad726f2ba3f1ae8e7366de7e51d2b9ac67dc4d80191ef7ddf272 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -13616,30 +10136,12 @@ __metadata: linkType: hard "istanbul-reports@npm:^3.0.2": -<<<<<<< HEAD -<<<<<<< HEAD - version: 3.1.5 - resolution: "istanbul-reports@npm:3.1.5" - dependencies: - html-escaper: ^2.0.0 - istanbul-lib-report: ^3.0.0 - checksum: 7867228f83ed39477b188ea07e7ccb9b4f5320b6f73d1db93a0981b7414fa4ef72d3f80c4692c442f90fc250d9406e71d8d7ab65bb615cb334e6292b73192b89 -======= - version: 3.1.4 - resolution: "istanbul-reports@npm:3.1.4" - dependencies: - html-escaper: ^2.0.0 - istanbul-lib-report: ^3.0.0 - checksum: 2132983355710c522f6b26808015cab9a0ee8b9f5ae0db0d3edeff40b886dd83cb670fb123cb7b32dbe59473d7c00cdde2ba6136bc0acdb20a865fccea64dfe1 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= version: 3.1.5 resolution: "istanbul-reports@npm:3.1.5" dependencies: html-escaper: ^2.0.0 istanbul-lib-report: ^3.0.0 checksum: 7867228f83ed39477b188ea07e7ccb9b4f5320b6f73d1db93a0981b7414fa4ef72d3f80c4692c442f90fc250d9406e71d8d7ab65bb615cb334e6292b73192b89 ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard @@ -14149,15 +10651,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -"jest-worker@npm:^27.5.1": -======= -"jest-worker@npm:^27.3.1": ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= "jest-worker@npm:^27.5.1": ->>>>>>> 217c233f (fix(slider): fixes due to new version) version: 27.5.1 resolution: "jest-worker@npm:27.5.1" dependencies: @@ -14313,23 +10807,9 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"json5@npm:^2.1.2, json5@npm:^2.2.1": -======= -"json5@npm:^2.1.2": ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= -"json5@npm:^2.1.2, json5@npm:^2.2.1": ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) - version: 2.2.1 - resolution: "json5@npm:2.2.1" -======= "json5@npm:^2.1.2, json5@npm:^2.2.2": version: 2.2.3 resolution: "json5@npm:2.2.3" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) bin: json5: lib/cli.js checksum: 2a7436a93393830bce797d4626275152e37e877b265e94ca69c99e3d20c2b9dab021279146a39cdb700e71b2dd32a4cebd1514cd57cee102b1af906ce5040349 @@ -14361,37 +10841,13 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"jsx-ast-utils@npm:^2.4.1 || ^3.0.0, jsx-ast-utils@npm:^3.3.2": -======= "jsx-ast-utils@npm:^2.4.1 || ^3.0.0, jsx-ast-utils@npm:^3.3.3": ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) - version: 3.3.3 - resolution: "jsx-ast-utils@npm:3.3.3" - dependencies: - array-includes: ^3.1.5 - object.assign: ^4.1.3 - checksum: a2ed78cac49a0f0c4be8b1eafe3c5257a1411341d8e7f1ac740debae003de04e5f6372bfcfbd9d082e954ffd99aac85bcda85b7c6bc11609992483f4cdc0f745 -======= -"jsx-ast-utils@npm:^2.4.1 || ^3.0.0, jsx-ast-utils@npm:^3.2.1": - version: 3.2.2 - resolution: "jsx-ast-utils@npm:3.2.2" - dependencies: - array-includes: ^3.1.4 - object.assign: ^4.1.2 - checksum: 88c7ade9e1edb8e27021c9ac194184f47d6ffd3852807c3aac44b1610f7eb33359e1aa872a35008d43ed66b5f7be0f6fd8d6e0574d01cf3a4af3ceb0cd0b5988 ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= -"jsx-ast-utils@npm:^2.4.1 || ^3.0.0, jsx-ast-utils@npm:^3.3.2": version: 3.3.3 resolution: "jsx-ast-utils@npm:3.3.3" dependencies: array-includes: ^3.1.5 object.assign: ^4.1.3 checksum: a2ed78cac49a0f0c4be8b1eafe3c5257a1411341d8e7f1ac740debae003de04e5f6372bfcfbd9d082e954ffd99aac85bcda85b7c6bc11609992483f4cdc0f745 ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard @@ -14498,21 +10954,9 @@ __metadata: linkType: hard "leaflet@npm:^1.7.1": -<<<<<<< HEAD -<<<<<<< HEAD version: 1.9.3 resolution: "leaflet@npm:1.9.3" checksum: f8bc33215e6aed8488cb3d32511b943ff093c1747bcda8a39116e24fe714e12525f1a6843b6a79940ece4cf8d2a86e2cb1d7b80fc550344b3182659b19231a04 -======= - version: 1.8.0 - resolution: "leaflet@npm:1.8.0" - checksum: 4a27895d4253844f2f13f94cbc52a2030b10833cdf553085d931b834745236a8d2a38844a01eb968cc109eb43268bfadb97aad85b51deffb17b6ccd106542e00 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= - version: 1.9.3 - resolution: "leaflet@npm:1.9.3" - checksum: f8bc33215e6aed8488cb3d32511b943ff093c1747bcda8a39116e24fe714e12525f1a6843b6a79940ece4cf8d2a86e2cb1d7b80fc550344b3182659b19231a04 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -14587,31 +11031,10 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"libphonenumber-js@npm:^1.10.14": - version: 1.10.14 - resolution: "libphonenumber-js@npm:1.10.14" - checksum: 853608aca7ba63182bc9305ff4f5380c64973866bbd245a87fa219422371edd1e7c694ce3e6a8d8f3fb557bbbe10c7fc32601ff300be9937daf583d84c80bbd3 -======= -"libphonenumber-js@npm:^1.9.50": - version: 1.9.50 - resolution: "libphonenumber-js@npm:1.9.50" - checksum: ebb80c59b5239259a7b8710a70d68d5d4f5a622091258e55f431a4234c88156a0167e8dfe466e9f5c12c7e1d79fd1a32d3f2613eeb927cfde19c94a7792f4f71 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= -"libphonenumber-js@npm:^1.10.13": - version: 1.10.13 - resolution: "libphonenumber-js@npm:1.10.13" - checksum: a1740bbed8faa1adb4ae01dda6a7c16b4fd2917efdd9bafac53fa06d9e4b53dc67543d282f7fd0043649edddc0f03359448a17adb837e534358c7ba92c7dc268 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "libphonenumber-js@npm:^1.10.19": version: 1.10.19 resolution: "libphonenumber-js@npm:1.10.19" checksum: 8408056a375b36728b83daa2048a9157abe21596b042307487c64a648aa31319ace77f04c59331710b30d7fc79466fc5ad978fddb74b6e4a0a21463b7e6bd535 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -14830,15 +11253,7 @@ __metadata: big.js: ^5.2.2 emojis-list: ^3.0.0 json5: ^2.1.2 -<<<<<<< HEAD -<<<<<<< HEAD checksum: a5281f5fff1eaa310ad5e1164095689443630f3411e927f95031ab4fb83b4a98f388185bb1fe949e8ab8d4247004336a625e9255c22122b815bb9a4c5d8fc3b7 -======= - checksum: 9078d1ed47cadc57f4c6ddbdb2add324ee7da544cea41de3b7f1128e8108fcd41cd3443a85b7ee8d7d8ac439148aa221922774efe4cf87506d4fb054d5889303 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= - checksum: a5281f5fff1eaa310ad5e1164095689443630f3411e927f95031ab4fb83b4a98f388185bb1fe949e8ab8d4247004336a625e9255c22122b815bb9a4c5d8fc3b7 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -15003,44 +11418,10 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"lru-cache@npm:^7.7.1": -<<<<<<< HEAD - version: 7.14.1 - resolution: "lru-cache@npm:7.14.1" - checksum: d72c6713c6a6d86836a7a6523b3f1ac6764768cca47ec99341c3e76db06aacd4764620e5e2cda719a36848785a52a70e531822dc2b33fb071fa709683746c104 -======= -"lru-cache@npm:^7.5.1, lru-cache@npm:^7.7.1": -======= -"lru-cache@npm:^7.7.1": ->>>>>>> fe15f957 (refactor(slider): set theme on load) - version: 7.7.1 - resolution: "lru-cache@npm:7.7.1" - checksum: f362c5a2cfa8ad6fe557ec43dc1b7a9695cce84a5652a43ff813609f782f5da576631e7dfad41878bf19a7a69438f38375178635ee80de269aa314280ca2f59e ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= -======= -"lru-cache@npm:^7.4.0, lru-cache@npm:^7.7.1": ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) - version: 7.7.3 - resolution: "lru-cache@npm:7.7.3" - checksum: 1789743a68a8db052564a9dd020f04ba0712327a43e08babc94f05e1c56ef75a03514cf4acab75ae90e3d5d16ae02c7bf0f34754968dc5b8c2c3bc2d92c21745 ->>>>>>> 0d3c577c (feat(slider): add border and shadow) -======= "lru-cache@npm:^7.7.1": -<<<<<<< HEAD - version: 7.14.0 - resolution: "lru-cache@npm:7.14.0" - checksum: efdd329f2c1bb790b71d497c6c59272e6bc2d7dd060ba55fc136becd3dd31fc8346edb446275504d94cb60d3c8385dbf5267b79b23789e409b2bdf302d13f0d7 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 7.14.1 resolution: "lru-cache@npm:7.14.1" checksum: d72c6713c6a6d86836a7a6523b3f1ac6764768cca47ec99341c3e76db06aacd4764620e5e2cda719a36848785a52a70e531822dc2b33fb071fa709683746c104 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -15080,58 +11461,16 @@ __metadata: linkType: hard "make-fetch-happen@npm:^10.0.3": -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 10.2.1 - resolution: "make-fetch-happen@npm:10.2.1" - dependencies: - agentkeepalive: ^4.2.1 - cacache: ^16.1.0 -======= - version: 10.0.6 - resolution: "make-fetch-happen@npm:10.0.6" - dependencies: - agentkeepalive: ^4.2.1 - cacache: ^16.0.0 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - version: 10.1.0 - resolution: "make-fetch-happen@npm:10.1.0" -======= - version: 10.1.1 - resolution: "make-fetch-happen@npm:10.1.1" ->>>>>>> 0d3c577c (feat(slider): add border and shadow) -======= - version: 10.1.2 - resolution: "make-fetch-happen@npm:10.1.2" ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) - dependencies: - agentkeepalive: ^4.2.1 - cacache: ^16.0.2 ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= version: 10.2.1 resolution: "make-fetch-happen@npm:10.2.1" dependencies: agentkeepalive: ^4.2.1 cacache: ^16.1.0 ->>>>>>> 217c233f (fix(slider): fixes due to new version) http-cache-semantics: ^4.1.0 http-proxy-agent: ^5.0.0 https-proxy-agent: ^5.0.0 is-lambda: ^1.0.1 -<<<<<<< HEAD -<<<<<<< HEAD lru-cache: ^7.7.1 -======= - lru-cache: ^7.5.1 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - lru-cache: ^7.7.1 ->>>>>>> fe15f957 (refactor(slider): set theme on load) minipass: ^3.1.6 minipass-collect: ^1.0.2 minipass-fetch: ^2.0.3 @@ -15139,34 +11478,9 @@ __metadata: minipass-pipeline: ^1.2.4 negotiator: ^0.6.3 promise-retry: ^2.0.1 -<<<<<<< HEAD -<<<<<<< HEAD - socks-proxy-agent: ^7.0.0 - ssri: ^9.0.0 - checksum: 2332eb9a8ec96f1ffeeea56ccefabcb4193693597b132cd110734d50f2928842e22b84cfa1508e921b8385cdfd06dda9ad68645fed62b50fff629a580f5fb72c -======= - socks-proxy-agent: ^6.1.1 -<<<<<<< HEAD - ssri: ^8.0.1 -<<<<<<< HEAD -<<<<<<< HEAD - checksum: cf3e745567f114bf161e13dbde402cff916482930936c102543b5c6e5e6409921b05d38d6400c92ed0b43011b185c8f39a9f504c9a1bdb956eeeed39929451a6 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - checksum: fae1c2f255f6467bf6731344c2c04dd0e1f1899d8ae4698d98e2c86131ba899a418746ebc564493b85d1651d43c93b49f7825a2773edda4285a1c4c5e5ba9168 ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= - checksum: 3f1b0acc2032061a01bb44458e07bbd5721e3fbfb5a1620eef38e7c7d022f2141373fc41a8056685441c70444d94e1479485492ac6e9e8ad5de87ea29ca9d9e4 ->>>>>>> 0d3c577c (feat(slider): add border and shadow) -======= - ssri: ^9.0.0 - checksum: 42825d119a7e4f5b1a8e7048a86d328cd36bb1ff875d155ce7079d9a0afdd310c198fb310096af358cfa9ecdf643cecf960380686792457dccb36e17efe89eb0 ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= socks-proxy-agent: ^7.0.0 ssri: ^9.0.0 checksum: 2332eb9a8ec96f1ffeeea56ccefabcb4193693597b132cd110734d50f2928842e22b84cfa1508e921b8385cdfd06dda9ad68645fed62b50fff629a580f5fb72c ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard @@ -15397,15 +11711,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD "micromatch@npm:^4.0.2, micromatch@npm:^4.0.4, micromatch@npm:^4.0.5": -======= -"micromatch@npm:^4.0.2, micromatch@npm:^4.0.4": ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= -"micromatch@npm:^4.0.2, micromatch@npm:^4.0.4, micromatch@npm:^4.0.5": ->>>>>>> 217c233f (fix(slider): fixes due to new version) version: 4.0.5 resolution: "micromatch@npm:4.0.5" dependencies: @@ -15512,15 +11818,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -"minimatch@npm:^3.0.4, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2": -======= -"minimatch@npm:^3.0.4, minimatch@npm:^3.1.2": ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= "minimatch@npm:^3.0.4, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2": ->>>>>>> 217c233f (fix(slider): fixes due to new version) version: 3.1.2 resolution: "minimatch@npm:3.1.2" dependencies: @@ -15529,20 +11827,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -"minimatch@npm:^5.0.1": - version: 5.1.1 - resolution: "minimatch@npm:5.1.1" - dependencies: - brace-expansion: ^2.0.1 - checksum: 215edd0978320a3354188f84a537d45841f2449af4df4379f79b9b777e71aa4f5722cc9d1717eabd2a70d38ef76ab7b708d24d83ea6a6c909dfd8833de98b437 - languageName: node - linkType: hard - -======= ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= "minimatch@npm:^5.0.1": version: 5.1.6 resolution: "minimatch@npm:5.1.6" @@ -15552,7 +11836,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 217c233f (fix(slider): fixes due to new version) "minimist-options@npm:4.1.0": version: 4.1.0 resolution: "minimist-options@npm:4.1.0" @@ -15565,21 +11848,9 @@ __metadata: linkType: hard "minimist@npm:^1.1.1, minimist@npm:^1.2.0, minimist@npm:^1.2.5, minimist@npm:^1.2.6": -<<<<<<< HEAD -<<<<<<< HEAD - version: 1.2.7 - resolution: "minimist@npm:1.2.7" - checksum: 7346574a1038ca23c32e02252f603801f09384dd1d78b69a943a4e8c2c28730b80e96193882d3d3b22a063445f460e48316b29b8a25addca2d7e5e8f75478bec -======= - version: 1.2.6 - resolution: "minimist@npm:1.2.6" - checksum: d15428cd1e11eb14e1233bcfb88ae07ed7a147de251441d61158619dfb32c4d7e9061d09cab4825fdee18ecd6fce323228c8c47b5ba7cd20af378ca4048fb3fb ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= version: 1.2.7 resolution: "minimist@npm:1.2.7" checksum: 7346574a1038ca23c32e02252f603801f09384dd1d78b69a943a4e8c2c28730b80e96193882d3d3b22a063445f460e48316b29b8a25addca2d7e5e8f75478bec ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -15593,23 +11864,8 @@ __metadata: linkType: hard "minipass-fetch@npm:^2.0.3": -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 2.1.2 - resolution: "minipass-fetch@npm:2.1.2" -======= - version: 2.0.3 - resolution: "minipass-fetch@npm:2.0.3" ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - version: 2.1.0 - resolution: "minipass-fetch@npm:2.1.0" ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= version: 2.1.2 resolution: "minipass-fetch@npm:2.1.2" ->>>>>>> 217c233f (fix(slider): fixes due to new version) dependencies: encoding: ^0.1.13 minipass: ^3.1.6 @@ -15618,19 +11874,7 @@ __metadata: dependenciesMeta: encoding: optional: true -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD checksum: 3f216be79164e915fc91210cea1850e488793c740534985da017a4cbc7a5ff50506956d0f73bb0cb60e4fe91be08b6b61ef35101706d3ef5da2c8709b5f08f91 -======= - checksum: 78a4a509b1e73f5e63b84065969790373b36b04da586744815c7f7f80013f1d786797842cc33cfa517eba0ad2f2142eb0ac808c46738da1c53e0e3aeed81df11 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - checksum: 1334732859a3f7959ed22589bafd9c40384b885aebb5932328071c33f86b3eb181d54c86919675d1825ab5f1c8e4f328878c863873258d113c29d79a4b0c9c9f ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= - checksum: 3f216be79164e915fc91210cea1850e488793c740534985da017a4cbc7a5ff50506956d0f73bb0cb60e4fe91be08b6b61ef35101706d3ef5da2c8709b5f08f91 ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard @@ -15662,26 +11906,6 @@ __metadata: linkType: hard "minipass@npm:^3.0.0, minipass@npm:^3.1.1, minipass@npm:^3.1.6": -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 3.3.6 - resolution: "minipass@npm:3.3.6" -======= - version: 3.1.6 - resolution: "minipass@npm:3.1.6" ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) - dependencies: - yallist: ^4.0.0 - checksum: a30d083c8054cee83cdcdc97f97e4641a3f58ae743970457b1489ce38ee1167b3aaf7d815cd39ec7a99b9c40397fd4f686e83750e73e652b21cb516f6d845e48 -======= - version: 3.3.5 - resolution: "minipass@npm:3.3.5" - dependencies: - yallist: ^4.0.0 - checksum: f89f02bcaa0e0e4bb4c44ec796008e69fbca62db0aba6ead1bc57d25bdaefdf42102130f4f9ecb7d9c6b6cd35ff7b0c7b97d001d3435da8e629fb68af3aea57e ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 3.3.6 resolution: "minipass@npm:3.3.6" dependencies: @@ -15691,10 +11915,9 @@ __metadata: linkType: hard "minipass@npm:^4.0.0": - version: 4.0.1 - resolution: "minipass@npm:4.0.1" - checksum: 48eb3141cc247b44f738944cbd789aedeed9288ebdb64c7de9b3bf23e9e71d611381bfecf643d877d25f7ca9f3d5ab7b6757ef6f46282086812ac5372b7cd291 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) + version: 4.0.2 + resolution: "minipass@npm:4.0.2" + checksum: 2e4f4caaf85a45c01c6042adc43b5111a6113f62e300acf1db3b193ac3ec6e955bc893d6d8a08635598771a55a0f60487dcac59a1ac39557eb524295d4778c9e languageName: node linkType: hard @@ -15736,15 +11959,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -"mkdirp@npm:^0.5.1, mkdirp@npm:^0.5.3, mkdirp@npm:^0.5.6, mkdirp@npm:~0.5.1": -======= -"mkdirp@npm:^0.5.1, mkdirp@npm:^0.5.3, mkdirp@npm:^0.5.5, mkdirp@npm:~0.5.1": ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= "mkdirp@npm:^0.5.1, mkdirp@npm:^0.5.3, mkdirp@npm:^0.5.6, mkdirp@npm:~0.5.1": ->>>>>>> 217c233f (fix(slider): fixes due to new version) version: 0.5.6 resolution: "mkdirp@npm:0.5.6" dependencies: @@ -15764,29 +11979,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD "moment@npm:^2.24.0, moment@npm:^2.29.2": -======= -<<<<<<< HEAD -"moment@npm:^2.24.0": - version: 2.29.1 - resolution: "moment@npm:2.29.1" - checksum: 1e14d5f422a2687996be11dd2d50c8de3bd577c4a4ca79ba5d02c397242a933e5b941655de6c8cb90ac18f01cc4127e55b4a12ae3c527a6c0a274e455979345e -======= -"moment@npm:^2.24.0, moment@npm:^2.25.3": - version: 2.29.2 - resolution: "moment@npm:2.29.2" - checksum: ee850b5776485e2af0775ceb3cfebaa7d7638f0a750fe0678fcae24c310749f96c1938808384bd422a55e5703834a71fcb09c8a1d36d9cf847f6ed0205d7a3e5 ->>>>>>> aef305ce (fix(night-slider): fix distance between points) - languageName: node - linkType: hard - -"moment@npm:^2.29.2": ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= -"moment@npm:^2.24.0, moment@npm:^2.29.2": ->>>>>>> 217c233f (fix(slider): fixes due to new version) version: 2.29.4 resolution: "moment@npm:2.29.4" checksum: 0ec3f9c2bcba38dc2451b1daed5daded747f17610b92427bebe1d08d48d8b7bdd8d9197500b072d14e326dd0ccf3e326b9e3d07c5895d3d49e39b6803b76e80e @@ -15847,50 +12040,16 @@ __metadata: resolution: "multicast-dns@npm:6.2.3" dependencies: dns-packet: ^1.3.1 - thunky: ^1.0.2 - bin: - multicast-dns: cli.js - checksum: f515b49ca964429ab48a4ac8041fcf969c927aeb49ab65288bd982e52c849a870fc3b03565780b0d194a1a02da8821f28b6425e48e95b8107bc9fcc92f571a6f - languageName: node - linkType: hard - -"nan@npm:^2.12.1": -<<<<<<< HEAD -<<<<<<< HEAD - version: 2.17.0 - resolution: "nan@npm:2.17.0" - dependencies: - node-gyp: latest - checksum: ec609aeaf7e68b76592a3ba96b372aa7f5df5b056c1e37410b0f1deefbab5a57a922061e2c5b369bae9c7c6b5e6eecf4ad2dac8833a1a7d3a751e0a7c7f849ed + thunky: ^1.0.2 + bin: + multicast-dns: cli.js + checksum: f515b49ca964429ab48a4ac8041fcf969c927aeb49ab65288bd982e52c849a870fc3b03565780b0d194a1a02da8821f28b6425e48e95b8107bc9fcc92f571a6f languageName: node linkType: hard -<<<<<<< HEAD -"nanoid@npm:^3.3.4": - version: 3.3.4 - resolution: "nanoid@npm:3.3.4" - bin: - nanoid: bin/nanoid.cjs - checksum: 2fddd6dee994b7676f008d3ffa4ab16035a754f4bb586c61df5a22cf8c8c94017aadd360368f47d653829e0569a92b129979152ff97af23a558331e47e37cd9c -======= -"nanoid@npm:^3.3.1": - version: 3.3.2 - resolution: "nanoid@npm:3.3.2" - bin: - nanoid: bin/nanoid.cjs -<<<<<<< HEAD - checksum: 4ef0969e1bbe866fc223eb32276cbccb0961900bfe79104fa5abe34361979dead8d0e061410a5c03bc3d47455685adf32c09d6f27790f4a6898fb51f7df7ec86 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - checksum: 376717f0685251fad77850bd84c6b8d57837c71eeb1c05be7c742140cc1835a5a2953562add05166d6dbc8fb65f3fdffa356213037b967a470e1691dc3e7b9cc ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= - version: 2.16.0 - resolution: "nan@npm:2.16.0" -======= +"nan@npm:^2.12.1": version: 2.17.0 resolution: "nan@npm:2.17.0" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: node-gyp: latest checksum: ec609aeaf7e68b76592a3ba96b372aa7f5df5b056c1e37410b0f1deefbab5a57a922061e2c5b369bae9c7c6b5e6eecf4ad2dac8833a1a7d3a751e0a7c7f849ed @@ -15903,7 +12062,6 @@ __metadata: bin: nanoid: bin/nanoid.cjs checksum: 2fddd6dee994b7676f008d3ffa4ab16035a754f4bb586c61df5a22cf8c8c94017aadd360368f47d653829e0569a92b129979152ff97af23a558331e47e37cd9c ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard @@ -15950,33 +12108,15 @@ __metadata: linkType: hard "needle@npm:^3.1.0": -<<<<<<< HEAD -<<<<<<< HEAD - version: 3.2.0 - resolution: "needle@npm:3.2.0" -======= - version: 3.1.0 - resolution: "needle@npm:3.1.0" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 3.2.0 resolution: "needle@npm:3.2.0" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: debug: ^3.2.6 iconv-lite: ^0.6.3 sax: ^1.2.4 bin: needle: bin/needle -<<<<<<< HEAD -<<<<<<< HEAD - checksum: d6f3e8668bbaf943d28ced0ad843eff793b56025e80152e511fd02313b8974e4dd9674bcbe3d8f9aa31882adb190dafe29ea5fce03a92b4724adf4850070bcfc -======= - checksum: 662c8a019d0b2b30137f43e1641aa03d96f9da7ce0d3951af8d6d23c1526c123a992d82fcf9f4e68cba6a52e361a7decfb2c71a56cc0e60230248e5a3520f6ad ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: d6f3e8668bbaf943d28ced0ad843eff793b56025e80152e511fd02313b8974e4dd9674bcbe3d8f9aa31882adb190dafe29ea5fce03a92b4724adf4850070bcfc ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -16026,37 +12166,14 @@ __metadata: linkType: hard "node-gyp@npm:latest": -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 9.3.0 - resolution: "node-gyp@npm:9.3.0" -======= - version: 9.0.0 - resolution: "node-gyp@npm:9.0.0" ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - version: 9.1.0 - resolution: "node-gyp@npm:9.1.0" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 9.3.1 resolution: "node-gyp@npm:9.3.1" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: env-paths: ^2.2.0 glob: ^7.1.4 graceful-fs: ^4.2.6 make-fetch-happen: ^10.0.3 -<<<<<<< HEAD -<<<<<<< HEAD nopt: ^6.0.0 -======= - nopt: ^5.0.0 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - nopt: ^6.0.0 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) npmlog: ^6.0.0 rimraf: ^3.0.2 semver: ^7.3.5 @@ -16064,19 +12181,7 @@ __metadata: which: ^2.0.2 bin: node-gyp: bin/node-gyp.js -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - checksum: 589ddd3ed967724ef425f9624bfa47cf73022640ab3eba6d556e92cdc4ddef33b63fce3a467c93b995a3f61df92eafd3c3d1e8dbe4a2c00c383334487dea99c3 -======= - checksum: 4d8ef8860f7e4f4d86c91db3f519d26ed5cc23b48fe54543e2afd86162b4acbd14f21de42a5db344525efb69a991e021b96a68c70c6e2d5f4a5cb770793da6d3 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - checksum: 1437fa4a879b5b9010604128e8da8609b57c66034262087539ee04a8b764b8436af2be01bab66f8fc729a3adba2dcc21b10a32b9f552696c3fa8cd657d134fc4 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: b860e9976fa645ca0789c69e25387401b4396b93c8375489b5151a6c55cf2640a3b6183c212b38625ef7c508994930b72198338e3d09b9d7ade5acc4aaf51ea7 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -16139,30 +12244,10 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> 217c233f (fix(slider): fixes due to new version) -"node-releases@npm:^2.0.6": - version: 2.0.6 - resolution: "node-releases@npm:2.0.6" - checksum: e86a926dc9fbb3b41b4c4a89d998afdf140e20a4e8dbe6c0a807f7b2948b42ea97d7fd3ad4868041487b6e9ee98409829c6e4d84a734a4215dff060a7fbeb4bf -<<<<<<< HEAD -======= -"node-releases@npm:^2.0.2": - version: 2.0.2 - resolution: "node-releases@npm:2.0.2" - checksum: da858bf86b4d512842379749f5a5e4196ddab05ba18ffcf29f05bf460beceaca927f070f4430bb5046efec18941ddbc85e4c5fdbb83afc28a38dd6069a2f255e ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "node-releases@npm:^2.0.8": - version: 2.0.9 - resolution: "node-releases@npm:2.0.9" - checksum: 3ae6b1b300dc72c1a628861093d339a01aa017d3ad9017b0478384be29d6f9c93b9e26c91fce79728cecaadc04d0f16834b7ae1a018730e3e54962ec8c6aa86f ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) + version: 2.0.10 + resolution: "node-releases@npm:2.0.10" + checksum: d784ecde25696a15d449c4433077f5cce620ed30a1656c4abf31282bfc691a70d9618bae6868d247a67914d1be5cc4fde22f65a05f4398cdfb92e0fc83cadfbc languageName: node linkType: hard @@ -16269,32 +12354,14 @@ __metadata: linkType: hard "npmlog@npm:^6.0.0": -<<<<<<< HEAD -<<<<<<< HEAD - version: 6.0.2 - resolution: "npmlog@npm:6.0.2" -======= - version: 6.0.1 - resolution: "npmlog@npm:6.0.1" ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= version: 6.0.2 resolution: "npmlog@npm:6.0.2" ->>>>>>> 217c233f (fix(slider): fixes due to new version) dependencies: are-we-there-yet: ^3.0.0 console-control-strings: ^1.1.0 gauge: ^4.0.3 set-blocking: ^2.0.0 -<<<<<<< HEAD -<<<<<<< HEAD checksum: ae238cd264a1c3f22091cdd9e2b106f684297d3c184f1146984ecbe18aaa86343953f26b9520dedd1b1372bc0316905b736c1932d778dbeb1fcf5a1001390e2a -======= - checksum: f1a4078a73ebc89896a832bbf869f491c32ecb12e0434b9a7499878ce8f29f22e72befe3c53cd8cdc9dbf4b4057297e783ab0b6746a8b067734de6205af4d538 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - checksum: ae238cd264a1c3f22091cdd9e2b106f684297d3c184f1146984ecbe18aaa86343953f26b9520dedd1b1372bc0316905b736c1932d778dbeb1fcf5a1001390e2a ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard @@ -16348,29 +12415,10 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> 217c233f (fix(slider): fixes due to new version) "object-inspect@npm:^1.12.2, object-inspect@npm:^1.9.0": -<<<<<<< HEAD - version: 1.12.2 - resolution: "object-inspect@npm:1.12.2" - checksum: a534fc1b8534284ed71f25ce3a496013b7ea030f3d1b77118f6b7b1713829262be9e6243acbcb3ef8c626e2b64186112cb7f6db74e37b2789b9c789ca23048b2 -<<<<<<< HEAD -======= -"object-inspect@npm:^1.12.0, object-inspect@npm:^1.9.0": - version: 1.12.0 - resolution: "object-inspect@npm:1.12.0" - checksum: 2b36d4001a9c921c6b342e2965734519c9c58c355822243c3207fbf0aac271f8d44d30d2d570d450b2cc6f0f00b72bcdba515c37827d2560e5f22b1899a31cf4 ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 1.12.3 resolution: "object-inspect@npm:1.12.3" checksum: dabfd824d97a5f407e6d5d24810d888859f6be394d8b733a77442b277e0808860555176719c5905e765e3743a7cada6b8b0a3b85e5331c530fd418cc8ae991db ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -16400,15 +12448,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -"object.assign@npm:^4.1.3, object.assign@npm:^4.1.4": -======= -"object.assign@npm:^4.1.0, object.assign@npm:^4.1.3, object.assign@npm:^4.1.4": ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "object.assign@npm:^4.1.3, object.assign@npm:^4.1.4": ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) version: 4.1.4 resolution: "object.assign@npm:4.1.4" dependencies: @@ -16443,33 +12483,8 @@ __metadata: linkType: hard "object.getownpropertydescriptors@npm:^2.0.3, object.getownpropertydescriptors@npm:^2.1.0": -<<<<<<< HEAD -<<<<<<< HEAD - version: 2.1.5 - resolution: "object.getownpropertydescriptors@npm:2.1.5" - dependencies: - array.prototype.reduce: ^1.0.5 - call-bind: ^1.0.2 - define-properties: ^1.1.4 - es-abstract: ^1.20.4 - checksum: 7883e1aac1f9cd4cd85e2bb8c7aab6a60940a7cfe07b788356f301844d4967482fc81058e7bda24e1b3909cbb4879387ea9407329b78704f8937bc0b97dec58b - languageName: node - linkType: hard - -"object.hasown@npm:^1.1.2": - version: 1.1.2 - resolution: "object.hasown@npm:1.1.2" - dependencies: - define-properties: ^1.1.4 - es-abstract: ^1.20.4 - checksum: b936572536db0cdf38eb30afd2f1026a8b6f2cc5d2c4497c9d9bbb01eaf3e980dead4fd07580cfdd098e6383e5a9db8212d3ea0c6bdd2b5e68c60aa7e3b45566 -======= - version: 2.1.4 - resolution: "object.getownpropertydescriptors@npm:2.1.4" -======= version: 2.1.5 resolution: "object.getownpropertydescriptors@npm:2.1.5" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: array.prototype.reduce: ^1.0.5 call-bind: ^1.0.2 @@ -16484,14 +12499,8 @@ __metadata: resolution: "object.hasown@npm:1.1.2" dependencies: define-properties: ^1.1.4 -<<<<<<< HEAD - es-abstract: ^1.19.5 - checksum: d8ed4907ce57f48b93e3b53c418fd6787bf226a51e8d698c91e39b78e80fe5b124cb6282f6a9d5be21cf9e2c7829ab10206dcc6112b7748860eefe641880c793 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= es-abstract: ^1.20.4 checksum: b936572536db0cdf38eb30afd2f1026a8b6f2cc5d2c4497c9d9bbb01eaf3e980dead4fd07580cfdd098e6383e5a9db8212d3ea0c6bdd2b5e68c60aa7e3b45566 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -16504,11 +12513,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"object.values@npm:^1.1.0, object.values@npm:^1.1.5, object.values@npm:^1.1.6": -======= "object.values@npm:^1.1.0, object.values@npm:^1.1.6": ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) version: 1.1.6 resolution: "object.values@npm:1.1.6" dependencies: @@ -16849,13 +12854,8 @@ __metadata: linkType: hard "patch-package@npm:^6.4.7": -<<<<<<< HEAD - version: 6.5.0 - resolution: "patch-package@npm:6.5.0" -======= version: 6.5.1 resolution: "patch-package@npm:6.5.1" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@yarnpkg/lockfile": ^1.1.0 chalk: ^4.1.2 @@ -16873,11 +12873,7 @@ __metadata: yaml: ^1.10.2 bin: patch-package: index.js -<<<<<<< HEAD - checksum: d300e87617e3fb990d1f78fd5be205b5a5e65dfdf197b1e7f76f3b3dfe1551a03d276cb5ee6b82ab4d57e78f54ddc22bde803eec1b0896560262b276d0b2c4ab -======= checksum: 8530ffa30f11136b527c6eddf6da48fa12856ee510a47edb1f9cdf8a025636adb82968f5fae778b5e04ce8c87915ebdf5911422b54add59a5a42e372a8f30eb2 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -17002,15 +12998,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -"picomatch@npm:^2.0.4, picomatch@npm:^2.2.1, picomatch@npm:^2.2.2, picomatch@npm:^2.3.0, picomatch@npm:^2.3.1": -======= -"picomatch@npm:^2.0.4, picomatch@npm:^2.2.1, picomatch@npm:^2.2.2, picomatch@npm:^2.2.3, picomatch@npm:^2.3.0": ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= "picomatch@npm:^2.0.4, picomatch@npm:^2.2.1, picomatch@npm:^2.2.2, picomatch@npm:^2.3.0, picomatch@npm:^2.3.1": ->>>>>>> fe15f957 (refactor(slider): set theme on load) version: 2.3.1 resolution: "picomatch@npm:2.3.1" checksum: 050c865ce81119c4822c45d3c84f1ced46f93a0126febae20737bd05ca20589c564d6e9226977df859ed5e03dc73f02584a2b0faad36e896936238238b0446cf @@ -17921,30 +13909,12 @@ __metadata: linkType: hard "postcss-selector-parser@npm:^6.0.0, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.5": -<<<<<<< HEAD -<<<<<<< HEAD version: 6.0.11 resolution: "postcss-selector-parser@npm:6.0.11" dependencies: cssesc: ^3.0.0 util-deprecate: ^1.0.2 checksum: 0b01aa9c2d2c8dbeb51e9b204796b678284be9823abc8d6d40a8b16d4149514e922c264a8ed4deb4d6dbced564b9be390f5942c058582d8656351516d6c49cde -======= - version: 6.0.10 - resolution: "postcss-selector-parser@npm:6.0.10" - dependencies: - cssesc: ^3.0.0 - util-deprecate: ^1.0.2 - checksum: 46afaa60e3d1998bd7adf6caa374baf857cc58d3ff944e29459c9a9e4680a7fe41597bd5b755fc81d7c388357e9bf67c0251d047c640a09f148e13606b8a8608 ->>>>>>> 0d3c577c (feat(slider): add border and shadow) -======= - version: 6.0.11 - resolution: "postcss-selector-parser@npm:6.0.11" - dependencies: - cssesc: ^3.0.0 - util-deprecate: ^1.0.2 - checksum: 0b01aa9c2d2c8dbeb51e9b204796b678284be9823abc8d6d40a8b16d4149514e922c264a8ed4deb4d6dbced564b9be390f5942c058582d8656351516d6c49cde ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -18026,41 +13996,13 @@ __metadata: linkType: hard "postcss@npm:^8.1.0": -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 8.4.19 - resolution: "postcss@npm:8.4.19" -======= version: 8.4.21 resolution: "postcss@npm:8.4.21" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) - dependencies: - nanoid: ^3.3.4 - picocolors: ^1.0.0 - source-map-js: ^1.0.2 -<<<<<<< HEAD - checksum: 62782723a385f92b7525f66d29614624de7c5643855423db3a5efd9287e677650300192749adddbbb6734cea9b1d5f5fd4f6ea00ca3f9a95dbbb88f835f5ca64 -======= - version: 8.4.12 - resolution: "postcss@npm:8.4.12" -======= - version: 8.4.16 - resolution: "postcss@npm:8.4.16" ->>>>>>> 217c233f (fix(slider): fixes due to new version) dependencies: nanoid: ^3.3.4 picocolors: ^1.0.0 source-map-js: ^1.0.2 -<<<<<<< HEAD - checksum: 248e3d0f9bbb8efaafcfda7f91627a29bdc9a19f456896886330beb28c5abea0e14c7901b35191928602e2eccbed496b1e94097d27a0b2a980854cd00c7a835f ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - checksum: 10eee25efd77868036403858577da0cefaf2e0905feeaba5770d5438ccdddba3d01cba8063e96b8aac4c6daa0ed413dd5ae0554a433a3c4db38df1d134cffc1f ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: e39ac60ccd1542d4f9d93d894048aac0d686b3bb38e927d8386005718e6793dbbb46930f0a523fe382f1bbd843c6d980aaea791252bf5e176180e5a4336d9679 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -18102,51 +14044,11 @@ __metadata: linkType: hard "prettier@npm:^2.3.1": -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 2.8.0 - resolution: "prettier@npm:2.8.0" - bin: - prettier: bin-prettier.js - checksum: 72004ce0cc9bb097daf3e3833f62495768724392c1d5b178dd47372337616e9e50ecbb0804f236596223f7b5eb1bbe69cefc8957dca21112c5777e77ef73a564 -======= - version: 2.6.0 - resolution: "prettier@npm:2.6.0" - bin: - prettier: bin-prettier.js - checksum: 3e527ad62279676778a8404d18174d7ca2365ada4caba6eebbcdd9907d1187afd3bc6ade5b4e5f5d4549bb9fb71e45ca8930d71500017635524f8fc05bc52e93 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - version: 2.6.1 - resolution: "prettier@npm:2.6.1" - bin: - prettier: bin-prettier.js - checksum: 78be1f8a3ddfad7c3d8a854b6c8941a3bb1ddfca4225c38d778e0fe1029a55368f71b3bbefff82c689015fbb4d391ec44add957f01308ad2725e01a7c1f37cb6 ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= - version: 2.6.2 - resolution: "prettier@npm:2.6.2" - bin: - prettier: bin-prettier.js - checksum: 48d08dde8e9fb1f5bccdd205baa7f192e9fc8bc98f86e1b97d919de804e28c806b0e6cc685e4a88211aa7987fa9668f30baae19580d87ced3ed0f2ec6572106f ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= - version: 2.7.1 - resolution: "prettier@npm:2.7.1" - bin: - prettier: bin-prettier.js - checksum: 55a4409182260866ab31284d929b3cb961e5fdb91fe0d2e099dac92eaecec890f36e524b4c19e6ceae839c99c6d7195817579cdffc8e2c80da0cb794463a748b ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 2.8.3 resolution: "prettier@npm:2.8.3" bin: prettier: bin-prettier.js checksum: 92f2ceb522d454370e02082aa74ad27388672f7cee8975028b59517c069fe643bdc73e322675c8faf2ff173d7a626d1a6389f26b474000308e793aa25fff46e5 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -18225,27 +14127,11 @@ __metadata: linkType: hard "promise@npm:^8.1.0": -<<<<<<< HEAD -<<<<<<< HEAD - version: 8.3.0 - resolution: "promise@npm:8.3.0" - dependencies: - asap: ~2.0.6 - checksum: a69f0ddbddf78ffc529cffee7ad950d307347615970564b17988ce43fbe767af5c738a9439660b24a9a8cbea106c0dcbb6c2b20e23b7e96a8e89e5c2679e94d5 -======= - version: 8.2.0 - resolution: "promise@npm:8.2.0" - dependencies: - asap: ~2.0.6 - checksum: 45d65ffe4fbd9172ef848f790ac1366822e63f063a5ef42a14e75b577ffa3c37870a9d8472729d9d429d7c8a770428f9d13650b52aafaa361dcc69cf84873b20 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 8.3.0 resolution: "promise@npm:8.3.0" dependencies: asap: ~2.0.6 checksum: a69f0ddbddf78ffc529cffee7ad950d307347615970564b17988ce43fbe767af5c738a9439660b24a9a8cbea106c0dcbb6c2b20e23b7e96a8e89e5c2679e94d5 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -18384,37 +14270,12 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"qs@npm:6.11.0": - version: 6.11.0 - resolution: "qs@npm:6.11.0" - dependencies: - side-channel: ^1.0.4 - checksum: 6e1f29dd5385f7488ec74ac7b6c92f4d09a90408882d0c208414a34dd33badc1a621019d4c799a3df15ab9b1d0292f97c1dd71dc7c045e69f81a8064e5af7297 -======= -"qs@npm:6.9.7": - version: 6.9.7 - resolution: "qs@npm:6.9.7" - checksum: 5bbd263332ccf320a1f36d04a2019a5834dc20bcb736431eaccde2a39dcba03fb26d2fd00174f5d7bc26aaad1cad86124b18440883ac042ea2a0fca6170c1bf1 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= -"qs@npm:6.10.3": - version: 6.10.3 - resolution: "qs@npm:6.10.3" - dependencies: - side-channel: ^1.0.4 - checksum: 0fac5e6c7191d0295a96d0e83c851aeb015df7e990e4d3b093897d3ac6c94e555dbd0a599739c84d7fa46d7fee282d94ba76943983935cf33bba6769539b8019 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "qs@npm:6.11.0": version: 6.11.0 resolution: "qs@npm:6.11.0" dependencies: side-channel: ^1.0.4 checksum: 6e1f29dd5385f7488ec74ac7b6c92f4d09a90408882d0c208414a34dd33badc1a621019d4c799a3df15ab9b1d0292f97c1dd71dc7c045e69f81a8064e5af7297 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -18505,37 +14366,15 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -"raw-body@npm:2.5.1": - version: 2.5.1 - resolution: "raw-body@npm:2.5.1" - dependencies: - bytes: 3.1.2 - http-errors: 2.0.0 - iconv-lite: 0.4.24 - unpipe: 1.0.0 - checksum: 5362adff1575d691bb3f75998803a0ffed8c64eabeaa06e54b4ada25a0cd1b2ae7f4f5ec46565d1bec337e08b5ac90c76eaa0758de6f72a633f025d754dec29e -======= -"raw-body@npm:2.4.3": - version: 2.4.3 - resolution: "raw-body@npm:2.4.3" -======= "raw-body@npm:2.5.1": version: 2.5.1 resolution: "raw-body@npm:2.5.1" ->>>>>>> 217c233f (fix(slider): fixes due to new version) dependencies: bytes: 3.1.2 http-errors: 2.0.0 iconv-lite: 0.4.24 unpipe: 1.0.0 -<<<<<<< HEAD - checksum: d2961fa3c71c9c22dc2c3fd60ff377bf36dfed7d7a748f2b25d585934a3e9df565bb9aa5bc2e3a716ea941f4bc2a6ddc795c8b0cf7219fb071029b59b1985394 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= checksum: 5362adff1575d691bb3f75998803a0ffed8c64eabeaa06e54b4ada25a0cd1b2ae7f4f5ec46565d1bec337e08b5ac90c76eaa0758de6f72a633f025d754dec29e ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard @@ -18555,33 +14394,9 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"rc-cascader@npm:~3.7.0": - version: 3.7.0 - resolution: "rc-cascader@npm:3.7.0" -======= -<<<<<<< HEAD -"rc-cascader@npm:~3.6.0": - version: 3.6.1 - resolution: "rc-cascader@npm:3.6.1" -======= -"rc-cascader@npm:~3.2.1": - version: 3.2.9 - resolution: "rc-cascader@npm:3.2.9" ->>>>>>> 4fe56d8a (feat(app): update yarn lock and fix ref errors in inputs) ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= -"rc-cascader@npm:~3.6.0": - version: 3.6.2 - resolution: "rc-cascader@npm:3.6.2" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "rc-cascader@npm:~3.7.0": version: 3.7.0 resolution: "rc-cascader@npm:3.7.0" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/runtime": ^7.12.5 array-tree-filter: ^2.1.0 @@ -18592,23 +14407,7 @@ __metadata: peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD checksum: 9bc01c8fb633f6d9af821fad7020ceb829fe71bb9e3517fee2554ca58176b650621e3e9286b2e8208df419c381d6b7696aa801985acdb050c6f36b7c68321cff -======= -<<<<<<< HEAD - checksum: fb607a23bd68076eed53acaf40f94734271580fa05a90b2df0ce04544c255e2c00d0c8009be5e866b9fbed5bef7770c70959118b67a0a16bd00631a697c8b934 -======= - checksum: e0f3eb53e557eace7b60c2898d2e5b865f131a109b754e873b4febae62758c54c94a2f78e42cb78a1c484f2a04e1386b0b6da7b31b240e014965cfbabacd5e02 ->>>>>>> 4fe56d8a (feat(app): update yarn lock and fix ref errors in inputs) ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - checksum: f94aef618d03eed4a7a24fe3833a911d10f511eb70d961144d97c7341d5df139cbd2acb7f334729336f1bb1a1cf2b359c66ebe96e7d852994bed7492f3705f1a ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= - checksum: 9bc01c8fb633f6d9af821fad7020ceb829fe71bb9e3517fee2554ca58176b650621e3e9286b2e8208df419c381d6b7696aa801985acdb050c6f36b7c68321cff ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -18657,21 +14456,9 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -"rc-drawer@npm:~6.0.0": - version: 6.0.1 - resolution: "rc-drawer@npm:6.0.1" -======= -"rc-drawer@npm:~5.1.0": - version: 5.1.0 - resolution: "rc-drawer@npm:5.1.0" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "rc-drawer@npm:~6.1.0": version: 6.1.2 resolution: "rc-drawer@npm:6.1.2" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/runtime": ^7.10.1 "@rc-component/portal": ^1.0.0-6 @@ -18681,11 +14468,7 @@ __metadata: peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" -<<<<<<< HEAD - checksum: ce4a0b2ac3a96a203a1038f1c30df079e34359f821db9bcab39a87bdc62e62dd681d3b37354d9e1c77b44e3954b4f583d3b16ed021bcd1851dea0f62b888f6a8 -======= checksum: 0d7f5cd56bcad80ebc11dd3d1c5b13ef620e8790fac67af62180938c9baa0e671cbd6aaf9588ebd1978de39a2791dcf4f0da56dd366797bada43d2d31ef575ad ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -18705,26 +14488,8 @@ __metadata: linkType: hard "rc-field-form@npm:~1.27.0": -<<<<<<< HEAD -<<<<<<< HEAD - version: 1.27.3 - resolution: "rc-field-form@npm:1.27.3" -======= - version: 1.27.1 - resolution: "rc-field-form@npm:1.27.1" -<<<<<<< HEAD -======= -"rc-field-form@npm:~1.25.0": - version: 1.25.0 - resolution: "rc-field-form@npm:1.25.0" ->>>>>>> aef305ce (fix(night-slider): fix distance between points) ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 1.27.3 resolution: "rc-field-form@npm:1.27.3" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/runtime": ^7.18.0 async-validator: ^4.1.0 @@ -18732,33 +14497,6 @@ __metadata: peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - checksum: da373e9fda1984fdbe10b62abfc05f60ea0a771f6d2449ce248644b5e22fdf7046693a5721658c0ead5f2cd30ae6946a0697713f9e640fb51f0c1294020b8168 -======= -<<<<<<< HEAD - checksum: 120808dd7e0f07dcb83806b495fa14e0a837dce7a61001bd78707f0d6d1f49284ea6648d3ff1e5505a09e44c7487d62bead208634b1c9b0ca40dfe4f62b906a8 -======= - checksum: 3c4441241b480bb208490ddb61a1a401249b6533839908c532b81752169ba774a88511c811cee1062649ef5119df071736fdc49d558638c75224c12b0925ff70 ->>>>>>> aef305ce (fix(night-slider): fix distance between points) ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) - languageName: node - linkType: hard - -"rc-image@npm:~5.12.0": - version: 5.12.1 - resolution: "rc-image@npm:5.12.1" -======= - checksum: 120808dd7e0f07dcb83806b495fa14e0a837dce7a61001bd78707f0d6d1f49284ea6648d3ff1e5505a09e44c7487d62bead208634b1c9b0ca40dfe4f62b906a8 - languageName: node - linkType: hard - -"rc-image@npm:~5.7.0": - version: 5.7.1 - resolution: "rc-image@npm:5.7.1" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: da373e9fda1984fdbe10b62abfc05f60ea0a771f6d2449ce248644b5e22fdf7046693a5721658c0ead5f2cd30ae6946a0697713f9e640fb51f0c1294020b8168 languageName: node linkType: hard @@ -18766,39 +14504,16 @@ __metadata: "rc-image@npm:~5.13.0": version: 5.13.0 resolution: "rc-image@npm:5.13.0" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/runtime": ^7.11.2 "@rc-component/portal": ^1.0.2 classnames: ^2.2.6 rc-dialog: ~9.0.0 -<<<<<<< HEAD -======= rc-motion: ^2.6.2 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) rc-util: ^5.0.6 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" -<<<<<<< HEAD -<<<<<<< HEAD - checksum: 93cb53f0132973ef4fb5fa8c98c383d1fc9c3a9c9186d5e3b3fd8a756c324289c65f16113499548edd078993555fb91826b2fcb9930c15a5e16cd14a283eb4ae - languageName: node - linkType: hard - -"rc-input-number@npm:~7.3.9": - version: 7.3.11 - resolution: "rc-input-number@npm:7.3.11" -======= - checksum: f38a6b109f9b3606cdbdddbfb2e96477f11d6e9a89205ed10cf32ea99df39fade025980d0d6e45ed472e5872524c47f2e0b36b46394a26ac0cdf931d69e613e6 - languageName: node - linkType: hard - -"rc-input-number@npm:~7.3.5": - version: 7.3.7 - resolution: "rc-input-number@npm:7.3.7" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: 720ecb531474f272366a1769a831f49cc6aeabcb5e0aaa3d2395b3cdc8a8b9b08733e1b92a37c229170fa3520433efbed2d03f573f35df3efffd32998690f68e languageName: node linkType: hard @@ -18806,7 +14521,6 @@ __metadata: "rc-input-number@npm:~7.3.9": version: 7.3.11 resolution: "rc-input-number@npm:7.3.11" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/runtime": ^7.10.1 classnames: ^2.2.5 @@ -18814,8 +14528,6 @@ __metadata: peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" -<<<<<<< HEAD -<<<<<<< HEAD checksum: 8555171aed72a277721a7d22cdfadc56585f20f9422ce55b0f505eaae43837586d85bd7ebc5dca7b6eec96cbd8798b622ffd03f0187464dbaf6d741a5c20ee7d languageName: node linkType: hard @@ -18823,24 +14535,6 @@ __metadata: "rc-input@npm:~0.1.4": version: 0.1.4 resolution: "rc-input@npm:0.1.4" -======= - checksum: 8d7c3daec296119039e89d7df3eca00d614fb13a6e1b705e89b5d782b0a9d06f3ac1dd7928c1bd9296a1b2c2ffd6046b7f52ada99af9999cac7c17b4ac79c83e - languageName: node - linkType: hard - -"rc-input@npm:~0.1.2": - version: 0.1.2 - resolution: "rc-input@npm:0.1.2" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= - checksum: 8555171aed72a277721a7d22cdfadc56585f20f9422ce55b0f505eaae43837586d85bd7ebc5dca7b6eec96cbd8798b622ffd03f0187464dbaf6d741a5c20ee7d - languageName: node - linkType: hard - -"rc-input@npm:~0.1.4": - version: 0.1.4 - resolution: "rc-input@npm:0.1.4" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/runtime": ^7.11.1 classnames: ^2.2.1 @@ -18848,25 +14542,6 @@ __metadata: peerDependencies: react: ">=16.0.0" react-dom: ">=16.0.0" -<<<<<<< HEAD -<<<<<<< HEAD - checksum: 1c1935856d7f991ec6f6f8d17945ad501ce956116fdd79b8fcbe1e265465a59b348ba61f1f90045ef14b24e93cc4963b87d5333b9b784f5f28407b6601e8570e - languageName: node - linkType: hard - -"rc-mentions@npm:~1.13.1": - version: 1.13.1 - resolution: "rc-mentions@npm:1.13.1" -======= - checksum: 18c501c30ea7b98e17bc83762539009e1f7ab9d46258bec8a11cd4017850cfaf0b21acab0bdce9b05c34963311f17704df4b763d69fdbc49cb3cb4374968a28c - languageName: node - linkType: hard - -"rc-mentions@npm:~1.9.1": - version: 1.9.2 - resolution: "rc-mentions@npm:1.9.2" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: 1c1935856d7f991ec6f6f8d17945ad501ce956116fdd79b8fcbe1e265465a59b348ba61f1f90045ef14b24e93cc4963b87d5333b9b784f5f28407b6601e8570e languageName: node linkType: hard @@ -18874,7 +14549,6 @@ __metadata: "rc-mentions@npm:~1.13.1": version: 1.13.1 resolution: "rc-mentions@npm:1.13.1" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/runtime": ^7.10.1 classnames: ^2.2.6 @@ -18885,25 +14559,6 @@ __metadata: peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" -<<<<<<< HEAD -<<<<<<< HEAD - checksum: 7893c56f91a9ef60d70d607d0fb415c07398d35096a25488d49ea4829a56eda2c9cc0334af919330978e20fe85d39393caddbb52484f9bf39a80e78df4057b2e - languageName: node - linkType: hard - -"rc-menu@npm:~9.8.0": - version: 9.8.0 - resolution: "rc-menu@npm:9.8.0" -======= - checksum: 52709f90c8c8cc36a157716830f796b4caea5a7b0b63c2d32bb6b8855693c3f671206dacc4a4bd2e9175e63ba70930862a4564f6e967a0caf892f69b6e860530 - languageName: node - linkType: hard - -"rc-menu@npm:~9.6.0, rc-menu@npm:~9.6.3": - version: 9.6.3 - resolution: "rc-menu@npm:9.6.3" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: 7893c56f91a9ef60d70d607d0fb415c07398d35096a25488d49ea4829a56eda2c9cc0334af919330978e20fe85d39393caddbb52484f9bf39a80e78df4057b2e languageName: node linkType: hard @@ -18911,7 +14566,6 @@ __metadata: "rc-menu@npm:~9.8.0": version: 9.8.2 resolution: "rc-menu@npm:9.8.2" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/runtime": ^7.10.1 classnames: 2.x @@ -18922,48 +14576,13 @@ __metadata: peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" -<<<<<<< HEAD -<<<<<<< HEAD - checksum: e6e3209381e9b90373765a76818ca15ebf27d06739cea1176c2c3ebf204394d2ae8edfd952ff6f04a63c83f23c12b79807b8a6ec2ba0df1d107a0cacc4d20ce9 - languageName: node - linkType: hard - -<<<<<<< HEAD -"rc-motion@npm:^2.0.0, rc-motion@npm:^2.0.1, rc-motion@npm:^2.2.0, rc-motion@npm:^2.3.0, rc-motion@npm:^2.3.4, rc-motion@npm:^2.4.3, rc-motion@npm:^2.4.4, rc-motion@npm:^2.6.1, rc-motion@npm:^2.6.2": -======= -"rc-motion@npm:^2.0.0, rc-motion@npm:^2.0.1, rc-motion@npm:^2.2.0, rc-motion@npm:^2.3.0, rc-motion@npm:^2.3.4, rc-motion@npm:^2.4.3, rc-motion@npm:^2.4.4": - version: 2.4.7 - resolution: "rc-motion@npm:2.4.7" - dependencies: - "@babel/runtime": ^7.11.1 - classnames: ^2.2.1 - rc-util: ^5.19.2 - peerDependencies: - react: ">=16.9.0" - react-dom: ">=16.9.0" - checksum: 04aaf9bbbf84d7fa6c10ccb14ec98726caec9ea1271a72f923a9327ce7a1781cce2c7e10c6750abed3abb07224ceaac01f57f21f1c35270e8c854b5a253ce724 - languageName: node - linkType: hard - -"rc-motion@npm:^2.6.1": ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= - checksum: 9f0faf722466cab90685f37d0a00740c5fa8b675fbbfa8184eaaa8015396436363db412d85fd70fd05af9230ca73c47c7118bd37137baf9f849fabe2f96dc4ba -======= checksum: cd8513fe329802e627785133784954e2745afde7cd4507dfcd7cdde933b087f93d9acb478b3e02a5cc30228ef7611002a269c9a64bfa5228b74eba63d3d37a05 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard "rc-motion@npm:^2.0.0, rc-motion@npm:^2.0.1, rc-motion@npm:^2.2.0, rc-motion@npm:^2.3.0, rc-motion@npm:^2.3.4, rc-motion@npm:^2.4.3, rc-motion@npm:^2.4.4, rc-motion@npm:^2.6.1, rc-motion@npm:^2.6.2": -<<<<<<< HEAD ->>>>>>> 217c233f (fix(slider): fixes due to new version) - version: 2.6.2 - resolution: "rc-motion@npm:2.6.2" -======= version: 2.6.3 resolution: "rc-motion@npm:2.6.3" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/runtime": ^7.11.1 classnames: ^2.2.1 @@ -18990,15 +14609,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -"rc-overflow@npm:^1.0.0, rc-overflow@npm:^1.2.8": -======= -"rc-overflow@npm:^1.0.0, rc-overflow@npm:^1.2.0": ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "rc-overflow@npm:^1.0.0, rc-overflow@npm:^1.2.8": ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) version: 1.2.8 resolution: "rc-overflow@npm:1.2.8" dependencies: @@ -19089,8 +14700,8 @@ __metadata: linkType: hard "rc-segmented@npm:~2.1.0": - version: 2.1.0 - resolution: "rc-segmented@npm:2.1.0" + version: 2.1.2 + resolution: "rc-segmented@npm:2.1.2" dependencies: "@babel/runtime": ^7.11.1 classnames: ^2.2.1 @@ -19099,35 +14710,13 @@ __metadata: peerDependencies: react: ">=16.0.0" react-dom: ">=16.0.0" - checksum: 4f61ba5da980ee2056dfc330c456710c3c76982a50aeee25210cda3172da6974ec013ac82db0fb307546b6f070482d770fe499093409eb8a966e878447e377d5 + checksum: 9ebba682e70b480cacea79985b6c3fcd024d564a3105a9d48c6a0481a87002f8382987195014ce00e37d455e84dbd0def05d24e3671a52bd89aeeec43c82a91a languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -"rc-select@npm:~14.1.0, rc-select@npm:~14.1.13": - version: 14.1.14 - resolution: "rc-select@npm:14.1.14" -======= -"rc-select@npm:~14.1.0, rc-select@npm:~14.1.1": -<<<<<<< HEAD - version: 14.1.9 - resolution: "rc-select@npm:14.1.9" -======= -"rc-select@npm:~14.0.0-alpha.23, rc-select@npm:~14.0.0-alpha.8, rc-select@npm:~14.0.2": - version: 14.0.6 - resolution: "rc-select@npm:14.0.6" ->>>>>>> aef305ce (fix(night-slider): fix distance between points) ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= - version: 14.1.11 - resolution: "rc-select@npm:14.1.11" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "rc-select@npm:~14.1.0, rc-select@npm:~14.1.13": version: 14.1.16 resolution: "rc-select@npm:14.1.16" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/runtime": ^7.10.1 classnames: 2.x @@ -19139,23 +14728,7 @@ __metadata: peerDependencies: react: "*" react-dom: "*" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - checksum: 88b2c90998c8180d0a302c4acf23eaf526ddaa13090745d570a633caa18f0698febbff0ea8fc036c6eb015307590729605ff3ad4e77ff0e351dcd3c6282700bc -======= -<<<<<<< HEAD - checksum: 6edfccb555ccac1dd9cf8d023705db99629ffbaff2dcd559867068d04e719f5df9ed164469e9bb86dbed0c3c053fd00ca420de98a91cb271b633dff6c424a972 -======= - checksum: 156daa85bbd379e394219bf4cb6b34b8394da348abcdc124e15115d54e5bf3a2d55820b2aa8d62ea1212be9a37885a7a572f56cb3b7fd5fdfa36f5487ac1aadf ->>>>>>> aef305ce (fix(night-slider): fix distance between points) ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= - checksum: 8d8a46c29e9fab195c4c471963299287adb109295ee8db39913c94330f5f53be241881256da5483f50cafac2a811a59b662dc9bbd08084e44ecd911c79f74425 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: 545d8a190f372a3fa553f6d42c9959b44868528a1abd4013af439cc87fa4a98cd755c242a4a64e40b05decaf41c71eb1ebd63e5253cb0c84ea3905d19d27e7d4 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -19218,49 +14791,21 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -"rc-tabs@npm:~12.4.1": - version: 12.4.1 - resolution: "rc-tabs@npm:12.4.1" -======= -"rc-tabs@npm:~12.1.0-alpha.1": - version: 12.1.0-alpha.1 - resolution: "rc-tabs@npm:12.1.0-alpha.1" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "rc-tabs@npm:~12.5.0": version: 12.5.6 resolution: "rc-tabs@npm:12.5.6" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/runtime": ^7.11.2 classnames: 2.x rc-dropdown: ~4.0.0 -<<<<<<< HEAD -<<<<<<< HEAD - rc-menu: ~9.8.0 -======= - rc-menu: ~9.6.0 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= rc-menu: ~9.8.0 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) rc-motion: ^2.6.2 rc-resize-observer: ^1.0.0 rc-util: ^5.16.0 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" -<<<<<<< HEAD -<<<<<<< HEAD - checksum: fd4bf8ca46987a27c7e564e654c38adf9abde7b5b459e1f48a784b51a9d85f6a2234c648eca0dfd131b32b41827b39c202fe5d574d54c9723e59a2dd90d38005 -======= - checksum: 5f5d642ee7b88d793f107c5c7a12a8a7aae95baefbe95edde10513343ded71326e3a12c5bec645cd4f62eff809e1f939d2a1d981315a0a1d9241aa231703634b ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: ca9457da3c1398f5b48c741e5afdffd860b066f88bd230d43bfb37b4003612a69bd20a016ab43095936dff73a07a83220593c7fbfd0c495cecc6ca74663fdf9e ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -19294,21 +14839,9 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -"rc-tree-select@npm:~5.5.0": - version: 5.5.5 - resolution: "rc-tree-select@npm:5.5.5" -======= -"rc-tree-select@npm:~5.4.0": - version: 5.4.1 - resolution: "rc-tree-select@npm:5.4.1" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "rc-tree-select@npm:~5.5.0": version: 5.5.5 resolution: "rc-tree-select@npm:5.5.5" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/runtime": ^7.10.1 classnames: 2.x @@ -19318,25 +14851,6 @@ __metadata: peerDependencies: react: "*" react-dom: "*" -<<<<<<< HEAD -<<<<<<< HEAD - checksum: 6d7de4d9b80583b3bd39be0c8bad5138a62770805048da9fd177eb3f21acc7d02cd68ea64d9ca3accf8bfefa41b0db84c1ac50a3637c7b3c97060d7d3e9d60e5 - languageName: node - linkType: hard - -"rc-tree@npm:~5.7.0": - version: 5.7.1 - resolution: "rc-tree@npm:5.7.1" -======= - checksum: 7aa3e64ddeeffe31a1da6c0ec5618b40d0d2ff1d7f0364919ec9f39fecb45a2d9bada7d9ac8744b0d90998046d6edde7e3b83ecde5b56ea166f1edd07c21307a - languageName: node - linkType: hard - -"rc-tree@npm:~5.6.1, rc-tree@npm:~5.6.3, rc-tree@npm:~5.6.5": - version: 5.6.7 - resolution: "rc-tree@npm:5.6.7" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: 6d7de4d9b80583b3bd39be0c8bad5138a62770805048da9fd177eb3f21acc7d02cd68ea64d9ca3accf8bfefa41b0db84c1ac50a3637c7b3c97060d7d3e9d60e5 languageName: node linkType: hard @@ -19344,7 +14858,6 @@ __metadata: "rc-tree@npm:~5.7.0": version: 5.7.2 resolution: "rc-tree@npm:5.7.2" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/runtime": ^7.10.1 classnames: 2.x @@ -19354,31 +14867,13 @@ __metadata: peerDependencies: react: "*" react-dom: "*" -<<<<<<< HEAD -<<<<<<< HEAD - checksum: fe5bea020165c9418318c3f19b5b40fa54ac5c98e81f8f570e006899189659975353ad96e332a2541f153a5df73d441b766465aace1934e4b5a01e4c2572c2eb -======= - checksum: 2c692410974436ae03da0f0c4943a78b25647f5b39bc217d1cbb39750de61c42721d945e2123815b19b56ca01c514035dbe03a39db5e2653460ddcf164c9439b ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: 9b465e1937fdd59987d2e69587b10c3d1415072ed6cd8e953d8975c4d31ddfa3f963d6d824b6d5017bd3a4331d9a0af029886a484af70a861ddda02dcfcb964c ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard "rc-trigger@npm:^5.0.0, rc-trigger@npm:^5.0.4, rc-trigger@npm:^5.1.2, rc-trigger@npm:^5.2.10, rc-trigger@npm:^5.3.1": -<<<<<<< HEAD -<<<<<<< HEAD - version: 5.3.4 - resolution: "rc-trigger@npm:5.3.4" -======= - version: 5.3.1 - resolution: "rc-trigger@npm:5.3.1" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 5.3.4 resolution: "rc-trigger@npm:5.3.4" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/runtime": ^7.18.3 classnames: ^2.2.6 @@ -19406,117 +14901,22 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"rc-util@npm:^5.0.1, rc-util@npm:^5.0.6, rc-util@npm:^5.12.0, rc-util@npm:^5.15.0, rc-util@npm:^5.16.0, rc-util@npm:^5.16.1, rc-util@npm:^5.17.0, rc-util@npm:^5.18.1, rc-util@npm:^5.19.2, rc-util@npm:^5.2.0, rc-util@npm:^5.2.1, rc-util@npm:^5.20.1, rc-util@npm:^5.21.0, rc-util@npm:^5.21.2, rc-util@npm:^5.22.5, rc-util@npm:^5.23.0, rc-util@npm:^5.24.4, rc-util@npm:^5.3.0, rc-util@npm:^5.4.0, rc-util@npm:^5.6.1, rc-util@npm:^5.8.0, rc-util@npm:^5.9.4": - version: 5.24.8 - resolution: "rc-util@npm:5.24.8" -======= -<<<<<<< HEAD -"rc-util@npm:^5.0.1, rc-util@npm:^5.0.6, rc-util@npm:^5.0.7, rc-util@npm:^5.12.0, rc-util@npm:^5.15.0, rc-util@npm:^5.16.1, rc-util@npm:^5.17.0, rc-util@npm:^5.18.1, rc-util@npm:^5.19.2, rc-util@npm:^5.2.0, rc-util@npm:^5.2.1, rc-util@npm:^5.3.0, rc-util@npm:^5.4.0, rc-util@npm:^5.5.0, rc-util@npm:^5.6.1, rc-util@npm:^5.7.0, rc-util@npm:^5.8.0": -======= -"rc-util@npm:^5.0.1, rc-util@npm:^5.0.6, rc-util@npm:^5.12.0, rc-util@npm:^5.14.0, rc-util@npm:^5.15.0, rc-util@npm:^5.16.1, rc-util@npm:^5.17.0, rc-util@npm:^5.18.1, rc-util@npm:^5.19.2, rc-util@npm:^5.19.3, rc-util@npm:^5.2.0, rc-util@npm:^5.2.1, rc-util@npm:^5.3.0, rc-util@npm:^5.4.0, rc-util@npm:^5.5.0, rc-util@npm:^5.6.1, rc-util@npm:^5.7.0, rc-util@npm:^5.8.0, rc-util@npm:^5.9.4, rc-util@npm:^5.9.8": ->>>>>>> aef305ce (fix(night-slider): fix distance between points) - version: 5.19.3 - resolution: "rc-util@npm:5.19.3" - dependencies: - "@babel/runtime": ^7.12.5 - react-is: ^16.12.0 - shallowequal: ^1.1.0 - peerDependencies: - react: ">=16.9.0" - react-dom: ">=16.9.0" - checksum: 40dcc17a978d65ef2cb59eb5b3b1eb11f2a8e77ebfce9d773ee74d35480e93c665f158286c75a6ade9af687c1e96c1500d693fc3153a94b600ee3a1cf5422fe4 - languageName: node - linkType: hard - -<<<<<<< HEAD -"rc-util@npm:^5.20.1, rc-util@npm:^5.21.0, rc-util@npm:^5.21.2, rc-util@npm:^5.22.5, rc-util@npm:^5.23.0": - version: 5.23.0 - resolution: "rc-util@npm:5.23.0" ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= -"rc-util@npm:^5.0.1, rc-util@npm:^5.0.6, rc-util@npm:^5.12.0, rc-util@npm:^5.15.0, rc-util@npm:^5.16.1, rc-util@npm:^5.17.0, rc-util@npm:^5.18.1, rc-util@npm:^5.19.2, rc-util@npm:^5.2.0, rc-util@npm:^5.2.1, rc-util@npm:^5.20.1, rc-util@npm:^5.21.0, rc-util@npm:^5.21.2, rc-util@npm:^5.22.5, rc-util@npm:^5.23.0, rc-util@npm:^5.3.0, rc-util@npm:^5.4.0, rc-util@npm:^5.5.0, rc-util@npm:^5.6.1, rc-util@npm:^5.7.0, rc-util@npm:^5.8.0, rc-util@npm:^5.9.4": - version: 5.24.2 - resolution: "rc-util@npm:5.24.2" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "rc-util@npm:^5.0.1, rc-util@npm:^5.0.6, rc-util@npm:^5.15.0, rc-util@npm:^5.16.0, rc-util@npm:^5.16.1, rc-util@npm:^5.17.0, rc-util@npm:^5.18.1, rc-util@npm:^5.19.2, rc-util@npm:^5.2.0, rc-util@npm:^5.2.1, rc-util@npm:^5.20.1, rc-util@npm:^5.21.0, rc-util@npm:^5.21.2, rc-util@npm:^5.22.5, rc-util@npm:^5.23.0, rc-util@npm:^5.24.4, rc-util@npm:^5.26.0, rc-util@npm:^5.27.0, rc-util@npm:^5.4.0, rc-util@npm:^5.6.1, rc-util@npm:^5.8.0, rc-util@npm:^5.9.4": version: 5.27.2 resolution: "rc-util@npm:5.27.2" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/runtime": ^7.18.3 react-is: ^16.12.0 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" -<<<<<<< HEAD -<<<<<<< HEAD - checksum: 50aa9ba0721f8b6ae25269600e692aee764018dd682f74c37fd5d5721b6e991c095692737b038d5280fd8b9a43ad0c3572aa1f8f52ecd63482766d3b1a3fe7a1 -======= checksum: 2d19bac2670bf546225f12e9b7f5b578233ec53cfca0071eaca53d4b056c10fe92b36d4148f0592f0cdc65ab3067c81f9cd8456769ff0e00c1b03210d40c8f19 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard -<<<<<<< HEAD "rc-virtual-list@npm:^3.2.0, rc-virtual-list@npm:^3.4.8": -<<<<<<< HEAD - version: 3.4.11 - resolution: "rc-virtual-list@npm:3.4.11" -======= -"rc-util@npm:^5.9.4": - version: 5.17.0 - resolution: "rc-util@npm:5.17.0" - dependencies: - "@babel/runtime": ^7.12.5 - react-is: ^16.12.0 - shallowequal: ^1.1.0 - peerDependencies: - react: ">=16.9.0" - react-dom: ">=16.9.0" - checksum: 40dcc17a978d65ef2cb59eb5b3b1eb11f2a8e77ebfce9d773ee74d35480e93c665f158286c75a6ade9af687c1e96c1500d693fc3153a94b600ee3a1cf5422fe4 - languageName: node - linkType: hard - -"rc-virtual-list@npm:^3.2.0": - version: 3.4.4 - resolution: "rc-virtual-list@npm:3.4.4" -======= -"rc-virtual-list@npm:^3.2.0, rc-virtual-list@npm:^3.4.2": - version: 3.4.6 - resolution: "rc-virtual-list@npm:3.4.6" ->>>>>>> aef305ce (fix(night-slider): fix distance between points) -======= version: 3.4.13 resolution: "rc-virtual-list@npm:3.4.13" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) - dependencies: - "@babel/runtime": ^7.20.0 - classnames: ^2.2.6 - rc-resize-observer: ^1.0.0 - rc-util: ^5.15.0 - peerDependencies: - react: "*" - react-dom: "*" -<<<<<<< HEAD - checksum: dcccc9c223013e741749d098ccf4f4fa7c935d114123d48f1259da3118ad956fea239761ec07bdc221b138b67fccba3b9ac7e4a8ea8050372fe68a75ac6e6a7e - languageName: node - linkType: hard - -"rc-virtual-list@npm:^3.4.8": -======= - checksum: 6b814e607bdf9e2e217868b740d38bcceae97df5f0f1e3fdfc412f908921355a6e6c99366446673a2a81b3318efae7d73fd86555ea8b6b7f8340e28473b5cd2c - languageName: node - linkType: hard - -"rc-virtual-list@npm:^3.2.0, rc-virtual-list@npm:^3.4.8": ->>>>>>> 217c233f (fix(slider): fixes due to new version) - version: 3.4.8 - resolution: "rc-virtual-list@npm:3.4.8" ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) dependencies: "@babel/runtime": ^7.20.0 classnames: ^2.2.6 @@ -19525,10 +14925,7 @@ __metadata: peerDependencies: react: "*" react-dom: "*" - checksum: 3d802c903d900e6ecb894abf027acf45e60a504db9ca8ee02ebb8d22a63116c1d11b302788565752424e337597725e6c4f01d3d20c0937c349d2edc918d25ee1 -======= checksum: 590baca20aa209bdc7038c4cdbedef78100e8f8762966b8ae556d0c7154ce8a4f26737a5bd59580ee1ed446c79a8eb627e3fb003e1ee0de38f1bb9a7b3cd7e78 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -19588,35 +14985,14 @@ __metadata: linkType: hard "react-dom@npm:>= 16.3": -<<<<<<< HEAD -<<<<<<< HEAD - version: 18.2.0 - resolution: "react-dom@npm:18.2.0" - dependencies: - loose-envify: ^1.1.0 - scheduler: ^0.23.0 - peerDependencies: - react: ^18.2.0 - checksum: 7d323310bea3a91be2965f9468d552f201b1c27891e45ddc2d6b8f717680c95a75ae0bc1e3f5cf41472446a2589a75aed4483aee8169287909fcd59ad149e8cc -======= - version: 18.0.0 - resolution: "react-dom@npm:18.0.0" -======= version: 18.2.0 resolution: "react-dom@npm:18.2.0" ->>>>>>> 217c233f (fix(slider): fixes due to new version) dependencies: loose-envify: ^1.1.0 scheduler: ^0.23.0 peerDependencies: -<<<<<<< HEAD - react: ^18.0.0 - checksum: dd0ba9f2f31dd728076c892a95b2f5a8dfe79136431b0289afb46eec39d0ca6b6f0f40a60fd8aa6ef702c98ce7c26100d3d4dbc35c7c9e87429cd04f84cb58bd ->>>>>>> 0d3c577c (feat(slider): add border and shadow) -======= react: ^18.2.0 checksum: 7d323310bea3a91be2965f9468d552f201b1c27891e45ddc2d6b8f717680c95a75ae0bc1e3f5cf41472446a2589a75aed4483aee8169287909fcd59ad149e8cc ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard @@ -19662,28 +15038,8 @@ __metadata: linkType: hard "react-i18next@npm:^11.11.4": -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 11.18.6 - resolution: "react-i18next@npm:11.18.6" -======= - version: 11.16.1 - resolution: "react-i18next@npm:11.16.1" ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - version: 11.16.2 - resolution: "react-i18next@npm:11.16.2" ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= - version: 11.18.5 - resolution: "react-i18next@npm:11.18.5" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 11.18.6 resolution: "react-i18next@npm:11.18.6" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/runtime": ^7.14.5 html-parse-stringify: ^3.0.1 @@ -19695,23 +15051,7 @@ __metadata: optional: true react-native: optional: true -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD checksum: 624c0a0313fac4e0d18560b83c99a8bd0a83abc02e5db8d01984e0643ac409d178668aa3a4720d01f7a0d9520d38598dcbff801d6f69a970bae67461de6cd852 -======= - checksum: 2c7b7f0a3dfbd89c841d7e5e5f7d679a75930cbb1c15f10ee82accef2e5f8721fdc4bc3545846b320c66cca68c89d216f4cada76feab059f03fe21b7eddf8097 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - checksum: 3e86c5e7a73eef88eff7487bbc87ecf3d5c6808ce3d0cc1e9599e6a1b72466d2d6ced2b1b600c18a2309757bea49d1670526a1bc8953a9bf377964e9ea3c9166 ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= - checksum: c5e4b5b8ecc49f799a93110cb4d99d91190a268cf3b14b48e005ac1453eefe75e10758952a7d01fef4cf55afc5a6e7170d23c41d602efaedc06d4d34a85cd725 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= - checksum: 624c0a0313fac4e0d18560b83c99a8bd0a83abc02e5db8d01984e0643ac409d178668aa3a4720d01f7a0d9520d38598dcbff801d6f69a970bae67461de6cd852 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -19763,48 +15103,15 @@ __metadata: linkType: hard "react-lifecycles-compat@npm:^3.0.0": - version: 3.0.4 - resolution: "react-lifecycles-compat@npm:3.0.4" - checksum: a904b0fc0a8eeb15a148c9feb7bc17cec7ef96e71188280061fc340043fd6d8ee3ff233381f0e8f95c1cf926210b2c4a31f38182c8f35ac55057e453d6df204f - languageName: node - linkType: hard - -<<<<<<< HEAD -"react-phone-number-input@npm:^3.1.27": -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 3.2.12 - resolution: "react-phone-number-input@npm:3.2.12" - dependencies: - classnames: ^2.3.1 - country-flag-icons: ^1.5.4 - input-format: ^0.3.8 - libphonenumber-js: ^1.10.14 - prop-types: ^15.8.1 - peerDependencies: - react: ">=16.8" - react-dom: ">=16.8" - checksum: a9afe4f4d730aaeb9c0154e3e6ddd5c4cb02592e7faf83789f55955fa1fae6bf58d3ba365b4cbfcf05c87f72e1aa365cd5d33078b54682c430d2e751864150dd -======= - version: 3.1.47 - resolution: "react-phone-number-input@npm:3.1.47" -======= - version: 3.1.49 - resolution: "react-phone-number-input@npm:3.1.49" ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= - version: 3.2.11 - resolution: "react-phone-number-input@npm:3.2.11" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= -======= + version: 3.0.4 + resolution: "react-lifecycles-compat@npm:3.0.4" + checksum: a904b0fc0a8eeb15a148c9feb7bc17cec7ef96e71188280061fc340043fd6d8ee3ff233381f0e8f95c1cf926210b2c4a31f38182c8f35ac55057e453d6df204f + languageName: node + linkType: hard + "react-phone-number-input@npm:^3.2.17": ->>>>>>> 09c40674 (fix(phone-item): fix error) - version: 3.2.17 - resolution: "react-phone-number-input@npm:3.2.17" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) + version: 3.2.18 + resolution: "react-phone-number-input@npm:3.2.18" dependencies: classnames: ^2.3.1 country-flag-icons: ^1.5.4 @@ -19812,24 +15119,9 @@ __metadata: libphonenumber-js: ^1.10.19 prop-types: ^15.8.1 peerDependencies: -<<<<<<< HEAD - react: ">=0.16.8" - react-dom: ">=0.16.8" -<<<<<<< HEAD - checksum: 3a42dfe89556771e86310f7794f2c01e8923e4bbf3186e98a466d3fbf1278b78ff1ed6dccbe18a7c7bd70325cc6132d070353a76f6957d065eb4536bc20b5af6 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - checksum: ae517892f8e469e13597b41a6bfb4cf89be6f576ae9e9afb2970a18eaf860c706583048861bb9785709d2a5a8cb324e8515a8715484a90227cb2a0f0f95ef5b5 ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= react: ">=16.8" react-dom: ">=16.8" -<<<<<<< HEAD - checksum: e3e2c4b0b7eaa92d06efd80d57457cbba646f7399d9e4c7ae6d6563b9fb3560c7a93905cd2e9201569bd056e3edb99abc937ff2701d2851f176e26e60b08dd80 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= - checksum: abaddef5577f08401118cc36060c7582b4272bc46e08325c7484216e17aaba5d15720f2d9bb03953dcd07ba8621977028d46d8b07dec708984a93f1e1aaadc40 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) + checksum: baf12a74e85726754ffbeb55a3e0d9acd8a43f9d6831fa145c9ecdbbcdf788bae23eb66718256837f6e86e109d9822189e9ea81a82361dc9621282392318370c languageName: node linkType: hard @@ -19870,18 +15162,8 @@ __metadata: linkType: hard "react-redux@npm:^7.2.6": -<<<<<<< HEAD -<<<<<<< HEAD - version: 7.2.9 - resolution: "react-redux@npm:7.2.9" -======= - version: 7.2.8 - resolution: "react-redux@npm:7.2.8" ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= version: 7.2.9 resolution: "react-redux@npm:7.2.9" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/runtime": ^7.15.4 "@types/react-redux": ^7.1.20 @@ -19896,15 +15178,7 @@ __metadata: optional: true react-native: optional: true -<<<<<<< HEAD -<<<<<<< HEAD checksum: 369a2bdcf87915659af9e5c55abfd9f52a84e43e0d12dcc108ed17dbe6933558b7b7fc12caa9c10c1a10a8be7df89454b6c96989d8573fedec1a772c94a1f145 -======= - checksum: ecf1933e91013f2d41bfc781515b536bf81eb1f70ff228607841094c8330fe77d522372b359687e51c0b52b9888dba73db9ac0486aace1896ab9eb9daec102d5 ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= - checksum: 369a2bdcf87915659af9e5c55abfd9f52a84e43e0d12dcc108ed17dbe6933558b7b7fc12caa9c10c1a10a8be7df89454b6c96989d8573fedec1a772c94a1f145 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -19930,45 +15204,15 @@ __metadata: linkType: hard "react-router-dom@npm:^6.0.2": -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 6.4.3 - resolution: "react-router-dom@npm:6.4.3" - dependencies: - "@remix-run/router": 1.0.3 - react-router: 6.4.3 - peerDependencies: - react: ">=16.8" - react-dom: ">=16.8" - checksum: 67a44d8dc45761a1c88793cac73839bb657168ef61b9473eb39b186b4a3ea1472454fd96f8997dc541cb1e79a723d62f9503cbc9179b63b8f1d634ed6d2b079a -======= - version: 6.2.2 - resolution: "react-router-dom@npm:6.2.2" -======= - version: 6.3.0 - resolution: "react-router-dom@npm:6.3.0" ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= version: 6.8.0 resolution: "react-router-dom@npm:6.8.0" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@remix-run/router": 1.3.1 react-router: 6.8.0 peerDependencies: react: ">=16.8" react-dom: ">=16.8" -<<<<<<< HEAD -<<<<<<< HEAD - checksum: 83c5105af923c4f8af65a6de98283a95f46ffa643fd0c1a5005647c2c3deb946dae52dda32dc00cfcc3659517b08be806ff02ff03173361dba3d824850053e99 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - checksum: 77603a654f8a8dc7f65535a2e5917a65f8d9ffcb06546d28dd297e52adcc4b8a84377e0115f48dca330b080af2da3e78f29d590c89307094d36927d2b1751ec3 ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= checksum: a10419023267014bdad20f50b5be04dffda49ebeb06c52ce9567795769dc0dc9b4e2fa61b52b5d70b61df4d17f85bae8f9c7e94c73d25d16974e46fd47765ced ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -19984,36 +15228,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"react-router@npm:6.4.3": - version: 6.4.3 - resolution: "react-router@npm:6.4.3" -======= -"react-router@npm:6.2.2": - version: 6.2.2 - resolution: "react-router@npm:6.2.2" ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= -"react-router@npm:6.3.0": - version: 6.3.0 - resolution: "react-router@npm:6.3.0" ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) - dependencies: - "@remix-run/router": 1.0.3 - peerDependencies: - react: ">=16.8" -<<<<<<< HEAD -<<<<<<< HEAD - checksum: b89c0495c6837b1457915c08c5acc4eb7a2e9e3fae0420faf9bfc6311ecdfe78627cc1034c0e975bccd9aeeb70d1dcc5021322779dd3053d94c47e37339d77eb -======= - checksum: 1a2e7006d4d56bfae8ff11dd5ec15e8049578864dfb2764652510eb0ce4af26a8949790a3732c4f7beb14bcb6500469ea18841b8cfc953e09828e4e4113922f0 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - checksum: 7be673f5e72104be01e6ab274516bdb932efd93305243170690f6560e3bd1035dd1df3d3c9ce1e0f452638a2529f43a1e77dcf0934fc8031c4783da657be13ca ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= "react-router@npm:6.8.0": version: 6.8.0 resolution: "react-router@npm:6.8.0" @@ -20022,7 +15236,6 @@ __metadata: peerDependencies: react: ">=16.8" checksum: 6e258c47f6cbbd0b0c7c9fd7bbaf7cd5cd60472935512fbe97c91e4bbd9b1717f0dee231f5d7206bedfbccdbc21ab77eaf336ba971ea5d8c6b1277045a7b958a ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -20175,64 +15388,21 @@ __metadata: linkType: hard "react-verification-input@npm:^2.0.3": -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 2.0.8 - resolution: "react-verification-input@npm:2.0.8" - peerDependencies: - react: ">=16.8.0" - react-dom: ">=16.8.0" - checksum: 1846c480661e1703dc579d6f7943de273b45c73414b413b423c97d6adbe703d73c07aca15b60edd358ba5d20904ae6552c7d7906cfb8d252a9e419b8d2146198 -======= - version: 2.0.5 - resolution: "react-verification-input@npm:2.0.5" - peerDependencies: - react: 16.8.0 - 17.x.x - react-dom: 16.8.0 - 17.x.x - checksum: e224ffaf41e9b294b53026f9239987ca90b0d54db961245738f1fed8075979debe1f8657b65084995cc88fe44a81874e028823427833452c145d591f204bed46 ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= - version: 2.0.6 - resolution: "react-verification-input@npm:2.0.6" - peerDependencies: - react: ">=16.8.0" - react-dom: ">=16.8.0" - checksum: e6452a46239764c88be9df922f790f66995d450dae0dabb9c4a06c4d62bab3da61a8b448cec85b605e03f33df80744a230d2024f52065a84dae96a5f1584bc83 ->>>>>>> 0d3c577c (feat(slider): add border and shadow) -======= version: 2.0.8 resolution: "react-verification-input@npm:2.0.8" peerDependencies: react: ">=16.8.0" react-dom: ">=16.8.0" checksum: 1846c480661e1703dc579d6f7943de273b45c73414b413b423c97d6adbe703d73c07aca15b60edd358ba5d20904ae6552c7d7906cfb8d252a9e419b8d2146198 ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard "react@npm:>= 16.3": -<<<<<<< HEAD -<<<<<<< HEAD - version: 18.2.0 - resolution: "react@npm:18.2.0" - dependencies: - loose-envify: ^1.1.0 - checksum: 88e38092da8839b830cda6feef2e8505dec8ace60579e46aa5490fc3dc9bba0bd50336507dc166f43e3afc1c42939c09fe33b25fae889d6f402721dcd78fca1b -======= - version: 18.0.0 - resolution: "react@npm:18.0.0" - dependencies: - loose-envify: ^1.1.0 - checksum: 293020b96536b3c7113ee57ca5c990a3f25649d1751b1c7a3aabd16dff0691fe9f1eed1206616d0906d05933536052037340a0c8d0941ff870b0eb469a2f975b ->>>>>>> 0d3c577c (feat(slider): add border and shadow) -======= version: 18.2.0 resolution: "react@npm:18.2.0" dependencies: loose-envify: ^1.1.0 checksum: 88e38092da8839b830cda6feef2e8505dec8ace60579e46aa5490fc3dc9bba0bd50336507dc166f43e3afc1c42939c09fe33b25fae889d6f402721dcd78fca1b ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard @@ -20372,49 +15542,21 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -"redux@npm:^4.0.0, redux@npm:^4.2.0": -======= -"redux@npm:^4.0.0, redux@npm:^4.1.2": ->>>>>>> 217c233f (fix(slider): fixes due to new version) - version: 4.2.0 - resolution: "redux@npm:4.2.0" -======= "redux@npm:^4.0.0, redux@npm:^4.2.0": version: 4.2.1 resolution: "redux@npm:4.2.1" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/runtime": ^7.9.2 checksum: f63b9060c3a1d930ae775252bb6e579b42415aee7a23c4114e21a0b4ba7ec12f0ec76936c00f546893f06e139819f0e2855e0d55ebfce34ca9c026241a6950dd languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -"regenerate-unicode-properties@npm:^10.1.0": - version: 10.1.0 - resolution: "regenerate-unicode-properties@npm:10.1.0" - dependencies: - regenerate: ^1.4.2 - checksum: b1a8929588433ab8b9dc1a34cf3665b3b472f79f2af6ceae00d905fc496b332b9af09c6718fb28c730918f19a00dc1d7310adbaa9b72a2ec7ad2f435da8ace17 -======= -"regenerate-unicode-properties@npm:^10.0.1": - version: 10.0.1 - resolution: "regenerate-unicode-properties@npm:10.0.1" - dependencies: - regenerate: ^1.4.2 - checksum: 1b638b7087d8143e5be3e20e2cda197ea0440fa0bc2cc49646b2f50c5a2b1acdc54b21e4215805a5a2dd487c686b2291accd5ad00619534098d2667e76247754 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= "regenerate-unicode-properties@npm:^10.1.0": version: 10.1.0 resolution: "regenerate-unicode-properties@npm:10.1.0" dependencies: regenerate: ^1.4.2 checksum: b1a8929588433ab8b9dc1a34cf3665b3b472f79f2af6ceae00d905fc496b332b9af09c6718fb28c730918f19a00dc1d7310adbaa9b72a2ec7ad2f435da8ace17 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -20439,30 +15581,12 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -"regenerator-transform@npm:^0.15.1": - version: 0.15.1 - resolution: "regenerator-transform@npm:0.15.1" - dependencies: - "@babel/runtime": ^7.8.4 - checksum: 2d15bdeadbbfb1d12c93f5775493d85874dbe1d405bec323da5c61ec6e701bc9eea36167483e1a5e752de9b2df59ab9a2dfff6bf3784f2b28af2279a673d29a4 -======= -"regenerator-transform@npm:^0.15.0": - version: 0.15.0 - resolution: "regenerator-transform@npm:0.15.0" - dependencies: - "@babel/runtime": ^7.8.4 - checksum: 86e54849ab1167618d28bb56d214c52a983daf29b0d115c976d79840511420049b6b42c9ebdf187defa8e7129bdd74b6dd266420d0d3868c9fa7f793b5d15d49 ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= "regenerator-transform@npm:^0.15.1": version: 0.15.1 resolution: "regenerator-transform@npm:0.15.1" dependencies: "@babel/runtime": ^7.8.4 checksum: 2d15bdeadbbfb1d12c93f5775493d85874dbe1d405bec323da5c61ec6e701bc9eea36167483e1a5e752de9b2df59ab9a2dfff6bf3784f2b28af2279a673d29a4 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -20483,25 +15607,9 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"regexp.prototype.flags@npm:^1.2.0, regexp.prototype.flags@npm:^1.4.3": - version: 1.4.3 - resolution: "regexp.prototype.flags@npm:1.4.3" -======= -"regexp.prototype.flags@npm:^1.2.0, regexp.prototype.flags@npm:^1.4.1": - version: 1.4.1 - resolution: "regexp.prototype.flags@npm:1.4.1" ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= -"regexp.prototype.flags@npm:^1.2.0, regexp.prototype.flags@npm:^1.4.1, regexp.prototype.flags@npm:^1.4.3": -======= "regexp.prototype.flags@npm:^1.2.0, regexp.prototype.flags@npm:^1.4.3": ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) version: 1.4.3 resolution: "regexp.prototype.flags@npm:1.4.3" ->>>>>>> 217c233f (fix(slider): fixes due to new version) dependencies: call-bind: ^1.0.2 define-properties: ^1.1.3 @@ -20517,47 +15625,9 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"regexpu-core@npm:^5.2.1": - version: 5.2.2 - resolution: "regexpu-core@npm:5.2.2" - dependencies: - regenerate: ^1.4.2 - regenerate-unicode-properties: ^10.1.0 - regjsgen: ^0.7.1 - regjsparser: ^0.9.1 - unicode-match-property-ecmascript: ^2.0.0 - unicode-match-property-value-ecmascript: ^2.1.0 - checksum: 87c56815e20d213848d38f6b047ba52f0d632f36e791b777f59327e8d350c0743b27cc25feab64c0eadc9fe9959dde6b1261af71108a9371b72c8c26beda05ef - languageName: node - linkType: hard - -"regjsgen@npm:^0.7.1": - version: 0.7.1 - resolution: "regjsgen@npm:0.7.1" - checksum: 7cac399921c58db8e16454869283ff66871531180218064fa938ac05c11c2976792a00706c3c78bbc625e1d793ca373065ea90564e06189a751a7b4ae33acadc - languageName: node - linkType: hard - -"regjsparser@npm:^0.9.1": - version: 0.9.1 - resolution: "regjsparser@npm:0.9.1" -======= -"regexpu-core@npm:^5.0.1": - version: 5.0.1 - resolution: "regexpu-core@npm:5.0.1" -======= -"regexpu-core@npm:^5.1.0": - version: 5.1.0 - resolution: "regexpu-core@npm:5.1.0" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "regexpu-core@npm:^5.2.1": version: 5.2.2 resolution: "regexpu-core@npm:5.2.2" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: regenerate: ^1.4.2 regenerate-unicode-properties: ^10.1.0 @@ -20576,29 +15646,14 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"regjsparser@npm:^0.8.2": - version: 0.8.4 - resolution: "regjsparser@npm:0.8.4" ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= "regjsparser@npm:^0.9.1": version: 0.9.1 resolution: "regjsparser@npm:0.9.1" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: jsesc: ~0.5.0 bin: regjsparser: bin/parser -<<<<<<< HEAD -<<<<<<< HEAD - checksum: 5e1b76afe8f1d03c3beaf9e0d935dd467589c3625f6d65fb8ffa14f224d783a0fed4bf49c2c1b8211043ef92b6117313419edf055a098ed8342e340586741afc -======= - checksum: d069b932491761cda127ce11f6bd2729c3b1b394a35200ec33f1199e937423db28ceb86cf33f0a97c76ecd7c0f8db996476579eaf0d80a1f74c1934f4ca8b27a ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= checksum: 5e1b76afe8f1d03c3beaf9e0d935dd467589c3625f6d65fb8ffa14f224d783a0fed4bf49c2c1b8211043ef92b6117313419edf055a098ed8342e340586741afc ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -20700,23 +15755,10 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) "reselect@npm:^4.1.7": version: 4.1.7 resolution: "reselect@npm:4.1.7" checksum: 738d8e2b8f0dca154ad29de6a209c9fbca2d70ae6788fd85df87f2c74b95a65bbf2d16d43a9e2faff39de34d17a29d706ba08a6b2ee5660c09589edbd19af7e1 -<<<<<<< HEAD -======= -"reselect@npm:^4.1.5": - version: 4.1.6 - resolution: "reselect@npm:4.1.6" - checksum: 3ea1058422904063ec93c8f4693fe33dcb2178bbf417ace8db5b2c797a5875cf357d9308d11ed3942ee22507dd34ecfbf1f3a21340a4f31c206cab1d36ceef31 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -20801,23 +15843,9 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"resolve@npm:^1.10.0, resolve@npm:^1.12.0, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.18.1, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.0, resolve@npm:^1.3.2": -<<<<<<< HEAD -<<<<<<< HEAD -======= "resolve@npm:^1.10.0, resolve@npm:^1.12.0, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.18.1, resolve@npm:^1.19.0, resolve@npm:^1.22.1, resolve@npm:^1.3.2": ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) - version: 1.22.1 - resolution: "resolve@npm:1.22.1" -======= - version: 1.22.0 - resolution: "resolve@npm:1.22.0" ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= version: 1.22.1 resolution: "resolve@npm:1.22.1" ->>>>>>> 217c233f (fix(slider): fixes due to new version) dependencies: is-core-module: ^2.9.0 path-parse: ^1.0.7 @@ -20851,23 +15879,9 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"resolve@patch:resolve@^1.10.0#~builtin, resolve@patch:resolve@^1.12.0#~builtin, resolve@patch:resolve@^1.14.2#~builtin, resolve@patch:resolve@^1.17.0#~builtin, resolve@patch:resolve@^1.18.1#~builtin, resolve@patch:resolve@^1.19.0#~builtin, resolve@patch:resolve@^1.20.0#~builtin, resolve@patch:resolve@^1.22.0#~builtin, resolve@patch:resolve@^1.3.2#~builtin": -<<<<<<< HEAD -<<<<<<< HEAD -======= "resolve@patch:resolve@^1.10.0#~builtin, resolve@patch:resolve@^1.12.0#~builtin, resolve@patch:resolve@^1.14.2#~builtin, resolve@patch:resolve@^1.17.0#~builtin, resolve@patch:resolve@^1.18.1#~builtin, resolve@patch:resolve@^1.19.0#~builtin, resolve@patch:resolve@^1.22.1#~builtin, resolve@patch:resolve@^1.3.2#~builtin": ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) - version: 1.22.1 - resolution: "resolve@patch:resolve@npm%3A1.22.1#~builtin::version=1.22.1&hash=07638b" -======= - version: 1.22.0 - resolution: "resolve@patch:resolve@npm%3A1.22.0#~builtin::version=1.22.0&hash=07638b" ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= version: 1.22.1 resolution: "resolve@patch:resolve@npm%3A1.22.1#~builtin::version=1.22.1&hash=07638b" ->>>>>>> 217c233f (fix(slider): fixes due to new version) dependencies: is-core-module: ^2.9.0 path-parse: ^1.0.7 @@ -21078,35 +16092,11 @@ __metadata: linkType: hard "rxjs@npm:^7.5.1": -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 7.5.7 - resolution: "rxjs@npm:7.5.7" - dependencies: - tslib: ^2.1.0 - checksum: edabcdb73b0f7e0f5f6e05c2077aff8c52222ac939069729704357d6406438acca831c24210db320aba269e86dbe1a400f3769c89101791885121a342fb15d9c -======= - version: 7.5.5 - resolution: "rxjs@npm:7.5.5" - dependencies: - tslib: ^2.1.0 - checksum: e034f60805210cce756dd2f49664a8108780b117cf5d0e2281506e9e6387f7b4f1532d974a8c8b09314fa7a16dd2f6cff3462072a5789672b5dcb45c4173f3c6 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - version: 7.5.6 - resolution: "rxjs@npm:7.5.6" - dependencies: - tslib: ^2.1.0 - checksum: fc05f01364a74dac57490fb3e07ea63b422af04017fae1db641a009073f902ef69f285c5daac31359620dc8d9aee7d81e42b370ca2a8573d1feae0b04329383b ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 7.8.0 resolution: "rxjs@npm:7.8.0" dependencies: tslib: ^2.1.0 checksum: 61b4d4fd323c1043d8d6ceb91f24183b28bcf5def4f01ca111511d5c6b66755bc5578587fe714ef5d67cf4c9f2e26f4490d4e1d8cabf9bd5967687835e9866a2 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -21178,18 +16168,8 @@ __metadata: linkType: hard "sass-loader@npm:^10.0.5": -<<<<<<< HEAD -<<<<<<< HEAD - version: 10.4.1 - resolution: "sass-loader@npm:10.4.1" -======= - version: 10.3.1 - resolution: "sass-loader@npm:10.3.1" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 10.4.1 resolution: "sass-loader@npm:10.4.1" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: klona: ^2.0.4 loader-utils: ^2.0.0 @@ -21198,15 +16178,7 @@ __metadata: semver: ^7.3.2 peerDependencies: fibers: ">= 3.1.0" -<<<<<<< HEAD -<<<<<<< HEAD - node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 -======= - node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) sass: ^1.3.0 webpack: ^4.36.0 || ^5.0.0 peerDependenciesMeta: @@ -21216,15 +16188,7 @@ __metadata: optional: true sass: optional: true -<<<<<<< HEAD -<<<<<<< HEAD checksum: df9a65a62247e95305299ccbdf212cffdcdb69490928aecdf4f3dcf539b5302ed7cbffa663f83c5fc3ce0864decf84257a9ce484f6df4cb4426feeb88445dcd0 -======= - checksum: ab73a41a8aae1a8b4ae607b3ab661e23e12629ea2d05904727625b201e238083e37d7686f613ddd459a1f243a1146b93cd10c9a339a4f6d11871e70c914965c4 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= - checksum: df9a65a62247e95305299ccbdf212cffdcdb69490928aecdf4f3dcf539b5302ed7cbffa663f83c5fc3ce0864decf84257a9ce484f6df4cb4426feeb88445dcd0 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -21254,30 +16218,12 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -"scheduler@npm:^0.23.0": - version: 0.23.0 - resolution: "scheduler@npm:0.23.0" - dependencies: - loose-envify: ^1.1.0 - checksum: d79192eeaa12abef860c195ea45d37cbf2bbf5f66e3c4dcd16f54a7da53b17788a70d109ee3d3dde1a0fd50e6a8fc171f4300356c5aee4fc0171de526bf35f8a -======= -"scheduler@npm:^0.21.0": - version: 0.21.0 - resolution: "scheduler@npm:0.21.0" - dependencies: - loose-envify: ^1.1.0 - checksum: 4f8285076041ed2c81acdd1faa987f1655fdbd30554bc667c1ea64743fc74fb3a04ca7d27454b3d678735df5a230137a3b84756061b43dc5796e80701b66d124 ->>>>>>> 0d3c577c (feat(slider): add border and shadow) -======= "scheduler@npm:^0.23.0": version: 0.23.0 resolution: "scheduler@npm:0.23.0" dependencies: loose-envify: ^1.1.0 checksum: d79192eeaa12abef860c195ea45d37cbf2bbf5f66e3c4dcd16f54a7da53b17788a70d109ee3d3dde1a0fd50e6a8fc171f4300356c5aee4fc0171de526bf35f8a ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard @@ -21373,43 +16319,14 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD "semver@npm:^7.2.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7": version: 7.3.8 resolution: "semver@npm:7.3.8" -======= -"semver@npm:^7.2.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5": - version: 7.3.6 - resolution: "semver@npm:7.3.6" ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= -"semver@npm:^7.2.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7": -<<<<<<< HEAD - version: 7.3.7 - resolution: "semver@npm:7.3.7" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= - version: 7.3.8 - resolution: "semver@npm:7.3.8" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: lru-cache: ^6.0.0 bin: semver: bin/semver.js -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - checksum: ba9c7cbbf2b7884696523450a61fee1a09930d888b7a8d7579025ad93d459b2d1949ee5bbfeb188b2be5f4ac163544c5e98491ad6152df34154feebc2cc337c1 -======= - checksum: 9845f96b22268190b30025e02feca391451f2bd49b2c51920c27cc56744f64cbe397df089018fdb347d4b4fd800eabbd85661870eb63eb28055d2b72e457f759 ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= - checksum: 2fa3e877568cd6ce769c75c211beaed1f9fce80b28338cadd9d0b6c40f2e2862bafd62c19a6cff42f3d54292b7c623277bcab8816a2b5521cf15210d43e75232 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: ba9c7cbbf2b7884696523450a61fee1a09930d888b7a8d7579025ad93d459b2d1949ee5bbfeb188b2be5f4ac163544c5e98491ad6152df34154feebc2cc337c1 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -21732,36 +16649,15 @@ __metadata: linkType: hard "sockjs-client@npm:^1.5.0": -<<<<<<< HEAD -<<<<<<< HEAD - version: 1.6.1 - resolution: "sockjs-client@npm:1.6.1" - dependencies: - debug: ^3.2.7 - eventsource: ^2.0.2 - faye-websocket: ^0.11.4 - inherits: ^2.0.4 - url-parse: ^1.5.10 - checksum: c7623bbc9891f427c1670145550a1c9c2d5379719e174a791606ba4f12c7d92e4cfb9acec6c17f91fda45d910b23c308a1f9fbcad4916ce5db4e982b24079fc7 -======= - version: 1.6.0 - resolution: "sockjs-client@npm:1.6.0" -======= version: 1.6.1 resolution: "sockjs-client@npm:1.6.1" ->>>>>>> 217c233f (fix(slider): fixes due to new version) dependencies: debug: ^3.2.7 eventsource: ^2.0.2 faye-websocket: ^0.11.4 inherits: ^2.0.4 url-parse: ^1.5.10 -<<<<<<< HEAD - checksum: e071eafb2a0a3e1ecd5af8b423c01e4c76be703cf13d97ee240b2af297784d57a0a3b398415cbb6506f80a256d1a16c7b4c15da9e58520bf0cc28cc316ccbda4 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= checksum: c7623bbc9891f427c1670145550a1c9c2d5379719e174a791606ba4f12c7d92e4cfb9acec6c17f91fda45d910b23c308a1f9fbcad4916ce5db4e982b24079fc7 ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard @@ -21776,21 +16672,9 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -"socks-proxy-agent@npm:^7.0.0": - version: 7.0.0 - resolution: "socks-proxy-agent@npm:7.0.0" -======= -"socks-proxy-agent@npm:^6.1.1": - version: 6.1.1 - resolution: "socks-proxy-agent@npm:6.1.1" ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= "socks-proxy-agent@npm:^7.0.0": version: 7.0.0 resolution: "socks-proxy-agent@npm:7.0.0" ->>>>>>> 217c233f (fix(slider): fixes due to new version) dependencies: agent-base: ^6.0.2 debug: ^4.3.3 @@ -21799,8 +16683,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD "socks@npm:^2.6.2": version: 2.7.1 resolution: "socks@npm:2.7.1" @@ -21808,27 +16690,6 @@ __metadata: ip: ^2.0.0 smart-buffer: ^4.2.0 checksum: 259d9e3e8e1c9809a7f5c32238c3d4d2a36b39b83851d0f573bfde5f21c4b1288417ce1af06af1452569cd1eb0841169afd4998f0e04ba04656f6b7f0e46d748 -<<<<<<< HEAD -======= -"socks@npm:^2.6.1": - version: 2.6.2 - resolution: "socks@npm:2.6.2" -======= -"socks@npm:^2.6.2": - version: 2.7.0 - resolution: "socks@npm:2.7.0" ->>>>>>> 217c233f (fix(slider): fixes due to new version) - dependencies: - ip: ^2.0.0 - smart-buffer: ^4.2.0 -<<<<<<< HEAD - checksum: dd9194293059d737759d5c69273850ad4149f448426249325c4bea0e340d1cf3d266c3b022694b0dcf5d31f759de23657244c481fc1e8322add80b7985c36b5e ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - checksum: 0b5d94e2b3c11e7937b40fc5dac1e80d8b92a330e68c51f1d271ce6980c70adca42a3f8cd47c4a5769956bada074823b53374f2dc5f2ea5c2121b222dec6eadf ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -22027,27 +16888,11 @@ __metadata: linkType: hard "ssri@npm:^9.0.0": -<<<<<<< HEAD -<<<<<<< HEAD - version: 9.0.1 - resolution: "ssri@npm:9.0.1" - dependencies: - minipass: ^3.1.1 - checksum: fb58f5e46b6923ae67b87ad5ef1c5ab6d427a17db0bead84570c2df3cd50b4ceb880ebdba2d60726588272890bae842a744e1ecce5bd2a2a582fccd5068309eb -======= - version: 9.0.0 - resolution: "ssri@npm:9.0.0" - dependencies: - minipass: ^3.1.1 - checksum: bf33174232d07cc64e77ab1c51b55d28352273380c503d35642a19627e88a2c5f160039bb0a28608a353485075dda084dbf0390c7070f9f284559eb71d01b84b ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) -======= version: 9.0.1 resolution: "ssri@npm:9.0.1" dependencies: minipass: ^3.1.1 checksum: fb58f5e46b6923ae67b87ad5ef1c5ab6d427a17db0bead84570c2df3cd50b4ceb880ebdba2d60726588272890bae842a744e1ecce5bd2a2a582fccd5068309eb ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard @@ -22067,23 +16912,10 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> 217c233f (fix(slider): fixes due to new version) "stackframe@npm:^1.3.4": version: 1.3.4 resolution: "stackframe@npm:1.3.4" checksum: bae1596873595c4610993fa84f86a3387d67586401c1816ea048c0196800c0646c4d2da98c2ee80557fd9eff05877efe33b91ba6cd052658ed96ddc85d19067d -<<<<<<< HEAD -======= -"stackframe@npm:^1.1.1": - version: 1.2.1 - resolution: "stackframe@npm:1.2.1" - checksum: 1a3f281014bb1d2178b7c2ab26d657fb0f83c21d7d34ab33d858fd0b652a035254619fce8601278a2cf22ddb3382af21c4ea29b429806da75f3077fbd5e5bf17 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard @@ -22112,17 +16944,6 @@ __metadata: linkType: hard "std-env@npm:^3.0.1": -<<<<<<< HEAD -<<<<<<< HEAD - version: 3.3.1 - resolution: "std-env@npm:3.3.1" - checksum: c4f59ecd2cb52041ce1785776d28a1aa56d346b6c4efcb8473e7e801eed1ac7612332dcee242d0b35948f35f745cceb6e226b5e825b59e588b262dca6be2b8aa -======= - version: 3.2.1 - resolution: "std-env@npm:3.2.1" - checksum: c046af2573ba6e02c9ffcfd5a2c3f94f160404915941be177b93d6d1695078e487293fed6ab4fa95680e75a331eccf0f6dbe0b86babda15056c594e600a99dc4 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 3.3.2 resolution: "std-env@npm:3.3.2" checksum: c02256bb041ba1870d23f8360bc7e47a9cf1fabcd02c8b7c4246d48f2c6bb47b4f45c70964348844e6d36521df84c4a9d09d468654b51e0eb5c600e3392b4570 @@ -22135,7 +16956,6 @@ __metadata: dependencies: internal-slot: ^1.0.4 checksum: d04173690b2efa40e24ab70e5e51a3ff31d56d699550cfad084104ab3381390daccb36652b25755e420245f3b0737de66c1879eaa2a8d4fc0a78f9bf892fcb42 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -22239,34 +17059,9 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"string.prototype.matchall@npm:^4.0.8": - version: 4.0.8 - resolution: "string.prototype.matchall@npm:4.0.8" - dependencies: - call-bind: ^1.0.2 - define-properties: ^1.1.4 - es-abstract: ^1.20.4 - get-intrinsic: ^1.1.3 - has-symbols: ^1.0.3 - internal-slot: ^1.0.3 - regexp.prototype.flags: ^1.4.3 - side-channel: ^1.0.4 - checksum: 952da3a818de42ad1c10b576140a5e05b4de7b34b8d9dbf00c3ac8c1293e9c0f533613a39c5cda53e0a8221f2e710bc2150e730b1c2278d60004a8a35726efb6 -======= -"string.prototype.matchall@npm:^4.0.6": -======= -"string.prototype.matchall@npm:^4.0.7": ->>>>>>> 217c233f (fix(slider): fixes due to new version) - version: 4.0.7 - resolution: "string.prototype.matchall@npm:4.0.7" -======= "string.prototype.matchall@npm:^4.0.8": version: 4.0.8 resolution: "string.prototype.matchall@npm:4.0.8" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: call-bind: ^1.0.2 define-properties: ^1.1.4 @@ -22276,52 +17071,6 @@ __metadata: internal-slot: ^1.0.3 regexp.prototype.flags: ^1.4.3 side-channel: ^1.0.4 -<<<<<<< HEAD - checksum: fc09f3ccbfb325de0472bcc87a6be0598a7499e0b4a31db5789676155b15754a4cc4bb83924f15fc9ed48934dac7366ee52c8b9bd160bed6fd072c93b489e75c ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) - languageName: node - linkType: hard - -"string.prototype.trimend@npm:^1.0.5": -<<<<<<< HEAD - version: 1.0.6 - resolution: "string.prototype.trimend@npm:1.0.6" - dependencies: - call-bind: ^1.0.2 - define-properties: ^1.1.4 - es-abstract: ^1.20.4 - checksum: 0fdc34645a639bd35179b5a08227a353b88dc089adf438f46be8a7c197fc3f22f8514c1c9be4629b3cd29c281582730a8cbbad6466c60f76b5f99cf2addb132e -======= - version: 1.0.5 - resolution: "string.prototype.trimend@npm:1.0.5" - dependencies: - call-bind: ^1.0.2 - define-properties: ^1.1.4 - es-abstract: ^1.19.5 - checksum: d44f543833112f57224e79182debadc9f4f3bf9d48a0414d6f0cbd2a86f2b3e8c0ca1f95c3f8e5b32ae83e91554d79d932fc746b411895f03f93d89ed3dfb6bc ->>>>>>> 217c233f (fix(slider): fixes due to new version) - languageName: node - linkType: hard - -"string.prototype.trimstart@npm:^1.0.5": -<<<<<<< HEAD - version: 1.0.6 - resolution: "string.prototype.trimstart@npm:1.0.6" - dependencies: - call-bind: ^1.0.2 - define-properties: ^1.1.4 - es-abstract: ^1.20.4 - checksum: 89080feef416621e6ef1279588994305477a7a91648d9436490d56010a1f7adc39167cddac7ce0b9884b8cdbef086987c4dcb2960209f2af8bac0d23ceff4f41 -======= - version: 1.0.5 - resolution: "string.prototype.trimstart@npm:1.0.5" - dependencies: - call-bind: ^1.0.2 - define-properties: ^1.1.4 - es-abstract: ^1.19.5 - checksum: a4857c5399ad709d159a77371eeaa8f9cc284469a0b5e1bfe405de16f1fd4166a8ea6f4180e55032f348d1b679b1599fd4301fbc7a8b72bdb3e795e43f7b1048 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: 952da3a818de42ad1c10b576140a5e05b4de7b34b8d9dbf00c3ac8c1293e9c0f533613a39c5cda53e0a8221f2e710bc2150e730b1c2278d60004a8a35726efb6 languageName: node linkType: hard @@ -22345,7 +17094,6 @@ __metadata: define-properties: ^1.1.4 es-abstract: ^1.20.4 checksum: 89080feef416621e6ef1279588994305477a7a91648d9436490d56010a1f7adc39167cddac7ce0b9884b8cdbef086987c4dcb2960209f2af8bac0d23ceff4f41 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -22488,18 +17236,8 @@ __metadata: linkType: hard "styled-components@npm:>= 4.0, styled-components@npm:^5.3.0": -<<<<<<< HEAD -<<<<<<< HEAD - version: 5.3.6 - resolution: "styled-components@npm:5.3.6" -======= - version: 5.3.5 - resolution: "styled-components@npm:5.3.5" ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= version: 5.3.6 resolution: "styled-components@npm:5.3.6" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@babel/helper-module-imports": ^7.0.0 "@babel/traverse": ^7.4.5 @@ -22515,15 +17253,7 @@ __metadata: react: ">= 16.8.0" react-dom: ">= 16.8.0" react-is: ">= 16.8.0" -<<<<<<< HEAD -<<<<<<< HEAD - checksum: 68eac1e451be81d66739cf86de8ec9e72f46e7584aa359271761a2437468210bd7cf0a864281fc97dab08c32b35e6bf7513dc8b4104ed6b196cf8d65674dd289 -======= - checksum: 05a664dfe423c2906959a0f3f47f9b1ad630e493eb2e06deea0dc0906af33ba5ca17277b98948a6c9642e73894d6533391aebf45576489f5afe920c974e9f8eb ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= checksum: 68eac1e451be81d66739cf86de8ec9e72f46e7584aa359271761a2437468210bd7cf0a864281fc97dab08c32b35e6bf7513dc8b4104ed6b196cf8d65674dd289 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -22751,18 +17481,8 @@ __metadata: linkType: hard "tar@npm:^6.0.2, tar@npm:^6.1.11, tar@npm:^6.1.2": -<<<<<<< HEAD -<<<<<<< HEAD - version: 6.1.12 - resolution: "tar@npm:6.1.12" -======= - version: 6.1.11 - resolution: "tar@npm:6.1.11" ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= version: 6.1.13 resolution: "tar@npm:6.1.13" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: chownr: ^2.0.0 fs-minipass: ^2.0.0 @@ -22770,11 +17490,7 @@ __metadata: minizlib: ^2.1.1 mkdirp: ^1.0.3 yallist: ^4.0.0 -<<<<<<< HEAD - checksum: 49d72e4420944e7ede2782d6b0826a6ede6cdab23c7de63470917e7a78166bc4d5b1a96279d3d79a85f1ba5a17cd37c0acbb3cbff19a07447691445b8b051c55 -======= checksum: 8a278bed123aa9f53549b256a36b719e317c8b96fe86a63406f3c62887f78267cea9b22dc6f7007009738509800d4a4dccc444abd71d762287c90f35b002eb1c ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -22858,15 +17574,8 @@ __metadata: linkType: hard "terser@npm:^5.3.4": -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 5.16.0 - resolution: "terser@npm:5.16.0" -======= version: 5.16.3 resolution: "terser@npm:5.16.3" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: "@jridgewell/source-map": ^0.3.2 acorn: ^8.5.0 @@ -22874,31 +17583,7 @@ __metadata: source-map-support: ~0.5.20 bin: terser: bin/terser -<<<<<<< HEAD - checksum: d035672bd28bd40ff80d83bea6bc6c85bddf41c18060e49c8b36a3aa45a0a6b4a59c6a56bdf52f9d3350587684d664f8ca26656c6084abeb951b85edf34e47ae -======= - version: 5.12.1 - resolution: "terser@npm:5.12.1" -======= - version: 5.15.0 - resolution: "terser@npm:5.15.0" ->>>>>>> 217c233f (fix(slider): fixes due to new version) - dependencies: - "@jridgewell/source-map": ^0.3.2 - acorn: ^8.5.0 - commander: ^2.20.0 - source-map-support: ~0.5.20 - bin: - terser: bin/terser -<<<<<<< HEAD - checksum: dd33af5d87a1159bcc38f354707505f1449a33d1491c512e9536f11fea7c3474cdc40e2e5fdf75f58658cfaab8ef47cb7454acd6406b2ce487675cb1978c6275 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - checksum: b2358c989fcb76b4a1c265f60e175c950d3f776e5f619a9f58f54e8d2d792cd6b4cca86071834075f3b9943556d695357bafdd4ee2390de2fc9fd96ba3efa8c8 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: d3c2ac1c2723c37b698b25b68d76fd315a1277fddde113983d5783d1f2a01dd7b8ed83ba3f54e5e65f0b59dd971ed7be2fdf8d4be94ec694b2d27832d2e7561f ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -23152,22 +17837,9 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD "ts-node@npm:^10.7.0": version: 10.9.1 resolution: "ts-node@npm:10.9.1" -<<<<<<< HEAD -======= -"ts-node@npm:^10.6.0": -======= -"ts-node@npm:^10.7.0": ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) - version: 10.7.0 - resolution: "ts-node@npm:10.7.0" ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= ->>>>>>> 217c233f (fix(slider): fixes due to new version) dependencies: "@cspotcode/source-map-support": ^0.8.0 "@tsconfig/node10": ^1.0.7 @@ -23180,15 +17852,7 @@ __metadata: create-require: ^1.1.0 diff: ^4.0.1 make-error: ^1.1.1 -<<<<<<< HEAD -<<<<<<< HEAD v8-compile-cache-lib: ^3.0.1 -======= - v8-compile-cache-lib: ^3.0.0 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - v8-compile-cache-lib: ^3.0.1 ->>>>>>> 217c233f (fix(slider): fixes due to new version) yn: 3.1.1 peerDependencies: "@swc/core": ">=1.2.50" @@ -23207,15 +17871,7 @@ __metadata: ts-node-script: dist/bin-script.js ts-node-transpile-only: dist/bin-transpile.js ts-script: dist/bin-script-deprecated.js -<<<<<<< HEAD -<<<<<<< HEAD - checksum: 090adff1302ab20bd3486e6b4799e90f97726ed39e02b39e566f8ab674fd5bd5f727f43615debbfc580d33c6d9d1c6b1b3ce7d8e3cca3e20530a145ffa232c35 -======= - checksum: 2a379e43f7478d0b79e1e63af91fe222d83857727957df4bd3bdf3c0a884de5097b12feb9bbf530074526b8874c0338b0e6328cf334f3a5e2c49c71e837273f7 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= checksum: 090adff1302ab20bd3486e6b4799e90f97726ed39e02b39e566f8ab674fd5bd5f727f43615debbfc580d33c6d9d1c6b1b3ce7d8e3cca3e20530a145ffa232c35 ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard @@ -23229,15 +17885,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD "tsconfig-paths@npm:^3.14.1": -======= -"tsconfig-paths@npm:^3.12.0": ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= -"tsconfig-paths@npm:^3.14.1": ->>>>>>> 8b5bed74 (fix(night-slider): fix distance between points) version: 3.14.1 resolution: "tsconfig-paths@npm:3.14.1" dependencies: @@ -23264,21 +17912,9 @@ __metadata: linkType: hard "tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.2.0, tslib@npm:^2.3.0": -<<<<<<< HEAD -<<<<<<< HEAD - version: 2.4.1 - resolution: "tslib@npm:2.4.1" - checksum: 19480d6e0313292bd6505d4efe096a6b31c70e21cf08b5febf4da62e95c265c8f571f7b36fcc3d1a17e068032f59c269fab3459d6cd3ed6949eafecf64315fca -======= - version: 2.4.0 - resolution: "tslib@npm:2.4.0" - checksum: 8c4aa6a3c5a754bf76aefc38026134180c053b7bd2f81338cb5e5ebf96fefa0f417bff221592bf801077f5bf990562f6264fecbc42cd3309b33872cb6fc3b113 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 2.5.0 resolution: "tslib@npm:2.5.0" checksum: ae3ed5f9ce29932d049908ebfdf21b3a003a85653a9a140d614da6b767a93ef94f460e52c3d787f0e4f383546981713f165037dc2274df212ea9f8a4541004e1 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -23384,23 +18020,10 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> 217c233f (fix(slider): fixes due to new version) "type@npm:^2.7.2": version: 2.7.2 resolution: "type@npm:2.7.2" checksum: 0f42379a8adb67fe529add238a3e3d16699d95b42d01adfe7b9a7c5da297f5c1ba93de39265ba30ffeb37dfd0afb3fb66ae09f58d6515da442219c086219f6f4 -<<<<<<< HEAD -======= -"type@npm:^2.5.0": - version: 2.6.0 - resolution: "type@npm:2.6.0" - checksum: 80da01fcc0f6ed5a253dc326530e134000a8f66ea44b6d9687cde2f894f0d0b2486595b0cd040a64f7f79dc3120784236f8c9ef667a8aef03984e049b447cfb4 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard @@ -23446,94 +18069,22 @@ __metadata: linkType: hard "typescript@npm:^4.1.2": -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 4.9.3 - resolution: "typescript@npm:4.9.3" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: 17b8f816050b412403e38d48eef0e893deb6be522d6dc7caf105e54a72e34daf6835c447735fd2b28b66784e72bfbf87f627abb4818a8e43d1fa8106396128dc -======= - version: 4.6.2 - resolution: "typescript@npm:4.6.2" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: 8a44ed7e6f6c4cb1ebe8cf236ecda2fb119d84dcf0fbd77e707b2dfea1bbcfc4e366493a143513ce7f57203c75da9d4e20af6fe46de89749366351046be7577c ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - version: 4.6.3 - resolution: "typescript@npm:4.6.3" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: 255bb26c8cb846ca689dd1c3a56587af4f69055907aa2c154796ea28ee0dea871535b1c78f85a6212c77f2657843a269c3a742d09d81495b97b914bf7920415b ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= - version: 4.8.2 - resolution: "typescript@npm:4.8.2" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: 7f5b81d0d558c9067f952c7af52ab7f19c2e70a916817929e4a5b256c93990bf3178eccb1ac8a850bc75df35f6781b6f4cb3370ce20d8b1ded92ed462348f628 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 4.9.5 resolution: "typescript@npm:4.9.5" bin: tsc: bin/tsc tsserver: bin/tsserver checksum: ee000bc26848147ad423b581bd250075662a354d84f0e06eb76d3b892328d8d4440b7487b5a83e851b12b255f55d71835b008a66cbf8f255a11e4400159237db ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard "typescript@patch:typescript@^4.1.2#~builtin": -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 4.9.3 - resolution: "typescript@patch:typescript@npm%3A4.9.3#~builtin::version=4.9.3&hash=493e53" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: ef65c22622d864497d0a0c5db693523329b3284c15fe632e93ad9aa059e8dc38ef3bd767d6f26b1e5ecf9446f49bd0f6c4e5714a2eeaf352805dc002479843d1 -======= - version: 4.6.2 - resolution: "typescript@patch:typescript@npm%3A4.6.2#~builtin::version=4.6.2&hash=493e53" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: efb83260a22ee49d4c8bdc59b3cefe54fdf51d6f563f5c3a35aa3d5e46fb12f3f1d33a36d6f9f64171e567ead1847e99cb612d0a9a74e7d44e16cad9d0bbc937 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - version: 4.6.3 - resolution: "typescript@patch:typescript@npm%3A4.6.3#~builtin::version=4.6.3&hash=493e53" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: fe6bdc1afb2f145ddb7b0a3a31f96352209f6a5704d97f038414ea22ff9d8dd42f32cfb6652e30458d7d958d2d4e85de2df11c574899c6f750a6b3c0e90a3a76 ->>>>>>> fe15f957 (refactor(slider): set theme on load) -======= - version: 4.8.2 - resolution: "typescript@patch:typescript@npm%3A4.8.2#~builtin::version=4.8.2&hash=493e53" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: 6f49363af8af2fe480da1d5fa68712644438785208b06690a3cbe5e7365fd652c3a0f1e587bc8684d78fb69de3dde4de185c0bad7bb4f3664ddfc813ce8caad6 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= version: 4.9.5 resolution: "typescript@patch:typescript@npm%3A4.9.5#~builtin::version=4.9.5&hash=493e53" bin: tsc: bin/tsc tsserver: bin/tsserver checksum: 2eee5c37cad4390385db5db5a8e81470e42e8f1401b0358d7390095d6f681b410f2c4a0c496c6ff9ebd775423c7785cdace7bcdad76c7bee283df3d9718c0f20 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -23742,21 +18293,9 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -"update-browserslist-db@npm:^1.0.9": - version: 1.0.10 - resolution: "update-browserslist-db@npm:1.0.10" -======= -"update-browserslist-db@npm:^1.0.5": - version: 1.0.7 - resolution: "update-browserslist-db@npm:1.0.7" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "update-browserslist-db@npm:^1.0.10": version: 1.0.10 resolution: "update-browserslist-db@npm:1.0.10" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: escalade: ^3.1.1 picocolors: ^1.0.0 @@ -23764,15 +18303,7 @@ __metadata: browserslist: ">= 4.21.0" bin: browserslist-lint: cli.js -<<<<<<< HEAD -<<<<<<< HEAD - checksum: 12db73b4f63029ac407b153732e7cd69a1ea8206c9100b482b7d12859cd3cd0bc59c602d7ae31e652706189f1acb90d42c53ab24a5ba563ed13aebdddc5561a0 -======= - checksum: 443ed6e77d4607b8bdf12710fe1c0b570fcbb992ebcafaa0c647811e5646fa51e0b5a17641637e10044e4b770bfc3a9ce2a9350a646477545aed882a1fcff8ce ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: 12db73b4f63029ac407b153732e7cd69a1ea8206c9100b482b7d12859cd3cd0bc59c602d7ae31e652706189f1acb90d42c53ab24a5ba563ed13aebdddc5561a0 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -23809,15 +18340,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD "url-parse@npm:^1.5.10, url-parse@npm:^1.5.3": -======= -"url-parse@npm:^1.4.3, url-parse@npm:^1.5.10": ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= -"url-parse@npm:^1.5.10, url-parse@npm:^1.5.3": ->>>>>>> 217c233f (fix(slider): fixes due to new version) version: 1.5.10 resolution: "url-parse@npm:1.5.10" dependencies: @@ -23923,23 +18446,10 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> 217c233f (fix(slider): fixes due to new version) "v8-compile-cache-lib@npm:^3.0.1": version: 3.0.1 resolution: "v8-compile-cache-lib@npm:3.0.1" checksum: 78089ad549e21bcdbfca10c08850022b22024cdcc2da9b168bcf5a73a6ed7bf01a9cebb9eac28e03cd23a684d81e0502797e88f3ccd27a32aeab1cfc44c39da0 -<<<<<<< HEAD -======= -"v8-compile-cache-lib@npm:^3.0.0": - version: 3.0.0 - resolution: "v8-compile-cache-lib@npm:3.0.0" - checksum: 674e312bbca796584b61dc915f33c7e7dc4e06d196e0048cb772c8964493a1ec723f1dd014d9419fd55c24a6eae148f60769da23f622e05cd13268063fa1ed6b ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard @@ -24105,18 +18615,8 @@ __metadata: linkType: hard "webpack-bundle-analyzer@npm:^4.4.2": -<<<<<<< HEAD -<<<<<<< HEAD version: 4.7.0 resolution: "webpack-bundle-analyzer@npm:4.7.0" -======= - version: 4.6.1 - resolution: "webpack-bundle-analyzer@npm:4.6.1" ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= - version: 4.7.0 - resolution: "webpack-bundle-analyzer@npm:4.7.0" ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) dependencies: acorn: ^8.0.4 acorn-walk: ^8.0.0 @@ -24129,15 +18629,7 @@ __metadata: ws: ^7.3.1 bin: webpack-bundle-analyzer: lib/bin/analyzer.js -<<<<<<< HEAD -<<<<<<< HEAD - checksum: 4ce3b379c61ce16b2219756843407cc99f2b82cd191f653043f1b705a3e32b3af03834af0dfded98ab852313a892a148bed1a8effaacd6440f028c19f41581f3 -======= - checksum: 4bc97ac6a1d9cd1f133444b0fc9d9091c97f4bd8388f97636ce27abd1ebffaa7dd45d29f6693661a666e77bcc08dff43ab7c2f5e2600a3101b956c94c1d038d0 ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= checksum: 4ce3b379c61ce16b2219756843407cc99f2b82cd191f653043f1b705a3e32b3af03834af0dfded98ab852313a892a148bed1a8effaacd6440f028c19f41581f3 ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard @@ -24702,18 +19194,8 @@ __metadata: linkType: hard "ws@npm:^7.3.1, ws@npm:^7.4.6": -<<<<<<< HEAD -<<<<<<< HEAD version: 7.5.9 resolution: "ws@npm:7.5.9" -======= - version: 7.5.7 - resolution: "ws@npm:7.5.7" ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - version: 7.5.9 - resolution: "ws@npm:7.5.9" ->>>>>>> 217c233f (fix(slider): fixes due to new version) peerDependencies: bufferutil: ^4.0.1 utf-8-validate: ^5.0.2 @@ -24722,15 +19204,7 @@ __metadata: optional: true utf-8-validate: optional: true -<<<<<<< HEAD -<<<<<<< HEAD checksum: c3c100a181b731f40b7f2fddf004aa023f79d64f489706a28bc23ff88e87f6a64b3c6651fbec3a84a53960b75159574d7a7385709847a62ddb7ad6af76f49138 -======= - checksum: 5c1f669a166fb57560b4e07f201375137fa31d9186afde78b1508926345ce546332f109081574ddc4e38cc474c5406b5fc71c18d71eb75f6e2d2245576976cba ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= - checksum: c3c100a181b731f40b7f2fddf004aa023f79d64f489706a28bc23ff88e87f6a64b3c6651fbec3a84a53960b75159574d7a7385709847a62ddb7ad6af76f49138 ->>>>>>> 217c233f (fix(slider): fixes due to new version) languageName: node linkType: hard @@ -24861,39 +19335,12 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"zrender@npm:5.4.0": - version: 5.4.0 - resolution: "zrender@npm:5.4.0" - dependencies: - tslib: 2.3.0 - checksum: 913cfd53064a9eaab0a6658bb48c8dddc8bd03f13858a2e6792a698af0c0b3d640e89de28eb4f1668f37d94ef125c24912d1bba904ae8a12ac17292fe0db52d5 -======= -"zrender@npm:5.3.1": - version: 5.3.1 - resolution: "zrender@npm:5.3.1" - dependencies: - tslib: 2.3.0 - checksum: 4dccd7cca6ff946f8e2e73d5563b9f7bfe419733e828d72e7fe8b40125ca0201ce9292d528f0df8c9d1896708ffa61f75276adde33c933c125ca1b7b1355bfc5 ->>>>>>> bd6e7577 (feat(app): update yarn lock and fix ref errors in inputs) -======= -"zrender@npm:5.3.2": - version: 5.3.2 - resolution: "zrender@npm:5.3.2" - dependencies: - tslib: 2.3.0 - checksum: 8f7f4c825cb0e21ff897cd9d4fad291dd0c45604546981ec78c1b6b65359875458c05b4d5eef9a1a52f1aa758b0dbfc923df3bd419a1b880a17963d15813a9ff ->>>>>>> 217c233f (fix(slider): fixes due to new version) -======= "zrender@npm:5.4.1": version: 5.4.1 resolution: "zrender@npm:5.4.1" dependencies: tslib: 2.3.0 checksum: 9a50cc2cc42ef44a436cfca5a29d6378b92790f50755b4d54f513a55dc7dab9698cecbc5640d731b380ad282aab1c33ae8cc1d14b61c0d51f0e951085a1bf17c ->>>>>>> a8e5f480 (refactor(app): remove typescript errors) languageName: node linkType: hard