diff --git a/.gitignore b/.gitignore index a581a9884..61f4dd135 100644 --- a/.gitignore +++ b/.gitignore @@ -7,10 +7,7 @@ config/*.yaml !config/deploy.*.yaml config/*.json config/tmp* -<<<<<<< HEAD *.tmp -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 !config/template*.json *.pyw dev_tools/debug_tools @@ -251,10 +248,6 @@ adb_port.ini *.exe !popup.exe *.zip -<<<<<<< HEAD -======= -console.bat ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 .vscode/* # Pylance configuration file diff --git a/README.md b/README.md index fad546617..2f1a43e5d 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,3 @@ -<<<<<<< HEAD -![1000033873](https://github.com/Zuosizhu/Alas-with-Dashboard/assets/60862861/432c0502-ecd4-4485-87d7-2c9615aa6407) -![1000033869](https://github.com/Zuosizhu/Alas-with-Dashboard/assets/60862861/415d94fb-3a9f-46f0-bc62-7c4df3a58388) -![1000033868](https://github.com/Zuosizhu/Alas-with-Dashboard/assets/60862861/f0d81e16-df27-4faa-9089-68b412ffa893) -![1000033872](https://github.com/Zuosizhu/Alas-with-Dashboard/assets/60862861/a54bb850-1013-4926-b4c2-55ca657c72d3) -![1000033871](https://github.com/Zuosizhu/Alas-with-Dashboard/assets/60862861/5f1ed358-e63d-43e6-ba17-bf4eaa824840) -![1000033870](https://github.com/Zuosizhu/Alas-with-Dashboard/assets/60862861/aa68c984-88dd-4840-98f7-e5daedd5f12b) -顺序反了，问题不大，跑路 -======= **| [English](README_en.md) | 简体中文 | [日本語](README_jp.md) |** # AzurLaneAutoScript @@ -188,4 +179,3 @@ Alas 仍在活跃开发中，我们会不定期发布未来的工作在 [Issues] - QQ 一群：[1087735381](https://jq.qq.com/?_wv=1027&k=I4NSqX7g) （有开发意向请加一群，入群需要提供你的Github用户名） - Bilibili 直播间：https://live.bilibili.com/22216705 ，偶尔直播写Alas，~~为了拯救Alas，Lme决定出道成为偶像~~ ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 diff --git a/alas.py b/alas.py index 56f6609dc..ead5522fb 100644 --- a/alas.py +++ b/alas.py @@ -13,10 +13,7 @@ from module.config.utils import deep_get, deep_set from module.exception import * from module.logger import logger from module.notify import handle_notify -<<<<<<< HEAD from module.gg_handler.gg_handler import GGHandler -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 class AzurLaneAutoScript: @@ -52,12 +49,9 @@ class AzurLaneAutoScript: except RequestHumanTakeover: logger.critical('Request human takeover') exit(1) -<<<<<<< HEAD except EmulatorNotRunningError: logger.critical('EmulatorNotRunningError') exit(1) -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 except Exception as e: logger.exception(e) exit(1) @@ -110,24 +104,16 @@ class AzurLaneAutoScript: title=f"Alas <{self.config_name}> crashed", content=f"<{self.config_name}> GamePageUnknownError", ) -<<<<<<< HEAD logger.info('Restart to reset Game page in 10 seconds') self.device.sleep(10) from module.handler.login import LoginHandler LoginHandler(self.config, self.device).app_restart() return False -======= - exit(1) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 else: self.checker.wait_until_available() return False except ScriptError as e: -<<<<<<< HEAD logger.critical(e) -======= - logger.exception(e) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 logger.critical('This is likely to be a mistake of developers, but sometimes just random issues') handle_notify( self.config.Error_OnePushConfig, @@ -143,13 +129,10 @@ class AzurLaneAutoScript: content=f"<{self.config_name}> RequestHumanTakeover", ) exit(1) -<<<<<<< HEAD except AutoSearchSetError: logger.critical('Auto search could not be set correctly. Maybe your ships in hard mode are changed.') logger.critical('Request human takeover.') exit(1) -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 except Exception as e: logger.exception(e) self.save_error_log() @@ -391,14 +374,11 @@ class AzurLaneAutoScript: CampaignRun(config=self.config, device=self.device).run( name=self.config.Campaign_Name, folder=self.config.Campaign_Event, mode=self.config.Campaign_Mode) -<<<<<<< HEAD def event3(self): from module.campaign.run import CampaignRun CampaignRun(config=self.config, device=self.device).run( name=self.config.Campaign_Name, folder=self.config.Campaign_Event, mode=self.config.Campaign_Mode) -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 def raid(self): from module.raid.run import RaidRun RaidRun(config=self.config, device=self.device).run() @@ -431,29 +411,6 @@ class AzurLaneAutoScript: GemsFarming(config=self.config, device=self.device).run( name=self.config.Campaign_Name, folder=self.config.Campaign_Event, mode=self.config.Campaign_Mode) -<<<<<<< HEAD -======= - def daemon(self): - from module.daemon.daemon import AzurLaneDaemon - AzurLaneDaemon(config=self.config, device=self.device, task="Daemon").run() - - def opsi_daemon(self): - from module.daemon.os_daemon import AzurLaneDaemon - AzurLaneDaemon(config=self.config, device=self.device, task="OpsiDaemon").run() - - def azur_lane_uncensored(self): - from module.daemon.uncensored import AzurLaneUncensored - AzurLaneUncensored(config=self.config, device=self.device, task="AzurLaneUncensored").run() - - def benchmark(self): - from module.daemon.benchmark import run_benchmark - run_benchmark(config=self.config) - - def game_manager(self): - from module.daemon.game_manager import GameManager - GameManager(config=self.config, device=self.device, task="GameManager").run() - ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 def wait_until(self, future): """ Wait until a specific time. @@ -506,12 +463,7 @@ class AzurLaneAutoScript: if not self.wait_until(task.next_run): del_cached_property(self, 'config') continue -<<<<<<< HEAD self.run('start') -======= - if task.command != 'Restart': - self.run('start') ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 elif method == 'goto_main': logger.info('Goto main page during wait') self.run('goto_main') @@ -539,7 +491,6 @@ class AzurLaneAutoScript: AzurLaneConfig.is_hoarding_task = False return task.command -<<<<<<< HEAD def gg_check(self): if deep_get(self.config.data, "GameManager.GGHandler.Enabled"): logger.info("GG is enabled, check gg package name") @@ -558,12 +509,6 @@ class AzurLaneAutoScript: self.checker.wait_until_available() GGHandler(config=self.config, device=self.device).handle_restart_before_tasks() check_fail = 0 -======= - def loop(self): - logger.set_file_logger(self.config_name) - logger.info(f'Start scheduler loop: {self.config_name}') - ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 while 1: # Check update event from GUI if self.stop_event is not None: @@ -585,7 +530,6 @@ class AzurLaneAutoScript: task = self.get_next_task() # Init device and change server _ = self.device -<<<<<<< HEAD # Skip first restart if task == 'Restart': @@ -594,16 +538,10 @@ class AzurLaneAutoScript: else: from module.handler.login import LoginHandler LoginHandler(self.config, self.device).app_restart() -======= - # Skip first restart - if self.is_first_task and task == 'Restart': - logger.info('Skip task `Restart` at scheduler start') ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 self.config.task_delay(server_update=True) del_cached_property(self, 'config') continue -<<<<<<< HEAD # Check GG config before a task begins (to reset temporary config), and decide to enable it. GGHandler(config=self.config, device=self.device).check_config() try: @@ -618,8 +556,6 @@ class AzurLaneAutoScript: logger.critical('Maybe your emulator died, trying to restart it') self.device.emulator_start() -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 # Run logger.info(f'Scheduler: Start task `{task}`') self.device.stuck_record_clear() @@ -640,10 +576,6 @@ class AzurLaneAutoScript: logger.critical("Possible reason #2: There is a problem with this task. " "Please contact developers or try to fix it yourself.") logger.critical('Request human takeover') -<<<<<<< HEAD - -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 handle_notify( self.config.Error_OnePushConfig, title=f"Alas <{self.config_name}> crashed", diff --git a/assets/gui/css/alas-mobile.css b/assets/gui/css/alas-mobile.css index 0b6fe3432..eb9412144 100644 --- a/assets/gui/css/alas-mobile.css +++ b/assets/gui/css/alas-mobile.css @@ -35,7 +35,6 @@ grid-template-columns: 1fr auto; grid-template-rows: 1fr auto; } -<<<<<<< HEAD #pywebio-scope-dashboard { font-weight: 400; width: 100%; @@ -44,8 +43,6 @@ grid-template-columns: repeat(auto-fit,minmax(6rem,1fr)); overflow: hidden; } -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 #pywebio-scope-_groups { grid-template-columns: 0fr 1fr; @@ -70,7 +67,6 @@ #pywebio-scope-waiting, #pywebio-scope-log { overflow-y: auto; -<<<<<<< HEAD } #output-container .status-point { @@ -93,6 +89,4 @@ } *[style*="--dashboard-help--"] { font-size: .6rem; -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } \ No newline at end of file diff --git a/assets/gui/css/alas-pc.css b/assets/gui/css/alas-pc.css index a207ec06b..e69de29bb 100644 --- a/assets/gui/css/alas-pc.css +++ b/assets/gui/css/alas-pc.css @@ -1,51 +0,0 @@ -[id^="pywebio-scope-arg_container-"] { - grid-auto-flow: column; - grid-template-columns: 1fr 13rem; -} - -[id^="pywebio-scope-arg_container-storage-"] { - grid-auto-flow: column; - grid-template-columns: 1fr auto; - grid-template-rows: 1fr auto; -} - -#pywebio-scope-overview { - grid-auto-flow: column; - grid-template-columns: minmax(16rem, 20rem) minmax(24rem, 1fr); -} - -#pywebio-scope-daemon-overview { - grid-auto-flow: column; - grid-template-columns: 1fr minmax(25rem, 6fr) 1fr; -} - -#pywebio-scope-schedulers { - grid-auto-flow: row; - grid-template-rows: auto 7.75rem minmax(7.75rem, 13rem) minmax(7.75rem, 1fr); - height: 100%; - overflow-y: auto; -} - -#pywebio-scope-log-bar, -#pywebio-scope-log, -#pywebio-scope-daemon-overview #pywebio-scope-groups { - overflow-y: auto; -} - -#pywebio-scope-_daemon { - display: grid; - grid-auto-flow: row; - grid-template-rows: auto minmax(6rem, auto) minmax(15rem, 1fr); - height: 100%; - overflow-y: auto; -} - -#pywebio-scope-_daemon_upper { - display: grid; - grid-auto-flow: column; - grid-template-columns: auto auto; -<<<<<<< HEAD -} -======= -} ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 diff --git a/assets/gui/css/alas.css b/assets/gui/css/alas.css index 8bb495285..e69de29bb 100644 --- a/assets/gui/css/alas.css +++ b/assets/gui/css/alas.css @@ -1,606 +0,0 @@ -details { - border: unset !important; - padding-bottom: unset !important; - margin-bottom: .25rem !important; -} - -details[open] > summary { - border-bottom: unset !important; -} - -details[open] > div { - margin-left: 0.625rem; -} - -summary { - background-color: transparent !important; - font-weight: 500; -} - -body { - margin-top: 0; - margin-bottom: 0; -} - -footer { - display: none; -} - -.btn:focus { - box-shadow: unset; -} - -.btn-menu { - font-weight: 400; - background-color: transparent; - padding: .0625rem .75rem; - border-radius: 0; - border: 0 solid; - transition: border .05s ease-in-out, padding .05s ease-in-out; - white-space: pre-wrap; - text-align: left; -} - -.btn-menu:hover, -.btn-menu-active { - font-weight: bold; - border-left: .125rem solid; - padding-right: .625rem; - border-left: 3px solid; -} - -.btn-aside { - width: 4rem; - font-weight: 400; - font-size: .8rem; - background-color: transparent; - padding: 32px 0 0 7px; - border-radius: 0; - border: 0 solid; - transition: border .1s ease-in-out, padding .1s ease-in-out -} - -.btn-aside:hover, -.btn-aside-active { - border-left: 4px solid; - padding-left: 3px; - font-weight: bold; -} - -.btn-off, -.btn-on { - border-radius: 0; - margin: 0; -} - -.btn-navigator { - border-radius: 0; - margin: 0 !important; - width: 100%; - text-align: left; - transition: color 0s ease-in-out; -} - -.btn-navigator:hover { - font-weight: bold; -} - -.toastify-center, -.toastify-right, -.toastify-left { - margin-top: 3.3125rem; -} - -.pywebio { - padding-top: 0; - padding-bottom: 0; - min-height: unset; -} - -#input-container { - margin-bottom: 0; -} - -#output-container { - padding-left: 0; - padding-right: 0; - margin-bottom: 0; - max-width: initial -} - -.container { - max-width: 100vh; -} - -.hr-group { - margin-top: .25rem !important; - margin-bottom: .25rem !important; -} - -<<<<<<< HEAD -.status-point { - margin: 37% 50% 63% 50%; - width: .75rem; - height: .75rem; - border-radius: 50%; -} - -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 -.hr-task-group-box { - display: flex; - align-items: center; - margin-bottom: 0.5rem; -} - -.hr-task-group-line { - border-top: 0.125rem solid; - flex-grow: 1; -} - -.hr-task-group-text { - margin: 0 0.5rem; - font-size: 0.875rem; -} - -input[type="checkbox"] { - width: 1.25rem; - height: 1.25rem; -} - -label { - display: inline; -} - -.form-control { - background-color: unset; - border-radius: initial !important; - border-width: 0; - padding: 0 .5rem 0; - margin-top: .125rem; - height: auto !important; -} - -.form-control[readonly] { - pointer-events: none; - border-bottom-color: transparent; -} - -.form-control:focus { - border-color: unset; -} - -.form-control.is-invalid:focus { - box-shadow: 0 0.06rem 0 #dc3545; -} - -select { - appearance: none; - -webkit-appearance: none; - -moz-appearance: none; - background-attachment: scroll; - background-position: right, center; - background-repeat: no-repeat; - background-size: 1rem; -} - -select.form-control { - padding-right: 1rem; -} - -select.form-control.is-invalid { - padding-right: 3rem !important; - background-position: right 1.5rem center; -} - -button.btn.dropdown-toggle { - display: none; -} - -.bootstrap-select > select { - position: unset !important; - bottom: unset !important; - left: unset !important; - width: 100% !important; - height: unset !important; - padding: 0 1rem 0 0.5rem !important; - opacity: 1 !important; - z-index: auto !important; -} - -.invalid-feedback { - margin-top: 0; -} - -.CodeMirror { - height: auto !important; -} - -.CodeMirror-line { - font-family: SFMono-Regular, SF Mono, Menlo, Consolas, Liberation Mono, monospace !important; -} - -.form-group { - margin-bottom: 0 !important; -} - -.alas-icon, -.alas-icon > image { - width: 42px; - height: 42px; -} - -.aside-icon { - width: 2rem; - height: 2rem; -} - -.container-log { - border-radius: 0 !important; - margin: .375rem !important; - padding: 1rem !important; -} - -code.rich-traceback { - padding: 0; -} - -pre.rich-traceback-code { - padding-top: 0; - padding-bottom: 0; - font-family: Menlo, consolas, DejaVu Sans Mono, Courier New, monospace; - font-size: 0.85rem; - line-height: 1.2; -} - -#pywebio-scope-ROOT { - height: 100vh; - display: grid; - grid-auto-flow: row; - grid-template-rows: auto 1fr; -} - -#pywebio-scope-aside { - z-index: 91; - padding-left: .125rem; - padding-right: .325rem; - padding-top: 1rem; - overflow-y: auto; - flex-shrink: 0; -} - -#pywebio-scope-menu { - z-index: 90; - padding-left: .5rem; - padding-right: .5rem; - padding-top: 1.2rem; - overflow-y: auto; - width: 12rem; - flex-shrink: 0; -} - -#pywebio-scope-content { - overflow: auto; - padding: .625rem; - flex-grow: 1; -} - -#pywebio-scope-header { - z-index: 100; - display: grid; - grid-auto-flow: column; - grid-template-columns: 4.4rem 4rem auto 1fr !important; -} - -*[style*="--header-icon--"] { - margin: .25rem auto .25rem; - border-radius: 1.5rem; -} - -*[style*="--header-text--"] { -<<<<<<< HEAD - font-size: 1rem; -======= - font-size: 1.5rem; ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 - font-weight: bold; - margin: auto !important; -} - -#pywebio-scope-header_title { - margin: auto; -} - -#pywebio-scope-header_title > p { - font-size: 1.2rem; - margin: auto; - overflow: hidden; - text-align: center; -} - -#pywebio-scope-header_status { - padding-top: 3px; - margin-top: auto; - margin-bottom: auto; -} - -#pywebio-scope-header_status > div > div + div + p { - margin: 0; -} - -#pywebio-scope-contents { - margin-top: 0; - overflow-y: auto; - display: flex; -} - -#pywebio-scope-_groups { - height: 100%; - display: grid; - grid-auto-flow: column; - - grid-template-columns: 1fr minmax(25rem, 5fr) 2fr; -} - -#pywebio-scope-group__info > p { - font-size: .80rem !important; - font-weight: 400; -} - -[id^="pywebio-scope-group_"] { - margin-top: .5rem; - margin-bottom: .5rem; - padding: 1rem; -} - -[id^="pywebio-scope-group_"] > p { - font-size: 1.25rem; - font-weight: 500; - margin: 0 .25rem 0 .25rem !important; -} - -[id^="pywebio-scope-group_"] > p + p { - font-size: .80rem; - margin: .2rem .25rem .1rem .25rem !important; -} - -#pywebio-scope-groups { - overflow-y: auto; -} - -#pywebio-scope-groups:not(:has(*)) { - display: none; -} - -#pywebio-scope-navigator { - margin: .5rem 1rem .5rem; - height: min-content; - max-width: 15rem; -} - -#pywebio-scope-overview { - height: 100%; - overflow: auto; - display: grid; -} - -#pywebio-scope-running, -#pywebio-scope-pending, -#pywebio-scope-waiting, -#pywebio-scope-scheduler-bar, -#pywebio-scope-log-bar, -#pywebio-scope-log, -#pywebio-scope-daemon-overview #pywebio-scope-groups { - font-weight: 500; - margin: 0.3125rem; - padding: 0.625rem; -} - -#pywebio-scope-scheduler-bar, -#pywebio-scope-log-bar { - display: flex; - align-items: center; - justify-content: space-between; -} - -<<<<<<< HEAD -#pywebio-scope-log-bar { - flex-wrap: wrap; -} - -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 -#pywebio-scope-log-bar-btns { - display: grid; - grid-auto-flow: column; -} - -<<<<<<< HEAD -#pywebio-scope-log-bar .hr-group { - width: 100%; -} - -#pywebio-scope-dashboard { - font-weight: 400; - width: 100%; - display: grid; - grid-auto-flow: row; - grid-template-columns: repeat(auto-fit,minmax(10rem,1fr)); -} - -#pywebio-scope-dashboard .form-control{ - padding: 0 0 0; - } - -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 -#pywebio-scope-log { - line-height: 1.2; - font-size: 0.85rem; - font-family: Menlo, consolas, DejaVu Sans Mono, Courier New, monospace; - white-space: pre; -} - -#pywebio-scope-running, -#pywebio-scope-pending, -#pywebio-scope-waiting { - display: grid; - grid-auto-flow: row; - grid-template-rows: auto auto 1fr; -} - -#pywebio-scope-running > p, -#pywebio-scope-pending > p, -#pywebio-scope-waiting > p { - font-size: 1.25rem; - font-weight: 500; - margin: 0 0.625rem 0 !important; -} - -#pywebio-scope-running_tasks, -#pywebio-scope-pending_tasks, -#pywebio-scope-waiting_tasks { - overflow-y: auto; - height: 100%; -} - -#pywebio-scope-logs { - display: grid; - grid-auto-flow: column; - - height: 100%; - overflow-y: auto; - grid-template-rows: auto 1fr; - -} - -[id^="pywebio-scope-overview-task_"] { - display: grid; - grid-auto-flow: column; - grid-template-columns: 1fr auto; - margin: .125rem .625rem .125rem .375rem; -} - -#pywebio-scope-daemon-overview { - display: grid; - height: 100%; - overflow-y: auto; -} - -#pywebio-scope-daemon-overview [id^="pywebio-scope-group_"] { - margin-top: 0; - margin-bottom: 0; - padding: 0.3125rem; -} - -#pywebio-scope-schedulers { - display: grid; -} - -.bs-title-option, -.form-check-input[id*="ch_S"] { - display: none; -} - -[id^="pywebio-scope-arg_container-"] { - display: grid; - margin: .125rem 0; -} - -[id^="pywebio-scope-arg_container-checkbox-"], -[id^="pywebio-scope-arg_container-storage-"] { - display: grid; - margin: .375rem 0; -} - -*[style*="--arg-title--"] { - font-size: 1rem; - font-weight: 500; - margin: 0 .25rem !important; - overflow-wrap: break-word; -} - -*[style*="--arg-help--"] { - font-size: .8rem; - margin: .2rem .25rem .1rem !important; - overflow-wrap: break-word; -} - -*[style*="--overview-notask-text--"] { - text-align: center; - font-size: 0.875rem; - color: darkgrey; -} - -*[style*="--input--"] { - margin: 0; - padding-right: .25rem; -} - -*[style*="--loading-grow--"] { - width: 1.5rem; - height: 1.5rem; -} - -*[style*="--loading-border--"] { - width: 1.5rem; - height: 1.5rem; - border: .2em solid currentColor; - border-right-color: transparent; -} - -*[style*="--loading-border-fill--"] { - width: 1.5rem; - height: 1.5rem; - border: .2em solid currentColor; -<<<<<<< HEAD -} - -/**[style*="--dashboard-value--"] {*/ -/* font-size: 1.3rem;*/ -/* font-weight: 400;*/ -/* margin: 0 0 -0.2rem 0.6rem !important;*/ -/* overflow-wrap: break-word;*/ -/* overflow: visible;*/ -/* border-bottom: 0;*/ -/*}*/ - -*[style*="--dashboard-value--"] { - font-size: 1.2rem; - font-weight: 400; - margin: 0 0 0 0.6rem !important; - font-family: - "Arial", - serif; -} - -*[style*="--dashboard-total--"] { - font-size: 1.2rem; - font-weight: 400; - margin: 0 0 0 0.15rem !important; - font-family: - "Arial", - serif; -} - -*[style*="--dashboard-help--"] { - font-size: .8rem; - margin: 0 0 0 0.6rem !important; - font-family: - "Arial", - serif; -} - -*[style*="--dashboard-limit--"] { - font-weight: 400; - font-size: .9rem; - margin: 0 0 0 0 !important; - vertical-align: text-bottom; - overflow-wrap: normal; - font-family: - "Arial", - serif; -} -======= -} ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 diff --git a/assets/gui/css/dark-alas.css b/assets/gui/css/dark-alas.css index db1d745d6..7d097c06a 100644 --- a/assets/gui/css/dark-alas.css +++ b/assets/gui/css/dark-alas.css @@ -149,7 +149,6 @@ pre.rich-traceback-code { border-bottom: 1px solid #36393f; } -<<<<<<< HEAD #pywebio-scope-dashboard input { background-color: #2f3136 !important; } @@ -166,9 +165,3 @@ pre.rich-traceback-code { *[style*="--dashboard-limit--"]{ color: #adb5bd; } -======= -*[style*="--arg-help--"], -[id^="pywebio-scope-group_"] > p + p { - color: #adb5bd; -} ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 diff --git a/assets/gui/css/light-alas.css b/assets/gui/css/light-alas.css index 4c6a64d7a..0f80aedd4 100644 --- a/assets/gui/css/light-alas.css +++ b/assets/gui/css/light-alas.css @@ -56,13 +56,10 @@ box-shadow: 0 0.06rem 0 #4e4c97; } -<<<<<<< HEAD #pywebio-scope-dashboard input { background-color: white !important; } -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 input[type="checkbox"] { accent-color: #7a77bb; } @@ -158,7 +155,6 @@ pre.rich-traceback-code { *[style*="--arg-help--"], [id^="pywebio-scope-group_"] > p + p { color: #777777; -<<<<<<< HEAD } *[style*="--dashboard-help--"]{ @@ -167,6 +163,4 @@ pre.rich-traceback-code { *[style*="--dashboard-limit--"]{ color: #777777; -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } \ No newline at end of file diff --git a/campaign/campaign_main/campaign_12_1.py b/campaign/campaign_main/campaign_12_1.py index fce9dc082..e2f081838 100644 --- a/campaign/campaign_main/campaign_12_1.py +++ b/campaign/campaign_main/campaign_12_1.py @@ -59,10 +59,6 @@ class Config: 'distance': 50, 'wlen': 1000 } -<<<<<<< HEAD -======= - HOMO_CANNY_THRESHOLD = (75, 100) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 HOMO_EDGE_COLOR_RANGE = (0, 49) HOMO_EDGE_HOUGHLINES_THRESHOLD = 210 MAP_SWIPE_MULTIPLY = (0.977, 0.995) diff --git a/campaign/campaign_main/campaign_13_1.py b/campaign/campaign_main/campaign_13_1.py index e9bc9e382..4d4a018f0 100644 --- a/campaign/campaign_main/campaign_13_1.py +++ b/campaign/campaign_main/campaign_13_1.py @@ -54,10 +54,6 @@ class Config: 'distance': 50, 'wlen': 1000 } -<<<<<<< HEAD -======= - HOMO_CANNY_THRESHOLD = (75, 100) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 HOMO_EDGE_COLOR_RANGE = (0, 49) MAP_SWIPE_MULTIPLY = (0.994, 1.013) MAP_SWIPE_MULTIPLY_MINITOUCH = (0.961, 0.979) diff --git a/campaign/campaign_main/campaign_15_2.py b/campaign/campaign_main/campaign_15_2.py index cdbcc32e6..038ebf1a3 100644 --- a/campaign/campaign_main/campaign_15_2.py +++ b/campaign/campaign_main/campaign_15_2.py @@ -80,11 +80,7 @@ class Campaign(CampaignBase): def battle_0(self): if not self.map_is_clear_mode and self.map_has_mob_move: self.mob_move(I6, I7) -<<<<<<< HEAD self.mob_move(I7, H7) -======= - self.mob_move(I7, I8) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 if G7.is_accessible: self.clear_chosen_enemy(G7) return True diff --git a/campaign/campaign_main/campaign_15_base.py b/campaign/campaign_main/campaign_15_base.py index 1ddf184da..e69de29bb 100644 --- a/campaign/campaign_main/campaign_15_base.py +++ b/campaign/campaign_main/campaign_15_base.py @@ -1,234 +0,0 @@ -from module.base.mask import Mask -from module.base.timer import Timer -from module.campaign.campaign_base import CampaignBase as CampaignBase_ -from module.handler.assets import STRATEGY_OPENED -from module.logger import logger -from module.map.map_grids import SelectedGrids -from module.map.utils import location_ensure -from module.map_detection.grid import GridInfo -from module.map_detection.utils_assets import ASSETS - -MASK_MAP_UI_W15 = Mask(file='./assets/mask/MASK_MAP_UI_W15.png') - - -class Config: - # Ambushes can be avoid by having more DDs. - MAP_WALK_OPTIMIZE = False - MAP_HAS_MYSTERY = False - MAP_ENEMY_TEMPLATE = ['Light', 'Main', 'Carrier', 'CarrierSpecial'] - INTERNAL_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (80, 255 - 33), - 'width': (0.9, 10), - 'prominence': 10, - 'distance': 35, - } -<<<<<<< HEAD -======= - HOMO_CANNY_THRESHOLD = (50, 100) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 - MAP_SWIPE_MULTIPLY = (0.993, 1.011) - MAP_SWIPE_MULTIPLY_MINITOUCH = (0.960, 0.978) - MAP_SWIPE_MULTIPLY_MAATOUCH = (0.932, 0.949) - - -class W15GridInfo(GridInfo): - def merge(self, info, mode='normal'): - # Consider boss as siren - if info.is_boss: - if not self.is_land and self.may_siren: - self.is_siren = True - self.enemy_scale = 0 - self.enemy_genre = '' - return True - - return super().merge(info, mode=mode) - - -class CampaignBase(CampaignBase_): - ENEMY_FILTER = '1T > 1L > 1E > 1M > 2T > 2L > 2E > 2M > 3T > 3L > 3E > 3M' - - def map_data_init(self, map_): - super().map_data_init(map_) - # Patch ui_mask, get rid of supporting fleet - _ = ASSETS.ui_mask - ASSETS.ui_mask = MASK_MAP_UI_W15.image - - map_has_mob_move = True - - def strategy_set_execute(self, formation_index=None, sub_view=None, sub_hunt=None): - super().strategy_set_execute( - formation_index=formation_index, - sub_view=sub_view, - sub_hunt=sub_hunt, - ) -<<<<<<< HEAD - self.map_has_mob_move = (self.strategy_get_mob_move_remain() > 0) - logger.attr("Map has mob move", self.map_has_mob_move) -======= - logger.attr("Map has mob move", self.strategy_has_mob_move()) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 - - def _map_swipe(self, vector, box=(239, 159, 1175, 628)): - # Left border to 239, avoid swiping on support fleet - return super()._map_swipe(vector, box=box) - - def mob_movable(self, location, target): - """ - Check if mob is movable from location to target. - This requires that: - 1. both location and target are grids in the map (not exceeding the boundaries) - 2. Manhattan distance between location and target is 1. - 3. location is a mob fleet - 4. target is a sea grid - - Args: - location (tuple): Location of mob. - target (tuple): Destination. - - Returns: - bool: if movable. - """ - location = location_ensure(location) - target = location_ensure(target) - movable = True - - try: - logger.info(f'location: {self.map[location]}, target: {self.map[target]}') - except KeyError as e: - logger.exception(f'Given coordinates are outside the map.') - raise e - - if abs(location[0] - target[0]) + abs(location[1] - target[1]) != 1: - logger.error(f'{self.map[target]} is not adjacent from {self.map[location]}.') - movable = False - - if not self.map[location].is_enemy: - logger.error(f'{self.map[location]} is not a mob fleet.') - movable = False - - if not self.map[target].is_sea: - logger.error(f'{self.map[target]} is not a sea grid.') - movable = False - - if not movable: - logger.error(f'Cannot move from {self.map[location]} to {self.map[target]}.') - - return movable - - def _mob_move(self, location, target): - """ - Move mob from location to target, and confirm if successfully moved. - - Args: - location (tuple, str, GridInfo): Location of mob. - target (tuple, str, GridInfo): Destination. - - Returns: - bool: If mob moved. - - Pages: - in: MOB_MOVE_CANCEL - out: STRATEGY_OPENED - """ - location = location_ensure(location) - target = location_ensure(target) - - view_target = SelectedGrids([self.map[location], self.map[target]]) \ - .sort_by_camera_distance(self.camera)[1] - self.in_sight(view_target) - origin_grid = self.convert_global_to_local(location) - origin_grid.__str__ = location - target_grid = self.convert_global_to_local(target) - target_grid.__str__ = target - - logger.info('Select mob to move') - skip_first_screenshot = True - interval = Timer(2, count=4) - while 1: - if skip_first_screenshot: - skip_first_screenshot = False - else: - self.device.screenshot() - - # End - if self.is_in_strategy_mob_move(): - self.view.update(image=self.device.image) - if origin_grid.predict_mob_move_icon(): - break - # Click - if interval.reached() and self.is_in_strategy_mob_move(): - self.device.click(origin_grid) - interval.reset() - continue - - logger.info('Select target grid') - skip_first_screenshot = True - interval = Timer(2, count=4) - while 1: - if skip_first_screenshot: - skip_first_screenshot = False - else: - self.device.screenshot() - - # End - if self.appear(STRATEGY_OPENED, offset=(120, 120)): - break - # Click - if interval.reached() and self.is_in_strategy_mob_move(): - self.device.click(target_grid) - interval.reset() - continue - if self.handle_popup_confirm('MOB_MOVE'): - continue - - def _mob_move_info_change(self, location, target): - location = location_ensure(location) - target = location_ensure(target) - self.map[target].enemy_scale = self.map[location].enemy_scale - self.map[location].enemy_scale = 0 - self.map[target].enemy_genre = self.map[location].enemy_genre - self.map[location].enemy_genre = None - self.map[target].is_boss = self.map[location].is_boss - self.map[location].is_boss = False - self.map[target].is_enemy = True -<<<<<<< HEAD -======= - self.map[target].may_enemy = True ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 - self.map[location].is_enemy = False - - def mob_move(self, location, target): - """ - Open strategy, move mob fleet from location to target, close strategy. - - Args: - location (tuple, str, GridInfo): Location of mob. - target (tuple, str, GridInfo): Destination. - - Returns: - bool: If mob moved - - Pages: - in: IN_MAP - out: IN_MAP - """ - if not self.mob_movable(location, target): - return False - - self.strategy_open() -<<<<<<< HEAD - remain = self.strategy_get_mob_move_remain() - if remain == 0: -======= - if not self.strategy_has_mob_move(): ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 - logger.warning(f'No remain mob move trials, will abandon moving') - self.strategy_close() - return False - self.strategy_mob_move_enter() - self._mob_move(location, target) - self.strategy_close(skip_first_screenshot=False) - - self._mob_move_info_change(location, target) - self.find_path_initial() - self.map.show() diff --git a/campaign/campaign_main/campaign_1_1.py b/campaign/campaign_main/campaign_1_1.py index 52ce36b79..e69de29bb 100644 --- a/campaign/campaign_main/campaign_1_1.py +++ b/campaign/campaign_main/campaign_1_1.py @@ -1,56 +0,0 @@ -from module.campaign.campaign_base import CampaignBase -from module.logger import logger -from module.map.map_base import CampaignMap -from module.map.map_grids import RoadGrids, SelectedGrids - -MAP = CampaignMap() -MAP.shape = 'G1' -MAP.camera_data = ['D1'] -MAP.camera_data_spawn_point = ['D1'] -MAP.map_data = """ - SP -- -- -- -- ME MB -""" -MAP.spawn_data = [ - {'battle': 0, 'enemy': 1}, - {'battle': 1, 'boss': 1}, -] -A1, B1, C1, D1, E1, F1, G1, \ - = MAP.flatten() - - -class Config: - FLEET_2 = 0 - SUBMARINE = 0 - INTERNAL_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (120, 255 - 49), - 'width': (1.5, 10), - 'prominence': 10, - 'distance': 35, - } - EDGE_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (255 - 49, 255), - 'prominence': 10, - 'distance': 50, - 'wlen': 1000 - } -<<<<<<< HEAD -======= - HOMO_CANNY_THRESHOLD = (75, 100) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 - HOMO_EDGE_COLOR_RANGE = (0, 49) - INTERNAL_LINES_HOUGHLINES_THRESHOLD = 40 - EDGE_LINES_HOUGHLINES_THRESHOLD = 40 - HOMO_EDGE_HOUGHLINES_THRESHOLD = 80 - - -class Campaign(CampaignBase): - MAP = MAP - - def battle_0(self): - return self.battle_default() - - def battle_1(self): - return self.clear_boss() - - def handle_boss_appear_refocus(self, preset=(-3, 0)): - return super().handle_boss_appear_refocus(preset) diff --git a/campaign/campaign_main/campaign_2_1.py b/campaign/campaign_main/campaign_2_1.py index 194d32234..e69de29bb 100644 --- a/campaign/campaign_main/campaign_2_1.py +++ b/campaign/campaign_main/campaign_2_1.py @@ -1,77 +0,0 @@ -from module.campaign.campaign_base import CampaignBase -from module.logger import logger -from module.map.map_base import CampaignMap -from module.map.map_grids import RoadGrids, SelectedGrids - -MAP = CampaignMap() -MAP.shape = 'F4' -MAP.camera_data = ['C2'] -MAP.camera_data_spawn_point = ['C1'] -MAP.map_data = """ - -- SP ME -- ME -- - SP -- ++ ++ ME MM - ++ -- ME -- ME ME - ++ ++ ++ MB -- ++ -""" -MAP.weight_data = """ - 40 40 40 40 40 40 - 30 30 30 30 30 30 - 20 20 20 20 20 30 - 10 10 10 10 10 10 -""" -MAP.spawn_data = [ - {'battle': 0, 'enemy': 2, 'mystery': 1}, - {'battle': 1, 'enemy': 2}, - {'battle': 2, 'enemy': 2, 'boss': 1}, -] -A1, B1, C1, D1, E1, F1, \ -A2, B2, C2, D2, E2, F2, \ -A3, B3, C3, D3, E3, F3, \ -A4, B4, C4, D4, E4, F4, \ - = MAP.flatten() - - -class Config: - FLEET_BOSS = 1 - - INTERNAL_LINES_HOUGHLINES_THRESHOLD = 40 - EDGE_LINES_HOUGHLINES_THRESHOLD = 40 - COINCIDENT_POINT_ENCOURAGE_DISTANCE = 1.5 - - INTERNAL_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (120, 255 - 49), - 'width': (1.5, 10), - 'prominence': 10, - 'distance': 35, - } - EDGE_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (255 - 49, 255), - 'prominence': 10, - 'distance': 50, - 'wlen': 1000 - } -<<<<<<< HEAD -======= - HOMO_CANNY_THRESHOLD = (75, 100) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 - HOMO_EDGE_COLOR_RANGE = (0, 49) - - -class Campaign(CampaignBase): - MAP = MAP - - def battle_0(self): - self.clear_all_mystery() - - return self.battle_default() - - def battle_2(self): - self.clear_all_mystery() - - if not self.check_accessibility(D4, fleet='boss'): - return self.battle_default() - - return self.fleet_boss.clear_boss() - - def handle_boss_appear_refocus(self, preset=(0, -2)): - return super().handle_boss_appear_refocus(preset) diff --git a/campaign/campaign_main/campaign_3_1.py b/campaign/campaign_main/campaign_3_1.py index 0471d2f1f..e69de29bb 100644 --- a/campaign/campaign_main/campaign_3_1.py +++ b/campaign/campaign_main/campaign_3_1.py @@ -1,79 +0,0 @@ -from module.campaign.campaign_base import CampaignBase -from module.logger import logger -from module.map.map_base import CampaignMap -from module.map.map_grids import RoadGrids, SelectedGrids - -MAP = CampaignMap() -MAP.shape = 'G4' -MAP.camera_data = ['D2'] -MAP.camera_data_spawn_point = ['D1', 'D2'] -MAP.map_data = """ - SP -- ME -- ME MB -- - -- ME -- ME -- ME MB - ++ ++ ME -- ME -- -- - ++ ++ SP ME MM ++ ++ -""" -MAP.weight_data = """ - 30 30 30 20 10 10 10 - 30 30 30 20 10 09 10 - 40 40 40 20 10 10 10 - 40 40 40 20 20 10 10 -""" -MAP.spawn_data = [ - {'battle': 0, 'enemy': 2, 'mystery': 1}, - {'battle': 1, 'enemy': 1}, - {'battle': 2, 'enemy': 1}, - {'battle': 3, 'enemy': 2, 'boss': 1}, -] -A1, B1, C1, D1, E1, F1, G1, \ -A2, B2, C2, D2, E2, F2, G2, \ -A3, B3, C3, D3, E3, F3, G3, \ -A4, B4, C4, D4, E4, F4, G4, \ - = MAP.flatten() - - -class Config: - FLEET_BOSS = 1 - MAP_MYSTERY_HAS_CARRIER = True - - INTERNAL_LINES_HOUGHLINES_THRESHOLD = 40 - EDGE_LINES_HOUGHLINES_THRESHOLD = 75 - INTERNAL_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (120, 255 - 49), - 'width': (1.5, 10), - 'prominence': 10, - 'distance': 35, - } - EDGE_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (255 - 49, 255), - 'prominence': 10, - 'distance': 50, - 'wlen': 1000 - } -<<<<<<< HEAD -======= - HOMO_CANNY_THRESHOLD = (75, 100) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 - HOMO_EDGE_COLOR_RANGE = (0, 49) - - -class Campaign(CampaignBase): - MAP = MAP - - def battle_0(self): - self.fleet_2_push_forward() - - if self.fleet_2_rescue(G2): - return True - - self.clear_all_mystery() - - return self.battle_default() - - def battle_3(self): - self.clear_all_mystery() - - if not self.check_accessibility(G2, fleet='boss'): - return self.fleet_boss.battle_default() - - return self.fleet_boss.clear_boss() diff --git a/campaign/campaign_main/campaign_5_1.py b/campaign/campaign_main/campaign_5_1.py index 40494668a..e69de29bb 100644 --- a/campaign/campaign_main/campaign_5_1.py +++ b/campaign/campaign_main/campaign_5_1.py @@ -1,81 +0,0 @@ -from module.campaign.campaign_base import CampaignBase -from module.logger import logger -from module.map.map_base import CampaignMap -from module.map.map_grids import RoadGrids, SelectedGrids - -MAP = CampaignMap() -MAP.shape = 'H6' -MAP.camera_data = ['D2', 'D4'] -MAP.camera_data_spawn_point = ['D2', 'D4'] -MAP.map_data = """ - MB MM ME ++ ++ ++ ++ ++ - SP -- -- -- ME -- -- MB - -- -- ME ME -- -- SP ME - -- ME -- ME -- ME ME MB - SP -- ME -- -- -- ++ ++ - MB ME -- ME -- MA ++ ++ -""" -MAP.weight_data = """ - 10 10 50 50 50 50 50 50 - 10 10 10 10 10 10 10 10 - 10 20 20 20 10 10 10 10 - 10 20 20 20 10 50 10 10 - 10 10 10 10 10 50 50 50 - 10 20 20 20 20 50 50 50 -""" -MAP.spawn_data = [ - {'battle': 0, 'enemy': 3, 'mystery': 1}, - {'battle': 1, 'enemy': 1}, - {'battle': 2, 'enemy': 1}, - {'battle': 3, 'enemy': 1}, - {'battle': 4, 'enemy': 1, 'boss': 1}, -] -A1, B1, C1, D1, E1, F1, G1, H1, \ -A2, B2, C2, D2, E2, F2, G2, H2, \ -A3, B3, C3, D3, E3, F3, G3, H3, \ -A4, B4, C4, D4, E4, F4, G4, H4, \ -A5, B5, C5, D5, E5, F5, G5, H5, \ -A6, B6, C6, D6, E6, F6, G6, H6, \ - = MAP.flatten() - - -class Config: - FLEET_BOSS = 1 - MAP_MYSTERY_HAS_CARRIER = True - - INTERNAL_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (120, 255 - 49), - 'width': (1.5, 10), - 'prominence': 10, - 'distance': 35, - } - EDGE_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (255 - 49, 255), - 'prominence': 10, - 'distance': 50, - 'wlen': 1000 - } -<<<<<<< HEAD -======= - HOMO_CANNY_THRESHOLD = (75, 100) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 - HOMO_EDGE_COLOR_RANGE = (0, 49) - - -class Campaign(CampaignBase): - MAP = MAP - - def battle_0(self): - self.clear_all_mystery() - - return self.battle_default() - - def battle_4(self): - self.clear_all_mystery() - - boss = self.map.select(is_boss=True) - if boss: - if not self.check_accessibility(boss[0], fleet='boss'): - return self.battle_default() - - return self.fleet_boss.clear_boss() diff --git a/config/deploy.template-AidLux-cn.yaml b/config/deploy.template-AidLux-cn.yaml index 52a80f4cc..e69de29bb 100644 --- a/config/deploy.template-AidLux-cn.yaml +++ b/config/deploy.template-AidLux-cn.yaml @@ -1,168 +0,0 @@ -Deploy: - Git: - # URL of AzurLaneAutoScript repository - # [CN user] Use 'git://git.lyoko.io/AzurLaneAutoScript' for faster and more stable download - # [Other] Use 'https://github.com/LmeSzinc/AzurLaneAutoScript' - Repository: git://git.lyoko.io/AzurLaneAutoScript - # Branch of Alas - # [Developer] Use 'dev', 'app', etc, to try new features - # [Other] Use 'master', the stable branch - Branch: master - # Filepath of git executable `git.exe` - # [Easy installer] Use './toolkit/Git/mingw64/bin/git.exe' - # [Other] Use you own git - GitExecutable: /usr/bin/git - # Set git proxy - # [CN user] Use your local http proxy (http://127.0.0.1:{port}) or socks5 proxy (socks5://127.0.0.1:{port}) - # [Other] Use null - GitProxy: null - # Set SSL Verify - # [In most cases] Use true - # [Other] Use false to when connected to an untrusted network - SSLVerify: true - # Update Alas at startup - # [In most cases] Use true - AutoUpdate: true - # Whether to keep local changes during update - # User settings, logs and screenshots will be kept, no mather this is true or false - # [Developer] Use true, if you modified the code - # [Other] Use false - KeepLocalChanges: false - - Python: - # Filepath of python executable `python.exe` - # [Easy installer] Use './toolkit/python.exe' - # [Other] Use you own python, and its version should be 3.7.6 64bit - PythonExecutable: /usr/bin/python - # URL of pypi mirror - # [CN user] Use 'https://pypi.tuna.tsinghua.edu.cn/simple' for faster and more stable download - # [Other] Use null - PypiMirror: https://pypi.tuna.tsinghua.edu.cn/simple - # Install dependencies at startup - # [In most cases] Use true - InstallDependencies: true - # Path to requirements.txt - # [In most cases] Use 'requirements.txt' - # [In AidLux] Use './deploy/AidLux/{version}/requirements.txt', version is default to 0.92 - RequirementsFile: ./deploy/AidLux/0.92/requirements.txt - - Adb: - # Filepath of ADB executable `adb.exe` - # [Easy installer] Use './toolkit/Lib/site-packages/adbutils/binaries/adb.exe' - # [Other] Use you own latest ADB, but not the ADB in your emulator - AdbExecutable: /usr/bin/adb - # Whether to replace ADB - # Chinese emulators (NoxPlayer, LDPlayer, MemuPlayer, MuMuPlayer) use their own ADB, instead of the latest. - # Different ADB servers will terminate each other at startup, resulting in disconnection. - # For compatibility, we have to replace them all. - # This will do: - # 1. Terminate current ADB server - # 2. Rename ADB from all emulators to *.bak and replace them by the AdbExecutable set above - # 3. Brute-force connect to all available emulator instances - # [In most cases] Use true - # [In few cases] Use false, if you have other programs using ADB. - ReplaceAdb: true - # Brute-force connect to all available emulator instances - # [In most cases] Use true - AutoConnect: true - # Re-install uiautomator2 - # [In most cases] Use true - InstallUiautomator2: true - - Ocr: - # Run Ocr as a service, can reduce memory usage by not import mxnet everytime you start an alas instance - - # Whether to use ocr server - # [Default] false - UseOcrServer: false - # Whether to start ocr server when start GUI - # [Default] false - StartOcrServer: false - # Port of ocr server runs by GUI - # [Default] 22268 - OcrServerPort: 22268 - # Address of ocr server for alas instance to connect - # [Default] 127.0.0.1:22268 - OcrClientAddress: 127.0.0.1:22268 - - Update: - # Use auto update and builtin updater feature - # This may cause problem https://github.com/LmeSzinc/AzurLaneAutoScript/issues/876 - EnableReload: true - # Check update every X minute - # [Disable] 0 - # [Default] 5 - CheckUpdateInterval: 5 - # Scheduled restart time - # If there are updates, Alas will automatically restart and update at this time every day - # and run all alas instances that running before restarted - # [Disable] null - # [Default] 03:50 - AutoRestartTime: 03:50 - - Misc: - # Enable discord rich presence - DiscordRichPresence: false - - RemoteAccess: - # Enable remote access (using ssh reverse tunnel serve by https://github.com/wang0618/localshare) - # ! You need to set Password below to enable remote access since everyone can access to your alas if they have your url. - # See here (http://app.azurlane.cloud/en.html) for more infomation. - EnableRemoteAccess: false - # Username when login into ssh server - # [Default] null (will generate a random one when startup) - SSHUser: null - # Server to connect - # [Default] null - # [Format] host:port - SSHServer: null - # Filepath of SSH executable `ssh.exe` - # [Default] ssh (find ssh in system PATH) - # If you don't have one, install OpenSSH or download it here (https://github.com/PowerShell/Win32-OpenSSH/releases) - SSHExecutable: ssh - - Webui: - # --host. Host to listen - # [Use IPv6] '::' - # [In most cases] Default to '0.0.0.0' - WebuiHost: 0.0.0.0 - # --port. Port to listen - # You will be able to access webui via `http://{host}:{port}` - # [In most cases] Default to 22267 - WebuiPort: 22267 - # Language to use on web ui - # 'zh-CN' for Chinese simplified - # 'en-US' for English - # 'ja-JP' for Japanese - # 'zh-TW' for Chinese traditional - Language: zh-CN - # Theme of web ui - # 'default' for light theme - # 'dark' for dark theme - Theme: default - # Follow system DPI scaling - # [In most cases] true - # [In few cases] false to make Alas smaller, if you have a low resolution but high DPI scaling. - DpiScaling: true - # --key. Password of web ui - # Useful when expose Alas to the public network - Password: null - # --cdn. Use jsdelivr cdn for pywebio static files (css, js). - # 'true' for jsdelivr cdn - # 'false' for self host cdn (automatically) - # 'https://path.to.your/cdn' to use custom cdn - CDN: false - # --run. Auto-run specified config when startup - # 'null' default no specified config - # '["alas"]' specified "alas" config - # '["alas","alas2"]' specified "alas" "alas2" configs - Run: null -<<<<<<< HEAD - # To update app.asar - # [In most cases] true - AppAsarUpdate: true - # --no-sandbox. https://github.com/electron/electron/issues/30966 - # Some Windows systems cannot call the GPU normally for virtualization, and you need to manually turn off sandbox mode - NoSandbox: false -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 diff --git a/config/deploy.template-AidLux.yaml b/config/deploy.template-AidLux.yaml index 29157d4ad..19dcdff71 100644 --- a/config/deploy.template-AidLux.yaml +++ b/config/deploy.template-AidLux.yaml @@ -157,12 +157,9 @@ Deploy: # '["alas"]' specified "alas" config # '["alas","alas2"]' specified "alas" "alas2" configs Run: null -<<<<<<< HEAD # To update app.asar # [In most cases] true AppAsarUpdate: true # --no-sandbox. https://github.com/electron/electron/issues/30966 # Some Windows systems cannot call the GPU normally for virtualization, and you need to manually turn off sandbox mode NoSandbox: false -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 diff --git a/config/deploy.template-cn.yaml b/config/deploy.template-cn.yaml index f1636fbcb..3800e347b 100644 --- a/config/deploy.template-cn.yaml +++ b/config/deploy.template-cn.yaml @@ -157,12 +157,9 @@ Deploy: # '["alas"]' specified "alas" config # '["alas","alas2"]' specified "alas" "alas2" configs Run: null -<<<<<<< HEAD # To update app.asar # [In most cases] true AppAsarUpdate: true # --no-sandbox. https://github.com/electron/electron/issues/30966 # Some Windows systems cannot call the GPU normally for virtualization, and you need to manually turn off sandbox mode NoSandbox: false -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 diff --git a/config/deploy.template-docker-cn.yaml b/config/deploy.template-docker-cn.yaml index d4abf5df6..d26fefdb2 100644 --- a/config/deploy.template-docker-cn.yaml +++ b/config/deploy.template-docker-cn.yaml @@ -157,12 +157,9 @@ Deploy: # '["alas"]' specified "alas" config # '["alas","alas2"]' specified "alas" "alas2" configs Run: null -<<<<<<< HEAD # To update app.asar # [In most cases] true AppAsarUpdate: true # --no-sandbox. https://github.com/electron/electron/issues/30966 # Some Windows systems cannot call the GPU normally for virtualization, and you need to manually turn off sandbox mode NoSandbox: false -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 diff --git a/config/deploy.template-docker.yaml b/config/deploy.template-docker.yaml index 9c9c575d7..e2351ecd0 100644 --- a/config/deploy.template-docker.yaml +++ b/config/deploy.template-docker.yaml @@ -157,12 +157,9 @@ Deploy: # '["alas"]' specified "alas" config # '["alas","alas2"]' specified "alas" "alas2" configs Run: null -<<<<<<< HEAD # To update app.asar # [In most cases] true AppAsarUpdate: true # --no-sandbox. https://github.com/electron/electron/issues/30966 # Some Windows systems cannot call the GPU normally for virtualization, and you need to manually turn off sandbox mode NoSandbox: false -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 diff --git a/config/deploy.template-linux-cn.yaml b/config/deploy.template-linux-cn.yaml index cd928582a..a4ba3c04d 100644 --- a/config/deploy.template-linux-cn.yaml +++ b/config/deploy.template-linux-cn.yaml @@ -157,12 +157,9 @@ Deploy: # '["alas"]' specified "alas" config # '["alas","alas2"]' specified "alas" "alas2" configs Run: null -<<<<<<< HEAD # To update app.asar # [In most cases] true AppAsarUpdate: true # --no-sandbox. https://github.com/electron/electron/issues/30966 # Some Windows systems cannot call the GPU normally for virtualization, and you need to manually turn off sandbox mode NoSandbox: false -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 diff --git a/config/deploy.template-linux.yaml b/config/deploy.template-linux.yaml index 277a17905..a256c2c50 100644 --- a/config/deploy.template-linux.yaml +++ b/config/deploy.template-linux.yaml @@ -157,12 +157,9 @@ Deploy: # '["alas"]' specified "alas" config # '["alas","alas2"]' specified "alas" "alas2" configs Run: null -<<<<<<< HEAD # To update app.asar # [In most cases] true AppAsarUpdate: true # --no-sandbox. https://github.com/electron/electron/issues/30966 # Some Windows systems cannot call the GPU normally for virtualization, and you need to manually turn off sandbox mode NoSandbox: false -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 diff --git a/config/deploy.template.yaml b/config/deploy.template.yaml index e260fb8e7..3d60a0319 100644 --- a/config/deploy.template.yaml +++ b/config/deploy.template.yaml @@ -157,12 +157,9 @@ Deploy: # '["alas"]' specified "alas" config # '["alas","alas2"]' specified "alas" "alas2" configs Run: null -<<<<<<< HEAD # To update app.asar # [In most cases] true AppAsarUpdate: true # --no-sandbox. https://github.com/electron/electron/issues/30966 # Some Windows systems cannot call the GPU normally for virtualization, and you need to manually turn off sandbox mode NoSandbox: false -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 diff --git a/config/template.json b/config/template.json index c22579fd0..d11d98caf 100644 --- a/config/template.json +++ b/config/template.json @@ -313,12 +313,9 @@ "CommonCV": "any", "ChangeVanguard": "ship", "CommonDD": "any", -<<<<<<< HEAD "ALLowLowVanguardLevel": true, "FleetNumberInHardMode": 0, "StopIFAutoNotEnsured": true, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "CommissionLimit": true }, "Campaign": { @@ -516,7 +513,6 @@ "Storage": {} } }, -<<<<<<< HEAD "Event3": { "Scheduler": { "Enable": false, @@ -591,8 +587,6 @@ "Storage": {} } }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "Raid": { "Scheduler": { "Enable": false, @@ -1474,10 +1468,7 @@ "ServerUpdate": "00:00, 12:00, 18:00" }, "Exercise": { -<<<<<<< HEAD "DelayUntilHoursBeforeNextUpdate": 12, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "OpponentChooseMode": "max_exp", "OpponentTrial": 1, "ExerciseStrategy": "aggressive", @@ -1706,10 +1697,7 @@ }, "OpsiFleet": { "Fleet": 1, -<<<<<<< HEAD "FleetMode": "combat_auto", -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "Submarine": false }, "Storage": { @@ -1763,10 +1751,7 @@ }, "OpsiFleet": { "Fleet": 1, -<<<<<<< HEAD "FleetMode": "combat_auto", -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "Submarine": false }, "Storage": { @@ -1787,10 +1772,7 @@ }, "OpsiFleet": { "Fleet": 1, -<<<<<<< HEAD "FleetMode": "combat_auto", -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "Submarine": false }, "Storage": { @@ -1827,10 +1809,7 @@ }, "OpsiFleet": { "Fleet": 1, -<<<<<<< HEAD "FleetMode": "combat_auto", -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "Submarine": false }, "Storage": { @@ -1852,14 +1831,11 @@ "OpsiFleetFilter": { "Filter": "Fleet-4 > CallSubmarine > Fleet-2 > Fleet-3 > Fleet-1" }, -<<<<<<< HEAD "OpsiFleet": { "Fleet": 1, "FleetMode": "combat_auto", "Submarine": true }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "Storage": { "Storage": {} } @@ -1901,10 +1877,7 @@ }, "OpsiFleet": { "Fleet": 1, -<<<<<<< HEAD "FleetMode": "combat_auto", -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "Submarine": false }, "Storage": { @@ -1925,10 +1898,7 @@ }, "OpsiFleet": { "Fleet": 1, -<<<<<<< HEAD "FleetMode": "combat_auto", -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "Submarine": false }, "Storage": { @@ -1986,7 +1956,6 @@ "GameManager": { "AutoRestart": true }, -<<<<<<< HEAD "GGHandler": { "Enabled": false, "GGMethod": "u2", @@ -2072,8 +2041,6 @@ "Color": "^AAAAAA", "Record": "2020-01-01 00:00:00" }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "Storage": { "Storage": {} } diff --git a/deploy/AidLux/0.92/requirements.txt b/deploy/AidLux/0.92/requirements.txt index cd659ab4c..6bdd5e1ab 100644 --- a/deploy/AidLux/0.92/requirements.txt +++ b/deploy/AidLux/0.92/requirements.txt @@ -9,11 +9,7 @@ jellyfish==0.11.2 lz4 mxnet==1.6.0 numpy -<<<<<<< HEAD onepush -======= -onepush==1.3.0 ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 pillow prettytable==2.2.1 psutil==5.9.3 diff --git a/deploy/AidLux/requirements_generator.py b/deploy/AidLux/requirements_generator.py index b180b4956..dc9eee768 100644 --- a/deploy/AidLux/requirements_generator.py +++ b/deploy/AidLux/requirements_generator.py @@ -1,11 +1,7 @@ import os import re -<<<<<<< HEAD from deploy.Windows.logger import logger -======= -from deploy.logger import logger ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 BASE_FOLDER = './deploy/AidLux' diff --git a/deploy/docker/requirements_generator.py b/deploy/docker/requirements_generator.py index 72fa3fed5..9f5b4d17d 100644 --- a/deploy/docker/requirements_generator.py +++ b/deploy/docker/requirements_generator.py @@ -1,10 +1,6 @@ import os -<<<<<<< HEAD from deploy.Windows.logger import logger -======= -from deploy.logger import logger ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 BASE_FOLDER = os.path.dirname(os.path.abspath(__file__)) logger.info(BASE_FOLDER) diff --git a/deploy/installer.py b/deploy/installer.py index ae24d451a..9bfad00db 100644 --- a/deploy/installer.py +++ b/deploy/installer.py @@ -1,4 +1,3 @@ -<<<<<<< HEAD from deploy.Windows.logger import Progress, logger from deploy.Windows.patch import pre_checks @@ -10,18 +9,6 @@ from deploy.Windows.app import AppManager from deploy.Windows.config import ExecutionError from deploy.Windows.git import GitManager from deploy.Windows.pip import PipManager -======= -from deploy.patch import pre_checks - -pre_checks() - -from deploy.adb import AdbManager -from deploy.alas import AlasManager -from deploy.app import AppManager -from deploy.config import ExecutionError -from deploy.git import GitManager -from deploy.pip import PipManager ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 class Installer(GitManager, PipManager, AdbManager, AppManager, AlasManager): @@ -36,7 +23,6 @@ class Installer(GitManager, PipManager, AdbManager, AppManager, AlasManager): exit(1) -<<<<<<< HEAD def run(): Progress.Start() installer = Installer() @@ -46,7 +32,3 @@ def run(): logger.info('Finish') Progress.Finish() -======= -if __name__ == '__main__': - Installer().install() ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 diff --git a/deploy/set.py b/deploy/set.py index bef4ec25a..c72a2c0e5 100644 --- a/deploy/set.py +++ b/deploy/set.py @@ -1,11 +1,7 @@ import sys import typing as t -<<<<<<< HEAD from deploy.Windows.utils import poor_yaml_read, poor_yaml_write, DEPLOY_TEMPLATE -======= -from deploy.utils import poor_yaml_read, poor_yaml_write, DEPLOY_TEMPLATE ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 """ Set config/deploy.yaml with commands like @@ -25,7 +21,6 @@ def get_args() -> t.Dict[str, str]: return args -<<<<<<< HEAD def config_set(modify: t.Dict[str, str], output='./config/deploy.yaml') -> t.Dict[str, str]: """ Args: @@ -49,19 +44,3 @@ def config_set(modify: t.Dict[str, str], output='./config/deploy.yaml') -> t.Dic if __name__ == '__main__': config_set(get_args()) -======= -def config_set(output='./config/deploy.yaml'): - data = poor_yaml_read(DEPLOY_TEMPLATE) - data.update(poor_yaml_read(output)) - for k, v in get_args().items(): - if k in data: - print(f'{k} set') - data[k] = v - else: - print(f'{k} not exist') - poor_yaml_write(data, file=output) - - -if __name__ == '__main__': - config_set() ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 diff --git a/module/base/base.py b/module/base/base.py index f769c3fcd..f59db8854 100644 --- a/module/base/base.py +++ b/module/base/base.py @@ -34,11 +34,6 @@ class ModuleBase: """ if isinstance(config, AzurLaneConfig): self.config = config -<<<<<<< HEAD -======= - if task is not None: - self.config.init_task(task) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 elif isinstance(config, str): self.config = AzurLaneConfig(config, task=task) else: @@ -78,12 +73,6 @@ class ModuleBase: if not self.config.is_actual_task: logger.info('No actual task bound, skip early_ocr_import') return -<<<<<<< HEAD -======= - if self.config.task.command in ['Daemon', 'OpsiDaemon']: - logger.info('No ocr in daemon task, skip early_ocr_import') - return ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 def do_ocr_import(): # Wait first image diff --git a/module/base/timer.py b/module/base/timer.py index 96f523b4a..530af0708 100644 --- a/module/base/timer.py +++ b/module/base/timer.py @@ -3,7 +3,6 @@ from datetime import datetime, timedelta from functools import wraps -<<<<<<< HEAD # def timeout(_timeout): # threadstop = thread._thread__stop # from threading import thread @@ -71,8 +70,6 @@ def timeout(func, timeout_sec=30.0, *args, **kwargs): return function_timeout(func) -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 def timer(function): @wraps(function) def function_timer(*args, **kwargs): diff --git a/module/campaign/assets.py b/module/campaign/assets.py index 55d1c01b5..e1d8ee032 100644 --- a/module/campaign/assets.py +++ b/module/campaign/assets.py @@ -9,18 +9,12 @@ CHAPTER_PREV = Button(area={'cn': (42, 360, 58, 387), 'en': (42, 360, 58, 387), COMMISSION_NOTICE_AT_CAMPAIGN = Button(area={'cn': (1077, 637, 1083, 643), 'en': (1077, 637, 1083, 643), 'jp': (1077, 637, 1083, 643), 'tw': (1077, 637, 1083, 643)}, color={'cn': (172, 72, 49), 'en': (172, 72, 49), 'jp': (172, 72, 49), 'tw': (172, 72, 49)}, button={'cn': (1077, 637, 1083, 643), 'en': (1077, 637, 1083, 643), 'jp': (1077, 637, 1083, 643), 'tw': (1077, 637, 1083, 643)}, file={'cn': './assets/cn/campaign/COMMISSION_NOTICE_AT_CAMPAIGN.png', 'en': './assets/en/campaign/COMMISSION_NOTICE_AT_CAMPAIGN.png', 'jp': './assets/jp/campaign/COMMISSION_NOTICE_AT_CAMPAIGN.png', 'tw': './assets/tw/campaign/COMMISSION_NOTICE_AT_CAMPAIGN.png'}) EVENT_20230817_STORY = Button(area={'cn': (610, 320, 670, 380), 'en': (610, 320, 670, 380), 'jp': (610, 320, 670, 380), 'tw': (610, 320, 670, 380)}, color={'cn': (183, 180, 190), 'en': (183, 180, 190), 'jp': (183, 180, 190), 'tw': (183, 180, 190)}, button={'cn': (610, 320, 670, 380), 'en': (610, 320, 670, 380), 'jp': (610, 320, 670, 380), 'tw': (610, 320, 670, 380)}, file={'cn': './assets/cn/campaign/EVENT_20230817_STORY.png', 'en': './assets/en/campaign/EVENT_20230817_STORY.png', 'jp': './assets/jp/campaign/EVENT_20230817_STORY.png', 'tw': './assets/tw/campaign/EVENT_20230817_STORY.png'}) OCR_COIN = Button(area={'cn': (815, 23, 922, 51), 'en': (815, 23, 922, 51), 'jp': (815, 23, 922, 51), 'tw': (815, 23, 922, 51)}, color={'cn': (61, 61, 73), 'en': (61, 61, 73), 'jp': (61, 61, 73), 'tw': (61, 61, 73)}, button={'cn': (815, 23, 922, 51), 'en': (815, 23, 922, 51), 'jp': (815, 23, 922, 51), 'tw': (815, 23, 922, 51)}, file={'cn': './assets/cn/campaign/OCR_COIN.png', 'en': './assets/en/campaign/OCR_COIN.png', 'jp': './assets/jp/campaign/OCR_COIN.png', 'tw': './assets/tw/campaign/OCR_COIN.png'}) -<<<<<<< HEAD OCR_COIN_LIMIT = Button(area={'cn': (807, 0, 944, 19), 'en': (807, 0, 944, 19), 'jp': (807, 0, 944, 19), 'tw': (807, 0, 944, 19)}, color={'cn': (206, 206, 206), 'en': (206, 206, 206), 'jp': (206, 206, 206), 'tw': (206, 206, 206)}, button={'cn': (807, 0, 944, 19), 'en': (807, 0, 944, 19), 'jp': (807, 0, 944, 19), 'tw': (807, 0, 944, 19)}, file={'cn': './assets/cn/campaign/OCR_COIN_LIMIT.png', 'en': './assets/en/campaign/OCR_COIN_LIMIT.png', 'jp': './assets/jp/campaign/OCR_COIN_LIMIT.png', 'tw': './assets/tw/campaign/OCR_COIN_LIMIT.png'}) OCR_EVENT_PT = Button(area={'cn': (1196, 109, 1280, 131), 'en': (1190, 109, 1280, 129), 'jp': (1196, 109, 1280, 131), 'tw': (1196, 109, 1280, 131)}, color={'cn': (121, 110, 59), 'en': (88, 78, 51), 'jp': (121, 110, 59), 'tw': (121, 110, 59)}, button={'cn': (1196, 109, 1280, 131), 'en': (1190, 109, 1280, 129), 'jp': (1196, 109, 1280, 131), 'tw': (1196, 109, 1280, 131)}, file={'cn': './assets/cn/campaign/OCR_EVENT_PT.png', 'en': './assets/en/campaign/OCR_EVENT_PT.png', 'jp': './assets/jp/campaign/OCR_EVENT_PT.png', 'tw': './assets/tw/campaign/OCR_EVENT_PT.png'}) OCR_GEM = Button(area={'cn': (1024, 23, 1137, 51), 'en': (1024, 23, 1137, 51), 'jp': (1024, 23, 1137, 51), 'tw': (1024, 23, 1137, 51)}, color={'cn': (102, 102, 100), 'en': (102, 102, 100), 'jp': (102, 102, 100), 'tw': (102, 102, 100)}, button={'cn': (1024, 23, 1137, 51), 'en': (1024, 23, 1137, 51), 'jp': (1024, 23, 1137, 51), 'tw': (1024, 23, 1137, 51)}, file={'cn': './assets/cn/campaign/OCR_GEM.png', 'en': './assets/cn/campaign/OCR_GEM.png', 'jp': './assets/cn/campaign/OCR_GEM.png', 'tw': './assets/cn/campaign/OCR_GEM.png'}) OCR_OIL = Button(area={'cn': (614, 23, 714, 51), 'en': (614, 23, 714, 51), 'jp': (614, 23, 714, 51), 'tw': (614, 23, 714, 51)}, color={'cn': (64, 65, 79), 'en': (64, 65, 79), 'jp': (64, 65, 79), 'tw': (64, 65, 79)}, button={'cn': (614, 23, 714, 51), 'en': (614, 23, 714, 51), 'jp': (614, 23, 714, 51), 'tw': (614, 23, 714, 51)}, file={'cn': './assets/cn/campaign/OCR_OIL.png', 'en': './assets/en/campaign/OCR_OIL.png', 'jp': './assets/jp/campaign/OCR_OIL.png', 'tw': './assets/tw/campaign/OCR_OIL.png'}) OCR_OIL_CHECK = Button(area={'cn': (573, 30, 592, 49), 'en': (573, 30, 592, 49), 'jp': (573, 30, 592, 49), 'tw': (573, 30, 592, 49)}, color={'cn': (82, 82, 82), 'en': (82, 82, 82), 'jp': (82, 82, 82), 'tw': (82, 82, 82)}, button={'cn': (573, 30, 592, 49), 'en': (573, 30, 592, 49), 'jp': (573, 30, 592, 49), 'tw': (573, 30, 592, 49)}, file={'cn': './assets/cn/campaign/OCR_OIL_CHECK.png', 'en': './assets/en/campaign/OCR_OIL_CHECK.png', 'jp': './assets/jp/campaign/OCR_OIL_CHECK.png', 'tw': './assets/tw/campaign/OCR_OIL_CHECK.png'}) OCR_OIL_LIMIT = Button(area={'cn': (608, 0, 736, 19), 'en': (608, 0, 736, 19), 'jp': (608, 0, 736, 19), 'tw': (608, 0, 736, 19)}, color={'cn': (202, 202, 202), 'en': (202, 202, 202), 'jp': (202, 202, 202), 'tw': (202, 202, 202)}, button={'cn': (608, 0, 736, 19), 'en': (608, 0, 736, 19), 'jp': (608, 0, 736, 19), 'tw': (608, 0, 736, 19)}, file={'cn': './assets/cn/campaign/OCR_OIL_LIMIT.png', 'en': './assets/en/campaign/OCR_OIL_LIMIT.png', 'jp': './assets/jp/campaign/OCR_OIL_LIMIT.png', 'tw': './assets/tw/campaign/OCR_OIL_LIMIT.png'}) -======= -OCR_EVENT_PT = Button(area={'cn': (1196, 109, 1280, 131), 'en': (1190, 109, 1280, 129), 'jp': (1196, 109, 1280, 131), 'tw': (1196, 109, 1280, 131)}, color={'cn': (121, 110, 59), 'en': (88, 78, 51), 'jp': (121, 110, 59), 'tw': (121, 110, 59)}, button={'cn': (1196, 109, 1280, 131), 'en': (1190, 109, 1280, 129), 'jp': (1196, 109, 1280, 131), 'tw': (1196, 109, 1280, 131)}, file={'cn': './assets/cn/campaign/OCR_EVENT_PT.png', 'en': './assets/en/campaign/OCR_EVENT_PT.png', 'jp': './assets/jp/campaign/OCR_EVENT_PT.png', 'tw': './assets/tw/campaign/OCR_EVENT_PT.png'}) -OCR_OIL = Button(area={'cn': (614, 23, 714, 51), 'en': (614, 23, 714, 51), 'jp': (614, 23, 714, 51), 'tw': (614, 23, 714, 51)}, color={'cn': (64, 65, 79), 'en': (64, 65, 79), 'jp': (64, 65, 79), 'tw': (64, 65, 79)}, button={'cn': (614, 23, 714, 51), 'en': (614, 23, 714, 51), 'jp': (614, 23, 714, 51), 'tw': (614, 23, 714, 51)}, file={'cn': './assets/cn/campaign/OCR_OIL.png', 'en': './assets/en/campaign/OCR_OIL.png', 'jp': './assets/jp/campaign/OCR_OIL.png', 'tw': './assets/tw/campaign/OCR_OIL.png'}) -OCR_OIL_CHECK = Button(area={'cn': (573, 30, 592, 49), 'en': (573, 30, 592, 49), 'jp': (573, 30, 592, 49), 'tw': (573, 30, 592, 49)}, color={'cn': (82, 82, 82), 'en': (82, 82, 82), 'jp': (82, 82, 82), 'tw': (82, 82, 82)}, button={'cn': (573, 30, 592, 49), 'en': (573, 30, 592, 49), 'jp': (573, 30, 592, 49), 'tw': (573, 30, 592, 49)}, file={'cn': './assets/cn/campaign/OCR_OIL_CHECK.png', 'en': './assets/en/campaign/OCR_OIL_CHECK.png', 'jp': './assets/jp/campaign/OCR_OIL_CHECK.png', 'tw': './assets/tw/campaign/OCR_OIL_CHECK.png'}) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 SWITCH_1_HARD = Button(area={'cn': (82, 641, 148, 675), 'en': (87, 642, 148, 676), 'jp': (24, 645, 150, 697), 'tw': (82, 641, 148, 675)}, color={'cn': (233, 141, 128), 'en': (234, 139, 124), 'jp': (219, 116, 106), 'tw': (236, 159, 148)}, button={'cn': (82, 641, 148, 675), 'en': (87, 642, 148, 676), 'jp': (24, 645, 150, 697), 'tw': (82, 641, 148, 675)}, file={'cn': './assets/cn/campaign/SWITCH_1_HARD.png', 'en': './assets/en/campaign/SWITCH_1_HARD.png', 'jp': './assets/jp/campaign/SWITCH_1_HARD.png', 'tw': './assets/tw/campaign/SWITCH_1_HARD.png'}) SWITCH_1_NORMAL = Button(area={'cn': (80, 641, 148, 675), 'en': (79, 638, 147, 675), 'jp': (24, 644, 150, 697), 'tw': (79, 641, 148, 675)}, color={'cn': (157, 180, 227), 'en': (157, 180, 227), 'jp': (143, 169, 222), 'tw': (156, 179, 227)}, button={'cn': (80, 641, 148, 675), 'en': (79, 638, 147, 675), 'jp': (24, 644, 150, 697), 'tw': (79, 641, 148, 675)}, file={'cn': './assets/cn/campaign/SWITCH_1_NORMAL.png', 'en': './assets/en/campaign/SWITCH_1_NORMAL.png', 'jp': './assets/jp/campaign/SWITCH_1_NORMAL.png', 'tw': './assets/tw/campaign/SWITCH_1_NORMAL.png'}) SWITCH_2_EX = Button(area={'cn': (272, 658, 310, 676), 'en': (251, 644, 313, 697), 'jp': (186, 638, 314, 692), 'tw': (241, 640, 312, 692)}, color={'cn': (253, 168, 98), 'en': (254, 163, 80), 'jp': (205, 136, 64), 'tw': (254, 161, 72)}, button={'cn': (272, 658, 310, 676), 'en': (251, 644, 313, 697), 'jp': (186, 638, 314, 692), 'tw': (241, 640, 312, 692)}, file={'cn': './assets/cn/campaign/SWITCH_2_EX.png', 'en': './assets/en/campaign/SWITCH_2_EX.png', 'jp': './assets/jp/campaign/SWITCH_2_EX.png', 'tw': './assets/tw/campaign/SWITCH_2_EX.png'}) diff --git a/module/campaign/campaign_event.py b/module/campaign/campaign_event.py index 5a7cd7939..658856db2 100644 --- a/module/campaign/campaign_event.py +++ b/module/campaign/campaign_event.py @@ -26,7 +26,6 @@ class CampaignEvent(CampaignStatus): for task in ['GemsFarming']: name = self.config.cross_get(keys=f'{task}.Campaign.Name', default='2-4') if not self.stage_is_main(name): -<<<<<<< HEAD from module.config.utils import deep_get _gg_on = deep_get(self.config.data, keys='GameManager.GGHandler.Enabled') if _gg_on: @@ -35,10 +34,6 @@ class CampaignEvent(CampaignStatus): campaign_to_go = '2-4' logger.info(f'Reset GemsFarming to {campaign_to_go}') self.config.cross_set(keys=f'{task}.Campaign.Name', value=campaign_to_go) -======= - logger.info(f'Reset GemsFarming to 2-4') - self.config.cross_set(keys=f'{task}.Campaign.Name', value='2-4') ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 self.config.cross_set(keys=f'{task}.Campaign.Event', value='campaign_main') logger.info(f'Reset event time limit') @@ -59,15 +54,10 @@ class CampaignEvent(CampaignStatus): tasks = EVENTS + RAIDS + COALITIONS + GEMS_FARMINGS command = self.config.Scheduler_Command if limit <= 0 or command not in tasks: -<<<<<<< HEAD self.get_event_pt() return False if command == 'GemsFarming' and self.stage_is_main(self.config.Campaign_Name): self.get_event_pt() -======= - return False - if command == 'GemsFarming' and self.stage_is_main(self.config.Campaign_Name): ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 return False pt = self.get_event_pt() @@ -111,15 +101,10 @@ class CampaignEvent(CampaignStatus): Pages: in: page_event or page_sp """ -<<<<<<< HEAD from module.config.utils import deep_get limit = self.config.TaskBalancer_CoinLimit coin = deep_get(self.config.data, 'Dashboard.Coin.Value') logger.attr('Coin Count', coin) -======= - limit = self.config.TaskBalancer_CoinLimit - coin = self.get_coin() ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 # Check Coin if coin == 0: # Avoid wrong/zero OCR result @@ -136,20 +121,12 @@ class CampaignEvent(CampaignStatus): return False def handle_task_balancer(self): -<<<<<<< HEAD if self.config.TaskBalancer_Enable and self.triggered_task_balancer(): self.config.task_delay(minute=5) next_task = self.config.TaskBalancer_TaskCall logger.hr(f'TaskBalancer triggered, switching task to {next_task}') self.config.task_call(next_task) self.config.task_stop() -======= - self.config.task_delay(minute=5) - next_task = self.config.TaskBalancer_TaskCall - logger.hr(f'TaskBalancer triggered, switching task to {next_task}') - self.config.task_call(next_task) - self.config.task_stop() ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 def is_event_entrance_available(self): """ diff --git a/module/campaign/campaign_status.py b/module/campaign/campaign_status.py index 8d71275cf..dc99930de 100644 --- a/module/campaign/campaign_status.py +++ b/module/campaign/campaign_status.py @@ -1,29 +1,16 @@ -<<<<<<< HEAD import datetime -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 import re import cv2 import numpy as np from module.base.timer import Timer -<<<<<<< HEAD from module.campaign.assets import OCR_EVENT_PT, OCR_COIN, OCR_OIL, OCR_COIN_LIMIT, OCR_OIL_LIMIT, OCR_OIL_CHECK from module.base.utils import color_similar, get_color from module.logger import logger from module.ocr.ocr import Digit, Ocr from module.ui.ui import UI from module.log_res.log_res import LogRes -======= -from module.base.utils import color_similar, get_color -from module.campaign.assets import OCR_COIN, OCR_EVENT_PT, OCR_OIL, OCR_OIL_CHECK -from module.logger import logger -from module.ocr.ocr import Digit, Ocr -from module.ui.ui import UI - -OCR_COIN = Digit(OCR_COIN, name='OCR_COIN', letter=(239, 239, 239), threshold=128) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 class PtOcr(Ocr): @@ -51,11 +38,7 @@ OCR_PT = PtOcr(OCR_EVENT_PT) class CampaignStatus(UI): -<<<<<<< HEAD def get_event_pt(self, update=False): -======= - def get_event_pt(self): ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 """ Returns: int: PT amount, or 0 if unable to parse @@ -66,7 +49,6 @@ class CampaignStatus(UI): if res: pt = int(res.group(1)) logger.attr('Event_PT', pt) -<<<<<<< HEAD LogRes(self.config).Pt = pt else: logger.warning(f'Invalid pt result: {pt}') @@ -76,23 +58,11 @@ class CampaignStatus(UI): return pt def get_coin(self, skip_first_screenshot=True, update=False): -======= - return pt - else: - logger.warning(f'Invalid pt result: {pt}') - return 0 - - def get_coin(self, skip_first_screenshot=True): ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 """ Returns: int: Coin amount """ -<<<<<<< HEAD _coin = {} -======= - amount = 0 ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 timeout = Timer(1, count=2).start() while 1: if skip_first_screenshot: @@ -104,7 +74,6 @@ class CampaignStatus(UI): logger.warning('Get coin timeout') break -<<<<<<< HEAD _coin = { 'Value': self._get_num(OCR_COIN, 'OCR_COIN'), 'Limit': self._get_num(OCR_COIN_LIMIT, 'OCR_COIN_LIMIT') @@ -116,13 +85,6 @@ class CampaignStatus(UI): self.config.update() return _coin['Value'] -======= - amount = OCR_COIN.ocr(self.device.image) - if amount >= 100: - break - - return amount ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 def _get_oil(self): # Update offset @@ -141,7 +103,6 @@ class CampaignStatus(UI): return ocr.ocr(self.device.image) -<<<<<<< HEAD def _get_num(self, _button, name): # Update offset _ = self.appear(OCR_OIL_CHECK) @@ -160,18 +121,11 @@ class CampaignStatus(UI): return ocr.ocr(self.device.image) def get_oil(self, skip_first_screenshot=True, update=False): -======= - def get_oil(self, skip_first_screenshot=True): ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 """ Returns: int: Oil amount """ -<<<<<<< HEAD _oil = {} -======= - amount = 0 ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 timeout = Timer(1, count=2).start() while 1: if skip_first_screenshot: @@ -179,18 +133,14 @@ class CampaignStatus(UI): else: self.device.screenshot() -<<<<<<< HEAD if not self.appear(OCR_OIL_CHECK, offset=(10, 2)): logger.info('No oil icon') self.device.sleep(1) -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 if timeout.reached(): logger.warning('Get oil timeout') break -<<<<<<< HEAD _oil = { 'Value': self._get_num(OCR_OIL, 'OCR_OIL'), 'Limit': self._get_num(OCR_OIL_LIMIT, 'OCR_OIL_LIMIT') @@ -202,17 +152,6 @@ class CampaignStatus(UI): self.config.update() return _oil['Value'] -======= - if not self.appear(OCR_OIL_CHECK, offset=(10, 2)): - logger.info('No oil icon') - continue - - amount = self._get_oil() - if amount >= 100: - break - - return amount ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 def is_balancer_task(self): """ @@ -222,12 +161,9 @@ class CampaignStatus(UI): tasks = [ 'Event', 'Event2', -<<<<<<< HEAD 'Event3', 'coalition', 'coalition_sp', -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 'Raid', 'GemsFarming', ] diff --git a/module/campaign/gems_farming.py b/module/campaign/gems_farming.py index a1239267a..8b458cb96 100644 --- a/module/campaign/gems_farming.py +++ b/module/campaign/gems_farming.py @@ -2,7 +2,6 @@ from module.campaign.campaign_base import CampaignBase from module.campaign.run import CampaignRun from module.combat.assets import BATTLE_PREPARATION from module.equipment.assets import * -<<<<<<< HEAD from module.equipment.equipment_change import EquipmentChange from module.equipment.fleet_equipment import OCR_FLEET_INDEX from module.exception import CampaignEnd, ScriptError, RequestHumanTakeover @@ -14,12 +13,6 @@ from module.map.assets import (FLEET_ENTER_FLAGSHIP_HARD_1, FLEET_ENTER_HARD_2_3) from module.retire.assets import ( DOCK_SHIP_DOWN) -======= -from module.equipment.fleet_equipment import FleetEquipment -from module.exception import CampaignEnd, ScriptError -from module.handler.assets import AUTO_SEARCH_MAP_OPTION_OFF -from module.logger import logger ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 from module.map.assets import FLEET_PREPARATION, MAP_PREPARATION from module.retire.assets import ( DOCK_CHECK, @@ -31,16 +24,10 @@ from module.retire.assets import ( from module.retire.dock import Dock from module.retire.scanner import ShipScanner from module.ui.assets import BACK_ARROW -<<<<<<< HEAD import inflection from module.ui.page import page_fleet SIM_VALUE = 0.95 -======= -from module.ui.page import page_fleet - -SIM_VALUE = 0.92 ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 class GemsCampaignOverride(CampaignBase): @@ -88,7 +75,6 @@ class GemsCampaignOverride(CampaignBase): raise CampaignEnd('Emotion withdraw') -<<<<<<< HEAD class GemsFarming(CampaignRun, Dock, EquipmentChange): def event_hard_mode_override(self): @@ -126,9 +112,6 @@ class GemsFarming(CampaignRun, Dock, EquipmentChange): self.FLEET_ENTER = FLEET_ENTER self._FLEET_ENTER = FLEET_ENTER self.hard_mode = False -======= -class GemsFarming(CampaignRun, FleetEquipment, Dock): ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 def load_campaign(self, name, folder='campaign_main'): super().load_campaign(name, folder) @@ -156,7 +139,6 @@ class GemsFarming(CampaignRun, FleetEquipment, Dock): def change_vanguard_equip(self): return 'equip' in self.config.GemsFarming_ChangeVanguard -<<<<<<< HEAD def _fleet_detail_enter(self): """ Enter GEMS_FLEET page @@ -197,14 +179,6 @@ class GemsFarming(CampaignRun, FleetEquipment, Dock): def _ship_detail_enter_hard(self, button): self._fleet_detail_enter_hard() self.equip_enter(button) -======= - @property - def fleet_to_attack(self): - if self.config.Fleet_FleetOrder == 'fleet1_standby_fleet2_all': - return self.config.Fleet_Fleet2 - else: - return self.config.Fleet_Fleet1 ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 def flagship_change(self): """ @@ -221,7 +195,6 @@ class GemsFarming(CampaignRun, FleetEquipment, Dock): index_list = range(0, 5) logger.hr('Change flagship', level=1) logger.attr('ChangeFlagship', self.config.GemsFarming_ChangeFlagship) -<<<<<<< HEAD if self.change_flagship_equip: logger.hr('Record flagship equipment', level=2) self._ship_detail_enter(self.FLEET_ENTER_FLAGSHIP) @@ -231,33 +204,15 @@ class GemsFarming(CampaignRun, FleetEquipment, Dock): logger.hr('Change flagship', level=2) self._fleet_detail_enter() -======= - self.fleet_enter(self.fleet_to_attack) - if self.change_flagship_equip: - logger.hr('Record flagship equipment', level=2) - self.fleet_enter_ship(FLEET_DETAIL_ENTER_FLAGSHIP) - self.ship_equipment_record_image(index_list=index_list) - self.ship_equipment_take_off() - self.fleet_back() - - logger.hr('Change flagship', level=2) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 success = self.flagship_change_execute() if self.change_flagship_equip: logger.hr('Equip flagship equipment', level=2) -<<<<<<< HEAD self._ship_detail_enter(self.FLEET_ENTER_FLAGSHIP) self._equip_take_off_one() self.equipment_take_on(index_list=index_list) self.ui_back(self.page_fleet_check_button) -======= - self.fleet_enter_ship(FLEET_DETAIL_ENTER_FLAGSHIP) - self.ship_equipment_take_off() - self.ship_equipment_take_on_image(index_list=index_list) - self.fleet_back() ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 return success @@ -271,7 +226,6 @@ class GemsFarming(CampaignRun, FleetEquipment, Dock): logger.hr('Change vanguard', level=1) logger.attr('ChangeVanguard', self.config.GemsFarming_ChangeVanguard) -<<<<<<< HEAD if self.change_vanguard_equip: logger.hr('Record vanguard equipment', level=2) self._ship_detail_enter(self.FLEET_ENTER) @@ -281,33 +235,15 @@ class GemsFarming(CampaignRun, FleetEquipment, Dock): logger.hr('Change vanguard', level=2) self._fleet_detail_enter() -======= - self.fleet_enter(self.fleet_to_attack) - if self.change_vanguard_equip: - logger.hr('Record vanguard equipment', level=2) - self.fleet_enter_ship(FLEET_DETAIL_ENTER) - self.ship_equipment_record_image() - self.ship_equipment_take_off() - self.fleet_back() - - logger.hr('Change vanguard', level=2) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 success = self.vanguard_change_execute() if self.change_vanguard_equip: logger.hr('Equip vanguard equipment', level=2) -<<<<<<< HEAD self._ship_detail_enter(self.FLEET_ENTER) self._equip_take_off_one() self.equipment_take_on() self.ui_back(self.page_fleet_check_button) -======= - self.fleet_enter_ship(FLEET_DETAIL_ENTER) - self.ship_equipment_take_off() - self.ship_equipment_take_on_image() - self.fleet_back() ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 return success @@ -316,15 +252,9 @@ class GemsFarming(CampaignRun, FleetEquipment, Dock): self.dock_select_one(button) self.dock_filter_set() self.dock_sort_method_dsc_set() -<<<<<<< HEAD self.dock_select_confirm(check_button=self.page_fleet_check_button) def get_common_rarity_cv(self, lv=31, emotion=16): -======= - self.dock_select_confirm(check_button=page_fleet.check_button) - - def get_common_rarity_cv(self): ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 """ Get a common rarity cv by config.GemsFarming_CommonCV If config.GemsFarming_CommonCV == 'any', return a common lv1 ~ lv33 cv @@ -334,13 +264,8 @@ class GemsFarming(CampaignRun, FleetEquipment, Dock): logger.hr('FINDING FLAGSHIP') -<<<<<<< HEAD scanner = ShipScanner( level=(1, lv), emotion=(emotion, 150), fleet=self.config.Fleet_Fleet1, status='free') -======= - scanner = ShipScanner(level=(1, 31), emotion=(10, 150), - fleet=self.fleet_to_attack, status='free') ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 scanner.disable('rarity') if self.config.GemsFarming_CommonCV == 'any': @@ -385,11 +310,7 @@ class GemsFarming(CampaignRun, FleetEquipment, Dock): return candidates -<<<<<<< HEAD def get_common_rarity_dd(self, emotion=16): -======= - def get_common_rarity_dd(self): ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 """ Get a common rarity dd with level is 100 (70 for servers except CN) and emotion > 10 Returns: @@ -401,7 +322,6 @@ class GemsFarming(CampaignRun, FleetEquipment, Dock): max_level = 100 else: max_level = 70 -<<<<<<< HEAD from module.gg_handler.gg_data import GGData _ggdata = GGData(self.config).get_data() if _ggdata['gg_enable'] and _ggdata['gg_auto'] and self.config.GemsFarming_ALLowLowVanguardLevel: @@ -412,11 +332,6 @@ class GemsFarming(CampaignRun, FleetEquipment, Dock): min_level = max(min_level, 49) scanner = ShipScanner(level=(min_level, max_level), emotion=(emotion, 150), fleet=self.config.Fleet_Fleet1, status='free') -======= - - scanner = ShipScanner(level=(max_level, max_level), emotion=(10, 150), - fleet=self.fleet_to_attack, status='free') ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 scanner.disable('rarity') self.dock_sort_method_dsc_set() @@ -482,7 +397,6 @@ class GemsFarming(CampaignRun, FleetEquipment, Dock): logger.error(f'Invalid CommonDD setting: {common_dd}') raise ScriptError(f'Invalid CommonDD setting: {common_dd}') -<<<<<<< HEAD def solve_hard_flagship_black(self): if self.hard_mode: self.ui_click(self.FLEET_ENTER_FLAGSHIP, @@ -497,8 +411,6 @@ class GemsFarming(CampaignRun, FleetEquipment, Dock): self._FLEET_ENTER_FLAGSHIP = self.FLEET_ENTER_FLAGSHIP self.FLEET_ENTER_FLAGSHIP = self.FLEET_ENTER_FLAGSHIP_3_POSITION -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 def flagship_change_execute(self): """ Returns: @@ -508,14 +420,9 @@ class GemsFarming(CampaignRun, FleetEquipment, Dock): in: page_fleet out: page_fleet """ -<<<<<<< HEAD self.solve_hard_flagship_black() self.ui_click(self.FLEET_ENTER_FLAGSHIP, appear_button=self.page_fleet_check_button, check_button=DOCK_CHECK, skip_first_screenshot=True) -======= - self.ui_click(FLEET_ENTER_FLAGSHIP, - appear_button=page_fleet.check_button, check_button=DOCK_CHECK, skip_first_screenshot=True) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 self.dock_filter_set( index='cv', rarity='common', extra='enhanceable', sort='total') self.dock_favourite_set(False) @@ -523,17 +430,13 @@ class GemsFarming(CampaignRun, FleetEquipment, Dock): ship = self.get_common_rarity_cv() if ship: self._ship_change_confirm(min(ship, key=lambda s: (s.level, -s.emotion)).button) -<<<<<<< HEAD if self.hard_mode: self.FLEET_ENTER_FLAGSHIP = self._FLEET_ENTER_FLAGSHIP -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 logger.info('Change flagship success') return True else: logger.info('Change flagship failed, no CV in common rarity.') -<<<<<<< HEAD if self.config.SERVER in ['cn']: max_level = 100 @@ -565,12 +468,6 @@ class GemsFarming(CampaignRun, FleetEquipment, Dock): self._FLEET_ENTER = self.FLEET_ENTER self.FLEET_ENTER = self.FLEET_ENTER_3_POSITION -======= - self.dock_filter_set() - self.ui_back(check_button=page_fleet.check_button) - return False - ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 def vanguard_change_execute(self): """ Returns: @@ -580,32 +477,23 @@ class GemsFarming(CampaignRun, FleetEquipment, Dock): in: page_fleet out: page_fleet """ -<<<<<<< HEAD self.solve_hard_vanguard_black() self.ui_click(self.FLEET_ENTER, appear_button=self.page_fleet_check_button, check_button=DOCK_CHECK, skip_first_screenshot=True) -======= - self.ui_click(FLEET_ENTER, - appear_button=page_fleet.check_button, check_button=DOCK_CHECK, skip_first_screenshot=True) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 self.dock_filter_set( index='dd', rarity='common', faction='eagle', extra='can_limit_break') self.dock_favourite_set(False) ship = self.get_common_rarity_dd() if ship: -<<<<<<< HEAD if self.hard_mode: self.FLEET_ENTER = self._FLEET_ENTER -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 self._ship_change_confirm(max(ship, key=lambda s: s.emotion).button) logger.info('Change vanguard ship success') return True else: logger.info('Change vanguard ship failed, no DD in common rarity.') -<<<<<<< HEAD ship = self.get_common_rarity_dd(emotion=0) if ship and self.hard_mode: @@ -617,10 +505,6 @@ class GemsFarming(CampaignRun, FleetEquipment, Dock): self.ui_back(check_button=self.page_fleet_check_button) if self.hard_mode: self.FLEET_ENTER = self._FLEET_ENTER -======= - self.dock_filter_set() - self.ui_back(check_button=page_fleet.check_button) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 return False _trigger_lv32 = False @@ -649,14 +533,9 @@ class GemsFarming(CampaignRun, FleetEquipment, Dock): total (int): """ self.config.STOP_IF_REACH_LV32 = self.change_flagship -<<<<<<< HEAD self.campaign_floder = folder self.config.RETIRE_KEEP_COMMON_CV = True self.event_hard_mode_override() -======= - self.config.RETIRE_KEEP_COMMON_CV = True - ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 while 1: self._trigger_lv32 = False is_limit = self.config.StopCondition_RunCount @@ -668,7 +547,6 @@ class GemsFarming(CampaignRun, FleetEquipment, Dock): self._trigger_emotion = True else: raise e -<<<<<<< HEAD except RequestHumanTakeover as e: try: if (e.args[0] == 'Hard not satisfied' and @@ -686,8 +564,6 @@ class GemsFarming(CampaignRun, FleetEquipment, Dock): from module.exception import GameStuckError raise GameStuckError -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 # End if self._trigger_lv32 or self._trigger_emotion: diff --git a/module/campaign/run.py b/module/campaign/run.py index 940d2cec8..a4545ff18 100644 --- a/module/campaign/run.py +++ b/module/campaign/run.py @@ -6,10 +6,7 @@ import re from module.campaign.campaign_base import CampaignBase from module.campaign.campaign_event import CampaignEvent -<<<<<<< HEAD from module.shop.shop_status import ShopStatus -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 from module.campaign.campaign_ui import MODE_SWITCH_1 from module.config.config import AzurLaneConfig from module.exception import CampaignEnd, RequestHumanTakeover, ScriptEnd @@ -19,11 +16,7 @@ from module.notify import handle_notify from module.ui.page import page_campaign -<<<<<<< HEAD class CampaignRun(CampaignEvent, ShopStatus): -======= -class CampaignRun(CampaignEvent): ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 folder: str name: str stage: str @@ -67,12 +60,9 @@ class CampaignRun(CampaignEvent): logger.critical(f'Possible reason #1: This event ({folder}) does not have {name}') logger.critical(f'Possible reason #2: You are using an old Alas, ' 'please check for update, or make map files yourself using dev_tools/map_extractor.py') -<<<<<<< HEAD if self.config.SERVER == 'cn': logger.critical(f'Possible reason #3: 对于看不懂以上英文的用户，此处是友情翻译：' f'还没更新呢急你妈急急急急。要么给极彩阿丽艾塔上总督催更，要么滚回去自己写') -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 raise RequestHumanTakeover config = copy.deepcopy(self.config).merge(self.module.Config()) @@ -109,14 +99,10 @@ class CampaignRun(CampaignEvent): return True # Oil limit if oil_check: -<<<<<<< HEAD self.status_get_gems() self.get_coin() _oil = self.get_oil() if _oil < max(500, self.config.StopCondition_OilLimit): -======= - if self.get_oil() < max(500, self.config.StopCondition_OilLimit): ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 logger.hr('Triggered stop condition: Oil limit') self.config.task_delay(minute=(120, 240)) return True @@ -401,14 +387,11 @@ class CampaignRun(CampaignEvent): if self.triggered_stop_condition(oil_check=not self.campaign.is_in_auto_search_menu()): break -<<<<<<< HEAD # Update config if len(self.config.modified): logger.info('Updating config for dashboard') self.config.update() -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 # Run self.device.stuck_record_clear() self.device.click_record_clear() @@ -419,13 +402,10 @@ class CampaignRun(CampaignEvent): logger.info(str(e)) break -<<<<<<< HEAD # Update config if len(self.campaign.config.modified): logger.info('Updating config for dashboard') self.campaign.config.update() -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 # After run self.run_count += 1 if self.config.StopCondition_RunCount: diff --git a/module/coalition/coalition.py b/module/coalition/coalition.py index b12907fcc..ba7850429 100644 --- a/module/coalition/coalition.py +++ b/module/coalition/coalition.py @@ -6,10 +6,7 @@ from module.coalition.combat import CoalitionCombat from module.exception import ScriptError, ScriptEnd from module.logger import logger from module.ocr.ocr import Digit -<<<<<<< HEAD from module.log_res.log_res import LogRes -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 OCR_PT = Digit(FROSTFALL_OCR_PT, name='OCR_PT', letter=(198, 158, 82), threshold=128) @@ -24,11 +21,8 @@ class Coalition(CoalitionCombat, CampaignEvent): int: PT amount, or 0 if unable to parse """ pt = OCR_PT.ocr(self.device.image) -<<<<<<< HEAD LogRes(self.config).Pt = pt self.config.update() -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 return pt def triggered_stop_condition(self): diff --git a/module/combat/auto_search_combat.py b/module/combat/auto_search_combat.py index 16d6c4583..4ec834f43 100644 --- a/module/combat/auto_search_combat.py +++ b/module/combat/auto_search_combat.py @@ -98,11 +98,7 @@ class AutoSearchCombat(MapOperation, Combat, CampaignStatus): This will set auto_search_oil_limit_triggered. """ if not checked: -<<<<<<< HEAD oil = self.get_oil() -======= - oil = self._get_oil() ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 if oil == 0: logger.warning('Oil not found') else: diff --git a/module/config/argument/args.json b/module/config/argument/args.json index d2284656d..c1ac2699f 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -1622,7 +1622,6 @@ "cassin_or_downes" ] }, -<<<<<<< HEAD "ALLowLowVanguardLevel": { "type": "checkbox", "value": true @@ -1640,8 +1639,6 @@ "type": "checkbox", "value": true }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "CommissionLimit": { "type": "checkbox", "value": true @@ -2847,7 +2844,6 @@ } } }, -<<<<<<< HEAD "Event3": { "Scheduler": { "Enable": { @@ -3296,8 +3292,6 @@ } } }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "Raid": { "Scheduler": { "Enable": { @@ -7894,7 +7888,6 @@ } }, "Exercise": { -<<<<<<< HEAD "DelayUntilHoursBeforeNextUpdate": { "type": "select", "value": 12, @@ -7907,8 +7900,6 @@ 12 ] }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "OpponentChooseMode": { "type": "select", "value": "max_exp", @@ -8853,7 +8844,6 @@ 4 ] }, -<<<<<<< HEAD "FleetMode": { "type": "select", "value": "combat_auto", @@ -8864,8 +8854,6 @@ "hide_in_bottom_left" ] }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "Submarine": { "type": "checkbox", "value": false @@ -9039,7 +9027,6 @@ 4 ] }, -<<<<<<< HEAD "FleetMode": { "type": "select", "value": "combat_auto", @@ -9050,8 +9037,6 @@ "hide_in_bottom_left" ] }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "Submarine": { "type": "checkbox", "value": false @@ -9119,7 +9104,6 @@ 4 ] }, -<<<<<<< HEAD "FleetMode": { "type": "select", "value": "combat_auto", @@ -9130,8 +9114,6 @@ "hide_in_bottom_left" ] }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "Submarine": { "type": "checkbox", "value": false @@ -9250,7 +9232,6 @@ 4 ] }, -<<<<<<< HEAD "FleetMode": { "type": "select", "value": "combat_auto", @@ -9261,8 +9242,6 @@ "hide_in_bottom_left" ] }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "Submarine": { "type": "checkbox", "value": false @@ -9325,7 +9304,6 @@ "value": "Fleet-4 > CallSubmarine > Fleet-2 > Fleet-3 > Fleet-1" } }, -<<<<<<< HEAD "OpsiFleet": { "Fleet": { "type": "select", @@ -9354,8 +9332,6 @@ "display": "hide" } }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "Storage": { "Storage": { "type": "storage", @@ -9502,7 +9478,6 @@ 4 ] }, -<<<<<<< HEAD "FleetMode": { "type": "select", "value": "combat_auto", @@ -9513,8 +9488,6 @@ "hide_in_bottom_left" ] }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "Submarine": { "type": "checkbox", "value": false @@ -9587,7 +9560,6 @@ 4 ] }, -<<<<<<< HEAD "FleetMode": { "type": "select", "value": "combat_auto", @@ -9598,8 +9570,6 @@ "hide_in_bottom_left" ] }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "Submarine": { "type": "checkbox", "value": false, @@ -9752,7 +9722,6 @@ "value": true } }, -<<<<<<< HEAD "GGHandler": { "Enabled": { "type": "checkbox", @@ -10033,8 +10002,6 @@ "validate": "datetime" } }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "Storage": { "Storage": { "type": "storage", diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index a5fc48307..4802f57e3 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -277,14 +277,11 @@ GemsFarming: CommonDD: value: any option: [ any, aulick_or_foote , cassin_or_downes ] -<<<<<<< HEAD ALLowLowVanguardLevel: true FleetNumberInHardMode: value: 0 option: [ 0, 1, 2 ] StopIFAutoNotEnsured: true -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 CommissionLimit: true # ==================== Event ==================== @@ -623,12 +620,9 @@ Hard: value: 1 option: [ 1, 2 ] Exercise: -<<<<<<< HEAD DelayUntilHoursBeforeNextUpdate: value: 12 option: [ 1, 2, 3, 4, 5, 12] -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 OpponentChooseMode: value: max_exp option: [ max_exp, easiest, leftmost, easiest_else_exp ] @@ -674,12 +668,9 @@ OpsiFleet: Fleet: value: 1 option: [ 1, 2, 3, 4 ] -<<<<<<< HEAD FleetMode: value: combat_auto option: [ combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left ] -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 Submarine: false OpsiExplore: SpecialRadar: false @@ -743,7 +734,6 @@ AzurLaneUncensored: display: disabled GameManager: AutoRestart: true -<<<<<<< HEAD GGHandler: Enabled: false @@ -848,5 +838,3 @@ GuildCoin: value: ^000000 display: hide Record: 2020-01-01 00:00:00 -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 diff --git a/module/config/argument/gui.yaml b/module/config/argument/gui.yaml index e1e8e2977..d6c36792a 100644 --- a/module/config/argument/gui.yaml +++ b/module/config/argument/gui.yaml @@ -14,11 +14,8 @@ Button: Stop: ScrollON: ScrollOFF: -<<<<<<< HEAD DashboardON: DashboardOFF: -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 ClearLog: Setting: CheckUpdate: @@ -51,7 +48,6 @@ MenuDevelop: Overview: Scheduler: -<<<<<<< HEAD Dashboard: SecondsAgo: MinutesAgo: @@ -72,8 +68,6 @@ Overview: Medal: Core: GuildCoin: -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 Log: Running: Pending: diff --git a/module/config/argument/menu.json b/module/config/argument/menu.json index 769c37f05..041e0189b 100644 --- a/module/config/argument/menu.json +++ b/module/config/argument/menu.json @@ -25,10 +25,7 @@ "EventGeneral", "Event", "Event2", -<<<<<<< HEAD "Event3", -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "Raid", "Coalition", "MaritimeEscort", diff --git a/module/config/argument/override.yaml b/module/config/argument/override.yaml index 712810efc..6041b2662 100644 --- a/module/config/argument/override.yaml +++ b/module/config/argument/override.yaml @@ -61,15 +61,12 @@ Event2: Event: type: state AmbushEvade: true -<<<<<<< HEAD Event3: Campaign: Mode: normal Event: display: disabled AmbushEvade: true -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 EventA: Scheduler: SuccessInterval: 30 @@ -424,12 +421,9 @@ OpsiStronghold: SuccessInterval: 60 FailureInterval: 60 ServerUpdate: 00:00 -<<<<<<< HEAD OpsiFleet: Fleet: 1 Submarine: true -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 OpsiMeowfficerFarming: Scheduler: SuccessInterval: 30 @@ -442,7 +436,6 @@ OpsiHazard1Leveling: ServerUpdate: 00:00, 12:00 OpsiFleet: Submarine: false -<<<<<<< HEAD # ==================== GGHandler ==================== GGHandler: @@ -475,5 +468,3 @@ Dashboard: Color: ^FFDD00 GuildCoin: Color: ^AAAAAA -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 diff --git a/module/config/argument/task.yaml b/module/config/argument/task.yaml index 18ec9349c..a2f655a0b 100644 --- a/module/config/argument/task.yaml +++ b/module/config/argument/task.yaml @@ -2,10 +2,6 @@ # Define argument group of tasks. # -------------------- -<<<<<<< HEAD - -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 # ==================== Alas ==================== Alas: @@ -25,10 +21,7 @@ Alas: - OldRetire Restart: - Scheduler -<<<<<<< HEAD - RestartEmulator -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 # ==================== Farm ==================== @@ -97,7 +90,6 @@ Event: - Emotion - HpControl - EnemyPriority -<<<<<<< HEAD Event3: - Scheduler - Campaign @@ -107,8 +99,6 @@ Event: - Emotion - HpControl - EnemyPriority -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 Raid: - Scheduler - Raid @@ -319,10 +309,7 @@ Opsi: - Scheduler - OpsiStronghold - OpsiFleetFilter -<<<<<<< HEAD - OpsiFleet -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 OpsiMonthBoss: - Scheduler - OpsiMonthBoss @@ -354,8 +341,5 @@ Tool: - AzurLaneUncensored GameManager: - GameManager -<<<<<<< HEAD - GGHandler - PowerLimit -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 diff --git a/module/config/config.py b/module/config/config.py index 92f930f1e..c91660937 100644 --- a/module/config/config.py +++ b/module/config/config.py @@ -104,7 +104,6 @@ class AzurLaneConfig(ConfigUpdater, ManualConfig, GeneratedConfig, ConfigWatcher logger.info("Using template config, which is read only") self.auto_update = False self.task = name_to_function("template") -<<<<<<< HEAD else: self.load() if task is None: @@ -116,24 +115,6 @@ class AzurLaneConfig(ConfigUpdater, ManualConfig, GeneratedConfig, ConfigWatcher self.bind(task) self.task = task self.save() -======= - self.init_task(task) - - def init_task(self, task=None): - if self.is_template_config: - return - - self.load() - if task is None: - # Bind `Alas` by default which includes emulator settings. - task = name_to_function("Alas") - else: - # Bind a specific task for debug purpose. - task = name_to_function(task) - self.bind(task) - self.task = task - self.save() ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 def load(self): self.data = self.read_file(self.config_name) diff --git a/module/config/config_generated.py b/module/config/config_generated.py index f520cf0db..9002cfc5e 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -149,16 +149,11 @@ class GeneratedConfig: # Group `GemsFarming` GemsFarming_ChangeFlagship = 'ship' # ship, ship_equip -<<<<<<< HEAD GemsFarming_ChangeVanguard = 'ship' # disabled, ship, ship_equip GemsFarming_ALLowLowVanguardLevel = True GemsFarming_FleetNumberInHardMode = 0 # 0, 1, 2 GemsFarming_StopIFAutoNotEnsured = True GemsFarming_CommonCV = 'any' # any, langley, bogue, ranger, hermes -======= - GemsFarming_CommonCV = 'any' # any, langley, bogue, ranger, hermes - GemsFarming_ChangeVanguard = 'ship' # disabled, ship, ship_equip ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 GemsFarming_CommonDD = 'any' # any, aulick_or_foote, cassin_or_downes GemsFarming_CommissionLimit = True @@ -354,10 +349,7 @@ class GeneratedConfig: Hard_HardFleet = 1 # 1, 2 # Group `Exercise` -<<<<<<< HEAD Exercise_DelayUntilHoursBeforeNextUpdate = 12 # 1, 2, 3, 4, 5, 12 -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 Exercise_OpponentChooseMode = 'max_exp' # max_exp, easiest, leftmost, easiest_else_exp Exercise_OpponentTrial = 1 Exercise_ExerciseStrategy = 'aggressive' # aggressive, fri18, sat0, sat12, sat18, sun0, sun12, sun18 @@ -392,10 +384,7 @@ class GeneratedConfig: # Group `OpsiFleet` OpsiFleet_Fleet = 1 # 1, 2, 3, 4 -<<<<<<< HEAD OpsiFleet_FleetMode = 'combat_auto' # combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 OpsiFleet_Submarine = False # Group `OpsiExplore` @@ -452,7 +441,6 @@ class GeneratedConfig: # Group `GameManager` GameManager_AutoRestart = True -<<<<<<< HEAD # Group `GGHandler` GGHandler_Enabled = False GGHandler_GGMethod = 'u2' # u2 @@ -533,7 +521,5 @@ class GeneratedConfig: GuildCoin_Color = '^000000' GuildCoin_Record = datetime.datetime(2020, 1, 1, 0, 0) -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 # Group `Storage` Storage_Storage = {} diff --git a/module/config/config_manual.py b/module/config/config_manual.py index 0ecfe067d..bf55d4cd0 100644 --- a/module/config/config_manual.py +++ b/module/config/config_manual.py @@ -23,11 +23,7 @@ class ManualConfig: > Daily > Hard > OpsiAshBeacon > OpsiAshAssist > OpsiMonthBoss > Sos > EventSp > EventA > EventB > EventC > EventD > RaidDaily > CoalitionSp > WarArchives > MaritimeEscort -<<<<<<< HEAD > Event > Event2 > Event3 > Raid > Coalition > Main > Main2 > Main3 -======= - > Event > Event2 > Raid > Coalition > Main > Main2 > Main3 ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 > OpsiMeowfficerFarming > GemsFarming > OpsiHazard1Leveling diff --git a/module/config/config_updater.py b/module/config/config_updater.py index 571e233fd..a376e8237 100644 --- a/module/config/config_updater.py +++ b/module/config/config_updater.py @@ -4,11 +4,7 @@ from copy import deepcopy from cached_property import cached_property -<<<<<<< HEAD from deploy.Windows.utils import DEPLOY_TEMPLATE, poor_yaml_read, poor_yaml_write -======= -from deploy.utils import DEPLOY_TEMPLATE, poor_yaml_read, poor_yaml_write ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 from module.base.timer import timer from module.config.env import IS_ON_PHONE_CLOUD from module.config.redirect_utils.utils import * @@ -34,11 +30,7 @@ ARCHIVES_PREFIX = { 'tw': '檔案 ' } MAINS = ['Main', 'Main2', 'Main3'] -<<<<<<< HEAD EVENTS = ['Event', 'Event2', 'Event3', 'EventA', 'EventB', 'EventC', 'EventD', 'EventSp'] -======= -EVENTS = ['Event', 'Event2', 'EventA', 'EventB', 'EventC', 'EventD', 'EventSp'] ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 GEMS_FARMINGS = ['GemsFarming'] RAIDS = ['Raid', 'RaidDaily'] WAR_ARCHIVES = ['WarArchives'] @@ -156,7 +148,6 @@ class ConfigGenerator: return read_file(filepath_argument('gui')) @cached_property -<<<<<<< HEAD def dashboard(self): """ @@ -166,8 +157,6 @@ class ConfigGenerator: @cached_property -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 @timer def args(self): """ @@ -181,19 +170,12 @@ class ConfigGenerator: """ # Construct args data = {} -<<<<<<< HEAD # Add dashboard to args dashboard_and_task = {**self.task, **self.dashboard} for path, groups in deep_iter(dashboard_and_task, depth=3): if 'tasks' not in path and 'Dashboard' not in path: continue task = path[2] if 'tasks' in path else path[0] -======= - for path, groups in deep_iter(self.task, depth=3): - if 'tasks' not in path: - continue - task = path[2] ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 # Add storage to all task groups.append('Storage') for group in groups: @@ -516,7 +498,6 @@ class ConfigGenerator: update('template-linux', linux) update('template-linux-cn', linux, cn) -<<<<<<< HEAD tpl = { 'Repository': '{{repository}}', 'GitExecutable': '{{gitExecutable}}', @@ -533,8 +514,6 @@ class ConfigGenerator: update('./webapp/packages/main/public/deploy.yaml.tpl', tpl) -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 def insert_package(self): option = deep_get(self.argument, keys='Emulator.PackageName.option') option += list(VALID_PACKAGE.keys()) diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 0ab32b346..0b6b46d64 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -74,13 +74,10 @@ "name": "活动图-2", "help": "" }, -<<<<<<< HEAD "Event3": { "name": "活动图-3", "help": "" }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "Raid": { "name": "共斗活动", "help": "" @@ -1153,16 +1150,11 @@ }, "ChangeVanguard": { "name": "更换前排", -<<<<<<< HEAD "help": "当前排红脸时更换前排，选择不更换则会强制红脸出击\n换前排通过找一艘心情不低于16、等级100的白鹰白皮驱逐完成，所以尽量保证有足够多的驱逐。国服以外则为等级70的白鹰白船驱逐。\n\n换装备只会更换正在装备中的栏位，即使是白装也会更换。如果指定了旗舰，则会更换全部5个装备，未指定旗舰只会更换设备。", -======= - "help": "当前排红脸时更换前排，选择不更换则会强制红脸出击\n换前排通过找一艘心情不低于10、等级100的白鹰白皮驱逐完成，所以尽量保证有足够多的驱逐。国服以外则为等级70的白鹰白船驱逐。\n\n换装备只会更换正在装备中的栏位，即使是白装也会更换。前排会更换全部5个装备。", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "disabled": "不更换", "ship": "更换舰船", "ship_equip": "更换舰船 + 装备" }, -<<<<<<< HEAD "ALLowLowVanguardLevel": { "name": "可更换低等级前排", "help": "倍率打开时，前排等级限制改为10以上即可。若为困难模式（如CD图）改为49级。" @@ -1178,8 +1170,6 @@ "name": "无法设置职能时停止任务", "help": "无法设置舰队职能时，以以下方式停止任务以免跨队队伍出击，石油被大量消耗：\n若设置了错误推送则推送任务停止的消息并停止该任务。\n若没有设置错误推送，则直接停止Alas。" }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "CommonDD": { "name": "指定前排", "help": "", @@ -2130,7 +2120,6 @@ "name": "演习", "help": "打演习，血量过低时自动撤退" }, -<<<<<<< HEAD "DelayUntilHoursBeforeNextUpdate": { "name": "推迟演习至下次更新次数前 X 小时", "help": "", @@ -2141,8 +2130,6 @@ "5": "5", "12": "不推迟" }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "OpponentChooseMode": { "name": "对手选择模式", "help": "", @@ -2299,7 +2286,6 @@ "3": "3", "4": "4" }, -<<<<<<< HEAD "FleetMode": { "name": "自律模式", "help": "", @@ -2308,8 +2294,6 @@ "stand_still_in_the_middle": "中路站桩", "hide_in_bottom_left": "躲左下角" }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "Submarine": { "name": "呼叫潜艇", "help": "开启后，运行间隔将增加至60分钟" @@ -2519,7 +2503,6 @@ "help": "游戏被强制结束后自动登录游戏" } }, -<<<<<<< HEAD "GGHandler": { "_info": { "name": "GG管理器", @@ -2817,8 +2800,6 @@ "help": "GuildCoin.Record.help" } }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "Storage": { "_info": { "name": "任务状态", @@ -2843,11 +2824,8 @@ "Stop": "停止", "ScrollON": "自动滚动 开", "ScrollOFF": "自动滚动 关", -<<<<<<< HEAD "DashboardON": "折叠", "DashboardOFF": "展开", -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "ClearLog": "清空日志", "Setting": "设置", "CheckUpdate": "检查更新", @@ -2880,7 +2858,6 @@ }, "Overview": { "Scheduler": "调度器", -<<<<<<< HEAD "Dashboard": "仪表盘", "SecondsAgo": "秒前", "MinutesAgo": "分钟前", @@ -2901,8 +2878,6 @@ "Medal": "勋章", "Core": "核心数据", "GuildCoin": "舰队币", -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "Log": "日志", "Running": "运行中", "Pending": "队列中", diff --git a/module/config/utils.py b/module/config/utils.py index 87dba5c94..1cf583025 100644 --- a/module/config/utils.py +++ b/module/config/utils.py @@ -646,7 +646,6 @@ def type_to_str(typ): return str(typ) -<<<<<<< HEAD def time_delta(_timedelta): """ Output the delta between two times @@ -689,7 +688,5 @@ def time_delta(_timedelta): return _time_dict -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 if __name__ == '__main__': get_os_reset_remain() diff --git a/module/daemon/game_manager.py b/module/daemon/game_manager.py index eeb916a55..bf27b6138 100644 --- a/module/daemon/game_manager.py +++ b/module/daemon/game_manager.py @@ -1,9 +1,6 @@ from module.handler.login import LoginHandler from module.logger import logger -<<<<<<< HEAD from module.gg_handler.gg_handler import GGHandler -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 class GameManager(LoginHandler): @@ -11,16 +8,9 @@ class GameManager(LoginHandler): logger.hr('Force Stop AzurLane', level=1) self.device.app_stop() logger.info('Force Stop finished') -<<<<<<< HEAD GGHandler(config=self.config, device=self.device).check_config() if self.config.GameManager_AutoRestart: LoginHandler(config=self.config, device=self.device).app_restart() -======= - - if self.config.GameManager_AutoRestart: - self.device.app_start() - self.handle_app_login() ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 if __name__ == '__main__': diff --git a/module/daemon/uncensored.py b/module/daemon/uncensored.py index e01d83640..68aea476d 100644 --- a/module/daemon/uncensored.py +++ b/module/daemon/uncensored.py @@ -1,12 +1,7 @@ import shutil -<<<<<<< HEAD from deploy.Windows.git import GitManager from deploy.Windows.utils import * -======= -from deploy.git import GitManager -from deploy.utils import * ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 from module.handler.login import LoginHandler from module.logger import logger diff --git a/module/daily/daily.py b/module/daily/daily.py index d9b9d4277..6b2e95bf7 100644 --- a/module/daily/daily.py +++ b/module/daily/daily.py @@ -4,11 +4,7 @@ from module.base.utils import get_color from module.combat.assets import BATTLE_PREPARATION from module.combat.combat import Combat from module.daily.assets import * -<<<<<<< HEAD from module.equipment.fleet_equipment import DailyEquipment -======= -from module.daily.equipment import DailyEquipment ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 from module.logger import logger from module.ocr.ocr import Digit from module.ui.assets import BACK_ARROW, DAILY_CHECK diff --git a/module/device/device.py b/module/device/device.py index bf75e313d..b88589447 100644 --- a/module/device/device.py +++ b/module/device/device.py @@ -12,7 +12,6 @@ from module.config.utils import get_server_next_update from module.device.app_control import AppControl from module.device.control import Control from module.device.screenshot import Screenshot -<<<<<<< HEAD from module.exception import ( EmulatorNotRunningError, GameNotRunningError, @@ -20,10 +19,6 @@ from module.exception import ( GameTooManyClickError, RequestHumanTakeover ) -======= -from module.exception import (EmulatorNotRunningError, GameNotRunningError, GameStuckError, GameTooManyClickError, - RequestHumanTakeover) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 from module.handler.assets import GET_MISSION from module.logger import logger diff --git a/module/device/method/adb.py b/module/device/method/adb.py index 65ff9e133..9bf0f216b 100644 --- a/module/device/method/adb.py +++ b/module/device/method/adb.py @@ -11,11 +11,7 @@ from module.base.decorator import Config from module.device.connection import Connection from module.device.method.utils import (RETRY_TRIES, retry_sleep, remove_prefix, handle_adb_error, ImageTruncated, PackageNotInstalled) -<<<<<<< HEAD from module.exception import RequestHumanTakeover, ScriptError, EmulatorNotRunningError -======= -from module.exception import RequestHumanTakeover, ScriptError ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 from module.logger import logger @@ -61,7 +57,6 @@ def retry(func): def init(): pass -<<<<<<< HEAD except AdbError as e: logger.exception(e) import sys @@ -80,8 +75,6 @@ def retry(func): def init(): pass -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 # Unknown except Exception as e: logger.exception(e) diff --git a/module/device/method/droidcast.py b/module/device/method/droidcast.py index 898b33f71..eb15f4c1a 100644 --- a/module/device/method/droidcast.py +++ b/module/device/method/droidcast.py @@ -6,11 +6,7 @@ import numpy as np import requests from adbutils.errors import AdbError -<<<<<<< HEAD from module.base.decorator import cached_property, del_cached_property, Config -======= -from module.base.decorator import cached_property, del_cached_property ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 from module.base.timer import Timer from module.device.method.uiautomator_2 import ProcessInfo, Uiautomator2 from module.device.method.utils import ( @@ -258,11 +254,7 @@ class DroidCast(Uiautomator2): raise DroidCastVersionIncompatible( 'Requesting screenshots from `DroidCast_raw` but server is `DroidCast`') # ValueError: cannot reshape array of size 0 into shape (720,1280) -<<<<<<< HEAD raise ImageTruncated(str(e)+'\nIf your emulator resolution not 1280x720, please set emulator resolution to 1280x720') -======= - raise ImageTruncated(str(e)) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 # Convert RGB565 to RGB888 # https://blog.csdn.net/happy08god/article/details/10516871 diff --git a/module/device/screenshot.py b/module/device/screenshot.py index 7d7d7304f..83685be2b 100644 --- a/module/device/screenshot.py +++ b/module/device/screenshot.py @@ -268,8 +268,4 @@ class Screenshot(Adb, WSA, DroidCast, AScreenCap, Scrcpy, NemuIpc): return False else: self._screen_black_checked = True -<<<<<<< HEAD return True -======= - return True ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 diff --git a/module/dorm/assets.py b/module/dorm/assets.py index e07ba47ed..4464ace41 100644 --- a/module/dorm/assets.py +++ b/module/dorm/assets.py @@ -19,11 +19,7 @@ DORM_FURNITURE_SHOP_FIRST_SELECTED = Button(area={'cn': (239, 519, 273, 525), 'e DORM_FURNITURE_SHOP_QUIT = Button(area={'cn': (38, 34, 58, 63), 'en': (38, 34, 58, 63), 'jp': (38, 34, 58, 63), 'tw': (38, 34, 58, 63)}, color={'cn': (255, 241, 195), 'en': (255, 241, 195), 'jp': (255, 241, 195), 'tw': (255, 241, 195)}, button={'cn': (38, 34, 58, 63), 'en': (38, 34, 58, 63), 'jp': (38, 34, 58, 63), 'tw': (38, 34, 58, 63)}, file={'cn': './assets/cn/dorm/DORM_FURNITURE_SHOP_QUIT.png', 'en': './assets/en/dorm/DORM_FURNITURE_SHOP_QUIT.png', 'jp': './assets/jp/dorm/DORM_FURNITURE_SHOP_QUIT.png', 'tw': './assets/tw/dorm/DORM_FURNITURE_SHOP_QUIT.png'}) DORM_MANAGE = Button(area={'cn': (949, 600, 1005, 659), 'en': (949, 600, 1005, 659), 'jp': (949, 600, 1005, 659), 'tw': (949, 600, 1005, 659)}, color={'cn': (255, 245, 213), 'en': (255, 245, 213), 'jp': (255, 245, 213), 'tw': (255, 245, 213)}, button={'cn': (949, 600, 1005, 659), 'en': (949, 600, 1005, 659), 'jp': (949, 600, 1005, 659), 'tw': (949, 600, 1005, 659)}, file={'cn': './assets/cn/dorm/DORM_MANAGE.png', 'en': './assets/en/dorm/DORM_MANAGE.png', 'jp': './assets/jp/dorm/DORM_MANAGE.png', 'tw': './assets/tw/dorm/DORM_MANAGE.png'}) DORM_MANAGE_CHECK = Button(area={'cn': (1128, 116, 1150, 135), 'en': (1128, 116, 1150, 135), 'jp': (1128, 116, 1150, 135), 'tw': (1128, 116, 1150, 135)}, color={'cn': (173, 147, 77), 'en': (173, 147, 77), 'jp': (173, 147, 77), 'tw': (173, 147, 77)}, button={'cn': (1128, 116, 1150, 135), 'en': (1128, 116, 1150, 135), 'jp': (1128, 116, 1150, 135), 'tw': (1128, 116, 1150, 135)}, file={'cn': './assets/cn/dorm/DORM_MANAGE_CHECK.png', 'en': './assets/en/dorm/DORM_MANAGE_CHECK.png', 'jp': './assets/jp/dorm/DORM_MANAGE_CHECK.png', 'tw': './assets/tw/dorm/DORM_MANAGE_CHECK.png'}) -<<<<<<< HEAD DORM_RED_DOT = Button(area={'cn': (528, 339, 543, 356), 'en': (528, 339, 543, 356), 'jp': (528, 339, 543, 356), 'tw': (734, 215, 767, 248)}, color={'cn': (214, 126, 114), 'en': (214, 126, 114), 'jp': (214, 126, 114), 'tw': (130, 89, 94)}, button={'cn': (528, 339, 543, 356), 'en': (528, 339, 543, 356), 'jp': (528, 339, 543, 356), 'tw': (734, 215, 767, 248)}, file={'cn': './assets/cn/dorm/DORM_RED_DOT.png', 'en': './assets/en/dorm/DORM_RED_DOT.png', 'jp': './assets/jp/dorm/DORM_RED_DOT.png', 'tw': './assets/tw/dorm/DORM_RED_DOT.png'}) -======= -DORM_RED_DOT = Button(area={'cn': (528, 339, 543, 356), 'en': (528, 339, 543, 356), 'jp': (528, 339, 543, 356), 'tw': (528, 339, 543, 356)}, color={'cn': (214, 126, 114), 'en': (214, 126, 114), 'jp': (214, 126, 114), 'tw': (214, 126, 114)}, button={'cn': (528, 339, 543, 356), 'en': (528, 339, 543, 356), 'jp': (528, 339, 543, 356), 'tw': (528, 339, 543, 356)}, file={'cn': './assets/cn/dorm/DORM_RED_DOT.png', 'en': './assets/en/dorm/DORM_RED_DOT.png', 'jp': './assets/jp/dorm/DORM_RED_DOT.png', 'tw': './assets/tw/dorm/DORM_RED_DOT.png'}) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 OCR_DORM_FILL = Button(area={'cn': (813, 271, 987, 296), 'en': (813, 271, 987, 296), 'jp': (813, 271, 987, 296), 'tw': (813, 271, 987, 296)}, color={'cn': (222, 213, 193), 'en': (222, 213, 193), 'jp': (222, 213, 193), 'tw': (222, 213, 193)}, button={'cn': (813, 271, 987, 296), 'en': (813, 271, 987, 296), 'jp': (813, 271, 987, 296), 'tw': (813, 271, 987, 296)}, file={'cn': './assets/cn/dorm/OCR_DORM_FILL.png', 'en': './assets/en/dorm/OCR_DORM_FILL.png', 'jp': './assets/jp/dorm/OCR_DORM_FILL.png', 'tw': './assets/tw/dorm/OCR_DORM_FILL.png'}) OCR_DORM_FURNITURE_COIN = Button(area={'cn': (897, 20, 988, 49), 'en': (897, 20, 988, 49), 'jp': (897, 20, 988, 49), 'tw': (897, 20, 988, 49)}, color={'cn': (203, 197, 194), 'en': (203, 197, 194), 'jp': (203, 197, 194), 'tw': (203, 197, 194)}, button={'cn': (897, 20, 988, 49), 'en': (897, 20, 988, 49), 'jp': (897, 20, 988, 49), 'tw': (897, 20, 988, 49)}, file={'cn': './assets/cn/dorm/OCR_DORM_FURNITURE_COIN.png', 'en': './assets/en/dorm/OCR_DORM_FURNITURE_COIN.png', 'jp': './assets/jp/dorm/OCR_DORM_FURNITURE_COIN.png', 'tw': './assets/tw/dorm/OCR_DORM_FURNITURE_COIN.png'}) OCR_DORM_FURNITURE_PRICE = Button(area={'cn': (819, 417, 896, 442), 'en': (819, 417, 896, 442), 'jp': (819, 417, 896, 442), 'tw': (819, 417, 896, 442)}, color={'cn': (227, 223, 220), 'en': (227, 223, 220), 'jp': (227, 223, 220), 'tw': (227, 223, 220)}, button={'cn': (819, 417, 896, 442), 'en': (819, 417, 896, 442), 'jp': (819, 417, 896, 442), 'tw': (819, 417, 896, 442)}, file={'cn': './assets/cn/dorm/OCR_DORM_FURNITURE_PRICE.png', 'en': './assets/en/dorm/OCR_DORM_FURNITURE_PRICE.png', 'jp': './assets/jp/dorm/OCR_DORM_FURNITURE_PRICE.png', 'tw': './assets/tw/dorm/OCR_DORM_FURNITURE_PRICE.png'}) diff --git a/module/equipment/assets.py b/module/equipment/assets.py index e86e53d82..30ebfd803 100644 --- a/module/equipment/assets.py +++ b/module/equipment/assets.py @@ -8,17 +8,10 @@ EQUIPMENT_CLOSE = Button(area={'cn': (1139, 87, 1231, 111), 'en': (1139, 86, 123 EQUIPMENT_OPEN = Button(area={'cn': (1139, 87, 1231, 111), 'en': (1143, 90, 1229, 110), 'jp': (1140, 88, 1234, 111), 'tw': (1138, 87, 1232, 112)}, color={'cn': (82, 137, 199), 'en': (75, 134, 200), 'jp': (80, 135, 198), 'tw': (86, 139, 198)}, button={'cn': (1139, 87, 1231, 111), 'en': (1143, 90, 1229, 110), 'jp': (1140, 88, 1234, 111), 'tw': (1138, 87, 1232, 112)}, file={'cn': './assets/cn/equipment/EQUIPMENT_OPEN.png', 'en': './assets/en/equipment/EQUIPMENT_OPEN.png', 'jp': './assets/jp/equipment/EQUIPMENT_OPEN.png', 'tw': './assets/tw/equipment/EQUIPMENT_OPEN.png'}) EQUIPMENT_SCROLL_BOTTOM = Button(area={'cn': (1256, 575, 1264, 583), 'en': (1256, 575, 1264, 583), 'jp': (1256, 575, 1264, 583), 'tw': (1256, 575, 1264, 583)}, color={'cn': (244, 209, 66), 'en': (244, 209, 66), 'jp': (244, 209, 66), 'tw': (244, 209, 66)}, button={'cn': (1256, 575, 1264, 583), 'en': (1256, 575, 1264, 583), 'jp': (1256, 575, 1264, 583), 'tw': (1256, 575, 1264, 583)}, file={'cn': './assets/cn/equipment/EQUIPMENT_SCROLL_BOTTOM.png', 'en': './assets/en/equipment/EQUIPMENT_SCROLL_BOTTOM.png', 'jp': './assets/jp/equipment/EQUIPMENT_SCROLL_BOTTOM.png', 'tw': './assets/tw/equipment/EQUIPMENT_SCROLL_BOTTOM.png'}) EQUIPPING_OFF = Button(area={'cn': (25, 565, 60, 589), 'en': (30, 585, 59, 605), 'jp': (25, 565, 60, 589), 'tw': (25, 565, 60, 589)}, color={'cn': (94, 101, 104), 'en': (65, 70, 96), 'jp': (94, 101, 104), 'tw': (94, 101, 104)}, button={'cn': (25, 565, 60, 589), 'en': (30, 585, 59, 605), 'jp': (25, 565, 60, 589), 'tw': (25, 565, 60, 589)}, file={'cn': './assets/cn/equipment/EQUIPPING_OFF.png', 'en': './assets/en/equipment/EQUIPPING_OFF.png', 'jp': './assets/jp/equipment/EQUIPPING_OFF.png', 'tw': './assets/tw/equipment/EQUIPPING_OFF.png'}) -<<<<<<< HEAD EQUIPPING_ON = Button(area={'cn': (26, 485, 60, 510), 'en': (32, 563, 54, 583), 'jp': (26, 485, 60, 510), 'tw': (26, 485, 60, 510)}, color={'cn': (184, 191, 214), 'en': (164, 173, 208), 'jp': (184, 191, 214), 'tw': (184, 191, 214)}, button={'cn': (26, 486, 57, 584), 'en': (7, 559, 78, 606), 'jp': (26, 486, 57, 584), 'tw': (26, 483, 61, 590)}, file={'cn': './assets/cn/equipment/EQUIPPING_ON.png', 'en': './assets/en/equipment/EQUIPPING_ON.png', 'jp': './assets/jp/equipment/EQUIPPING_ON.png', 'tw': './assets/tw/equipment/EQUIPPING_ON.png'}) EQUIP_1 = Button(area={'cn': (1191, 266, 1247, 319), 'en': (1200, 273, 1241, 314), 'jp': (1191, 265, 1248, 320), 'tw': (1190, 265, 1249, 319)}, color={'cn': (98, 142, 207), 'en': (77, 130, 192), 'jp': (97, 142, 206), 'tw': (102, 147, 211)}, button={'cn': (1191, 266, 1247, 319), 'en': (1200, 273, 1241, 314), 'jp': (1191, 265, 1248, 320), 'tw': (1190, 265, 1249, 319)}, file={'cn': './assets/cn/equipment/EQUIP_1.png', 'en': './assets/en/equipment/EQUIP_1.png', 'jp': './assets/jp/equipment/EQUIP_1.png', 'tw': './assets/tw/equipment/EQUIP_1.png'}) EQUIP_2 = Button(area={'cn': (1191, 366, 1247, 419), 'en': (1200, 374, 1241, 415), 'jp': (1191, 365, 1248, 420), 'tw': (1190, 365, 1249, 419)}, color={'cn': (95, 139, 202), 'en': (77, 130, 192), 'jp': (94, 138, 201), 'tw': (100, 144, 208)}, button={'cn': (1191, 366, 1247, 419), 'en': (1200, 374, 1241, 415), 'jp': (1191, 365, 1248, 420), 'tw': (1190, 365, 1249, 419)}, file={'cn': './assets/cn/equipment/EQUIP_2.png', 'en': './assets/en/equipment/EQUIP_2.png', 'jp': './assets/jp/equipment/EQUIP_2.png', 'tw': './assets/tw/equipment/EQUIP_2.png'}) EQUIP_3 = Button(area={'cn': (1191, 466, 1247, 519), 'en': (1200, 475, 1241, 516), 'jp': (1190, 467, 1249, 520), 'tw': (1190, 466, 1249, 520)}, color={'cn': (94, 137, 201), 'en': (80, 132, 192), 'jp': (89, 134, 197), 'tw': (97, 142, 205)}, button={'cn': (1191, 466, 1247, 519), 'en': (1200, 475, 1241, 516), 'jp': (1190, 467, 1249, 520), 'tw': (1190, 466, 1249, 520)}, file={'cn': './assets/cn/equipment/EQUIP_3.png', 'en': './assets/en/equipment/EQUIP_3.png', 'jp': './assets/jp/equipment/EQUIP_3.png', 'tw': './assets/tw/equipment/EQUIP_3.png'}) -======= -EQUIPPING_ON = Button(area={'cn': (26, 510, 57, 584), 'en': (32, 563, 54, 583), 'jp': (32, 513, 55, 586), 'tw': (26, 510, 61, 590)}, color={'cn': (97, 115, 156), 'en': (164, 173, 208), 'jp': (108, 123, 165), 'tw': (86, 105, 148)}, button={'cn': (26, 510, 57, 584), 'en': (7, 559, 78, 606), 'jp': (32, 513, 55, 586), 'tw': (26, 510, 61, 590)}, file={'cn': './assets/cn/equipment/EQUIPPING_ON.png', 'en': './assets/en/equipment/EQUIPPING_ON.png', 'jp': './assets/jp/equipment/EQUIPPING_ON.png', 'tw': './assets/tw/equipment/EQUIPPING_ON.png'}) -EQUIP_1 = Button(area={'cn': (1211, 274, 1230, 315), 'en': (1200, 273, 1241, 314), 'jp': (1191, 265, 1248, 320), 'tw': (1190, 265, 1249, 319)}, color={'cn': (133, 181, 222), 'en': (77, 130, 192), 'jp': (97, 142, 206), 'tw': (102, 147, 211)}, button={'cn': (1211, 274, 1230, 315), 'en': (1200, 273, 1241, 314), 'jp': (1191, 265, 1248, 320), 'tw': (1190, 265, 1249, 319)}, file={'cn': './assets/cn/equipment/EQUIP_1.png', 'en': './assets/en/equipment/EQUIP_1.png', 'jp': './assets/jp/equipment/EQUIP_1.png', 'tw': './assets/tw/equipment/EQUIP_1.png'}) -EQUIP_2 = Button(area={'cn': (1211, 374, 1230, 416), 'en': (1200, 374, 1241, 415), 'jp': (1191, 365, 1248, 420), 'tw': (1190, 365, 1249, 419)}, color={'cn': (130, 179, 220), 'en': (77, 130, 192), 'jp': (94, 138, 201), 'tw': (100, 144, 208)}, button={'cn': (1211, 374, 1230, 416), 'en': (1200, 374, 1241, 415), 'jp': (1191, 365, 1248, 420), 'tw': (1190, 365, 1249, 419)}, file={'cn': './assets/cn/equipment/EQUIP_2.png', 'en': './assets/en/equipment/EQUIP_2.png', 'jp': './assets/jp/equipment/EQUIP_2.png', 'tw': './assets/tw/equipment/EQUIP_2.png'}) -EQUIP_3 = Button(area={'cn': (1211, 475, 1230, 517), 'en': (1200, 475, 1241, 516), 'jp': (1190, 467, 1249, 520), 'tw': (1190, 466, 1249, 520)}, color={'cn': (130, 179, 220), 'en': (80, 132, 192), 'jp': (89, 134, 197), 'tw': (97, 142, 205)}, button={'cn': (1211, 475, 1230, 517), 'en': (1200, 475, 1241, 516), 'jp': (1190, 467, 1249, 520), 'tw': (1190, 466, 1249, 520)}, file={'cn': './assets/cn/equipment/EQUIP_3.png', 'en': './assets/en/equipment/EQUIP_3.png', 'jp': './assets/jp/equipment/EQUIP_3.png', 'tw': './assets/tw/equipment/EQUIP_3.png'}) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 EQUIP_CONFIRM = Button(area={'cn': (792, 623, 959, 677), 'en': (809, 633, 940, 658), 'jp': (792, 623, 960, 674), 'tw': (792, 623, 960, 677)}, color={'cn': (222, 154, 59), 'en': (236, 192, 133), 'jp': (222, 152, 55), 'tw': (223, 153, 57)}, button={'cn': (792, 623, 959, 677), 'en': (793, 620, 961, 673), 'jp': (792, 623, 960, 674), 'tw': (792, 623, 960, 677)}, file={'cn': './assets/cn/equipment/EQUIP_CONFIRM.png', 'en': './assets/en/equipment/EQUIP_CONFIRM.png', 'jp': './assets/jp/equipment/EQUIP_CONFIRM.png', 'tw': './assets/tw/equipment/EQUIP_CONFIRM.png'}) EQUIP_OFF = Button(area={'cn': (907, 565, 1037, 610), 'en': (911, 564, 1034, 607), 'jp': (908, 564, 1039, 612), 'tw': (907, 565, 1037, 611)}, color={'cn': (112, 153, 216), 'en': (91, 142, 212), 'jp': (110, 151, 213), 'tw': (106, 150, 214)}, button={'cn': (907, 565, 1037, 610), 'en': (911, 564, 1034, 607), 'jp': (908, 564, 1039, 612), 'tw': (907, 565, 1037, 611)}, file={'cn': './assets/cn/equipment/EQUIP_OFF.png', 'en': './assets/en/equipment/EQUIP_OFF.png', 'jp': './assets/jp/equipment/EQUIP_OFF.png', 'tw': './assets/tw/equipment/EQUIP_OFF.png'}) EQUIP_SAVE = Button(area={'cn': (355, 312, 452, 433), 'en': (355, 312, 452, 433), 'jp': (407, 312, 476, 404), 'tw': (355, 312, 452, 433)}, color={'cn': (170, 156, 122), 'en': (170, 156, 122), 'jp': (119, 94, 128), 'tw': (170, 156, 122)}, button={'cn': (355, 312, 452, 433), 'en': (355, 312, 452, 433), 'jp': (407, 312, 476, 404), 'tw': (355, 312, 452, 433)}, file={'cn': './assets/cn/equipment/EQUIP_SAVE.png', 'en': './assets/en/equipment/EQUIP_SAVE.png', 'jp': './assets/jp/equipment/EQUIP_SAVE.png', 'tw': './assets/tw/equipment/EQUIP_SAVE.png'}) @@ -33,11 +26,7 @@ FLEET_DETAIL_CHECK = Button(area={'cn': (915, 647, 980, 679), 'en': (915, 649, 9 FLEET_DETAIL_ENTER = Button(area={'cn': (729, 314, 802, 438), 'en': (729, 314, 802, 438), 'jp': (729, 314, 802, 438), 'tw': (729, 314, 802, 438)}, color={'cn': (154, 149, 147), 'en': (154, 149, 147), 'jp': (154, 149, 147), 'tw': (154, 149, 147)}, button={'cn': (729, 314, 802, 438), 'en': (729, 314, 802, 438), 'jp': (729, 314, 802, 438), 'tw': (729, 314, 802, 438)}, file={'cn': './assets/cn/equipment/FLEET_DETAIL_ENTER.png', 'en': './assets/en/equipment/FLEET_DETAIL_ENTER.png', 'jp': './assets/jp/equipment/FLEET_DETAIL_ENTER.png', 'tw': './assets/tw/equipment/FLEET_DETAIL_ENTER.png'}) FLEET_DETAIL_ENTER_FLAGSHIP = Button(area={'cn': (103, 327, 176, 437), 'en': (103, 327, 176, 437), 'jp': (103, 327, 176, 437), 'tw': (103, 327, 176, 437)}, color={'cn': (141, 135, 138), 'en': (141, 135, 138), 'jp': (141, 135, 138), 'tw': (141, 135, 138)}, button={'cn': (103, 327, 176, 437), 'en': (103, 327, 176, 437), 'jp': (103, 327, 176, 437), 'tw': (103, 327, 176, 437)}, file={'cn': './assets/cn/equipment/FLEET_DETAIL_ENTER_FLAGSHIP.png', 'en': './assets/en/equipment/FLEET_DETAIL_ENTER_FLAGSHIP.png', 'jp': './assets/jp/equipment/FLEET_DETAIL_ENTER_FLAGSHIP.png', 'tw': './assets/tw/equipment/FLEET_DETAIL_ENTER_FLAGSHIP.png'}) FLEET_ENTER = Button(area={'cn': (502, 474, 517, 489), 'en': (502, 474, 517, 489), 'jp': (502, 474, 517, 489), 'tw': (502, 474, 517, 489)}, color={'cn': (58, 62, 77), 'en': (58, 62, 77), 'jp': (58, 62, 77), 'tw': (58, 62, 77)}, button={'cn': (502, 474, 517, 489), 'en': (502, 474, 517, 489), 'jp': (502, 474, 517, 489), 'tw': (502, 474, 517, 489)}, file={'cn': './assets/cn/equipment/FLEET_ENTER.png', 'en': './assets/en/equipment/FLEET_ENTER.png', 'jp': './assets/jp/equipment/FLEET_ENTER.png', 'tw': './assets/tw/equipment/FLEET_ENTER.png'}) -<<<<<<< HEAD FLEET_ENTER_FLAGSHIP = Button(area={'cn': (577, 306, 604, 321), 'en': (577, 306, 604, 321), 'jp': (577, 306, 604, 321), 'tw': (577, 306, 604, 321)}, color={'cn': (95, 83, 74), 'en': (95, 83, 74), 'jp': (95, 83, 74), 'tw': (95, 83, 74)}, button={'cn': (577, 306, 604, 321), 'en': (577, 306, 604, 321), 'jp': (577, 306, 604, 321), 'tw': (577, 306, 604, 321)}, file={'cn': './assets/cn/equipment/FLEET_ENTER_FLAGSHIP.png', 'en': './assets/en/equipment/FLEET_ENTER_FLAGSHIP.png', 'jp': './assets/jp/equipment/FLEET_ENTER_FLAGSHIP.png', 'tw': './assets/tw/equipment/FLEET_ENTER_FLAGSHIP.png'}) -======= -FLEET_ENTER_FLAGSHIP = Button(area={'cn': (577, 277, 605, 291), 'en': (577, 277, 605, 291), 'jp': (577, 277, 605, 291), 'tw': (577, 277, 605, 291)}, color={'cn': (132, 124, 128), 'en': (132, 124, 128), 'jp': (132, 124, 128), 'tw': (132, 124, 128)}, button={'cn': (577, 277, 605, 291), 'en': (577, 277, 605, 291), 'jp': (577, 277, 605, 291), 'tw': (577, 277, 605, 291)}, file={'cn': './assets/cn/equipment/FLEET_ENTER_FLAGSHIP.png', 'en': './assets/en/equipment/FLEET_ENTER_FLAGSHIP.png', 'jp': './assets/jp/equipment/FLEET_ENTER_FLAGSHIP.png', 'tw': './assets/tw/equipment/FLEET_ENTER_FLAGSHIP.png'}) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 FLEET_NEXT = Button(area={'cn': (1234, 327, 1254, 356), 'en': (1234, 327, 1254, 356), 'jp': (1234, 327, 1254, 356), 'tw': (1234, 327, 1254, 356)}, color={'cn': (72, 93, 125), 'en': (72, 93, 125), 'jp': (72, 93, 125), 'tw': (72, 93, 125)}, button={'cn': (1234, 327, 1254, 356), 'en': (1234, 327, 1254, 356), 'jp': (1234, 327, 1254, 356), 'tw': (1234, 327, 1254, 356)}, file={'cn': './assets/cn/equipment/FLEET_NEXT.png', 'en': './assets/en/equipment/FLEET_NEXT.png', 'jp': './assets/jp/equipment/FLEET_NEXT.png', 'tw': './assets/tw/equipment/FLEET_NEXT.png'}) FLEET_PREV = Button(area={'cn': (26, 327, 46, 356), 'en': (26, 327, 46, 356), 'jp': (26, 327, 46, 356), 'tw': (26, 327, 46, 356)}, color={'cn': (72, 93, 125), 'en': (72, 93, 125), 'jp': (72, 93, 125), 'tw': (72, 93, 125)}, button={'cn': (26, 327, 46, 356), 'en': (26, 327, 46, 356), 'jp': (26, 327, 46, 356), 'tw': (26, 327, 46, 356)}, file={'cn': './assets/cn/equipment/FLEET_PREV.png', 'en': './assets/en/equipment/FLEET_PREV.png', 'jp': './assets/jp/equipment/FLEET_PREV.png', 'tw': './assets/tw/equipment/FLEET_PREV.png'}) OCR_FLEET_INDEX = Button(area={'cn': (957, 113, 987, 163), 'en': (957, 113, 987, 163), 'jp': (957, 113, 987, 163), 'tw': (957, 113, 987, 163)}, color={'cn': (36, 54, 86), 'en': (36, 54, 86), 'jp': (36, 54, 86), 'tw': (36, 54, 86)}, button={'cn': (957, 113, 987, 163), 'en': (957, 113, 987, 163), 'jp': (957, 113, 987, 163), 'tw': (957, 113, 987, 163)}, file={'cn': './assets/cn/equipment/OCR_FLEET_INDEX.png', 'en': './assets/en/equipment/OCR_FLEET_INDEX.png', 'jp': './assets/jp/equipment/OCR_FLEET_INDEX.png', 'tw': './assets/tw/equipment/OCR_FLEET_INDEX.png'}) diff --git a/module/equipment/equipment.py b/module/equipment/equipment.py index c791b7b4c..3e7920f11 100644 --- a/module/equipment/equipment.py +++ b/module/equipment/equipment.py @@ -8,14 +8,11 @@ from module.retire.assets import EQUIP_CONFIRM as RETIRE_EQUIP_CONFIRM from module.storage.storage import StorageHandler from module.ui.assets import BACK_ARROW from module.ui.navbar import Navbar -<<<<<<< HEAD from module.ui.switch import Switch equipping_filter = Switch('Equiping_filter') equipping_filter.add_status('on', check_button=EQUIPPING_ON) equipping_filter.add_status('off', check_button=EQUIPPING_OFF) -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 SWIPE_DISTANCE = 250 SWIPE_RANDOM_RANGE = (-40, -20, 40, 20) @@ -24,15 +21,11 @@ SWIPE_RANDOM_RANGE = (-40, -20, 40, 20) class Equipment(StorageHandler): equipment_has_take_on = False -<<<<<<< HEAD def equipping_set(self, enable=False): if equipping_filter.set('on' if enable else 'off', main=self): self.wait_until_stable(SWIPE_AREA) def _equip_view_swipe(self, distance, check_button=EQUIPMENT_OPEN): -======= - def _ship_view_swipe(self, distance, check_button=EQUIPMENT_OPEN): ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 swipe_count = 0 swipe_timer = Timer(5, count=10) self.handle_info_bar() @@ -43,11 +36,7 @@ class Equipment(StorageHandler): if not swipe_timer.started() or swipe_timer.reached(): swipe_timer.reset() self.device.swipe_vector(vector=(distance, 0), box=SWIPE_AREA.area, random_range=SWIPE_RANDOM_RANGE, -<<<<<<< HEAD padding=0, duration=(0.1, 0.12), name='EQUIP_SWIPE') -======= - padding=0, duration=(0.1, 0.12), name='SHIP_SWIPE') ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 # self.wait_until_appear(check_button, offset=(30, 30)) skip_first_screenshot = True while 1: @@ -58,22 +47,14 @@ class Equipment(StorageHandler): if self.appear(check_button, offset=(30, 30)): break if self.appear(RETIRE_EQUIP_CONFIRM, offset=(30, 30)): -<<<<<<< HEAD logger.info('RETIRE_EQUIP_CONFIRM popup in _equip_view_swipe()') -======= - logger.info('RETIRE_EQUIP_CONFIRM popup in _ship_view_swipe()') ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 return False swipe_count += 1 self.device.screenshot() if self.appear(RETIRE_EQUIP_CONFIRM, offset=(30, 30)): -<<<<<<< HEAD logger.info('RETIRE_EQUIP_CONFIRM popup in _equip_view_swipe()') -======= - logger.info('RETIRE_EQUIP_CONFIRM popup in _ship_view_swipe()') ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 return False if SWIPE_CHECK.match(self.device.image): if swipe_count > 1: @@ -85,7 +66,6 @@ class Equipment(StorageHandler): logger.info('New ship detected on swipe') return True -<<<<<<< HEAD def equip_view_next(self, check_button=EQUIPMENT_OPEN): return self._equip_view_swipe(distance=-SWIPE_DISTANCE, check_button=check_button) @@ -98,39 +78,17 @@ class Equipment(StorageHandler): while 1: if skil_first_screenshot: skil_first_screenshot = False -======= - def ship_view_next(self, check_button=EQUIPMENT_OPEN): - return self._ship_view_swipe(distance=-SWIPE_DISTANCE, check_button=check_button) - - def ship_view_prev(self, check_button=EQUIPMENT_OPEN): - return self._ship_view_swipe(distance=SWIPE_DISTANCE, check_button=check_button) - - def ship_info_enter(self, click_button, check_button=EQUIPMENT_OPEN, long_click=True, skip_first_screenshot=True): - enter_timer = Timer(10) - - while 1: - if skip_first_screenshot: - skip_first_screenshot = False ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 else: self.device.screenshot() # End -<<<<<<< HEAD if self.appear(check_button): -======= - if self.appear(check_button, offset=(5, 5)): ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 break # Long click accidentally became normal click, exit from dock if long_click: if self.appear(DOCK_CHECK, offset=(20, 20), interval=3): -<<<<<<< HEAD logger.info(f'equip_enter {DOCK_CHECK} -> {BACK_ARROW}') -======= - logger.info(f'ship_info_enter {DOCK_CHECK} -> {BACK_ARROW}') ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 self.device.click(BACK_ARROW) continue if enter_timer.reached(): @@ -141,11 +99,7 @@ class Equipment(StorageHandler): enter_timer.reset() @cached_property -<<<<<<< HEAD def _equip_side_navbar(self): -======= - def _ship_side_navbar(self): ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 """ pry_sidebar 3 options research. @@ -165,7 +119,6 @@ class Equipment(StorageHandler): equipment. detail. """ -<<<<<<< HEAD equip_side_navbar = ButtonGrid( origin=(21, 118), delta=(0, 94.5), button_shape=(60, 75), grid_shape=(1, 5), name='DETAIL_SIDE_NAVBAR') @@ -174,16 +127,6 @@ class Equipment(StorageHandler): inactive_color=(140, 162, 181), inactive_threshold=221) def equip_side_navbar_ensure(self, upper=None, bottom=None): -======= - ship_side_navbar = ButtonGrid( - origin=(21, 118), delta=(0, 94.5), button_shape=(60, 75), grid_shape=(1, 5), name='SHIP_SIDE_NAVBAR') - - return Navbar(grids=ship_side_navbar, - active_color=(247, 255, 173), active_threshold=221, - inactive_color=(140, 162, 181), inactive_threshold=221) - - def ship_side_navbar_ensure(self, upper=None, bottom=None): ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 """ Ensure able to transition to page Whether page has completely loaded is handled @@ -210,43 +153,25 @@ class Equipment(StorageHandler): Returns: bool: if side_navbar set ensured """ -<<<<<<< HEAD if self._equip_side_navbar.get_total(main=self) == 3: -======= - if self._ship_side_navbar.get_total(main=self) == 3: ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 if upper == 1 or bottom == 3: logger.warning('Transitions to "research" is not supported') return False -<<<<<<< HEAD if self._equip_side_navbar.set(self, upper=upper, bottom=bottom): return True return False def _equip_take_off_one(self, skip_first_screenshot=True): -======= - if self._ship_side_navbar.set(self, upper=upper, bottom=bottom): - return True - return False - - def ship_equipment_take_off(self, skip_first_screenshot=True): ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 bar_timer = Timer(5) off_timer = Timer(5) confirm_timer = Timer(5) while 1: if skip_first_screenshot: -<<<<<<< HEAD self.device.screenshot() else: skip_first_screenshot = False -======= - skip_first_screenshot = False - else: - self.device.screenshot() ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 # End # if self.handle_info_bar(): @@ -257,11 +182,7 @@ class Equipment(StorageHandler): if self.handle_storage_full(): continue -<<<<<<< HEAD if confirm_timer.reached() and self.handle_popup_confirm(): -======= - if confirm_timer.reached() and self.handle_popup_confirm('EQUIPMENT_TAKE_OFF'): ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 confirm_timer.reset() continue @@ -276,7 +197,6 @@ class Equipment(StorageHandler): bar_timer.reset() continue -<<<<<<< HEAD def equipment_take_off(self, enter, out, fleet): """ Args: @@ -294,46 +214,19 @@ class Equipment(StorageHandler): else: self._equip_take_off_one() self.ui_click(click_button=EQUIPMENT_CLOSE, check_button=EQUIPMENT_OPEN, offset=None) -======= - def fleet_equipment_take_off(self, enter, long_click, out): - """ - Args: - enter (Button): Button to edit equipment. - long_click (bool): How to click enter - out (Button): Button to confirm exit success. - """ - logger.hr('Equipment take off') - self.ship_info_enter(enter, long_click=long_click) - - while True: - self.ship_equipment_take_off() - self.ui_click(EQUIPMENT_CLOSE, check_button=EQUIPMENT_OPEN, skip_first_screenshot=True) - if not self.ship_view_next(): - break ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 self.ui_back(out) self.equipment_has_take_on = False -<<<<<<< HEAD def _equip_take_on_one(self, index, skip_first_screenshot=True): -======= - def ship_equipment_take_on_preset(self, index, skip_first_screenshot=True): ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 bar_timer = Timer(5) on_timer = Timer(5) while 1: if skip_first_screenshot: -<<<<<<< HEAD self.device.screenshot() else: skip_first_screenshot = False -======= - skip_first_screenshot = False - else: - self.device.screenshot() ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 # End # if self.handle_info_bar(): @@ -358,7 +251,6 @@ class Equipment(StorageHandler): on_timer.reset() continue -<<<<<<< HEAD def equipment_take_on(self, enter, out, fleet): """ Args: @@ -376,26 +268,6 @@ class Equipment(StorageHandler): else: self._equip_take_on_one(index=index) self.ui_click(click_button=EQUIPMENT_CLOSE, check_button=EQUIPMENT_OPEN, offset=None) -======= - def fleet_equipment_take_on_preset(self, preset_record, enter, long_click, out): - """ - Args: - preset_record (list[int]): list of equipment record. [3, 1, 1, 1, 1, 1] - enter (Button): Button to edit equipment. - long_click (bool): How to click enter - out (Button): Button to confirm exit success. - """ - logger.hr('Equipment take on') - self.ship_info_enter(enter, long_click=long_click) - - for index in '9'.join([str(x) for x in preset_record if x > 0]): - index = int(index) - if index == 9: - self.ship_view_next() - else: - self.ship_equipment_take_on_preset(index=index) - self.ui_click(EQUIPMENT_CLOSE, check_button=EQUIPMENT_OPEN, skip_first_screenshot=True) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 self.ui_back(out) self.equipment_has_take_on = True diff --git a/module/equipment/equipment_change.py b/module/equipment/equipment_change.py index bd62cb1c0..b03f521f1 100644 --- a/module/equipment/equipment_change.py +++ b/module/equipment/equipment_change.py @@ -6,10 +6,6 @@ from module.equipment.equipment import Equipment from module.logger import logger from module.ui.assets import BACK_ARROW from module.ui.scroll import Scroll -<<<<<<< HEAD -======= -from module.ui.switch import Switch ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 # Button of 5 equipments EQUIP_INFO_BAR = ButtonGrid( @@ -20,7 +16,6 @@ EQUIPMENT_GRID = ButtonGrid( EQUIPMENT_SCROLL = Scroll(EQUIP_SCROLL, color=(247, 211, 66), name='EQUIP_SCROLL') SIM_VALUE = 0.90 -<<<<<<< HEAD class EquipmentChange(Equipment): equip_list = {} @@ -39,50 +34,12 @@ class EquipmentChange(Equipment): index = 0 self.equipping_list = [] for button in EQUIPMENT_GRID.buttons: -======= -equipping_filter = Switch('Equipping_filter') -equipping_filter.add_status('on', check_button=EQUIPPING_ON) -equipping_filter.add_status('off', check_button=EQUIPPING_OFF) - - -class EquipmentChange(Equipment): - equipment_list = {} - - def equipping_set(self, enable=False): - if equipping_filter.set('on' if enable else 'off', main=self): - self.wait_until_stable(SWIPE_AREA) - - def ship_equipment_record_image(self, index_list=range(0, 5)): - """ - Record equipment through upgrade page - Notice: The equipment icons in the upgrade page are the same size as the icons in the equipment status - """ - logger.info('RECORD EQUIPMENT') - self.ship_side_navbar_ensure(bottom=1) - - # Ensure EQUIPMENT_GRID in the right place - skip_first_screenshot = True - while True: - if skip_first_screenshot: - skip_first_screenshot = False - else: - self.device.screenshot() - if self.appear(EQUIPMENT_OPEN, offset=(5, 5)): - break - - self.equipment_list = {} - info_bar_disappeared = False - for index, button in enumerate(EQUIPMENT_GRID.buttons): - if index not in index_list: - continue ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 crop_image = self.image_crop(button) edge_value = np.mean(np.abs(cv2.Sobel(crop_image, 3, 1, 1))) # Nothing is 0.15~1 # +1 is 40 # +10 is 46 if edge_value > 10: -<<<<<<< HEAD self.equipping_list.append(index) index += 1 logger.info(f"Equipping list: {self.equipping_list}") @@ -121,38 +78,6 @@ class EquipmentChange(Equipment): for index in index_list: if index in self.equipping_list: -======= - # Enter equipment info - self.ui_click(appear_button=EQUIPMENT_OPEN, - click_button=EQUIP_INFO_BAR[(index, 0)], - check_button=UPGRADE_ENTER) - # Enter upgrade inform - self.ui_click(click_button=UPGRADE_ENTER, - check_button=UPGRADE_ENTER_CHECK, skip_first_screenshot=True) - # Save equipment template - if not info_bar_disappeared: - self.handle_info_bar() - info_bar_disappeared = True - self.equipment_list[index] = self.image_crop(EQUIP_SAVE) - # Quit upgrade inform - self.ui_click( - click_button=UPGRADE_QUIT, check_button=EQUIPMENT_OPEN, appear_button=UPGRADE_ENTER_CHECK, - skip_first_screenshot=True) - else: - logger.info(f"Equipment {index} is empty") - - logger.info(f"Recorded equipment index list: {list(self.equipment_list.keys())}") - - def ship_equipment_take_on_image(self, index_list=range(0, 5), skip_first_screenshot=True): - """ - Equip the equipment previously recorded - """ - logger.info('Take on equipment') - self.ship_side_navbar_ensure(bottom=2) - - for index in index_list: - if index in self.equipment_list: ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 logger.info(f'Take on {index}') enter_button = globals()[ 'EQUIP_TAKE_ON_{index}'.format(index=index)] @@ -160,11 +85,7 @@ class EquipmentChange(Equipment): self.ui_click(enter_button, check_button=EQUIPPING_ON, skip_first_screenshot=skip_first_screenshot, offset=(5, 5)) self.handle_info_bar() -<<<<<<< HEAD self._find_equip(index) -======= - self._find_equipment(index) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 @Config.when(DEVICE_CONTROL_METHOD='minitouch') def _equipment_swipe(self, distance=190): @@ -187,21 +108,13 @@ class EquipmentChange(Equipment): self.device.screenshot() def _equip_equipment(self, point, offset=(100, 100)): -<<<<<<< HEAD ''' -======= - """ ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 Equip Equipment then back to ship details Confirm the popup Pages: in: EQUIPMENT STATUS out: SHIP_SIDEBAR_EQUIPMENT -<<<<<<< HEAD ''' -======= - """ ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 logger.info('Equip equipment') button = Button(area=(), color=(), button=(point[0], point[1], point[0] + offset[0], point[1] + offset[1]), name='EQUIPMENT') @@ -209,44 +122,23 @@ class EquipmentChange(Equipment): logger.info('Equip confirm') self.ui_click(click_button=EQUIP_CONFIRM, check_button=SHIP_INFO_EQUIPMENT_CHECK) -<<<<<<< HEAD def _find_equip(self, index): ''' Find the equipment previously recorded Pages: in: EQUIPMENT STATUS ''' -======= - def _find_equipment(self, index): - """ - Find the equipment previously recorded - Pages: - in: EQUIPMENT STATUS - """ ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 self.equipping_set(False) res = cv2.matchTemplate(self.device.screenshot(), np.array( -<<<<<<< HEAD self.equip_list[index]), cv2.TM_CCOEFF_NORMED) -======= - self.equipment_list[index]), cv2.TM_CCOEFF_NORMED) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 _, sim, _, point = cv2.minMaxLoc(res) if sim > SIM_VALUE: self._equip_equipment(point) return -<<<<<<< HEAD -======= - if not EQUIPMENT_SCROLL.appear(main=self): - logger.warning('No recorded equipment was found.') - self.ui_back(check_button=globals()[f'EQUIP_TAKE_ON_{index}'], appear_button=EQUIPPING_OFF) - return - ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 for _ in range(0, 15): self._equipment_swipe() @@ -254,11 +146,7 @@ class EquipmentChange(Equipment): self.device.click(BACK_ARROW) continue res = cv2.matchTemplate(self.device.screenshot(), np.array( -<<<<<<< HEAD self.equip_list[index]), cv2.TM_CCOEFF_NORMED) -======= - self.equipment_list[index]), cv2.TM_CCOEFF_NORMED) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 _, sim, _, point = cv2.minMaxLoc(res) if sim > SIM_VALUE: diff --git a/module/equipment/fleet_equipment.py b/module/equipment/fleet_equipment.py index 9c17b24b5..ce04d81af 100644 --- a/module/equipment/fleet_equipment.py +++ b/module/equipment/fleet_equipment.py @@ -1,10 +1,6 @@ from module.equipment.assets import * -<<<<<<< HEAD from module.equipment.equipment import Equipment from module.logger import logger -======= -from module.equipment.equipment_change import EquipmentChange ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 from module.ocr.ocr import Digit from module.ui.assets import FLEET_CHECK from module.ui.page import page_fleet @@ -12,7 +8,6 @@ from module.ui.page import page_fleet OCR_FLEET_INDEX = Digit(OCR_FLEET_INDEX, letter=(90, 154, 255), threshold=128, alphabet='123456') -<<<<<<< HEAD class DailyEquipment(Equipment): equipment_has_take_on = False @@ -50,33 +45,3 @@ class DailyEquipment(Equipment): self.equipment_has_take_on = False self.device.sleep(1) return True -======= -class FleetEquipment(EquipmentChange): - def fleet_enter(self, fleet): - self.ui_ensure(page_fleet) - self.ui_ensure_index(fleet, letter=OCR_FLEET_INDEX, - next_button=FLEET_NEXT, prev_button=FLEET_PREV, skip_first_screenshot=True) - - def fleet_equipment_take_on_preset(self, preset_record, enter=FLEET_DETAIL_ENTER_FLAGSHIP, - long_click=False, out=FLEET_DETAIL_CHECK): - self.ui_click(FLEET_DETAIL, appear_button=page_fleet.check_button, - check_button=FLEET_DETAIL_CHECK, skip_first_screenshot=True) - super().fleet_equipment_take_on_preset(preset_record=preset_record, enter=FLEET_DETAIL_ENTER_FLAGSHIP, - long_click=False, out=FLEET_DETAIL_CHECK) - self.ui_back(FLEET_CHECK) - - def fleet_equipment_take_off(self, enter=FLEET_DETAIL_ENTER_FLAGSHIP, long_click=False, out=FLEET_DETAIL_CHECK): - self.ui_click(FLEET_DETAIL, appear_button=page_fleet.check_button, - check_button=FLEET_DETAIL_CHECK, skip_first_screenshot=True) - super().fleet_equipment_take_off(enter=enter, long_click=long_click, out=out) - self.ui_back(FLEET_CHECK) - - def fleet_enter_ship(self, button): - self.ui_click(FLEET_DETAIL, appear_button=page_fleet.check_button, - check_button=FLEET_DETAIL_CHECK, skip_first_screenshot=True) - self.ship_info_enter(button, long_click=False) - - def fleet_back(self): - self.ui_back(FLEET_DETAIL_CHECK) - self.ui_back(FLEET_CHECK) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 diff --git a/module/exception.py b/module/exception.py index 90db40925..155265500 100644 --- a/module/exception.py +++ b/module/exception.py @@ -57,10 +57,7 @@ class RequestHumanTakeover(Exception): # Request human takeover # Alas is unable to handle such error, probably because of wrong settings. pass -<<<<<<< HEAD class AutoSearchSetError(Exception): pass -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 diff --git a/module/exercise/assets.py b/module/exercise/assets.py index a78c4567a..8de41c543 100644 --- a/module/exercise/assets.py +++ b/module/exercise/assets.py @@ -9,18 +9,11 @@ CLICK_SAFE_AREA = Button(area={'cn': (1215, 637, 1260, 686), 'en': (1215, 637, 1 DEFENDER_HP_AREA = Button(area={'cn': (691, 43, 1004, 58), 'en': (691, 43, 1004, 58), 'jp': (691, 44, 1005, 56), 'tw': (691, 43, 1004, 58)}, color={'cn': (239, 51, 15), 'en': (239, 51, 15), 'jp': (244, 115, 98), 'tw': (239, 51, 15)}, button={'cn': (691, 43, 1004, 58), 'en': (691, 43, 1004, 58), 'jp': (691, 44, 1005, 56), 'tw': (691, 43, 1004, 58)}, file={'cn': './assets/cn/exercise/DEFENDER_HP_AREA.png', 'en': './assets/en/exercise/DEFENDER_HP_AREA.png', 'jp': './assets/jp/exercise/DEFENDER_HP_AREA.png', 'tw': './assets/tw/exercise/DEFENDER_HP_AREA.png'}) EQUIP_EDIT_ACTIVE = Button(area={'cn': (51, 608, 245, 668), 'en': (50, 607, 247, 670), 'jp': (53, 610, 245, 667), 'tw': (51, 607, 247, 668)}, color={'cn': (191, 159, 109), 'en': (186, 157, 105), 'jp': (192, 159, 109), 'tw': (191, 159, 109)}, button={'cn': (51, 608, 245, 668), 'en': (50, 607, 247, 670), 'jp': (53, 610, 245, 667), 'tw': (51, 607, 247, 668)}, file={'cn': './assets/cn/exercise/EQUIP_EDIT_ACTIVE.png', 'en': './assets/en/exercise/EQUIP_EDIT_ACTIVE.png', 'jp': './assets/jp/exercise/EQUIP_EDIT_ACTIVE.png', 'tw': './assets/tw/exercise/EQUIP_EDIT_ACTIVE.png'}) EQUIP_EDIT_INACTIVE = Button(area={'cn': (51, 608, 246, 667), 'en': (50, 607, 247, 670), 'jp': (50, 610, 244, 668), 'tw': (50, 608, 246, 669)}, color={'cn': (89, 112, 158), 'en': (88, 111, 156), 'jp': (90, 113, 160), 'tw': (92, 115, 160)}, button={'cn': (51, 608, 246, 667), 'en': (50, 607, 247, 670), 'jp': (50, 610, 244, 668), 'tw': (50, 608, 246, 669)}, file={'cn': './assets/cn/exercise/EQUIP_EDIT_INACTIVE.png', 'en': './assets/en/exercise/EQUIP_EDIT_INACTIVE.png', 'jp': './assets/jp/exercise/EQUIP_EDIT_INACTIVE.png', 'tw': './assets/tw/exercise/EQUIP_EDIT_INACTIVE.png'}) -<<<<<<< HEAD EQUIP_ENTER = Button(area={'cn': (351, 446, 361, 456), 'en': (351, 446, 361, 456), 'jp': (351, 446, 361, 456), 'tw': (351, 446, 361, 456)}, color={'cn': (252, 251, 252), 'en': (252, 251, 252), 'jp': (252, 251, 252), 'tw': (252, 251, 252)}, button={'cn': (351, 446, 361, 456), 'en': (351, 446, 361, 456), 'jp': (351, 446, 361, 456), 'tw': (351, 446, 361, 456)}, file={'cn': './assets/cn/exercise/EQUIP_ENTER.png', 'en': './assets/en/exercise/EQUIP_ENTER.png', 'jp': './assets/jp/exercise/EQUIP_ENTER.png', 'tw': './assets/tw/exercise/EQUIP_ENTER.png'}) EXERCISE_PREPARATION = Button(area={'cn': (543, 539, 741, 599), 'en': (541, 537, 743, 601), 'jp': (549, 543, 736, 595), 'tw': (542, 539, 742, 600)}, color={'cn': (235, 186, 114), 'en': (234, 182, 102), 'jp': (235, 184, 111), 'tw': (236, 187, 117)}, button={'cn': (543, 539, 741, 599), 'en': (541, 537, 743, 601), 'jp': (549, 543, 736, 595), 'tw': (542, 539, 742, 600)}, file={'cn': './assets/cn/exercise/EXERCISE_PREPARATION.png', 'en': './assets/en/exercise/EXERCISE_PREPARATION.png', 'jp': './assets/jp/exercise/EXERCISE_PREPARATION.png', 'tw': './assets/tw/exercise/EXERCISE_PREPARATION.png'}) NEW_OPPONENT = Button(area={'cn': (1065, 340, 1204, 382), 'en': (1064, 339, 1205, 384), 'jp': (1064, 339, 1204, 383), 'tw': (1066, 342, 1203, 381)}, color={'cn': (129, 166, 220), 'en': (128, 165, 221), 'jp': (131, 165, 220), 'tw': (138, 172, 222)}, button={'cn': (1065, 340, 1204, 382), 'en': (1064, 339, 1205, 384), 'jp': (1064, 339, 1204, 383), 'tw': (1066, 342, 1203, 381)}, file={'cn': './assets/cn/exercise/NEW_OPPONENT.png', 'en': './assets/en/exercise/NEW_OPPONENT.png', 'jp': './assets/jp/exercise/NEW_OPPONENT.png', 'tw': './assets/tw/exercise/NEW_OPPONENT.png'}) OCR_EXERCISE_REMAIN = Button(area={'cn': (1153, 140, 1178, 165), 'en': (1153, 140, 1178, 165), 'jp': (1153, 140, 1178, 165), 'tw': (1153, 140, 1178, 165)}, color={'cn': (96, 132, 113), 'en': (96, 132, 113), 'jp': (96, 132, 113), 'tw': (96, 132, 113)}, button={'cn': (1153, 140, 1178, 165), 'en': (1153, 140, 1178, 165), 'jp': (1153, 140, 1178, 165), 'tw': (1153, 140, 1178, 165)}, file={'cn': './assets/cn/exercise/OCR_EXERCISE_REMAIN.png', 'en': './assets/en/exercise/OCR_EXERCISE_REMAIN.png', 'jp': './assets/jp/exercise/OCR_EXERCISE_REMAIN.png', 'tw': './assets/tw/exercise/OCR_EXERCISE_REMAIN.png'}) OCR_EXERCISE_TIME_REMAIN = Button(area={'cn': (1088, 105, 1208, 128), 'en': (1088, 105, 1208, 128), 'jp': (1088, 105, 1208, 128), 'tw': (1088, 105, 1208, 128)}, color={'cn': (124, 133, 171), 'en': (124, 133, 171), 'jp': (124, 133, 171), 'tw': (124, 133, 171)}, button={'cn': (1088, 105, 1208, 128), 'en': (1088, 105, 1208, 128), 'jp': (1088, 105, 1208, 128), 'tw': (1088, 105, 1208, 128)}, file={'cn': './assets/cn/exercise/OCR_EXERCISE_TIME_REMAIN.png', 'en': './assets/cn/exercise/OCR_EXERCISE_TIME_REMAIN.png', 'jp': './assets/cn/exercise/OCR_EXERCISE_TIME_REMAIN.png', 'tw': './assets/cn/exercise/OCR_EXERCISE_TIME_REMAIN.png'}) -======= -EQUIP_ENTER = Button(area={'cn': (432, 283, 442, 293), 'en': (432, 283, 442, 293), 'jp': (432, 283, 442, 293), 'tw': (432, 283, 442, 293)}, color={'cn': (207, 206, 206), 'en': (207, 206, 206), 'jp': (207, 206, 206), 'tw': (207, 206, 206)}, button={'cn': (432, 283, 442, 293), 'en': (432, 283, 442, 293), 'jp': (432, 283, 442, 293), 'tw': (432, 283, 442, 293)}, file={'cn': './assets/cn/exercise/EQUIP_ENTER.png', 'en': './assets/en/exercise/EQUIP_ENTER.png', 'jp': './assets/jp/exercise/EQUIP_ENTER.png', 'tw': './assets/tw/exercise/EQUIP_ENTER.png'}) -EXERCISE_PREPARATION = Button(area={'cn': (543, 539, 741, 599), 'en': (541, 537, 743, 601), 'jp': (549, 543, 736, 595), 'tw': (542, 539, 742, 600)}, color={'cn': (235, 186, 114), 'en': (234, 182, 102), 'jp': (235, 184, 111), 'tw': (236, 187, 117)}, button={'cn': (543, 539, 741, 599), 'en': (541, 537, 743, 601), 'jp': (549, 543, 736, 595), 'tw': (542, 539, 742, 600)}, file={'cn': './assets/cn/exercise/EXERCISE_PREPARATION.png', 'en': './assets/en/exercise/EXERCISE_PREPARATION.png', 'jp': './assets/jp/exercise/EXERCISE_PREPARATION.png', 'tw': './assets/tw/exercise/EXERCISE_PREPARATION.png'}) -NEW_OPPONENT = Button(area={'cn': (1065, 340, 1204, 382), 'en': (1064, 339, 1205, 384), 'jp': (1064, 339, 1204, 383), 'tw': (1066, 342, 1203, 381)}, color={'cn': (129, 166, 220), 'en': (128, 165, 221), 'jp': (131, 165, 220), 'tw': (138, 172, 222)}, button={'cn': (1065, 340, 1204, 382), 'en': (1064, 339, 1205, 384), 'jp': (1064, 339, 1204, 383), 'tw': (1066, 342, 1203, 381)}, file={'cn': './assets/cn/exercise/NEW_OPPONENT.png', 'en': './assets/en/exercise/NEW_OPPONENT.png', 'jp': './assets/jp/exercise/NEW_OPPONENT.png', 'tw': './assets/tw/exercise/NEW_OPPONENT.png'}) -OCR_EXERCISE_REMAIN = Button(area={'cn': (1153, 140, 1178, 165), 'en': (1153, 140, 1178, 165), 'jp': (1153, 140, 1178, 165), 'tw': (1153, 140, 1178, 165)}, color={'cn': (96, 132, 113), 'en': (96, 132, 113), 'jp': (96, 132, 113), 'tw': (96, 132, 113)}, button={'cn': (1153, 140, 1178, 165), 'en': (1153, 140, 1178, 165), 'jp': (1153, 140, 1178, 165), 'tw': (1153, 140, 1178, 165)}, file={'cn': './assets/cn/exercise/OCR_EXERCISE_REMAIN.png', 'en': './assets/en/exercise/OCR_EXERCISE_REMAIN.png', 'jp': './assets/jp/exercise/OCR_EXERCISE_REMAIN.png', 'tw': './assets/tw/exercise/OCR_EXERCISE_REMAIN.png'}) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 OCR_PERIOD_REMAIN = Button(area={'cn': (1089, 105, 1209, 129), 'en': (1089, 105, 1209, 129), 'jp': (1089, 105, 1209, 129), 'tw': (1089, 105, 1209, 129)}, color={'cn': (125, 133, 169), 'en': (125, 133, 169), 'jp': (125, 133, 169), 'tw': (125, 133, 169)}, button={'cn': (1089, 105, 1209, 129), 'en': (1089, 105, 1209, 129), 'jp': (1089, 105, 1209, 129), 'tw': (1089, 105, 1209, 129)}, file={'cn': './assets/cn/exercise/OCR_PERIOD_REMAIN.png', 'en': './assets/en/exercise/OCR_PERIOD_REMAIN.png', 'jp': './assets/jp/exercise/OCR_PERIOD_REMAIN.png', 'tw': './assets/tw/exercise/OCR_PERIOD_REMAIN.png'}) OPPONENT_1 = Button(area={'cn': (104, 77, 316, 381), 'en': (102, 76, 318, 381), 'jp': (104, 77, 316, 381), 'tw': (104, 77, 316, 381)}, color={'cn': (101, 117, 136), 'en': (100, 115, 134), 'jp': (101, 117, 136), 'tw': (101, 117, 136)}, button={'cn': (104, 77, 316, 381), 'en': (102, 76, 318, 381), 'jp': (104, 77, 316, 381), 'tw': (104, 77, 316, 381)}, file={'cn': './assets/cn/exercise/OPPONENT_1.png', 'en': './assets/en/exercise/OPPONENT_1.png', 'jp': './assets/jp/exercise/OPPONENT_1.png', 'tw': './assets/tw/exercise/OPPONENT_1.png'}) OPPONENT_2 = Button(area={'cn': (348, 77, 560, 381), 'en': (348, 77, 562, 381), 'jp': (348, 77, 560, 381), 'tw': (348, 77, 560, 381)}, color={'cn': (105, 123, 149), 'en': (105, 122, 150), 'jp': (105, 123, 149), 'tw': (105, 123, 149)}, button={'cn': (348, 77, 560, 381), 'en': (348, 77, 562, 381), 'jp': (348, 77, 560, 381), 'tw': (348, 77, 560, 381)}, file={'cn': './assets/cn/exercise/OPPONENT_2.png', 'en': './assets/en/exercise/OPPONENT_2.png', 'jp': './assets/jp/exercise/OPPONENT_2.png', 'tw': './assets/tw/exercise/OPPONENT_2.png'}) diff --git a/module/exercise/combat.py b/module/exercise/combat.py index 074a5d4da..3f66c511e 100644 --- a/module/exercise/combat.py +++ b/module/exercise/combat.py @@ -24,13 +24,10 @@ class ExerciseCombat(HpDaemon, OpponentChoose, ExerciseEquipment, Combat): # self.equipment_take_on() pass -<<<<<<< HEAD # Power limit check from module.gg_handler.gg_handler import GGHandler GGHandler(config=self.config, device=self.device).power_limit('Exercise') -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 self.device.click(BATTLE_PREPARATION) continue @@ -177,7 +174,6 @@ class ExerciseCombat(HpDaemon, OpponentChoose, ExerciseEquipment, Combat): return False self._choose_opponent(0) -<<<<<<< HEAD super().equipment_take_off() self._preparation_quit() @@ -190,17 +186,3 @@ class ExerciseCombat(HpDaemon, OpponentChoose, ExerciseEquipment, Combat): # self._choose_opponent(0) # super().equipment_take_on() # self._preparation_quit() -======= - self.equipment_take_off() - self._preparation_quit() - - def equipment_take_on(self): - if self.config.EXERCISE_FLEET_EQUIPMENT is None: - return False - if self.equipment_has_take_on: - return False - - self._choose_opponent(0) - super().equipment_take_on() - self._preparation_quit() ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 diff --git a/module/exercise/equipment.py b/module/exercise/equipment.py index 5d6cd3bb1..d77429346 100644 --- a/module/exercise/equipment.py +++ b/module/exercise/equipment.py @@ -1,18 +1,10 @@ from module.base.timer import Timer from module.combat.assets import BATTLE_PREPARATION -<<<<<<< HEAD from module.equipment.equipment import Equipment from module.exercise.assets import * class ExerciseEquipment(Equipment): -======= -from module.equipment.equipment_change import EquipmentChange -from module.exercise.assets import * - - -class ExerciseEquipment(EquipmentChange): ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 def _active_edit(self): timer = Timer(5) while 1: @@ -40,7 +32,6 @@ class ExerciseEquipment(EquipmentChange): break def equipment_take_on(self): -<<<<<<< HEAD if self.config.EXERCISE_FLEET_EQUIPMENT is None: return False if self.equipment_has_take_on: @@ -61,14 +52,3 @@ class ExerciseEquipment(EquipmentChange): super().equipment_take_off(enter=EQUIP_ENTER, out=BATTLE_PREPARATION, fleet=self.config.EXERCISE_FLEET_EQUIPMENT) self._inactive_edit() return True -======= - self._active_edit() - self.fleet_equipment_take_on_preset(preset_record=self.config.EXERCISE_FLEET_EQUIPMENT, enter=EQUIP_ENTER, - long_click=True, out=BATTLE_PREPARATION) - self._inactive_edit() - - def equipment_take_off(self): - self._active_edit() - self.fleet_equipment_take_off(enter=EQUIP_ENTER, long_click=True, out=BATTLE_PREPARATION) - self._inactive_edit() ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 diff --git a/module/exercise/exercise.py b/module/exercise/exercise.py index 552e59880..06e5767a0 100644 --- a/module/exercise/exercise.py +++ b/module/exercise/exercise.py @@ -1,19 +1,11 @@ -<<<<<<< HEAD import datetime -======= -from datetime import timedelta ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 from module.config.utils import get_server_last_update from module.exercise.assets import * from module.exercise.combat import ExerciseCombat from module.logger import logger from module.ocr.ocr import Digit, Ocr, OcrYuv from module.ui.page import page_exercise -<<<<<<< HEAD from module.config.utils import get_server_next_update -======= - ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 class DatedDuration(Ocr): def __init__(self, buttons, lang='cnocr', letter=(255, 255, 255), threshold=128, alphabet='0123456789:IDS天日d', @@ -28,19 +20,11 @@ class DatedDuration(Ocr): def ocr(self, image, direct_ocr=False): """ Do OCR on a dated duration, such as `10d 01:30:30` or `7日01:30:30`. -<<<<<<< HEAD Args: image: direct_ocr: -======= - - Args: - image: - direct_ocr: - ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 Returns: list, datetime.timedelta: timedelta object, or a list of it. """ @@ -55,15 +39,9 @@ class DatedDuration(Ocr): @staticmethod def parse_time(string): """ -<<<<<<< HEAD Args: string (str): `10d 01:30:30` or `7日01:30:30` -======= - Args: - string (str): `10d 01:30:30` or `7日01:30:30` - ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 Returns: datetime.timedelta: """ @@ -71,17 +49,10 @@ class DatedDuration(Ocr): result = re.search(r'(\d{1,2})\D?(\d{1,2}):?(\d{2}):?(\d{2})', string) if result: result = [int(s) for s in result.groups()] -<<<<<<< HEAD return datetime.timedelta(days=result[0], hours=result[1], minutes=result[2], seconds=result[3]) else: logger.warning(f'Invalid dated duration: {string}') return datetime.timedelta(days=0, hours=0, minutes=0, seconds=0) -======= - return timedelta(days=result[0], hours=result[1], minutes=result[2], seconds=result[3]) - else: - logger.warning(f'Invalid dated duration: {string}') - return timedelta(days=0, hours=0, minutes=0, seconds=0) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 class DatedDurationYuv(DatedDuration, OcrYuv): @@ -228,10 +199,7 @@ class Exercise(ExerciseCombat): def run(self): self.ui_ensure(page_exercise) -<<<<<<< HEAD server_update = self.config.Scheduler_ServerUpdate -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 self.opponent_change_count = self._get_opponent_change_count() logger.attr("Change_opponent_count", self.opponent_change_count) @@ -241,11 +209,7 @@ class Exercise(ExerciseCombat): if not self.server_support_ocr_reset_remain(): logger.info(f'Server {self.config.SERVER} does not yet support OCR exercise reset remain time') logger.info('Please contact the developer to improve as soon as possible') -<<<<<<< HEAD remain_time = datetime.timedelta(days=0) -======= - remain_time = timedelta(days=0) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 else: remain_time = OCR_PERIOD_REMAIN.ocr(self.device.image) logger.info(f'Exercise period remain: {remain_time}') @@ -256,7 +220,6 @@ class Exercise(ExerciseCombat): if admiral_start > int(remain_time.total_seconds() // 3600) >= admiral_end: # set time for getting admiral logger.info('Reach set time for admiral trial, using all attempts.') self.preserve = 0 -<<<<<<< HEAD forced_run =True elif int(remain_time.total_seconds() // 3600) < 6: # if not set to "sun18", still depleting at sunday 18pm. logger.info('Exercise period remain less than 6 hours, using all attempts.') @@ -279,15 +242,6 @@ class Exercise(ExerciseCombat): run = True while run: -======= - elif int(remain_time.total_seconds() // 3600) < 6: # if not set to "sun18", still depleting at sunday 18pm. - logger.info('Exercise period remain less than 6 hours, using all attempts.') - self.preserve = 0 - else: - logger.info(f'Preserve {self.preserve} exercise') - - while 1: ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 self.remain = OCR_EXERCISE_REMAIN.ocr(self.device.image) if self.remain <= self.preserve: break @@ -307,7 +261,6 @@ class Exercise(ExerciseCombat): with self.config.multi_set(): self.config.set_record(Exercise_OpponentRefreshValue=self.opponent_change_count) if self.remain <= self.preserve or self.opponent_change_count >= 5: -<<<<<<< HEAD next_run = get_server_next_update(server_update) \ - datetime.timedelta(hours=self.config.Exercise_DelayUntilHoursBeforeNextUpdate) now = datetime.datetime.now() @@ -316,8 +269,5 @@ class Exercise(ExerciseCombat): return minutes_to_delay = int((next_run - now).total_seconds() / 60 + 1) self.config.task_delay(minute=minutes_to_delay) -======= - self.config.task_delay(server_update=True) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 else: self.config.task_delay(success=False) diff --git a/module/freebies/freebies.py b/module/freebies/freebies.py index 0808a5810..3e5b4017a 100644 --- a/module/freebies/freebies.py +++ b/module/freebies/freebies.py @@ -19,15 +19,9 @@ class Freebies(ModuleBase): logger.hr('Data key', level=1) DataKey(self.config, self.device).run() -<<<<<<< HEAD if self.config.Mail_Collect: logger.hr('Mail', level=1) Mail(self.config, self.device).run() -======= - # if self.config.Mail_Collect: - # logger.hr('Mail', level=1) - # Mail(self.config, self.device).run() ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 if self.config.SupplyPack_Collect: logger.hr('Supply pack', level=1) diff --git a/module/gacha/gacha_reward.py b/module/gacha/gacha_reward.py index 177cfcb42..1099a06f4 100644 --- a/module/gacha/gacha_reward.py +++ b/module/gacha/gacha_reward.py @@ -8,10 +8,7 @@ from module.logger import logger from module.ocr.ocr import Digit from module.retire.retirement import Retirement from module.shop.shop_general import GeneralShop -<<<<<<< HEAD from module.log_res.log_res import LogRes -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 RECORD_GACHA_OPTION = ('RewardRecord', 'gacha') RECORD_GACHA_SINCE = (0,) @@ -128,11 +125,8 @@ class RewardGacha(GachaUI, GeneralShop, Retirement): logger.info(f'Able to submit up to {target_count} build orders') self._currency -= gold_total self.build_cube_count -= cube_total -<<<<<<< HEAD LogRes(self.config).Cube = self.build_cube_count self.config.update() -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 return target_count def gacha_goto_pool(self, target_pool): @@ -297,27 +291,17 @@ class RewardGacha(GachaUI, GeneralShop, Retirement): # Go to Gacha self.ui_goto_gacha() -<<<<<<< HEAD # OCR Gold and Cubes self.device.screenshot() self.shop_currency() self.build_cube_count = OCR_BUILD_CUBE_COUNT.ocr(self.device.image) -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 # Flush queue of any pre-existing # builds to ensure starting fresh # Upon exit, expected to be in # main Build page self.gacha_flush_queue() -<<<<<<< HEAD -======= - # OCR Gold and Cubes - self.shop_currency() - self.build_cube_count = OCR_BUILD_CUBE_COUNT.ocr(self.device.image) - ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 # Transition to appropriate target construction pool # Returns appropriate costs for gacha as well actual_pool = self.gacha_goto_pool(self.config.Gacha_Pool) @@ -341,12 +325,9 @@ class RewardGacha(GachaUI, GeneralShop, Retirement): buy[0] = self.build_ticket_count # Calculate rolls allowed based on configurations and resources buy[1] = self.gacha_calculate(self.config.Gacha_Amount-self.build_ticket_count, gold_cost, cube_cost) -<<<<<<< HEAD else: LogRes(self.config).Cube = self.build_cube_count self.config.update() -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 # Submit 'buy_count' and execute if capable # Cannot use handle_popup_confirm, this window diff --git a/module/handler/assets.py b/module/handler/assets.py index b2ac72ff3..567a609f1 100644 --- a/module/handler/assets.py +++ b/module/handler/assets.py @@ -11,7 +11,6 @@ AUTO_SEARCH_MENU_EXIT = Button(area={'cn': (419, 609, 475, 637), 'en': (421, 611 AUTO_SEARCH_OFF = Button(area={'cn': (867, 588, 883, 604), 'en': (830, 588, 846, 604), 'jp': (849, 588, 865, 604), 'tw': (867, 588, 883, 604)}, color={'cn': (94, 92, 94), 'en': (90, 89, 92), 'jp': (99, 99, 109), 'tw': (94, 92, 94)}, button={'cn': (867, 588, 883, 604), 'en': (830, 588, 846, 604), 'jp': (849, 588, 865, 604), 'tw': (867, 588, 883, 604)}, file={'cn': './assets/cn/handler/AUTO_SEARCH_OFF.png', 'en': './assets/en/handler/AUTO_SEARCH_OFF.png', 'jp': './assets/jp/handler/AUTO_SEARCH_OFF.png', 'tw': './assets/tw/handler/AUTO_SEARCH_OFF.png'}) AUTO_SEARCH_ON = Button(area={'cn': (867, 588, 883, 604), 'en': (830, 588, 846, 604), 'jp': (849, 588, 865, 604), 'tw': (867, 588, 883, 604)}, color={'cn': (140, 167, 120), 'en': (139, 168, 112), 'jp': (140, 167, 122), 'tw': (140, 167, 120)}, button={'cn': (867, 588, 883, 604), 'en': (830, 588, 846, 604), 'jp': (849, 588, 865, 604), 'tw': (867, 588, 883, 604)}, file={'cn': './assets/cn/handler/AUTO_SEARCH_ON.png', 'en': './assets/en/handler/AUTO_SEARCH_ON.png', 'jp': './assets/jp/handler/AUTO_SEARCH_ON.png', 'tw': './assets/tw/handler/AUTO_SEARCH_ON.png'}) AUTO_SEARCH_SET_ALL = Button(area={'cn': (832, 207, 851, 226), 'en': (940, 322, 959, 340), 'jp': (832, 207, 851, 226), 'tw': (832, 207, 851, 226)}, color={'cn': (32, 32, 38), 'en': (39, 40, 41), 'jp': (38, 37, 38), 'tw': (39, 41, 41)}, button={'cn': (832, 207, 851, 226), 'en': (940, 322, 959, 340), 'jp': (832, 207, 851, 226), 'tw': (832, 207, 851, 226)}, file={'cn': './assets/cn/handler/AUTO_SEARCH_SET_ALL.png', 'en': './assets/en/handler/AUTO_SEARCH_SET_ALL.png', 'jp': './assets/jp/handler/AUTO_SEARCH_SET_ALL.png', 'tw': './assets/tw/handler/AUTO_SEARCH_SET_ALL.png'}) -<<<<<<< HEAD AUTO_SEARCH_SET_ALL_15 = Button(area={'cn': (832, 161, 851, 180), 'en': (832, 161, 851, 180), 'jp': (832, 161, 851, 180), 'tw': (832, 161, 851, 180)}, color={'cn': (74, 101, 55), 'en': (74, 101, 55), 'jp': (74, 101, 55), 'tw': (74, 101, 55)}, button={'cn': (832, 161, 851, 180), 'en': (832, 161, 851, 180), 'jp': (832, 161, 851, 180), 'tw': (832, 161, 851, 180)}, file={'cn': './assets/cn/handler/AUTO_SEARCH_SET_ALL_15.png', 'en': './assets/cn/handler/AUTO_SEARCH_SET_ALL_15.png', 'jp': './assets/cn/handler/AUTO_SEARCH_SET_ALL_15.png', 'tw': './assets/cn/handler/AUTO_SEARCH_SET_ALL_15.png'}) AUTO_SEARCH_SET_BOSS = Button(area={'cn': (635, 207, 653, 226), 'en': (616, 208, 634, 226), 'jp': (635, 207, 653, 226), 'tw': (635, 207, 653, 226)}, color={'cn': (30, 30, 33), 'en': (42, 40, 43), 'jp': (37, 36, 37), 'tw': (37, 39, 39)}, button={'cn': (635, 207, 653, 226), 'en': (616, 208, 634, 226), 'jp': (635, 207, 653, 226), 'tw': (635, 207, 653, 226)}, file={'cn': './assets/cn/handler/AUTO_SEARCH_SET_BOSS.png', 'en': './assets/en/handler/AUTO_SEARCH_SET_BOSS.png', 'jp': './assets/jp/handler/AUTO_SEARCH_SET_BOSS.png', 'tw': './assets/tw/handler/AUTO_SEARCH_SET_BOSS.png'}) AUTO_SEARCH_SET_BOSS_15 = Button(area={'cn': (635, 161, 653, 180), 'en': (635, 161, 653, 180), 'jp': (635, 161, 653, 180), 'tw': (635, 161, 653, 180)}, color={'cn': (37, 37, 39), 'en': (37, 37, 39), 'jp': (37, 37, 39), 'tw': (37, 37, 39)}, button={'cn': (635, 161, 653, 180), 'en': (635, 161, 653, 180), 'jp': (635, 161, 653, 180), 'tw': (635, 161, 653, 180)}, file={'cn': './assets/cn/handler/AUTO_SEARCH_SET_BOSS_15.png', 'en': './assets/cn/handler/AUTO_SEARCH_SET_BOSS_15.png', 'jp': './assets/cn/handler/AUTO_SEARCH_SET_BOSS_15.png', 'tw': './assets/cn/handler/AUTO_SEARCH_SET_BOSS_15.png'}) @@ -23,13 +22,6 @@ AUTO_SEARCH_SET_SUB_AUTO = Button(area={'cn': (578, 457, 597, 476), 'en': (577, AUTO_SEARCH_SET_SUB_AUTO_15 = Button(area={'cn': (578, 389, 597, 408), 'en': (578, 389, 597, 408), 'jp': (578, 389, 597, 408), 'tw': (578, 389, 597, 408)}, color={'cn': (42, 42, 43), 'en': (42, 42, 43), 'jp': (42, 42, 43), 'tw': (42, 42, 43)}, button={'cn': (578, 389, 597, 408), 'en': (578, 389, 597, 408), 'jp': (578, 389, 597, 408), 'tw': (578, 389, 597, 408)}, file={'cn': './assets/cn/handler/AUTO_SEARCH_SET_SUB_AUTO_15.png', 'en': './assets/cn/handler/AUTO_SEARCH_SET_SUB_AUTO_15.png', 'jp': './assets/cn/handler/AUTO_SEARCH_SET_SUB_AUTO_15.png', 'tw': './assets/cn/handler/AUTO_SEARCH_SET_SUB_AUTO_15.png'}) AUTO_SEARCH_SET_SUB_STANDBY = Button(area={'cn': (894, 457, 913, 476), 'en': (855, 460, 874, 478), 'jp': (894, 457, 913, 476), 'tw': (894, 457, 913, 476)}, color={'cn': (32, 31, 34), 'en': (75, 104, 54), 'jp': (73, 100, 52), 'tw': (35, 36, 38)}, button={'cn': (894, 457, 913, 476), 'en': (855, 460, 874, 478), 'jp': (894, 457, 913, 476), 'tw': (894, 457, 913, 476)}, file={'cn': './assets/cn/handler/AUTO_SEARCH_SET_SUB_STANDBY.png', 'en': './assets/en/handler/AUTO_SEARCH_SET_SUB_STANDBY.png', 'jp': './assets/jp/handler/AUTO_SEARCH_SET_SUB_STANDBY.png', 'tw': './assets/tw/handler/AUTO_SEARCH_SET_SUB_STANDBY.png'}) AUTO_SEARCH_SET_SUB_STANDBY_15 = Button(area={'cn': (894, 389, 913, 408), 'en': (894, 389, 913, 408), 'jp': (894, 389, 913, 408), 'tw': (894, 389, 913, 408)}, color={'cn': (74, 101, 55), 'en': (74, 101, 55), 'jp': (74, 101, 55), 'tw': (74, 101, 55)}, button={'cn': (894, 389, 913, 408), 'en': (894, 389, 913, 408), 'jp': (894, 389, 913, 408), 'tw': (894, 389, 913, 408)}, file={'cn': './assets/cn/handler/AUTO_SEARCH_SET_SUB_STANDBY_15.png', 'en': './assets/cn/handler/AUTO_SEARCH_SET_SUB_STANDBY_15.png', 'jp': './assets/cn/handler/AUTO_SEARCH_SET_SUB_STANDBY_15.png', 'tw': './assets/cn/handler/AUTO_SEARCH_SET_SUB_STANDBY_15.png'}) -======= -AUTO_SEARCH_SET_BOSS = Button(area={'cn': (635, 207, 653, 226), 'en': (616, 208, 634, 226), 'jp': (635, 207, 653, 226), 'tw': (635, 207, 653, 226)}, color={'cn': (30, 30, 33), 'en': (42, 40, 43), 'jp': (37, 36, 37), 'tw': (37, 39, 39)}, button={'cn': (635, 207, 653, 226), 'en': (616, 208, 634, 226), 'jp': (635, 207, 653, 226), 'tw': (635, 207, 653, 226)}, file={'cn': './assets/cn/handler/AUTO_SEARCH_SET_BOSS.png', 'en': './assets/en/handler/AUTO_SEARCH_SET_BOSS.png', 'jp': './assets/jp/handler/AUTO_SEARCH_SET_BOSS.png', 'tw': './assets/tw/handler/AUTO_SEARCH_SET_BOSS.png'}) -AUTO_SEARCH_SET_MOB = Button(area={'cn': (496, 207, 515, 226), 'en': (477, 208, 496, 226), 'jp': (496, 207, 515, 226), 'tw': (496, 207, 515, 226)}, color={'cn': (69, 96, 51), 'en': (77, 106, 57), 'jp': (73, 100, 52), 'tw': (73, 101, 55)}, button={'cn': (496, 207, 515, 226), 'en': (477, 208, 496, 226), 'jp': (496, 207, 515, 226), 'tw': (496, 207, 515, 226)}, file={'cn': './assets/cn/handler/AUTO_SEARCH_SET_MOB.png', 'en': './assets/en/handler/AUTO_SEARCH_SET_MOB.png', 'jp': './assets/jp/handler/AUTO_SEARCH_SET_MOB.png', 'tw': './assets/tw/handler/AUTO_SEARCH_SET_MOB.png'}) -AUTO_SEARCH_SET_STANDBY = Button(area={'cn': (932, 207, 950, 226), 'en': (813, 322, 832, 340), 'jp': (932, 207, 950, 226), 'tw': (932, 207, 950, 226)}, color={'cn': (30, 30, 37), 'en': (41, 41, 42), 'jp': (37, 36, 37), 'tw': (37, 38, 39)}, button={'cn': (932, 207, 950, 226), 'en': (813, 322, 832, 340), 'jp': (932, 207, 950, 226), 'tw': (932, 207, 950, 226)}, file={'cn': './assets/cn/handler/AUTO_SEARCH_SET_STANDBY.png', 'en': './assets/en/handler/AUTO_SEARCH_SET_STANDBY.png', 'jp': './assets/jp/handler/AUTO_SEARCH_SET_STANDBY.png', 'tw': './assets/tw/handler/AUTO_SEARCH_SET_STANDBY.png'}) -AUTO_SEARCH_SET_SUB_AUTO = Button(area={'cn': (578, 457, 597, 476), 'en': (577, 460, 595, 478), 'jp': (578, 457, 597, 476), 'tw': (578, 457, 597, 476)}, color={'cn': (69, 96, 52), 'en': (41, 39, 41), 'jp': (39, 37, 39), 'tw': (73, 100, 53)}, button={'cn': (578, 457, 597, 476), 'en': (577, 460, 595, 478), 'jp': (578, 457, 597, 476), 'tw': (578, 457, 597, 476)}, file={'cn': './assets/cn/handler/AUTO_SEARCH_SET_SUB_AUTO.png', 'en': './assets/en/handler/AUTO_SEARCH_SET_SUB_AUTO.png', 'jp': './assets/jp/handler/AUTO_SEARCH_SET_SUB_AUTO.png', 'tw': './assets/tw/handler/AUTO_SEARCH_SET_SUB_AUTO.png'}) -AUTO_SEARCH_SET_SUB_STANDBY = Button(area={'cn': (894, 457, 913, 476), 'en': (855, 460, 874, 478), 'jp': (894, 457, 913, 476), 'tw': (894, 457, 913, 476)}, color={'cn': (32, 31, 34), 'en': (75, 104, 54), 'jp': (73, 100, 52), 'tw': (35, 36, 38)}, button={'cn': (894, 457, 913, 476), 'en': (855, 460, 874, 478), 'jp': (894, 457, 913, 476), 'tw': (894, 457, 913, 476)}, file={'cn': './assets/cn/handler/AUTO_SEARCH_SET_SUB_STANDBY.png', 'en': './assets/en/handler/AUTO_SEARCH_SET_SUB_STANDBY.png', 'jp': './assets/jp/handler/AUTO_SEARCH_SET_SUB_STANDBY.png', 'tw': './assets/tw/handler/AUTO_SEARCH_SET_SUB_STANDBY.png'}) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 BATTLE_PASS_NOTICE = Button(area={'cn': (554, 483, 726, 540), 'en': (716, 488, 869, 533), 'jp': (554, 483, 726, 540), 'tw': (554, 483, 726, 540)}, color={'cn': (107, 152, 207), 'en': (89, 138, 201), 'jp': (107, 152, 207), 'tw': (107, 152, 207)}, button={'cn': (863, 173, 929, 217), 'en': (863, 173, 929, 217), 'jp': (863, 173, 929, 217), 'tw': (863, 173, 929, 217)}, file={'cn': './assets/cn/handler/BATTLE_PASS_NOTICE.png', 'en': './assets/en/handler/BATTLE_PASS_NOTICE.png', 'jp': './assets/cn/handler/BATTLE_PASS_NOTICE.png', 'tw': './assets/cn/handler/BATTLE_PASS_NOTICE.png'}) BOOK_BOX_AUTO = Button(area={'cn': (737, 614, 756, 631), 'en': (739, 615, 754, 630), 'jp': (808, 614, 825, 631), 'tw': (807, 613, 826, 632)}, color={'cn': (67, 74, 82), 'en': (57, 64, 74), 'jp': (59, 62, 68), 'tw': (62, 66, 71)}, button={'cn': (737, 614, 756, 631), 'en': (739, 615, 754, 630), 'jp': (808, 614, 825, 631), 'tw': (807, 613, 826, 632)}, file={'cn': './assets/cn/handler/BOOK_BOX_AUTO.png', 'en': './assets/en/handler/BOOK_BOX_AUTO.png', 'jp': './assets/jp/handler/BOOK_BOX_AUTO.png', 'tw': './assets/tw/handler/BOOK_BOX_AUTO.png'}) BOOK_BOX_PREP = Button(area={'cn': (922, 600, 940, 617), 'en': (906, 604, 922, 619), 'jp': (921, 602, 939, 621), 'tw': (906, 604, 922, 619)}, color={'cn': (88, 122, 68), 'en': (29, 32, 29), 'jp': (35, 35, 36), 'tw': (29, 32, 29)}, button={'cn': (922, 600, 940, 617), 'en': (906, 604, 922, 619), 'jp': (921, 602, 939, 621), 'tw': (906, 604, 922, 619)}, file={'cn': './assets/cn/handler/BOOK_BOX_PREP.png', 'en': './assets/en/handler/BOOK_BOX_PREP.png', 'jp': './assets/jp/handler/BOOK_BOX_PREP.png', 'tw': './assets/tw/handler/BOOK_BOX_PREP.png'}) @@ -81,14 +73,9 @@ MAP_WALK_OUT_OF_STEP = Button(area={'cn': (654, 312, 704, 335), 'en': (454, 314, MAP_WALK_SPEEDUP = Button(area={'cn': (1025, 406, 1055, 436), 'en': (1025, 406, 1055, 436), 'jp': (1025, 406, 1055, 436), 'tw': (1025, 406, 1055, 436)}, color={'cn': (62, 97, 72), 'en': (62, 97, 72), 'jp': (62, 97, 72), 'tw': (62, 97, 72)}, button={'cn': (1025, 406, 1055, 436), 'en': (1025, 406, 1055, 436), 'jp': (1025, 406, 1055, 436), 'tw': (1025, 406, 1055, 436)}, file={'cn': './assets/cn/handler/MAP_WALK_SPEEDUP.png', 'en': './assets/en/handler/MAP_WALK_SPEEDUP.png', 'jp': './assets/jp/handler/MAP_WALK_SPEEDUP.png', 'tw': './assets/tw/handler/MAP_WALK_SPEEDUP.png'}) MISSION_POPUP_ACK = Button(area={'cn': (432, 493, 543, 533), 'en': (413, 489, 566, 532), 'jp': (410, 482, 574, 539), 'tw': (413, 489, 566, 532)}, color={'cn': (181, 182, 184), 'en': (169, 170, 172), 'jp': (162, 164, 167), 'tw': (169, 170, 172)}, button={'cn': (432, 493, 543, 533), 'en': (413, 489, 566, 532), 'jp': (410, 482, 574, 539), 'tw': (413, 489, 566, 532)}, file={'cn': './assets/cn/handler/MISSION_POPUP_ACK.png', 'en': './assets/en/handler/MISSION_POPUP_ACK.png', 'jp': './assets/jp/handler/MISSION_POPUP_ACK.png', 'tw': './assets/tw/handler/MISSION_POPUP_ACK.png'}) MISSION_POPUP_GO = Button(area={'cn': (719, 493, 861, 534), 'en': (716, 488, 869, 533), 'jp': (711, 482, 874, 539), 'tw': (716, 488, 869, 533)}, color={'cn': (125, 164, 214), 'en': (89, 138, 201), 'jp': (93, 142, 204), 'tw': (89, 138, 201)}, button={'cn': (719, 493, 861, 534), 'en': (716, 488, 869, 533), 'jp': (711, 482, 874, 539), 'tw': (716, 488, 869, 533)}, file={'cn': './assets/cn/handler/MISSION_POPUP_GO.png', 'en': './assets/en/handler/MISSION_POPUP_GO.png', 'jp': './assets/jp/handler/MISSION_POPUP_GO.png', 'tw': './assets/tw/handler/MISSION_POPUP_GO.png'}) -<<<<<<< HEAD MOB_MOVE_1 = Button(area={'cn': (1102, 504, 1176, 578), 'en': (1102, 504, 1176, 578), 'jp': (1102, 504, 1176, 578), 'tw': (1102, 504, 1176, 578)}, color={'cn': (118, 120, 127), 'en': (118, 120, 127), 'jp': (118, 120, 127), 'tw': (118, 120, 127)}, button={'cn': (1102, 504, 1176, 578), 'en': (1102, 504, 1176, 578), 'jp': (1102, 504, 1176, 578), 'tw': (1102, 504, 1176, 578)}, file={'cn': './assets/cn/handler/MOB_MOVE_1.png', 'en': './assets/en/handler/MOB_MOVE_1.png', 'jp': './assets/jp/handler/MOB_MOVE_1.png', 'tw': './assets/tw/handler/MOB_MOVE_1.png'}) MOB_MOVE_2 = Button(area={'cn': (1102, 504, 1176, 578), 'en': (1102, 504, 1176, 578), 'jp': (1102, 504, 1176, 578), 'tw': (1102, 504, 1176, 578)}, color={'cn': (119, 121, 128), 'en': (119, 121, 128), 'jp': (119, 121, 128), 'tw': (119, 121, 128)}, button={'cn': (1102, 504, 1176, 578), 'en': (1102, 504, 1176, 578), 'jp': (1102, 504, 1176, 578), 'tw': (1102, 504, 1176, 578)}, file={'cn': './assets/cn/handler/MOB_MOVE_2.png', 'en': './assets/en/handler/MOB_MOVE_2.png', 'jp': './assets/jp/handler/MOB_MOVE_2.png', 'tw': './assets/tw/handler/MOB_MOVE_2.png'}) MOB_MOVE_CANCEL = Button(area={'cn': (1162, 646, 1220, 674), 'en': (1162, 646, 1220, 674), 'jp': (1162, 644, 1222, 675), 'tw': (1162, 646, 1220, 674)}, color={'cn': (224, 176, 173), 'en': (224, 176, 173), 'jp': (207, 140, 136), 'tw': (224, 176, 173)}, button={'cn': (1162, 646, 1220, 674), 'en': (1162, 646, 1220, 674), 'jp': (1162, 644, 1222, 675), 'tw': (1162, 646, 1220, 674)}, file={'cn': './assets/cn/handler/MOB_MOVE_CANCEL.png', 'en': './assets/cn/handler/MOB_MOVE_CANCEL.png', 'jp': './assets/jp/handler/MOB_MOVE_CANCEL.png', 'tw': './assets/cn/handler/MOB_MOVE_CANCEL.png'}) -======= -MOB_MOVE_CANCEL = Button(area={'cn': (1162, 646, 1220, 674), 'en': (1162, 646, 1220, 674), 'jp': (1162, 644, 1222, 675), 'tw': (1162, 646, 1220, 674)}, color={'cn': (224, 176, 173), 'en': (224, 176, 173), 'jp': (207, 140, 136), 'tw': (224, 176, 173)}, button={'cn': (1162, 646, 1220, 674), 'en': (1162, 646, 1220, 674), 'jp': (1162, 644, 1222, 675), 'tw': (1162, 646, 1220, 674)}, file={'cn': './assets/cn/handler/MOB_MOVE_CANCEL.png', 'en': './assets/cn/handler/MOB_MOVE_CANCEL.png', 'jp': './assets/jp/handler/MOB_MOVE_CANCEL.png', 'tw': './assets/cn/handler/MOB_MOVE_CANCEL.png'}) -MOB_MOVE_ENTER = Button(area={'cn': (1102, 504, 1157, 578), 'en': (1102, 504, 1157, 578), 'jp': (1102, 504, 1157, 578), 'tw': (1102, 504, 1157, 578)}, color={'cn': (122, 124, 131), 'en': (122, 124, 131), 'jp': (122, 124, 131), 'tw': (122, 124, 131)}, button={'cn': (1102, 504, 1157, 578), 'en': (1102, 504, 1157, 578), 'jp': (1102, 504, 1157, 578), 'tw': (1102, 504, 1157, 578)}, file={'cn': './assets/cn/handler/MOB_MOVE_ENTER.png', 'en': './assets/en/handler/MOB_MOVE_ENTER.png', 'jp': './assets/jp/handler/MOB_MOVE_ENTER.png', 'tw': './assets/tw/handler/MOB_MOVE_ENTER.png'}) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 MONTHLY_PASS_NOTICE = Button(area={'cn': (554, 505, 726, 561), 'en': (716, 488, 869, 533), 'jp': (554, 505, 726, 561), 'tw': (554, 505, 726, 561)}, color={'cn': (109, 153, 208), 'en': (89, 138, 201), 'jp': (109, 153, 208), 'tw': (109, 153, 208)}, button={'cn': (872, 152, 939, 196), 'en': (863, 173, 929, 217), 'jp': (872, 152, 939, 196), 'tw': (872, 152, 939, 196)}, file={'cn': './assets/cn/handler/MONTHLY_PASS_NOTICE.png', 'en': './assets/en/handler/MONTHLY_PASS_NOTICE.png', 'jp': './assets/cn/handler/MONTHLY_PASS_NOTICE.png', 'tw': './assets/cn/handler/MONTHLY_PASS_NOTICE.png'}) MYSTERY_ITEM = Button(area={'cn': (589, 294, 691, 427), 'en': (589, 294, 691, 427), 'jp': (589, 294, 691, 427), 'tw': (589, 294, 691, 427)}, color={'cn': (144, 127, 83), 'en': (144, 127, 83), 'jp': (144, 127, 83), 'tw': (144, 127, 83)}, button={'cn': (588, 478, 698, 496), 'en': (588, 478, 698, 496), 'jp': (588, 478, 698, 496), 'tw': (588, 478, 698, 496)}, file={'cn': './assets/cn/handler/MYSTERY_ITEM.png', 'en': './assets/en/handler/MYSTERY_ITEM.png', 'jp': './assets/jp/handler/MYSTERY_ITEM.png', 'tw': './assets/tw/handler/MYSTERY_ITEM.png'}) POPUP_CANCEL = Button(area={'cn': (453, 506, 525, 536), 'en': (407, 485, 574, 535), 'jp': (455, 515, 521, 546), 'tw': (454, 495, 525, 526)}, color={'cn': (196, 198, 199), 'en': (168, 169, 171), 'jp': (181, 183, 184), 'tw': (195, 196, 197)}, button={'cn': (453, 506, 525, 536), 'en': (407, 485, 574, 535), 'jp': (455, 515, 521, 546), 'tw': (454, 495, 525, 526)}, file={'cn': './assets/cn/handler/POPUP_CANCEL.png', 'en': './assets/en/handler/POPUP_CANCEL.gif', 'jp': './assets/jp/handler/POPUP_CANCEL.png', 'tw': './assets/tw/handler/POPUP_CANCEL.png'}) diff --git a/module/handler/auto_search.py b/module/handler/auto_search.py index 676acae71..c8d587c9c 100644 --- a/module/handler/auto_search.py +++ b/module/handler/auto_search.py @@ -15,7 +15,6 @@ AUTO_SEARCH_SETTINGS = [ AUTO_SEARCH_SET_SUB_AUTO, AUTO_SEARCH_SET_SUB_STANDBY ] -<<<<<<< HEAD AUTO_SEARCH_SETTINGS_15 = [ AUTO_SEARCH_SET_MOB_15, AUTO_SEARCH_SET_BOSS_15, @@ -24,8 +23,6 @@ AUTO_SEARCH_SETTINGS_15 = [ AUTO_SEARCH_SET_SUB_AUTO_15, AUTO_SEARCH_SET_SUB_STANDBY_15 ] -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 dic_setting_name_to_index = { 'fleet1_mob_fleet2_boss': 0, 'fleet1_boss_fleet2_mob': 1, @@ -142,11 +139,8 @@ class AutoSearchHandler(EnemySearchingHandler): bool: If selected to the correct option. """ active = [] -<<<<<<< HEAD self.AUTO_SEARCH_SETTINGS = AUTO_SEARCH_SETTINGS_15 if 'campaign_15' in self.config.campaign_name \ else AUTO_SEARCH_SETTINGS -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 for index, button in enumerate(AUTO_SEARCH_SETTINGS): if self.image_color_count(button.button, color=(156, 255, 82), threshold=221, count=20): @@ -166,11 +160,7 @@ class AutoSearchHandler(EnemySearchingHandler): logger.info('Selected to the correct auto search setting') return True else: -<<<<<<< HEAD self.device.click(self.AUTO_SEARCH_SETTINGS[target_index]) -======= - self.device.click(AUTO_SEARCH_SETTINGS[target_index]) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 return False def auto_search_setting_ensure(self, setting, skip_first_screenshot=True): diff --git a/module/handler/fast_forward.py b/module/handler/fast_forward.py index 0473baa05..54da7fa90 100644 --- a/module/handler/fast_forward.py +++ b/module/handler/fast_forward.py @@ -245,7 +245,6 @@ class FastForwardHandler(AutoSearchHandler): logger.info('Auto search setting') self.fleet_preparation_sidebar_ensure(3) -<<<<<<< HEAD if not self.auto_search_setting_ensure(self.config.Fleet_FleetOrder): if self.config.task.command == 'GemsFarming' and self.config.GemsFarming_StopIFAutoNotEnsured: from module.notify import handle_notify @@ -262,9 +261,6 @@ class FastForwardHandler(AutoSearchHandler): logger.critical('Auto search could not be ensured.') logger.critical('Close Task: GemsFarming') self.config.task_stop('Auto search could not be ensured.') -======= - self.auto_search_setting_ensure(self.config.Fleet_FleetOrder) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 if self.config.SUBMARINE: self.auto_search_setting_ensure(self.config.Submarine_AutoSearchMode) return True diff --git a/module/handler/login.py b/module/handler/login.py index 833b93804..de2c52833 100644 --- a/module/handler/login.py +++ b/module/handler/login.py @@ -17,7 +17,6 @@ from module.map.assets import * from module.ui.assets import * from module.ui.page import page_campaign_menu from module.ui.ui import UI -<<<<<<< HEAD from module.gg_handler.gg_handler import GGHandler @@ -25,11 +24,6 @@ class LoginHandler(UI): _app_u2_family = ['uiautomator2', 'minitouch', 'scrcpy', 'MaaTouch'] have_been_reset = False -======= - - -class LoginHandler(UI): ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 def _handle_app_login(self): """ Pages: @@ -37,18 +31,10 @@ class LoginHandler(UI): out: page_main """ logger.hr('App login') -<<<<<<< HEAD GGHandler(config=self.config, device=self.device).handle_restart() confirm_timer = Timer(1.5, count=4).start() orientation_timer = Timer(5) login_success = False -======= - - confirm_timer = Timer(1.5, count=4).start() - orientation_timer = Timer(5) - login_success = False - ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 while 1: # Watch device rotation if not login_success and orientation_timer.reached(): @@ -103,11 +89,7 @@ class LoginHandler(UI): # Always goto page_main if self.appear_then_click(GOTO_MAIN, offset=(30, 30), interval=5): continue -<<<<<<< HEAD -======= - ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 return True _user_agreement_timer = Timer(1, count=2) @@ -161,49 +143,33 @@ class LoginHandler(UI): logger.critical('Login failed more than 3') logger.critical('Azur Lane server may be under maintenance, or you may lost network connection') -<<<<<<< HEAD raise GameStuckError def app_stop(self): if self.config.Emulator_ControlMethod in self._app_u2_family and not self.have_been_reset: GGHandler(config=self.config, device=self.device).handle_u2_restart() self.have_been_reset = True -======= - raise RequestHumanTakeover - - def app_stop(self): ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 logger.hr('App stop') self.device.app_stop() def app_start(self): -<<<<<<< HEAD if self.config.Emulator_ControlMethod in self._app_u2_family and not self.have_been_reset: GGHandler(config=self.config, device=self.device).handle_u2_restart() self.have_been_reset = True -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 logger.hr('App start') self.device.app_start() self.handle_app_login() # self.ensure_no_unfinished_campaign() def app_restart(self): -<<<<<<< HEAD if self.config.Emulator_ControlMethod in self._app_u2_family and not self.have_been_reset: GGHandler(config=self.config, device=self.device).handle_u2_restart() self.have_been_reset = True -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 logger.hr('App restart') self.device.app_stop() self.device.app_start() self.handle_app_login() # self.ensure_no_unfinished_campaign() -<<<<<<< HEAD -======= - self.config.task_delay(server_update=True) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 def ensure_no_unfinished_campaign(self, confirm_wait=3): """ diff --git a/module/handler/strategy.py b/module/handler/strategy.py index 90448278c..7462a72eb 100644 --- a/module/handler/strategy.py +++ b/module/handler/strategy.py @@ -211,39 +211,23 @@ class StrategyHandler(InfoHandler): """ return self.appear(MOB_MOVE_CANCEL, offset=(20, 20)) -<<<<<<< HEAD def strategy_get_mob_move_remain(self): -======= - def strategy_has_mob_move(self): ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 """ Pages: in: STRATEGY_OPENED out: STRATEGY_OPENED """ -<<<<<<< HEAD if self.appear(MOB_MOVE_2, offset=MOB_MOVE_OFFSET): return 2 elif self.appear(MOB_MOVE_1, offset=MOB_MOVE_OFFSET): return 1 else: return 0 -======= - if (self.appear(MOB_MOVE_ENTER, offset=MOB_MOVE_OFFSET) - and MOB_MOVE_ENTER.match_appear_on(self.device.image)): - return True - else: - return False ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 def strategy_mob_move_enter(self, skip_first_screenshot=True): """ Pages: -<<<<<<< HEAD in: STRATEGY_OPENED, MOB_MOVE_1 or MOB_MOVE_2 -======= - in: STRATEGY_OPENED, MOB_MOVE_ENTER ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 out: MOB_MOVE_CANCEL """ logger.info('Mob move enter') @@ -256,24 +240,16 @@ class StrategyHandler(InfoHandler): if self.appear(MOB_MOVE_CANCEL, offset=(20, 20)): break -<<<<<<< HEAD if self.appear_then_click(MOB_MOVE_1, offset=MOB_MOVE_OFFSET, interval=5): continue if self.appear_then_click(MOB_MOVE_2, offset=MOB_MOVE_OFFSET, interval=5): -======= - if self.appear_then_click(MOB_MOVE_ENTER, offset=MOB_MOVE_OFFSET, interval=5): ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 continue def strategy_mob_move_cancel(self, skip_first_screenshot=True): """ Pages: in: MOB_MOVE_CANCEL -<<<<<<< HEAD out: STRATEGY_OPENED, MOB_MOVE_1 or MOB_MOVE_2 -======= - out: STRATEGY_OPENED, MOB_MOVE_ENTER ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 """ logger.info('Mob move cancel') while 1: @@ -282,12 +258,8 @@ class StrategyHandler(InfoHandler): else: self.device.screenshot() -<<<<<<< HEAD if self.appear(MOB_MOVE_1, offset=MOB_MOVE_OFFSET) \ or self.appear(MOB_MOVE_2, offset=MOB_MOVE_OFFSET): -======= - if self.appear(MOB_MOVE_ENTER, offset=MOB_MOVE_OFFSET): ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 break if self.appear_then_click(MOB_MOVE_CANCEL, offset=(20, 20), interval=5): diff --git a/module/hard/equipment.py b/module/hard/equipment.py index cbd13b368..2506baa51 100644 --- a/module/hard/equipment.py +++ b/module/hard/equipment.py @@ -1,32 +1,17 @@ -<<<<<<< HEAD from module.equipment.equipment import Equipment -======= -from module.equipment.equipment_change import EquipmentChange ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 from module.hard.assets import * from module.map.assets import * -<<<<<<< HEAD class HardEquipment(Equipment): -======= -class HardEquipment(EquipmentChange): - ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 def equipment_take_on(self): if self.config.FLEET_HARD_EQUIPMENT is None: return False if self.equipment_has_take_on: return False -<<<<<<< HEAD enter = EQUIP_ENTER_1 if self.config.FLEET_HARD == 1 else EQUIP_ENTER_2 super().equipment_take_on(enter=enter, out=FLEET_PREPARATION, fleet=self.config.FLEET_HARD_EQUIPMENT) -======= - enter = EQUIP_ENTER_1 if self.config.Hard_HardFleet == 1 else EQUIP_ENTER_2 - self.fleet_equipment_take_on_preset(preset_record=self.config.FLEET_HARD_EQUIPMENT, enter=enter, - long_click=True, out=FLEET_PREPARATION) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 return True def equipment_take_off(self): @@ -35,11 +20,6 @@ class HardEquipment(EquipmentChange): if not self.equipment_has_take_on: return False -<<<<<<< HEAD enter = EQUIP_ENTER_1 if self.config.FLEET_HARD == 1 else EQUIP_ENTER_2 super().equipment_take_off(enter=enter, out=FLEET_PREPARATION, fleet=self.config.FLEET_HARD_EQUIPMENT) -======= - enter = EQUIP_ENTER_1 if self.config.Hard_HardFleet == 1 else EQUIP_ENTER_2 - self.fleet_equipment_take_off(enter=enter, long_click=True, out=FLEET_PREPARATION) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 return True diff --git a/module/logger.py b/module/logger.py index 45428a0bf..7c79c3744 100644 --- a/module/logger.py +++ b/module/logger.py @@ -5,23 +5,16 @@ import sys from typing import Callable, List from rich.console import Console, ConsoleOptions, ConsoleRenderable, NewLine -<<<<<<< HEAD from rich.highlighter import NullHighlighter, RegexHighlighter -======= -from rich.highlighter import RegexHighlighter, NullHighlighter ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 from rich.logging import RichHandler from rich.rule import Rule from rich.style import Style from rich.theme import Theme from rich.traceback import Traceback -<<<<<<< HEAD sys.stdout.reconfigure(encoding='utf-8') sys.stderr.reconfigure(encoding='utf-8') -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 def empty_function(*args, **kwargs): pass @@ -54,15 +47,9 @@ class RichRenderableHandler(RichHandler): message = self.format(record) traceback = None if ( -<<<<<<< HEAD self.rich_tracebacks and record.exc_info and record.exc_info != (None, None, None) -======= - self.rich_tracebacks - and record.exc_info - and record.exc_info != (None, None, None) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 ): exc_type, exc_value, exc_traceback = record.exc_info assert exc_type is not None @@ -107,10 +94,6 @@ class HTMLConsole(Console): Force full feature console but not working lol :( """ -<<<<<<< HEAD - -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 @property def options(self) -> ConsoleOptions: return ConsoleOptions( @@ -151,10 +134,6 @@ WEB_THEME = Theme({ "rule.text": Style(bold=True), }) -<<<<<<< HEAD -======= - ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 # Logger init logger_debug = False logger = logging.getLogger('alas') @@ -272,11 +251,7 @@ def set_func_logger(func): def _get_renderables( -<<<<<<< HEAD self: Console, *objects, sep=" ", end="\n", justify=None, emoji=None, markup=None, highlight=None, -======= - self: Console, *objects, sep=" ", end="\n", justify=None, emoji=None, markup=None, highlight=None, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 ) -> List[ConsoleRenderable]: """ Refer to rich.console.Console.print() diff --git a/module/map/assets.py b/module/map/assets.py index eade6e0af..dc3529a47 100644 --- a/module/map/assets.py +++ b/module/map/assets.py @@ -16,7 +16,6 @@ FLEET_2_CHOOSE = Button(area={'cn': (1022, 306, 1083, 365), 'en': (1003, 307, 10 FLEET_2_CLEAR = Button(area={'cn': (1109, 306, 1169, 365), 'en': (1092, 307, 1152, 365), 'jp': (1113, 306, 1169, 365), 'tw': (1109, 303, 1175, 365)}, color={'cn': (155, 158, 159), 'en': (140, 141, 143), 'jp': (151, 153, 154), 'tw': (151, 152, 154)}, button={'cn': (1109, 306, 1169, 365), 'en': (1092, 307, 1152, 365), 'jp': (1113, 306, 1169, 365), 'tw': (1109, 303, 1175, 365)}, file={'cn': './assets/cn/map/FLEET_2_CLEAR.png', 'en': './assets/en/map/FLEET_2_CLEAR.png', 'jp': './assets/jp/map/FLEET_2_CLEAR.png', 'tw': './assets/tw/map/FLEET_2_CLEAR.png'}) FLEET_2_HARD_SATIESFIED = Button(area={'cn': (208, 372, 361, 401), 'en': (188, 378, 328, 402), 'jp': (208, 372, 361, 401), 'tw': (215, 377, 306, 400)}, color={'cn': (75, 54, 43), 'en': (97, 88, 78), 'jp': (75, 54, 43), 'tw': (83, 68, 48)}, button={'cn': (208, 372, 361, 401), 'en': (188, 378, 328, 402), 'jp': (208, 372, 361, 401), 'tw': (215, 377, 306, 400)}, file={'cn': './assets/cn/map/FLEET_2_HARD_SATIESFIED.png', 'en': './assets/en/map/FLEET_2_HARD_SATIESFIED.png', 'jp': './assets/jp/map/FLEET_2_HARD_SATIESFIED.png', 'tw': './assets/tw/map/FLEET_2_HARD_SATIESFIED.png'}) FLEET_2_IN_USE = Button(area={'cn': (391, 351, 475, 374), 'en': (374, 352, 453, 373), 'jp': (391, 351, 475, 374), 'tw': (393, 338, 473, 373)}, color={'cn': (182, 165, 200), 'en': (151, 152, 162), 'jp': (182, 165, 200), 'tw': (140, 116, 113)}, button={'cn': (391, 351, 475, 374), 'en': (374, 352, 453, 373), 'jp': (391, 351, 475, 374), 'tw': (393, 338, 473, 373)}, file={'cn': './assets/cn/map/FLEET_2_IN_USE.png', 'en': './assets/en/map/FLEET_2_IN_USE.png', 'jp': './assets/jp/map/FLEET_2_IN_USE.png', 'tw': './assets/tw/map/FLEET_2_IN_USE.png'}) -<<<<<<< HEAD FLEET_ENTER_FLAGSHIP_HARD_1 = Button(area={'cn': (389, 158, 472, 241), 'en': (389, 158, 472, 241), 'jp': (389, 158, 472, 241), 'tw': (389, 158, 472, 241)}, color={'cn': (144, 160, 164), 'en': (144, 160, 164), 'jp': (144, 160, 164), 'tw': (144, 160, 164)}, button={'cn': (389, 158, 472, 241), 'en': (389, 158, 472, 241), 'jp': (389, 158, 472, 241), 'tw': (389, 158, 472, 241)}, file={'cn': './assets/cn/map/FLEET_ENTER_FLAGSHIP_HARD_1.png', 'en': './assets/cn/map/FLEET_ENTER_FLAGSHIP_HARD_1.png', 'jp': './assets/cn/map/FLEET_ENTER_FLAGSHIP_HARD_1.png', 'tw': './assets/cn/map/FLEET_ENTER_FLAGSHIP_HARD_1.png'}) FLEET_ENTER_FLAGSHIP_HARD_1_3 = Button(area={'cn': (598, 179, 677, 258), 'en': (598, 179, 677, 258), 'jp': (598, 179, 677, 258), 'tw': (598, 179, 677, 258)}, color={'cn': (48, 54, 66), 'en': (48, 54, 66), 'jp': (48, 54, 66), 'tw': (48, 54, 66)}, button={'cn': (598, 179, 677, 258), 'en': (598, 179, 677, 258), 'jp': (598, 179, 677, 258), 'tw': (598, 179, 677, 258)}, file={'cn': './assets/cn/map/FLEET_ENTER_FLAGSHIP_HARD_1_3.png', 'en': './assets/cn/map/FLEET_ENTER_FLAGSHIP_HARD_1_3.png', 'jp': './assets/cn/map/FLEET_ENTER_FLAGSHIP_HARD_1_3.png', 'tw': './assets/cn/map/FLEET_ENTER_FLAGSHIP_HARD_1_3.png'}) FLEET_ENTER_FLAGSHIP_HARD_2 = Button(area={'cn': (389, 291, 472, 374), 'en': (389, 291, 472, 374), 'jp': (389, 291, 472, 374), 'tw': (389, 291, 472, 374)}, color={'cn': (177, 165, 150), 'en': (177, 165, 150), 'jp': (177, 165, 150), 'tw': (177, 165, 150)}, button={'cn': (389, 291, 472, 374), 'en': (389, 291, 472, 374), 'jp': (389, 291, 472, 374), 'tw': (389, 291, 472, 374)}, file={'cn': './assets/cn/map/FLEET_ENTER_FLAGSHIP_HARD_2.png', 'en': './assets/cn/map/FLEET_ENTER_FLAGSHIP_HARD_2.png', 'jp': './assets/cn/map/FLEET_ENTER_FLAGSHIP_HARD_2.png', 'tw': './assets/cn/map/FLEET_ENTER_FLAGSHIP_HARD_2.png'}) @@ -25,8 +24,6 @@ FLEET_ENTER_HARD_1 = Button(area={'cn': (705, 158, 788, 241), 'en': (705, 158, 7 FLEET_ENTER_HARD_1_3 = Button(area={'cn': (910, 176, 994, 260), 'en': (910, 176, 994, 260), 'jp': (910, 176, 994, 260), 'tw': (910, 176, 994, 260)}, color={'cn': (47, 59, 73), 'en': (47, 59, 73), 'jp': (47, 59, 73), 'tw': (47, 59, 73)}, button={'cn': (910, 176, 994, 260), 'en': (910, 176, 994, 260), 'jp': (910, 176, 994, 260), 'tw': (910, 176, 994, 260)}, file={'cn': './assets/cn/map/FLEET_ENTER_HARD_1_3.png', 'en': './assets/cn/map/FLEET_ENTER_HARD_1_3.png', 'jp': './assets/cn/map/FLEET_ENTER_HARD_1_3.png', 'tw': './assets/cn/map/FLEET_ENTER_HARD_1_3.png'}) FLEET_ENTER_HARD_2 = Button(area={'cn': (705, 291, 788, 374), 'en': (705, 291, 788, 374), 'jp': (705, 291, 788, 374), 'tw': (705, 291, 788, 374)}, color={'cn': (169, 182, 200), 'en': (169, 182, 200), 'jp': (169, 182, 200), 'tw': (169, 182, 200)}, button={'cn': (705, 291, 788, 374), 'en': (705, 291, 788, 374), 'jp': (705, 291, 788, 374), 'tw': (705, 291, 788, 374)}, file={'cn': './assets/cn/map/FLEET_ENTER_HARD_2.png', 'en': './assets/cn/map/FLEET_ENTER_HARD_2.png', 'jp': './assets/cn/map/FLEET_ENTER_HARD_2.png', 'tw': './assets/cn/map/FLEET_ENTER_HARD_2.png'}) FLEET_ENTER_HARD_2_3 = Button(area={'cn': (910, 288, 996, 374), 'en': (910, 288, 996, 374), 'jp': (910, 288, 996, 374), 'tw': (910, 288, 996, 374)}, color={'cn': (52, 56, 64), 'en': (52, 56, 64), 'jp': (52, 56, 64), 'tw': (52, 56, 64)}, button={'cn': (910, 288, 996, 374), 'en': (910, 288, 996, 374), 'jp': (910, 288, 996, 374), 'tw': (910, 288, 996, 374)}, file={'cn': './assets/cn/map/FLEET_ENTER_HARD_2_3.png', 'en': './assets/cn/map/FLEET_ENTER_HARD_2_3.png', 'jp': './assets/cn/map/FLEET_ENTER_HARD_2_3.png', 'tw': './assets/cn/map/FLEET_ENTER_HARD_2_3.png'}) -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 FLEET_NUM_1 = Button(area={'cn': (213, 76, 224, 101), 'en': (213, 76, 224, 101), 'jp': (213, 76, 224, 101), 'tw': (213, 76, 224, 101)}, color={'cn': (51, 143, 186), 'en': (51, 143, 186), 'jp': (51, 143, 186), 'tw': (51, 143, 186)}, button={'cn': (213, 76, 224, 101), 'en': (213, 76, 224, 101), 'jp': (213, 76, 224, 101), 'tw': (213, 76, 224, 101)}, file={'cn': './assets/cn/map/FLEET_NUM_1.png', 'en': './assets/en/map/FLEET_NUM_1.png', 'jp': './assets/jp/map/FLEET_NUM_1.png', 'tw': './assets/tw/map/FLEET_NUM_1.png'}) FLEET_NUM_2 = Button(area={'cn': (212, 75, 226, 101), 'en': (212, 75, 226, 101), 'jp': (212, 75, 226, 101), 'tw': (212, 75, 226, 101)}, color={'cn': (52, 150, 194), 'en': (52, 150, 194), 'jp': (52, 150, 194), 'tw': (52, 150, 194)}, button={'cn': (212, 75, 226, 101), 'en': (212, 75, 226, 101), 'jp': (212, 75, 226, 101), 'tw': (212, 75, 226, 101)}, file={'cn': './assets/cn/map/FLEET_NUM_2.png', 'en': './assets/en/map/FLEET_NUM_2.png', 'jp': './assets/jp/map/FLEET_NUM_2.png', 'tw': './assets/tw/map/FLEET_NUM_2.png'}) FLEET_PREPARATION = Button(area={'cn': (1013, 558, 1141, 588), 'en': (1048, 569, 1086, 595), 'jp': (1046, 558, 1107, 587), 'tw': (1014, 557, 1142, 588)}, color={'cn': (242, 211, 160), 'en': (241, 201, 148), 'jp': (241, 205, 151), 'tw': (242, 208, 157)}, button={'cn': (980, 549, 1181, 612), 'en': (988, 556, 1145, 606), 'jp': (983, 549, 1185, 612), 'tw': (980, 548, 1180, 612)}, file={'cn': './assets/cn/map/FLEET_PREPARATION.png', 'en': './assets/en/map/FLEET_PREPARATION.png', 'jp': './assets/jp/map/FLEET_PREPARATION.png', 'tw': './assets/tw/map/FLEET_PREPARATION.png'}) diff --git a/module/map/map_fleet_preparation.py b/module/map/map_fleet_preparation.py index 434ef755b..3c74bd487 100644 --- a/module/map/map_fleet_preparation.py +++ b/module/map/map_fleet_preparation.py @@ -127,11 +127,7 @@ class FleetOperator: stage = self.main.config.Campaign_Name logger.critical(f'Stage "{stage}" is a hard mode, ' f'please prepare your fleet "{str(self)}" in game before running Alas') -<<<<<<< HEAD raise RequestHumanTakeover('Hard not satisfied', str(self)) -======= - raise RequestHumanTakeover ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 def clear(self, skip_first_screenshot=True): """ diff --git a/module/os/map.py b/module/os/map.py index 3db9f196a..4f563127f 100644 --- a/module/os/map.py +++ b/module/os/map.py @@ -384,13 +384,7 @@ class OSMap(OSFleet, Map, GlobeCamera, StrategicSearchHandler): # Restart the game manually rather # than through 'task_call' # Ongoing task is uninterrupted -<<<<<<< HEAD self.device.app_restart() -======= - self.device.app_stop() - self.device.app_start() - LoginHandler(self.config, self.device).handle_app_login() ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 self.ui_ensure(page_os) if repair: @@ -409,11 +403,7 @@ class OSMap(OSFleet, Map, GlobeCamera, StrategicSearchHandler): remain = get_os_reset_remain() if remain <= 0: if self.config.is_task_enabled('OpsiCrossMonth'): -<<<<<<< HEAD logger.info('Just less than 1 day to OpSi reset, OpsiCrossMonth is enabled, ' -======= - logger.info('Just less than 1 day to OpSi reset, OpsiCrossMonth is enabled' ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 'set OpsiMeowfficerFarming.ActionPointPreserve to 300 temporarily') return 300 else: diff --git a/module/os/operation_siren.py b/module/os/operation_siren.py index 73d701a60..be92c3b1b 100644 --- a/module/os/operation_siren.py +++ b/module/os/operation_siren.py @@ -250,14 +250,10 @@ class OperationSiren(OSMap): OpsiFleet_Fleet=self.config.cross_get('OpsiMeowfficerFarming.OpsiFleet.Fleet'), OpsiFleet_Submarine=False, OpsiMeowfficerFarming_ActionPointPreserve=0, -<<<<<<< HEAD OpsiMeowfficerFarming_HazardLevel= self.config.cross_get('OpsiMeowfficerFarming' '.OpsiMeowfficerFarming' '.HazardLevel'), -======= - OpsiMeowfficerFarming_HazardLevel=3, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 OpsiMeowfficerFarming_TargetZone=0, ) while 1: diff --git a/module/os_ash/ash.py b/module/os_ash/ash.py index 03bf326e7..5aeeb40d7 100644 --- a/module/os_ash/ash.py +++ b/module/os_ash/ash.py @@ -49,7 +49,6 @@ class AshCombat(Combat): return False def handle_battle_preparation(self): -<<<<<<< HEAD if self.appear(BATTLE_PREPARATION, offset=(20, 20)): self.device.sleep(0.5) @@ -59,10 +58,6 @@ class AshCombat(Combat): GGHandler(config=self.config, device=self.device).power_limit('Ash') if super().handle_battle_preparation(): return True -======= - if super().handle_battle_preparation(): - return True ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 if self.appear_then_click(ASH_START, offset=(30, 30), interval=2): return True diff --git a/module/os_combat/combat.py b/module/os_combat/combat.py index 48c154f0f..025c9a0df 100644 --- a/module/os_combat/combat.py +++ b/module/os_combat/combat.py @@ -4,10 +4,7 @@ from module.logger import logger from module.os_combat.assets import * from module.os_handler.assets import * from module.os_handler.map_event import MapEventHandler -<<<<<<< HEAD from module.base.timer import Timer -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 class ContinuousCombat(Exception): @@ -246,7 +243,6 @@ class Combat(Combat_, MapEventHandler): self.submarine_call_reset() self.device.stuck_record_clear() self.device.click_record_clear() -<<<<<<< HEAD self.combat_auto_reset() self.combat_manual_reset() submarine_mode = 'do_not_use' @@ -257,23 +253,15 @@ class Combat(Combat_, MapEventHandler): auto = self.config.OpsiFleet_FleetMode confirm_timer = Timer(10) confirm_timer.start() -======= - submarine_mode = 'do_not_use' - if self.config.Submarine_Fleet: - submarine_mode = self.config.Submarine_Mode ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 success = True while 1: self.device.screenshot() -<<<<<<< HEAD if self.handle_combat_auto(auto): continue if self.handle_combat_manual(auto): continue -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 if self.handle_submarine_call(submarine_mode): continue # Don't change auto search option if failed diff --git a/module/os_handler/action_point.py b/module/os_handler/action_point.py index 0f6ccd521..d39a4b246 100644 --- a/module/os_handler/action_point.py +++ b/module/os_handler/action_point.py @@ -12,11 +12,8 @@ from module.os_handler.map_event import MapEventHandler from module.statistics.item import Item, ItemGrid from module.ui.assets import OS_CHECK from module.ui.ui import UI -<<<<<<< HEAD from module.config.utils import deep_get from module.log_res.log_res import LogRes -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 OCR_ACTION_POINT_REMAIN = Digit(ACTION_POINT_REMAIN, letter=(255, 219, 66), name='OCR_ACTION_POINT_REMAIN') OCR_ACTION_POINT_REMAIN_OS = Digit(ACTION_POINT_REMAIN_OS, letter=(239, 239, 239), @@ -142,15 +139,10 @@ class ActionPointHandler(UI, MapEventHandler): if self.config.OS_ACTION_POINT_BOX_USE: total += np.sum(np.array(box) * tuple(ACTION_POINT_BOX.values())) oil = box[0] -<<<<<<< HEAD LogRes(self.config).Oil = oil logger.info(f'Action points: {current}({total}), oil: {oil}') LogRes(self.config).ActionPoint = {'Value': current, 'Total': total} self.config.update() -======= - - logger.info(f'Action points: {current}({total}), oil: {oil}') ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 self._action_point_current = current self._action_point_box = box self._action_point_total = total diff --git a/module/os_handler/os_status.py b/module/os_handler/os_status.py index 6b4cc4ca6..97c587c64 100644 --- a/module/os_handler/os_status.py +++ b/module/os_handler/os_status.py @@ -9,10 +9,7 @@ from module.map.map_grids import SelectedGrids from module.ocr.ocr import Digit from module.os_handler.assets import * from module.ui.ui import UI -<<<<<<< HEAD from module.log_res.log_res import LogRes -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 OCR_SHOP_YELLOW_COINS = Digit(SHOP_YELLOW_COINS, letter=(239, 239, 239), threshold=160, name='OCR_SHOP_YELLOW_COINS') OCR_SHOP_PURPLE_COINS = Digit(SHOP_PURPLE_COINS, letter=(255, 255, 255), name='OCR_SHOP_PURPLE_COINS') @@ -75,17 +72,11 @@ class OSStatus(UI): continue else: break -<<<<<<< HEAD LogRes(self.config).YellowCoin = yellow_coins -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 return yellow_coins def get_purple_coins(self) -> int: amount = OCR_SHOP_PURPLE_COINS.ocr(self.device.image) -<<<<<<< HEAD LogRes(self.config).PurpleCoin = amount -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 return amount diff --git a/module/raid/raid.py b/module/raid/raid.py index 4f9ce79c5..48d3630c6 100644 --- a/module/raid/raid.py +++ b/module/raid/raid.py @@ -194,14 +194,11 @@ class Raid(MapOperation, RaidCombat, CampaignEvent): fleet_index (int): """ logger.info('Combat preparation.') -<<<<<<< HEAD # Power limit check from module.gg_handler.gg_handler import GGHandler GGHandler(config=self.config, device=self.device).power_limit('Raid') -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 skip_first_screenshot = True # No need, already waited in `raid_execute_once()` @@ -346,10 +343,7 @@ class Raid(MapOperation, RaidCombat, CampaignEvent): Pages: in: page_raid """ -<<<<<<< HEAD from module.log_res.log_res import LogRes -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 skip_first_screenshot = True timeout = Timer(1.5, count=5).start() ocr = pt_ocr(self.config.Campaign_Event) @@ -364,18 +358,12 @@ class Raid(MapOperation, RaidCombat, CampaignEvent): pt = ocr.ocr(self.device.image) if timeout.reached(): logger.warning('Wait PT timeout, assume it is') -<<<<<<< HEAD LogRes(self.config).Pt = pt -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 return pt if pt in [70000, 70001]: continue else: -<<<<<<< HEAD LogRes(self.config).Pt = pt -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 return pt else: logger.info(f'Raid {self.config.Campaign_Event} does not support PT ocr, skip') diff --git a/module/retire/assets.py b/module/retire/assets.py index c91cbe292..9b6077540 100644 --- a/module/retire/assets.py +++ b/module/retire/assets.py @@ -13,10 +13,7 @@ DOCK_FILTER = Button(area={'cn': (1099, 5, 1193, 48), 'en': (1098, 4, 1194, 49), DOCK_FILTER_CONFIRM = Button(area={'cn': (714, 613, 886, 671), 'en': (718, 618, 883, 666), 'jp': (717, 618, 885, 668), 'tw': (715, 630, 884, 680)}, color={'cn': (86, 133, 192), 'en': (108, 148, 201), 'jp': (83, 128, 188), 'tw': (83, 130, 190)}, button={'cn': (714, 613, 886, 671), 'en': (718, 618, 883, 666), 'jp': (717, 618, 885, 668), 'tw': (715, 630, 884, 680)}, file={'cn': './assets/cn/retire/DOCK_FILTER_CONFIRM.png', 'en': './assets/en/retire/DOCK_FILTER_CONFIRM.png', 'jp': './assets/jp/retire/DOCK_FILTER_CONFIRM.png', 'tw': './assets/tw/retire/DOCK_FILTER_CONFIRM.png'}) DOCK_SCROLL = Button(area={'cn': (1239, 76, 1248, 641), 'en': (1239, 76, 1248, 641), 'jp': (1237, 78, 1250, 628), 'tw': (1239, 76, 1248, 641)}, color={'cn': (47, 46, 37), 'en': (47, 46, 37), 'jp': (180, 156, 66), 'tw': (47, 46, 37)}, button={'cn': (1239, 76, 1248, 641), 'en': (1239, 76, 1248, 641), 'jp': (1237, 78, 1250, 628), 'tw': (1239, 76, 1248, 641)}, file={'cn': './assets/cn/retire/DOCK_SCROLL.png', 'en': './assets/en/retire/DOCK_SCROLL.png', 'jp': './assets/jp/retire/DOCK_SCROLL.png', 'tw': './assets/tw/retire/DOCK_SCROLL.png'}) DOCK_SELECTED = Button(area={'cn': (582, 662, 647, 685), 'en': (702, 660, 751, 686), 'jp': (603, 662, 655, 685), 'tw': (582, 662, 647, 685)}, color={'cn': (75, 75, 83), 'en': (84, 85, 93), 'jp': (84, 83, 92), 'tw': (75, 75, 83)}, button={'cn': (582, 662, 647, 685), 'en': (702, 660, 751, 686), 'jp': (603, 662, 655, 685), 'tw': (582, 662, 647, 685)}, file={'cn': './assets/cn/retire/DOCK_SELECTED.png', 'en': './assets/en/retire/DOCK_SELECTED.png', 'jp': './assets/jp/retire/DOCK_SELECTED.png', 'tw': './assets/tw/retire/DOCK_SELECTED.png'}) -<<<<<<< HEAD DOCK_SHIP_DOWN = Button(area={'cn': (93, 90, 225, 266), 'en': (93, 90, 225, 266), 'jp': (93, 90, 225, 266), 'tw': (93, 90, 225, 266)}, color={'cn': (68, 67, 69), 'en': (68, 67, 69), 'jp': (68, 67, 69), 'tw': (68, 67, 69)}, button={'cn': (93, 90, 225, 266), 'en': (93, 90, 225, 266), 'jp': (93, 90, 225, 266), 'tw': (93, 90, 225, 266)}, file={'cn': './assets/cn/retire/DOCK_SHIP_DOWN.png', 'en': './assets/cn/retire/DOCK_SHIP_DOWN.png', 'jp': './assets/cn/retire/DOCK_SHIP_DOWN.png', 'tw': './assets/cn/retire/DOCK_SHIP_DOWN.png'}) -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 EMPTY_ENHANCE_SLOT_PLUS = Button(area={'cn': (737, 402, 773, 437), 'en': (737, 402, 773, 437), 'jp': (737, 402, 773, 437), 'tw': (737, 402, 773, 437)}, color={'cn': (46, 46, 46), 'en': (46, 46, 46), 'jp': (46, 46, 46), 'tw': (46, 46, 46)}, button={'cn': (737, 402, 773, 437), 'en': (737, 402, 773, 437), 'jp': (737, 402, 773, 437), 'tw': (737, 402, 773, 437)}, file={'cn': './assets/cn/retire/EMPTY_ENHANCE_SLOT_PLUS.png', 'en': './assets/en/retire/EMPTY_ENHANCE_SLOT_PLUS.png', 'jp': './assets/jp/retire/EMPTY_ENHANCE_SLOT_PLUS.png', 'tw': './assets/tw/retire/EMPTY_ENHANCE_SLOT_PLUS.png'}) ENHANCE_CONFIRM = Button(area={'cn': (1126, 602, 1256, 645), 'en': (1130, 603, 1255, 643), 'jp': (1126, 601, 1257, 646), 'tw': (1126, 602, 1257, 644)}, color={'cn': (203, 149, 81), 'en': (204, 148, 82), 'jp': (189, 139, 78), 'tw': (198, 145, 82)}, button={'cn': (1126, 602, 1256, 645), 'en': (1130, 603, 1255, 643), 'jp': (1126, 601, 1257, 646), 'tw': (1126, 602, 1257, 644)}, file={'cn': './assets/cn/retire/ENHANCE_CONFIRM.png', 'en': './assets/en/retire/ENHANCE_CONFIRM.png', 'jp': './assets/jp/retire/ENHANCE_CONFIRM.png', 'tw': './assets/tw/retire/ENHANCE_CONFIRM.png'}) ENHANCE_FILLED = Button(area={'cn': (728, 440, 781, 454), 'en': (728, 440, 781, 454), 'jp': (722, 387, 789, 400), 'tw': (728, 440, 781, 454)}, color={'cn': (156, 138, 127), 'en': (156, 138, 127), 'jp': (146, 153, 211), 'tw': (156, 138, 127)}, button={'cn': (728, 440, 781, 454), 'en': (728, 440, 781, 454), 'jp': (722, 387, 789, 400), 'tw': (728, 440, 781, 454)}, file={'cn': './assets/cn/retire/ENHANCE_FILLED.png', 'en': './assets/en/retire/ENHANCE_FILLED.png', 'jp': './assets/jp/retire/ENHANCE_FILLED.png', 'tw': './assets/tw/retire/ENHANCE_FILLED.png'}) @@ -63,9 +60,6 @@ TEMPLATE_HERMES = Template(file={'cn': './assets/cn/retire/TEMPLATE_HERMES.png', TEMPLATE_IN_BATTLE = Template(file={'cn': './assets/cn/retire/TEMPLATE_IN_BATTLE.png', 'en': './assets/en/retire/TEMPLATE_IN_BATTLE.png', 'jp': './assets/jp/retire/TEMPLATE_IN_BATTLE.png', 'tw': './assets/tw/retire/TEMPLATE_IN_BATTLE.png'}) TEMPLATE_IN_COMMISSION = Template(file={'cn': './assets/cn/retire/TEMPLATE_IN_COMMISSION.png', 'en': './assets/en/retire/TEMPLATE_IN_COMMISSION.png', 'jp': './assets/jp/retire/TEMPLATE_IN_COMMISSION.png', 'tw': './assets/tw/retire/TEMPLATE_IN_COMMISSION.png'}) TEMPLATE_IN_EVENT_FLEET = Template(file={'cn': './assets/cn/retire/TEMPLATE_IN_EVENT_FLEET.png', 'en': './assets/cn/retire/TEMPLATE_IN_EVENT_FLEET.png', 'jp': './assets/cn/retire/TEMPLATE_IN_EVENT_FLEET.png', 'tw': './assets/cn/retire/TEMPLATE_IN_EVENT_FLEET.png'}) -<<<<<<< HEAD TEMPLATE_IN_HARD = Template(file={'cn': './assets/cn/retire/TEMPLATE_IN_HARD.png', 'en': './assets/cn/retire/TEMPLATE_IN_HARD.png', 'jp': './assets/cn/retire/TEMPLATE_IN_HARD.png', 'tw': './assets/cn/retire/TEMPLATE_IN_HARD.png'}) -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 TEMPLATE_LANGLEY = Template(file={'cn': './assets/cn/retire/TEMPLATE_LANGLEY.png', 'en': './assets/en/retire/TEMPLATE_LANGLEY.png', 'jp': './assets/jp/retire/TEMPLATE_LANGLEY.png', 'tw': './assets/tw/retire/TEMPLATE_LANGLEY.png'}) TEMPLATE_RANGER = Template(file={'cn': './assets/cn/retire/TEMPLATE_RANGER.png', 'en': './assets/en/retire/TEMPLATE_RANGER.png', 'jp': './assets/jp/retire/TEMPLATE_RANGER.png', 'tw': './assets/tw/retire/TEMPLATE_RANGER.png'}) diff --git a/module/retire/enhancement.py b/module/retire/enhancement.py index 7479bee5b..8852e0617 100644 --- a/module/retire/enhancement.py +++ b/module/retire/enhancement.py @@ -49,11 +49,7 @@ class Enhancement(Dock): if self.appear(DOCK_EMPTY, offset=(30, 30)): return False -<<<<<<< HEAD self.equip_enter( -======= - self.ship_info_enter( ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 CARD_GRIDS[(0, 0)], check_button=SHIP_DETAIL_CHECK, long_click=False) return True @@ -131,11 +127,7 @@ class Enhancement(Dock): logger.info( 'Reached maximum number to check, exiting current category') return "state_enhance_exit" -<<<<<<< HEAD if not self.equip_side_navbar_ensure(bottom=4): -======= - if not self.ship_side_navbar_ensure(bottom=4): ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 return "state_enhance_check" self.wait_until_appear(ENHANCE_RECOMMEND, offset=( @@ -197,11 +189,7 @@ class Enhancement(Dock): return "state_enhance_confirm" # Try to swipe to next -<<<<<<< HEAD if self.equip_view_next(check_button=ENHANCE_RECOMMEND): -======= - if self.ship_view_next(check_button=ENHANCE_RECOMMEND): ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 if not need_to_skip: nonlocal ship_count ship_count -= 1 @@ -233,11 +221,7 @@ class Enhancement(Dock): # Avoid too_many_click exception caused by multiple tries without material if state_list[-2:] == ["state_enhance_recommend", "state_enhance_fail"]: if len(self.device.click_record): -<<<<<<< HEAD while self.device.click_record[-1] in ['ENHANCE_RECOMMEND', 'EQUIP_SWIPE']: -======= - while self.device.click_record[-1] in ['ENHANCE_RECOMMEND', 'SHIP_SWIPE']: ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 self.device.click_record.pop() state_list.clear() state_list.append(state) diff --git a/module/retire/scanner.py b/module/retire/scanner.py index ded6934ec..df02e7d98 100644 --- a/module/retire/scanner.py +++ b/module/retire/scanner.py @@ -13,11 +13,7 @@ from module.ocr.ocr import Digit from module.retire.assets import (TEMPLATE_FLEET_1, TEMPLATE_FLEET_2, TEMPLATE_FLEET_3, TEMPLATE_FLEET_4, TEMPLATE_FLEET_5, TEMPLATE_FLEET_6, -<<<<<<< HEAD TEMPLATE_IN_BATTLE, TEMPLATE_IN_COMMISSION, TEMPLATE_IN_HARD, -======= - TEMPLATE_IN_BATTLE, TEMPLATE_IN_COMMISSION, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 TEMPLATE_IN_EVENT_FLEET) from module.retire.dock import (CARD_EMOTION_GRIDS, CARD_GRIDS, CARD_LEVEL_GRIDS, CARD_RARITY_GRIDS) @@ -248,7 +244,6 @@ class StatusScanner(Scanner): super().__init__() self._results = [] self.grids = CARD_GRIDS -<<<<<<< HEAD self.value_list: List[str] = [ 'free', 'battle', @@ -260,12 +255,6 @@ class StatusScanner(Scanner): TEMPLATE_IN_BATTLE: 'battle', TEMPLATE_IN_COMMISSION: 'commission', TEMPLATE_IN_HARD: 'in_hard_fleet', -======= - self.value_list: List[str] = ['free', 'battle', 'commission'] - self.templates = { - TEMPLATE_IN_BATTLE: 'battle', - TEMPLATE_IN_COMMISSION: 'commission', ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 TEMPLATE_IN_EVENT_FLEET: 'in_event_fleet', } @@ -302,7 +291,6 @@ class ShipScanner(Scanner): level (tuple): (lower, upper). Will be limited in range [1, 125] emotion (tuple): (lower, upper). Will be limited in range [0, 150] fleet (int): 0 means not in any fleet. Will be limited in range [0, 6] -<<<<<<< HEAD status (str, list): [ 'free', 'battle', @@ -310,9 +298,6 @@ class ShipScanner(Scanner): 'in_hard_fleet', 'in_event_fleet', ] -======= - status (str, list): ['any', 'commission', 'battle'] ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 """ def __init__( self, @@ -426,7 +411,6 @@ class ShipScanner(Scanner): level (tuple): (lower, upper). Will be limited in range [1, 125] emotion (tuple): (lower, upper). Will be limited in range [0, 150] fleet (int): 0 means not in any fleet. Will be limited in range [0, 6] -<<<<<<< HEAD status (str, list): [ 'free', 'battle', @@ -434,9 +418,6 @@ class ShipScanner(Scanner): 'in_hard_fleet', 'in_event_fleet', ] -======= - status (str, list): ['any', 'commission', 'battle'] ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 """ for attr in self.limitaion.keys(): value = kwargs.get(attr, self.limitaion[attr]) diff --git a/module/reward/reward.py b/module/reward/reward.py index 74c7bf140..e555117b1 100644 --- a/module/reward/reward.py +++ b/module/reward/reward.py @@ -45,19 +45,11 @@ class Reward(UI): confirm_timer.reset() click_timer.reset() continue -<<<<<<< HEAD if coin and click_timer.reached() and self.appear_then_click(COIN, offset=(20, 50), interval=60): confirm_timer.reset() click_timer.reset() continue if exp and click_timer.reached() and self.appear_then_click(EXP, offset=(20, 50), interval=60): -======= - if coin and click_timer.reached() and self.appear_then_click(COIN, offset=(25, 50), interval=60): - confirm_timer.reset() - click_timer.reset() - continue - if exp and click_timer.reached() and self.appear_then_click(EXP, offset=(30, 50), interval=60): ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 confirm_timer.reset() click_timer.reset() continue diff --git a/module/shop/shop_reward.py b/module/shop/shop_reward.py index 2ce8900a3..3cbaa126d 100644 --- a/module/shop/shop_reward.py +++ b/module/shop/shop_reward.py @@ -1,7 +1,4 @@ -<<<<<<< HEAD from module.base.decorator import Config -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 from module.shop.shop_core import CoreShop from module.shop.shop_general import GeneralShop from module.shop.shop_guild import GuildShop @@ -21,7 +18,6 @@ class RewardShop(ShopUI): self.config.task_delay(server_update=True) -<<<<<<< HEAD @Config.when(SERVER='tw') def run_once(self): # Munitions shops @@ -47,8 +43,6 @@ class RewardShop(ShopUI): self.config.task_delay(server_update=True) @Config.when(SERVER=None) -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 def run_once(self): # Munitions shops self.ui_goto_shop() diff --git a/module/shop/shop_status.py b/module/shop/shop_status.py index db1b445e4..cbce8ad06 100644 --- a/module/shop/shop_status.py +++ b/module/shop/shop_status.py @@ -1,10 +1,7 @@ from module.ocr.ocr import Digit from module.shop.assets import * from module.ui.ui import UI -<<<<<<< HEAD from module.log_res.log_res import LogRes -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 OCR_SHOP_GOLD_COINS = Digit(SHOP_GOLD_COINS, letter=(239, 239, 239), name='OCR_SHOP_GOLD_COINS') OCR_SHOP_GEMS = Digit(SHOP_GEMS, letter=(255, 243, 82), name='OCR_SHOP_GEMS') @@ -25,11 +22,8 @@ class ShopStatus(UI): in: """ amount = OCR_SHOP_GOLD_COINS.ocr(self.device.image) -<<<<<<< HEAD LogRes(self.config).Coin = amount self.config.update() -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 return amount def status_get_gems(self): @@ -41,11 +35,8 @@ class ShopStatus(UI): in: page_shop, medal shop """ amount = OCR_SHOP_GEMS.ocr(self.device.image) -<<<<<<< HEAD LogRes(self.config).Gem = amount self.config.update() -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 return amount def status_get_medal(self): @@ -57,11 +48,8 @@ class ShopStatus(UI): in: page_shop, medal shop """ amount = OCR_SHOP_MEDAL.ocr(self.device.image) -<<<<<<< HEAD LogRes(self.config).Medal = amount self.config.update() -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 return amount def status_get_merit(self): @@ -73,11 +61,8 @@ class ShopStatus(UI): in: page_shop, merit shop """ amount = OCR_SHOP_MERIT.ocr(self.device.image) -<<<<<<< HEAD LogRes(self.config).Merit = amount self.config.update() -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 return amount def status_get_guild_coins(self): @@ -89,11 +74,8 @@ class ShopStatus(UI): in: page_shop, guild shop """ amount = OCR_SHOP_GUILD_COINS.ocr(self.device.image) -<<<<<<< HEAD LogRes(self.config).GuildCoin = amount self.config.update() -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 return amount def status_get_core(self): @@ -105,11 +87,8 @@ class ShopStatus(UI): in: page_shop, core shop """ amount = OCR_SHOP_CORE.ocr(self.device.image) -<<<<<<< HEAD LogRes(self.config).Core = amount self.config.update() -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 return amount def status_get_voucher(self): diff --git a/module/submodule/utils.py b/module/submodule/utils.py index fa1c7a870..317b36c07 100644 --- a/module/submodule/utils.py +++ b/module/submodule/utils.py @@ -13,19 +13,6 @@ MOD_FUNC_DICT = { MOD_CONFIG_DICT = {} -<<<<<<< HEAD -======= -def get_available_func(): - return ( - 'Daemon', - 'OpsiDaemon', - 'AzurLaneUncensored', - 'Benchmark', - 'GameManager', - ) - - ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 def get_available_mod(): return set(MOD_DICT) diff --git a/module/ui/navbar.py b/module/ui/navbar.py index 456b6aad3..3a64d581d 100644 --- a/module/ui/navbar.py +++ b/module/ui/navbar.py @@ -188,12 +188,7 @@ class Navbar: active, minimum, maximum = self.get_info(main=main) logger.info(f'Nav item active: {active} from range ({minimum}, {maximum})') # Get None when receiving a pure black screenshot. -<<<<<<< HEAD if minimum is None or maximum is None: -======= - # Active is None could be because of slow animation - if active is None or minimum is None or maximum is None: ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 continue index = minimum + left - 1 if left is not None else maximum - right + 1 diff --git a/module/ui/ui.py b/module/ui/ui.py index b466fae87..ec5e26017 100644 --- a/module/ui/ui.py +++ b/module/ui/ui.py @@ -4,11 +4,7 @@ from module.base.timer import Timer from module.coalition.assets import FLEET_PREPARATION as COALITION_FLEET_PREPARATION from module.combat.assets import GET_ITEMS_1, GET_ITEMS_2, GET_SHIP from module.exception import (GameNotRunningError, GamePageUnknownError, -<<<<<<< HEAD GameTooManyClickError) -======= - RequestHumanTakeover) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 from module.exercise.assets import EXERCISE_PREPARATION from module.freebies.assets import PURCHASE_POPUP from module.handler.assets import (AUTO_SEARCH_MENU_EXIT, BATTLE_PASS_NOTICE, GAME_TIPS, LOGIN_ANNOUNCE, @@ -428,11 +424,7 @@ class UI(InfoHandler): logger.critical("Possible reason #1: You haven't set any fleets in operation siren") logger.critical( "Possible reason #2: Your fleets haven't satisfied the level restrictions in operation siren") -<<<<<<< HEAD raise GameTooManyClickError -======= - raise RequestHumanTakeover ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 if self.appear_then_click(RESET_TICKET_POPUP, offset=(30, 30), interval=3): return True if self.appear_then_click(RESET_FLEET_PREPARATION, offset=(30, 30), interval=3): diff --git a/module/ui_white/assets.py b/module/ui_white/assets.py index 8adb4710a..d3a1158ec 100644 --- a/module/ui_white/assets.py +++ b/module/ui_white/assets.py @@ -17,12 +17,7 @@ MAIN_GOTO_REWARD_WHITE = Button(area={'cn': (11, 209, 30, 259), 'en': (11, 216, MAIN_GOTO_SHOP_WHITE = Button(area={'cn': (18, 656, 164, 703), 'en': (18, 656, 165, 703), 'jp': (19, 657, 165, 702), 'tw': (19, 657, 164, 702)}, color={'cn': (221, 214, 212), 'en': (232, 220, 204), 'jp': (231, 223, 218), 'tw': (232, 224, 222)}, button={'cn': (18, 656, 164, 703), 'en': (18, 656, 165, 703), 'jp': (19, 657, 165, 702), 'tw': (19, 657, 164, 702)}, file={'cn': './assets/cn/ui_white/MAIN_GOTO_SHOP_WHITE.png', 'en': './assets/en/ui_white/MAIN_GOTO_SHOP_WHITE.png', 'jp': './assets/jp/ui_white/MAIN_GOTO_SHOP_WHITE.png', 'tw': './assets/tw/ui_white/MAIN_GOTO_SHOP_WHITE.png'}) MAIN_GOTO_STORAGE_WHITE = Button(area={'cn': (331, 656, 478, 703), 'en': (331, 657, 478, 703), 'jp': (332, 657, 478, 703), 'tw': (332, 657, 477, 702)}, color={'cn': (212, 214, 219), 'en': (214, 215, 216), 'jp': (220, 217, 223), 'tw': (216, 214, 217)}, button={'cn': (331, 656, 478, 703), 'en': (331, 657, 478, 703), 'jp': (332, 657, 478, 703), 'tw': (332, 657, 477, 702)}, file={'cn': './assets/cn/ui_white/MAIN_GOTO_STORAGE_WHITE.png', 'en': './assets/en/ui_white/MAIN_GOTO_STORAGE_WHITE.png', 'jp': './assets/jp/ui_white/MAIN_GOTO_STORAGE_WHITE.png', 'tw': './assets/tw/ui_white/MAIN_GOTO_STORAGE_WHITE.png'}) MISSION_NOTICE_WHITE = Button(area={'cn': (923, 657, 947, 671), 'en': (923, 657, 947, 671), 'jp': (923, 657, 947, 671), 'tw': (923, 657, 947, 671)}, color={'cn': (227, 168, 159), 'en': (227, 168, 159), 'jp': (227, 168, 159), 'tw': (227, 168, 159)}, button={'cn': (923, 657, 947, 671), 'en': (923, 657, 947, 671), 'jp': (923, 657, 947, 671), 'tw': (923, 657, 947, 671)}, file={'cn': './assets/cn/ui_white/MISSION_NOTICE_WHITE.png', 'en': './assets/en/ui_white/MISSION_NOTICE_WHITE.png', 'jp': './assets/jp/ui_white/MISSION_NOTICE_WHITE.png', 'tw': './assets/tw/ui_white/MISSION_NOTICE_WHITE.png'}) -<<<<<<< HEAD REWARD_1_WHITE = Button(area={'cn': (437, 278, 496, 306), 'en': (339, 234, 431, 248), 'jp': (443, 282, 493, 306), 'tw': (441, 280, 490, 306)}, color={'cn': (255, 193, 97), 'en': (255, 212, 147), 'jp': (255, 196, 106), 'tw': (255, 199, 111)}, button={'cn': (437, 278, 496, 306), 'en': (339, 234, 431, 248), 'jp': (443, 282, 493, 306), 'tw': (441, 280, 490, 306)}, file={'cn': './assets/cn/ui_white/REWARD_1_WHITE.png', 'en': './assets/en/ui_white/REWARD_1_WHITE.png', 'jp': './assets/jp/ui_white/REWARD_1_WHITE.png', 'tw': './assets/tw/ui_white/REWARD_1_WHITE.png'}) REWARD_2_WHITE = Button(area={'cn': (436, 419, 497, 448), 'en': (339, 351, 431, 365), 'jp': (443, 422, 493, 447), 'tw': (439, 422, 490, 448)}, color={'cn': (255, 192, 94), 'en': (255, 211, 145), 'jp': (255, 195, 104), 'tw': (255, 198, 109)}, button={'cn': (436, 419, 497, 448), 'en': (339, 351, 431, 365), 'jp': (443, 422, 493, 447), 'tw': (439, 422, 490, 448)}, file={'cn': './assets/cn/ui_white/REWARD_2_WHITE.png', 'en': './assets/en/ui_white/REWARD_2_WHITE.png', 'jp': './assets/jp/ui_white/REWARD_2_WHITE.png', 'tw': './assets/tw/ui_white/REWARD_2_WHITE.png'}) -======= -REWARD_1_WHITE = Button(area={'cn': (437, 278, 496, 306), 'en': (411, 283, 523, 300), 'jp': (443, 282, 493, 306), 'tw': (441, 280, 490, 306)}, color={'cn': (255, 193, 97), 'en': (255, 212, 150), 'jp': (255, 196, 106), 'tw': (255, 199, 111)}, button={'cn': (437, 278, 496, 306), 'en': (411, 283, 523, 300), 'jp': (443, 282, 493, 306), 'tw': (441, 280, 490, 306)}, file={'cn': './assets/cn/ui_white/REWARD_1_WHITE.png', 'en': './assets/en/ui_white/REWARD_1_WHITE.png', 'jp': './assets/jp/ui_white/REWARD_1_WHITE.png', 'tw': './assets/tw/ui_white/REWARD_1_WHITE.png'}) -REWARD_2_WHITE = Button(area={'cn': (436, 419, 497, 448), 'en': (411, 425, 523, 442), 'jp': (443, 422, 493, 447), 'tw': (439, 422, 490, 448)}, color={'cn': (255, 192, 94), 'en': (255, 212, 146), 'jp': (255, 195, 104), 'tw': (255, 198, 109)}, button={'cn': (436, 419, 497, 448), 'en': (411, 425, 523, 442), 'jp': (443, 422, 493, 447), 'tw': (439, 422, 490, 448)}, file={'cn': './assets/cn/ui_white/REWARD_2_WHITE.png', 'en': './assets/en/ui_white/REWARD_2_WHITE.png', 'jp': './assets/jp/ui_white/REWARD_2_WHITE.png', 'tw': './assets/tw/ui_white/REWARD_2_WHITE.png'}) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 REWARD_GOTO_COMMISSION_WHITE = Button(area={'cn': (440, 278, 494, 307), 'en': (420, 283, 512, 300), 'jp': (441, 280, 491, 305), 'tw': (440, 279, 489, 306)}, color={'cn': (103, 207, 255), 'en': (149, 220, 255), 'jp': (119, 212, 255), 'tw': (113, 211, 255)}, button={'cn': (440, 278, 494, 307), 'en': (420, 283, 512, 300), 'jp': (441, 280, 491, 305), 'tw': (440, 279, 489, 306)}, file={'cn': './assets/cn/ui_white/REWARD_GOTO_COMMISSION_WHITE.png', 'en': './assets/en/ui_white/REWARD_GOTO_COMMISSION_WHITE.png', 'jp': './assets/jp/ui_white/REWARD_GOTO_COMMISSION_WHITE.png', 'tw': './assets/tw/ui_white/REWARD_GOTO_COMMISSION_WHITE.png'}) REWARD_GOTO_TACTICAL_WHITE = Button(area={'cn': (442, 421, 492, 447), 'en': (420, 425, 512, 443), 'jp': (442, 421, 491, 445), 'tw': (439, 421, 489, 449)}, color={'cn': (114, 211, 255), 'en': (145, 219, 255), 'jp': (123, 214, 255), 'tw': (109, 209, 255)}, button={'cn': (442, 421, 492, 447), 'en': (420, 425, 512, 443), 'jp': (442, 421, 491, 445), 'tw': (439, 421, 489, 449)}, file={'cn': './assets/cn/ui_white/REWARD_GOTO_TACTICAL_WHITE.png', 'en': './assets/en/ui_white/REWARD_GOTO_TACTICAL_WHITE.png', 'jp': './assets/jp/ui_white/REWARD_GOTO_TACTICAL_WHITE.png', 'tw': './assets/tw/ui_white/REWARD_GOTO_TACTICAL_WHITE.png'}) diff --git a/module/webui/__init__.py b/module/webui/__init__.py index 3b27825c1..0eee023e7 100644 --- a/module/webui/__init__.py +++ b/module/webui/__init__.py @@ -1,11 +1,5 @@ # This must be the first to import from module.logger import logger # Change folder -<<<<<<< HEAD import deploy.Windows.logger deploy.Windows.logger.logger = logger -======= -import deploy.logger - -deploy.logger.logger = logger ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 diff --git a/module/webui/app.py b/module/webui/app.py index 625137671..89c467346 100644 --- a/module/webui/app.py +++ b/module/webui/app.py @@ -1,7 +1,4 @@ -<<<<<<< HEAD import re -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 import argparse import json import queue @@ -60,11 +57,8 @@ from module.config.utils import ( filepath_config, read_file, ) -<<<<<<< HEAD from module.config.utils import time_delta from module.log_res.log_res import LogRes -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 from module.logger import logger from module.ocr.rpc import start_ocr_server_process, stop_ocr_server_process from module.submodule.submodule import load_config @@ -73,11 +67,7 @@ from module.webui.base import Frame from module.webui.discord_presence import close_discord_rpc, init_discord_rpc from module.webui.fastapi import asgi_app from module.webui.lang import _t, t -<<<<<<< HEAD from module.webui.pin import put_input, put_select, pin_update -======= -from module.webui.pin import put_input, put_select ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 from module.webui.process_manager import ProcessManager from module.webui.remote_access import RemoteAccess from module.webui.setting import State @@ -110,7 +100,6 @@ from module.webui.widgets import ( task_handler = TaskHandler() -<<<<<<< HEAD def timedelta_to_text(delta=None): time_delta_name_suffix_dict = { 'Y': 'YearsAgo', @@ -134,16 +123,11 @@ def timedelta_to_text(delta=None): return time_delta_display + t(time_delta_name) -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 class AlasGUI(Frame): ALAS_MENU: Dict[str, Dict[str, List[str]]] ALAS_ARGS: Dict[str, Dict[str, Dict[str, Dict[str, str]]]] theme = "default" -<<<<<<< HEAD _log = RichLog -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 def initial(self) -> None: self.ALAS_MENU = read_file(filepath_args("menu", self.alas_mod)) @@ -436,7 +420,6 @@ class AlasGUI(Frame): ) log = RichLog("log") -<<<<<<< HEAD self._log = log self._log.dashboard_arg_group = LogRes(self.alas_config).groups @@ -474,24 +457,6 @@ class AlasGUI(Frame): put_scope("dashboard"), ], ), -======= - - with use_scope("logs"): - put_scope( - "log-bar", - [ - put_text(t("Gui.Overview.Log")).style( - "font-size: 1.25rem; margin: auto .5rem auto;" - ), - put_scope( - "log-bar-btns", - [ - put_scope("log_scroll_btn"), - ], - ), - ], - ) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 put_scope("log", [put_html("")]) log.console.width = log.get_width() @@ -506,7 +471,6 @@ class AlasGUI(Frame): color_off="off", scope="log_scroll_btn", ) -<<<<<<< HEAD switch_dashboard = BinarySwitchButton( label_on=t("Gui.Button.DashboardON"), label_off=t("Gui.Button.DashboardOFF"), @@ -530,14 +494,6 @@ class AlasGUI(Frame): self._log.set_dashboard_display(b) self.alas_update_dashboard(True) -======= - - self.task_handler.add(switch_scheduler.g(), 1, True) - self.task_handler.add(switch_log_scroll.g(), 1, True) - self.task_handler.add(self.alas_update_overview_task, 10, True) - self.task_handler.add(log.put_log(self.alas), 0.25, True) - ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 def _init_alas_config_watcher(self) -> None: def put_queue(path, value): self.modified_config_queue.put({"name": path, "value": value}) @@ -574,10 +530,7 @@ class AlasGUI(Frame): config_updater: AzurLaneConfig = State.config_updater, ) -> None: try: -<<<<<<< HEAD skip_time_record = False -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 valid = [] invalid = [] config = config_updater.read_file(config_name) @@ -681,7 +634,6 @@ class AlasGUI(Frame): else: put_text(t("Gui.Overview.NoTask")).style("--overview-notask-text--") -<<<<<<< HEAD def _update_dashboard(self, num=None, groups_to_display=None): x = 0 _num = 10000 if num is None else num @@ -781,8 +733,6 @@ class AlasGUI(Frame): elif self._log.display_dashboard: self._update_dashboard() -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 @use_scope("content", clear=True) def alas_daemon_overview(self, task: str) -> None: self.init_menu(name=task) @@ -1101,7 +1051,6 @@ class AlasGUI(Frame): def dev_utils(self) -> None: self.init_menu(name="Utils") self.set_title(t("Gui.MenuDevelop.Utils")) -<<<<<<< HEAD put_button(label=t("Gui.MenuDevelop.RaiseException"), onclick=raise_exception) def _force_restart(): @@ -1113,19 +1062,6 @@ class AlasGUI(Frame): toast(t("Gui.Toast.ReloadEnabled"), color="error") put_button(label=t("Gui.MenuDevelop.ForceRestart"), onclick=_force_restart) -======= - put_button(label="Raise exception", onclick=raise_exception) - - def _force_restart(): - if State.restart_event is not None: - toast("Alas will restart in 3 seconds", duration=0, color="error") - clearup() - State.restart_event.set() - else: - toast("Reload not enabled", color="error") - - put_button(label="Force restart", onclick=_force_restart) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 @use_scope("content", clear=True) def dev_remote(self) -> None: @@ -1343,11 +1279,7 @@ class AlasGUI(Frame): def run(self) -> None: # setup gui -<<<<<<< HEAD set_env(title="AlasGG", output_animation=False) -======= - set_env(title="Alas", output_animation=False) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 add_css(filepath_css("alas")) if self.is_mobile: add_css(filepath_css("alas-mobile")) diff --git a/module/webui/base.py b/module/webui/base.py index 94ce30061..ebf4c0f41 100644 --- a/module/webui/base.py +++ b/module/webui/base.py @@ -64,11 +64,7 @@ class Frame(Base): "header", [ put_html(Icon.ALAS).style("--header-icon--"), -<<<<<<< HEAD put_text("AlasGG").style("--header-text--"), -======= - put_text("Alas").style("--header-text--"), ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 put_scope("header_status"), put_scope("header_title"), ], diff --git a/module/webui/config.py b/module/webui/config.py index 63567bfb6..0df5f0527 100644 --- a/module/webui/config.py +++ b/module/webui/config.py @@ -1,15 +1,7 @@ -<<<<<<< HEAD from filelock import FileLock from deploy.Windows.config import DeployConfig as _DeployConfig from deploy.Windows.utils import * -======= -from typing import Optional, Union -from filelock import FileLock - -from deploy.config import DeployConfig as _DeployConfig -from deploy.utils import * ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 def poor_yaml_read_with_lock(file): diff --git a/module/webui/pin.py b/module/webui/pin.py index fff7dea0c..80ef58623 100644 --- a/module/webui/pin.py +++ b/module/webui/pin.py @@ -5,11 +5,7 @@ Add **other_html_attrs to put_xxx() from pywebio.io_ctrl import Output from pywebio.output import OutputPosition -<<<<<<< HEAD from pywebio.pin import _pin_output, check_dom_name_value, pin_update -======= -from pywebio.pin import _pin_output, check_dom_name_value ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 def put_input(name, type='text', *, label='', value=None, placeholder=None, readonly=None, datalist=None, diff --git a/module/webui/process_manager.py b/module/webui/process_manager.py index 1c886df09..2964f1d1a 100644 --- a/module/webui/process_manager.py +++ b/module/webui/process_manager.py @@ -12,12 +12,7 @@ from rich.console import Console, ConsoleRenderable from module.config.utils import filepath_config from module.logger import logger, set_file_logger, set_func_logger from module.submodule.submodule import load_mod -<<<<<<< HEAD from module.submodule.utils import get_available_mod, get_available_mod_func, get_config_mod, get_func_mod, list_mod_instance -======= -from module.submodule.utils import get_available_func, get_available_mod, get_available_mod_func, get_config_mod, \ - get_func_mod, list_mod_instance ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 from module.webui.setting import State @@ -154,7 +149,6 @@ class ProcessManager: if e is not None: AzurLaneAutoScript.stop_event = e AzurLaneAutoScript(config_name=config_name).loop() -<<<<<<< HEAD elif func == "Daemon": from module.daemon.daemon import AzurLaneDaemon @@ -175,12 +169,6 @@ class ProcessManager: from module.daemon.game_manager import GameManager GameManager(config=config_name, task="GameManager").run() -======= - elif func in get_available_func(): - from alas import AzurLaneAutoScript - - AzurLaneAutoScript(config_name=config_name).run(inflection.underscore(func)) ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 elif func in get_available_mod(): mod = load_mod(func) diff --git a/module/webui/updater.py b/module/webui/updater.py index d2b3209ab..5c60b2427 100644 --- a/module/webui/updater.py +++ b/module/webui/updater.py @@ -5,17 +5,10 @@ import time from typing import Generator, List, Tuple import requests -<<<<<<< HEAD from deploy.Windows.config import ExecutionError from deploy.Windows.git import GitManager from deploy.Windows.pip import PipManager from deploy.Windows.utils import DEPLOY_CONFIG -======= -from deploy.config import ExecutionError -from deploy.git import GitManager -from deploy.pip import PipManager -from deploy.utils import DEPLOY_CONFIG ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 from module.base.retry import retry from module.logger import logger from module.webui.config import DeployConfig diff --git a/module/webui/widgets.py b/module/webui/widgets.py index b8f27cfe2..86e815355 100644 --- a/module/webui/widgets.py +++ b/module/webui/widgets.py @@ -1,9 +1,6 @@ import copy import json -<<<<<<< HEAD import pywebio.pin -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 import random import string from typing import Any, Callable, Dict, Generator, List, Optional, TYPE_CHECKING, Union @@ -78,11 +75,8 @@ class ScrollableCode: class RichLog: -<<<<<<< HEAD last_display_time: dict -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 def __init__(self, scope, font_width="0.559") -> None: self.scope = scope self.font_width = font_width @@ -102,13 +96,10 @@ class RichLog: # self._callback_thread = None # self._width = 80 self.keep_bottom = True -<<<<<<< HEAD self.display_dashboard = False self.first_display = True self.last_display_time = {} self.dashboard_arg_group = None -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 if State.theme == "dark": self.terminal_theme = DARK_TERMINAL_THEME else: @@ -154,14 +145,11 @@ class RichLog: # use for lambda callback function self.keep_bottom = b -<<<<<<< HEAD def set_dashboard_display(self, b: bool) -> None: # use for lambda callback function. Copied. self.display_dashboard = b self.first_display = True -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 def get_width(self): js = """ let canvas = document.createElement('canvas'); diff --git a/webapp/.eslintrc.json b/webapp/.eslintrc.json index baede6355..5f65e8918 100644 --- a/webapp/.eslintrc.json +++ b/webapp/.eslintrc.json @@ -8,20 +8,15 @@ "extends": [ "eslint:recommended", /** @see https://github.com/typescript-eslint/typescript-eslint/tree/master/packages/eslint-plugin#recommended-configs */ -<<<<<<< HEAD "plugin:@typescript-eslint/recommended", "prettier", "plugin:prettier/recommended" -======= - "plugin:@typescript-eslint/recommended" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 ], "parser": "@typescript-eslint/parser", "parserOptions": { "ecmaVersion": 12, "sourceType": "module" }, -<<<<<<< HEAD "plugins": ["@typescript-eslint"], "ignorePatterns": ["node_modules/**", "**/dist/**"], "rules": { @@ -44,42 +39,10 @@ * This will make the history of changes in the hit a little cleaner */ "comma-dangle": ["warn", "always-multiline"], -======= - "plugins": [ - "@typescript-eslint" - ], - "ignorePatterns": [ - "types/env.d.ts", - "node_modules/**", - "**/dist/**" - ], - "rules": { - "@typescript-eslint/no-unused-vars": "error", - "@typescript-eslint/no-var-requires": "off", - "@typescript-eslint/consistent-type-imports": "error", - - /** - * Having a semicolon helps the optimizer interpret your code correctly. - * This avoids rare errors in optimized code. - * @see https://twitter.com/alex_kozack/status/1364210394328408066 - */ - "semi": [ - "error", - "always" - ], - /** - * This will make the history of changes in the hit a little cleaner - */ - "comma-dangle": [ - "warn", - "always-multiline" - ], ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 /** * Just for beauty */ "quotes": [ -<<<<<<< HEAD "warn", "single", { @@ -88,9 +51,5 @@ ], "@typescript-eslint/no-explicit-any": "off", "@typescript-eslint/ban-types": "off" -======= - "warn", "single" - ] ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } } diff --git a/webapp/.gitattributes b/webapp/.gitattributes index 75528abb9..4e01be4f0 100644 --- a/webapp/.gitattributes +++ b/webapp/.gitattributes @@ -1,7 +1,4 @@ .github/actions/**/*.js linguist-detectable=false scripts/*.js linguist-detectable=false *.config.js linguist-detectable=false -<<<<<<< HEAD * text=auto eol=lf -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 diff --git a/webapp/.github/FUNDING.yml b/webapp/.github/FUNDING.yml index a622009ab..a9c0779d5 100644 --- a/webapp/.github/FUNDING.yml +++ b/webapp/.github/FUNDING.yml @@ -1,8 +1,3 @@ # These are supported funding model platforms -<<<<<<< HEAD custom: ["https://www.buymeacoffee.com/kozack/", "https://send.monobank.ua/6SmojkkR9i"] -======= -patreon: Kozack -open_collective: vite-electron-builder ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 diff --git a/webapp/.github/ISSUE_TEMPLATE/bug_report.md b/webapp/.github/ISSUE_TEMPLATE/bug_report.md index 0a44af1af..8e4602664 100644 --- a/webapp/.github/ISSUE_TEMPLATE/bug_report.md +++ b/webapp/.github/ISSUE_TEMPLATE/bug_report.md @@ -12,10 +12,6 @@ A clear and concise description of what the bug is. **To Reproduce** Steps to reproduce the behavior: -<<<<<<< HEAD - -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 1. Go to '...' 2. Click on '....' 3. Scroll down to '....' diff --git a/webapp/.github/renovate.json b/webapp/.github/renovate.json index 890b64c29..3807570e1 100644 --- a/webapp/.github/renovate.json +++ b/webapp/.github/renovate.json @@ -2,7 +2,6 @@ "extends": [ "config:base", ":semanticCommits", -<<<<<<< HEAD ":semanticCommitTypeAll(deps)", ":semanticCommitScopeDisabled", ":automergeAll", @@ -25,59 +24,4 @@ "commit", "push" ] -======= - ":automergeTypes", - ":disableDependencyDashboard" - ], - "labels": [ - "dependencies" - ], - "baseBranches": [ - "main" - ], - "bumpVersion": "patch", - "patch": { - "automerge": true - }, - "minor": { - "automerge": true - }, - "packageRules": [ - { - "packageNames": [ - "node", - "npm" - ], - "enabled": false - }, - { - "depTypeList": [ - "devDependencies" - ], - "semanticCommitType": "build" - }, - { - "matchSourceUrlPrefixes": [ - "https://github.com/vitejs/vite/" - ], - "groupName": "Vite monorepo packages", - "automerge": false - }, - { - "matchPackagePatterns": [ - "^@typescript-eslint", - "^eslint" - ], - "automerge": true, - "groupName": "eslint" - }, - { - "matchPackageNames": [ - "electron" - ], - "separateMajorMinor": false - } - ], - "rangeStrategy": "pin" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } diff --git a/webapp/.github/workflows/lint.yml b/webapp/.github/workflows/lint.yml index e0db00961..e8770a90d 100644 --- a/webapp/.github/workflows/lint.yml +++ b/webapp/.github/workflows/lint.yml @@ -1,4 +1,3 @@ -<<<<<<< HEAD on: workflow_dispatch: push: @@ -29,27 +28,6 @@ on: concurrency: group: lint-${{ github.ref }} cancel-in-progress: true -======= -name: Linters -on: - push: - branches: - - main - paths: - - '**.js' - - '**.ts' - - '**.vue' - - 'package-lock.json' - - '.github/workflows/lint.yml' - pull_request: - paths: - - '**.js' - - '**.ts' - - '**.vue' - - 'package-lock.json' - - '.github/workflows/lint.yml' - ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 defaults: run: @@ -60,18 +38,12 @@ jobs: runs-on: ubuntu-latest steps: -<<<<<<< HEAD - uses: actions/checkout@v3 - uses: actions/setup-node@v3 -======= - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 with: node-version: 16 # Need for npm >=7.7 cache: 'npm' -<<<<<<< HEAD - run: npm ci env: PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 @@ -91,10 +63,3 @@ jobs: - run: npm i prettier - run: npx prettier --check "**/*.{js,mjs,cjs,jsx,ts,mts,cts,tsx,vue,json}" -======= - # TODO: Install not all dependencies, but only those required for this workflow - - name: Install dependencies - run: npm ci - - - run: npm run lint ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 diff --git a/webapp/.github/workflows/release.yml b/webapp/.github/workflows/release.yml index 03aad7240..f570381b6 100644 --- a/webapp/.github/workflows/release.yml +++ b/webapp/.github/workflows/release.yml @@ -1,6 +1,5 @@ name: Release on: -<<<<<<< HEAD workflow_call: inputs: dry-run: @@ -8,18 +7,6 @@ on: default: false required: false type: boolean -======= - push: - branches: - - main - paths-ignore: - - '**.md' - - '**.spec.js' - - '.idea' - - '.gitignore' - - '.github/**' - - '!.github/workflows/release.yml' ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 concurrency: group: release-${{ github.ref }} @@ -32,98 +19,23 @@ defaults: jobs: -<<<<<<< HEAD draft_release: strategy: fail-fast: true matrix: os: [ macos-latest, ubuntu-latest, windows-latest ] -======= - - draft: - runs-on: ubuntu-latest - outputs: - release-note: ${{ steps.release-note.outputs.release-note }} - version: ${{ steps.version.outputs.build-version }} - - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - uses: actions/setup-node@v2 - with: - node-version: 14 - - - name: Get last git tag - id: tag - run: echo "::set-output name=last-tag::$(git describe --tags --abbrev=0 || git rev-list --max-parents=0 ${{github.ref}})" - - - name: Generate release notes - uses: ./.github/actions/release-notes - id: release-note - with: - from: ${{ steps.tag.outputs.last-tag }} - to: ${{ github.ref }} - include-commit-body: true - include-abbreviated-commit: true - - - name: Get version from current date - id: version - run: echo "::set-output name=build-version::$(node -e "try{console.log(require('./electron-builder.config.js').extraMetadata.version)}catch(e){console.error(e);process.exit(1)}")" - - - - name: Waiting on All checks - uses: lewagon/wait-on-check-action@v0.2 - with: - ref: ${{ github.ref }} - repo-token: ${{ secrets.GITHUB_TOKEN }} - running-workflow-name: 'draft' - - - name: Delete outdated drafts - uses: hugo19941994/delete-draft-releases@v1.0.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Create Release Draft - uses: softprops/action-gh-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.github_token }} - with: - prerelease: true - draft: true - tag_name: v${{ steps.version.outputs.build-version }} - name: v${{ steps.version.outputs.build-version }} - body: ${{ steps.release-note.outputs.release-note }} - - upload_artifacts: - needs: [ draft ] - - strategy: - matrix: - os: [ windows-latest ] - # To compile the application for different platforms, use: - # os: [ macos-latest, ubuntu-latest, windows-latest ] ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 runs-on: ${{ matrix.os }} steps: -<<<<<<< HEAD - uses: actions/checkout@v3 - uses: actions/setup-node@v3 -======= - - uses: actions/checkout@v2 - - - uses: actions/setup-node@v2 ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 with: node-version: 16 # Need for npm >=7.7 cache: 'npm' -<<<<<<< HEAD - run: npm ci env: PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 @@ -147,50 +59,3 @@ jobs: # CSC_KEY_PASSWORD: '' # Publishing artifacts GH_TOKEN: ${{ secrets.github_token }} # GitHub token, automatically provided (No need to define this secret in the repo settings) -======= - - name: Install dependencies - run: npm ci - - # The easiest way to transfer release notes to a compiled application is create `release-notes.md` in the build resources. - # See https://github.com/electron-userland/electron-builder/issues/1511#issuecomment-310160119 - - name: Prepare release notes - env: - RELEASE_NOTE: ${{ needs.draft.outputs.release-note }} - run: echo "$RELEASE_NOTE" >> ./buildResources/release-notes.md - - # Compile app and upload artifacts - - name: Compile & release Electron app - uses: samuelmeuli/action-electron-builder@v1 - env: - VITE_APP_VERSION: ${{ needs.draft.outputs.version }} - with: - build_script_name: build - args: --config electron-builder.config.js - - # GitHub token, automatically provided to the action - # (No need to define this secret in the repo settings) - github_token: ${{ secrets.github_token }} - - # If the commit is tagged with a version (e.g. "v1.0.0"), - # release the app after building - release: true - - # Sometimes the build may fail due to a connection problem with Apple, GitHub, etc. servers. - # This option will restart the build as many attempts as possible - max_attempts: 3 - - - # Code Signing params - - # Base64-encoded code signing certificate for Windows - # windows_certs: '' - - # Password for decrypting `windows_certs` - # windows_certs_password: '' - - # Base64-encoded code signing certificate for macOS - # mac_certs: '' - - # Password for decrypting `mac_certs` - # mac_certs_password: '' ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 diff --git a/webapp/.github/workflows/tests.yml b/webapp/.github/workflows/tests.yml index 914993580..a79697cde 100644 --- a/webapp/.github/workflows/tests.yml +++ b/webapp/.github/workflows/tests.yml @@ -1,34 +1,15 @@ name: Tests -<<<<<<< HEAD on: [ workflow_call ] concurrency: group: tests-${{ github.ref }} cancel-in-progress: true -======= -on: - push: - branches: - - main - paths: - - 'packages/**' - - 'tests/**' - - 'package-lock.json' - - '.github/workflows/tests.yml' - pull_request: - paths: - - 'packages/**' - - 'tests/**' - - 'package-lock.json' - - '.github/workflows/tests.yml' ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 defaults: run: shell: 'bash' jobs: -<<<<<<< HEAD tests: strategy: fail-fast: false @@ -55,24 +36,3 @@ jobs: - run: npm run test:e2e --if-present if: matrix.os != 'ubuntu-latest' -======= - e2e: - strategy: - matrix: - os: [ windows-latest ] - - runs-on: ${{ matrix.os }} - - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 - with: - node-version: 16 # Need for npm >=7.7 - cache: 'npm' - - # TODO: Install not all dependencies, but only those required for this workflow - - name: Install dependencies - run: npm ci - - - run: npm test ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 diff --git a/webapp/.github/workflows/typechecking.yml b/webapp/.github/workflows/typechecking.yml index 4c5254b79..938924123 100644 --- a/webapp/.github/workflows/typechecking.yml +++ b/webapp/.github/workflows/typechecking.yml @@ -1,29 +1,9 @@ name: Typechecking -<<<<<<< HEAD on: [ workflow_call ] concurrency: group: typechecking-${{ github.ref }} cancel-in-progress: true -======= -on: - push: - branches: - - main - paths: - - '**.ts' - - '**.vue' - - '**/tsconfig.json' - - 'package-lock.json' - - '.github/workflows/typechecking.yml' - pull_request: - paths: - - '**.ts' - - '**.vue' - - '**/tsconfig.json' - - 'package-lock.json' - - '.github/workflows/typechecking.yml' ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 defaults: run: @@ -34,30 +14,14 @@ jobs: runs-on: ubuntu-latest steps: -<<<<<<< HEAD - uses: actions/checkout@v3 - uses: actions/setup-node@v3 -======= - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 with: node-version: 16 # Need for npm >=7.7 cache: 'npm' -<<<<<<< HEAD - run: npm ci env: PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 - run: npm run typecheck --if-present -======= - # TODO: Install not all dependencies, but only those required for this workflow - - name: Install dependencies - run: npm ci - - # Type checking is divided into three separate commands for more convenient logs - - run: npm run typecheck-main - - run: npm run typecheck-preload - - run: npm run typecheck-renderer ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 diff --git a/webapp/.gitignore b/webapp/.gitignore index 6c12cd407..170663cbd 100644 --- a/webapp/.gitignore +++ b/webapp/.gitignore @@ -5,11 +5,8 @@ dist thumbs.db .eslintcache -<<<<<<< HEAD .browserslistrc .electron-vendors.cache.json -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 diff --git a/webapp/.yarnclean b/webapp/.yarnclean index c3ca0e259..9e8b8b430 100644 --- a/webapp/.yarnclean +++ b/webapp/.yarnclean @@ -6,10 +6,6 @@ powered-test # asset directories docs -<<<<<<< HEAD -======= -doc ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 website images assets diff --git a/webapp/README.md b/webapp/README.md index 55d303513..a4b43ac12 100644 --- a/webapp/README.md +++ b/webapp/README.md @@ -1,4 +1,3 @@ -<<<<<<< HEAD # Vite Electron Builder Boilerplate This is a template for secure electron applications. Written following the latest safety requirements, recommendations @@ -22,51 +21,10 @@ That's all you need. 😉 > This template uses npm v7 feature — [**Installing Peer Dependencies Automatically**](https://github.com/npm/rfcs/blob/latest/implemented/0025-install-peer-deps.md). If you are using a different package manager, you may need to install some peerDependencies manually. -======= -# Vite Electron Builder Boilerplate v2 - -[![GitHub issues by-label](https://img.shields.io/github/issues/cawa-93/vite-electron-builder/help%20wanted?label=issues%20need%20help&logo=github)](https://github.com/cawa-93/vite-electron-builder/issues?q=label%3A%22help+wanted%22+is%3Aopen+is%3Aissue) -[![Minimal node version](https://img.shields.io/static/v1?label=node&message=%3E=14.16&logo=node.js&color)](https://nodejs.org/about/releases/) -[![Minimal npm version](https://img.shields.io/static/v1?label=npm&message=%3E=7.7&logo=npm&color)](https://github.com/npm/cli/releases) - -> Vite+Electron = 🔥 - -This is a secure template for electron applications. Written following the latest safety requirements, recommendations and best practices. - -Under the hood is used [Vite] — super fast, nextgen bundler, and [electron-builder] for compilation. - - -___ -### Support -- This template maintained by [Alex Kozack][cawa-93-github]. You can [💖 sponsor him][cawa-93-sponsor] for continued development of this template. - -- Found a problem? Pull requests are welcome. - -- If you have ideas, questions or suggestions - **Welcome to [discussions](https://github.com/cawa-93/vite-electron-builder/discussions)**. 😊 -___ - - - - -## Get started - -Follow these steps to get started with this template: - -1. Click the **[Use this template](https://github.com/cawa-93/vite-electron-builder/generate)** button (you must be logged in) or just clone this repo. -2. If you want use another package manager don't forget edit [`.github/workflows`](/.github/workflows) -- it uses `npm` by default. - -That's all you need. 😉 - -**Note**: This template uses npm v7 feature — [**Installing Peer Dependencies Automatically**](https://github.com/npm/rfcs/blob/latest/implemented/0025-install-peer-deps.md). If you are using a different package manager, you may need to install some peerDependencies manually. - - - ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 ## Features ### Electron [![Electron version](https://img.shields.io/github/package-json/dependency-version/cawa-93/vite-electron-builder/dev/electron?label=%20)][electron] -<<<<<<< HEAD - This template uses the latest electron version with all the latest security patches. - The architecture of the application is built according to the @@ -285,138 +243,6 @@ By default, there are two modes: - `development` is used by `npm run watch` script When running the build script, the environment variables are loaded from the following files in your project root: -======= -- Template use the latest electron version with all the latest security patches. -- The architecture of the application is built according to the security [guids](https://www.electronjs.org/docs/tutorial/security) and best practices. -- The latest version of the [electron-builder] is used to compile the application. - - -### Vite [![Vite version](https://img.shields.io/github/package-json/dependency-version/cawa-93/vite-electron-builder/dev/vite?label=%20)][vite] -- [Vite] is used to bundle all source codes. This is an extremely fast packer that has a bunch of great features. You can learn more about how it is arranged in [this](https://youtu.be/xXrhg26VCSc) video. -- Vite [supports](https://vitejs.dev/guide/env-and-mode.html) reading `.env` files. You can also specify types of your environment variables in [`types/vite-env.d.ts`](types/vite-env.d.ts). - -Vite provides you with many useful features, such as: `TypeScript`, `TSX/JSX`, `CSS/JSON Importing`, `CSS Modules`, `Web Assembly` and much more. - -[See all Vite features](https://vitejs.dev/guide/features.html). - - -### TypeScript [![TypeScript version](https://img.shields.io/github/package-json/dependency-version/cawa-93/vite-electron-builder/dev/typescript?label=%20)][typescript] (optional) -- The Latest TypeScript is used for all source code. -- **Vite** supports TypeScript out of the box. However, it does not support type checking. -- Code formatting rules follow the latest TypeScript recommendations and best practices thanks to [@typescript-eslint/eslint-plugin](https://www.npmjs.com/package/@typescript-eslint/eslint-plugin). - -**[See this discussion](https://github.com/cawa-93/vite-electron-builder/discussions/339)** if you want completly remove TypeScript. - - -### Vue [![Vue version](https://img.shields.io/github/package-json/dependency-version/cawa-93/vite-electron-builder/vue?label=%20)][vue] (optional) -- By default, web pages are built using [Vue]. However, you can easily change it. Or do not use additional frameworks at all. (See [React fork](https://github.com/soulsam480/vite-electron-react-starter)) -- Also, by default, the [vue-router] version [![Vue-router version](https://img.shields.io/github/package-json/dependency-version/cawa-93/vite-electron-builder/vue-router?label=%20)][vue-router] is used. -- Code formatting rules follow the latest Vue recommendations and best practices thanks to [eslint-plugin-vue]. -- Installed [Vue.js devtools beta](https://chrome.google.com/webstore/detail/vuejs-devtools/ljjemllljcmogpfapbkkighbhhppjdbg) with Vue 3 support. - -See [examples of web pages for different frameworks](https://github.com/vitejs/vite/tree/main/packages/create-vite). - -### Continuous Integration -- The configured workflow for check the types for each push and PR. -- The configured workflow for check the code style for each push and PR. -- **Automatic tests** used [playwright]. Simple, automated test check: - - Does the main window created and visible? - - Is the main window not empty? - - Is dev tools closed? - - Is preload script loaded? - - -### Continuous delivery -- Each time you push changes to the `main` branch, [`release`](.github/workflows/release.yml) workflow starts, which creates release draft. - - The version is automatically set based on the current date in the format `yy.mm.dd-minutes`. - - Notes are automatically generated and added to the release draft. - - Code signing supported. See [`compile` job in `release` workflow](.github/workflows/release.yml). -- **Auto-update is supported**. After the release will be published, all client applications will download the new version and install updates silently. - - -## Status - -This template was created to make my work easier. It may not be universal, but I try to keep it that way. - -I am actively involved in its development. But I do not guarantee that this template will be maintained in the future. - - -**At the moment, there are the following problems:** - -- ⚠ Playwright has **experimental** support for Electron. -- ⚠ Release notes are created automatically based on commit history. [`.github/actions/release-notes`](.github/actions/release-notes) is used for generation. It may not provide some scenarios. If you encounter a problem - write about it. -- ⏳ I want to migrate all code base to ESM. But because Nodejs ecosystem is unprepared I have not known whether this will give more benefits or more inconvenience. - -Some improvement or problems can be listed in [issues](https://github.com/cawa-93/vite-electron-builder/issues). - -**Pull requests are welcome**. - -## How it works -The template required a minimum [dependencies](package.json). Only **Vite** is used for building, nothing more. - -### Project Structure - -The structure of this template is very similar to the structure of a monorepo. - -The entire source code of the program is divided into three modules (packages) that are bundled each independently: -- [`packages/main`](packages/main) -Electron [**main script**](https://www.electronjs.org/docs/tutorial/quick-start#create-the-main-script-file). -- [`packages/preload`](packages/preload) -Used in `BrowserWindow.webPreferences.preload`. See [Checklist: Security Recommendations](https://www.electronjs.org/docs/tutorial/security#2-do-not-enable-nodejs-integration-for-remote-content). -- [`packages/renderer`](packages/renderer) -Electron [**web page**](https://www.electronjs.org/docs/tutorial/quick-start#create-a-web-page). - -### Build web resources - -Packages `main` and `preload` are built in [library mode](https://vitejs.dev/guide/build.html#library-mode) as it is a simple javascript. -`renderer` package build as regular web app. - -The build of web resources is performed in the [`scripts/build.js`](scripts/build.js). Its analogue is a sequential call to `vite build` for each package. - -### Compile App -Next step is run packaging and compilation a ready for distribution Electron app for macOS, Windows and Linux with "auto update" support out of the box. - -To do this, using the [electron-builder]: -- In npm script `compile`: This script is configured to compile the application as quickly as possible. It is not ready for distribution, is compiled only for the current platform and is used for debugging. -- In GitHub Action: The application is compiled for any platform and ready-to-distribute files are automatically added to the draft GitHub release. - - -### Using Node.js API in renderer -According to [Electron's security guidelines](https://www.electronjs.org/docs/tutorial/security#2-do-not-enable-nodejs-integration-for-remote-content), Node.js integration is disabled for remote content. This means that **you cannot call any Node.js api in the `packages/renderer` directly**. To do this, you **must** describe the interface in the `packages/preload` where Node.js api is allowed: -```ts -// packages/preload/src/index.ts -import {readFile} from 'fs/promises' - -const api = { - readConfig: () => readFile('/path/to/config.json', {encoding: 'utf-8'}), -} - -contextBridge.exposeInMainWorld('electron', api) -``` - -```ts -// packages/renderer/src/App.vue -import {useElectron} from '/@/use/electron' - -const {readConfig} = useElectron() -``` - -[Read more about Security Considerations](https://www.electronjs.org/docs/tutorial/context-isolation#security-considerations). - - -### Modes and Environment Variables -All environment variables set as part of the `import.meta`, so you can access them as follows: `import.meta.env`. - -You can also specify types of your environment variables in [`types/vite-env.d.ts`](types/vite-env.d.ts). - -The mode option is used to specify the value of `import.meta.env.MODE` and the corresponding environment variables files that needs to be loaded. - -By default, there are two modes: - - `production` is used by default - - `development` is used by `npm run watch` script - -When running building, environment variables are loaded from the following files in your project root: ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 ``` .env # loaded in all cases @@ -425,7 +251,6 @@ When running building, environment variables are loaded from the following files .env.[mode].local # only loaded in specified env mode, ignored by git ``` -<<<<<<< HEAD > **Warning**: > To prevent accidentally leaking env variables to the client, only variables prefixed with `VITE_` are exposed to your Vite-processed code. @@ -441,11 +266,6 @@ Only `VITE_SOME_KEY` will be exposed as `import.meta.env.VITE_SOME_KEY` to your will not. You can change that prefix or add another. See [`envPrefix`](https://vitejs.dev/config/shared-options.html#envprefix) -======= -**Note:** only variables prefixed with `VITE_` are exposed to your code (e.g. `VITE_SOME_KEY=123`) and `SOME_KEY=123` will not. You can access `VITE_SOME_KEY` using `import.meta.env.VITE_SOME_KEY`. This is because the `.env` files may be used by some users for server-side or build scripts and may contain sensitive information that should not be exposed in code shipped to browsers. - - ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 ## Contribution @@ -453,7 +273,6 @@ See [Contributing Guide](contributing.md). [vite]: https://github.com/vitejs/vite/ -<<<<<<< HEAD [electron]: https://github.com/electron/electron @@ -475,15 +294,4 @@ See [Contributing Guide](contributing.md). [cawa-93-github]: https://github.com/cawa-93/ -======= -[electron]: https://github.com/electron/electron -[electron-builder]: https://github.com/electron-userland/electron-builder -[vue]: https://github.com/vuejs/vue-next -[vue-router]: https://github.com/vuejs/vue-router-next/ -[typescript]: https://github.com/microsoft/TypeScript/ -[playwright]: https://playwright.dev -[vue-tsc]: https://github.com/johnsoncodehk/vue-tsc -[eslint-plugin-vue]: https://github.com/vuejs/eslint-plugin-vue -[cawa-93-github]: https://github.com/cawa-93/ ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 [cawa-93-sponsor]: https://www.patreon.com/Kozack/ diff --git a/webapp/contributing.md b/webapp/contributing.md index 953e029a3..2e5835f70 100644 --- a/webapp/contributing.md +++ b/webapp/contributing.md @@ -1,6 +1,5 @@ # Contributing -<<<<<<< HEAD First and foremost, thank you! We appreciate that you want to contribute to vite-electron-builder, your time is valuable, and your contributions mean a lot to us. @@ -8,20 +7,12 @@ valuable, and your contributions mean a lot to us. Do not create issues about bumping dependencies unless a bug has been identified, and you can demonstrate that it effects this library. -======= -First and foremost, thank you! We appreciate that you want to contribute to vite-electron-builder, your time is valuable, and your contributions mean a lot to us. - -## Issues - -Do not create issues about bumping dependencies unless a bug has been identified, and you can demonstrate that it effects this library. ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 **Help us to help you** Remember that we’re here to help, but not to make guesses about what you need help with: - Whatever bug or issue you're experiencing, assume that it will not be as obvious to the maintainers as it is to you. -<<<<<<< HEAD - Spell it out completely. Keep in mind that maintainers need to think about _all potential use cases_ of a library. It's important that you explain how you're using a library so that maintainers can make that connection and solve the issue. @@ -32,14 +23,6 @@ involved, including yourself, by providing this information up front._ ## Repo Setup -======= -- Spell it out completely. Keep in mind that maintainers need to think about _all potential use cases_ of a library. It's important that you explain how you're using a library so that maintainers can make that connection and solve the issue. - -_It can't be understated how frustrating and draining it can be to maintainers to have to ask clarifying questions on the most basic things, before it's even possible to start debugging. Please try to make the best use of everyone's time involved, including yourself, by providing this information up front._ - - -## Repo Setup ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 The package manager used to install and link dependencies must be npm v7 or later. 1. Clone repo @@ -48,7 +31,4 @@ The package manager used to install and link dependencies must be npm v7 or late 1. `npm run lint` lint your code. 1. `npm run typecheck` Run typescript check. 1. `npm run test` Run app test. -<<<<<<< HEAD 1. `npm run format` Reformat all codebase to project code style. -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 diff --git a/webapp/electron-builder.config.js b/webapp/electron-builder.config.js index 5a376b444..96b367bee 100644 --- a/webapp/electron-builder.config.js +++ b/webapp/electron-builder.config.js @@ -1,13 +1,8 @@ if (process.env.VITE_APP_VERSION === undefined) { -<<<<<<< HEAD const now = new Date(); process.env.VITE_APP_VERSION = `${now.getUTCFullYear() - 2000}.${ now.getUTCMonth() + 1 }.${now.getUTCDate()}-${now.getUTCHours() * 60 + now.getUTCMinutes()}`; -======= - const now = new Date; - process.env.VITE_APP_VERSION = `${now.getUTCFullYear() - 2000}.${now.getUTCMonth() + 1}.${now.getUTCDate()}-${now.getUTCHours() * 60 + now.getUTCMinutes()}`; ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } /** @@ -19,13 +14,7 @@ const config = { output: 'dist', buildResources: 'buildResources', }, -<<<<<<< HEAD files: ['packages/**/dist/**'], -======= - files: [ - 'packages/**/dist/**', - ], ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 extraMetadata: { version: process.env.VITE_APP_VERSION, }, diff --git a/webapp/package-lock.json b/webapp/package-lock.json index f53024fec..93ffa3f21 100644 --- a/webapp/package-lock.json +++ b/webapp/package-lock.json @@ -1,15 +1,11 @@ { "name": "vite-electron-builder", -<<<<<<< HEAD "version": "1.0.2", -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vite-electron-builder", -<<<<<<< HEAD "version": "1.0.2", "hasInstallScript": true, "dependencies": { @@ -42,142 +38,6 @@ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.4.tgz", "integrity": "sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow==", "dev": true, -======= - "dependencies": { - "electron-updater": "4.6.0", - "vue": "3.2.19", - "vue-router": "4.0.11" - }, - "devDependencies": { - "@types/electron-devtools-installer": "2.2.0", - "@typescript-eslint/eslint-plugin": "4.32.0", - "@vitejs/plugin-vue": "1.9.2", - "cross-env": "7.0.3", - "electron": "15.1.0", - "electron-builder": "22.11.7", - "electron-devtools-installer": "3.2.0", - "eslint": "7.32.0", - "eslint-plugin-vue": "7.18.0", - "lint-staged": "11.1.2", - "playwright": "1.15.1", - "simple-git-hooks": "2.6.1", - "typescript": "4.4.2", - "vite": "2.6.2", - "vue-tsc": "0.3.0" - }, - "engines": { - "node": ">=v14.16", - "npm": ">=7.7" - } - }, - "node_modules/@babel/code-frame": { - "version": "7.12.11", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz", - "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==", - "dev": true, - "dependencies": { - "@babel/highlight": "^7.10.4" - } - }, - "node_modules/@babel/helper-validator-identifier": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz", - "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/highlight": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz", - "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==", - "dev": true, - "dependencies": { - "@babel/helper-validator-identifier": "^7.14.5", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/highlight/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/@babel/highlight/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "node_modules/@babel/highlight/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/@babel/highlight/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/parser": { - "version": "7.15.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.3.tgz", - "integrity": "sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "bin": { "parser": "bin/babel-parser.js" }, @@ -185,22 +45,6 @@ "node": ">=6.0.0" } }, -<<<<<<< HEAD -======= - "node_modules/@babel/types": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz", - "integrity": "sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==", - "dev": true, - "dependencies": { - "@babel/helper-validator-identifier": "^7.14.9", - "to-fast-properties": "^2.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/@develar/schema-utils": { "version": "2.6.5", "resolved": "https://registry.npmjs.org/@develar/schema-utils/-/schema-utils-2.6.5.tgz", @@ -219,42 +63,24 @@ } }, "node_modules/@electron/get": { -<<<<<<< HEAD "version": "2.0.2", "resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.2.tgz", "integrity": "sha512-eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g==", -======= - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.13.0.tgz", - "integrity": "sha512-+SjZhRuRo+STTO1Fdhzqnv9D2ZhjxXP6egsJ9kiO8dtP68cDx7dFCwWi64dlMQV7sWcfW1OYCW4wviEBzmRsfQ==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "dependencies": { "debug": "^4.1.1", "env-paths": "^2.2.0", "fs-extra": "^8.1.0", -<<<<<<< HEAD "got": "^11.8.5", -======= - "got": "^9.6.0", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "progress": "^2.0.3", "semver": "^6.2.0", "sumchecker": "^3.0.1" }, "engines": { -<<<<<<< HEAD "node": ">=12" }, "optionalDependencies": { "global-agent": "^3.0.0" -======= - "node": ">=8.6" - }, - "optionalDependencies": { - "global-agent": "^2.0.2", - "global-tunnel-ng": "^2.7.1" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "node_modules/@electron/get/node_modules/semver": { @@ -267,7 +93,6 @@ } }, "node_modules/@electron/universal": { -<<<<<<< HEAD "version": "1.2.1", "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-1.2.1.tgz", "integrity": "sha512-7323HyMh7KBAl/nPDppdLsC87G6RwRU02dy5FPeGB1eS7rUePh55+WNWiDPLhFQqqVPHzh77M69uhmoT8XnwMQ==", @@ -280,18 +105,6 @@ "fs-extra": "^9.0.1", "minimatch": "^3.0.4", "plist": "^3.0.4" -======= - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-1.0.5.tgz", - "integrity": "sha512-zX9O6+jr2NMyAdSkwEUlyltiI4/EBLu2Ls/VD3pUQdi3cAYeYfdQnT2AJJ38HE4QxLccbU13LSpccw1IWlkyag==", - "dev": true, - "dependencies": { - "@malept/cross-spawn-promise": "^1.1.0", - "asar": "^3.0.3", - "debug": "^4.3.1", - "dir-compare": "^2.4.0", - "fs-extra": "^9.0.1" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "engines": { "node": ">=8.6" @@ -333,7 +146,6 @@ "node": ">= 10.0.0" } }, -<<<<<<< HEAD "node_modules/@esbuild/android-arm": { "version": "0.16.17", "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.16.17.tgz", @@ -751,95 +563,11 @@ "@humanwhocodes/object-schema": "^1.2.1", "debug": "^4.1.1", "minimatch": "^3.0.5" -======= - "node_modules/@emmetio/abbreviation": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/@emmetio/abbreviation/-/abbreviation-2.2.2.tgz", - "integrity": "sha512-TtE/dBnkTCct8+LntkqVrwqQao6EnPAs1YN3cUgxOxTaBlesBCY37ROUAVZrRlG64GNnVShdl/b70RfAI3w5lw==", - "dev": true, - "dependencies": { - "@emmetio/scanner": "^1.0.0" - } - }, - "node_modules/@emmetio/css-abbreviation": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@emmetio/css-abbreviation/-/css-abbreviation-2.1.4.tgz", - "integrity": "sha512-qk9L60Y+uRtM5CPbB0y+QNl/1XKE09mSO+AhhSauIfr2YOx/ta3NJw2d8RtCFxgzHeRqFRr8jgyzThbu+MZ4Uw==", - "dev": true, - "dependencies": { - "@emmetio/scanner": "^1.0.0" - } - }, - "node_modules/@emmetio/scanner": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@emmetio/scanner/-/scanner-1.0.0.tgz", - "integrity": "sha512-8HqW8EVqjnCmWXVpqAOZf+EGESdkR27odcMMMGefgKXtar00SoYNSryGv//TELI4T3QFsECo78p+0lmalk/CFA==", - "dev": true - }, - "node_modules/@eslint/eslintrc": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz", - "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==", - "dev": true, - "dependencies": { - "ajv": "^6.12.4", - "debug": "^4.1.1", - "espree": "^7.3.0", - "globals": "^13.9.0", - "ignore": "^4.0.6", - "import-fresh": "^3.2.1", - "js-yaml": "^3.13.1", - "minimatch": "^3.0.4", - "strip-json-comments": "^3.1.1" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/@eslint/eslintrc/node_modules/argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "dependencies": { - "sprintf-js": "~1.0.2" - } - }, - "node_modules/@eslint/eslintrc/node_modules/js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dev": true, - "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/@eslint/eslintrc/node_modules/sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true - }, - "node_modules/@humanwhocodes/config-array": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz", - "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==", - "dev": true, - "dependencies": { - "@humanwhocodes/object-schema": "^1.2.0", - "debug": "^4.1.1", - "minimatch": "^3.0.4" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "engines": { "node": ">=10.10.0" } }, -<<<<<<< HEAD "node_modules/@humanwhocodes/module-importer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", @@ -857,12 +585,6 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", -======= - "node_modules/@humanwhocodes/object-schema": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz", - "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true }, "node_modules/@malept/cross-spawn-promise": { @@ -974,7 +696,6 @@ } }, "node_modules/@sindresorhus/is": { -<<<<<<< HEAD "version": "4.6.0", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz", "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==", @@ -1032,26 +753,6 @@ "dev": true, "dependencies": { "@types/chai": "*" -======= - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", - "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/@szmarczak/http-timer": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz", - "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==", - "dev": true, - "dependencies": { - "defer-to-connect": "^1.0.1" - }, - "engines": { - "node": ">=6" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "node_modules/@types/debug": { @@ -1063,38 +764,19 @@ "@types/ms": "*" } }, -<<<<<<< HEAD "node_modules/@types/fs-extra": { "version": "9.0.13", "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz", "integrity": "sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==", -======= - "node_modules/@types/electron-devtools-installer": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@types/electron-devtools-installer/-/electron-devtools-installer-2.2.0.tgz", - "integrity": "sha512-HJNxpaOXuykCK4rQ6FOMxAA0NLFYsf7FiPFGmab0iQmtVBHSAfxzy3MRFpLTTDDWbV0yD2YsHOQvdu8yCqtCfw==", - "dev": true - }, - "node_modules/@types/fs-extra": { - "version": "9.0.12", - "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.12.tgz", - "integrity": "sha512-I+bsBr67CurCGnSenZZ7v94gd3tc3+Aj2taxMT4yu4ABLuOgOjeFxX3dokG24ztSRg5tnT00sL8BszO7gSMoIw==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "dependencies": { "@types/node": "*" } }, "node_modules/@types/glob": { -<<<<<<< HEAD "version": "7.2.0", "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz", "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==", -======= - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.4.tgz", - "integrity": "sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "optional": true, "dependencies": { @@ -1102,7 +784,6 @@ "@types/node": "*" } }, -<<<<<<< HEAD "node_modules/@types/http-cache-semantics": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz", @@ -1124,14 +805,6 @@ "@types/node": "*" } }, -======= - "node_modules/@types/json-schema": { - "version": "7.0.9", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", - "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==", - "dev": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/@types/minimatch": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz", @@ -1146,21 +819,9 @@ "dev": true }, "node_modules/@types/node": { -<<<<<<< HEAD "version": "18.15.3", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.3.tgz", "integrity": "sha512-p6ua9zBxz5otCmbpb5D3U4B5Nanw6Pk3PPyX05xnxbB/fRv71N7CPmORg7uAD5P70T0xmx1pzAx/FUfa5X+3cw==", -======= - "version": "14.17.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.7.tgz", - "integrity": "sha512-SYTdMaW47se8499q8m0fYKZZRlmq0RaRv6oYmlVm6DUm31l0fhOl1D03X8hGxohCKTI2Bg6w7W0TiYB51aJzag==", - "dev": true - }, - "node_modules/@types/parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true }, "node_modules/@types/plist": { @@ -1174,7 +835,6 @@ "xmlbuilder": ">=11.0.1" } }, -<<<<<<< HEAD "node_modules/@types/responselike": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz", @@ -1188,12 +848,6 @@ "version": "7.3.12", "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.12.tgz", "integrity": "sha512-WwA1MW0++RfXmCr12xeYOOC5baSC9mSb0ZqCquFzKhcoF4TvHu5MKOuXsncgZcpVFhB1pXd5hZmM0ryAoCp12A==" -======= - "node_modules/@types/semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-D/2EJvAlCEtYFEYmmlGwbGXuK886HzyCc3nZX/tkFTQdEU8jZDAgiv08P162yB17y4ZXZoq7yFAnW4GDBb9Now==" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "node_modules/@types/verror": { "version": "1.10.5", @@ -1203,15 +857,9 @@ "optional": true }, "node_modules/@types/yargs": { -<<<<<<< HEAD "version": "17.0.8", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.8.tgz", "integrity": "sha512-wDeUwiUmem9FzsyysEwRukaEdDNcwbROvQ9QGRKaLI6t+IltNzbn4/i4asmB10auvZGQCzSQ6t0GSczEThlUXw==", -======= - "version": "16.0.4", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz", - "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "dependencies": { "@types/yargs-parser": "*" @@ -1224,15 +872,9 @@ "dev": true }, "node_modules/@types/yauzl": { -<<<<<<< HEAD "version": "2.10.0", "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz", "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==", -======= - "version": "2.9.2", - "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.2.tgz", - "integrity": "sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "optional": true, "dependencies": { @@ -1240,7 +882,6 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { -<<<<<<< HEAD "version": "5.55.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.55.0.tgz", "integrity": "sha512-IZGc50rtbjk+xp5YQoJvmMPmJEYoC53SiKPXyqWfv15XoD2Y5Kju6zN0DwlmaGJp1Iw33JsWJcQ7nw0lGCGjVg==", @@ -1259,37 +900,14 @@ }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -======= - "version": "4.32.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.32.0.tgz", - "integrity": "sha512-+OWTuWRSbWI1KDK8iEyG/6uK2rTm3kpS38wuVifGUTDB6kjEuNrzBI1MUtxnkneuWG/23QehABe2zHHrj+4yuA==", - "dev": true, - "dependencies": { - "@typescript-eslint/experimental-utils": "4.32.0", - "@typescript-eslint/scope-manager": "4.32.0", - "debug": "^4.3.1", - "functional-red-black-tree": "^1.0.1", - "ignore": "^5.1.8", - "regexpp": "^3.1.0", - "semver": "^7.3.5", - "tsutils": "^3.21.0" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { -<<<<<<< HEAD "@typescript-eslint/parser": "^5.0.0", "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" -======= - "@typescript-eslint/parser": "^4.0.0", - "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "peerDependenciesMeta": { "typescript": { @@ -1298,7 +916,6 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": { -<<<<<<< HEAD "version": "5.55.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.55.0.tgz", "integrity": "sha512-OK+cIO1ZGhJYNCL//a3ROpsd83psf4dUJ4j7pdNVzd5DmIk+ffkuUIX2vcZQbEW/IR41DYsfJTB19tpCboxQuw==", @@ -1309,18 +926,6 @@ }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -======= - "version": "4.32.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.32.0.tgz", - "integrity": "sha512-DK+fMSHdM216C0OM/KR1lHXjP1CNtVIhJ54kQxfOE6x8UGFAjha8cXgDMBEIYS2XCYjjCtvTkjQYwL3uvGOo0w==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "4.32.0", - "@typescript-eslint/visitor-keys": "4.32.0" - }, - "engines": { - "node": "^8.10.0 || ^10.13.0 || >=11.10.1" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "funding": { "type": "opencollective", @@ -1328,21 +933,12 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": { -<<<<<<< HEAD "version": "5.55.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.55.0.tgz", "integrity": "sha512-M4iRh4AG1ChrOL6Y+mETEKGeDnT7Sparn6fhZ5LtVJF1909D5O4uqK+C5NPbLmpfZ0XIIxCdwzKiijpZUOvOug==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -======= - "version": "4.32.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.32.0.tgz", - "integrity": "sha512-LE7Z7BAv0E2UvqzogssGf1x7GPpUalgG07nGCBYb1oK4mFsOiFC/VrSMKbZQzFJdN2JL5XYmsx7C7FX9p9ns0w==", - "dev": true, - "engines": { - "node": "^8.10.0 || ^10.13.0 || >=11.10.1" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "funding": { "type": "opencollective", @@ -1350,7 +946,6 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": { -<<<<<<< HEAD "version": "5.55.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.55.0.tgz", "integrity": "sha512-q2dlHHwWgirKh1D3acnuApXG+VNXpEY5/AwRxDVuEQpxWaB0jCDe0jFMVMALJ3ebSfuOVE8/rMS+9ZOYGg1GWw==", @@ -1361,125 +956,6 @@ }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -======= - "version": "4.32.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.32.0.tgz", - "integrity": "sha512-e7NE0qz8W+atzv3Cy9qaQ7BTLwWsm084Z0c4nIO2l3Bp6u9WIgdqCgyPyV5oSPDMIW3b20H59OOCmVk3jw3Ptw==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "4.32.0", - "eslint-visitor-keys": "^2.0.0" - }, - "engines": { - "node": "^8.10.0 || ^10.13.0 || >=11.10.1" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": { - "version": "5.1.8", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", - "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, - "node_modules/@typescript-eslint/experimental-utils": { - "version": "4.32.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.32.0.tgz", - "integrity": "sha512-WLoXcc+cQufxRYjTWr4kFt0DyEv6hDgSaFqYhIzQZ05cF+kXfqXdUh+//kgquPJVUBbL3oQGKQxwPbLxHRqm6A==", - "dev": true, - "dependencies": { - "@types/json-schema": "^7.0.7", - "@typescript-eslint/scope-manager": "4.32.0", - "@typescript-eslint/types": "4.32.0", - "@typescript-eslint/typescript-estree": "4.32.0", - "eslint-scope": "^5.1.1", - "eslint-utils": "^3.0.0" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "*" - } - }, - "node_modules/@typescript-eslint/experimental-utils/node_modules/@typescript-eslint/scope-manager": { - "version": "4.32.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.32.0.tgz", - "integrity": "sha512-DK+fMSHdM216C0OM/KR1lHXjP1CNtVIhJ54kQxfOE6x8UGFAjha8cXgDMBEIYS2XCYjjCtvTkjQYwL3uvGOo0w==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "4.32.0", - "@typescript-eslint/visitor-keys": "4.32.0" - }, - "engines": { - "node": "^8.10.0 || ^10.13.0 || >=11.10.1" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/experimental-utils/node_modules/@typescript-eslint/types": { - "version": "4.32.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.32.0.tgz", - "integrity": "sha512-LE7Z7BAv0E2UvqzogssGf1x7GPpUalgG07nGCBYb1oK4mFsOiFC/VrSMKbZQzFJdN2JL5XYmsx7C7FX9p9ns0w==", - "dev": true, - "engines": { - "node": "^8.10.0 || ^10.13.0 || >=11.10.1" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/experimental-utils/node_modules/@typescript-eslint/typescript-estree": { - "version": "4.32.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.32.0.tgz", - "integrity": "sha512-tRYCgJ3g1UjMw1cGG8Yn1KzOzNlQ6u1h9AmEtPhb5V5a1TmiHWcRyF/Ic+91M4f43QeChyYlVTcf3DvDTZR9vw==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "4.32.0", - "@typescript-eslint/visitor-keys": "4.32.0", - "debug": "^4.3.1", - "globby": "^11.0.3", - "is-glob": "^4.0.1", - "semver": "^7.3.5", - "tsutils": "^3.21.0" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/experimental-utils/node_modules/@typescript-eslint/visitor-keys": { - "version": "4.32.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.32.0.tgz", - "integrity": "sha512-e7NE0qz8W+atzv3Cy9qaQ7BTLwWsm084Z0c4nIO2l3Bp6u9WIgdqCgyPyV5oSPDMIW3b20H59OOCmVk3jw3Ptw==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "4.32.0", - "eslint-visitor-keys": "^2.0.0" - }, - "engines": { - "node": "^8.10.0 || ^10.13.0 || >=11.10.1" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "funding": { "type": "opencollective", @@ -1487,7 +963,6 @@ } }, "node_modules/@typescript-eslint/parser": { -<<<<<<< HEAD "version": "5.8.1", "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.8.1.tgz", "integrity": "sha512-K1giKHAjHuyB421SoXMXFHHVI4NdNY603uKw92++D3qyxSeYvC10CBJ/GE5Thpo4WTUvu1mmJI2/FFkz38F2Gw==", @@ -1501,32 +976,13 @@ }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -======= - "version": "4.28.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.28.5.tgz", - "integrity": "sha512-NPCOGhTnkXGMqTznqgVbA5LqVsnw+i3+XA1UKLnAb+MG1Y1rP4ZSK9GX0kJBmAZTMIktf+dTwXToT6kFwyimbw==", - "dev": true, - "peer": true, - "dependencies": { - "@typescript-eslint/scope-manager": "4.28.5", - "@typescript-eslint/types": "4.28.5", - "@typescript-eslint/typescript-estree": "4.28.5", - "debug": "^4.3.1" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { -<<<<<<< HEAD "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" -======= - "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "peerDependenciesMeta": { "typescript": { @@ -1535,7 +991,6 @@ } }, "node_modules/@typescript-eslint/scope-manager": { -<<<<<<< HEAD "version": "5.8.1", "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.8.1.tgz", "integrity": "sha512-DGxJkNyYruFH3NIZc3PwrzwOQAg7vvgsHsHCILOLvUpupgkwDZdNq/cXU3BjF4LNrCsVg0qxEyWasys5AiJ85Q==", @@ -1631,19 +1086,6 @@ }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -======= - "version": "4.28.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.28.5.tgz", - "integrity": "sha512-PHLq6n9nTMrLYcVcIZ7v0VY1X7dK309NM8ya9oL/yG8syFINIMHxyr2GzGoBYUdv3NUfCOqtuqps0ZmcgnZTfQ==", - "dev": true, - "peer": true, - "dependencies": { - "@typescript-eslint/types": "4.28.5", - "@typescript-eslint/visitor-keys": "4.28.5" - }, - "engines": { - "node": "^8.10.0 || ^10.13.0 || >=11.10.1" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "funding": { "type": "opencollective", @@ -1651,7 +1093,6 @@ } }, "node_modules/@typescript-eslint/types": { -<<<<<<< HEAD "version": "5.8.1", "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.8.1.tgz", "integrity": "sha512-L/FlWCCgnjKOLefdok90/pqInkomLnAcF9UAzNr+DSqMC3IffzumHTQTrINXhP1gVp9zlHiYYjvozVZDPleLcA==", @@ -1659,15 +1100,6 @@ "peer": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -======= - "version": "4.28.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.5.tgz", - "integrity": "sha512-MruOu4ZaDOLOhw4f/6iudyks/obuvvZUAHBDSW80Trnc5+ovmViLT2ZMDXhUV66ozcl6z0LJfKs1Usldgi/WCA==", - "dev": true, - "peer": true, - "engines": { - "node": "^8.10.0 || ^10.13.0 || >=11.10.1" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "funding": { "type": "opencollective", @@ -1675,7 +1107,6 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { -<<<<<<< HEAD "version": "5.8.1", "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.8.1.tgz", "integrity": "sha512-26lQ8l8tTbG7ri7xEcCFT9ijU5Fk+sx/KRRyyzCv7MQ+rZZlqiDPtMKWLC8P7o+dtCnby4c+OlxuX1tp8WfafQ==", @@ -1687,28 +1118,11 @@ "debug": "^4.3.2", "globby": "^11.0.4", "is-glob": "^4.0.3", -======= - "version": "4.28.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.5.tgz", - "integrity": "sha512-FzJUKsBX8poCCdve7iV7ShirP8V+ys2t1fvamVeD1rWpiAnIm550a+BX/fmTHrjEpQJ7ZAn+Z7ZZwJjytk9rZw==", - "dev": true, - "peer": true, - "dependencies": { - "@typescript-eslint/types": "4.28.5", - "@typescript-eslint/visitor-keys": "4.28.5", - "debug": "^4.3.1", - "globby": "^11.0.3", - "is-glob": "^4.0.1", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "semver": "^7.3.5", "tsutils": "^3.21.0" }, "engines": { -<<<<<<< HEAD "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -======= - "node": "^10.12.0 || >=12.0.0" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "funding": { "type": "opencollective", @@ -1720,7 +1134,6 @@ } } }, -<<<<<<< HEAD "node_modules/@typescript-eslint/utils": { "version": "5.55.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.55.0.tgz", @@ -1833,20 +1246,6 @@ }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -======= - "node_modules/@typescript-eslint/visitor-keys": { - "version": "4.28.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.5.tgz", - "integrity": "sha512-dva/7Rr+EkxNWdJWau26xU/0slnFlkh88v3TsyTgRS/IIYFi5iIfpCFM4ikw0vQTFUR9FYSSyqgK4w64gsgxhg==", - "dev": true, - "peer": true, - "dependencies": { - "@typescript-eslint/types": "4.28.5", - "eslint-visitor-keys": "^2.0.0" - }, - "engines": { - "node": "^8.10.0 || ^10.13.0 || >=11.10.1" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "funding": { "type": "opencollective", @@ -1854,7 +1253,6 @@ } }, "node_modules/@vitejs/plugin-vue": { -<<<<<<< HEAD "version": "4.0.0", "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-4.0.0.tgz", "integrity": "sha512-e0X4jErIxAB5oLtDqbHvHpJe/uWNkdpYV83AOG2xo2tEVSzCzewgJMtREZM30wXnM5ls90hxiOtAuVU6H5JgbA==", @@ -2135,103 +1533,11 @@ "dependencies": { "@babel/parser": "^7.16.4", "@vue/shared": "3.2.47", -======= - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-1.9.2.tgz", - "integrity": "sha512-QnUQJvGmY+YT9xTidLcjr6NAjKWNdSuul1M+BZ6uwTQaO5vpAY9USBncXESATk742dYMZGJenegJgeJhG/HMNQ==", - "dev": true, - "engines": { - "node": ">=12.0.0" - }, - "peerDependencies": { - "vite": "^2.5.10" - } - }, - "node_modules/@volar/code-gen": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/@volar/code-gen/-/code-gen-0.27.1.tgz", - "integrity": "sha512-tN7Rxa7mAfd8GQceKxHjjDjfRo3S4OBIEtv4GpmO75IrodjMVkZEZR/v6EY3yn52ffTh3SuAvjiCSRRcHhvDqg==", - "dev": true, - "dependencies": { - "@volar/shared": "^0.27.1", - "@volar/source-map": "^0.27.1" - } - }, - "node_modules/@volar/html2pug": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/@volar/html2pug/-/html2pug-0.27.1.tgz", - "integrity": "sha512-4192qerpj+fuzmaduT8l9qoY7620oh4LNEK2GN8V9l7+LNAuPRr9kN0BNrow2j1WO9lklhtNqDlCSOmPCmcoPA==", - "dev": true, - "dependencies": { - "domelementtype": "^2.2.0", - "domhandler": "^4.2.0", - "htmlparser2": "^6.1.0", - "pug": "^3.0.2" - } - }, - "node_modules/@volar/shared": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/@volar/shared/-/shared-0.27.1.tgz", - "integrity": "sha512-PvoD6cp3ICaZXsLcuEB14FkrQuJnQVuhtAiss6BLGFfq4vOhJPMZihfoSZtQYkspkZ1/r8IgidMZqTtuAxYBzA==", - "dev": true, - "dependencies": { - "upath": "^2.0.1", - "vscode-jsonrpc": "^8.0.0-next.1", - "vscode-uri": "^3.0.2" - } - }, - "node_modules/@volar/source-map": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-0.27.1.tgz", - "integrity": "sha512-Y4cJjAIfMhoHg0jsO8uUZ4YvJAxDYSwWRD9corm+2W/4Km5AKSF7hhVwFSGy2WvODTRLZY2jjlL3eu88m1eg/g==", - "dev": true, - "dependencies": { - "@volar/shared": "^0.27.1" - } - }, - "node_modules/@volar/transforms": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/@volar/transforms/-/transforms-0.27.1.tgz", - "integrity": "sha512-jEWYXFQL+KUVS85qrYYsaQYtwdLZLs3koNFEMEQMnDMad3jEBDqd3IKgDGePI6jQ5Vq3jFneNwX1GGCFJeKvJA==", - "dev": true, - "dependencies": { - "@volar/shared": "^0.27.1" - } - }, - "node_modules/@vscode/emmet-helper": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/@vscode/emmet-helper/-/emmet-helper-2.7.0.tgz", - "integrity": "sha512-LL7MoKNLUQASacQROO7hBdx5IAxsEnA0UdJFd9xXyf3sBQgz8NE3QEfo3IezE7uin8W2fkG2+EXMst3oqK6+KQ==", - "dev": true, - "dependencies": { - "emmet": "^2.3.0", - "jsonc-parser": "^2.3.0", - "vscode-languageserver-textdocument": "^1.0.1", - "vscode-languageserver-types": "^3.15.1", - "vscode-nls": "^5.0.0", - "vscode-uri": "^2.1.2" - } - }, - "node_modules/@vscode/emmet-helper/node_modules/vscode-uri": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.2.tgz", - "integrity": "sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A==", - "dev": true - }, - "node_modules/@vue/compiler-core": { - "version": "3.2.19", - "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.19.tgz", - "integrity": "sha512-8dOPX0YOtaXol0Zf2cfLQ4NU/yHYl2H7DCKsLEZ7gdvPK6ZSEwGLJ7IdghhY2YEshEpC5RB9QKdC5I07z8Dtjg==", - "dependencies": { - "@babel/parser": "^7.15.0", - "@vue/shared": "3.2.19", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "estree-walker": "^2.0.2", "source-map": "^0.6.1" } }, "node_modules/@vue/compiler-dom": { -<<<<<<< HEAD "version": "3.2.47", "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.47.tgz", "integrity": "sha512-dBBnEHEPoftUiS03a4ggEig74J2YBZ2UIeyfpcRM2tavgMWo4bsEfgCGsu+uJIL/vax9S+JztH8NmQerUo7shQ==", @@ -2253,27 +1559,6 @@ "@vue/compiler-ssr": "3.2.47", "@vue/reactivity-transform": "3.2.47", "@vue/shared": "3.2.47", -======= - "version": "3.2.19", - "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.19.tgz", - "integrity": "sha512-WzQoE8rfkFjPtIioc7SSgTsnz9g2oG61DU8KHnzPrRS7fW/lji6H2uCYJfp4Z6kZE8GjnHc1Ljwl3/gxDes0cw==", - "dependencies": { - "@vue/compiler-core": "3.2.19", - "@vue/shared": "3.2.19" - } - }, - "node_modules/@vue/compiler-sfc": { - "version": "3.2.19", - "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.19.tgz", - "integrity": "sha512-pLlbgkO1UHTO02MSpa/sFOXUwIDxSMiKZ1ozE5n71CY4DM+YmI+G3gT/ZHZ46WBId7f3VTF/D8pGwMygcQbrQA==", - "dependencies": { - "@babel/parser": "^7.15.0", - "@vue/compiler-core": "3.2.19", - "@vue/compiler-dom": "3.2.19", - "@vue/compiler-ssr": "3.2.19", - "@vue/ref-transform": "3.2.19", - "@vue/shared": "3.2.19", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "estree-walker": "^2.0.2", "magic-string": "^0.25.7", "postcss": "^8.1.10", @@ -2281,7 +1566,6 @@ } }, "node_modules/@vue/compiler-ssr": { -<<<<<<< HEAD "version": "3.2.47", "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.47.tgz", "integrity": "sha512-wVXC+gszhulcMD8wpxMsqSOpvDZ6xKXSVWkf50Guf/S+28hTAXPDYRTbLQ3EDkOP5Xz/+SY37YiwDquKbJOgZw==", @@ -2309,43 +1593,11 @@ "@babel/parser": "^7.16.4", "@vue/compiler-core": "3.2.47", "@vue/shared": "3.2.47", -======= - "version": "3.2.19", - "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.19.tgz", - "integrity": "sha512-oLon0Cn3O7WEYzzmzZavGoqXH+199LT+smdjBT3Uf3UX4HwDNuBFCmvL0TsqV9SQnIgKvBRbQ7lhbpnd4lqM3w==", - "dependencies": { - "@vue/compiler-dom": "3.2.19", - "@vue/shared": "3.2.19" - } - }, - "node_modules/@vue/devtools-api": { - "version": "6.0.0-beta.15", - "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.0.0-beta.15.tgz", - "integrity": "sha512-quBx4Jjpexo6KDiNUGFr/zF/2A4srKM9S9v2uHgMXSU//hjgq1eGzqkIFql8T9gfX5ZaVOUzYBP3jIdIR3PKIA==" - }, - "node_modules/@vue/reactivity": { - "version": "3.2.19", - "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.19.tgz", - "integrity": "sha512-FtachoYs2SnyrWup5UikP54xDX6ZJ1s5VgHcJp4rkGoutU3Ry61jhs+nCX7J64zjX992Mh9gGUC0LqTs8q9vCA==", - "dependencies": { - "@vue/shared": "3.2.19" - } - }, - "node_modules/@vue/ref-transform": { - "version": "3.2.19", - "resolved": "https://registry.npmjs.org/@vue/ref-transform/-/ref-transform-3.2.19.tgz", - "integrity": "sha512-03wwUnoIAeKti5IGGx6Vk/HEBJ+zUcm5wrUM3+PQsGf7IYnXTbeIfHHpx4HeSeWhnLAjqZjADQwW8uA4rBmVbg==", - "dependencies": { - "@babel/parser": "^7.15.0", - "@vue/compiler-core": "3.2.19", - "@vue/shared": "3.2.19", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "estree-walker": "^2.0.2", "magic-string": "^0.25.7" } }, "node_modules/@vue/runtime-core": { -<<<<<<< HEAD "version": "3.2.47", "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.47.tgz", "integrity": "sha512-RZxbLQIRB/K0ev0K9FXhNbBzT32H9iRtYbaXb0ZIz2usLms/D55dJR2t6cIEUn6vyhS3ALNvNthI+Q95C+NOpA==", @@ -2363,28 +1615,10 @@ "dependencies": { "@vue/runtime-core": "3.2.47", "@vue/shared": "3.2.47", -======= - "version": "3.2.19", - "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.19.tgz", - "integrity": "sha512-qArZSWKxWsgKfxk9BelZ32nY0MZ31CAW2kUUyVJyxh4cTfHaXGbjiQB5JgsvKc49ROMNffv9t3/qjasQqAH+RQ==", - "dependencies": { - "@vue/reactivity": "3.2.19", - "@vue/shared": "3.2.19" - } - }, - "node_modules/@vue/runtime-dom": { - "version": "3.2.19", - "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.19.tgz", - "integrity": "sha512-hIRboxXwafeHhbZEkZYNV0MiJXPNf4fP0X6hM2TJb0vssz8BKhD9cF92BkRgZztTQevecbhk0gu4uAPJ3dxL9A==", - "dependencies": { - "@vue/runtime-core": "3.2.19", - "@vue/shared": "3.2.19", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "csstype": "^2.6.8" } }, "node_modules/@vue/server-renderer": { -<<<<<<< HEAD "version": "3.2.47", "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.47.tgz", "integrity": "sha512-dN9gc1i8EvmP9RCzvneONXsKfBRgqFeFZLurmHOveL7oH6HiFXJw5OGu294n1nHc/HMgTy6LulU/tv5/A7f/LA==", @@ -2420,23 +1654,6 @@ "@vue/server-renderer": "^3.0.1", "vue": "^3.0.1" } -======= - "version": "3.2.19", - "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.19.tgz", - "integrity": "sha512-A9FNT7fgQJXItwdzWREntAgWKVtKYuXHBKGev/H4+ByTu8vB7gQXGcim01QxaJshdNg4dYuH2tEBZXCNCNx+/w==", - "dependencies": { - "@vue/compiler-ssr": "3.2.19", - "@vue/shared": "3.2.19" - }, - "peerDependencies": { - "vue": "3.2.19" - } - }, - "node_modules/@vue/shared": { - "version": "3.2.19", - "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.19.tgz", - "integrity": "sha512-Knqhx7WieLdVgwCAZgTVrDCXZ50uItuecLh9JdLC8O+a5ayaSyIQYveUK3hCRNC7ws5zalHmZwfdLMGaS8r4Ew==" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "node_modules/7zip-bin": { "version": "5.1.1", @@ -2444,7 +1661,6 @@ "integrity": "sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ==", "dev": true }, -<<<<<<< HEAD "node_modules/abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", @@ -2455,12 +1671,6 @@ "version": "8.8.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz", "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==", -======= - "node_modules/acorn": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "bin": { "acorn": "bin/acorn" @@ -2478,7 +1688,6 @@ "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, -<<<<<<< HEAD "node_modules/acorn-walk": { "version": "8.2.0", "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", @@ -2498,19 +1707,6 @@ }, "engines": { "node": ">= 6.0.0" -======= - "node_modules/aggregate-error": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", - "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", - "dev": true, - "dependencies": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" - }, - "engines": { - "node": ">=8" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "node_modules/ajv": { @@ -2538,97 +1734,10 @@ "ajv": "^6.9.1" } }, -<<<<<<< HEAD "node_modules/ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", -======= - "node_modules/ansi-align": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz", - "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==", - "dev": true, - "dependencies": { - "string-width": "^3.0.0" - } - }, - "node_modules/ansi-align/node_modules/ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/ansi-align/node_modules/string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "dependencies": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/ansi-align/node_modules/strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "dependencies": { - "ansi-regex": "^4.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/ansi-colors": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", - "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/ansi-escapes": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", - "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", - "dev": true, - "dependencies": { - "type-fest": "^0.21.3" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/ansi-escapes/node_modules/type-fest": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", - "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "engines": { "node": ">=8" @@ -2649,7 +1758,6 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, -<<<<<<< HEAD "node_modules/anymatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", @@ -2677,27 +1785,10 @@ "dependencies": { "@develar/schema-utils": "~2.6.5", "@electron/universal": "1.2.1", -======= - "node_modules/app-builder-bin": { - "version": "3.5.13", - "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.5.13.tgz", - "integrity": "sha512-ighVe9G+bT1ENGdp9ecO1P+94vv/f+FUwaI+XkNzeg9bYF8Oi3BQ+mJuxS00UgyHs8luuOzjzC+qnAtdb43Mpg==", - "dev": true - }, - "node_modules/app-builder-lib": { - "version": "22.11.7", - "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.11.7.tgz", - "integrity": "sha512-pS9/cR4/TnNZVAHZECiSvvwTBzbwblj7KBBZkMKDG57nibq0I1XY8zAaYeHFdlYTyrRcz9JUXbAqJKezya7UFQ==", - "dev": true, - "dependencies": { - "@develar/schema-utils": "~2.6.5", - "@electron/universal": "1.0.5", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "@malept/flatpak-bundler": "^0.4.0", "7zip-bin": "~5.1.1", "async-exit-hook": "^2.0.1", "bluebird-lst": "^1.0.9", -<<<<<<< HEAD "builder-util": "23.6.0", "builder-util-runtime": "9.1.1", "chromium-pickle-js": "^0.2.0", @@ -2717,24 +1808,6 @@ "sanitize-filename": "^1.6.3", "semver": "^7.3.7", "tar": "^6.1.11", -======= - "builder-util": "22.11.7", - "builder-util-runtime": "8.7.7", - "chromium-pickle-js": "^0.2.0", - "debug": "^4.3.2", - "ejs": "^3.1.6", - "electron-publish": "22.11.7", - "fs-extra": "^10.0.0", - "hosted-git-info": "^4.0.2", - "is-ci": "^3.0.0", - "isbinaryfile": "^4.0.8", - "js-yaml": "^4.1.0", - "lazy-val": "^1.0.5", - "minimatch": "^3.0.4", - "read-config-file": "6.2.0", - "sanitize-filename": "^1.6.3", - "semver": "^7.3.5", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "temp-file": "^3.4.0" }, "engines": { @@ -2742,15 +1815,9 @@ } }, "node_modules/app-builder-lib/node_modules/fs-extra": { -<<<<<<< HEAD "version": "10.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", -======= - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", - "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "dependencies": { "graceful-fs": "^4.2.0", @@ -2796,23 +1863,10 @@ "node": ">=8" } }, -<<<<<<< HEAD "node_modules/asar": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/asar/-/asar-3.1.0.tgz", "integrity": "sha512-vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ==", -======= - "node_modules/asap": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", - "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=", - "dev": true - }, - "node_modules/asar": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/asar/-/asar-3.0.3.tgz", - "integrity": "sha512-k7zd+KoR+n8pl71PvgElcoKHrVNiSXtw7odKbyNpmgKe7EGRF9Pnu3uLOukD37EvavKwVFxOUpqXTIZC5B5Pmw==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "dependencies": { "chromium-pickle-js": "^0.2.0", @@ -2830,30 +1884,16 @@ "@types/glob": "^7.1.1" } }, -<<<<<<< HEAD "node_modules/assert-plus": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==", -======= - "node_modules/assert-never": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/assert-never/-/assert-never-1.2.1.tgz", - "integrity": "sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==", - "dev": true - }, - "node_modules/assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "optional": true, "engines": { "node": ">=0.8" } }, -<<<<<<< HEAD "node_modules/assertion-error": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", @@ -2863,31 +1903,20 @@ "node": "*" } }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/astral-regex": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", "dev": true, -<<<<<<< HEAD "optional": true, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "engines": { "node": ">=8" } }, "node_modules/async": { -<<<<<<< HEAD "version": "3.2.4", "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz", "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==", -======= - "version": "0.9.2", - "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", - "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true }, "node_modules/async-exit-hook": { @@ -2899,15 +1928,12 @@ "node": ">=0.12.0" } }, -<<<<<<< HEAD "node_modules/asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", "dev": true }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/at-least-node": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", @@ -2917,21 +1943,6 @@ "node": ">= 4.0.0" } }, -<<<<<<< HEAD -======= - "node_modules/babel-walk": { - "version": "3.0.0-canary-5", - "resolved": "https://registry.npmjs.org/babel-walk/-/babel-walk-3.0.0-canary-5.tgz", - "integrity": "sha512-GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw==", - "dev": true, - "dependencies": { - "@babel/types": "^7.9.6" - }, - "engines": { - "node": ">= 10.0.0" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -2956,7 +1967,6 @@ "type": "consulting", "url": "https://feross.org/support" } -<<<<<<< HEAD ] }, "node_modules/binary-extensions": { @@ -2967,10 +1977,6 @@ "engines": { "node": ">=8" } -======= - ], - "optional": true ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "node_modules/bluebird": { "version": "3.7.2", @@ -2987,7 +1993,6 @@ "bluebird": "^3.5.5" } }, -<<<<<<< HEAD "node_modules/boolbase": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", @@ -3001,66 +2006,6 @@ "dev": true, "optional": true }, -======= - "node_modules/boolean": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.1.4.tgz", - "integrity": "sha512-3hx0kwU3uzG6ReQ3pnaFQPSktpBw6RHN3/ivDKEuU8g1XSfafowyvDnadjv1xp8IZqhtSukxlwv9bF6FhX8m0w==", - "dev": true, - "optional": true - }, - "node_modules/boxen": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/boxen/-/boxen-5.0.1.tgz", - "integrity": "sha512-49VBlw+PrWEF51aCmy7QIteYPIFZxSpvqBdP/2itCPPlJ49kj9zg/XPRFrdkne2W+CfwXUls8exMvu1RysZpKA==", - "dev": true, - "dependencies": { - "ansi-align": "^3.0.0", - "camelcase": "^6.2.0", - "chalk": "^4.1.0", - "cli-boxes": "^2.2.1", - "string-width": "^4.2.0", - "type-fest": "^0.20.2", - "widest-line": "^3.1.0", - "wrap-ansi": "^7.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/boxen/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "node_modules/boxen/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/boxen/node_modules/string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", - "dev": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -3108,7 +2053,6 @@ "ieee754": "^1.1.13" } }, -<<<<<<< HEAD "node_modules/buffer-alloc": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", @@ -3129,12 +2073,6 @@ "version": "0.2.13", "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", -======= - "node_modules/buffer-crc32": { - "version": "0.2.13", - "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", - "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "engines": { "node": "*" @@ -3143,25 +2081,18 @@ "node_modules/buffer-equal": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz", -<<<<<<< HEAD "integrity": "sha512-tcBWO2Dl4e7Asr9hTGcpVrCe+F7DubpmqWCTbj4FHLmjqO2hIaC383acQubWtRJhdceqs5uBHs6Es+Sk//RKiQ==", -======= - "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "engines": { "node": ">=0.4.0" } }, -<<<<<<< HEAD "node_modules/buffer-fill": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz", "integrity": "sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==", "dev": true }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/buffer-from": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", @@ -3169,7 +2100,6 @@ "dev": true }, "node_modules/builder-util": { -<<<<<<< HEAD "version": "23.6.0", "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-23.6.0.tgz", "integrity": "sha512-QiQHweYsh8o+U/KNCZFSvISRnvRctb8m/2rB2I1JdByzvNKxPeFLlHFRPQRXab6aYeXc18j9LpsDLJ3sGQmWTQ==", @@ -3187,22 +2117,6 @@ "fs-extra": "^10.0.0", "http-proxy-agent": "^5.0.0", "https-proxy-agent": "^5.0.0", -======= - "version": "22.11.7", - "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.11.7.tgz", - "integrity": "sha512-ihqUe5ey82LM9qqQe0/oIcaSm9w+B9UjcsWJZxJliTBsbU+sErOpDFpHW+sim0veiTF/EIcGUh9HoduWw+l9FA==", - "dev": true, - "dependencies": { - "@types/debug": "^4.1.5", - "@types/fs-extra": "^9.0.11", - "7zip-bin": "~5.1.1", - "app-builder-bin": "3.5.13", - "bluebird-lst": "^1.0.9", - "builder-util-runtime": "8.7.7", - "chalk": "^4.1.1", - "debug": "^4.3.2", - "fs-extra": "^10.0.0", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "is-ci": "^3.0.0", "js-yaml": "^4.1.0", "source-map-support": "^0.5.19", @@ -3211,20 +2125,11 @@ } }, "node_modules/builder-util-runtime": { -<<<<<<< HEAD "version": "9.1.1", "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz", "integrity": "sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw==", "dependencies": { "debug": "^4.3.4", -======= - "version": "8.7.7", - "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.7.tgz", - "integrity": "sha512-RUfoXzVrmFFI0K/Oft0CtP1LpTIOlBeLJatt5DePTI0KlxE156am4SGUpqtbbdqZNm++LkV9mX4olBDcXyGPow==", - "dev": true, - "dependencies": { - "debug": "^4.3.2", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "sax": "^1.2.4" }, "engines": { @@ -3232,15 +2137,9 @@ } }, "node_modules/builder-util/node_modules/fs-extra": { -<<<<<<< HEAD "version": "10.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", -======= - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", - "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "dependencies": { "graceful-fs": "^4.2.0", @@ -3272,7 +2171,6 @@ "node": ">= 10.0.0" } }, -<<<<<<< HEAD "node_modules/cac": { "version": "6.7.14", "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz", @@ -3295,73 +2193,20 @@ "version": "7.0.2", "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz", "integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==", -======= - "node_modules/cacheable-request": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", - "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "dependencies": { "clone-response": "^1.0.2", "get-stream": "^5.1.0", "http-cache-semantics": "^4.0.0", -<<<<<<< HEAD "keyv": "^4.0.0", "lowercase-keys": "^2.0.0", "normalize-url": "^6.0.1", "responselike": "^2.0.0" -======= - "keyv": "^3.0.0", - "lowercase-keys": "^2.0.0", - "normalize-url": "^4.1.0", - "responselike": "^1.0.2" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "engines": { "node": ">=8" } }, -<<<<<<< HEAD -======= - "node_modules/cacheable-request/node_modules/get-stream": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", - "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "dev": true, - "dependencies": { - "pump": "^3.0.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cacheable-request/node_modules/lowercase-keys": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", - "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "dev": true, - "dependencies": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", @@ -3371,7 +2216,6 @@ "node": ">=6" } }, -<<<<<<< HEAD "node_modules/chai": { "version": "4.3.7", "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.7.tgz", @@ -3388,18 +2232,6 @@ }, "engines": { "node": ">=4" -======= - "node_modules/camelcase": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz", - "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "node_modules/chalk": { @@ -3418,7 +2250,6 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, -<<<<<<< HEAD "node_modules/check-error": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", @@ -3474,21 +2305,11 @@ "dev": true, "engines": { "node": ">=10" -======= - "node_modules/character-parser": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz", - "integrity": "sha1-x84o821LzZdE5f/CxfzeHHMmH8A=", - "dev": true, - "dependencies": { - "is-regex": "^1.0.3" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "node_modules/chromium-pickle-js": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz", -<<<<<<< HEAD "integrity": "sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw==", "dev": true }, @@ -3539,111 +2360,6 @@ }, "funding": { "url": "https://github.com/sponsors/sindresorhus" -======= - "integrity": "sha1-BKEGZywYsIWrd02YPfo+oTjyIgU=", - "dev": true - }, - "node_modules/ci-info": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz", - "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==", - "dev": true - }, - "node_modules/clean-stack": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/cli-boxes": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz", - "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==", - "dev": true, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cli-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", - "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", - "dev": true, - "dependencies": { - "restore-cursor": "^3.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/cli-truncate": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-1.1.0.tgz", - "integrity": "sha512-bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA==", - "dev": true, - "optional": true, - "dependencies": { - "slice-ansi": "^1.0.0", - "string-width": "^2.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/cliui": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", - "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", - "dev": true, - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^7.0.0" - } - }, - "node_modules/cliui/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "node_modules/cliui/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/cliui/node_modules/string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", - "dev": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/clone-response": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", - "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", - "dev": true, - "dependencies": { - "mimic-response": "^1.0.0" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "node_modules/color-convert": { @@ -3664,29 +2380,15 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, -<<<<<<< HEAD "node_modules/colors": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz", "integrity": "sha512-pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw==", -======= - "node_modules/colorette": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz", - "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==", - "dev": true - }, - "node_modules/colors": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz", - "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "engines": { "node": ">=0.1.90" } }, -<<<<<<< HEAD "node_modules/combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -3699,8 +2401,6 @@ "node": ">= 0.8" } }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/commander": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", @@ -3710,7 +2410,6 @@ "node": ">= 6" } }, -<<<<<<< HEAD "node_modules/compare-version": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz", @@ -3720,110 +2419,22 @@ "node": ">=0.10.0" } }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", "dev": true }, -<<<<<<< HEAD -======= - "node_modules/concat-stream": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", - "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", - "dev": true, - "engines": [ - "node >= 0.8" - ], - "dependencies": { - "buffer-from": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^2.2.2", - "typedarray": "^0.0.6" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/config-chain": { "version": "1.1.13", "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==", "dev": true, -<<<<<<< HEAD -======= - "optional": true, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dependencies": { "ini": "^1.3.4", "proto-list": "~1.2.1" } }, -<<<<<<< HEAD -======= - "node_modules/configstore": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz", - "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==", - "dev": true, - "dependencies": { - "dot-prop": "^5.2.0", - "graceful-fs": "^4.1.2", - "make-dir": "^3.0.0", - "unique-string": "^2.0.0", - "write-file-atomic": "^3.0.0", - "xdg-basedir": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/constantinople": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/constantinople/-/constantinople-4.0.1.tgz", - "integrity": "sha512-vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw==", - "dev": true, - "dependencies": { - "@babel/parser": "^7.6.0", - "@babel/types": "^7.6.1" - } - }, - "node_modules/core-js": { - "version": "3.18.0", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.18.0.tgz", - "integrity": "sha512-WJeQqq6jOYgVgg4NrXKL0KLQhi0CT4ZOCvFL+3CQ5o7I6J8HkT5wd53EadMfqTDp1so/MT1J+w2ujhWcCJtN7w==", - "dev": true, - "hasInstallScript": true, - "optional": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/core-js" - } - }, - "node_modules/core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true - }, - "node_modules/cosmiconfig": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz", - "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==", - "dev": true, - "dependencies": { - "@types/parse-json": "^4.0.0", - "import-fresh": "^3.2.1", - "parse-json": "^5.0.0", - "path-type": "^4.0.0", - "yaml": "^1.10.0" - }, - "engines": { - "node": ">=10" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/crc": { "version": "3.8.0", "resolved": "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz", @@ -3866,7 +2477,6 @@ "node": ">= 8" } }, -<<<<<<< HEAD "node_modules/css.escape": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz", @@ -3901,26 +2511,6 @@ "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", -======= - "node_modules/crypto-random-string": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", - "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/csstype": { - "version": "2.6.18", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.18.tgz", - "integrity": "sha512-RSU6Hyeg14am3Ah4VZEmeX8H7kLwEEirXe6aU2IPfKNvhXwTflK5HQRDNI0ypQXoqmm+QPyG2IaPuQE5zMwSIQ==" - }, - "node_modules/debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dependencies": { "ms": "2.1.2" }, @@ -3934,7 +2524,6 @@ } }, "node_modules/decompress-response": { -<<<<<<< HEAD "version": "6.0.0", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", @@ -4012,51 +2601,6 @@ "dev": true, "engines": { "node": ">=0.4.0" -======= - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", - "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", - "dev": true, - "dependencies": { - "mimic-response": "^1.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/deep-extend": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", - "dev": true, - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/deep-is": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", - "dev": true - }, - "node_modules/defer-to-connect": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz", - "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==", - "dev": true - }, - "node_modules/define-properties": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", - "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", - "dev": true, - "optional": true, - "dependencies": { - "object-keys": "^1.0.12" - }, - "engines": { - "node": ">= 0.4" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "node_modules/detect-node": { @@ -4066,7 +2610,6 @@ "dev": true, "optional": true }, -<<<<<<< HEAD "node_modules/diff": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz", @@ -4076,8 +2619,6 @@ "node": ">=0.3.1" } }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/dir-compare": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/dir-compare/-/dir-compare-2.4.0.tgz", @@ -4096,11 +2637,7 @@ "node_modules/dir-compare/node_modules/commander": { "version": "2.9.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", -<<<<<<< HEAD "integrity": "sha512-bmkUukX8wAOjHdN26xj5c4ctEV22TQ7dQYhSmuckKhToXrkUn0iIaolHdIxYYqD55nhpSPA9zPQ1yP57GdXP2A==", -======= - "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "dependencies": { "graceful-readlink": ">= 1.0.0" @@ -4109,7 +2646,6 @@ "node": ">= 0.6.x" } }, -<<<<<<< HEAD "node_modules/dir-compare/node_modules/minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", @@ -4122,8 +2658,6 @@ "node": "*" } }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/dir-glob": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", @@ -4137,7 +2671,6 @@ } }, "node_modules/dmg-builder": { -<<<<<<< HEAD "version": "23.6.0", "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-23.6.0.tgz", "integrity": "sha512-jFZvY1JohyHarIAlTbfQOk+HnceGjjAdFjVn3n8xlDWKsYNqbO4muca6qXEZTfGXeQMG7TYim6CeS5XKSfSsGA==", @@ -4146,22 +2679,11 @@ "app-builder-lib": "23.6.0", "builder-util": "23.6.0", "builder-util-runtime": "9.1.1", -======= - "version": "22.11.7", - "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.11.7.tgz", - "integrity": "sha512-+I+XfP2DODHB6PwFANgpH/WMzzCA5r5XoMvbFCIYjQjJpXlO0XnqQaamzFl2vh/Wz/Qt0d0lJMgRy8gKR3MGdQ==", - "dev": true, - "dependencies": { - "app-builder-lib": "22.11.7", - "builder-util": "22.11.7", - "builder-util-runtime": "8.7.6", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "fs-extra": "^10.0.0", "iconv-lite": "^0.6.2", "js-yaml": "^4.1.0" }, "optionalDependencies": { -<<<<<<< HEAD "dmg-license": "^1.0.11" } }, @@ -4169,28 +2691,6 @@ "version": "10.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", -======= - "dmg-license": "^1.0.9" - } - }, - "node_modules/dmg-builder/node_modules/builder-util-runtime": { - "version": "8.7.6", - "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.6.tgz", - "integrity": "sha512-rj9AIY7CzLSuTOXpToiaQkruYh6UEQ+kYnd5UET22ch8MGClEtIZKXHG14qEiXEr2x4EOKDMxkcTa+9TYaE+ug==", - "dev": true, - "dependencies": { - "debug": "^4.3.2", - "sax": "^1.2.4" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/dmg-builder/node_modules/fs-extra": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", - "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "dependencies": { "graceful-fs": "^4.2.0", @@ -4223,16 +2723,10 @@ } }, "node_modules/dmg-license": { -<<<<<<< HEAD "version": "1.0.11", "resolved": "https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.11.tgz", "integrity": "sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q==", "deprecated": "Disk image license agreements are deprecated by Apple and will probably be removed in a future macOS release. Discussion at: https://github.com/argv-minus-one/dmg-license/issues/11", -======= - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.9.tgz", - "integrity": "sha512-Rq6qMDaDou2+aPN2SYy0x7LDznoJ/XaG6oDcH5wXUp+WRWQMUYE6eM+F+nex+/LSXOp1uw4HLFoed0YbfU8R/Q==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "optional": true, "os": [ @@ -4242,16 +2736,9 @@ "@types/plist": "^3.0.1", "@types/verror": "^1.10.3", "ajv": "^6.10.0", -<<<<<<< HEAD "crc": "^3.8.0", "iconv-corefoundation": "^1.1.7", "plist": "^3.0.4", -======= - "cli-truncate": "^1.1.0", - "crc": "^3.8.0", - "iconv-corefoundation": "^1.1.6", - "plist": "^3.0.1", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "smart-buffer": "^4.0.2", "verror": "^1.10.0" }, @@ -4274,91 +2761,6 @@ "node": ">=6.0.0" } }, -<<<<<<< HEAD -======= - "node_modules/doctypes": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz", - "integrity": "sha1-6oCxBqh1OHdOijpKWv4pPeSJ4Kk=", - "dev": true - }, - "node_modules/dom-serializer": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz", - "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==", - "dev": true, - "dependencies": { - "domelementtype": "^2.0.1", - "domhandler": "^4.2.0", - "entities": "^2.0.0" - }, - "funding": { - "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" - } - }, - "node_modules/domelementtype": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", - "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/fb55" - } - ] - }, - "node_modules/domhandler": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.0.tgz", - "integrity": "sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==", - "dev": true, - "dependencies": { - "domelementtype": "^2.2.0" - }, - "engines": { - "node": ">= 4" - }, - "funding": { - "url": "https://github.com/fb55/domhandler?sponsor=1" - } - }, - "node_modules/domutils": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.7.0.tgz", - "integrity": "sha512-8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg==", - "dev": true, - "dependencies": { - "dom-serializer": "^1.0.1", - "domelementtype": "^2.2.0", - "domhandler": "^4.2.0" - }, - "funding": { - "url": "https://github.com/fb55/domutils?sponsor=1" - } - }, - "node_modules/dot-prop": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", - "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==", - "dev": true, - "dependencies": { - "is-obj": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/dot-prop/node_modules/is-obj": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", - "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/dotenv": { "version": "9.0.2", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-9.0.2.tgz", @@ -4374,7 +2776,6 @@ "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==", "dev": true }, -<<<<<<< HEAD "node_modules/eastasianwidth": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", @@ -4434,21 +2835,6 @@ "dev": true, "dependencies": { "jake": "^10.8.5" -======= - "node_modules/duplexer3": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", - "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=", - "dev": true - }, - "node_modules/ejs": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.6.tgz", - "integrity": "sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==", - "dev": true, - "dependencies": { - "jake": "^10.6.1" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "bin": { "ejs": "bin/cli.js" @@ -4458,7 +2844,6 @@ } }, "node_modules/electron": { -<<<<<<< HEAD "version": "23.1.4", "resolved": "https://registry.npmjs.org/electron/-/electron-23.1.4.tgz", "integrity": "sha512-3Z6CpAPdhv6haYX9DTO7k0l6uAUreZM3/EngQYqGN3Gz7Fp0DPb/egt8BwR3ClG/jTlQM+PQ+5WkTK0eMjm07A==", @@ -4468,23 +2853,11 @@ "@electron/get": "^2.0.0", "@types/node": "^16.11.26", "extract-zip": "^2.0.1" -======= - "version": "15.1.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-15.1.0.tgz", - "integrity": "sha512-QZJKZdrOG2G9lyOrDpCHh+arMrj7ZVVBulrukhNXwCeCEHgNLTVULEQzMOB9AVXUbIs+FthcddlMgcgpaErohw==", - "dev": true, - "hasInstallScript": true, - "dependencies": { - "@electron/get": "^1.13.0", - "@types/node": "^14.6.2", - "extract-zip": "^1.0.3" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "bin": { "electron": "cli.js" }, "engines": { -<<<<<<< HEAD "node": ">= 12.20.55" } }, @@ -4500,34 +2873,12 @@ "builder-util-runtime": "9.1.1", "chalk": "^4.1.1", "dmg-builder": "23.6.0", -======= - "node": ">= 8.6" - } - }, - "node_modules/electron-builder": { - "version": "22.11.7", - "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.11.7.tgz", - "integrity": "sha512-yQExSLt7Hbz/P8lLkZDdE/OnJJ7NCX+uiQcV+XIH0TeEZcD87ZnSqBBzGUN5akySU4BXXlrVZKeUsXACWrm5Kw==", - "dev": true, - "dependencies": { - "@types/yargs": "^16.0.2", - "app-builder-lib": "22.11.7", - "builder-util": "22.11.7", - "builder-util-runtime": "8.7.7", - "chalk": "^4.1.1", - "dmg-builder": "22.11.7", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "fs-extra": "^10.0.0", "is-ci": "^3.0.0", "lazy-val": "^1.0.5", "read-config-file": "6.2.0", -<<<<<<< HEAD "simple-update-notifier": "^1.0.7", "yargs": "^17.5.1" -======= - "update-notifier": "^5.1.0", - "yargs": "^17.0.1" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "bin": { "electron-builder": "cli.js", @@ -4538,15 +2889,9 @@ } }, "node_modules/electron-builder/node_modules/fs-extra": { -<<<<<<< HEAD "version": "10.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", -======= - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", - "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "dependencies": { "graceful-fs": "^4.2.0", @@ -4578,7 +2923,6 @@ "node": ">= 10.0.0" } }, -<<<<<<< HEAD "node_modules/electron-osx-sign": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.6.0.tgz", @@ -4636,29 +2980,6 @@ "@types/fs-extra": "^9.0.11", "builder-util": "23.6.0", "builder-util-runtime": "9.1.1", -======= - "node_modules/electron-devtools-installer": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/electron-devtools-installer/-/electron-devtools-installer-3.2.0.tgz", - "integrity": "sha512-t3UczsYugm4OAbqvdImMCImIMVdFzJAHgbwHpkl5jmfu1izVgUcP/mnrPqJIpEeCK1uZGpt+yHgWEN+9EwoYhQ==", - "dev": true, - "dependencies": { - "rimraf": "^3.0.2", - "semver": "^7.2.1", - "tslib": "^2.1.0", - "unzip-crx-3": "^0.2.0" - } - }, - "node_modules/electron-publish": { - "version": "22.11.7", - "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.11.7.tgz", - "integrity": "sha512-A4EhRRNBVz4SPzUlBrPO6BmuyDeI0pyprggPAV9rQ+SDVSnSB/WKPot9JwWMyArkGj3AUUTMNVT6hwZhMvhfqw==", - "dev": true, - "dependencies": { - "@types/fs-extra": "^9.0.11", - "builder-util": "22.11.7", - "builder-util-runtime": "8.7.7", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "chalk": "^4.1.1", "fs-extra": "^10.0.0", "lazy-val": "^1.0.5", @@ -4666,15 +2987,9 @@ } }, "node_modules/electron-publish/node_modules/fs-extra": { -<<<<<<< HEAD "version": "10.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", -======= - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", - "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "dependencies": { "graceful-fs": "^4.2.0", @@ -4707,27 +3022,17 @@ } }, "node_modules/electron-updater": { -<<<<<<< HEAD "version": "5.3.0", "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-5.3.0.tgz", "integrity": "sha512-iKEr7yQBcvnQUPnSDYGSWC9t0eF2YbZWeYYYZzYxdl+HiRejXFENjYMnYjoOm2zxyD6Cr2JTHZhp9pqxiXuCOw==", "dependencies": { "@types/semver": "^7.3.6", "builder-util-runtime": "9.1.1", -======= - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-4.6.0.tgz", - "integrity": "sha512-evvAwfDn100sIBZ/GLDpcWtWfaug48RGxVuYiSp0foKQkaXJGFyqYy5ADyt+HPML/mSTMPBvUq55cLEW45BroQ==", - "dependencies": { - "@types/semver": "^7.3.6", - "builder-util-runtime": "8.9.0", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "fs-extra": "^10.0.0", "js-yaml": "^4.1.0", "lazy-val": "^1.0.5", "lodash.escaperegexp": "^4.1.2", "lodash.isequal": "^4.5.0", -<<<<<<< HEAD "semver": "^7.3.5", "typed-emitter": "^2.1.0" } @@ -4736,27 +3041,6 @@ "version": "10.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", -======= - "semver": "^7.3.5" - } - }, - "node_modules/electron-updater/node_modules/builder-util-runtime": { - "version": "8.9.0", - "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.9.0.tgz", - "integrity": "sha512-XT7asdRMiSqUj/7EtvSW1mzVARvnhj0Nv4Ei4kD0p8GrKMFJt1Nadm4XwD+PrI2+srrtU+l8JMoBgSe4LX8EmQ==", - "dependencies": { - "debug": "^4.3.2", - "sax": "^1.2.4" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/electron-updater/node_modules/fs-extra": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", - "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -4785,7 +3069,6 @@ "node": ">= 10.0.0" } }, -<<<<<<< HEAD "node_modules/electron/node_modules/@types/node": { "version": "16.18.16", "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.16.tgz", @@ -4798,34 +3081,6 @@ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true }, -======= - "node_modules/emmet": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/emmet/-/emmet-2.3.4.tgz", - "integrity": "sha512-3IqSwmO+N2ZGeuhDyhV/TIOJFUbkChi53bcasSNRE7Yd+4eorbbYz4e53TpMECt38NtYkZNupQCZRlwdAYA42A==", - "dev": true, - "dependencies": { - "@emmetio/abbreviation": "^2.2.2", - "@emmetio/css-abbreviation": "^2.1.4" - } - }, - "node_modules/emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", - "dev": true - }, - "node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", - "dev": true, - "optional": true, - "engines": { - "node": ">= 0.8" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/end-of-stream": { "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", @@ -4835,30 +3090,6 @@ "once": "^1.4.0" } }, -<<<<<<< HEAD -======= - "node_modules/enquirer": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", - "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", - "dev": true, - "dependencies": { - "ansi-colors": "^4.1.1" - }, - "engines": { - "node": ">=8.6" - } - }, - "node_modules/entities": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", - "dev": true, - "funding": { - "url": "https://github.com/fb55/entities?sponsor=1" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/env-paths": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", @@ -4868,18 +3099,6 @@ "node": ">=6" } }, -<<<<<<< HEAD -======= - "node_modules/error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, - "dependencies": { - "is-arrayish": "^0.2.1" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/es6-error": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", @@ -4888,21 +3107,14 @@ "optional": true }, "node_modules/esbuild": { -<<<<<<< HEAD "version": "0.16.17", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.16.17.tgz", "integrity": "sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg==", -======= - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.13.3.tgz", - "integrity": "sha512-98xovMLKnyhv3gcReUuAEi5Ig1rK6SIgvsJuBIcfwzqGSEHsV8UJjMlmkhHoHMf9XZybMpE9Zax8AA8f7i2hlQ==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "hasInstallScript": true, "bin": { "esbuild": "bin/esbuild" }, -<<<<<<< HEAD "engines": { "node": ">=12" }, @@ -4931,235 +3143,6 @@ "@esbuild/win32-x64": "0.16.17" } }, -======= - "optionalDependencies": { - "esbuild-android-arm64": "0.13.3", - "esbuild-darwin-64": "0.13.3", - "esbuild-darwin-arm64": "0.13.3", - "esbuild-freebsd-64": "0.13.3", - "esbuild-freebsd-arm64": "0.13.3", - "esbuild-linux-32": "0.13.3", - "esbuild-linux-64": "0.13.3", - "esbuild-linux-arm": "0.13.3", - "esbuild-linux-arm64": "0.13.3", - "esbuild-linux-mips64le": "0.13.3", - "esbuild-linux-ppc64le": "0.13.3", - "esbuild-openbsd-64": "0.13.3", - "esbuild-sunos-64": "0.13.3", - "esbuild-windows-32": "0.13.3", - "esbuild-windows-64": "0.13.3", - "esbuild-windows-arm64": "0.13.3" - } - }, - "node_modules/esbuild-android-arm64": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.13.3.tgz", - "integrity": "sha512-jc9E8vGTHkzb0Vwl74H8liANV9BWsqtzLHaKvcsRgf1M+aVCBSF0gUheduAKfDsbDMT0judeMLhwBP34EUesTA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ] - }, - "node_modules/esbuild-darwin-64": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.13.3.tgz", - "integrity": "sha512-8bG3Zq+ZNuLlIJebOO2+weI7P2LVf33sOzaUfHj8MuJ+1Ixe4KtQxfYp7qhFnP6xP2ToJaYHxGUfLeiUCEz9hw==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/esbuild-darwin-arm64": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.13.3.tgz", - "integrity": "sha512-5E81eImYtTgh8pY7Gq4WQHhWkR/LvYadUXmuYeZBiP+3ADZJZcG60UFceZrjqNPaFOWKr/xmh4aNocwagEubcA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/esbuild-freebsd-64": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.13.3.tgz", - "integrity": "sha512-ou+f91KkTGexi8HvF/BdtsITL6plbciQfZGys7QX6/QEwyE96PmL5KnU6ZQwoU7E99Ts6Sc9bUDq8HXJubKtBA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ] - }, - "node_modules/esbuild-freebsd-arm64": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.13.3.tgz", - "integrity": "sha512-F1zV7nySjHswJuvIgjkiG5liZ63MeazDGXGKViTCeegjZ71sAhOChcaGhKcu6vq9+vqZxlfEi1fmXlx6Pc3coQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ] - }, - "node_modules/esbuild-linux-32": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.13.3.tgz", - "integrity": "sha512-mHHc2v6uLrHH4zaaq5RB/5IWzgimEJ1HGldzf1qtGI513KZWfH0HRRQ8p1di4notJgBn7tDzWQ1f34ZHy69viQ==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/esbuild-linux-64": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.13.3.tgz", - "integrity": "sha512-FJ1De2O89mrOuqtaEXu41qIYJU6R41F+OA6vheNwcAQcX8fu0aiA13FJeLABq29BYJuTVgRj3cyC8q+tz19/dQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/esbuild-linux-arm": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.13.3.tgz", - "integrity": "sha512-9BJNRtLwBh3OP22cln9g3AJdbAQUcjRHqA4BScx9k4RZpGqPokFr548zpeplxWhcwrIjT8qPebwH9CrRVy8Bsw==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/esbuild-linux-arm64": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.13.3.tgz", - "integrity": "sha512-Cauhr45KSo+wRUojs+1qfycQqQCAXTOvsWvkZ6xmEMAXLAm+f8RQGDQeP8CAf8Yeelnegcn6UNdvzdzLHhWDFg==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/esbuild-linux-mips64le": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.13.3.tgz", - "integrity": "sha512-YVzJUGCncuuLm2boYyVeuMFsak4ZAhdiBwi0xNDZCC8sy+tS6Boe2mzcrD2uubv5JKAUOrpN186S1DtU4WgBgw==", - "cpu": [ - "mips64el" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/esbuild-linux-ppc64le": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.13.3.tgz", - "integrity": "sha512-GU6CqqKtJEoyxC2QWHiJtmuOz9wc/jMv8ZloK2WwiGY5yMvAmM3PI103Dj7xcjebNTHBqITTUw/aigY1wx5A3w==", - "cpu": [ - "ppc64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/esbuild-openbsd-64": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.13.3.tgz", - "integrity": "sha512-HVpkgpn4BQt4BPDAjTOpeMub6mzNWw6Y3gaLQJrpbO24pws6ZwYkY24OI3/Uo3LDCbH6856MM81JxECt92OWjA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "openbsd" - ] - }, - "node_modules/esbuild-sunos-64": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.13.3.tgz", - "integrity": "sha512-XncBVOtnEfUbPV4CaiFBxh38ychnBfwCxuTm9iAqcHzIwkmeNRN5qMzDyfE1jyfJje+Bbt6AvIfz6SdYt8/UEQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "sunos" - ] - }, - "node_modules/esbuild-windows-32": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.13.3.tgz", - "integrity": "sha512-ZlgDz7d1nk8wQACi+z8IDzNZVUlN9iprAme+1YSTsfFDlkyI8jeaGWPk9EQFNY7rJzsLVYm6eZ2mhPioc7uT5A==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/esbuild-windows-64": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.13.3.tgz", - "integrity": "sha512-YX7KvRez3TR+GudlQm9tND/ssj2FsF9vb8ZWzAoZOLxpPzE3y+3SFJNrfDzzQKPzJ0Pnh9KBP4gsaMwJjKHDhw==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/esbuild-windows-arm64": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.13.3.tgz", - "integrity": "sha512-nP7H0Y2a6OJd3Qi1Q8sehhyP4x4JoXK4S5y6FzH2vgaJgiyEurzFxjUufGdMaw+RxtxiwD/uRndUgwaZ2JD8lg==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ] - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", @@ -5169,18 +3152,6 @@ "node": ">=6" } }, -<<<<<<< HEAD -======= - "node_modules/escape-goat": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz", - "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", @@ -5194,7 +3165,6 @@ } }, "node_modules/eslint": { -<<<<<<< HEAD "version": "8.36.0", "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.36.0.tgz", "integrity": "sha512-Y956lmS7vDqomxlaaQAHVmeb4tNMp2FWIvU/RnU5BD3IKMD/MJPr76xdyr68P8tV1iNMvN2mRK0yy3c+UjL+bw==", @@ -5240,70 +3210,18 @@ "strip-ansi": "^6.0.1", "strip-json-comments": "^3.1.0", "text-table": "^0.2.0" -======= - "version": "7.32.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz", - "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==", - "dev": true, - "dependencies": { - "@babel/code-frame": "7.12.11", - "@eslint/eslintrc": "^0.4.3", - "@humanwhocodes/config-array": "^0.5.0", - "ajv": "^6.10.0", - "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", - "debug": "^4.0.1", - "doctrine": "^3.0.0", - "enquirer": "^2.3.5", - "escape-string-regexp": "^4.0.0", - "eslint-scope": "^5.1.1", - "eslint-utils": "^2.1.0", - "eslint-visitor-keys": "^2.0.0", - "espree": "^7.3.1", - "esquery": "^1.4.0", - "esutils": "^2.0.2", - "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", - "functional-red-black-tree": "^1.0.1", - "glob-parent": "^5.1.2", - "globals": "^13.6.0", - "ignore": "^4.0.6", - "import-fresh": "^3.0.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", - "js-yaml": "^3.13.1", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", - "lodash.merge": "^4.6.2", - "minimatch": "^3.0.4", - "natural-compare": "^1.4.0", - "optionator": "^0.9.1", - "progress": "^2.0.0", - "regexpp": "^3.1.0", - "semver": "^7.2.1", - "strip-ansi": "^6.0.0", - "strip-json-comments": "^3.1.0", - "table": "^6.0.9", - "text-table": "^0.2.0", - "v8-compile-cache": "^2.0.3" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "bin": { "eslint": "bin/eslint.js" }, "engines": { -<<<<<<< HEAD "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -======= - "node": "^10.12.0 || >=12.0.0" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "funding": { "url": "https://opencollective.com/eslint" } }, "node_modules/eslint-plugin-vue": { -<<<<<<< HEAD "version": "9.9.0", "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.9.0.tgz", "integrity": "sha512-YbubS7eK0J7DCf0U2LxvVP7LMfs6rC6UltihIgval3azO3gyDwEGVgsCMe1TmDiEkl6GdMKfRpaME6QxIYtzDQ==", @@ -5322,56 +3240,6 @@ }, "peerDependencies": { "eslint": "^6.2.0 || ^7.0.0 || ^8.0.0" -======= - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.18.0.tgz", - "integrity": "sha512-ceDXlXYMMPMSXw7tdKUR42w9jlzthJGJ3Kvm3YrZ0zuQfvAySNxe8sm6VHuksBW0+060GzYXhHJG6IHVOfF83Q==", - "dev": true, - "dependencies": { - "eslint-utils": "^2.1.0", - "natural-compare": "^1.4.0", - "semver": "^6.3.0", - "vue-eslint-parser": "^7.10.0" - }, - "engines": { - "node": ">=8.10" - }, - "peerDependencies": { - "eslint": "^6.2.0 || ^7.0.0 || ^8.0.0-0" - } - }, - "node_modules/eslint-plugin-vue/node_modules/eslint-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", - "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", - "dev": true, - "dependencies": { - "eslint-visitor-keys": "^1.1.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - } - }, - "node_modules/eslint-plugin-vue/node_modules/eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/eslint-plugin-vue/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "bin": { - "semver": "bin/semver.js" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "node_modules/eslint-scope": { @@ -5405,11 +3273,7 @@ "eslint": ">=5" } }, -<<<<<<< HEAD "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { -======= - "node_modules/eslint-visitor-keys": { ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "version": "2.1.0", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", @@ -5418,7 +3282,6 @@ "node": ">=10" } }, -<<<<<<< HEAD "node_modules/eslint-visitor-keys": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", @@ -5471,100 +3334,6 @@ "version": "1.4.2", "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.2.tgz", "integrity": "sha512-JVSoLdTlTDkmjFmab7H/9SL9qGSyjElT3myyKp7krqjVFQCDLmj1QFaCLRFBszBKI0XVZaiiXvuPIX3ZwHe1Ng==", -======= - "node_modules/eslint/node_modules/argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "dependencies": { - "sprintf-js": "~1.0.2" - } - }, - "node_modules/eslint/node_modules/eslint-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", - "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", - "dev": true, - "dependencies": { - "eslint-visitor-keys": "^1.1.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - } - }, - "node_modules/eslint/node_modules/eslint-utils/node_modules/eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/eslint/node_modules/js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dev": true, - "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/eslint/node_modules/sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true - }, - "node_modules/espree": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz", - "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==", - "dev": true, - "dependencies": { - "acorn": "^7.4.0", - "acorn-jsx": "^5.3.1", - "eslint-visitor-keys": "^1.3.0" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/espree/node_modules/eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true, - "bin": { - "esparse": "bin/esparse.js", - "esvalidate": "bin/esvalidate.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/esquery": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz", - "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "dependencies": { "estraverse": "^5.1.0" @@ -5574,15 +3343,9 @@ } }, "node_modules/esquery/node_modules/estraverse": { -<<<<<<< HEAD "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", -======= - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "engines": { "node": ">=4.0" @@ -5601,15 +3364,9 @@ } }, "node_modules/esrecurse/node_modules/estraverse": { -<<<<<<< HEAD "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", -======= - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "engines": { "node": ">=4.0" @@ -5627,12 +3384,8 @@ "node_modules/estree-walker": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", -<<<<<<< HEAD "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", "dev": true -======= - "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "node_modules/esutils": { "version": "2.0.3", @@ -5643,7 +3396,6 @@ "node": ">=0.10.0" } }, -<<<<<<< HEAD "node_modules/extract-zip": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", @@ -5652,57 +3404,10 @@ "dependencies": { "debug": "^4.1.1", "get-stream": "^5.1.0", -======= - "node_modules/execa": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", - "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", - "dev": true, - "dependencies": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.0", - "human-signals": "^2.1.0", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.1", - "onetime": "^5.1.2", - "signal-exit": "^3.0.3", - "strip-final-newline": "^2.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sindresorhus/execa?sponsor=1" - } - }, - "node_modules/execa/node_modules/get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/extract-zip": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz", - "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==", - "dev": true, - "dependencies": { - "concat-stream": "^1.6.2", - "debug": "^2.6.9", - "mkdirp": "^0.5.4", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "yauzl": "^2.10.0" }, "bin": { "extract-zip": "cli.js" -<<<<<<< HEAD }, "engines": { "node": ">= 10.17.0" @@ -5715,29 +3420,6 @@ "version": "1.4.1", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz", "integrity": "sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==", -======= - } - }, - "node_modules/extract-zip/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/extract-zip/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "node_modules/extsprintf": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.0.tgz", - "integrity": "sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "engines": [ "node >=0.6.0" @@ -5751,15 +3433,9 @@ "dev": true }, "node_modules/fast-glob": { -<<<<<<< HEAD "version": "3.2.11", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz", "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==", -======= - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz", - "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "dependencies": { "@nodelib/fs.stat": "^2.0.2", @@ -5769,7 +3445,6 @@ "micromatch": "^4.0.4" }, "engines": { -<<<<<<< HEAD "node": ">=8.6.0" } }, @@ -5783,9 +3458,6 @@ }, "engines": { "node": ">= 6" -======= - "node": ">=8" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "node_modules/fast-json-stable-stringify": { @@ -5801,15 +3473,9 @@ "dev": true }, "node_modules/fastq": { -<<<<<<< HEAD "version": "1.13.0", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", -======= - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.1.tgz", - "integrity": "sha512-HOnr8Mc60eNYl1gzwp6r5RoUyAn5/glBolUzP/Ez6IFVPMPirxn/9phgL6zhOtaTy7ISwPvQ+wT+hfcRZh/bzw==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "dependencies": { "reusify": "^1.0.4" @@ -5818,11 +3484,7 @@ "node_modules/fd-slicer": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", -<<<<<<< HEAD "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==", -======= - "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "dependencies": { "pend": "~1.2.0" @@ -5841,7 +3503,6 @@ } }, "node_modules/filelist": { -<<<<<<< HEAD "version": "1.0.4", "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", @@ -5869,14 +3530,6 @@ }, "engines": { "node": ">=10" -======= - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.2.tgz", - "integrity": "sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ==", - "dev": true, - "dependencies": { - "minimatch": "^3.0.4" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "node_modules/fill-range": { @@ -5891,7 +3544,6 @@ "node": ">=8" } }, -<<<<<<< HEAD "node_modules/find-up": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", @@ -5908,8 +3560,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/flat-cache": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", @@ -5924,7 +3574,6 @@ } }, "node_modules/flatted": { -<<<<<<< HEAD "version": "3.2.4", "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz", "integrity": "sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw==", @@ -5944,13 +3593,6 @@ "node": ">= 6" } }, -======= - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz", - "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==", - "dev": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/fs-extra": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", @@ -5965,7 +3607,6 @@ "node": ">=6 <7 || >=8" } }, -<<<<<<< HEAD "node_modules/fs-minipass": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", @@ -5978,8 +3619,6 @@ "node": ">= 8" } }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -6006,15 +3645,6 @@ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", "dev": true }, -<<<<<<< HEAD -======= - "node_modules/functional-red-black-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", - "dev": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", @@ -6024,7 +3654,6 @@ "node": "6.* || 8.* || >= 10.*" } }, -<<<<<<< HEAD "node_modules/get-func-name": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", @@ -6034,17 +3663,12 @@ "node": "*" } }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/get-intrinsic": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", "dev": true, -<<<<<<< HEAD "optional": true, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dependencies": { "function-bind": "^1.1.1", "has": "^1.0.3", @@ -6054,29 +3678,15 @@ "url": "https://github.com/sponsors/ljharb" } }, -<<<<<<< HEAD "node_modules/get-stream": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", -======= - "node_modules/get-own-enumerable-property-symbols": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz", - "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==", - "dev": true - }, - "node_modules/get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "dependencies": { "pump": "^3.0.0" }, "engines": { -<<<<<<< HEAD "node": ">=8" }, "funding": { @@ -6087,15 +3697,6 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", -======= - "node": ">=6" - } - }, - "node_modules/glob": { - "version": "7.1.7", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", - "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "dependencies": { "fs.realpath": "^1.0.0", @@ -6113,7 +3714,6 @@ } }, "node_modules/glob-parent": { -<<<<<<< HEAD "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", @@ -6129,31 +3729,10 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz", "integrity": "sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==", -======= - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/global-agent": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-2.2.0.tgz", - "integrity": "sha512-+20KpaW6DDLqhG7JDiJpD1JvNvb8ts+TNl7BPOYcURqCrXqnN1Vf+XVOrkKJAFPqfX+oEhsdzOj1hLWkBTdNJg==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "optional": true, "dependencies": { "boolean": "^3.0.1", -<<<<<<< HEAD -======= - "core-js": "^3.6.5", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "es6-error": "^4.1.1", "matcher": "^3.0.0", "roarr": "^2.15.3", @@ -6164,57 +3743,10 @@ "node": ">=10.0" } }, -<<<<<<< HEAD "node_modules/globals": { "version": "13.19.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz", "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==", -======= - "node_modules/global-dirs": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.0.tgz", - "integrity": "sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==", - "dev": true, - "dependencies": { - "ini": "2.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/global-dirs/node_modules/ini": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz", - "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/global-tunnel-ng": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz", - "integrity": "sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg==", - "dev": true, - "optional": true, - "dependencies": { - "encodeurl": "^1.0.2", - "lodash": "^4.17.10", - "npm-conf": "^1.1.3", - "tunnel": "^0.0.6" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/globals": { - "version": "13.10.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.10.0.tgz", - "integrity": "sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -6227,15 +3759,9 @@ } }, "node_modules/globalthis": { -<<<<<<< HEAD "version": "1.0.3", "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz", "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==", -======= - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.2.tgz", - "integrity": "sha512-ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "optional": true, "dependencies": { @@ -6249,28 +3775,16 @@ } }, "node_modules/globby": { -<<<<<<< HEAD "version": "11.1.0", "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", -======= - "version": "11.0.4", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz", - "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "dependencies": { "array-union": "^2.1.0", "dir-glob": "^3.0.1", -<<<<<<< HEAD "fast-glob": "^3.2.9", "ignore": "^5.2.0", "merge2": "^1.4.1", -======= - "fast-glob": "^3.1.1", - "ignore": "^5.1.4", - "merge2": "^1.3.0", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "slash": "^3.0.0" }, "engines": { @@ -6280,7 +3794,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, -<<<<<<< HEAD "node_modules/got": { "version": "11.8.5", "resolved": "https://registry.npmjs.org/got/-/got-11.8.5.tgz", @@ -6310,48 +3823,10 @@ "version": "4.2.8", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz", "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==" -======= - "node_modules/globby/node_modules/ignore": { - "version": "5.1.8", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", - "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, - "node_modules/got": { - "version": "9.6.0", - "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", - "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==", - "dev": true, - "dependencies": { - "@sindresorhus/is": "^0.14.0", - "@szmarczak/http-timer": "^1.1.2", - "cacheable-request": "^6.0.0", - "decompress-response": "^3.3.0", - "duplexer3": "^0.1.4", - "get-stream": "^4.1.0", - "lowercase-keys": "^1.0.1", - "mimic-response": "^1.0.1", - "p-cancelable": "^1.0.0", - "to-readable-stream": "^1.0.0", - "url-parse-lax": "^3.0.0" - }, - "engines": { - "node": ">=8.6" - } - }, - "node_modules/graceful-fs": { - "version": "4.2.6", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz", - "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "node_modules/graceful-readlink": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", -<<<<<<< HEAD "integrity": "sha512-8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w==", "dev": true }, @@ -6376,11 +3851,6 @@ "whatwg-mimetype": "^3.0.0" } }, -======= - "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=", - "dev": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -6402,7 +3872,6 @@ "node": ">=8" } }, -<<<<<<< HEAD "node_modules/has-property-descriptors": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", @@ -6416,17 +3885,12 @@ "url": "https://github.com/sponsors/ljharb" } }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/has-symbols": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==", "dev": true, -<<<<<<< HEAD "optional": true, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "engines": { "node": ">= 0.4" }, @@ -6434,7 +3898,6 @@ "url": "https://github.com/sponsors/ljharb" } }, -<<<<<<< HEAD "node_modules/he": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", @@ -6448,36 +3911,6 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==", -======= - "node_modules/has-tostringtag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", - "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", - "dev": true, - "dependencies": { - "has-symbols": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-yarn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz", - "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/hosted-git-info": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz", - "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -6486,53 +3919,12 @@ "node": ">=10" } }, -<<<<<<< HEAD -======= - "node_modules/hosted-git-info/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/hosted-git-info/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, - "node_modules/htmlparser2": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", - "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==", - "dev": true, - "funding": [ - "https://github.com/fb55/htmlparser2?sponsor=1", - { - "type": "github", - "url": "https://github.com/sponsors/fb55" - } - ], - "dependencies": { - "domelementtype": "^2.0.1", - "domhandler": "^4.0.0", - "domutils": "^2.5.2", - "entities": "^2.0.0" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/http-cache-semantics": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==", "dev": true }, -<<<<<<< HEAD "node_modules/http-proxy-agent": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", @@ -6577,32 +3969,13 @@ "version": "1.1.7", "resolved": "https://registry.npmjs.org/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz", "integrity": "sha512-T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ==", -======= - "node_modules/human-signals": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", - "dev": true, - "engines": { - "node": ">=10.17.0" - } - }, - "node_modules/iconv-corefoundation": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/iconv-corefoundation/-/iconv-corefoundation-1.1.6.tgz", - "integrity": "sha512-1NBe55C75bKGZaY9UHxvXG3G0gEp0ziht7quhuFrW3SPgZDw9HI6qvYXRSV5M/Eupyu8ljuJ6Cba+ec15PZ4Xw==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "optional": true, "os": [ "darwin" ], "dependencies": { -<<<<<<< HEAD "cli-truncate": "^2.1.0", -======= - "cli-truncate": "^1.1.0", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node-addon-api": "^1.6.3" }, "engines": { @@ -6643,29 +4016,14 @@ "optional": true }, "node_modules/ignore": { -<<<<<<< HEAD "version": "5.2.0", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", -======= - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "engines": { "node": ">= 4" } }, -<<<<<<< HEAD -======= - "node_modules/immediate": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", - "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=", - "dev": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/import-fresh": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", @@ -6682,18 +4040,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, -<<<<<<< HEAD -======= - "node_modules/import-lazy": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", - "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=", - "dev": true, - "engines": { - "node": ">=4" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", @@ -6703,18 +4049,6 @@ "node": ">=0.8.19" } }, -<<<<<<< HEAD -======= - "node_modules/indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -6737,7 +4071,6 @@ "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", "dev": true }, -<<<<<<< HEAD "node_modules/is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -6757,36 +4090,15 @@ "dev": true, "dependencies": { "ci-info": "^3.2.0" -======= - "node_modules/is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", - "dev": true - }, - "node_modules/is-ci": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.0.tgz", - "integrity": "sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ==", - "dev": true, - "dependencies": { - "ci-info": "^3.1.1" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "bin": { "is-ci": "bin.js" } }, "node_modules/is-core-module": { -<<<<<<< HEAD "version": "2.9.0", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", -======= - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.5.0.tgz", - "integrity": "sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "dependencies": { "has": "^1.0.3" @@ -6795,19 +4107,6 @@ "url": "https://github.com/sponsors/ljharb" } }, -<<<<<<< HEAD -======= - "node_modules/is-expression": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-expression/-/is-expression-4.0.0.tgz", - "integrity": "sha512-zMIXX63sxzG3XrkHkrAPvm/OVZVSCPNkwMHU8oTX7/U3AL78I0QXCEICXUM13BIa8TYGZ68PiTKfQz3yaTNr4A==", - "dev": true, - "dependencies": { - "acorn": "^7.1.1", - "object-assign": "^4.1.1" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", @@ -6818,7 +4117,6 @@ } }, "node_modules/is-fullwidth-code-point": { -<<<<<<< HEAD "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", @@ -6831,20 +4129,6 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", -======= - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/is-glob": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", - "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "dependencies": { "is-extglob": "^2.1.1" @@ -6853,37 +4137,6 @@ "node": ">=0.10.0" } }, -<<<<<<< HEAD -======= - "node_modules/is-installed-globally": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz", - "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==", - "dev": true, - "dependencies": { - "global-dirs": "^3.0.0", - "is-path-inside": "^3.0.2" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-npm": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-5.0.0.tgz", - "integrity": "sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", @@ -6893,18 +4146,6 @@ "node": ">=0.12.0" } }, -<<<<<<< HEAD -======= - "node_modules/is-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", - "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/is-path-inside": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", @@ -6914,90 +4155,10 @@ "node": ">=8" } }, -<<<<<<< HEAD "node_modules/isbinaryfile": { "version": "4.0.10", "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.10.tgz", "integrity": "sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==", -======= - "node_modules/is-promise": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz", - "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==", - "dev": true - }, - "node_modules/is-regex": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", - "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-regexp": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz", - "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", - "dev": true, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", - "dev": true - }, - "node_modules/is-unicode-supported": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", - "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-yarn-global": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz", - "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==", - "dev": true - }, - "node_modules/isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, - "node_modules/isbinaryfile": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.8.tgz", - "integrity": "sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "engines": { "node": ">= 8.0.0" @@ -7013,7 +4174,6 @@ "dev": true }, "node_modules/jake": { -<<<<<<< HEAD "version": "10.8.5", "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz", "integrity": "sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==", @@ -7021,15 +4181,6 @@ "dependencies": { "async": "^3.2.3", "chalk": "^4.0.2", -======= - "version": "10.8.2", - "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz", - "integrity": "sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A==", - "dev": true, - "dependencies": { - "async": "0.9.x", - "chalk": "^2.4.2", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "filelist": "^1.0.1", "minimatch": "^3.0.4" }, @@ -7037,7 +4188,6 @@ "jake": "bin/cli.js" }, "engines": { -<<<<<<< HEAD "node": ">=10" } }, @@ -7105,98 +4255,6 @@ "version": "4.1.4", "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.4.tgz", "integrity": "sha512-Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw==", -======= - "node": "*" - } - }, - "node_modules/jake/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/jake/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/jake/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/jake/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "node_modules/jake/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/jake/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/jake/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/jpeg-js": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.3.tgz", - "integrity": "sha512-ru1HWKek8octvUHFHvE5ZzQ1yAsJmIvRdGWvSoKV52XKyuyYA437QWDttXT8eZXDSbuMpHlLzPDZUPd6idIz+Q==", - "dev": true - }, - "node_modules/js-stringify": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz", - "integrity": "sha1-Fzb939lyTyijaCrcYjCufk6Weds=", - "dev": true - }, - "node_modules/js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true }, "node_modules/js-yaml": { @@ -7211,21 +4269,9 @@ } }, "node_modules/json-buffer": { -<<<<<<< HEAD "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", -======= - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", - "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=", - "dev": true - }, - "node_modules/json-parse-even-better-errors": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true }, "node_modules/json-schema-traverse": { @@ -7243,7 +4289,6 @@ "node_modules/json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", -<<<<<<< HEAD "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==", "dev": true, "optional": true @@ -7264,32 +4309,17 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==", -======= - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", - "dev": true, - "optional": true - }, - "node_modules/jsonc-parser": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.1.tgz", - "integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true }, "node_modules/jsonfile": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", -<<<<<<< HEAD "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", -======= - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "optionalDependencies": { "graceful-fs": "^4.1.6" } }, -<<<<<<< HEAD "node_modules/keyv": { "version": "4.5.2", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.2.tgz", @@ -7297,49 +4327,6 @@ "dev": true, "dependencies": { "json-buffer": "3.0.1" -======= - "node_modules/jstransformer": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz", - "integrity": "sha1-7Yvwkh4vPx7U1cGkT2hwntJHIsM=", - "dev": true, - "dependencies": { - "is-promise": "^2.0.0", - "promise": "^7.0.1" - } - }, - "node_modules/jszip": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.0.tgz", - "integrity": "sha512-Y2OlFIzrDOPWUnpU0LORIcDn2xN7rC9yKffFM/7pGhQuhO+SUhfm2trkJ/S5amjFvem0Y+1EALz/MEPkvHXVNw==", - "dev": true, - "dependencies": { - "lie": "~3.3.0", - "pako": "~1.0.2", - "readable-stream": "~2.3.6", - "set-immediate-shim": "~1.0.1" - } - }, - "node_modules/keyv": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", - "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==", - "dev": true, - "dependencies": { - "json-buffer": "3.0.0" - } - }, - "node_modules/latest-version": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz", - "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==", - "dev": true, - "dependencies": { - "package-json": "^6.3.0" - }, - "engines": { - "node": ">=8" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "node_modules/lazy-val": { @@ -7360,7 +4347,6 @@ "node": ">= 0.8.0" } }, -<<<<<<< HEAD "node_modules/local-pkg": { "version": "0.4.2", "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.4.2.tgz", @@ -7383,217 +4369,17 @@ }, "engines": { "node": ">=10" -======= - "node_modules/lie": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", - "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", - "dev": true, - "dependencies": { - "immediate": "~3.0.5" - } - }, - "node_modules/lines-and-columns": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", - "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=", - "dev": true - }, - "node_modules/lint-staged": { - "version": "11.1.2", - "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-11.1.2.tgz", - "integrity": "sha512-6lYpNoA9wGqkL6Hew/4n1H6lRqF3qCsujVT0Oq5Z4hiSAM7S6NksPJ3gnr7A7R52xCtiZMcEUNNQ6d6X5Bvh9w==", - "dev": true, - "dependencies": { - "chalk": "^4.1.1", - "cli-truncate": "^2.1.0", - "commander": "^7.2.0", - "cosmiconfig": "^7.0.0", - "debug": "^4.3.1", - "enquirer": "^2.3.6", - "execa": "^5.0.0", - "listr2": "^3.8.2", - "log-symbols": "^4.1.0", - "micromatch": "^4.0.4", - "normalize-path": "^3.0.0", - "please-upgrade-node": "^3.2.0", - "string-argv": "0.3.1", - "stringify-object": "^3.3.0" - }, - "bin": { - "lint-staged": "bin/lint-staged.js" - }, - "funding": { - "url": "https://opencollective.com/lint-staged" - } - }, - "node_modules/lint-staged/node_modules/cli-truncate": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz", - "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==", - "dev": true, - "dependencies": { - "slice-ansi": "^3.0.0", - "string-width": "^4.2.0" - }, - "engines": { - "node": ">=8" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, -<<<<<<< HEAD -======= - "node_modules/lint-staged/node_modules/commander": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", - "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", - "dev": true, - "engines": { - "node": ">= 10" - } - }, - "node_modules/lint-staged/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "node_modules/lint-staged/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/lint-staged/node_modules/slice-ansi": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", - "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/lint-staged/node_modules/string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", - "dev": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/listr2": { - "version": "3.11.0", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.11.0.tgz", - "integrity": "sha512-XLJVe2JgXCyQTa3FbSv11lkKExYmEyA4jltVo8z4FX10Vt1Yj8IMekBfwim0BSOM9uj1QMTJvDQQpHyuPbB/dQ==", - "dev": true, - "dependencies": { - "cli-truncate": "^2.1.0", - "colorette": "^1.2.2", - "log-update": "^4.0.0", - "p-map": "^4.0.0", - "rxjs": "^6.6.7", - "through": "^2.3.8", - "wrap-ansi": "^7.0.0" - }, - "engines": { - "node": ">=10.0.0" - }, - "peerDependencies": { - "enquirer": ">= 2.3.0 < 3" - } - }, - "node_modules/listr2/node_modules/cli-truncate": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz", - "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==", - "dev": true, - "dependencies": { - "slice-ansi": "^3.0.0", - "string-width": "^4.2.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/listr2/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "node_modules/listr2/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/listr2/node_modules/slice-ansi": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", - "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/listr2/node_modules/string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", - "dev": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "dev": true }, -<<<<<<< HEAD -======= - "node_modules/lodash.clonedeep": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", - "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", - "dev": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/lodash.escaperegexp": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz", @@ -7610,7 +4396,6 @@ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, -<<<<<<< HEAD "node_modules/loupe": { "version": "2.3.6", "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz", @@ -7624,64 +4409,11 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", -======= - "node_modules/lodash.truncate": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", - "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=", - "dev": true - }, - "node_modules/log-symbols": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", - "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", - "dev": true, - "dependencies": { - "chalk": "^4.1.0", - "is-unicode-supported": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/log-update": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz", - "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==", - "dev": true, - "dependencies": { - "ansi-escapes": "^4.3.0", - "cli-cursor": "^3.1.0", - "slice-ansi": "^4.0.0", - "wrap-ansi": "^6.2.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/log-update/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "node_modules/log-update/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "engines": { "node": ">=8" } }, -<<<<<<< HEAD "node_modules/lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -7700,92 +4432,6 @@ "dev": true, "dependencies": { "sourcemap-codec": "^1.4.8" -======= - "node_modules/log-update/node_modules/slice-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", - "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/slice-ansi?sponsor=1" - } - }, - "node_modules/log-update/node_modules/string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", - "dev": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/log-update/node_modules/wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/lowercase-keys": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", - "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/magic-string": { - "version": "0.25.7", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz", - "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==", - "dependencies": { - "sourcemap-codec": "^1.4.4" - } - }, - "node_modules/make-dir": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", - "dev": true, - "dependencies": { - "semver": "^6.0.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/make-dir/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "bin": { - "semver": "bin/semver.js" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "node_modules/matcher": { @@ -7801,15 +4447,6 @@ "node": ">=10" } }, -<<<<<<< HEAD -======= - "node_modules/merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/merge2": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", @@ -7820,7 +4457,6 @@ } }, "node_modules/micromatch": { -<<<<<<< HEAD "version": "4.0.5", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", @@ -7828,30 +4464,15 @@ "dependencies": { "braces": "^3.0.2", "picomatch": "^2.3.1" -======= - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", - "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", - "dev": true, - "dependencies": { - "braces": "^3.0.1", - "picomatch": "^2.2.3" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "engines": { "node": ">=8.6" } }, "node_modules/mime": { -<<<<<<< HEAD "version": "2.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", -======= - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz", - "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "bin": { "mime": "cli.js" @@ -7860,7 +4481,6 @@ "node": ">=4.0.0" } }, -<<<<<<< HEAD "node_modules/mime-db": { "version": "1.51.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz", @@ -7880,15 +4500,6 @@ }, "engines": { "node": ">= 0.6" -======= - "node_modules/mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true, - "engines": { - "node": ">=6" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "node_modules/mimic-response": { @@ -7901,15 +4512,9 @@ } }, "node_modules/minimatch": { -<<<<<<< HEAD "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", -======= - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "dependencies": { "brace-expansion": "^1.1.7" @@ -7924,7 +4529,6 @@ "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", "dev": true }, -<<<<<<< HEAD "node_modules/minipass": { "version": "3.3.3", "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.3.tgz", @@ -7960,18 +4564,6 @@ "pathe": "^0.3.8", "pkg-types": "^0.3.5", "ufo": "^0.8.5" -======= - "node_modules/mkdirp": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", - "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", - "dev": true, - "dependencies": { - "minimist": "^1.2.5" - }, - "bin": { - "mkdirp": "bin/cmd.js" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "node_modules/ms": { @@ -7979,7 +4571,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, -<<<<<<< HEAD "node_modules/muggle-string": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/muggle-string/-/muggle-string-0.2.2.tgz", @@ -8006,17 +4597,6 @@ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", "dev": true, -======= - "node_modules/nanocolors": { - "version": "0.2.12", - "resolved": "https://registry.npmjs.org/nanocolors/-/nanocolors-0.2.12.tgz", - "integrity": "sha512-SFNdALvzW+rVlzqexid6epYdt8H9Zol7xDoQarioEFcFN0JHo4CYNztAxmtfgGTVRCmFlEOqqhBpoFGKqSAMug==" - }, - "node_modules/nanoid": { - "version": "3.1.28", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.28.tgz", - "integrity": "sha512-gSu9VZ2HtmoKYe/lmyPFES5nknFrHa+/DT9muUFWFMi6Jh9E1I7bkvlQ8xxf1Kos9pi9o8lBnIOkatMhKX/YUw==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -8030,15 +4610,12 @@ "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", "dev": true }, -<<<<<<< HEAD "node_modules/natural-compare-lite": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz", "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", "dev": true }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/node-addon-api": { "version": "1.7.2", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz", @@ -8046,7 +4623,6 @@ "dev": true, "optional": true }, -<<<<<<< HEAD "node_modules/node-fetch": { "version": "2.6.6", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz", @@ -8074,8 +4650,6 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", @@ -8086,7 +4660,6 @@ } }, "node_modules/normalize-url": { -<<<<<<< HEAD "version": "6.1.0", "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==", @@ -8108,49 +4681,6 @@ }, "funding": { "url": "https://github.com/fb55/nth-check?sponsor=1" -======= - "version": "4.5.1", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz", - "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/npm-conf": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz", - "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==", - "dev": true, - "optional": true, - "dependencies": { - "config-chain": "^1.1.11", - "pify": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/npm-run-path": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", - "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", - "dev": true, - "dependencies": { - "path-key": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "dev": true, - "engines": { - "node": ">=0.10.0" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "node_modules/object-keys": { @@ -8172,24 +4702,6 @@ "wrappy": "1" } }, -<<<<<<< HEAD -======= - "node_modules/onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, - "dependencies": { - "mimic-fn": "^2.1.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/optionator": { "version": "0.9.1", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", @@ -8208,7 +4720,6 @@ } }, "node_modules/p-cancelable": { -<<<<<<< HEAD "version": "2.1.1", "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz", "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==", @@ -8246,60 +4757,6 @@ "funding": { "url": "https://github.com/sponsors/sindresorhus" } -======= - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz", - "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", - "dev": true, - "dependencies": { - "aggregate-error": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/package-json": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz", - "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==", - "dev": true, - "dependencies": { - "got": "^9.6.0", - "registry-auth-token": "^4.0.0", - "registry-url": "^5.0.0", - "semver": "^6.2.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/package-json/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/pako": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", - "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", - "dev": true ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "node_modules/parent-module": { "version": "1.0.1", @@ -8313,7 +4770,6 @@ "node": ">=6" } }, -<<<<<<< HEAD "node_modules/path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -8321,24 +4777,6 @@ "dev": true, "engines": { "node": ">=8" -======= - "node_modules/parse-json": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", - "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.0.0", - "error-ex": "^1.3.1", - "json-parse-even-better-errors": "^2.3.0", - "lines-and-columns": "^1.1.6" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "node_modules/path-is-absolute": { @@ -8374,7 +4812,6 @@ "node": ">=8" } }, -<<<<<<< HEAD "node_modules/pathe": { "version": "0.3.9", "resolved": "https://registry.npmjs.org/pathe/-/pathe-0.3.9.tgz", @@ -8406,18 +4843,6 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", -======= - "node_modules/pend": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", - "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=", - "dev": true - }, - "node_modules/picomatch": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", - "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "engines": { "node": ">=8.6" @@ -8426,7 +4851,6 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, -<<<<<<< HEAD "node_modules/pkg-types": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-0.3.6.tgz", @@ -8474,135 +4898,6 @@ "dependencies": { "base64-js": "^1.5.1", "xmlbuilder": "^9.0.7" -======= - "node_modules/pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true, - "optional": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/playwright": { - "version": "1.15.1", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.15.1.tgz", - "integrity": "sha512-MQaKii1mhfoZF0+HXE4h5s2CwZNJmcASlmI097yosoZ9Fo5RW9RkLN5VMCbSw9xTyoqo6vdE6Df0OFpupYjBow==", - "dev": true, - "hasInstallScript": true, - "dependencies": { - "commander": "^6.1.0", - "debug": "^4.1.1", - "extract-zip": "^2.0.1", - "https-proxy-agent": "^5.0.0", - "jpeg-js": "^0.4.2", - "mime": "^2.4.6", - "pngjs": "^5.0.0", - "progress": "^2.0.3", - "proper-lockfile": "^4.1.1", - "proxy-from-env": "^1.1.0", - "rimraf": "^3.0.2", - "stack-utils": "^2.0.3", - "ws": "^7.4.6", - "yazl": "^2.5.1" - }, - "bin": { - "playwright": "lib/cli/cli.js" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/playwright/node_modules/agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, - "dependencies": { - "debug": "4" - }, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/playwright/node_modules/commander": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", - "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==", - "dev": true, - "engines": { - "node": ">= 6" - } - }, - "node_modules/playwright/node_modules/extract-zip": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", - "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", - "dev": true, - "dependencies": { - "debug": "^4.1.1", - "get-stream": "^5.1.0", - "yauzl": "^2.10.0" - }, - "bin": { - "extract-zip": "cli.js" - }, - "engines": { - "node": ">= 10.17.0" - }, - "optionalDependencies": { - "@types/yauzl": "^2.9.1" - } - }, - "node_modules/playwright/node_modules/get-stream": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", - "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "dev": true, - "dependencies": { - "pump": "^3.0.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/playwright/node_modules/https-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", - "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", - "dev": true, - "dependencies": { - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/please-upgrade-node": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz", - "integrity": "sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==", - "dev": true, - "dependencies": { - "semver-compare": "^1.0.0" - } - }, - "node_modules/plist": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.2.tgz", - "integrity": "sha512-MSrkwZBdQ6YapHy87/8hDU8MnIcyxBKjeF+McXnr5A9MtffPewTs7G3hlpodT5TacyfIyFTaJEhh3GGcmasTgQ==", - "dev": true, - "optional": true, - "dependencies": { - "base64-js": "^1.5.1", - "xmlbuilder": "^9.0.7", - "xmldom": "^0.5.0" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "engines": { "node": ">=6" @@ -8613,15 +4908,10 @@ "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=", "dev": true, -<<<<<<< HEAD -======= - "optional": true, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "engines": { "node": ">=4.0" } }, -<<<<<<< HEAD "node_modules/postcss": { "version": "8.4.21", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz", @@ -8657,32 +4947,6 @@ }, "engines": { "node": ">=4" -======= - "node_modules/pngjs": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-5.0.0.tgz", - "integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==", - "dev": true, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/postcss": { - "version": "8.3.8", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.8.tgz", - "integrity": "sha512-GT5bTjjZnwDifajzczOC+r3FI3Cu+PgPvrsjhQdRqa2kTJ4968/X9CUce9xttIB0xOs5c6xf0TCWZo/y9lF6bA==", - "dependencies": { - "nanocolors": "^0.2.2", - "nanoid": "^3.1.25", - "source-map-js": "^0.6.2" - }, - "engines": { - "node": "^10 || ^12 || >=14" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "node_modules/prelude-ls": { @@ -8694,7 +4958,6 @@ "node": ">= 0.8.0" } }, -<<<<<<< HEAD "node_modules/pretty-format": { "version": "27.5.1", "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", @@ -8720,22 +4983,6 @@ "funding": { "url": "https://github.com/chalk/ansi-styles?sponsor=1" } -======= - "node_modules/prepend-http": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", - "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", - "dev": true ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "node_modules/progress": { "version": "2.0.3", @@ -8746,7 +4993,6 @@ "node": ">=0.4.0" } }, -<<<<<<< HEAD "node_modules/proto-list": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", @@ -8757,163 +5003,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==", -======= - "node_modules/promise": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", - "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", - "dev": true, - "dependencies": { - "asap": "~2.0.3" - } - }, - "node_modules/proper-lockfile": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-4.1.2.tgz", - "integrity": "sha512-TjNPblN4BwAWMXU8s9AEz4JmQxnD1NNL7bNOY/AKUzyamc379FWASUhc/K1pL2noVb+XmZKLL68cjzLsiOAMaA==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.2.4", - "retry": "^0.12.0", - "signal-exit": "^3.0.2" - } - }, - "node_modules/proto-list": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", - "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=", - "dev": true, - "optional": true - }, - "node_modules/proxy-from-env": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", - "dev": true - }, - "node_modules/pug": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/pug/-/pug-3.0.2.tgz", - "integrity": "sha512-bp0I/hiK1D1vChHh6EfDxtndHji55XP/ZJKwsRqrz6lRia6ZC2OZbdAymlxdVFwd1L70ebrVJw4/eZ79skrIaw==", - "dev": true, - "dependencies": { - "pug-code-gen": "^3.0.2", - "pug-filters": "^4.0.0", - "pug-lexer": "^5.0.1", - "pug-linker": "^4.0.0", - "pug-load": "^3.0.0", - "pug-parser": "^6.0.0", - "pug-runtime": "^3.0.1", - "pug-strip-comments": "^2.0.0" - } - }, - "node_modules/pug-attrs": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pug-attrs/-/pug-attrs-3.0.0.tgz", - "integrity": "sha512-azINV9dUtzPMFQktvTXciNAfAuVh/L/JCl0vtPCwvOA21uZrC08K/UnmrL+SXGEVc1FwzjW62+xw5S/uaLj6cA==", - "dev": true, - "dependencies": { - "constantinople": "^4.0.1", - "js-stringify": "^1.0.2", - "pug-runtime": "^3.0.0" - } - }, - "node_modules/pug-code-gen": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-3.0.2.tgz", - "integrity": "sha512-nJMhW16MbiGRiyR4miDTQMRWDgKplnHyeLvioEJYbk1RsPI3FuA3saEP8uwnTb2nTJEKBU90NFVWJBk4OU5qyg==", - "dev": true, - "dependencies": { - "constantinople": "^4.0.1", - "doctypes": "^1.1.0", - "js-stringify": "^1.0.2", - "pug-attrs": "^3.0.0", - "pug-error": "^2.0.0", - "pug-runtime": "^3.0.0", - "void-elements": "^3.1.0", - "with": "^7.0.0" - } - }, - "node_modules/pug-error": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pug-error/-/pug-error-2.0.0.tgz", - "integrity": "sha512-sjiUsi9M4RAGHktC1drQfCr5C5eriu24Lfbt4s+7SykztEOwVZtbFk1RRq0tzLxcMxMYTBR+zMQaG07J/btayQ==", - "dev": true - }, - "node_modules/pug-filters": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/pug-filters/-/pug-filters-4.0.0.tgz", - "integrity": "sha512-yeNFtq5Yxmfz0f9z2rMXGw/8/4i1cCFecw/Q7+D0V2DdtII5UvqE12VaZ2AY7ri6o5RNXiweGH79OCq+2RQU4A==", - "dev": true, - "dependencies": { - "constantinople": "^4.0.1", - "jstransformer": "1.0.0", - "pug-error": "^2.0.0", - "pug-walk": "^2.0.0", - "resolve": "^1.15.1" - } - }, - "node_modules/pug-lexer": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/pug-lexer/-/pug-lexer-5.0.1.tgz", - "integrity": "sha512-0I6C62+keXlZPZkOJeVam9aBLVP2EnbeDw3An+k0/QlqdwH6rv8284nko14Na7c0TtqtogfWXcRoFE4O4Ff20w==", - "dev": true, - "dependencies": { - "character-parser": "^2.2.0", - "is-expression": "^4.0.0", - "pug-error": "^2.0.0" - } - }, - "node_modules/pug-linker": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/pug-linker/-/pug-linker-4.0.0.tgz", - "integrity": "sha512-gjD1yzp0yxbQqnzBAdlhbgoJL5qIFJw78juN1NpTLt/mfPJ5VgC4BvkoD3G23qKzJtIIXBbcCt6FioLSFLOHdw==", - "dev": true, - "dependencies": { - "pug-error": "^2.0.0", - "pug-walk": "^2.0.0" - } - }, - "node_modules/pug-load": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pug-load/-/pug-load-3.0.0.tgz", - "integrity": "sha512-OCjTEnhLWZBvS4zni/WUMjH2YSUosnsmjGBB1An7CsKQarYSWQ0GCVyd4eQPMFJqZ8w9xgs01QdiZXKVjk92EQ==", - "dev": true, - "dependencies": { - "object-assign": "^4.1.1", - "pug-walk": "^2.0.0" - } - }, - "node_modules/pug-parser": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/pug-parser/-/pug-parser-6.0.0.tgz", - "integrity": "sha512-ukiYM/9cH6Cml+AOl5kETtM9NR3WulyVP2y4HOU45DyMim1IeP/OOiyEWRr6qk5I5klpsBnbuHpwKmTx6WURnw==", - "dev": true, - "dependencies": { - "pug-error": "^2.0.0", - "token-stream": "1.0.0" - } - }, - "node_modules/pug-runtime": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/pug-runtime/-/pug-runtime-3.0.1.tgz", - "integrity": "sha512-L50zbvrQ35TkpHwv0G6aLSuueDRwc/97XdY8kL3tOT0FmhgG7UypU3VztfV/LATAvmUfYi4wNxSajhSAeNN+Kg==", - "dev": true - }, - "node_modules/pug-strip-comments": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-2.0.0.tgz", - "integrity": "sha512-zo8DsDpH7eTkPHCXFeAk1xZXJbyoTfdPlNR0bK7rpOMuhBYb0f5qUVCO1xlsitYd3w5FQTK7zpNVKb3rZoUrrQ==", - "dev": true, - "dependencies": { - "pug-error": "^2.0.0" - } - }, - "node_modules/pug-walk": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pug-walk/-/pug-walk-2.0.0.tgz", - "integrity": "sha512-yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true }, "node_modules/pump": { @@ -8935,21 +5024,6 @@ "node": ">=6" } }, -<<<<<<< HEAD -======= - "node_modules/pupa": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz", - "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==", - "dev": true, - "dependencies": { - "escape-goat": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -8970,7 +5044,6 @@ } ] }, -<<<<<<< HEAD "node_modules/quick-lru": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", @@ -8988,31 +5061,6 @@ "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", "dev": true -======= - "node_modules/rc": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", - "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", - "dev": true, - "dependencies": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "bin": { - "rc": "cli.js" - } - }, - "node_modules/rc/node_modules/strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "node_modules/read-config-file": { "version": "6.2.0", @@ -9030,7 +5078,6 @@ "node": ">=12.0.0" } }, -<<<<<<< HEAD "node_modules/readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", @@ -9043,80 +5090,6 @@ "node": ">=8.10.0" } }, -======= - "node_modules/read-config-file/node_modules/json5": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", - "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", - "dev": true, - "dependencies": { - "minimist": "^1.2.5" - }, - "bin": { - "json5": "lib/cli.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "node_modules/regexpp": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", - "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", - "dev": true, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - } - }, - "node_modules/registry-auth-token": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.1.tgz", - "integrity": "sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==", - "dev": true, - "dependencies": { - "rc": "^1.2.8" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/registry-url": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz", - "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==", - "dev": true, - "dependencies": { - "rc": "^1.2.8" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/request-light": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.5.4.tgz", - "integrity": "sha512-t3566CMweOFlUk7Y1DJMu5OrtpoZEb6aSTsLQVT3wtrIEJ5NhcY9G/Oqxvjllzl4a15zXfFlcr9q40LbLVQJqw==", - "dev": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -9126,7 +5099,6 @@ "node": ">=0.10.0" } }, -<<<<<<< HEAD "node_modules/resolve": { "version": "1.22.1", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", @@ -9139,39 +5111,17 @@ }, "bin": { "resolve": "bin/resolve" -======= - "node_modules/require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/resolve": { - "version": "1.20.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", - "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", - "dev": true, - "dependencies": { - "is-core-module": "^2.2.0", - "path-parse": "^1.0.6" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, -<<<<<<< HEAD "node_modules/resolve-alpn": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz", "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==", "dev": true }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/resolve-from": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", @@ -9182,7 +5132,6 @@ } }, "node_modules/responselike": { -<<<<<<< HEAD "version": "2.0.1", "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz", "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==", @@ -9192,36 +5141,6 @@ }, "funding": { "url": "https://github.com/sponsors/sindresorhus" -======= - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", - "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", - "dev": true, - "dependencies": { - "lowercase-keys": "^1.0.0" - } - }, - "node_modules/restore-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", - "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", - "dev": true, - "dependencies": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/retry": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", - "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=", - "dev": true, - "engines": { - "node": ">= 4" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "node_modules/reusify": { @@ -9268,26 +5187,16 @@ } }, "node_modules/rollup": { -<<<<<<< HEAD "version": "3.12.1", "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.12.1.tgz", "integrity": "sha512-t9elERrz2i4UU9z7AwISj3CQcXP39cWxgRWLdf4Tm6aKm1eYrqHIgjzXBgb67GNY1sZckTFFi0oMozh3/S++Ig==", -======= - "version": "2.57.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.57.0.tgz", - "integrity": "sha512-bKQIh1rWKofRee6mv8SrF2HdP6pea5QkwBZSMImJysFj39gQuiV8MEPBjXOCpzk3wSYp63M2v2wkWBmFC8O/rg==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "bin": { "rollup": "dist/bin/rollup" }, "engines": { -<<<<<<< HEAD "node": ">=14.18.0", "npm": ">=8.0.0" -======= - "node": ">=10.0.0" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "optionalDependencies": { "fsevents": "~2.3.2" @@ -9317,7 +5226,6 @@ } }, "node_modules/rxjs": { -<<<<<<< HEAD "version": "7.5.5", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz", "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==", @@ -9326,31 +5234,6 @@ "tslib": "^2.1.0" } }, -======= - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "dependencies": { - "tslib": "^1.9.0" - }, - "engines": { - "npm": ">=2.0.0" - } - }, - "node_modules/rxjs/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, - "node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", @@ -9372,15 +5255,9 @@ "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" }, "node_modules/semver": { -<<<<<<< HEAD "version": "7.3.7", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", -======= - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dependencies": { "lru-cache": "^6.0.0" }, @@ -9394,51 +5271,9 @@ "node_modules/semver-compare": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz", -<<<<<<< HEAD "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==", "dev": true, "optional": true -======= - "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=", - "dev": true - }, - "node_modules/semver-diff": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz", - "integrity": "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==", - "dev": true, - "dependencies": { - "semver": "^6.3.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/semver-diff/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/semver/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/semver/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "node_modules/serialize-error": { "version": "7.0.1", @@ -9469,18 +5304,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, -<<<<<<< HEAD -======= - "node_modules/set-immediate-shim": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", - "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -9502,7 +5325,6 @@ "node": ">=8" } }, -<<<<<<< HEAD "node_modules/siginfo": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz", @@ -9519,25 +5341,12 @@ "version": "2.8.1", "resolved": "https://registry.npmjs.org/simple-git-hooks/-/simple-git-hooks-2.8.1.tgz", "integrity": "sha512-DYpcVR1AGtSfFUNzlBdHrQGPsOhuuEJ/FkmPOOlFysP60AHd3nsEpkGq/QEOdtUyT1Qhk7w9oLmFoMG+75BDog==", -======= - "node_modules/signal-exit": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", - "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==", - "dev": true - }, - "node_modules/simple-git-hooks": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/simple-git-hooks/-/simple-git-hooks-2.6.1.tgz", - "integrity": "sha512-nvqaNfgvcjN3cGSYJSdjwB+tP8YKRCyvuUvQ24luIjIpGhUCPpZDTJ+p+hcJiwc0lZlTCl0NayfBVDoIMG7Jpg==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "hasInstallScript": true, "bin": { "simple-git-hooks": "cli.js" } }, -<<<<<<< HEAD "node_modules/simple-update-notifier": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz", @@ -9559,8 +5368,6 @@ "semver": "bin/semver.js" } }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", @@ -9571,7 +5378,6 @@ } }, "node_modules/slice-ansi": { -<<<<<<< HEAD "version": "3.0.0", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==", @@ -9590,24 +5396,6 @@ "version": "4.2.0", "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", -======= - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz", - "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==", - "dev": true, - "optional": true, - "dependencies": { - "is-fullwidth-code-point": "^2.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/smart-buffer": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.1.0.tgz", - "integrity": "sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "optional": true, "engines": { @@ -9619,39 +5407,24 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", -<<<<<<< HEAD "dev": true, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "engines": { "node": ">=0.10.0" } }, "node_modules/source-map-js": { -<<<<<<< HEAD "version": "1.0.2", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", "dev": true, -======= - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz", - "integrity": "sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "engines": { "node": ">=0.10.0" } }, "node_modules/source-map-support": { -<<<<<<< HEAD "version": "0.5.21", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", -======= - "version": "0.5.19", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", - "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "dependencies": { "buffer-from": "^1.0.0", @@ -9661,12 +5434,8 @@ "node_modules/sourcemap-codec": { "version": "1.4.8", "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz", -<<<<<<< HEAD "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==", "dev": true -======= - "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "node_modules/sprintf-js": { "version": "1.1.2", @@ -9675,34 +5444,11 @@ "dev": true, "optional": true }, -<<<<<<< HEAD "node_modules/stackback": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz", "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==", "dev": true -======= - "node_modules/stack-utils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.3.tgz", - "integrity": "sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==", - "dev": true, - "dependencies": { - "escape-string-regexp": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/stack-utils/node_modules/escape-string-regexp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", - "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", - "dev": true, - "engines": { - "node": ">=8" - } ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "node_modules/stat-mode": { "version": "1.0.0", @@ -9713,7 +5459,6 @@ "node": ">= 6" } }, -<<<<<<< HEAD "node_modules/std-env": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.3.1.tgz", @@ -9729,90 +5474,11 @@ "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" -======= - "node_modules/string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "dependencies": { - "safe-buffer": "~5.1.0" - } - }, - "node_modules/string-argv": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz", - "integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==", - "dev": true, - "engines": { - "node": ">=0.6.19" - } - }, - "node_modules/string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "optional": true, - "dependencies": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/string-width/node_modules/ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true, - "optional": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/string-width/node_modules/strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "optional": true, - "dependencies": { - "ansi-regex": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/stringify-object": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz", - "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==", - "dev": true, - "dependencies": { - "get-own-enumerable-property-symbols": "^3.0.0", - "is-obj": "^1.0.1", - "is-regexp": "^1.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, - "dependencies": { - "ansi-regex": "^5.0.0" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "engines": { "node": ">=8" } }, -<<<<<<< HEAD "node_modules/strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", @@ -9823,15 +5489,6 @@ }, "engines": { "node": ">=8" -======= - "node_modules/strip-final-newline": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", - "dev": true, - "engines": { - "node": ">=6" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "node_modules/strip-json-comments": { @@ -9846,7 +5503,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, -<<<<<<< HEAD "node_modules/strip-literal": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-1.0.0.tgz", @@ -9859,8 +5515,6 @@ "url": "https://github.com/sponsors/antfu" } }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/sumchecker": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz", @@ -9885,7 +5539,6 @@ "node": ">=8" } }, -<<<<<<< HEAD "node_modules/supports-preserve-symlinks-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", @@ -9925,91 +5578,6 @@ }, "engines": { "node": ">=10" -======= - "node_modules/table": { - "version": "6.7.1", - "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz", - "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==", - "dev": true, - "dependencies": { - "ajv": "^8.0.1", - "lodash.clonedeep": "^4.5.0", - "lodash.truncate": "^4.4.2", - "slice-ansi": "^4.0.0", - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/table/node_modules/ajv": { - "version": "8.6.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.2.tgz", - "integrity": "sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/table/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "node_modules/table/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/table/node_modules/json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true - }, - "node_modules/table/node_modules/slice-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", - "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/slice-ansi?sponsor=1" - } - }, - "node_modules/table/node_modules/string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", - "dev": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=8" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "node_modules/temp-file": { @@ -10023,15 +5591,9 @@ } }, "node_modules/temp-file/node_modules/fs-extra": { -<<<<<<< HEAD "version": "10.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", -======= - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", - "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "dependencies": { "graceful-fs": "^4.2.0", @@ -10069,7 +5631,6 @@ "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", "dev": true }, -<<<<<<< HEAD "node_modules/tinybench": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.3.1.tgz", @@ -10094,14 +5655,6 @@ "node": ">=14.0.0" } }, -======= - "node_modules/through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", - "dev": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/tmp": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", @@ -10115,41 +5668,14 @@ } }, "node_modules/tmp-promise": { -<<<<<<< HEAD "version": "3.0.3", "resolved": "https://registry.npmjs.org/tmp-promise/-/tmp-promise-3.0.3.tgz", "integrity": "sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ==", -======= - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/tmp-promise/-/tmp-promise-3.0.2.tgz", - "integrity": "sha512-OyCLAKU1HzBjL6Ev3gxUeraJNlbNingmi8IrHHEsYH8LTmEuhvYfqvhn2F/je+mjf4N58UmZ96OMEy1JanSCpA==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "dependencies": { "tmp": "^0.2.0" } }, -<<<<<<< HEAD -======= - "node_modules/to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/to-readable-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz", - "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==", - "dev": true, - "engines": { - "node": ">=6" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -10162,17 +5688,10 @@ "node": ">=8.0" } }, -<<<<<<< HEAD "node_modules/tr46": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=", -======= - "node_modules/token-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/token-stream/-/token-stream-1.0.0.tgz", - "integrity": "sha1-zCAOqyYT9BZtJ/+a/HylbUnfbrQ=", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true }, "node_modules/truncate-utf8-bytes": { @@ -10185,17 +5704,10 @@ } }, "node_modules/tslib": { -<<<<<<< HEAD "version": "2.3.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", "optional": true -======= - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz", - "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==", - "dev": true ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "node_modules/tsutils": { "version": "3.21.0", @@ -10218,19 +5730,6 @@ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", "dev": true }, -<<<<<<< HEAD -======= - "node_modules/tunnel": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz", - "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==", - "dev": true, - "optional": true, - "engines": { - "node": ">=0.6.11 <=0.7.0 || >=0.7.3" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", @@ -10243,7 +5742,6 @@ "node": ">= 0.8.0" } }, -<<<<<<< HEAD "node_modules/type-detect": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", @@ -10253,8 +5751,6 @@ "node": ">=4" } }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/type-fest": { "version": "0.20.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", @@ -10267,7 +5763,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, -<<<<<<< HEAD "node_modules/typed-emitter": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/typed-emitter/-/typed-emitter-2.1.0.tgz", @@ -10280,27 +5775,6 @@ "version": "4.9.5", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", -======= - "node_modules/typedarray": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", - "dev": true - }, - "node_modules/typedarray-to-buffer": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", - "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", - "dev": true, - "dependencies": { - "is-typedarray": "^1.0.0" - } - }, - "node_modules/typescript": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.2.tgz", - "integrity": "sha512-gzP+t5W4hdy4c+68bfcv0t400HVJMMd2+H9B7gae1nQlBzCqvrXX+6GL/b3GAgyTH966pzrZ70/fRjwAtZksSQ==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "bin": { "tsc": "bin/tsc", @@ -10310,25 +5784,11 @@ "node": ">=4.2.0" } }, -<<<<<<< HEAD "node_modules/ufo": { "version": "0.8.5", "resolved": "https://registry.npmjs.org/ufo/-/ufo-0.8.5.tgz", "integrity": "sha512-e4+UtA5IRO+ha6hYklwj6r7BjiGMxS0O+UaSg9HbaTefg4kMkzj4tXzEBajRR+wkxf+golgAWKzLbytCUDMJAA==", "dev": true -======= - "node_modules/unique-string": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz", - "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==", - "dev": true, - "dependencies": { - "crypto-random-string": "^2.0.0" - }, - "engines": { - "node": ">=8" - } ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "node_modules/universalify": { "version": "0.1.2", @@ -10339,7 +5799,6 @@ "node": ">= 4.0.0" } }, -<<<<<<< HEAD "node_modules/unplugin": { "version": "0.10.2", "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-0.10.2.tgz", @@ -10373,73 +5832,6 @@ }, "engines": { "node": ">=12" -======= - "node_modules/unzip-crx-3": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/unzip-crx-3/-/unzip-crx-3-0.2.0.tgz", - "integrity": "sha512-0+JiUq/z7faJ6oifVB5nSwt589v1KCduqIJupNVDoWSXZtWDmjDGO3RAEOvwJ07w90aoXoP4enKsR7ecMrJtWQ==", - "dev": true, - "dependencies": { - "jszip": "^3.1.0", - "mkdirp": "^0.5.1", - "yaku": "^0.16.6" - } - }, - "node_modules/upath": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/upath/-/upath-2.0.1.tgz", - "integrity": "sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==", - "dev": true, - "engines": { - "node": ">=4", - "yarn": "*" - } - }, - "node_modules/update-notifier": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-5.1.0.tgz", - "integrity": "sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw==", - "dev": true, - "dependencies": { - "boxen": "^5.0.0", - "chalk": "^4.1.0", - "configstore": "^5.0.1", - "has-yarn": "^2.1.0", - "import-lazy": "^2.1.0", - "is-ci": "^2.0.0", - "is-installed-globally": "^0.4.0", - "is-npm": "^5.0.0", - "is-yarn-global": "^0.3.0", - "latest-version": "^5.1.0", - "pupa": "^2.1.1", - "semver": "^7.3.4", - "semver-diff": "^3.1.1", - "xdg-basedir": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/yeoman/update-notifier?sponsor=1" - } - }, - "node_modules/update-notifier/node_modules/ci-info": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", - "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==", - "dev": true - }, - "node_modules/update-notifier/node_modules/is-ci": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", - "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==", - "dev": true, - "dependencies": { - "ci-info": "^2.0.0" - }, - "bin": { - "is-ci": "bin.js" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "node_modules/uri-js": { @@ -10451,21 +5843,6 @@ "punycode": "^2.1.0" } }, -<<<<<<< HEAD -======= - "node_modules/url-parse-lax": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", - "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", - "dev": true, - "dependencies": { - "prepend-http": "^2.0.0" - }, - "engines": { - "node": ">=4" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/utf8-byte-length": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz", @@ -10478,34 +5855,16 @@ "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "dev": true }, -<<<<<<< HEAD "node_modules/verror": { "version": "1.10.1", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.1.tgz", "integrity": "sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg==", "dev": true, -======= - "node_modules/v8-compile-cache": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", - "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", - "dev": true - }, - "node_modules/verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "dev": true, - "engines": [ - "node >=0.6.0" - ], ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "optional": true, "dependencies": { "assert-plus": "^1.0.0", "core-util-is": "1.0.2", "extsprintf": "^1.2.0" -<<<<<<< HEAD }, "engines": { "node": ">=0.6.0" @@ -10528,36 +5887,17 @@ "postcss": "^8.4.21", "resolve": "^1.22.1", "rollup": "^3.10.0" -======= - } - }, - "node_modules/vite": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/vite/-/vite-2.6.2.tgz", - "integrity": "sha512-HSIg9U15LOnbD3CUxX364Pdrm7DUjftuBljowGxvkFHgDZU/SKPqApg9t86MX/Qq1VCO7wS+mGJHlfuTF7c0Sg==", - "dev": true, - "dependencies": { - "esbuild": "^0.13.2", - "postcss": "^8.3.8", - "resolve": "^1.20.0", - "rollup": "^2.57.0" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "bin": { "vite": "bin/vite.js" }, "engines": { -<<<<<<< HEAD "node": "^14.18.0 || >=16.0.0" -======= - "node": ">=12.2.0" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "optionalDependencies": { "fsevents": "~2.3.2" }, "peerDependencies": { -<<<<<<< HEAD "@types/node": ">= 14", "less": "*", "sass": "*", @@ -10569,13 +5909,6 @@ "@types/node": { "optional": true }, -======= - "less": "*", - "sass": "*", - "stylus": "*" - }, - "peerDependenciesMeta": { ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "less": { "optional": true }, @@ -10584,7 +5917,6 @@ }, "stylus": { "optional": true -<<<<<<< HEAD }, "sugarss": { "optional": true @@ -10752,215 +6084,11 @@ }, "engines": { "node": "^14.17.0 || >=16.0.0" -======= - } - } - }, - "node_modules/void-elements": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz", - "integrity": "sha1-YU9/v42AHwu18GYfWy9XhXUOTwk=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/vscode-css-languageservice": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-5.1.4.tgz", - "integrity": "sha512-fIJZJMXbaBsK0ifBb2RmSiLtzwn6NrZnKn7O+0ziIjwAY+rPvSK9St2qqQXFU3reZVRAt/I4GBp40dC/THcUDA==", - "dev": true, - "dependencies": { - "vscode-languageserver-textdocument": "^1.0.1", - "vscode-languageserver-types": "^3.16.0", - "vscode-nls": "^5.0.0", - "vscode-uri": "^3.0.2" - } - }, - "node_modules/vscode-html-languageservice": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-4.0.7.tgz", - "integrity": "sha512-P5TQMYpgxAdLs+PwpC7Lm+0lXCyQAC6kZ41YuPYNHVooC4XO7Y2+ncHBcQJVK4C9LU2cTOAl0lzq4WAxuwRHYw==", - "dev": true, - "dependencies": { - "vscode-languageserver-textdocument": "^1.0.1", - "vscode-languageserver-types": "^3.16.0", - "vscode-nls": "^5.0.0", - "vscode-uri": "^3.0.2" - } - }, - "node_modules/vscode-json-languageservice": { - "version": "4.1.6", - "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.1.6.tgz", - "integrity": "sha512-DIKb3tcfRtb3tIE6g9SLOl5E9tNSt6kljH08Wa5RwFlVshtXGrDDzttchze4CYy9pJpE9mBtCbRHmLvY1Z1ZXA==", - "dev": true, - "dependencies": { - "jsonc-parser": "^3.0.0", - "vscode-languageserver-textdocument": "^1.0.1", - "vscode-languageserver-types": "^3.16.0", - "vscode-nls": "^5.0.0", - "vscode-uri": "^3.0.2" - }, - "engines": { - "npm": ">=7.0.0" - } - }, - "node_modules/vscode-json-languageservice/node_modules/jsonc-parser": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz", - "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==", - "dev": true - }, - "node_modules/vscode-jsonrpc": { - "version": "8.0.0-next.2", - "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.0-next.2.tgz", - "integrity": "sha512-gxUyTBAjmwGkiHW/UaRScre2s4i98P8M7gnc3VB4DrVQUm3vQ0idi2cN9nbkfcjATx+uEt8C22j+MLN/8UzsJA==", - "dev": true, - "engines": { - "node": ">=8.0.0 || >=10.0.0" - } - }, - "node_modules/vscode-languageserver": { - "version": "8.0.0-next.2", - "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.0.0-next.2.tgz", - "integrity": "sha512-7qCEXTeGZKkI8BGvlKh0JPXTY7BaWoiwQYKCcGaUgnMs34wt6F/yaKcxoC3XIouBBVyRxiI6Ml/JdztM3XYEaA==", - "dev": true, - "dependencies": { - "vscode-languageserver-protocol": "3.17.0-next.8" - }, - "bin": { - "installServerIntoExtension": "bin/installServerIntoExtension" - } - }, - "node_modules/vscode-languageserver-protocol": { - "version": "3.17.0-next.8", - "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.0-next.8.tgz", - "integrity": "sha512-P89vSuJ+FA5JzFmcOoZN13Ig1yd6LsiPOig0O5m5BSGuO/rplQegCd9J0wKpaTy7trf/SYHRoypnbUBdzy14sg==", - "dev": true, - "dependencies": { - "vscode-jsonrpc": "8.0.0-next.2", - "vscode-languageserver-types": "3.17.0-next.3" - } - }, - "node_modules/vscode-languageserver-protocol/node_modules/vscode-languageserver-types": { - "version": "3.17.0-next.3", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0-next.3.tgz", - "integrity": "sha512-VQcXnhKYxUW6OiRMhG++SzmZYMJwusXknJGd+FfdOnS1yHAo734OHyR0e2eEHDlv0/oWc8RZPgx/VKSKyondVg==", - "dev": true - }, - "node_modules/vscode-languageserver-textdocument": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.1.tgz", - "integrity": "sha512-UIcJDjX7IFkck7cSkNNyzIz5FyvpQfY7sdzVy+wkKN/BLaD4DQ0ppXQrKePomCxTS7RrolK1I0pey0bG9eh8dA==", - "dev": true - }, - "node_modules/vscode-languageserver-types": { - "version": "3.16.0", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz", - "integrity": "sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==", - "dev": true - }, - "node_modules/vscode-nls": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.0.0.tgz", - "integrity": "sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA==", - "dev": true - }, - "node_modules/vscode-pug-languageservice": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/vscode-pug-languageservice/-/vscode-pug-languageservice-0.27.1.tgz", - "integrity": "sha512-zUrcrcizqxxP7UIplzkdpdhU6bS458Vf9MS+fFaaR1WI/rVJOsXh5ETMrVeHTD0FHqAIstikuNoKEpuaaHkEXA==", - "dev": true, - "dependencies": { - "@volar/code-gen": "^0.27.1", - "@volar/shared": "^0.27.1", - "@volar/source-map": "^0.27.1", - "@volar/transforms": "^0.27.1", - "pug-lexer": "^5.0.1", - "pug-parser": "^6.0.0", - "vscode-languageserver": "^8.0.0-next.1" - } - }, - "node_modules/vscode-typescript-languageservice": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/vscode-typescript-languageservice/-/vscode-typescript-languageservice-0.27.1.tgz", - "integrity": "sha512-lIXLyYpcO4+9mzFrgTkRgrWYDLlV+kv+3/vmipEvF4QbiKHWcA0l5AOSJcPR/IUeZz6mu9eoawpOjPsbp9HKqw==", - "dev": true, - "dependencies": { - "@volar/shared": "^0.27.1", - "upath": "^2.0.1", - "vscode-languageserver": "^8.0.0-next.1", - "vscode-languageserver-textdocument": "^1.0.1" - } - }, - "node_modules/vscode-uri": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.2.tgz", - "integrity": "sha512-jkjy6pjU1fxUvI51P+gCsxg1u2n8LSt0W6KrCNQceaziKzff74GoWmjVG46KieVzybO1sttPQmYfrwSHey7GUA==", - "dev": true - }, - "node_modules/vscode-vue-languageservice": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/vscode-vue-languageservice/-/vscode-vue-languageservice-0.27.1.tgz", - "integrity": "sha512-32I6OCEvgxQpRW/Txod2+5xNKpae1BS+EFXjXpxK0TMFT3NYrJYXo0xVaddlV9+IZcVmH5KdoBia7J3CO4H74Q==", - "dev": true, - "dependencies": { - "@volar/code-gen": "^0.27.1", - "@volar/html2pug": "^0.27.1", - "@volar/shared": "^0.27.1", - "@volar/source-map": "^0.27.1", - "@volar/transforms": "^0.27.1", - "@vscode/emmet-helper": "^2.7.0", - "@vue/compiler-dom": "^3.2.2", - "@vue/compiler-sfc": "^3.2.2", - "@vue/reactivity": "^3.2.2", - "@vue/shared": "^3.2.2", - "request-light": "^0.5.4", - "upath": "^2.0.1", - "vscode-css-languageservice": "^5.1.4", - "vscode-html-languageservice": "^4.0.7", - "vscode-json-languageservice": "^4.1.5", - "vscode-languageserver": "^8.0.0-next.1", - "vscode-languageserver-textdocument": "^1.0.1", - "vscode-pug-languageservice": "^0.27.1", - "vscode-typescript-languageservice": "^0.27.1" - } - }, - "node_modules/vue": { - "version": "3.2.19", - "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.19.tgz", - "integrity": "sha512-6KAMdIfAtlK+qohTIUE4urwAv4A3YRuo8uAbByApUmiB0CziGAAPs6qVugN6oHPia8YIafHB/37K0O6KZ7sGmA==", - "dependencies": { - "@vue/compiler-dom": "3.2.19", - "@vue/compiler-sfc": "3.2.19", - "@vue/runtime-dom": "3.2.19", - "@vue/server-renderer": "3.2.19", - "@vue/shared": "3.2.19" - } - }, - "node_modules/vue-eslint-parser": { - "version": "7.10.0", - "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.10.0.tgz", - "integrity": "sha512-7tc/ewS9Vq9Bn741pvpg8op2fWJPH3k32aL+jcIcWGCTzh/zXSdh7pZ5FV3W2aJancP9+ftPAv292zY5T5IPCg==", - "dev": true, - "dependencies": { - "debug": "^4.1.1", - "eslint-scope": "^5.1.1", - "eslint-visitor-keys": "^1.1.0", - "espree": "^6.2.1", - "esquery": "^1.4.0", - "lodash": "^4.17.21", - "semver": "^6.3.0" - }, - "engines": { - "node": ">=8.10" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "funding": { "url": "https://github.com/sponsors/mysticatea" }, "peerDependencies": { -<<<<<<< HEAD "eslint": ">=6.0.0" } }, @@ -11004,61 +6132,6 @@ "dependencies": { "@volar/vue-language-core": "1.2.0", "@volar/vue-typescript": "1.2.0" -======= - "eslint": ">=5.0.0" - } - }, - "node_modules/vue-eslint-parser/node_modules/eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/vue-eslint-parser/node_modules/espree": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz", - "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==", - "dev": true, - "dependencies": { - "acorn": "^7.1.1", - "acorn-jsx": "^5.2.0", - "eslint-visitor-keys": "^1.1.0" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/vue-eslint-parser/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/vue-router": { - "version": "4.0.11", - "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.0.11.tgz", - "integrity": "sha512-sha6I8fx9HWtvTrFZfxZkiQQBpqSeT+UCwauYjkdOQYRvwsGwimlQQE2ayqUwuuXGzquFpCPoXzYKWlzL4OuXg==", - "dependencies": { - "@vue/devtools-api": "^6.0.0-beta.14" - }, - "peerDependencies": { - "vue": "^3.0.0" - } - }, - "node_modules/vue-tsc": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-0.3.0.tgz", - "integrity": "sha512-zaDRZBxwRIz1XjhNP92FqugG71st6BUMnA2EwPeXrAyzbEYVRz6TezNFceYl3QYqqN8CtaxbqUhaQEDj/ntoCA==", - "dev": true, - "dependencies": { - "vscode-vue-languageservice": "^0.27.0" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "bin": { "vue-tsc": "bin/vue-tsc.js" @@ -11067,7 +6140,6 @@ "typescript": "*" } }, -<<<<<<< HEAD "node_modules/webidl-conversions": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", @@ -11129,8 +6201,6 @@ "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=", "dev": true }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -11146,7 +6216,6 @@ "node": ">= 8" } }, -<<<<<<< HEAD "node_modules/why-is-node-running": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.2.2.tgz", @@ -11158,67 +6227,11 @@ }, "bin": { "why-is-node-running": "cli.js" -======= - "node_modules/widest-line": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz", - "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==", - "dev": true, - "dependencies": { - "string-width": "^4.0.0" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "engines": { "node": ">=8" } }, -<<<<<<< HEAD -======= - "node_modules/widest-line/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "node_modules/widest-line/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/widest-line/node_modules/string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", - "dev": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/with": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/with/-/with-7.0.2.tgz", - "integrity": "sha512-RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w==", - "dev": true, - "dependencies": { - "@babel/parser": "^7.9.6", - "@babel/types": "^7.9.6", - "assert-never": "^1.2.1", - "babel-walk": "3.0.0-canary-5" - }, - "engines": { - "node": ">= 10.0.0" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/word-wrap": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", @@ -11245,45 +6258,12 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, -<<<<<<< HEAD -======= - "node_modules/wrap-ansi/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/wrap-ansi/node_modules/string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", - "dev": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "dev": true }, -<<<<<<< HEAD "node_modules/xml-name-validator": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz", @@ -11291,48 +6271,6 @@ "dev": true, "engines": { "node": ">=12" -======= - "node_modules/write-file-atomic": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", - "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", - "dev": true, - "dependencies": { - "imurmurhash": "^0.1.4", - "is-typedarray": "^1.0.0", - "signal-exit": "^3.0.2", - "typedarray-to-buffer": "^3.1.5" - } - }, - "node_modules/ws": { - "version": "7.5.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz", - "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==", - "dev": true, - "engines": { - "node": ">=8.3.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": "^5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } - }, - "node_modules/xdg-basedir": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", - "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==", - "dev": true, - "engines": { - "node": ">=8" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "node_modules/xmlbuilder": { @@ -11345,19 +6283,6 @@ "node": ">=8.0" } }, -<<<<<<< HEAD -======= - "node_modules/xmldom": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.5.0.tgz", - "integrity": "sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA==", - "dev": true, - "optional": true, - "engines": { - "node": ">=10.0.0" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node_modules/y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", @@ -11367,7 +6292,6 @@ "node": ">=10" } }, -<<<<<<< HEAD "node_modules/yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", @@ -11386,103 +6310,30 @@ "string-width": "^4.2.3", "y18n": "^5.0.5", "yargs-parser": "^21.0.0" -======= - "node_modules/yaku": { - "version": "0.16.7", - "resolved": "https://registry.npmjs.org/yaku/-/yaku-0.16.7.tgz", - "integrity": "sha1-HRlceKqbW/hHnIlblQT9TwhHmE4=", - "dev": true - }, - "node_modules/yaml": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", - "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", - "dev": true, - "engines": { - "node": ">= 6" - } - }, - "node_modules/yargs": { - "version": "17.0.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.0.1.tgz", - "integrity": "sha512-xBBulfCc8Y6gLFcrPvtqKz9hz8SO0l1Ni8GgDekvBX2ro0HRQImDGnikfc33cgzcYUSncapnNcZDjVFIH3f6KQ==", - "dev": true, - "dependencies": { - "cliui": "^7.0.2", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.0", - "y18n": "^5.0.5", - "yargs-parser": "^20.2.2" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "engines": { "node": ">=12" } }, "node_modules/yargs-parser": { -<<<<<<< HEAD "version": "21.0.0", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.0.tgz", "integrity": "sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA==", "dev": true, "engines": { "node": ">=12" -======= - "version": "20.2.9", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", - "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/yargs/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "node_modules/yargs/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", - "dev": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=8" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "node_modules/yauzl": { "version": "2.10.0", "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", -<<<<<<< HEAD "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", -======= - "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "dependencies": { "buffer-crc32": "~0.2.3", "fd-slicer": "~1.1.0" } }, -<<<<<<< HEAD "node_modules/yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", @@ -11493,127 +6344,16 @@ }, "funding": { "url": "https://github.com/sponsors/sindresorhus" -======= - "node_modules/yazl": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.5.1.tgz", - "integrity": "sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==", - "dev": true, - "dependencies": { - "buffer-crc32": "~0.2.3" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } } }, "dependencies": { -<<<<<<< HEAD "@babel/parser": { "version": "7.18.4", "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.4.tgz", "integrity": "sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow==", "dev": true }, -======= - "@babel/code-frame": { - "version": "7.12.11", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz", - "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==", - "dev": true, - "requires": { - "@babel/highlight": "^7.10.4" - } - }, - "@babel/helper-validator-identifier": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz", - "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==", - "dev": true - }, - "@babel/highlight": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz", - "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.14.5", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "@babel/parser": { - "version": "7.15.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.3.tgz", - "integrity": "sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA==" - }, - "@babel/types": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz", - "integrity": "sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.14.9", - "to-fast-properties": "^2.0.0" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "@develar/schema-utils": { "version": "2.6.5", "resolved": "https://registry.npmjs.org/@develar/schema-utils/-/schema-utils-2.6.5.tgz", @@ -11625,28 +6365,16 @@ } }, "@electron/get": { -<<<<<<< HEAD "version": "2.0.2", "resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.2.tgz", "integrity": "sha512-eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g==", -======= - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.13.0.tgz", - "integrity": "sha512-+SjZhRuRo+STTO1Fdhzqnv9D2ZhjxXP6egsJ9kiO8dtP68cDx7dFCwWi64dlMQV7sWcfW1OYCW4wviEBzmRsfQ==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "requires": { "debug": "^4.1.1", "env-paths": "^2.2.0", "fs-extra": "^8.1.0", -<<<<<<< HEAD "global-agent": "^3.0.0", "got": "^11.8.5", -======= - "global-agent": "^2.0.2", - "global-tunnel-ng": "^2.7.1", - "got": "^9.6.0", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "progress": "^2.0.3", "semver": "^6.2.0", "sumchecker": "^3.0.1" @@ -11661,7 +6389,6 @@ } }, "@electron/universal": { -<<<<<<< HEAD "version": "1.2.1", "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-1.2.1.tgz", "integrity": "sha512-7323HyMh7KBAl/nPDppdLsC87G6RwRU02dy5FPeGB1eS7rUePh55+WNWiDPLhFQqqVPHzh77M69uhmoT8XnwMQ==", @@ -11674,18 +6401,6 @@ "fs-extra": "^9.0.1", "minimatch": "^3.0.4", "plist": "^3.0.4" -======= - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-1.0.5.tgz", - "integrity": "sha512-zX9O6+jr2NMyAdSkwEUlyltiI4/EBLu2Ls/VD3pUQdi3cAYeYfdQnT2AJJ38HE4QxLccbU13LSpccw1IWlkyag==", - "dev": true, - "requires": { - "@malept/cross-spawn-promise": "^1.1.0", - "asar": "^3.0.3", - "debug": "^4.3.1", - "dir-compare": "^2.4.0", - "fs-extra": "^9.0.1" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "dependencies": { "fs-extra": { @@ -11718,7 +6433,6 @@ } } }, -<<<<<<< HEAD "@esbuild/android-arm": { "version": "0.16.17", "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.16.17.tgz", @@ -11932,91 +6646,6 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", -======= - "@emmetio/abbreviation": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/@emmetio/abbreviation/-/abbreviation-2.2.2.tgz", - "integrity": "sha512-TtE/dBnkTCct8+LntkqVrwqQao6EnPAs1YN3cUgxOxTaBlesBCY37ROUAVZrRlG64GNnVShdl/b70RfAI3w5lw==", - "dev": true, - "requires": { - "@emmetio/scanner": "^1.0.0" - } - }, - "@emmetio/css-abbreviation": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@emmetio/css-abbreviation/-/css-abbreviation-2.1.4.tgz", - "integrity": "sha512-qk9L60Y+uRtM5CPbB0y+QNl/1XKE09mSO+AhhSauIfr2YOx/ta3NJw2d8RtCFxgzHeRqFRr8jgyzThbu+MZ4Uw==", - "dev": true, - "requires": { - "@emmetio/scanner": "^1.0.0" - } - }, - "@emmetio/scanner": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@emmetio/scanner/-/scanner-1.0.0.tgz", - "integrity": "sha512-8HqW8EVqjnCmWXVpqAOZf+EGESdkR27odcMMMGefgKXtar00SoYNSryGv//TELI4T3QFsECo78p+0lmalk/CFA==", - "dev": true - }, - "@eslint/eslintrc": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz", - "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==", - "dev": true, - "requires": { - "ajv": "^6.12.4", - "debug": "^4.1.1", - "espree": "^7.3.0", - "globals": "^13.9.0", - "ignore": "^4.0.6", - "import-fresh": "^3.2.1", - "js-yaml": "^3.13.1", - "minimatch": "^3.0.4", - "strip-json-comments": "^3.1.1" - }, - "dependencies": { - "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "requires": { - "sprintf-js": "~1.0.2" - } - }, - "js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dev": true, - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - } - }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true - } - } - }, - "@humanwhocodes/config-array": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz", - "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==", - "dev": true, - "requires": { - "@humanwhocodes/object-schema": "^1.2.0", - "debug": "^4.1.1", - "minimatch": "^3.0.4" - } - }, - "@humanwhocodes/object-schema": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz", - "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true }, "@malept/cross-spawn-promise": { @@ -12097,7 +6726,6 @@ } }, "@sindresorhus/is": { -<<<<<<< HEAD "version": "4.6.0", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz", "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==", @@ -12143,20 +6771,6 @@ "dev": true, "requires": { "@types/chai": "*" -======= - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", - "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==", - "dev": true - }, - "@szmarczak/http-timer": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz", - "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==", - "dev": true, - "requires": { - "defer-to-connect": "^1.0.1" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "@types/debug": { @@ -12168,38 +6782,19 @@ "@types/ms": "*" } }, -<<<<<<< HEAD "@types/fs-extra": { "version": "9.0.13", "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz", "integrity": "sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==", -======= - "@types/electron-devtools-installer": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@types/electron-devtools-installer/-/electron-devtools-installer-2.2.0.tgz", - "integrity": "sha512-HJNxpaOXuykCK4rQ6FOMxAA0NLFYsf7FiPFGmab0iQmtVBHSAfxzy3MRFpLTTDDWbV0yD2YsHOQvdu8yCqtCfw==", - "dev": true - }, - "@types/fs-extra": { - "version": "9.0.12", - "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.12.tgz", - "integrity": "sha512-I+bsBr67CurCGnSenZZ7v94gd3tc3+Aj2taxMT4yu4ABLuOgOjeFxX3dokG24ztSRg5tnT00sL8BszO7gSMoIw==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "requires": { "@types/node": "*" } }, "@types/glob": { -<<<<<<< HEAD "version": "7.2.0", "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz", "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==", -======= - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.4.tgz", - "integrity": "sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "optional": true, "requires": { @@ -12207,7 +6802,6 @@ "@types/node": "*" } }, -<<<<<<< HEAD "@types/http-cache-semantics": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz", @@ -12229,14 +6823,6 @@ "@types/node": "*" } }, -======= - "@types/json-schema": { - "version": "7.0.9", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", - "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==", - "dev": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "@types/minimatch": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz", @@ -12251,21 +6837,9 @@ "dev": true }, "@types/node": { -<<<<<<< HEAD "version": "18.15.3", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.3.tgz", "integrity": "sha512-p6ua9zBxz5otCmbpb5D3U4B5Nanw6Pk3PPyX05xnxbB/fRv71N7CPmORg7uAD5P70T0xmx1pzAx/FUfa5X+3cw==", -======= - "version": "14.17.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.7.tgz", - "integrity": "sha512-SYTdMaW47se8499q8m0fYKZZRlmq0RaRv6oYmlVm6DUm31l0fhOl1D03X8hGxohCKTI2Bg6w7W0TiYB51aJzag==", - "dev": true - }, - "@types/parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true }, "@types/plist": { @@ -12279,7 +6853,6 @@ "xmlbuilder": ">=11.0.1" } }, -<<<<<<< HEAD "@types/responselike": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz", @@ -12293,12 +6866,6 @@ "version": "7.3.12", "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.12.tgz", "integrity": "sha512-WwA1MW0++RfXmCr12xeYOOC5baSC9mSb0ZqCquFzKhcoF4TvHu5MKOuXsncgZcpVFhB1pXd5hZmM0ryAoCp12A==" -======= - "@types/semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-D/2EJvAlCEtYFEYmmlGwbGXuK886HzyCc3nZX/tkFTQdEU8jZDAgiv08P162yB17y4ZXZoq7yFAnW4GDBb9Now==" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "@types/verror": { "version": "1.10.5", @@ -12308,15 +6875,9 @@ "optional": true }, "@types/yargs": { -<<<<<<< HEAD "version": "17.0.8", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.8.tgz", "integrity": "sha512-wDeUwiUmem9FzsyysEwRukaEdDNcwbROvQ9QGRKaLI6t+IltNzbn4/i4asmB10auvZGQCzSQ6t0GSczEThlUXw==", -======= - "version": "16.0.4", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz", - "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "requires": { "@types/yargs-parser": "*" @@ -12329,15 +6890,9 @@ "dev": true }, "@types/yauzl": { -<<<<<<< HEAD "version": "2.10.0", "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz", "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==", -======= - "version": "2.9.2", - "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.2.tgz", - "integrity": "sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "optional": true, "requires": { @@ -12345,7 +6900,6 @@ } }, "@typescript-eslint/eslint-plugin": { -<<<<<<< HEAD "version": "5.55.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.55.0.tgz", "integrity": "sha512-IZGc50rtbjk+xp5YQoJvmMPmJEYoC53SiKPXyqWfv15XoD2Y5Kju6zN0DwlmaGJp1Iw33JsWJcQ7nw0lGCGjVg==", @@ -12360,25 +6914,10 @@ "ignore": "^5.2.0", "natural-compare-lite": "^1.4.0", "semver": "^7.3.7", -======= - "version": "4.32.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.32.0.tgz", - "integrity": "sha512-+OWTuWRSbWI1KDK8iEyG/6uK2rTm3kpS38wuVifGUTDB6kjEuNrzBI1MUtxnkneuWG/23QehABe2zHHrj+4yuA==", - "dev": true, - "requires": { - "@typescript-eslint/experimental-utils": "4.32.0", - "@typescript-eslint/scope-manager": "4.32.0", - "debug": "^4.3.1", - "functional-red-black-tree": "^1.0.1", - "ignore": "^5.1.8", - "regexpp": "^3.1.0", - "semver": "^7.3.5", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "tsutils": "^3.21.0" }, "dependencies": { "@typescript-eslint/scope-manager": { -<<<<<<< HEAD "version": "5.55.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.55.0.tgz", "integrity": "sha512-OK+cIO1ZGhJYNCL//a3ROpsd83psf4dUJ4j7pdNVzd5DmIk+ffkuUIX2vcZQbEW/IR41DYsfJTB19tpCboxQuw==", @@ -12402,100 +6941,11 @@ "requires": { "@typescript-eslint/types": "5.55.0", "eslint-visitor-keys": "^3.3.0" -======= - "version": "4.32.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.32.0.tgz", - "integrity": "sha512-DK+fMSHdM216C0OM/KR1lHXjP1CNtVIhJ54kQxfOE6x8UGFAjha8cXgDMBEIYS2XCYjjCtvTkjQYwL3uvGOo0w==", - "dev": true, - "requires": { - "@typescript-eslint/types": "4.32.0", - "@typescript-eslint/visitor-keys": "4.32.0" - } - }, - "@typescript-eslint/types": { - "version": "4.32.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.32.0.tgz", - "integrity": "sha512-LE7Z7BAv0E2UvqzogssGf1x7GPpUalgG07nGCBYb1oK4mFsOiFC/VrSMKbZQzFJdN2JL5XYmsx7C7FX9p9ns0w==", - "dev": true - }, - "@typescript-eslint/visitor-keys": { - "version": "4.32.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.32.0.tgz", - "integrity": "sha512-e7NE0qz8W+atzv3Cy9qaQ7BTLwWsm084Z0c4nIO2l3Bp6u9WIgdqCgyPyV5oSPDMIW3b20H59OOCmVk3jw3Ptw==", - "dev": true, - "requires": { - "@typescript-eslint/types": "4.32.0", - "eslint-visitor-keys": "^2.0.0" - } - }, - "ignore": { - "version": "5.1.8", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", - "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", - "dev": true - } - } - }, - "@typescript-eslint/experimental-utils": { - "version": "4.32.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.32.0.tgz", - "integrity": "sha512-WLoXcc+cQufxRYjTWr4kFt0DyEv6hDgSaFqYhIzQZ05cF+kXfqXdUh+//kgquPJVUBbL3oQGKQxwPbLxHRqm6A==", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.7", - "@typescript-eslint/scope-manager": "4.32.0", - "@typescript-eslint/types": "4.32.0", - "@typescript-eslint/typescript-estree": "4.32.0", - "eslint-scope": "^5.1.1", - "eslint-utils": "^3.0.0" - }, - "dependencies": { - "@typescript-eslint/scope-manager": { - "version": "4.32.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.32.0.tgz", - "integrity": "sha512-DK+fMSHdM216C0OM/KR1lHXjP1CNtVIhJ54kQxfOE6x8UGFAjha8cXgDMBEIYS2XCYjjCtvTkjQYwL3uvGOo0w==", - "dev": true, - "requires": { - "@typescript-eslint/types": "4.32.0", - "@typescript-eslint/visitor-keys": "4.32.0" - } - }, - "@typescript-eslint/types": { - "version": "4.32.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.32.0.tgz", - "integrity": "sha512-LE7Z7BAv0E2UvqzogssGf1x7GPpUalgG07nGCBYb1oK4mFsOiFC/VrSMKbZQzFJdN2JL5XYmsx7C7FX9p9ns0w==", - "dev": true - }, - "@typescript-eslint/typescript-estree": { - "version": "4.32.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.32.0.tgz", - "integrity": "sha512-tRYCgJ3g1UjMw1cGG8Yn1KzOzNlQ6u1h9AmEtPhb5V5a1TmiHWcRyF/Ic+91M4f43QeChyYlVTcf3DvDTZR9vw==", - "dev": true, - "requires": { - "@typescript-eslint/types": "4.32.0", - "@typescript-eslint/visitor-keys": "4.32.0", - "debug": "^4.3.1", - "globby": "^11.0.3", - "is-glob": "^4.0.1", - "semver": "^7.3.5", - "tsutils": "^3.21.0" - } - }, - "@typescript-eslint/visitor-keys": { - "version": "4.32.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.32.0.tgz", - "integrity": "sha512-e7NE0qz8W+atzv3Cy9qaQ7BTLwWsm084Z0c4nIO2l3Bp6u9WIgdqCgyPyV5oSPDMIW3b20H59OOCmVk3jw3Ptw==", - "dev": true, - "requires": { - "@typescript-eslint/types": "4.32.0", - "eslint-visitor-keys": "^2.0.0" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } } } }, "@typescript-eslint/parser": { -<<<<<<< HEAD "version": "5.8.1", "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.8.1.tgz", "integrity": "sha512-K1giKHAjHuyB421SoXMXFHHVI4NdNY603uKw92++D3qyxSeYvC10CBJ/GE5Thpo4WTUvu1mmJI2/FFkz38F2Gw==", @@ -12568,40 +7018,10 @@ "version": "5.8.1", "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.8.1.tgz", "integrity": "sha512-L/FlWCCgnjKOLefdok90/pqInkomLnAcF9UAzNr+DSqMC3IffzumHTQTrINXhP1gVp9zlHiYYjvozVZDPleLcA==", -======= - "version": "4.28.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.28.5.tgz", - "integrity": "sha512-NPCOGhTnkXGMqTznqgVbA5LqVsnw+i3+XA1UKLnAb+MG1Y1rP4ZSK9GX0kJBmAZTMIktf+dTwXToT6kFwyimbw==", - "dev": true, - "peer": true, - "requires": { - "@typescript-eslint/scope-manager": "4.28.5", - "@typescript-eslint/types": "4.28.5", - "@typescript-eslint/typescript-estree": "4.28.5", - "debug": "^4.3.1" - } - }, - "@typescript-eslint/scope-manager": { - "version": "4.28.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.28.5.tgz", - "integrity": "sha512-PHLq6n9nTMrLYcVcIZ7v0VY1X7dK309NM8ya9oL/yG8syFINIMHxyr2GzGoBYUdv3NUfCOqtuqps0ZmcgnZTfQ==", - "dev": true, - "peer": true, - "requires": { - "@typescript-eslint/types": "4.28.5", - "@typescript-eslint/visitor-keys": "4.28.5" - } - }, - "@typescript-eslint/types": { - "version": "4.28.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.5.tgz", - "integrity": "sha512-MruOu4ZaDOLOhw4f/6iudyks/obuvvZUAHBDSW80Trnc5+ovmViLT2ZMDXhUV66ozcl6z0LJfKs1Usldgi/WCA==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "peer": true }, "@typescript-eslint/typescript-estree": { -<<<<<<< HEAD "version": "5.8.1", "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.8.1.tgz", "integrity": "sha512-26lQ8l8tTbG7ri7xEcCFT9ijU5Fk+sx/KRRyyzCv7MQ+rZZlqiDPtMKWLC8P7o+dtCnby4c+OlxuX1tp8WfafQ==", @@ -12613,24 +7033,10 @@ "debug": "^4.3.2", "globby": "^11.0.4", "is-glob": "^4.0.3", -======= - "version": "4.28.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.5.tgz", - "integrity": "sha512-FzJUKsBX8poCCdve7iV7ShirP8V+ys2t1fvamVeD1rWpiAnIm550a+BX/fmTHrjEpQJ7ZAn+Z7ZZwJjytk9rZw==", - "dev": true, - "peer": true, - "requires": { - "@typescript-eslint/types": "4.28.5", - "@typescript-eslint/visitor-keys": "4.28.5", - "debug": "^4.3.1", - "globby": "^11.0.3", - "is-glob": "^4.0.1", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "semver": "^7.3.5", "tsutils": "^3.21.0" } }, -<<<<<<< HEAD "@typescript-eslint/utils": { "version": "5.55.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.55.0.tgz", @@ -12922,112 +7328,11 @@ "requires": { "@babel/parser": "^7.16.4", "@vue/shared": "3.2.47", -======= - "@typescript-eslint/visitor-keys": { - "version": "4.28.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.5.tgz", - "integrity": "sha512-dva/7Rr+EkxNWdJWau26xU/0slnFlkh88v3TsyTgRS/IIYFi5iIfpCFM4ikw0vQTFUR9FYSSyqgK4w64gsgxhg==", - "dev": true, - "peer": true, - "requires": { - "@typescript-eslint/types": "4.28.5", - "eslint-visitor-keys": "^2.0.0" - } - }, - "@vitejs/plugin-vue": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-1.9.2.tgz", - "integrity": "sha512-QnUQJvGmY+YT9xTidLcjr6NAjKWNdSuul1M+BZ6uwTQaO5vpAY9USBncXESATk742dYMZGJenegJgeJhG/HMNQ==", - "dev": true, - "requires": {} - }, - "@volar/code-gen": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/@volar/code-gen/-/code-gen-0.27.1.tgz", - "integrity": "sha512-tN7Rxa7mAfd8GQceKxHjjDjfRo3S4OBIEtv4GpmO75IrodjMVkZEZR/v6EY3yn52ffTh3SuAvjiCSRRcHhvDqg==", - "dev": true, - "requires": { - "@volar/shared": "^0.27.1", - "@volar/source-map": "^0.27.1" - } - }, - "@volar/html2pug": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/@volar/html2pug/-/html2pug-0.27.1.tgz", - "integrity": "sha512-4192qerpj+fuzmaduT8l9qoY7620oh4LNEK2GN8V9l7+LNAuPRr9kN0BNrow2j1WO9lklhtNqDlCSOmPCmcoPA==", - "dev": true, - "requires": { - "domelementtype": "^2.2.0", - "domhandler": "^4.2.0", - "htmlparser2": "^6.1.0", - "pug": "^3.0.2" - } - }, - "@volar/shared": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/@volar/shared/-/shared-0.27.1.tgz", - "integrity": "sha512-PvoD6cp3ICaZXsLcuEB14FkrQuJnQVuhtAiss6BLGFfq4vOhJPMZihfoSZtQYkspkZ1/r8IgidMZqTtuAxYBzA==", - "dev": true, - "requires": { - "upath": "^2.0.1", - "vscode-jsonrpc": "^8.0.0-next.1", - "vscode-uri": "^3.0.2" - } - }, - "@volar/source-map": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-0.27.1.tgz", - "integrity": "sha512-Y4cJjAIfMhoHg0jsO8uUZ4YvJAxDYSwWRD9corm+2W/4Km5AKSF7hhVwFSGy2WvODTRLZY2jjlL3eu88m1eg/g==", - "dev": true, - "requires": { - "@volar/shared": "^0.27.1" - } - }, - "@volar/transforms": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/@volar/transforms/-/transforms-0.27.1.tgz", - "integrity": "sha512-jEWYXFQL+KUVS85qrYYsaQYtwdLZLs3koNFEMEQMnDMad3jEBDqd3IKgDGePI6jQ5Vq3jFneNwX1GGCFJeKvJA==", - "dev": true, - "requires": { - "@volar/shared": "^0.27.1" - } - }, - "@vscode/emmet-helper": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/@vscode/emmet-helper/-/emmet-helper-2.7.0.tgz", - "integrity": "sha512-LL7MoKNLUQASacQROO7hBdx5IAxsEnA0UdJFd9xXyf3sBQgz8NE3QEfo3IezE7uin8W2fkG2+EXMst3oqK6+KQ==", - "dev": true, - "requires": { - "emmet": "^2.3.0", - "jsonc-parser": "^2.3.0", - "vscode-languageserver-textdocument": "^1.0.1", - "vscode-languageserver-types": "^3.15.1", - "vscode-nls": "^5.0.0", - "vscode-uri": "^2.1.2" - }, - "dependencies": { - "vscode-uri": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.2.tgz", - "integrity": "sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A==", - "dev": true - } - } - }, - "@vue/compiler-core": { - "version": "3.2.19", - "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.19.tgz", - "integrity": "sha512-8dOPX0YOtaXol0Zf2cfLQ4NU/yHYl2H7DCKsLEZ7gdvPK6ZSEwGLJ7IdghhY2YEshEpC5RB9QKdC5I07z8Dtjg==", - "requires": { - "@babel/parser": "^7.15.0", - "@vue/shared": "3.2.19", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "estree-walker": "^2.0.2", "source-map": "^0.6.1" } }, "@vue/compiler-dom": { -<<<<<<< HEAD "version": "3.2.47", "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.47.tgz", "integrity": "sha512-dBBnEHEPoftUiS03a4ggEig74J2YBZ2UIeyfpcRM2tavgMWo4bsEfgCGsu+uJIL/vax9S+JztH8NmQerUo7shQ==", @@ -13049,27 +7354,6 @@ "@vue/compiler-ssr": "3.2.47", "@vue/reactivity-transform": "3.2.47", "@vue/shared": "3.2.47", -======= - "version": "3.2.19", - "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.19.tgz", - "integrity": "sha512-WzQoE8rfkFjPtIioc7SSgTsnz9g2oG61DU8KHnzPrRS7fW/lji6H2uCYJfp4Z6kZE8GjnHc1Ljwl3/gxDes0cw==", - "requires": { - "@vue/compiler-core": "3.2.19", - "@vue/shared": "3.2.19" - } - }, - "@vue/compiler-sfc": { - "version": "3.2.19", - "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.19.tgz", - "integrity": "sha512-pLlbgkO1UHTO02MSpa/sFOXUwIDxSMiKZ1ozE5n71CY4DM+YmI+G3gT/ZHZ46WBId7f3VTF/D8pGwMygcQbrQA==", - "requires": { - "@babel/parser": "^7.15.0", - "@vue/compiler-core": "3.2.19", - "@vue/compiler-dom": "3.2.19", - "@vue/compiler-ssr": "3.2.19", - "@vue/ref-transform": "3.2.19", - "@vue/shared": "3.2.19", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "estree-walker": "^2.0.2", "magic-string": "^0.25.7", "postcss": "^8.1.10", @@ -13077,7 +7361,6 @@ } }, "@vue/compiler-ssr": { -<<<<<<< HEAD "version": "3.2.47", "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.47.tgz", "integrity": "sha512-wVXC+gszhulcMD8wpxMsqSOpvDZ6xKXSVWkf50Guf/S+28hTAXPDYRTbLQ3EDkOP5Xz/+SY37YiwDquKbJOgZw==", @@ -13105,43 +7388,11 @@ "@babel/parser": "^7.16.4", "@vue/compiler-core": "3.2.47", "@vue/shared": "3.2.47", -======= - "version": "3.2.19", - "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.19.tgz", - "integrity": "sha512-oLon0Cn3O7WEYzzmzZavGoqXH+199LT+smdjBT3Uf3UX4HwDNuBFCmvL0TsqV9SQnIgKvBRbQ7lhbpnd4lqM3w==", - "requires": { - "@vue/compiler-dom": "3.2.19", - "@vue/shared": "3.2.19" - } - }, - "@vue/devtools-api": { - "version": "6.0.0-beta.15", - "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.0.0-beta.15.tgz", - "integrity": "sha512-quBx4Jjpexo6KDiNUGFr/zF/2A4srKM9S9v2uHgMXSU//hjgq1eGzqkIFql8T9gfX5ZaVOUzYBP3jIdIR3PKIA==" - }, - "@vue/reactivity": { - "version": "3.2.19", - "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.19.tgz", - "integrity": "sha512-FtachoYs2SnyrWup5UikP54xDX6ZJ1s5VgHcJp4rkGoutU3Ry61jhs+nCX7J64zjX992Mh9gGUC0LqTs8q9vCA==", - "requires": { - "@vue/shared": "3.2.19" - } - }, - "@vue/ref-transform": { - "version": "3.2.19", - "resolved": "https://registry.npmjs.org/@vue/ref-transform/-/ref-transform-3.2.19.tgz", - "integrity": "sha512-03wwUnoIAeKti5IGGx6Vk/HEBJ+zUcm5wrUM3+PQsGf7IYnXTbeIfHHpx4HeSeWhnLAjqZjADQwW8uA4rBmVbg==", - "requires": { - "@babel/parser": "^7.15.0", - "@vue/compiler-core": "3.2.19", - "@vue/shared": "3.2.19", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "estree-walker": "^2.0.2", "magic-string": "^0.25.7" } }, "@vue/runtime-core": { -<<<<<<< HEAD "version": "3.2.47", "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.47.tgz", "integrity": "sha512-RZxbLQIRB/K0ev0K9FXhNbBzT32H9iRtYbaXb0ZIz2usLms/D55dJR2t6cIEUn6vyhS3ALNvNthI+Q95C+NOpA==", @@ -13159,28 +7410,10 @@ "requires": { "@vue/runtime-core": "3.2.47", "@vue/shared": "3.2.47", -======= - "version": "3.2.19", - "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.19.tgz", - "integrity": "sha512-qArZSWKxWsgKfxk9BelZ32nY0MZ31CAW2kUUyVJyxh4cTfHaXGbjiQB5JgsvKc49ROMNffv9t3/qjasQqAH+RQ==", - "requires": { - "@vue/reactivity": "3.2.19", - "@vue/shared": "3.2.19" - } - }, - "@vue/runtime-dom": { - "version": "3.2.19", - "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.19.tgz", - "integrity": "sha512-hIRboxXwafeHhbZEkZYNV0MiJXPNf4fP0X6hM2TJb0vssz8BKhD9cF92BkRgZztTQevecbhk0gu4uAPJ3dxL9A==", - "requires": { - "@vue/runtime-core": "3.2.19", - "@vue/shared": "3.2.19", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "csstype": "^2.6.8" } }, "@vue/server-renderer": { -<<<<<<< HEAD "version": "3.2.47", "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.47.tgz", "integrity": "sha512-dN9gc1i8EvmP9RCzvneONXsKfBRgqFeFZLurmHOveL7oH6HiFXJw5OGu294n1nHc/HMgTy6LulU/tv5/A7f/LA==", @@ -13206,20 +7439,6 @@ "@vue/server-renderer": "^3.0.1", "js-beautify": "1.14.6" } -======= - "version": "3.2.19", - "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.19.tgz", - "integrity": "sha512-A9FNT7fgQJXItwdzWREntAgWKVtKYuXHBKGev/H4+ByTu8vB7gQXGcim01QxaJshdNg4dYuH2tEBZXCNCNx+/w==", - "requires": { - "@vue/compiler-ssr": "3.2.19", - "@vue/shared": "3.2.19" - } - }, - "@vue/shared": { - "version": "3.2.19", - "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.19.tgz", - "integrity": "sha512-Knqhx7WieLdVgwCAZgTVrDCXZ50uItuecLh9JdLC8O+a5ayaSyIQYveUK3hCRNC7ws5zalHmZwfdLMGaS8r4Ew==" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "7zip-bin": { "version": "5.1.1", @@ -13227,7 +7446,6 @@ "integrity": "sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ==", "dev": true }, -<<<<<<< HEAD "abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", @@ -13238,12 +7456,6 @@ "version": "8.8.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz", "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==", -======= - "acorn": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true }, "acorn-jsx": { @@ -13253,7 +7465,6 @@ "dev": true, "requires": {} }, -<<<<<<< HEAD "acorn-walk": { "version": "8.2.0", "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", @@ -13267,16 +7478,6 @@ "dev": true, "requires": { "debug": "4" -======= - "aggregate-error": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", - "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", - "dev": true, - "requires": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "ajv": { @@ -13298,77 +7499,10 @@ "dev": true, "requires": {} }, -<<<<<<< HEAD "ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", -======= - "ansi-align": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz", - "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==", - "dev": true, - "requires": { - "string-width": "^3.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - } - } - }, - "ansi-colors": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", - "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", - "dev": true - }, - "ansi-escapes": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", - "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", - "dev": true, - "requires": { - "type-fest": "^0.21.3" - }, - "dependencies": { - "type-fest": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", - "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", - "dev": true - } - } - }, - "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true }, "ansi-styles": { @@ -13380,7 +7514,6 @@ "color-convert": "^2.0.1" } }, -<<<<<<< HEAD "anymatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", @@ -13405,27 +7538,10 @@ "requires": { "@develar/schema-utils": "~2.6.5", "@electron/universal": "1.2.1", -======= - "app-builder-bin": { - "version": "3.5.13", - "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.5.13.tgz", - "integrity": "sha512-ighVe9G+bT1ENGdp9ecO1P+94vv/f+FUwaI+XkNzeg9bYF8Oi3BQ+mJuxS00UgyHs8luuOzjzC+qnAtdb43Mpg==", - "dev": true - }, - "app-builder-lib": { - "version": "22.11.7", - "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.11.7.tgz", - "integrity": "sha512-pS9/cR4/TnNZVAHZECiSvvwTBzbwblj7KBBZkMKDG57nibq0I1XY8zAaYeHFdlYTyrRcz9JUXbAqJKezya7UFQ==", - "dev": true, - "requires": { - "@develar/schema-utils": "~2.6.5", - "@electron/universal": "1.0.5", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "@malept/flatpak-bundler": "^0.4.0", "7zip-bin": "~5.1.1", "async-exit-hook": "^2.0.1", "bluebird-lst": "^1.0.9", -<<<<<<< HEAD "builder-util": "23.6.0", "builder-util-runtime": "9.1.1", "chromium-pickle-js": "^0.2.0", @@ -13445,37 +7561,13 @@ "sanitize-filename": "^1.6.3", "semver": "^7.3.7", "tar": "^6.1.11", -======= - "builder-util": "22.11.7", - "builder-util-runtime": "8.7.7", - "chromium-pickle-js": "^0.2.0", - "debug": "^4.3.2", - "ejs": "^3.1.6", - "electron-publish": "22.11.7", - "fs-extra": "^10.0.0", - "hosted-git-info": "^4.0.2", - "is-ci": "^3.0.0", - "isbinaryfile": "^4.0.8", - "js-yaml": "^4.1.0", - "lazy-val": "^1.0.5", - "minimatch": "^3.0.4", - "read-config-file": "6.2.0", - "sanitize-filename": "^1.6.3", - "semver": "^7.3.5", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "temp-file": "^3.4.0" }, "dependencies": { "fs-extra": { -<<<<<<< HEAD "version": "10.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", -======= - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", - "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "requires": { "graceful-fs": "^4.2.0", @@ -13512,23 +7604,10 @@ "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", "dev": true }, -<<<<<<< HEAD "asar": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/asar/-/asar-3.1.0.tgz", "integrity": "sha512-vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ==", -======= - "asap": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", - "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=", - "dev": true - }, - "asar": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/asar/-/asar-3.0.3.tgz", - "integrity": "sha512-k7zd+KoR+n8pl71PvgElcoKHrVNiSXtw7odKbyNpmgKe7EGRF9Pnu3uLOukD37EvavKwVFxOUpqXTIZC5B5Pmw==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "requires": { "@types/glob": "^7.1.1", @@ -13538,7 +7617,6 @@ "minimatch": "^3.0.4" } }, -<<<<<<< HEAD "assert-plus": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", @@ -13552,26 +7630,10 @@ "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", "dev": true }, -======= - "assert-never": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/assert-never/-/assert-never-1.2.1.tgz", - "integrity": "sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==", - "dev": true - }, - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true, - "optional": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "astral-regex": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", -<<<<<<< HEAD "dev": true, "optional": true }, @@ -13579,14 +7641,6 @@ "version": "3.2.4", "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz", "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==", -======= - "dev": true - }, - "async": { - "version": "0.9.2", - "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", - "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true }, "async-exit-hook": { @@ -13595,33 +7649,18 @@ "integrity": "sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw==", "dev": true }, -<<<<<<< HEAD "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", "dev": true }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "at-least-node": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", "dev": true }, -<<<<<<< HEAD -======= - "babel-walk": { - "version": "3.0.0-canary-5", - "resolved": "https://registry.npmjs.org/babel-walk/-/babel-walk-3.0.0-canary-5.tgz", - "integrity": "sha512-GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw==", - "dev": true, - "requires": { - "@babel/types": "^7.9.6" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -13632,7 +7671,6 @@ "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", -<<<<<<< HEAD "dev": true }, "binary-extensions": { @@ -13640,10 +7678,6 @@ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", "dev": true -======= - "dev": true, - "optional": true ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "bluebird": { "version": "3.7.2", @@ -13660,7 +7694,6 @@ "bluebird": "^3.5.5" } }, -<<<<<<< HEAD "boolbase": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", @@ -13674,56 +7707,6 @@ "dev": true, "optional": true }, -======= - "boolean": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.1.4.tgz", - "integrity": "sha512-3hx0kwU3uzG6ReQ3pnaFQPSktpBw6RHN3/ivDKEuU8g1XSfafowyvDnadjv1xp8IZqhtSukxlwv9bF6FhX8m0w==", - "dev": true, - "optional": true - }, - "boxen": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/boxen/-/boxen-5.0.1.tgz", - "integrity": "sha512-49VBlw+PrWEF51aCmy7QIteYPIFZxSpvqBdP/2itCPPlJ49kj9zg/XPRFrdkne2W+CfwXUls8exMvu1RysZpKA==", - "dev": true, - "requires": { - "ansi-align": "^3.0.0", - "camelcase": "^6.2.0", - "chalk": "^4.1.0", - "cli-boxes": "^2.2.1", - "string-width": "^4.2.0", - "type-fest": "^0.20.2", - "widest-line": "^3.1.0", - "wrap-ansi": "^7.0.0" - }, - "dependencies": { - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - }, - "string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - } - } - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -13754,7 +7737,6 @@ "ieee754": "^1.1.13" } }, -<<<<<<< HEAD "buffer-alloc": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", @@ -13775,18 +7757,11 @@ "version": "0.2.13", "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", -======= - "buffer-crc32": { - "version": "0.2.13", - "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", - "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true }, "buffer-equal": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz", -<<<<<<< HEAD "integrity": "sha512-tcBWO2Dl4e7Asr9hTGcpVrCe+F7DubpmqWCTbj4FHLmjqO2hIaC383acQubWtRJhdceqs5uBHs6Es+Sk//RKiQ==", "dev": true }, @@ -13794,9 +7769,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz", "integrity": "sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==", -======= - "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true }, "buffer-from": { @@ -13806,7 +7778,6 @@ "dev": true }, "builder-util": { -<<<<<<< HEAD "version": "23.6.0", "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-23.6.0.tgz", "integrity": "sha512-QiQHweYsh8o+U/KNCZFSvISRnvRctb8m/2rB2I1JdByzvNKxPeFLlHFRPQRXab6aYeXc18j9LpsDLJ3sGQmWTQ==", @@ -13824,22 +7795,6 @@ "fs-extra": "^10.0.0", "http-proxy-agent": "^5.0.0", "https-proxy-agent": "^5.0.0", -======= - "version": "22.11.7", - "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.11.7.tgz", - "integrity": "sha512-ihqUe5ey82LM9qqQe0/oIcaSm9w+B9UjcsWJZxJliTBsbU+sErOpDFpHW+sim0veiTF/EIcGUh9HoduWw+l9FA==", - "dev": true, - "requires": { - "@types/debug": "^4.1.5", - "@types/fs-extra": "^9.0.11", - "7zip-bin": "~5.1.1", - "app-builder-bin": "3.5.13", - "bluebird-lst": "^1.0.9", - "builder-util-runtime": "8.7.7", - "chalk": "^4.1.1", - "debug": "^4.3.2", - "fs-extra": "^10.0.0", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "is-ci": "^3.0.0", "js-yaml": "^4.1.0", "source-map-support": "^0.5.19", @@ -13848,15 +7803,9 @@ }, "dependencies": { "fs-extra": { -<<<<<<< HEAD "version": "10.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", -======= - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", - "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "requires": { "graceful-fs": "^4.2.0", @@ -13883,7 +7832,6 @@ } }, "builder-util-runtime": { -<<<<<<< HEAD "version": "9.1.1", "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz", "integrity": "sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw==", @@ -13908,64 +7856,15 @@ "version": "7.0.2", "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz", "integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==", -======= - "version": "8.7.7", - "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.7.tgz", - "integrity": "sha512-RUfoXzVrmFFI0K/Oft0CtP1LpTIOlBeLJatt5DePTI0KlxE156am4SGUpqtbbdqZNm++LkV9mX4olBDcXyGPow==", - "dev": true, - "requires": { - "debug": "^4.3.2", - "sax": "^1.2.4" - } - }, - "cacheable-request": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", - "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "requires": { "clone-response": "^1.0.2", "get-stream": "^5.1.0", "http-cache-semantics": "^4.0.0", -<<<<<<< HEAD "keyv": "^4.0.0", "lowercase-keys": "^2.0.0", "normalize-url": "^6.0.1", "responselike": "^2.0.0" -======= - "keyv": "^3.0.0", - "lowercase-keys": "^2.0.0", - "normalize-url": "^4.1.0", - "responselike": "^1.0.2" - }, - "dependencies": { - "get-stream": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", - "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "dev": true, - "requires": { - "pump": "^3.0.0" - } - }, - "lowercase-keys": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", - "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", - "dev": true - } - } - }, - "call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "dev": true, - "requires": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "callsites": { @@ -13974,7 +7873,6 @@ "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", "dev": true }, -<<<<<<< HEAD "chai": { "version": "4.3.7", "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.7.tgz", @@ -13989,13 +7887,6 @@ "pathval": "^1.1.1", "type-detect": "^4.0.5" } -======= - "camelcase": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz", - "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==", - "dev": true ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "chalk": { "version": "4.1.2", @@ -14007,7 +7898,6 @@ "supports-color": "^7.1.0" } }, -<<<<<<< HEAD "check-error": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", @@ -14085,101 +7975,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz", "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==", -======= - "character-parser": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz", - "integrity": "sha1-x84o821LzZdE5f/CxfzeHHMmH8A=", - "dev": true, - "requires": { - "is-regex": "^1.0.3" - } - }, - "chromium-pickle-js": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz", - "integrity": "sha1-BKEGZywYsIWrd02YPfo+oTjyIgU=", - "dev": true - }, - "ci-info": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz", - "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==", - "dev": true - }, - "clean-stack": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", - "dev": true - }, - "cli-boxes": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz", - "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==", - "dev": true - }, - "cli-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", - "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", - "dev": true, - "requires": { - "restore-cursor": "^3.1.0" - } - }, - "cli-truncate": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-1.1.0.tgz", - "integrity": "sha512-bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA==", - "dev": true, - "optional": true, - "requires": { - "slice-ansi": "^1.0.0", - "string-width": "^2.0.0" - } - }, - "cliui": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", - "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", - "dev": true, - "requires": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^7.0.0" - }, - "dependencies": { - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - }, - "string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - } - } - } - }, - "clone-response": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", - "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "requires": { "mimic-response": "^1.0.0" @@ -14200,7 +7995,6 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, -<<<<<<< HEAD "colors": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz", @@ -14216,123 +8010,34 @@ "delayed-stream": "~1.0.0" } }, -======= - "colorette": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz", - "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==", - "dev": true - }, - "colors": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz", - "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=", - "dev": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "commander": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==", "dev": true }, -<<<<<<< HEAD "compare-version": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz", "integrity": "sha512-pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A==", "dev": true }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", "dev": true }, -<<<<<<< HEAD -======= - "concat-stream": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", - "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", - "dev": true, - "requires": { - "buffer-from": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^2.2.2", - "typedarray": "^0.0.6" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "config-chain": { "version": "1.1.13", "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==", "dev": true, -<<<<<<< HEAD -======= - "optional": true, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "requires": { "ini": "^1.3.4", "proto-list": "~1.2.1" } }, -<<<<<<< HEAD -======= - "configstore": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz", - "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==", - "dev": true, - "requires": { - "dot-prop": "^5.2.0", - "graceful-fs": "^4.1.2", - "make-dir": "^3.0.0", - "unique-string": "^2.0.0", - "write-file-atomic": "^3.0.0", - "xdg-basedir": "^4.0.0" - } - }, - "constantinople": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/constantinople/-/constantinople-4.0.1.tgz", - "integrity": "sha512-vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw==", - "dev": true, - "requires": { - "@babel/parser": "^7.6.0", - "@babel/types": "^7.6.1" - } - }, - "core-js": { - "version": "3.18.0", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.18.0.tgz", - "integrity": "sha512-WJeQqq6jOYgVgg4NrXKL0KLQhi0CT4ZOCvFL+3CQ5o7I6J8HkT5wd53EadMfqTDp1so/MT1J+w2ujhWcCJtN7w==", - "dev": true, - "optional": true - }, - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true - }, - "cosmiconfig": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz", - "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==", - "dev": true, - "requires": { - "@types/parse-json": "^4.0.0", - "import-fresh": "^3.2.1", - "parse-json": "^5.0.0", - "path-type": "^4.0.0", - "yaml": "^1.10.0" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "crc": { "version": "3.8.0", "resolved": "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz", @@ -14363,7 +8068,6 @@ "which": "^2.0.1" } }, -<<<<<<< HEAD "css.escape": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz", @@ -14392,29 +8096,11 @@ "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", -======= - "crypto-random-string": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", - "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==", - "dev": true - }, - "csstype": { - "version": "2.6.18", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.18.tgz", - "integrity": "sha512-RSU6Hyeg14am3Ah4VZEmeX8H7kLwEEirXe6aU2IPfKNvhXwTflK5HQRDNI0ypQXoqmm+QPyG2IaPuQE5zMwSIQ==" - }, - "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "requires": { "ms": "2.1.2" } }, "decompress-response": { -<<<<<<< HEAD "version": "6.0.0", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", @@ -14469,44 +8155,6 @@ "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", "dev": true }, -======= - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", - "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", - "dev": true, - "requires": { - "mimic-response": "^1.0.0" - } - }, - "deep-extend": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", - "dev": true - }, - "deep-is": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", - "dev": true - }, - "defer-to-connect": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz", - "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==", - "dev": true - }, - "define-properties": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", - "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", - "dev": true, - "optional": true, - "requires": { - "object-keys": "^1.0.12" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "detect-node": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz", @@ -14514,15 +8162,12 @@ "dev": true, "optional": true }, -<<<<<<< HEAD "diff": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz", "integrity": "sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==", "dev": true }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dir-compare": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/dir-compare/-/dir-compare-2.4.0.tgz", @@ -14538,16 +8183,11 @@ "commander": { "version": "2.9.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", -<<<<<<< HEAD "integrity": "sha512-bmkUukX8wAOjHdN26xj5c4ctEV22TQ7dQYhSmuckKhToXrkUn0iIaolHdIxYYqD55nhpSPA9zPQ1yP57GdXP2A==", -======= - "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "requires": { "graceful-readlink": ">= 1.0.0" } -<<<<<<< HEAD }, "minimatch": { "version": "3.0.4", @@ -14557,8 +8197,6 @@ "requires": { "brace-expansion": "^1.1.7" } -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } } }, @@ -14572,7 +8210,6 @@ } }, "dmg-builder": { -<<<<<<< HEAD "version": "23.6.0", "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-23.6.0.tgz", "integrity": "sha512-jFZvY1JohyHarIAlTbfQOk+HnceGjjAdFjVn3n8xlDWKsYNqbO4muca6qXEZTfGXeQMG7TYim6CeS5XKSfSsGA==", @@ -14582,43 +8219,15 @@ "builder-util": "23.6.0", "builder-util-runtime": "9.1.1", "dmg-license": "^1.0.11", -======= - "version": "22.11.7", - "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.11.7.tgz", - "integrity": "sha512-+I+XfP2DODHB6PwFANgpH/WMzzCA5r5XoMvbFCIYjQjJpXlO0XnqQaamzFl2vh/Wz/Qt0d0lJMgRy8gKR3MGdQ==", - "dev": true, - "requires": { - "app-builder-lib": "22.11.7", - "builder-util": "22.11.7", - "builder-util-runtime": "8.7.6", - "dmg-license": "^1.0.9", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "fs-extra": "^10.0.0", "iconv-lite": "^0.6.2", "js-yaml": "^4.1.0" }, "dependencies": { -<<<<<<< HEAD "fs-extra": { "version": "10.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", -======= - "builder-util-runtime": { - "version": "8.7.6", - "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.6.tgz", - "integrity": "sha512-rj9AIY7CzLSuTOXpToiaQkruYh6UEQ+kYnd5UET22ch8MGClEtIZKXHG14qEiXEr2x4EOKDMxkcTa+9TYaE+ug==", - "dev": true, - "requires": { - "debug": "^4.3.2", - "sax": "^1.2.4" - } - }, - "fs-extra": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", - "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "requires": { "graceful-fs": "^4.2.0", @@ -14645,31 +8254,18 @@ } }, "dmg-license": { -<<<<<<< HEAD "version": "1.0.11", "resolved": "https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.11.tgz", "integrity": "sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q==", -======= - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.9.tgz", - "integrity": "sha512-Rq6qMDaDou2+aPN2SYy0x7LDznoJ/XaG6oDcH5wXUp+WRWQMUYE6eM+F+nex+/LSXOp1uw4HLFoed0YbfU8R/Q==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "optional": true, "requires": { "@types/plist": "^3.0.1", "@types/verror": "^1.10.3", "ajv": "^6.10.0", -<<<<<<< HEAD "crc": "^3.8.0", "iconv-corefoundation": "^1.1.7", "plist": "^3.0.4", -======= - "cli-truncate": "^1.1.0", - "crc": "^3.8.0", - "iconv-corefoundation": "^1.1.6", - "plist": "^3.0.1", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "smart-buffer": "^4.0.2", "verror": "^1.10.0" } @@ -14683,69 +8279,6 @@ "esutils": "^2.0.2" } }, -<<<<<<< HEAD -======= - "doctypes": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz", - "integrity": "sha1-6oCxBqh1OHdOijpKWv4pPeSJ4Kk=", - "dev": true - }, - "dom-serializer": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz", - "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==", - "dev": true, - "requires": { - "domelementtype": "^2.0.1", - "domhandler": "^4.2.0", - "entities": "^2.0.0" - } - }, - "domelementtype": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", - "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==", - "dev": true - }, - "domhandler": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.0.tgz", - "integrity": "sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==", - "dev": true, - "requires": { - "domelementtype": "^2.2.0" - } - }, - "domutils": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.7.0.tgz", - "integrity": "sha512-8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg==", - "dev": true, - "requires": { - "dom-serializer": "^1.0.1", - "domelementtype": "^2.2.0", - "domhandler": "^4.2.0" - } - }, - "dot-prop": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", - "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==", - "dev": true, - "requires": { - "is-obj": "^2.0.0" - }, - "dependencies": { - "is-obj": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", - "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", - "dev": true - } - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dotenv": { "version": "9.0.2", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-9.0.2.tgz", @@ -14758,7 +8291,6 @@ "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==", "dev": true }, -<<<<<<< HEAD "eastasianwidth": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", @@ -14847,51 +8379,10 @@ "builder-util-runtime": "9.1.1", "chalk": "^4.1.1", "dmg-builder": "23.6.0", -======= - "duplexer3": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", - "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=", - "dev": true - }, - "ejs": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.6.tgz", - "integrity": "sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==", - "dev": true, - "requires": { - "jake": "^10.6.1" - } - }, - "electron": { - "version": "15.1.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-15.1.0.tgz", - "integrity": "sha512-QZJKZdrOG2G9lyOrDpCHh+arMrj7ZVVBulrukhNXwCeCEHgNLTVULEQzMOB9AVXUbIs+FthcddlMgcgpaErohw==", - "dev": true, - "requires": { - "@electron/get": "^1.13.0", - "@types/node": "^14.6.2", - "extract-zip": "^1.0.3" - } - }, - "electron-builder": { - "version": "22.11.7", - "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.11.7.tgz", - "integrity": "sha512-yQExSLt7Hbz/P8lLkZDdE/OnJJ7NCX+uiQcV+XIH0TeEZcD87ZnSqBBzGUN5akySU4BXXlrVZKeUsXACWrm5Kw==", - "dev": true, - "requires": { - "@types/yargs": "^16.0.2", - "app-builder-lib": "22.11.7", - "builder-util": "22.11.7", - "builder-util-runtime": "8.7.7", - "chalk": "^4.1.1", - "dmg-builder": "22.11.7", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "fs-extra": "^10.0.0", "is-ci": "^3.0.0", "lazy-val": "^1.0.5", "read-config-file": "6.2.0", -<<<<<<< HEAD "simple-update-notifier": "^1.0.7", "yargs": "^17.5.1" }, @@ -14900,16 +8391,6 @@ "version": "10.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", -======= - "update-notifier": "^5.1.0", - "yargs": "^17.0.1" - }, - "dependencies": { - "fs-extra": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", - "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "requires": { "graceful-fs": "^4.2.0", @@ -14935,7 +8416,6 @@ } } }, -<<<<<<< HEAD "electron-osx-sign": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.6.0.tgz", @@ -14985,29 +8465,6 @@ "@types/fs-extra": "^9.0.11", "builder-util": "23.6.0", "builder-util-runtime": "9.1.1", -======= - "electron-devtools-installer": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/electron-devtools-installer/-/electron-devtools-installer-3.2.0.tgz", - "integrity": "sha512-t3UczsYugm4OAbqvdImMCImIMVdFzJAHgbwHpkl5jmfu1izVgUcP/mnrPqJIpEeCK1uZGpt+yHgWEN+9EwoYhQ==", - "dev": true, - "requires": { - "rimraf": "^3.0.2", - "semver": "^7.2.1", - "tslib": "^2.1.0", - "unzip-crx-3": "^0.2.0" - } - }, - "electron-publish": { - "version": "22.11.7", - "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.11.7.tgz", - "integrity": "sha512-A4EhRRNBVz4SPzUlBrPO6BmuyDeI0pyprggPAV9rQ+SDVSnSB/WKPot9JwWMyArkGj3AUUTMNVT6hwZhMvhfqw==", - "dev": true, - "requires": { - "@types/fs-extra": "^9.0.11", - "builder-util": "22.11.7", - "builder-util-runtime": "8.7.7", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "chalk": "^4.1.1", "fs-extra": "^10.0.0", "lazy-val": "^1.0.5", @@ -15015,15 +8472,9 @@ }, "dependencies": { "fs-extra": { -<<<<<<< HEAD "version": "10.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", -======= - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", - "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "requires": { "graceful-fs": "^4.2.0", @@ -15050,27 +8501,17 @@ } }, "electron-updater": { -<<<<<<< HEAD "version": "5.3.0", "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-5.3.0.tgz", "integrity": "sha512-iKEr7yQBcvnQUPnSDYGSWC9t0eF2YbZWeYYYZzYxdl+HiRejXFENjYMnYjoOm2zxyD6Cr2JTHZhp9pqxiXuCOw==", "requires": { "@types/semver": "^7.3.6", "builder-util-runtime": "9.1.1", -======= - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-4.6.0.tgz", - "integrity": "sha512-evvAwfDn100sIBZ/GLDpcWtWfaug48RGxVuYiSp0foKQkaXJGFyqYy5ADyt+HPML/mSTMPBvUq55cLEW45BroQ==", - "requires": { - "@types/semver": "^7.3.6", - "builder-util-runtime": "8.9.0", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "fs-extra": "^10.0.0", "js-yaml": "^4.1.0", "lazy-val": "^1.0.5", "lodash.escaperegexp": "^4.1.2", "lodash.isequal": "^4.5.0", -<<<<<<< HEAD "semver": "^7.3.5", "typed-emitter": "^2.1.0" }, @@ -15079,24 +8520,6 @@ "version": "10.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", -======= - "semver": "^7.3.5" - }, - "dependencies": { - "builder-util-runtime": { - "version": "8.9.0", - "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.9.0.tgz", - "integrity": "sha512-XT7asdRMiSqUj/7EtvSW1mzVARvnhj0Nv4Ei4kD0p8GrKMFJt1Nadm4XwD+PrI2+srrtU+l8JMoBgSe4LX8EmQ==", - "requires": { - "debug": "^4.3.2", - "sax": "^1.2.4" - } - }, - "fs-extra": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", - "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "requires": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -15119,38 +8542,12 @@ } } }, -<<<<<<< HEAD "emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true }, -======= - "emmet": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/emmet/-/emmet-2.3.4.tgz", - "integrity": "sha512-3IqSwmO+N2ZGeuhDyhV/TIOJFUbkChi53bcasSNRE7Yd+4eorbbYz4e53TpMECt38NtYkZNupQCZRlwdAYA42A==", - "dev": true, - "requires": { - "@emmetio/abbreviation": "^2.2.2", - "@emmetio/css-abbreviation": "^2.1.4" - } - }, - "emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", - "dev": true - }, - "encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", - "dev": true, - "optional": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "end-of-stream": { "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", @@ -15160,42 +8557,12 @@ "once": "^1.4.0" } }, -<<<<<<< HEAD -======= - "enquirer": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", - "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", - "dev": true, - "requires": { - "ansi-colors": "^4.1.1" - } - }, - "entities": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", - "dev": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "env-paths": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", "dev": true }, -<<<<<<< HEAD -======= - "error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, - "requires": { - "is-arrayish": "^0.2.1" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "es6-error": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", @@ -15204,7 +8571,6 @@ "optional": true }, "esbuild": { -<<<<<<< HEAD "version": "0.16.17", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.16.17.tgz", "integrity": "sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg==", @@ -15234,158 +8600,12 @@ "@esbuild/win32-x64": "0.16.17" } }, -======= - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.13.3.tgz", - "integrity": "sha512-98xovMLKnyhv3gcReUuAEi5Ig1rK6SIgvsJuBIcfwzqGSEHsV8UJjMlmkhHoHMf9XZybMpE9Zax8AA8f7i2hlQ==", - "dev": true, - "requires": { - "esbuild-android-arm64": "0.13.3", - "esbuild-darwin-64": "0.13.3", - "esbuild-darwin-arm64": "0.13.3", - "esbuild-freebsd-64": "0.13.3", - "esbuild-freebsd-arm64": "0.13.3", - "esbuild-linux-32": "0.13.3", - "esbuild-linux-64": "0.13.3", - "esbuild-linux-arm": "0.13.3", - "esbuild-linux-arm64": "0.13.3", - "esbuild-linux-mips64le": "0.13.3", - "esbuild-linux-ppc64le": "0.13.3", - "esbuild-openbsd-64": "0.13.3", - "esbuild-sunos-64": "0.13.3", - "esbuild-windows-32": "0.13.3", - "esbuild-windows-64": "0.13.3", - "esbuild-windows-arm64": "0.13.3" - } - }, - "esbuild-android-arm64": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.13.3.tgz", - "integrity": "sha512-jc9E8vGTHkzb0Vwl74H8liANV9BWsqtzLHaKvcsRgf1M+aVCBSF0gUheduAKfDsbDMT0judeMLhwBP34EUesTA==", - "dev": true, - "optional": true - }, - "esbuild-darwin-64": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.13.3.tgz", - "integrity": "sha512-8bG3Zq+ZNuLlIJebOO2+weI7P2LVf33sOzaUfHj8MuJ+1Ixe4KtQxfYp7qhFnP6xP2ToJaYHxGUfLeiUCEz9hw==", - "dev": true, - "optional": true - }, - "esbuild-darwin-arm64": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.13.3.tgz", - "integrity": "sha512-5E81eImYtTgh8pY7Gq4WQHhWkR/LvYadUXmuYeZBiP+3ADZJZcG60UFceZrjqNPaFOWKr/xmh4aNocwagEubcA==", - "dev": true, - "optional": true - }, - "esbuild-freebsd-64": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.13.3.tgz", - "integrity": "sha512-ou+f91KkTGexi8HvF/BdtsITL6plbciQfZGys7QX6/QEwyE96PmL5KnU6ZQwoU7E99Ts6Sc9bUDq8HXJubKtBA==", - "dev": true, - "optional": true - }, - "esbuild-freebsd-arm64": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.13.3.tgz", - "integrity": "sha512-F1zV7nySjHswJuvIgjkiG5liZ63MeazDGXGKViTCeegjZ71sAhOChcaGhKcu6vq9+vqZxlfEi1fmXlx6Pc3coQ==", - "dev": true, - "optional": true - }, - "esbuild-linux-32": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.13.3.tgz", - "integrity": "sha512-mHHc2v6uLrHH4zaaq5RB/5IWzgimEJ1HGldzf1qtGI513KZWfH0HRRQ8p1di4notJgBn7tDzWQ1f34ZHy69viQ==", - "dev": true, - "optional": true - }, - "esbuild-linux-64": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.13.3.tgz", - "integrity": "sha512-FJ1De2O89mrOuqtaEXu41qIYJU6R41F+OA6vheNwcAQcX8fu0aiA13FJeLABq29BYJuTVgRj3cyC8q+tz19/dQ==", - "dev": true, - "optional": true - }, - "esbuild-linux-arm": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.13.3.tgz", - "integrity": "sha512-9BJNRtLwBh3OP22cln9g3AJdbAQUcjRHqA4BScx9k4RZpGqPokFr548zpeplxWhcwrIjT8qPebwH9CrRVy8Bsw==", - "dev": true, - "optional": true - }, - "esbuild-linux-arm64": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.13.3.tgz", - "integrity": "sha512-Cauhr45KSo+wRUojs+1qfycQqQCAXTOvsWvkZ6xmEMAXLAm+f8RQGDQeP8CAf8Yeelnegcn6UNdvzdzLHhWDFg==", - "dev": true, - "optional": true - }, - "esbuild-linux-mips64le": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.13.3.tgz", - "integrity": "sha512-YVzJUGCncuuLm2boYyVeuMFsak4ZAhdiBwi0xNDZCC8sy+tS6Boe2mzcrD2uubv5JKAUOrpN186S1DtU4WgBgw==", - "dev": true, - "optional": true - }, - "esbuild-linux-ppc64le": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.13.3.tgz", - "integrity": "sha512-GU6CqqKtJEoyxC2QWHiJtmuOz9wc/jMv8ZloK2WwiGY5yMvAmM3PI103Dj7xcjebNTHBqITTUw/aigY1wx5A3w==", - "dev": true, - "optional": true - }, - "esbuild-openbsd-64": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.13.3.tgz", - "integrity": "sha512-HVpkgpn4BQt4BPDAjTOpeMub6mzNWw6Y3gaLQJrpbO24pws6ZwYkY24OI3/Uo3LDCbH6856MM81JxECt92OWjA==", - "dev": true, - "optional": true - }, - "esbuild-sunos-64": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.13.3.tgz", - "integrity": "sha512-XncBVOtnEfUbPV4CaiFBxh38ychnBfwCxuTm9iAqcHzIwkmeNRN5qMzDyfE1jyfJje+Bbt6AvIfz6SdYt8/UEQ==", - "dev": true, - "optional": true - }, - "esbuild-windows-32": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.13.3.tgz", - "integrity": "sha512-ZlgDz7d1nk8wQACi+z8IDzNZVUlN9iprAme+1YSTsfFDlkyI8jeaGWPk9EQFNY7rJzsLVYm6eZ2mhPioc7uT5A==", - "dev": true, - "optional": true - }, - "esbuild-windows-64": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.13.3.tgz", - "integrity": "sha512-YX7KvRez3TR+GudlQm9tND/ssj2FsF9vb8ZWzAoZOLxpPzE3y+3SFJNrfDzzQKPzJ0Pnh9KBP4gsaMwJjKHDhw==", - "dev": true, - "optional": true - }, - "esbuild-windows-arm64": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.13.3.tgz", - "integrity": "sha512-nP7H0Y2a6OJd3Qi1Q8sehhyP4x4JoXK4S5y6FzH2vgaJgiyEurzFxjUufGdMaw+RxtxiwD/uRndUgwaZ2JD8lg==", - "dev": true, - "optional": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", "dev": true }, -<<<<<<< HEAD -======= - "escape-goat": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz", - "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==", - "dev": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", @@ -15393,7 +8613,6 @@ "dev": true }, "eslint": { -<<<<<<< HEAD "version": "8.36.0", "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.36.0.tgz", "integrity": "sha512-Y956lmS7vDqomxlaaQAHVmeb4tNMp2FWIvU/RnU5BD3IKMD/MJPr76xdyr68P8tV1iNMvN2mRK0yy3c+UjL+bw==", @@ -15455,101 +8674,11 @@ "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", -======= - "version": "7.32.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz", - "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==", - "dev": true, - "requires": { - "@babel/code-frame": "7.12.11", - "@eslint/eslintrc": "^0.4.3", - "@humanwhocodes/config-array": "^0.5.0", - "ajv": "^6.10.0", - "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", - "debug": "^4.0.1", - "doctrine": "^3.0.0", - "enquirer": "^2.3.5", - "escape-string-regexp": "^4.0.0", - "eslint-scope": "^5.1.1", - "eslint-utils": "^2.1.0", - "eslint-visitor-keys": "^2.0.0", - "espree": "^7.3.1", - "esquery": "^1.4.0", - "esutils": "^2.0.2", - "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", - "functional-red-black-tree": "^1.0.1", - "glob-parent": "^5.1.2", - "globals": "^13.6.0", - "ignore": "^4.0.6", - "import-fresh": "^3.0.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", - "js-yaml": "^3.13.1", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", - "lodash.merge": "^4.6.2", - "minimatch": "^3.0.4", - "natural-compare": "^1.4.0", - "optionator": "^0.9.1", - "progress": "^2.0.0", - "regexpp": "^3.1.0", - "semver": "^7.2.1", - "strip-ansi": "^6.0.0", - "strip-json-comments": "^3.1.0", - "table": "^6.0.9", - "text-table": "^0.2.0", - "v8-compile-cache": "^2.0.3" - }, - "dependencies": { - "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "requires": { - "sprintf-js": "~1.0.2" - } - }, - "eslint-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", - "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", - "dev": true, - "requires": { - "eslint-visitor-keys": "^1.1.0" - }, - "dependencies": { - "eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true - } - } - }, - "js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dev": true, - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - } - }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true } } }, "eslint-plugin-vue": { -<<<<<<< HEAD "version": "9.9.0", "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.9.0.tgz", "integrity": "sha512-YbubS7eK0J7DCf0U2LxvVP7LMfs6rC6UltihIgval3azO3gyDwEGVgsCMe1TmDiEkl6GdMKfRpaME6QxIYtzDQ==", @@ -15562,40 +8691,6 @@ "semver": "^7.3.5", "vue-eslint-parser": "^9.0.1", "xml-name-validator": "^4.0.0" -======= - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.18.0.tgz", - "integrity": "sha512-ceDXlXYMMPMSXw7tdKUR42w9jlzthJGJ3Kvm3YrZ0zuQfvAySNxe8sm6VHuksBW0+060GzYXhHJG6IHVOfF83Q==", - "dev": true, - "requires": { - "eslint-utils": "^2.1.0", - "natural-compare": "^1.4.0", - "semver": "^6.3.0", - "vue-eslint-parser": "^7.10.0" - }, - "dependencies": { - "eslint-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", - "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", - "dev": true, - "requires": { - "eslint-visitor-keys": "^1.1.0" - } - }, - "eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "eslint-scope": { @@ -15615,43 +8710,16 @@ "dev": true, "requires": { "eslint-visitor-keys": "^2.0.0" -<<<<<<< HEAD }, "dependencies": { "eslint-visitor-keys": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", -======= - } - }, - "eslint-visitor-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", - "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", - "dev": true - }, - "espree": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz", - "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==", - "dev": true, - "requires": { - "acorn": "^7.4.0", - "acorn-jsx": "^5.3.1", - "eslint-visitor-keys": "^1.3.0" - }, - "dependencies": { - "eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true } } }, -<<<<<<< HEAD "eslint-visitor-keys": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", @@ -15673,33 +8741,15 @@ "version": "1.4.2", "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.2.tgz", "integrity": "sha512-JVSoLdTlTDkmjFmab7H/9SL9qGSyjElT3myyKp7krqjVFQCDLmj1QFaCLRFBszBKI0XVZaiiXvuPIX3ZwHe1Ng==", -======= - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true - }, - "esquery": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz", - "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "requires": { "estraverse": "^5.1.0" }, "dependencies": { "estraverse": { -<<<<<<< HEAD "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", -======= - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true } } @@ -15714,15 +8764,9 @@ }, "dependencies": { "estraverse": { -<<<<<<< HEAD "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", -======= - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true } } @@ -15736,12 +8780,8 @@ "estree-walker": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", -<<<<<<< HEAD "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", "dev": true -======= - "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "esutils": { "version": "2.0.3", @@ -15749,7 +8789,6 @@ "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", "dev": true }, -<<<<<<< HEAD "extract-zip": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", @@ -15766,66 +8805,6 @@ "version": "1.4.1", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz", "integrity": "sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==", -======= - "execa": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", - "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", - "dev": true, - "requires": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.0", - "human-signals": "^2.1.0", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.1", - "onetime": "^5.1.2", - "signal-exit": "^3.0.3", - "strip-final-newline": "^2.0.0" - }, - "dependencies": { - "get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true - } - } - }, - "extract-zip": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz", - "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==", - "dev": true, - "requires": { - "concat-stream": "^1.6.2", - "debug": "^2.6.9", - "mkdirp": "^0.5.4", - "yauzl": "^2.10.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } - } - }, - "extsprintf": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.0.tgz", - "integrity": "sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "optional": true }, @@ -15836,15 +8815,9 @@ "dev": true }, "fast-glob": { -<<<<<<< HEAD "version": "3.2.11", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz", "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==", -======= - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz", - "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "requires": { "@nodelib/fs.stat": "^2.0.2", @@ -15852,7 +8825,6 @@ "glob-parent": "^5.1.2", "merge2": "^1.3.0", "micromatch": "^4.0.4" -<<<<<<< HEAD }, "dependencies": { "glob-parent": { @@ -15864,8 +8836,6 @@ "is-glob": "^4.0.1" } } -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "fast-json-stable-stringify": { @@ -15881,15 +8851,9 @@ "dev": true }, "fastq": { -<<<<<<< HEAD "version": "1.13.0", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", -======= - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.1.tgz", - "integrity": "sha512-HOnr8Mc60eNYl1gzwp6r5RoUyAn5/glBolUzP/Ez6IFVPMPirxn/9phgL6zhOtaTy7ISwPvQ+wT+hfcRZh/bzw==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "requires": { "reusify": "^1.0.4" @@ -15898,11 +8862,7 @@ "fd-slicer": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", -<<<<<<< HEAD "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==", -======= - "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "requires": { "pend": "~1.2.0" @@ -15918,7 +8878,6 @@ } }, "filelist": { -<<<<<<< HEAD "version": "1.0.4", "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", @@ -15945,14 +8904,6 @@ "brace-expansion": "^2.0.1" } } -======= - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.2.tgz", - "integrity": "sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ==", - "dev": true, - "requires": { - "minimatch": "^3.0.4" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "fill-range": { @@ -15964,7 +8915,6 @@ "to-regex-range": "^5.0.1" } }, -<<<<<<< HEAD "find-up": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", @@ -15975,8 +8925,6 @@ "path-exists": "^4.0.0" } }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "flat-cache": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", @@ -15988,7 +8936,6 @@ } }, "flatted": { -<<<<<<< HEAD "version": "3.2.4", "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz", "integrity": "sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw==", @@ -16005,13 +8952,6 @@ "mime-types": "^2.1.12" } }, -======= - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz", - "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==", - "dev": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "fs-extra": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", @@ -16023,7 +8963,6 @@ "universalify": "^0.1.0" } }, -<<<<<<< HEAD "fs-minipass": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", @@ -16033,8 +8972,6 @@ "minipass": "^3.0.0" } }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -16054,77 +8991,43 @@ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", "dev": true }, -<<<<<<< HEAD -======= - "functional-red-black-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", - "dev": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true }, -<<<<<<< HEAD "get-func-name": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", "dev": true }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "get-intrinsic": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", "dev": true, -<<<<<<< HEAD "optional": true, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "requires": { "function-bind": "^1.1.1", "has": "^1.0.3", "has-symbols": "^1.0.1" } }, -<<<<<<< HEAD "get-stream": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", -======= - "get-own-enumerable-property-symbols": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz", - "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==", - "dev": true - }, - "get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "requires": { "pump": "^3.0.0" } }, "glob": { -<<<<<<< HEAD "version": "7.2.0", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", -======= - "version": "7.1.7", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", - "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "requires": { "fs.realpath": "^1.0.0", @@ -16136,7 +9039,6 @@ } }, "glob-parent": { -<<<<<<< HEAD "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", @@ -16149,28 +9051,10 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz", "integrity": "sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==", -======= - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "requires": { - "is-glob": "^4.0.1" - } - }, - "global-agent": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-2.2.0.tgz", - "integrity": "sha512-+20KpaW6DDLqhG7JDiJpD1JvNvb8ts+TNl7BPOYcURqCrXqnN1Vf+XVOrkKJAFPqfX+oEhsdzOj1hLWkBTdNJg==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "optional": true, "requires": { "boolean": "^3.0.1", -<<<<<<< HEAD -======= - "core-js": "^3.6.5", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "es6-error": "^4.1.1", "matcher": "^3.0.0", "roarr": "^2.15.3", @@ -16178,62 +9062,19 @@ "serialize-error": "^7.0.1" } }, -<<<<<<< HEAD "globals": { "version": "13.19.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz", "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==", -======= - "global-dirs": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.0.tgz", - "integrity": "sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==", - "dev": true, - "requires": { - "ini": "2.0.0" - }, - "dependencies": { - "ini": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz", - "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==", - "dev": true - } - } - }, - "global-tunnel-ng": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz", - "integrity": "sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg==", - "dev": true, - "optional": true, - "requires": { - "encodeurl": "^1.0.2", - "lodash": "^4.17.10", - "npm-conf": "^1.1.3", - "tunnel": "^0.0.6" - } - }, - "globals": { - "version": "13.10.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.10.0.tgz", - "integrity": "sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "requires": { "type-fest": "^0.20.2" } }, "globalthis": { -<<<<<<< HEAD "version": "1.0.3", "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz", "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==", -======= - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.2.tgz", - "integrity": "sha512-ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "optional": true, "requires": { @@ -16241,20 +9082,13 @@ } }, "globby": { -<<<<<<< HEAD "version": "11.1.0", "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", -======= - "version": "11.0.4", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz", - "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "requires": { "array-union": "^2.1.0", "dir-glob": "^3.0.1", -<<<<<<< HEAD "fast-glob": "^3.2.9", "ignore": "^5.2.0", "merge2": "^1.4.1", @@ -16284,50 +9118,10 @@ "version": "4.2.8", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz", "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==" -======= - "fast-glob": "^3.1.1", - "ignore": "^5.1.4", - "merge2": "^1.3.0", - "slash": "^3.0.0" - }, - "dependencies": { - "ignore": { - "version": "5.1.8", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", - "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", - "dev": true - } - } - }, - "got": { - "version": "9.6.0", - "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", - "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==", - "dev": true, - "requires": { - "@sindresorhus/is": "^0.14.0", - "@szmarczak/http-timer": "^1.1.2", - "cacheable-request": "^6.0.0", - "decompress-response": "^3.3.0", - "duplexer3": "^0.1.4", - "get-stream": "^4.1.0", - "lowercase-keys": "^1.0.1", - "mimic-response": "^1.0.1", - "p-cancelable": "^1.0.0", - "to-readable-stream": "^1.0.0", - "url-parse-lax": "^3.0.0" - } - }, - "graceful-fs": { - "version": "4.2.6", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz", - "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "graceful-readlink": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", -<<<<<<< HEAD "integrity": "sha512-8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w==", "dev": true }, @@ -16352,11 +9146,6 @@ "whatwg-mimetype": "^3.0.0" } }, -======= - "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=", - "dev": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -16372,7 +9161,6 @@ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, -<<<<<<< HEAD "has-property-descriptors": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", @@ -16383,13 +9171,10 @@ "get-intrinsic": "^1.1.1" } }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "has-symbols": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==", -<<<<<<< HEAD "dev": true, "optional": true }, @@ -16406,61 +9191,6 @@ "dev": true, "requires": { "lru-cache": "^6.0.0" -======= - "dev": true - }, - "has-tostringtag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", - "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", - "dev": true, - "requires": { - "has-symbols": "^1.0.2" - } - }, - "has-yarn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz", - "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==", - "dev": true - }, - "hosted-git-info": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz", - "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - }, - "dependencies": { - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - } - } - }, - "htmlparser2": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", - "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==", - "dev": true, - "requires": { - "domelementtype": "^2.0.1", - "domhandler": "^4.0.0", - "domutils": "^2.5.2", - "entities": "^2.0.0" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "http-cache-semantics": { @@ -16469,7 +9199,6 @@ "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==", "dev": true }, -<<<<<<< HEAD "http-proxy-agent": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", @@ -16509,22 +9238,6 @@ "optional": true, "requires": { "cli-truncate": "^2.1.0", -======= - "human-signals": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", - "dev": true - }, - "iconv-corefoundation": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/iconv-corefoundation/-/iconv-corefoundation-1.1.6.tgz", - "integrity": "sha512-1NBe55C75bKGZaY9UHxvXG3G0gEp0ziht7quhuFrW3SPgZDw9HI6qvYXRSV5M/Eupyu8ljuJ6Cba+ec15PZ4Xw==", - "dev": true, - "optional": true, - "requires": { - "cli-truncate": "^1.1.0", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node-addon-api": "^1.6.3" } }, @@ -16545,21 +9258,9 @@ "optional": true }, "ignore": { -<<<<<<< HEAD "version": "5.2.0", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", -======= - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", - "dev": true - }, - "immediate": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", - "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true }, "import-fresh": { @@ -16572,30 +9273,12 @@ "resolve-from": "^4.0.0" } }, -<<<<<<< HEAD -======= - "import-lazy": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", - "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=", - "dev": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", "dev": true }, -<<<<<<< HEAD -======= - "indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", - "dev": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -16618,7 +9301,6 @@ "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", "dev": true }, -<<<<<<< HEAD "is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -16641,45 +9323,11 @@ "version": "2.9.0", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", -======= - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", - "dev": true - }, - "is-ci": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.0.tgz", - "integrity": "sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ==", - "dev": true, - "requires": { - "ci-info": "^3.1.1" - } - }, - "is-core-module": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.5.0.tgz", - "integrity": "sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "requires": { "has": "^1.0.3" } }, -<<<<<<< HEAD -======= - "is-expression": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-expression/-/is-expression-4.0.0.tgz", - "integrity": "sha512-zMIXX63sxzG3XrkHkrAPvm/OVZVSCPNkwMHU8oTX7/U3AL78I0QXCEICXUM13BIa8TYGZ68PiTKfQz3yaTNr4A==", - "dev": true, - "requires": { - "acorn": "^7.1.1", - "object-assign": "^4.1.1" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", @@ -16687,7 +9335,6 @@ "dev": true }, "is-fullwidth-code-point": { -<<<<<<< HEAD "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", @@ -16697,125 +9344,27 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", -======= - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "is-glob": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", - "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "requires": { "is-extglob": "^2.1.1" } }, -<<<<<<< HEAD -======= - "is-installed-globally": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz", - "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==", - "dev": true, - "requires": { - "global-dirs": "^3.0.0", - "is-path-inside": "^3.0.2" - } - }, - "is-npm": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-5.0.0.tgz", - "integrity": "sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA==", - "dev": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true }, -<<<<<<< HEAD -======= - "is-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", - "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", - "dev": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "is-path-inside": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", "dev": true }, -<<<<<<< HEAD "isbinaryfile": { "version": "4.0.10", "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.10.tgz", "integrity": "sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==", -======= - "is-promise": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz", - "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==", - "dev": true - }, - "is-regex": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", - "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - } - }, - "is-regexp": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz", - "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=", - "dev": true - }, - "is-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", - "dev": true - }, - "is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", - "dev": true - }, - "is-unicode-supported": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", - "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", - "dev": true - }, - "is-yarn-global": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz", - "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==", - "dev": true - }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, - "isbinaryfile": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.8.tgz", - "integrity": "sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true }, "isexe": { @@ -16825,7 +9374,6 @@ "dev": true }, "jake": { -<<<<<<< HEAD "version": "10.8.5", "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz", "integrity": "sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==", @@ -16878,100 +9426,14 @@ "dev": true, "requires": { "brace-expansion": "^2.0.1" -======= - "version": "10.8.2", - "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz", - "integrity": "sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A==", - "dev": true, - "requires": { - "async": "0.9.x", - "chalk": "^2.4.2", - "filelist": "^1.0.1", - "minimatch": "^3.0.4" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } } } }, -<<<<<<< HEAD "js-sdsl": { "version": "4.1.4", "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.4.tgz", "integrity": "sha512-Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw==", -======= - "jpeg-js": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.3.tgz", - "integrity": "sha512-ru1HWKek8octvUHFHvE5ZzQ1yAsJmIvRdGWvSoKV52XKyuyYA437QWDttXT8eZXDSbuMpHlLzPDZUPd6idIz+Q==", - "dev": true - }, - "js-stringify": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz", - "integrity": "sha1-Fzb939lyTyijaCrcYjCufk6Weds=", - "dev": true - }, - "js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true }, "js-yaml": { @@ -16983,21 +9445,9 @@ } }, "json-buffer": { -<<<<<<< HEAD "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", -======= - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", - "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=", - "dev": true - }, - "json-parse-even-better-errors": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true }, "json-schema-traverse": { @@ -17015,7 +9465,6 @@ "json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", -<<<<<<< HEAD "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==", "dev": true, "optional": true @@ -17030,32 +9479,17 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==", -======= - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", - "dev": true, - "optional": true - }, - "jsonc-parser": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.1.tgz", - "integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true }, "jsonfile": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", -<<<<<<< HEAD "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", -======= - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "requires": { "graceful-fs": "^4.1.6" } }, -<<<<<<< HEAD "keyv": { "version": "4.5.2", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.2.tgz", @@ -17063,46 +9497,6 @@ "dev": true, "requires": { "json-buffer": "3.0.1" -======= - "jstransformer": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz", - "integrity": "sha1-7Yvwkh4vPx7U1cGkT2hwntJHIsM=", - "dev": true, - "requires": { - "is-promise": "^2.0.0", - "promise": "^7.0.1" - } - }, - "jszip": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.0.tgz", - "integrity": "sha512-Y2OlFIzrDOPWUnpU0LORIcDn2xN7rC9yKffFM/7pGhQuhO+SUhfm2trkJ/S5amjFvem0Y+1EALz/MEPkvHXVNw==", - "dev": true, - "requires": { - "lie": "~3.3.0", - "pako": "~1.0.2", - "readable-stream": "~2.3.6", - "set-immediate-shim": "~1.0.1" - } - }, - "keyv": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", - "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==", - "dev": true, - "requires": { - "json-buffer": "3.0.0" - } - }, - "latest-version": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz", - "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==", - "dev": true, - "requires": { - "package-json": "^6.3.0" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "lazy-val": { @@ -17120,7 +9514,6 @@ "type-check": "~0.4.0" } }, -<<<<<<< HEAD "local-pkg": { "version": "0.4.2", "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.4.2.tgz", @@ -17134,156 +9527,6 @@ "dev": true, "requires": { "p-locate": "^5.0.0" -======= - "lie": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", - "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", - "dev": true, - "requires": { - "immediate": "~3.0.5" - } - }, - "lines-and-columns": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", - "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=", - "dev": true - }, - "lint-staged": { - "version": "11.1.2", - "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-11.1.2.tgz", - "integrity": "sha512-6lYpNoA9wGqkL6Hew/4n1H6lRqF3qCsujVT0Oq5Z4hiSAM7S6NksPJ3gnr7A7R52xCtiZMcEUNNQ6d6X5Bvh9w==", - "dev": true, - "requires": { - "chalk": "^4.1.1", - "cli-truncate": "^2.1.0", - "commander": "^7.2.0", - "cosmiconfig": "^7.0.0", - "debug": "^4.3.1", - "enquirer": "^2.3.6", - "execa": "^5.0.0", - "listr2": "^3.8.2", - "log-symbols": "^4.1.0", - "micromatch": "^4.0.4", - "normalize-path": "^3.0.0", - "please-upgrade-node": "^3.2.0", - "string-argv": "0.3.1", - "stringify-object": "^3.3.0" - }, - "dependencies": { - "cli-truncate": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz", - "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==", - "dev": true, - "requires": { - "slice-ansi": "^3.0.0", - "string-width": "^4.2.0" - } - }, - "commander": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", - "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", - "dev": true - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - }, - "slice-ansi": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", - "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==", - "dev": true, - "requires": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" - } - }, - "string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - } - } - } - }, - "listr2": { - "version": "3.11.0", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.11.0.tgz", - "integrity": "sha512-XLJVe2JgXCyQTa3FbSv11lkKExYmEyA4jltVo8z4FX10Vt1Yj8IMekBfwim0BSOM9uj1QMTJvDQQpHyuPbB/dQ==", - "dev": true, - "requires": { - "cli-truncate": "^2.1.0", - "colorette": "^1.2.2", - "log-update": "^4.0.0", - "p-map": "^4.0.0", - "rxjs": "^6.6.7", - "through": "^2.3.8", - "wrap-ansi": "^7.0.0" - }, - "dependencies": { - "cli-truncate": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz", - "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==", - "dev": true, - "requires": { - "slice-ansi": "^3.0.0", - "string-width": "^4.2.0" - } - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - }, - "slice-ansi": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", - "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==", - "dev": true, - "requires": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" - } - }, - "string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - } - } ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "lodash": { @@ -17292,15 +9535,6 @@ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "dev": true }, -<<<<<<< HEAD -======= - "lodash.clonedeep": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", - "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", - "dev": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "lodash.escaperegexp": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz", @@ -17317,7 +9551,6 @@ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, -<<<<<<< HEAD "loupe": { "version": "2.3.6", "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz", @@ -17348,112 +9581,6 @@ "dev": true, "requires": { "sourcemap-codec": "^1.4.8" -======= - "lodash.truncate": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", - "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=", - "dev": true - }, - "log-symbols": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", - "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", - "dev": true, - "requires": { - "chalk": "^4.1.0", - "is-unicode-supported": "^0.1.0" - } - }, - "log-update": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz", - "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==", - "dev": true, - "requires": { - "ansi-escapes": "^4.3.0", - "cli-cursor": "^3.1.0", - "slice-ansi": "^4.0.0", - "wrap-ansi": "^6.2.0" - }, - "dependencies": { - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - }, - "slice-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", - "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", - "dev": true, - "requires": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" - } - }, - "string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - } - }, - "wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", - "dev": true, - "requires": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - } - } - } - }, - "lowercase-keys": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", - "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==", - "dev": true - }, - "magic-string": { - "version": "0.25.7", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz", - "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==", - "requires": { - "sourcemap-codec": "^1.4.4" - } - }, - "make-dir": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", - "dev": true, - "requires": { - "semver": "^6.0.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "matcher": { @@ -17466,15 +9593,6 @@ "escape-string-regexp": "^4.0.0" } }, -<<<<<<< HEAD -======= - "merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "merge2": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", @@ -17482,7 +9600,6 @@ "dev": true }, "micromatch": { -<<<<<<< HEAD "version": "4.0.5", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", @@ -17513,29 +9630,6 @@ "mime-db": "1.51.0" } }, -======= - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", - "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", - "dev": true, - "requires": { - "braces": "^3.0.1", - "picomatch": "^2.2.3" - } - }, - "mime": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz", - "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==", - "dev": true - }, - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "mimic-response": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", @@ -17543,15 +9637,9 @@ "dev": true }, "minimatch": { -<<<<<<< HEAD "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", -======= - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "requires": { "brace-expansion": "^1.1.7" @@ -17563,7 +9651,6 @@ "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", "dev": true }, -<<<<<<< HEAD "minipass": { "version": "3.3.3", "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.3.tgz", @@ -17593,15 +9680,6 @@ "pathe": "^0.3.8", "pkg-types": "^0.3.5", "ufo": "^0.8.5" -======= - "mkdirp": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", - "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", - "dev": true, - "requires": { - "minimist": "^1.2.5" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "ms": { @@ -17609,7 +9687,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, -<<<<<<< HEAD "muggle-string": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/muggle-string/-/muggle-string-0.2.2.tgz", @@ -17630,17 +9707,6 @@ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", "dev": true -======= - "nanocolors": { - "version": "0.2.12", - "resolved": "https://registry.npmjs.org/nanocolors/-/nanocolors-0.2.12.tgz", - "integrity": "sha512-SFNdALvzW+rVlzqexid6epYdt8H9Zol7xDoQarioEFcFN0JHo4CYNztAxmtfgGTVRCmFlEOqqhBpoFGKqSAMug==" - }, - "nanoid": { - "version": "3.1.28", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.28.tgz", - "integrity": "sha512-gSu9VZ2HtmoKYe/lmyPFES5nknFrHa+/DT9muUFWFMi6Jh9E1I7bkvlQ8xxf1Kos9pi9o8lBnIOkatMhKX/YUw==" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "natural-compare": { "version": "1.4.0", @@ -17648,15 +9714,12 @@ "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", "dev": true }, -<<<<<<< HEAD "natural-compare-lite": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz", "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", "dev": true }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "node-addon-api": { "version": "1.7.2", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz", @@ -17664,7 +9727,6 @@ "dev": true, "optional": true }, -<<<<<<< HEAD "node-fetch": { "version": "2.6.6", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz", @@ -17683,8 +9745,6 @@ "abbrev": "^1.0.0" } }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", @@ -17692,7 +9752,6 @@ "dev": true }, "normalize-url": { -<<<<<<< HEAD "version": "6.1.0", "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==", @@ -17707,39 +9766,6 @@ "boolbase": "^1.0.0" } }, -======= - "version": "4.5.1", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz", - "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==", - "dev": true - }, - "npm-conf": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz", - "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==", - "dev": true, - "optional": true, - "requires": { - "config-chain": "^1.1.11", - "pify": "^3.0.0" - } - }, - "npm-run-path": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", - "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", - "dev": true, - "requires": { - "path-key": "^3.0.0" - } - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "dev": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "object-keys": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", @@ -17756,18 +9782,6 @@ "wrappy": "1" } }, -<<<<<<< HEAD -======= - "onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, - "requires": { - "mimic-fn": "^2.1.0" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "optionator": { "version": "0.9.1", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", @@ -17783,7 +9797,6 @@ } }, "p-cancelable": { -<<<<<<< HEAD "version": "2.1.1", "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz", "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==", @@ -17807,48 +9820,6 @@ "p-limit": "^3.0.2" } }, -======= - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz", - "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==", - "dev": true - }, - "p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", - "dev": true, - "requires": { - "aggregate-error": "^3.0.0" - } - }, - "package-json": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz", - "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==", - "dev": true, - "requires": { - "got": "^9.6.0", - "registry-auth-token": "^4.0.0", - "registry-url": "^5.0.0", - "semver": "^6.2.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, - "pako": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", - "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", - "dev": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", @@ -17858,25 +9829,11 @@ "callsites": "^3.0.0" } }, -<<<<<<< HEAD "path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true -======= - "parse-json": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", - "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "error-ex": "^1.3.1", - "json-parse-even-better-errors": "^2.3.0", - "lines-and-columns": "^1.1.6" - } ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "path-is-absolute": { "version": "1.0.1", @@ -17902,7 +9859,6 @@ "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", "dev": true }, -<<<<<<< HEAD "pathe": { "version": "0.3.9", "resolved": "https://registry.npmjs.org/pathe/-/pathe-0.3.9.tgz", @@ -17967,123 +9923,12 @@ "requires": { "base64-js": "^1.5.1", "xmlbuilder": "^9.0.7" -======= - "pend": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", - "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=", - "dev": true - }, - "picomatch": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", - "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", - "dev": true - }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true, - "optional": true - }, - "playwright": { - "version": "1.15.1", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.15.1.tgz", - "integrity": "sha512-MQaKii1mhfoZF0+HXE4h5s2CwZNJmcASlmI097yosoZ9Fo5RW9RkLN5VMCbSw9xTyoqo6vdE6Df0OFpupYjBow==", - "dev": true, - "requires": { - "commander": "^6.1.0", - "debug": "^4.1.1", - "extract-zip": "^2.0.1", - "https-proxy-agent": "^5.0.0", - "jpeg-js": "^0.4.2", - "mime": "^2.4.6", - "pngjs": "^5.0.0", - "progress": "^2.0.3", - "proper-lockfile": "^4.1.1", - "proxy-from-env": "^1.1.0", - "rimraf": "^3.0.2", - "stack-utils": "^2.0.3", - "ws": "^7.4.6", - "yazl": "^2.5.1" - }, - "dependencies": { - "agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, - "requires": { - "debug": "4" - } - }, - "commander": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", - "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==", - "dev": true - }, - "extract-zip": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", - "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", - "dev": true, - "requires": { - "@types/yauzl": "^2.9.1", - "debug": "^4.1.1", - "get-stream": "^5.1.0", - "yauzl": "^2.10.0" - } - }, - "get-stream": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", - "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "dev": true, - "requires": { - "pump": "^3.0.0" - } - }, - "https-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", - "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", - "dev": true, - "requires": { - "agent-base": "6", - "debug": "4" - } - } - } - }, - "please-upgrade-node": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz", - "integrity": "sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==", - "dev": true, - "requires": { - "semver-compare": "^1.0.0" - } - }, - "plist": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.2.tgz", - "integrity": "sha512-MSrkwZBdQ6YapHy87/8hDU8MnIcyxBKjeF+McXnr5A9MtffPewTs7G3hlpodT5TacyfIyFTaJEhh3GGcmasTgQ==", - "dev": true, - "optional": true, - "requires": { - "base64-js": "^1.5.1", - "xmlbuilder": "^9.0.7", - "xmldom": "^0.5.0" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "dependencies": { "xmlbuilder": { "version": "9.0.7", "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=", -<<<<<<< HEAD "dev": true } } @@ -18107,27 +9952,6 @@ "requires": { "cssesc": "^3.0.0", "util-deprecate": "^1.0.2" -======= - "dev": true, - "optional": true - } - } - }, - "pngjs": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-5.0.0.tgz", - "integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==", - "dev": true - }, - "postcss": { - "version": "8.3.8", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.8.tgz", - "integrity": "sha512-GT5bTjjZnwDifajzczOC+r3FI3Cu+PgPvrsjhQdRqa2kTJ4968/X9CUce9xttIB0xOs5c6xf0TCWZo/y9lF6bA==", - "requires": { - "nanocolors": "^0.2.2", - "nanoid": "^3.1.25", - "source-map-js": "^0.6.2" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "prelude-ls": { @@ -18136,7 +9960,6 @@ "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", "dev": true }, -<<<<<<< HEAD "pretty-format": { "version": "27.5.1", "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", @@ -18155,19 +9978,6 @@ "dev": true } } -======= - "prepend-http": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", - "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", - "dev": true - }, - "process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", - "dev": true ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "progress": { "version": "2.0.3", @@ -18175,7 +9985,6 @@ "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", "dev": true }, -<<<<<<< HEAD "proto-list": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", @@ -18186,163 +9995,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==", -======= - "promise": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", - "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", - "dev": true, - "requires": { - "asap": "~2.0.3" - } - }, - "proper-lockfile": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-4.1.2.tgz", - "integrity": "sha512-TjNPblN4BwAWMXU8s9AEz4JmQxnD1NNL7bNOY/AKUzyamc379FWASUhc/K1pL2noVb+XmZKLL68cjzLsiOAMaA==", - "dev": true, - "requires": { - "graceful-fs": "^4.2.4", - "retry": "^0.12.0", - "signal-exit": "^3.0.2" - } - }, - "proto-list": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", - "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=", - "dev": true, - "optional": true - }, - "proxy-from-env": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", - "dev": true - }, - "pug": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/pug/-/pug-3.0.2.tgz", - "integrity": "sha512-bp0I/hiK1D1vChHh6EfDxtndHji55XP/ZJKwsRqrz6lRia6ZC2OZbdAymlxdVFwd1L70ebrVJw4/eZ79skrIaw==", - "dev": true, - "requires": { - "pug-code-gen": "^3.0.2", - "pug-filters": "^4.0.0", - "pug-lexer": "^5.0.1", - "pug-linker": "^4.0.0", - "pug-load": "^3.0.0", - "pug-parser": "^6.0.0", - "pug-runtime": "^3.0.1", - "pug-strip-comments": "^2.0.0" - } - }, - "pug-attrs": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pug-attrs/-/pug-attrs-3.0.0.tgz", - "integrity": "sha512-azINV9dUtzPMFQktvTXciNAfAuVh/L/JCl0vtPCwvOA21uZrC08K/UnmrL+SXGEVc1FwzjW62+xw5S/uaLj6cA==", - "dev": true, - "requires": { - "constantinople": "^4.0.1", - "js-stringify": "^1.0.2", - "pug-runtime": "^3.0.0" - } - }, - "pug-code-gen": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-3.0.2.tgz", - "integrity": "sha512-nJMhW16MbiGRiyR4miDTQMRWDgKplnHyeLvioEJYbk1RsPI3FuA3saEP8uwnTb2nTJEKBU90NFVWJBk4OU5qyg==", - "dev": true, - "requires": { - "constantinople": "^4.0.1", - "doctypes": "^1.1.0", - "js-stringify": "^1.0.2", - "pug-attrs": "^3.0.0", - "pug-error": "^2.0.0", - "pug-runtime": "^3.0.0", - "void-elements": "^3.1.0", - "with": "^7.0.0" - } - }, - "pug-error": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pug-error/-/pug-error-2.0.0.tgz", - "integrity": "sha512-sjiUsi9M4RAGHktC1drQfCr5C5eriu24Lfbt4s+7SykztEOwVZtbFk1RRq0tzLxcMxMYTBR+zMQaG07J/btayQ==", - "dev": true - }, - "pug-filters": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/pug-filters/-/pug-filters-4.0.0.tgz", - "integrity": "sha512-yeNFtq5Yxmfz0f9z2rMXGw/8/4i1cCFecw/Q7+D0V2DdtII5UvqE12VaZ2AY7ri6o5RNXiweGH79OCq+2RQU4A==", - "dev": true, - "requires": { - "constantinople": "^4.0.1", - "jstransformer": "1.0.0", - "pug-error": "^2.0.0", - "pug-walk": "^2.0.0", - "resolve": "^1.15.1" - } - }, - "pug-lexer": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/pug-lexer/-/pug-lexer-5.0.1.tgz", - "integrity": "sha512-0I6C62+keXlZPZkOJeVam9aBLVP2EnbeDw3An+k0/QlqdwH6rv8284nko14Na7c0TtqtogfWXcRoFE4O4Ff20w==", - "dev": true, - "requires": { - "character-parser": "^2.2.0", - "is-expression": "^4.0.0", - "pug-error": "^2.0.0" - } - }, - "pug-linker": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/pug-linker/-/pug-linker-4.0.0.tgz", - "integrity": "sha512-gjD1yzp0yxbQqnzBAdlhbgoJL5qIFJw78juN1NpTLt/mfPJ5VgC4BvkoD3G23qKzJtIIXBbcCt6FioLSFLOHdw==", - "dev": true, - "requires": { - "pug-error": "^2.0.0", - "pug-walk": "^2.0.0" - } - }, - "pug-load": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pug-load/-/pug-load-3.0.0.tgz", - "integrity": "sha512-OCjTEnhLWZBvS4zni/WUMjH2YSUosnsmjGBB1An7CsKQarYSWQ0GCVyd4eQPMFJqZ8w9xgs01QdiZXKVjk92EQ==", - "dev": true, - "requires": { - "object-assign": "^4.1.1", - "pug-walk": "^2.0.0" - } - }, - "pug-parser": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/pug-parser/-/pug-parser-6.0.0.tgz", - "integrity": "sha512-ukiYM/9cH6Cml+AOl5kETtM9NR3WulyVP2y4HOU45DyMim1IeP/OOiyEWRr6qk5I5klpsBnbuHpwKmTx6WURnw==", - "dev": true, - "requires": { - "pug-error": "^2.0.0", - "token-stream": "1.0.0" - } - }, - "pug-runtime": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/pug-runtime/-/pug-runtime-3.0.1.tgz", - "integrity": "sha512-L50zbvrQ35TkpHwv0G6aLSuueDRwc/97XdY8kL3tOT0FmhgG7UypU3VztfV/LATAvmUfYi4wNxSajhSAeNN+Kg==", - "dev": true - }, - "pug-strip-comments": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-2.0.0.tgz", - "integrity": "sha512-zo8DsDpH7eTkPHCXFeAk1xZXJbyoTfdPlNR0bK7rpOMuhBYb0f5qUVCO1xlsitYd3w5FQTK7zpNVKb3rZoUrrQ==", - "dev": true, - "requires": { - "pug-error": "^2.0.0" - } - }, - "pug-walk": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pug-walk/-/pug-walk-2.0.0.tgz", - "integrity": "sha512-yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true }, "pump": { @@ -18361,25 +10013,12 @@ "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", "dev": true }, -<<<<<<< HEAD -======= - "pupa": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz", - "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==", - "dev": true, - "requires": { - "escape-goat": "^2.0.0" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", "dev": true }, -<<<<<<< HEAD "quick-lru": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", @@ -18391,27 +10030,6 @@ "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", "dev": true -======= - "rc": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", - "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", - "dev": true, - "requires": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "dependencies": { - "strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", - "dev": true - } - } ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "read-config-file": { "version": "6.2.0", @@ -18424,7 +10042,6 @@ "js-yaml": "^4.1.0", "json5": "^2.2.0", "lazy-val": "^1.0.4" -<<<<<<< HEAD } }, "readdirp": { @@ -18436,73 +10053,12 @@ "picomatch": "^2.2.1" } }, -======= - }, - "dependencies": { - "json5": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", - "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", - "dev": true, - "requires": { - "minimist": "^1.2.5" - } - } - } - }, - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "regexpp": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", - "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", - "dev": true - }, - "registry-auth-token": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.1.tgz", - "integrity": "sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==", - "dev": true, - "requires": { - "rc": "^1.2.8" - } - }, - "registry-url": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz", - "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==", - "dev": true, - "requires": { - "rc": "^1.2.8" - } - }, - "request-light": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.5.4.tgz", - "integrity": "sha512-t3566CMweOFlUk7Y1DJMu5OrtpoZEb6aSTsLQVT3wtrIEJ5NhcY9G/Oqxvjllzl4a15zXfFlcr9q40LbLVQJqw==", - "dev": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", "dev": true }, -<<<<<<< HEAD "resolve": { "version": "1.22.1", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", @@ -18520,24 +10076,6 @@ "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==", "dev": true }, -======= - "require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", - "dev": true - }, - "resolve": { - "version": "1.20.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", - "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", - "dev": true, - "requires": { - "is-core-module": "^2.2.0", - "path-parse": "^1.0.6" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "resolve-from": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", @@ -18545,7 +10083,6 @@ "dev": true }, "responselike": { -<<<<<<< HEAD "version": "2.0.1", "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz", "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==", @@ -18554,32 +10091,6 @@ "lowercase-keys": "^2.0.0" } }, -======= - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", - "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", - "dev": true, - "requires": { - "lowercase-keys": "^1.0.0" - } - }, - "restore-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", - "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", - "dev": true, - "requires": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" - } - }, - "retry": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", - "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=", - "dev": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "reusify": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", @@ -18611,15 +10122,9 @@ } }, "rollup": { -<<<<<<< HEAD "version": "3.12.1", "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.12.1.tgz", "integrity": "sha512-t9elERrz2i4UU9z7AwISj3CQcXP39cWxgRWLdf4Tm6aKm1eYrqHIgjzXBgb67GNY1sZckTFFi0oMozh3/S++Ig==", -======= - "version": "2.57.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.57.0.tgz", - "integrity": "sha512-bKQIh1rWKofRee6mv8SrF2HdP6pea5QkwBZSMImJysFj39gQuiV8MEPBjXOCpzk3wSYp63M2v2wkWBmFC8O/rg==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "requires": { "fsevents": "~2.3.2" @@ -18635,7 +10140,6 @@ } }, "rxjs": { -<<<<<<< HEAD "version": "7.5.5", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz", "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==", @@ -18644,30 +10148,6 @@ "tslib": "^2.1.0" } }, -======= - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - }, - "dependencies": { - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - } - } - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", @@ -18689,64 +10169,19 @@ "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" }, "semver": { -<<<<<<< HEAD "version": "7.3.7", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", "requires": { "lru-cache": "^6.0.0" -======= - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", - "requires": { - "lru-cache": "^6.0.0" - }, - "dependencies": { - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "requires": { - "yallist": "^4.0.0" - } - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - } ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "semver-compare": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz", -<<<<<<< HEAD "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==", "dev": true, "optional": true -======= - "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=", - "dev": true - }, - "semver-diff": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz", - "integrity": "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==", - "dev": true, - "requires": { - "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "serialize-error": { "version": "7.0.1", @@ -18767,15 +10202,6 @@ } } }, -<<<<<<< HEAD -======= - "set-immediate-shim": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", - "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=", - "dev": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -18791,7 +10217,6 @@ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true }, -<<<<<<< HEAD "siginfo": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz", @@ -18827,20 +10252,6 @@ } } }, -======= - "signal-exit": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", - "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==", - "dev": true - }, - "simple-git-hooks": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/simple-git-hooks/-/simple-git-hooks-2.6.1.tgz", - "integrity": "sha512-nvqaNfgvcjN3cGSYJSdjwB+tP8YKRCyvuUvQ24luIjIpGhUCPpZDTJ+p+hcJiwc0lZlTCl0NayfBVDoIMG7Jpg==", - "dev": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", @@ -18848,7 +10259,6 @@ "dev": true }, "slice-ansi": { -<<<<<<< HEAD "version": "3.0.0", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==", @@ -18864,28 +10274,12 @@ "version": "4.2.0", "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", -======= - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz", - "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==", - "dev": true, - "optional": true, - "requires": { - "is-fullwidth-code-point": "^2.0.0" - } - }, - "smart-buffer": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.1.0.tgz", - "integrity": "sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "optional": true }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", -<<<<<<< HEAD "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true }, @@ -18899,19 +10293,6 @@ "version": "0.5.21", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", -======= - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - }, - "source-map-js": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz", - "integrity": "sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==" - }, - "source-map-support": { - "version": "0.5.19", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", - "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "requires": { "buffer-from": "^1.0.0", @@ -18921,12 +10302,8 @@ "sourcemap-codec": { "version": "1.4.8", "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz", -<<<<<<< HEAD "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==", "dev": true -======= - "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "sprintf-js": { "version": "1.1.2", @@ -18935,30 +10312,11 @@ "dev": true, "optional": true }, -<<<<<<< HEAD "stackback": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz", "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==", "dev": true -======= - "stack-utils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.3.tgz", - "integrity": "sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==", - "dev": true, - "requires": { - "escape-string-regexp": "^2.0.0" - }, - "dependencies": { - "escape-string-regexp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", - "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", - "dev": true - } - } ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "stat-mode": { "version": "1.0.0", @@ -18966,7 +10324,6 @@ "integrity": "sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg==", "dev": true }, -<<<<<<< HEAD "std-env": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.3.1.tgz", @@ -18993,86 +10350,12 @@ "ansi-regex": "^5.0.1" } }, -======= - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } - }, - "string-argv": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz", - "integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "optional": true, - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true, - "optional": true - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "optional": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - }, - "stringify-object": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz", - "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==", - "dev": true, - "requires": { - "get-own-enumerable-property-symbols": "^3.0.0", - "is-obj": "^1.0.1", - "is-regexp": "^1.0.0" - } - }, - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.0" - } - }, - "strip-final-newline": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", - "dev": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "strip-json-comments": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true }, -<<<<<<< HEAD "strip-literal": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-1.0.0.tgz", @@ -19082,8 +10365,6 @@ "acorn": "^8.8.1" } }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "sumchecker": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz", @@ -19102,7 +10383,6 @@ "has-flag": "^4.0.0" } }, -<<<<<<< HEAD "supports-preserve-symlinks-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", @@ -19128,73 +10408,6 @@ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", "dev": true -======= - "table": { - "version": "6.7.1", - "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz", - "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==", - "dev": true, - "requires": { - "ajv": "^8.0.1", - "lodash.clonedeep": "^4.5.0", - "lodash.truncate": "^4.4.2", - "slice-ansi": "^4.0.0", - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0" - }, - "dependencies": { - "ajv": { - "version": "8.6.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.2.tgz", - "integrity": "sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" - } - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - }, - "json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true - }, - "slice-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", - "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", - "dev": true, - "requires": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" - } - }, - "string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - } ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } } }, @@ -19209,15 +10422,9 @@ }, "dependencies": { "fs-extra": { -<<<<<<< HEAD "version": "10.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", -======= - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", - "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "requires": { "graceful-fs": "^4.2.0", @@ -19249,7 +10456,6 @@ "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", "dev": true }, -<<<<<<< HEAD "tinybench": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.3.1.tgz", @@ -19266,12 +10472,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-1.0.2.tgz", "integrity": "sha512-bSGlgwLBYf7PnUsQ6WOc6SJ3pGOcd+d8AA6EUnLDDM0kWEstC1JIlSZA3UNliDXhd9ABoS7hiRBDCu+XP/sf1Q==", -======= - "through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true }, "tmp": { @@ -19284,35 +10484,14 @@ } }, "tmp-promise": { -<<<<<<< HEAD "version": "3.0.3", "resolved": "https://registry.npmjs.org/tmp-promise/-/tmp-promise-3.0.3.tgz", "integrity": "sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ==", -======= - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/tmp-promise/-/tmp-promise-3.0.2.tgz", - "integrity": "sha512-OyCLAKU1HzBjL6Ev3gxUeraJNlbNingmi8IrHHEsYH8LTmEuhvYfqvhn2F/je+mjf4N58UmZ96OMEy1JanSCpA==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "requires": { "tmp": "^0.2.0" } }, -<<<<<<< HEAD -======= - "to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", - "dev": true - }, - "to-readable-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz", - "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==", - "dev": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -19322,17 +10501,10 @@ "is-number": "^7.0.0" } }, -<<<<<<< HEAD "tr46": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=", -======= - "token-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/token-stream/-/token-stream-1.0.0.tgz", - "integrity": "sha1-zCAOqyYT9BZtJ/+a/HylbUnfbrQ=", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true }, "truncate-utf8-bytes": { @@ -19345,17 +10517,10 @@ } }, "tslib": { -<<<<<<< HEAD "version": "2.3.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", "optional": true -======= - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz", - "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==", - "dev": true ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "tsutils": { "version": "3.21.0", @@ -19374,16 +10539,6 @@ } } }, -<<<<<<< HEAD -======= - "tunnel": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz", - "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==", - "dev": true, - "optional": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", @@ -19393,22 +10548,18 @@ "prelude-ls": "^1.2.1" } }, -<<<<<<< HEAD "type-detect": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", "dev": true }, -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "type-fest": { "version": "0.20.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", "dev": true }, -<<<<<<< HEAD "typed-emitter": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/typed-emitter/-/typed-emitter-2.1.0.tgz", @@ -19428,37 +10579,6 @@ "resolved": "https://registry.npmjs.org/ufo/-/ufo-0.8.5.tgz", "integrity": "sha512-e4+UtA5IRO+ha6hYklwj6r7BjiGMxS0O+UaSg9HbaTefg4kMkzj4tXzEBajRR+wkxf+golgAWKzLbytCUDMJAA==", "dev": true -======= - "typedarray": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", - "dev": true - }, - "typedarray-to-buffer": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", - "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", - "dev": true, - "requires": { - "is-typedarray": "^1.0.0" - } - }, - "typescript": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.2.tgz", - "integrity": "sha512-gzP+t5W4hdy4c+68bfcv0t400HVJMMd2+H9B7gae1nQlBzCqvrXX+6GL/b3GAgyTH966pzrZ70/fRjwAtZksSQ==", - "dev": true - }, - "unique-string": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz", - "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==", - "dev": true, - "requires": { - "crypto-random-string": "^2.0.0" - } ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, "universalify": { "version": "0.1.2", @@ -19466,7 +10586,6 @@ "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", "dev": true }, -<<<<<<< HEAD "unplugin": { "version": "0.10.2", "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-0.10.2.tgz", @@ -19497,60 +10616,6 @@ "dev": true, "requires": { "sourcemap-codec": "^1.4.8" -======= - "unzip-crx-3": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/unzip-crx-3/-/unzip-crx-3-0.2.0.tgz", - "integrity": "sha512-0+JiUq/z7faJ6oifVB5nSwt589v1KCduqIJupNVDoWSXZtWDmjDGO3RAEOvwJ07w90aoXoP4enKsR7ecMrJtWQ==", - "dev": true, - "requires": { - "jszip": "^3.1.0", - "mkdirp": "^0.5.1", - "yaku": "^0.16.6" - } - }, - "upath": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/upath/-/upath-2.0.1.tgz", - "integrity": "sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==", - "dev": true - }, - "update-notifier": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-5.1.0.tgz", - "integrity": "sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw==", - "dev": true, - "requires": { - "boxen": "^5.0.0", - "chalk": "^4.1.0", - "configstore": "^5.0.1", - "has-yarn": "^2.1.0", - "import-lazy": "^2.1.0", - "is-ci": "^2.0.0", - "is-installed-globally": "^0.4.0", - "is-npm": "^5.0.0", - "is-yarn-global": "^0.3.0", - "latest-version": "^5.1.0", - "pupa": "^2.1.1", - "semver": "^7.3.4", - "semver-diff": "^3.1.1", - "xdg-basedir": "^4.0.0" - }, - "dependencies": { - "ci-info": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", - "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==", - "dev": true - }, - "is-ci": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", - "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==", - "dev": true, - "requires": { - "ci-info": "^2.0.0" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } } } @@ -19564,18 +10629,6 @@ "punycode": "^2.1.0" } }, -<<<<<<< HEAD -======= - "url-parse-lax": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", - "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", - "dev": true, - "requires": { - "prepend-http": "^2.0.0" - } - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "utf8-byte-length": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz", @@ -19588,30 +10641,16 @@ "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "dev": true }, -<<<<<<< HEAD "verror": { "version": "1.10.1", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.1.tgz", "integrity": "sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg==", -======= - "v8-compile-cache": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", - "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", - "dev": true - }, - "verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "optional": true, "requires": { "assert-plus": "^1.0.0", "core-util-is": "1.0.2", "extsprintf": "^1.2.0" -<<<<<<< HEAD }, "dependencies": { "core-util-is": { @@ -19683,75 +10722,10 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.0.1.tgz", "integrity": "sha512-boAm74ubXHY7KJQZLlXrtMz52qFvpsbOxDcZOnw/Wf+LS4Mmyu7JxmzD4tDLtUQtmZECypJ0FrCz4QIe6dvKRA==", -======= - } - }, - "vite": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/vite/-/vite-2.6.2.tgz", - "integrity": "sha512-HSIg9U15LOnbD3CUxX364Pdrm7DUjftuBljowGxvkFHgDZU/SKPqApg9t86MX/Qq1VCO7wS+mGJHlfuTF7c0Sg==", - "dev": true, - "requires": { - "esbuild": "^0.13.2", - "fsevents": "~2.3.2", - "postcss": "^8.3.8", - "resolve": "^1.20.0", - "rollup": "^2.57.0" - } - }, - "void-elements": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz", - "integrity": "sha1-YU9/v42AHwu18GYfWy9XhXUOTwk=", - "dev": true - }, - "vscode-css-languageservice": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-5.1.4.tgz", - "integrity": "sha512-fIJZJMXbaBsK0ifBb2RmSiLtzwn6NrZnKn7O+0ziIjwAY+rPvSK9St2qqQXFU3reZVRAt/I4GBp40dC/THcUDA==", - "dev": true, - "requires": { - "vscode-languageserver-textdocument": "^1.0.1", - "vscode-languageserver-types": "^3.16.0", - "vscode-nls": "^5.0.0", - "vscode-uri": "^3.0.2" - } - }, - "vscode-html-languageservice": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-4.0.7.tgz", - "integrity": "sha512-P5TQMYpgxAdLs+PwpC7Lm+0lXCyQAC6kZ41YuPYNHVooC4XO7Y2+ncHBcQJVK4C9LU2cTOAl0lzq4WAxuwRHYw==", - "dev": true, - "requires": { - "vscode-languageserver-textdocument": "^1.0.1", - "vscode-languageserver-types": "^3.16.0", - "vscode-nls": "^5.0.0", - "vscode-uri": "^3.0.2" - } - }, - "vscode-json-languageservice": { - "version": "4.1.6", - "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.1.6.tgz", - "integrity": "sha512-DIKb3tcfRtb3tIE6g9SLOl5E9tNSt6kljH08Wa5RwFlVshtXGrDDzttchze4CYy9pJpE9mBtCbRHmLvY1Z1ZXA==", - "dev": true, - "requires": { - "jsonc-parser": "^3.0.0", - "vscode-languageserver-textdocument": "^1.0.1", - "vscode-languageserver-types": "^3.16.0", - "vscode-nls": "^5.0.0", - "vscode-uri": "^3.0.2" - }, - "dependencies": { - "jsonc-parser": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz", - "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true } } }, -<<<<<<< HEAD "vitest": { "version": "0.29.3", "resolved": "https://registry.npmjs.org/vitest/-/vitest-0.29.3.tgz", @@ -19788,42 +10762,10 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.0.tgz", "integrity": "sha512-ODbEPR0KKHqECXW1GoxdDb+AZvULmXjVPy4rt+pGo2+TnjJTIPJQSVS6N63n8T2Ip+syHhbn52OewKicV0373w==", -======= - "vscode-jsonrpc": { - "version": "8.0.0-next.2", - "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.0-next.2.tgz", - "integrity": "sha512-gxUyTBAjmwGkiHW/UaRScre2s4i98P8M7gnc3VB4DrVQUm3vQ0idi2cN9nbkfcjATx+uEt8C22j+MLN/8UzsJA==", - "dev": true - }, - "vscode-languageserver": { - "version": "8.0.0-next.2", - "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.0.0-next.2.tgz", - "integrity": "sha512-7qCEXTeGZKkI8BGvlKh0JPXTY7BaWoiwQYKCcGaUgnMs34wt6F/yaKcxoC3XIouBBVyRxiI6Ml/JdztM3XYEaA==", - "dev": true, - "requires": { - "vscode-languageserver-protocol": "3.17.0-next.8" - } - }, - "vscode-languageserver-protocol": { - "version": "3.17.0-next.8", - "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.0-next.8.tgz", - "integrity": "sha512-P89vSuJ+FA5JzFmcOoZN13Ig1yd6LsiPOig0O5m5BSGuO/rplQegCd9J0wKpaTy7trf/SYHRoypnbUBdzy14sg==", - "dev": true, - "requires": { - "vscode-jsonrpc": "8.0.0-next.2", - "vscode-languageserver-types": "3.17.0-next.3" - }, - "dependencies": { - "vscode-languageserver-types": { - "version": "3.17.0-next.3", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0-next.3.tgz", - "integrity": "sha512-VQcXnhKYxUW6OiRMhG++SzmZYMJwusXknJGd+FfdOnS1yHAo734OHyR0e2eEHDlv0/oWc8RZPgx/VKSKyondVg==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true } } }, -<<<<<<< HEAD "vue": { "version": "3.2.47", "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.47.tgz", @@ -19866,139 +10808,10 @@ "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", -======= - "vscode-languageserver-textdocument": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.1.tgz", - "integrity": "sha512-UIcJDjX7IFkck7cSkNNyzIz5FyvpQfY7sdzVy+wkKN/BLaD4DQ0ppXQrKePomCxTS7RrolK1I0pey0bG9eh8dA==", - "dev": true - }, - "vscode-languageserver-types": { - "version": "3.16.0", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz", - "integrity": "sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==", - "dev": true - }, - "vscode-nls": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.0.0.tgz", - "integrity": "sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA==", - "dev": true - }, - "vscode-pug-languageservice": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/vscode-pug-languageservice/-/vscode-pug-languageservice-0.27.1.tgz", - "integrity": "sha512-zUrcrcizqxxP7UIplzkdpdhU6bS458Vf9MS+fFaaR1WI/rVJOsXh5ETMrVeHTD0FHqAIstikuNoKEpuaaHkEXA==", - "dev": true, - "requires": { - "@volar/code-gen": "^0.27.1", - "@volar/shared": "^0.27.1", - "@volar/source-map": "^0.27.1", - "@volar/transforms": "^0.27.1", - "pug-lexer": "^5.0.1", - "pug-parser": "^6.0.0", - "vscode-languageserver": "^8.0.0-next.1" - } - }, - "vscode-typescript-languageservice": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/vscode-typescript-languageservice/-/vscode-typescript-languageservice-0.27.1.tgz", - "integrity": "sha512-lIXLyYpcO4+9mzFrgTkRgrWYDLlV+kv+3/vmipEvF4QbiKHWcA0l5AOSJcPR/IUeZz6mu9eoawpOjPsbp9HKqw==", - "dev": true, - "requires": { - "@volar/shared": "^0.27.1", - "upath": "^2.0.1", - "vscode-languageserver": "^8.0.0-next.1", - "vscode-languageserver-textdocument": "^1.0.1" - } - }, - "vscode-uri": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.2.tgz", - "integrity": "sha512-jkjy6pjU1fxUvI51P+gCsxg1u2n8LSt0W6KrCNQceaziKzff74GoWmjVG46KieVzybO1sttPQmYfrwSHey7GUA==", - "dev": true - }, - "vscode-vue-languageservice": { - "version": "0.27.1", - "resolved": "https://registry.npmjs.org/vscode-vue-languageservice/-/vscode-vue-languageservice-0.27.1.tgz", - "integrity": "sha512-32I6OCEvgxQpRW/Txod2+5xNKpae1BS+EFXjXpxK0TMFT3NYrJYXo0xVaddlV9+IZcVmH5KdoBia7J3CO4H74Q==", - "dev": true, - "requires": { - "@volar/code-gen": "^0.27.1", - "@volar/html2pug": "^0.27.1", - "@volar/shared": "^0.27.1", - "@volar/source-map": "^0.27.1", - "@volar/transforms": "^0.27.1", - "@vscode/emmet-helper": "^2.7.0", - "@vue/compiler-dom": "^3.2.2", - "@vue/compiler-sfc": "^3.2.2", - "@vue/reactivity": "^3.2.2", - "@vue/shared": "^3.2.2", - "request-light": "^0.5.4", - "upath": "^2.0.1", - "vscode-css-languageservice": "^5.1.4", - "vscode-html-languageservice": "^4.0.7", - "vscode-json-languageservice": "^4.1.5", - "vscode-languageserver": "^8.0.0-next.1", - "vscode-languageserver-textdocument": "^1.0.1", - "vscode-pug-languageservice": "^0.27.1", - "vscode-typescript-languageservice": "^0.27.1" - } - }, - "vue": { - "version": "3.2.19", - "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.19.tgz", - "integrity": "sha512-6KAMdIfAtlK+qohTIUE4urwAv4A3YRuo8uAbByApUmiB0CziGAAPs6qVugN6oHPia8YIafHB/37K0O6KZ7sGmA==", - "requires": { - "@vue/compiler-dom": "3.2.19", - "@vue/compiler-sfc": "3.2.19", - "@vue/runtime-dom": "3.2.19", - "@vue/server-renderer": "3.2.19", - "@vue/shared": "3.2.19" - } - }, - "vue-eslint-parser": { - "version": "7.10.0", - "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.10.0.tgz", - "integrity": "sha512-7tc/ewS9Vq9Bn741pvpg8op2fWJPH3k32aL+jcIcWGCTzh/zXSdh7pZ5FV3W2aJancP9+ftPAv292zY5T5IPCg==", - "dev": true, - "requires": { - "debug": "^4.1.1", - "eslint-scope": "^5.1.1", - "eslint-visitor-keys": "^1.1.0", - "espree": "^6.2.1", - "esquery": "^1.4.0", - "lodash": "^4.17.21", - "semver": "^6.3.0" - }, - "dependencies": { - "eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true - }, - "espree": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz", - "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==", - "dev": true, - "requires": { - "acorn": "^7.1.1", - "acorn-jsx": "^5.2.0", - "eslint-visitor-keys": "^1.1.0" - } - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true } } }, -<<<<<<< HEAD "vue-template-compiler": { "version": "2.7.14", "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.14.tgz", @@ -20068,23 +10881,6 @@ "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=", "dev": true } -======= - "vue-router": { - "version": "4.0.11", - "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.0.11.tgz", - "integrity": "sha512-sha6I8fx9HWtvTrFZfxZkiQQBpqSeT+UCwauYjkdOQYRvwsGwimlQQE2ayqUwuuXGzquFpCPoXzYKWlzL4OuXg==", - "requires": { - "@vue/devtools-api": "^6.0.0-beta.14" - } - }, - "vue-tsc": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-0.3.0.tgz", - "integrity": "sha512-zaDRZBxwRIz1XjhNP92FqugG71st6BUMnA2EwPeXrAyzbEYVRz6TezNFceYl3QYqqN8CtaxbqUhaQEDj/ntoCA==", - "dev": true, - "requires": { - "vscode-vue-languageservice": "^0.27.0" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "which": { @@ -20096,7 +10892,6 @@ "isexe": "^2.0.0" } }, -<<<<<<< HEAD "why-is-node-running": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.2.2.tgz", @@ -20105,52 +10900,6 @@ "requires": { "siginfo": "^2.0.0", "stackback": "0.0.2" -======= - "widest-line": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz", - "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==", - "dev": true, - "requires": { - "string-width": "^4.0.0" - }, - "dependencies": { - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - }, - "string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - } - } - } - }, - "with": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/with/-/with-7.0.2.tgz", - "integrity": "sha512-RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w==", - "dev": true, - "requires": { - "@babel/parser": "^7.9.6", - "@babel/types": "^7.9.6", - "assert-never": "^1.2.1", - "babel-walk": "3.0.0-canary-5" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "word-wrap": { @@ -20168,34 +10917,6 @@ "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" -<<<<<<< HEAD -======= - }, - "dependencies": { - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - }, - "string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - } - } ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } }, "wrappy": { @@ -20204,36 +10925,10 @@ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "dev": true }, -<<<<<<< HEAD "xml-name-validator": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz", "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==", -======= - "write-file-atomic": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", - "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", - "dev": true, - "requires": { - "imurmurhash": "^0.1.4", - "is-typedarray": "^1.0.0", - "signal-exit": "^3.0.2", - "typedarray-to-buffer": "^3.1.5" - } - }, - "ws": { - "version": "7.5.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz", - "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==", - "dev": true, - "requires": {} - }, - "xdg-basedir": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", - "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true }, "xmlbuilder": { @@ -20243,23 +10938,12 @@ "dev": true, "optional": true }, -<<<<<<< HEAD -======= - "xmldom": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.5.0.tgz", - "integrity": "sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA==", - "dev": true, - "optional": true - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", "dev": true }, -<<<<<<< HEAD "yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", @@ -20284,96 +10968,23 @@ "version": "21.0.0", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.0.tgz", "integrity": "sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA==", -======= - "yaku": { - "version": "0.16.7", - "resolved": "https://registry.npmjs.org/yaku/-/yaku-0.16.7.tgz", - "integrity": "sha1-HRlceKqbW/hHnIlblQT9TwhHmE4=", - "dev": true - }, - "yaml": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", - "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", - "dev": true - }, - "yargs": { - "version": "17.0.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.0.1.tgz", - "integrity": "sha512-xBBulfCc8Y6gLFcrPvtqKz9hz8SO0l1Ni8GgDekvBX2ro0HRQImDGnikfc33cgzcYUSncapnNcZDjVFIH3f6KQ==", - "dev": true, - "requires": { - "cliui": "^7.0.2", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.0", - "y18n": "^5.0.5", - "yargs-parser": "^20.2.2" - }, - "dependencies": { - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - }, - "string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - } - } - } - }, - "yargs-parser": { - "version": "20.2.9", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", - "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true }, "yauzl": { "version": "2.10.0", "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", -<<<<<<< HEAD "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", -======= - "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=", ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "dev": true, "requires": { "buffer-crc32": "~0.2.3", "fd-slicer": "~1.1.0" } }, -<<<<<<< HEAD "yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", "dev": true -======= - "yazl": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.5.1.tgz", - "integrity": "sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==", - "dev": true, - "requires": { - "buffer-crc32": "~0.2.3" - } ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } } } diff --git a/webapp/package.json b/webapp/package.json index 4c51397f3..fb7ba68ee 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -1,6 +1,5 @@ { "name": "alas", -<<<<<<< HEAD "description": "AzurLaneAutoScript desktop app", "version": "0.4.0", "private": true, @@ -84,61 +83,5 @@ "vue-i18n": "^9.2.2", "vue-router": "^4.1.6", "yaml": "^2.2.1" -======= - "private": true, - "engines": { - "node": ">=v14.14", - "npm": ">=7.7" - }, - "main": "packages/main/dist/index.cjs", - "scripts": { - "build": "node scripts/build.js", - "precompile": "cross-env MODE=production npm run build", - "compile": "electron-builder build --config electron-builder.config.js --dir", - "pretest": "npm run build", - "test": "node tests/app.spec.js", - "watch": "node scripts/watch.js", - "lint": "eslint . --ext js,ts,vue", - "typecheck-main": "tsc --noEmit -p packages/main/tsconfig.json", - "typecheck-preload": "tsc --noEmit -p packages/preload/tsconfig.json", - "typecheck-renderer": "vue-tsc --noEmit -p packages/renderer/tsconfig.json", - "typecheck": "npm run typecheck-main && npm run typecheck-preload && npm run typecheck-renderer" - }, - "browserslist": [ - "Chrome 94" - ], - "simple-git-hooks": { - "pre-commit": "npx lint-staged", - "pre-push": "npm run typecheck" - }, - "lint-staged": { - "*.{js,ts,vue}": "eslint --cache --fix" - }, - "devDependencies": { - "@types/electron-devtools-installer": "2.2.0", - "@typescript-eslint/eslint-plugin": "4.32.0", - "@vitejs/plugin-vue": "1.9.2", - "cross-env": "7.0.3", - "electron": "15.1.0", - "electron-builder": "22.11.7", - "electron-devtools-installer": "3.2.0", - "eslint": "7.32.0", - "eslint-plugin-vue": "7.18.0", - "lint-staged": "11.1.2", - "playwright": "1.15.1", - "simple-git-hooks": "2.6.1", - "typescript": "4.4.2", - "vite": "2.6.2", - "vue-tsc": "0.3.0" - }, - "dependencies": { - "@ant-design/icons-vue": "^6.0.1", - "electron-updater": "4.6.0", - "python-shell": "^3.0.0", - "tree-kill": "^1.2.2", - "vue": "3.2.19", - "vue-router": "4.0.11", - "yaml": "^1.10.2" ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } } diff --git a/webapp/packages/main/src/config.ts b/webapp/packages/main/src/config.ts index 0f19a2c8e..15fb030a7 100644 --- a/webapp/packages/main/src/config.ts +++ b/webapp/packages/main/src/config.ts @@ -1,4 +1,3 @@ -<<<<<<< HEAD import {isMacintosh} from '@common/utils/env'; import getAlasABSPath from '@common/utils/getAlasABSPath'; import {ALAS_INSTR_FILE} from '@common/constant/config'; @@ -6,13 +5,10 @@ import {validateConfigFile} from '@common/utils/validate'; import {join} from 'path'; import logger from '/@/logger'; -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 const yaml = require('yaml'); const fs = require('fs'); const path = require('path'); -<<<<<<< HEAD function getAlasPath() { let file; const currentFilePath = process.cwd(); @@ -87,18 +83,3 @@ export const dpiScaling = export const webuiTheme = ThemeObj[Theme] || 'light'; export const noSandbox = config.Deploy.Webui.NoSandbox; -======= -// export const alasPath = 'D:/AzurLaneAutoScript'; -export const alasPath = process.cwd(); - -const file = fs.readFileSync(path.join(alasPath, './config/deploy.yaml'), 'utf8'); -const config = yaml.parse(file); -const PythonExecutable = config.Deploy.Python.PythonExecutable; -const WebuiPort = config.Deploy.Webui.WebuiPort.toString(); - -export const pythonPath = (path.isAbsolute(PythonExecutable) ? PythonExecutable : path.join(alasPath, PythonExecutable)); -export const webuiUrl = `http://127.0.0.1:${WebuiPort}`; -export const webuiPath = 'gui.py'; -export const webuiArgs = ['--port', WebuiPort, '--electron']; -export const dpiScaling = Boolean(config.Deploy.Webui.DpiScaling) || (config.Deploy.Webui.DpiScaling === undefined) ; ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 diff --git a/webapp/packages/main/src/index.ts b/webapp/packages/main/src/index.ts index 87bedad3d..af5204aa9 100644 --- a/webapp/packages/main/src/index.ts +++ b/webapp/packages/main/src/index.ts @@ -1,4 +1,3 @@ -<<<<<<< HEAD import {app, BrowserWindow} from 'electron'; import './security-restrictions'; import {createApp} from '/@/createApp'; @@ -128,215 +127,3 @@ app.on('activate', async () => { curWindow.focus(); } }); -======= -import {app, Menu, Tray, BrowserWindow, ipcMain, globalShortcut} from 'electron'; -import {URL} from 'url'; -import {PyShell} from '/@/pyshell'; -import {webuiArgs, webuiPath, dpiScaling} from '/@/config'; - -const path = require('path'); - -const isSingleInstance = app.requestSingleInstanceLock(); - -if (!isSingleInstance) { - app.quit(); - process.exit(0); -} - -app.disableHardwareAcceleration(); - -// Install "Vue.js devtools" -if (import.meta.env.MODE === 'development') { - app.whenReady() - .then(() => import('electron-devtools-installer')) - .then(({default: installExtension, VUEJS3_DEVTOOLS}) => installExtension(VUEJS3_DEVTOOLS, { - loadExtensionOptions: { - allowFileAccess: true, - }, - })) - .catch(e => console.error('Failed install extension:', e)); -} - -/** - * Load deploy settings and start Alas web server. - */ -let alas = new PyShell(webuiPath, webuiArgs); -alas.end(function (err: string) { - // if (err) throw err; -}); - - -let mainWindow: BrowserWindow | null = null; - -const createWindow = async () => { - mainWindow = new BrowserWindow({ - width: 1280, - height: 880, - show: false, // Use 'ready-to-show' event to show window - frame: false, - icon: path.join(__dirname, './buildResources/icon.ico'), - webPreferences: { - nodeIntegration: true, - contextIsolation: false, // Spectron tests can't work with contextIsolation: true - nativeWindowOpen: true, - // preload: join(__dirname, '../../preload/dist/index.cjs'), - }, - }); - - /** - * If you install `show: true` then it can cause issues when trying to close the window. - * Use `show: false` and listener events `ready-to-show` to fix these issues. - * - * @see https://github.com/electron/electron/issues/25012 - */ - mainWindow.on('ready-to-show', () => { - mainWindow?.show(); - - // Hide menu - const {Menu} = require('electron'); - Menu.setApplicationMenu(null); - - if (import.meta.env.MODE === 'development') { - mainWindow?.webContents.openDevTools(); - } - }); - - mainWindow.on('focus', function () { - // Dev tools - globalShortcut.register('Ctrl+Shift+I', function () { - if (mainWindow?.webContents.isDevToolsOpened()) { - mainWindow?.webContents.closeDevTools() - } else { - mainWindow?.webContents.openDevTools() - } - }); - // Refresh - globalShortcut.register('Ctrl+R', function () { - mainWindow?.reload() - }); - globalShortcut.register('Ctrl+Shift+R', function () { - mainWindow?.reload() - }); - }); - mainWindow.on('blur', function () { - globalShortcut.unregisterAll() - }); - - // Minimize, maximize, close window. - ipcMain.on('window-tray', function () { - mainWindow?.hide(); - }); - ipcMain.on('window-min', function () { - mainWindow?.minimize(); - }); - ipcMain.on('window-max', function () { - mainWindow?.isMaximized() ? mainWindow?.restore() : mainWindow?.maximize(); - }); - ipcMain.on('window-close', function () { - alas.kill(function () { - mainWindow?.close(); - }) - }); - - // Tray - const tray = new Tray(path.join(__dirname, 'icon.png')); - const contextMenu = Menu.buildFromTemplate([ - { - label: 'Show', - click: function () { - mainWindow?.show(); - } - }, - { - label: 'Hide', - click: function () { - mainWindow?.hide(); - } - }, - { - label: 'Exit', - click: function () { - alas.kill(function () { - mainWindow?.close(); - }) - } - } - ]); - tray.setToolTip('Alas'); - tray.setContextMenu(contextMenu); - tray.on('click', () => { - mainWindow?.isVisible() ? mainWindow?.hide() : mainWindow?.show() - }); - tray.on('right-click', () => { - tray.popUpContextMenu(contextMenu) - }); -}; - - -// No DPI scaling -if (!dpiScaling) { - app.commandLine.appendSwitch('high-dpi-support', '1'); - app.commandLine.appendSwitch('force-device-scale-factor', '1'); -} - - -function loadURL() { - /** - * URL for main window. - * Vite dev server for development. - * `file://../renderer/index.html` for production and test - */ - const pageUrl = import.meta.env.MODE === 'development' && import.meta.env.VITE_DEV_SERVER_URL !== undefined - ? import.meta.env.VITE_DEV_SERVER_URL - : new URL('../renderer/dist/index.html', 'file://' + __dirname).toString(); - - mainWindow?.loadURL(pageUrl); -} - - -alas.on('stderr', function (message: string) { - /** - * Receive logs, judge if Alas is ready - * For starlette backend, there will have: - * `INFO: Uvicorn running on http://0.0.0.0:22267 (Press CTRL+C to quit)` - * Or backend has started already - * `[Errno 10048] error while attempting to bind on address ('0.0.0.0', 22267): ` - */ - if (message.includes('Application startup complete') || message.includes('bind on address')) { - alas.removeAllListeners('stderr'); - loadURL() - } -}); - - -app.on('second-instance', () => { - // Someone tried to run a second instance, we should focus our window. - if (mainWindow) { - if (mainWindow.isMinimized()) mainWindow.restore(); - if (!mainWindow.isVisible()) mainWindow.show(); - mainWindow.focus(); - } -}); - - -app.on('window-all-closed', () => { - if (process.platform !== 'darwin') { - app.quit(); - } -}); - - -app.whenReady() - .then(createWindow) - .catch((e) => console.error('Failed create window:', e)); - - -// Auto-updates -if (import.meta.env.PROD) { - app.whenReady() - .then(() => import('electron-updater')) - .then(({autoUpdater}) => autoUpdater.checkForUpdatesAndNotify()) - .catch((e) => console.error('Failed check updates:', e)); -} - ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 diff --git a/webapp/packages/main/src/pyshell.ts b/webapp/packages/main/src/pyshell.ts index dd8149fdc..1a9e81736 100644 --- a/webapp/packages/main/src/pyshell.ts +++ b/webapp/packages/main/src/pyshell.ts @@ -1,16 +1,9 @@ import {alasPath, pythonPath} from '/@/config'; -<<<<<<< HEAD import logger from '/@/logger'; -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 const {PythonShell} = require('python-shell'); const treeKill = require('tree-kill'); -<<<<<<< HEAD -======= - ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 export class PyShell extends PythonShell { constructor(script: string, args: Array = []) { const options = { @@ -19,10 +12,7 @@ export class PyShell extends PythonShell { pythonPath: pythonPath, scriptPath: alasPath, }; -<<<<<<< HEAD logger.info(`${pythonPath} ${script} ${args}`); -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 super(script, options); } diff --git a/webapp/packages/main/tsconfig.json b/webapp/packages/main/tsconfig.json index 3147c8557..9bb9b8475 100644 --- a/webapp/packages/main/tsconfig.json +++ b/webapp/packages/main/tsconfig.json @@ -1,5 +1,4 @@ { -<<<<<<< HEAD "compilerOptions": { "module": "esnext", "target": "esnext", @@ -17,21 +16,4 @@ }, "include": ["src/**/*.ts", "../../types/**/*.d.ts","../common/**/*.ts"], "exclude": ["**/*.spec.ts", "**/*.test.ts"] -======= - "extends": "../../tsconfig.json", - "compilerOptions": { - "baseUrl": ".", - "paths": { - "/@/*": [ - "./src/*" - ] - }, - }, - "files": [ - "src/index.ts" - ], - "include": [ - "../../types/**/*.d.ts" - ] ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } diff --git a/webapp/packages/main/vite.config.js b/webapp/packages/main/vite.config.js index e4ad58e59..5905e6842 100644 --- a/webapp/packages/main/vite.config.js +++ b/webapp/packages/main/vite.config.js @@ -1,18 +1,9 @@ -<<<<<<< HEAD import {node} from '../../.electron-vendors.cache.json'; import {join} from 'node:path'; import {injectAppVersion} from '../../version/inject-app-version-plugin.mjs'; const PACKAGE_ROOT = __dirname; const PROJECT_ROOT = join(PACKAGE_ROOT, '../..'); -======= -import {node} from '../../electron-vendors.config.json'; -import {join} from 'path'; -import {builtinModules} from 'module'; - -const PACKAGE_ROOT = __dirname; - ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 /** * @type {import('vite').UserConfig} @@ -21,7 +12,6 @@ const PACKAGE_ROOT = __dirname; const config = { mode: process.env.MODE, root: PACKAGE_ROOT, -<<<<<<< HEAD envDir: PROJECT_ROOT, resolve: { alias: { @@ -31,57 +21,24 @@ const config = { }, build: { ssr: true, -======= - envDir: process.cwd(), - resolve: { - alias: { - '/@/': join(PACKAGE_ROOT, 'src') + '/', - }, - }, - build: { ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 sourcemap: 'inline', target: `node${node}`, outDir: 'dist', assetsDir: '.', -<<<<<<< HEAD minify: process.env.MODE !== 'development', -======= - minify: process.env.MODE === 'development' ? false : 'terser', - terserOptions: { - ecma: 2020, - compress: { - passes: 2, - }, - safari10: false, - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 lib: { entry: 'src/index.ts', formats: ['cjs'], }, rollupOptions: { -<<<<<<< HEAD -======= - external: [ - 'electron', - 'electron-devtools-installer', - ...builtinModules, - ], ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 output: { entryFileNames: '[name].cjs', }, }, emptyOutDir: true, -<<<<<<< HEAD reportCompressedSize: false, }, plugins: [injectAppVersion()], -======= - brotliSize: false, - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }; export default config; diff --git a/webapp/packages/preload/src/index.ts b/webapp/packages/preload/src/index.ts index b4def0de6..860ab1b6d 100644 --- a/webapp/packages/preload/src/index.ts +++ b/webapp/packages/preload/src/index.ts @@ -1,4 +1,3 @@ -<<<<<<< HEAD /** * @module preload */ @@ -9,22 +8,3 @@ export {ipcRendererSend, ipcRendererOn} from './electronApi'; export {getAlasConfig, checkIsNeedInstall, getAlasConfigDirFiles} from './alasConfig'; export {copyFilesToDir} from '@common/utils/copyFilesToDir'; export {modifyConfigYaml} from './modifyConfigYaml'; -======= -import {contextBridge} from 'electron'; - -const apiKey = 'electron'; -/** - * @see https://github.com/electron/electron/issues/21437#issuecomment-573522360 - */ -const api: ElectronApi = { - versions: process.versions, -}; - -/** - * The "Main World" is the JavaScript context that your main renderer code runs in. - * By default, the page you load in your renderer executes code in this world. - * - * @see https://www.electronjs.org/docs/api/context-bridge - */ -contextBridge.exposeInMainWorld(apiKey, api); ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 diff --git a/webapp/packages/preload/tsconfig.json b/webapp/packages/preload/tsconfig.json index 50a6e38b3..fabc94731 100644 --- a/webapp/packages/preload/tsconfig.json +++ b/webapp/packages/preload/tsconfig.json @@ -1,5 +1,4 @@ { -<<<<<<< HEAD "compilerOptions": { "module": "esnext", "target": "esnext", @@ -16,22 +15,4 @@ }, "include": ["src/**/*.ts", "../../types/**/*.d.ts","../common/**/*.ts"], "exclude": ["**/*.spec.ts", "**/*.test.ts"] -======= - "extends": "../../tsconfig.json", - "compilerOptions": { - "baseUrl": ".", - "paths": { - "/@/*": [ - "./src/*" - ] - } - }, - "files": [ - "types/electron-api.d.ts", - "src/index.ts" - ], - "include": [ - "../../types/**/*.d.ts" - ] ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } diff --git a/webapp/packages/preload/types/electron-api.d.ts b/webapp/packages/preload/types/electron-api.d.ts index 618f5a1db..d0d68886c 100644 --- a/webapp/packages/preload/types/electron-api.d.ts +++ b/webapp/packages/preload/types/electron-api.d.ts @@ -1,4 +1,3 @@ -<<<<<<< HEAD interface ElectronApi { readonly versions: Readonly; } @@ -6,14 +5,4 @@ interface ElectronApi { declare interface Window { electron: Readonly; electronRequire?: NodeRequire; -======= - -interface ElectronApi { - readonly versions: Readonly -} - -declare interface Window { - electron: Readonly - electronRequire?: NodeRequire ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } diff --git a/webapp/packages/preload/vite.config.js b/webapp/packages/preload/vite.config.js index e162b1c8c..bb2beccd0 100644 --- a/webapp/packages/preload/vite.config.js +++ b/webapp/packages/preload/vite.config.js @@ -1,4 +1,3 @@ -<<<<<<< HEAD import {chrome} from '../../.electron-vendors.cache.json'; import {preload} from 'unplugin-auto-expose'; import {join} from 'node:path'; @@ -6,13 +5,6 @@ import {injectAppVersion} from '../../version/inject-app-version-plugin.mjs'; const PACKAGE_ROOT = __dirname; const PROJECT_ROOT = join(PACKAGE_ROOT, '../..'); -======= -import {chrome} from '../../electron-vendors.config.json'; -import {join} from 'path'; -import {builtinModules} from 'module'; - -const PACKAGE_ROOT = __dirname; ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 /** * @type {import('vite').UserConfig} @@ -21,7 +13,6 @@ const PACKAGE_ROOT = __dirname; const config = { mode: process.env.MODE, root: PACKAGE_ROOT, -<<<<<<< HEAD envDir: PROJECT_ROOT, resolve: { alias: [ @@ -33,56 +24,24 @@ const config = { }, build: { ssr: true, -======= - envDir: process.cwd(), - resolve: { - alias: { - '/@/': join(PACKAGE_ROOT, 'src') + '/', - }, - }, - build: { ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 sourcemap: 'inline', target: `chrome${chrome}`, outDir: 'dist', assetsDir: '.', -<<<<<<< HEAD minify: process.env.MODE !== 'development', -======= - minify: process.env.MODE === 'development' ? false : 'terser', - terserOptions: { - ecma: 2020, - compress: { - passes: 2, - }, - safari10: false, - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 lib: { entry: 'src/index.ts', formats: ['cjs'], }, rollupOptions: { -<<<<<<< HEAD -======= - external: [ - 'electron', - ...builtinModules, - ], ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 output: { entryFileNames: '[name].cjs', }, }, emptyOutDir: true, -<<<<<<< HEAD reportCompressedSize: false, }, plugins: [preload.vite(), injectAppVersion()], -======= - brotliSize: false, - }, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }; export default config; diff --git a/webapp/packages/renderer/.eslintrc.json b/webapp/packages/renderer/.eslintrc.json index 3d164841b..3cf7c2f05 100644 --- a/webapp/packages/renderer/.eslintrc.json +++ b/webapp/packages/renderer/.eslintrc.json @@ -11,13 +11,10 @@ "parser": "@typescript-eslint/parser", "ecmaVersion": 12, "sourceType": "module" -<<<<<<< HEAD }, "rules": { /** These rules are disabled because they are incompatible with prettier */ "vue/html-self-closing": "off", "vue/singleline-html-element-content-newline": "off" -======= ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } } diff --git a/webapp/packages/renderer/index.html b/webapp/packages/renderer/index.html index 3c989dda8..7649d9091 100644 --- a/webapp/packages/renderer/index.html +++ b/webapp/packages/renderer/index.html @@ -1,5 +1,4 @@ -<<<<<<< HEAD -======= - - - - - - Alas - - -
- - ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 diff --git a/webapp/packages/renderer/src/App.vue b/webapp/packages/renderer/src/App.vue index febb77c11..80b5ffec0 100644 --- a/webapp/packages/renderer/src/App.vue +++ b/webapp/packages/renderer/src/App.vue @@ -1,5 +1,4 @@ - - - - diff --git a/webapp/packages/renderer/src/components/Alas.vue b/webapp/packages/renderer/src/components/Alas.vue index 7b5a7b11a..198e51ed7 100644 --- a/webapp/packages/renderer/src/components/Alas.vue +++ b/webapp/packages/renderer/src/components/Alas.vue @@ -1,5 +1,4 @@ - - - - diff --git a/webapp/packages/renderer/src/components/AppHeader.vue b/webapp/packages/renderer/src/components/AppHeader.vue index 394e0aeb6..5cf1b0bba 100644 --- a/webapp/packages/renderer/src/components/AppHeader.vue +++ b/webapp/packages/renderer/src/components/AppHeader.vue @@ -2,7 +2,6 @@
-<<<<<<< HEAD -======= - - - - ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
- - diff --git a/webapp/packages/renderer/src/index.ts b/webapp/packages/renderer/src/index.ts index fcf94357d..334693e82 100644 --- a/webapp/packages/renderer/src/index.ts +++ b/webapp/packages/renderer/src/index.ts @@ -1,7 +1,6 @@ import {createApp} from 'vue'; import App from '/@/App.vue'; import router from '/@/router'; -<<<<<<< HEAD import {setupI18n} from '/@/locales/setupI18n'; import {setupThemeSetting} from '/@/settings/themeSetting'; import {setupStore} from '/@/store'; @@ -32,9 +31,3 @@ async function bootstrap() { } await bootstrap(); -======= - -createApp(App) - .use(router) - .mount('#app'); ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 diff --git a/webapp/packages/renderer/src/router.ts b/webapp/packages/renderer/src/router.ts index abb8b378b..b1faceb7a 100644 --- a/webapp/packages/renderer/src/router.ts +++ b/webapp/packages/renderer/src/router.ts @@ -2,15 +2,11 @@ import {createRouter, createWebHashHistory} from 'vue-router'; import Alas from '/@/components/Alas.vue'; const routes = [ -<<<<<<< HEAD {path: '/', name: 'Loading', component: () => import('./views/LoadingPage.vue')}, {path: '/Install', name: 'InstallPage', component: () => import('./views/InstallAlas.vue')}, {path: '/Launch', name: 'LaunchPage', component: () => import('./views/Launch.vue')}, {path: '/Import', name: 'ImportConfig', component: () => import('./views/ImportConfig.vue')}, {path: '/Alas', name: 'Alas', component: Alas}, -======= - {path: '/', name: 'Alas', component: Alas}, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 ]; export default createRouter({ diff --git a/webapp/packages/renderer/tsconfig.json b/webapp/packages/renderer/tsconfig.json index db49b4f12..31f392aff 100644 --- a/webapp/packages/renderer/tsconfig.json +++ b/webapp/packages/renderer/tsconfig.json @@ -1,5 +1,4 @@ { -<<<<<<< HEAD "compilerOptions": { "module": "esnext", "target": "esnext", @@ -20,33 +19,15 @@ }, "lib": ["ESNext", "dom", "dom.iterable"] }, -======= - "extends": "../../tsconfig.json", - "compilerOptions": { - "baseUrl": ".", - "paths": { - "/@/*": [ - "./src/*" - ] - }, - "lib": ["ESNext", "dom", "dom.iterable"] - }, - ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 "include": [ "src/**/*.vue", "src/**/*.ts", "src/**/*.tsx", "types/**/*.d.ts", "../../types/**/*.d.ts", -<<<<<<< HEAD "../../../types/**/*.d.ts", "./components.d.ts" ], "exclude": ["**/*.spec.ts", "**/*.test.ts"], "typeRoots": ["../../node_modules/@types/", "./types", "../../../types"] -======= - "../preload/types/electron-api.d.ts" - ] ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 } diff --git a/webapp/packages/renderer/types/shims-vue.d.ts b/webapp/packages/renderer/types/shims-vue.d.ts index 9fdbc7864..f6feabbe0 100644 --- a/webapp/packages/renderer/types/shims-vue.d.ts +++ b/webapp/packages/renderer/types/shims-vue.d.ts @@ -1,9 +1,5 @@ declare module '*.vue' { -<<<<<<< HEAD import type {DefineComponent} from 'vue'; -======= - import type { DefineComponent } from 'vue'; ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 // eslint-disable-next-line @typescript-eslint/ban-types, @typescript-eslint/no-explicit-any const component: DefineComponent<{}, {}, any>; export default component; diff --git a/webapp/packages/renderer/vite.config.js b/webapp/packages/renderer/vite.config.js index ecd3c62dc..e1a3b7f08 100644 --- a/webapp/packages/renderer/vite.config.js +++ b/webapp/packages/renderer/vite.config.js @@ -1,7 +1,6 @@ /* eslint-env node */ import {chrome} from '../../electron-vendors.config.json'; -<<<<<<< HEAD import vue from '@vitejs/plugin-vue'; import {renderer} from 'unplugin-auto-expose'; import {join, resolve} from 'node:path'; @@ -21,13 +20,6 @@ import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite'; const PACKAGE_ROOT = __dirname; const PROJECT_ROOT = join(PACKAGE_ROOT, '../..'); -======= -import {join} from 'path'; -import {builtinModules} from 'module'; -import vue from '@vitejs/plugin-vue'; - -const PACKAGE_ROOT = __dirname; ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 /** * @type {import('vite').UserConfig} @@ -36,7 +28,6 @@ const PACKAGE_ROOT = __dirname; const config = { mode: process.env.MODE, root: PACKAGE_ROOT, -<<<<<<< HEAD envDir: PROJECT_ROOT, resolve: { alias: [ @@ -54,14 +45,6 @@ const config = { }, ], }, -======= - resolve: { - alias: { - '/@/': join(PACKAGE_ROOT, 'src') + '/', - }, - }, - plugins: [vue()], ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 base: '', server: { fs: { @@ -73,7 +56,6 @@ const config = { target: `chrome${chrome}`, outDir: 'dist', assetsDir: '.', -<<<<<<< HEAD rollupOptions: { input: join(PACKAGE_ROOT, 'index.html'), }, @@ -123,22 +105,6 @@ const config = { '@arco-design/web-vue/es/locale/lang/ja-jp', '@arco-design/web-vue/es/locale/lang/zh-tw', ], -======= - terserOptions: { - ecma: 2020, - compress: { - passes: 2, - }, - safari10: false, - }, - rollupOptions: { - external: [ - ...builtinModules, - ], - }, - emptyOutDir: true, - brotliSize: false, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, }; diff --git a/webapp/scripts/build.js b/webapp/scripts/build.js index 2bdbe5602..2e5a9b0ba 100644 --- a/webapp/scripts/build.js +++ b/webapp/scripts/build.js @@ -3,11 +3,7 @@ const {build} = require('vite'); const {dirname} = require('path'); /** @type 'production' | 'development' | 'test' */ -<<<<<<< HEAD const mode = (process.env.MODE = process.env.MODE || 'production'); -======= -const mode = process.env.MODE = process.env.MODE || 'production'; ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 const packagesConfigs = [ 'packages/main/vite.config.js', @@ -15,28 +11,16 @@ const packagesConfigs = [ 'packages/renderer/vite.config.js', ]; -<<<<<<< HEAD /** * Run `vite build` for config file */ const buildByConfig = configFile => build({configFile, mode}); -======= - -/** - * Run `vite build` for config file - */ -const buildByConfig = (configFile) => build({configFile, mode}); ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 (async () => { try { const totalTimeLabel = 'Total bundling time'; console.time(totalTimeLabel); for (const packageConfigPath of packagesConfigs) { -<<<<<<< HEAD -======= - ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 const consoleGroupName = `${dirname(packageConfigPath)}/`; console.group(consoleGroupName); diff --git a/webapp/scripts/update-electron-vendors.js b/webapp/scripts/update-electron-vendors.js index b9f2c2bd2..b6ab85144 100644 --- a/webapp/scripts/update-electron-vendors.js +++ b/webapp/scripts/update-electron-vendors.js @@ -12,21 +12,13 @@ const path = require('path'); */ function getVendors() { const output = execSync(`${electron} -p "JSON.stringify(process.versions)"`, { -<<<<<<< HEAD env: {ELECTRON_RUN_AS_NODE: '1'}, -======= - env: {'ELECTRON_RUN_AS_NODE': '1'}, ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 encoding: 'utf-8', }); return JSON.parse(output); } -<<<<<<< HEAD -======= - ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 function formattedJSON(obj) { return JSON.stringify(obj, null, 2) + '\n'; } @@ -40,19 +32,14 @@ function updateVendors() { const packageJSONPath = path.resolve(process.cwd(), 'package.json'); return Promise.all([ -<<<<<<< HEAD writeFile( './electron-vendors.config.json', -======= - writeFile('./electron-vendors.config.json', ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 formattedJSON({ chrome: chromeMajorVersion, node: nodeMajorVersion, }), ), -<<<<<<< HEAD readFile(packageJSONPath) .then(JSON.parse) .then(packageJSON => { @@ -64,17 +51,6 @@ function updateVendors() { return writeFile(packageJSONPath, formattedJSON(packageJSON)); }), -======= - readFile(packageJSONPath).then(JSON.parse).then((packageJSON) => { - if (!packageJSON || !Array.isArray(packageJSON.browserslist)) { - throw new Error(`Can't find browserslist in ${packageJSONPath}`); - } - - packageJSON.browserslist = [`Chrome ${chromeMajorVersion}`]; - - return writeFile(packageJSONPath, formattedJSON(packageJSON)); - }), ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 ]); } diff --git a/webapp/scripts/watch.js b/webapp/scripts/watch.js index 04e0c85a9..dda00bc3c 100644 --- a/webapp/scripts/watch.js +++ b/webapp/scripts/watch.js @@ -4,23 +4,12 @@ const {createServer, build, createLogger} = require('vite'); const electronPath = require('electron'); const {spawn} = require('child_process'); -<<<<<<< HEAD /** @type 'production' | 'development' | 'test' */ const mode = (process.env.MODE = process.env.MODE || 'development'); -======= - -/** @type 'production' | 'development' | 'test' */ -const mode = process.env.MODE = process.env.MODE || 'development'; - ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 /** @type {import('vite').LogLevel} */ const LOG_LEVEL = 'warn'; -<<<<<<< HEAD -======= - ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 /** @type {import('vite').InlineConfig} */ const sharedConfig = { mode, @@ -30,10 +19,6 @@ const sharedConfig = { logLevel: LOG_LEVEL, }; -<<<<<<< HEAD -======= - ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 /** * @param configFile * @param writeBundle @@ -48,20 +33,12 @@ const getWatcher = ({name, configFile, writeBundle}) => { }); }; -<<<<<<< HEAD -======= - ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 /** * Start or restart App when source files are changed * @param {import('vite').ViteDevServer} viteDevServer * @returns {Promise | import('vite').RollupWatcher>} */ -<<<<<<< HEAD const setupMainPackageWatcher = viteDevServer => { -======= -const setupMainPackageWatcher = (viteDevServer) => { ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 // Write a value to an environment variable to pass it to the main process. { const protocol = `http${viteDevServer.config.server.https ? 's' : ''}:`; @@ -89,7 +66,6 @@ const setupMainPackageWatcher = (viteDevServer) => { spawnProcess = spawn(String(electronPath), ['.']); -<<<<<<< HEAD spawnProcess.stdout.on( 'data', d => d.toString().trim() && logger.warn(d.toString(), {timestamp: true}), @@ -98,28 +74,16 @@ const setupMainPackageWatcher = (viteDevServer) => { 'data', d => d.toString().trim() && logger.error(d.toString(), {timestamp: true}), ); -======= - spawnProcess.stdout.on('data', d => d.toString().trim() && logger.warn(d.toString(), {timestamp: true})); - spawnProcess.stderr.on('data', d => d.toString().trim() && logger.error(d.toString(), {timestamp: true})); ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }, }); }; -<<<<<<< HEAD -======= - ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 /** * Start or restart App when source files are changed * @param {import('vite').ViteDevServer} viteDevServer * @returns {Promise | import('vite').RollupWatcher>} */ -<<<<<<< HEAD const setupPreloadPackageWatcher = viteDevServer => { -======= -const setupPreloadPackageWatcher = (viteDevServer) => { ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 return getWatcher({ name: 'reload-page-on-preload-package-change', configFile: 'packages/preload/vite.config.js', diff --git a/webapp/tests/app.spec.js b/webapp/tests/app.spec.js index b19961eff..4609e7add 100644 --- a/webapp/tests/app.spec.js +++ b/webapp/tests/app.spec.js @@ -18,18 +18,10 @@ const {strict: assert} = require('assert'); isCrashed: mainWindow.webContents.isCrashed(), }); -<<<<<<< HEAD return new Promise(resolve => { if (mainWindow.isVisible()) { resolve(getState()); } else mainWindow.once('ready-to-show', () => setTimeout(() => resolve(getState()), 0)); -======= - return new Promise((resolve) => { - if (mainWindow.isVisible()) { - resolve(getState()); - } else - mainWindow.once('ready-to-show', () => setTimeout(() => resolve(getState()), 0)); ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 }); }); @@ -44,21 +36,11 @@ const {strict: assert} = require('assert'); */ const page = await electronApp.firstWindow(); -<<<<<<< HEAD // Check web-page content const element = await page.$('#app', {strict: true}); assert.notStrictEqual(element, null, "Can't find root element"); assert.notStrictEqual((await element.innerHTML()).trim(), '', 'Window content is empty'); -======= - - // Check web-page content - const element = await page.$('#app', {strict: true}); - assert.notStrictEqual(element, null, 'Can\'t find root element'); - assert.notStrictEqual((await element.innerHTML()).trim(), '', 'Window content is empty'); - - ->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0 // Checking the framework. // It is assumed that on the main screen there is a `