From 92194e786b030c5935a127fa0cba0120634aa2bd Mon Sep 17 00:00:00 2001 From: Alexey Safronov Date: Mon, 24 Jul 2023 14:03:52 +0400 Subject: [PATCH 01/30] Node: Services: Added new logLevel param --- common/ASC.Socket.IO/app/log.js | 8 +++++--- common/ASC.SsoAuth/app/log.js | 8 +++++--- config/appsettings.services.json | 7 ++++--- packages/editor/src/server/lib/logger.js | 6 ++++-- packages/login/src/server/lib/logger.ts | 6 ++++-- 5 files changed, 22 insertions(+), 13 deletions(-) diff --git a/common/ASC.Socket.IO/app/log.js b/common/ASC.Socket.IO/app/log.js index ed9c50f5a86..79eb2b793d8 100644 --- a/common/ASC.Socket.IO/app/log.js +++ b/common/ASC.Socket.IO/app/log.js @@ -1,4 +1,4 @@ -const winston = require("winston"), +const winston = require("winston"), WinstonCloudWatch = require('winston-cloudwatch'); require("winston-daily-rotate-file"); @@ -11,6 +11,7 @@ const { randomUUID } = require('crypto'); const date = require('date-and-time'); let logpath = config.get("logPath"); +let logLevel = config.get("logLevel") || "debug"; if(logpath != null) { if(!path.isAbsolute(logpath)) @@ -40,6 +41,7 @@ if (!fs.existsSync(dirName)) { var options = { file: { filename: fileName, + level: logLevel, datePattern: "MM-DD", handleExceptions: true, humanReadableUnhandledException: true, @@ -49,14 +51,14 @@ var options = { json: true, }, console: { - level: "debug", + level: logLevel, handleExceptions: true, json: false, colorize: true, }, cloudWatch: { name: 'aws', - level: "debug", + level: logLevel, logStreamName: logStreamName, logGroupName: logGroupName, awsRegion: awsRegion, diff --git a/common/ASC.SsoAuth/app/log.js b/common/ASC.SsoAuth/app/log.js index 080dc428b44..d3e79dfd858 100644 --- a/common/ASC.SsoAuth/app/log.js +++ b/common/ASC.SsoAuth/app/log.js @@ -1,4 +1,4 @@ -const winston = require("winston"), +const winston = require("winston"), WinstonCloudWatch = require("winston-cloudwatch"); require("winston-daily-rotate-file"); @@ -11,6 +11,7 @@ const { randomUUID } = require("crypto"); const date = require("date-and-time"); let logpath = config.get("logPath"); +let logLevel = config.get("logLevel") || "debug"; if (logpath != null) { if (!path.isAbsolute(logpath)) { logpath = path.join(__dirname, "..", logpath); @@ -41,6 +42,7 @@ if (!fs.existsSync(dirName)) { var options = { file: { filename: fileName, + level: logLevel, datePattern: "MM-DD", handleExceptions: true, humanReadableUnhandledException: true, @@ -50,14 +52,14 @@ var options = { json: true, }, console: { - level: "debug", + level: logLevel, handleExceptions: true, json: false, colorize: true, }, cloudWatch: { name: "aws", - level: "debug", + level: logLevel, logStreamName: logStreamName, logGroupName: logGroupName, awsRegion: awsRegion, diff --git a/config/appsettings.services.json b/config/appsettings.services.json index 76fa334efa1..a6701f77e90 100644 --- a/config/appsettings.services.json +++ b/config/appsettings.services.json @@ -1,9 +1,10 @@ { "core": { "products": { - "folder": "../../../products", - "subfolder": "Server" + "folder": "../../../products", + "subfolder": "Server" } }, - "logPath": "../../Logs/" + "logPath": "../../Logs/", + "logLevel": "debug" } diff --git a/packages/editor/src/server/lib/logger.js b/packages/editor/src/server/lib/logger.js index 72a745ec119..dd3afcf96ff 100644 --- a/packages/editor/src/server/lib/logger.js +++ b/packages/editor/src/server/lib/logger.js @@ -9,6 +9,7 @@ import fs from "fs"; import config from "../config"; let logPath = config.get("logPath"); +let logLevel = config.get("logLevel") || "debug"; if (logPath != null) { if (!path.isAbsolute(logPath)) { @@ -40,6 +41,7 @@ if (!fs.existsSync(dirName)) { const options = { file: { filename: fileName, + level: logLevel, datePattern: "MM-DD", handleExceptions: true, humanReadableUnhandledException: true, @@ -49,14 +51,14 @@ const options = { json: true, }, console: { - level: "debug", + level: logLevel, handleExceptions: true, json: false, colorize: true, }, cloudWatch: { name: 'aws', - level: "debug", + level: logLevel, logStreamName: logStreamName, logGroupName: logGroupName, awsRegion: awsRegion, diff --git a/packages/login/src/server/lib/logger.ts b/packages/login/src/server/lib/logger.ts index a0bedf35184..94c56aed6d5 100644 --- a/packages/login/src/server/lib/logger.ts +++ b/packages/login/src/server/lib/logger.ts @@ -9,6 +9,7 @@ import config from "../config"; import { randomUUID } from "crypto"; let logPath: string = config.get("logPath"); +let logLevel = config.get("logLevel") || "debug"; if (logPath != null) { if (!path.isAbsolute(logPath)) { @@ -39,6 +40,7 @@ const logStreamName = aws.logStreamName.replace("${hostname}", os.hostname()) const options = { file: { filename: fileName, + level: logLevel, datePattern: "MM-DD", handleExceptions: true, humanReadableUnhandledException: true, @@ -48,14 +50,14 @@ const options = { json: true, }, console: { - level: "debug", + level: logLevel, handleExceptions: true, json: false, colorize: true, }, cloudWatch: { name: 'aws', - level: "debug", + level: logLevel, logStreamName: logStreamName, logGroupName: logGroupName, awsRegion: awsRegion, From c94448c0e17ae3761f0261db1f86e41fd067455f Mon Sep 17 00:00:00 2001 From: Evgeniy Antonyuk Date: Fri, 21 Jul 2023 15:35:43 +0500 Subject: [PATCH 02/30] Optimize unnecessary substitution of postman value --- build/install/common/product-configuration | 4 ++-- build/install/deb/debian/rules | 3 +++ build/install/rpm/SPECS/build.spec | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/build/install/common/product-configuration b/build/install/common/product-configuration index 4477995c542..8a921ff2911 100644 --- a/build/install/common/product-configuration +++ b/build/install/common/product-configuration @@ -222,8 +222,8 @@ set_core_machinekey () { fi fi - $JSON_USERCONF "this.core={'base-domain': \"$APP_HOST\", 'machinekey': \"$CORE_MACHINEKEY\", 'notify': { 'postman': \"services\" }}" >/dev/null 2>&1 - $JSON $APP_DIR/apisystem.$ENVIRONMENT.json -e "this.core={'base-domain': \"$APP_HOST\", 'machinekey': \"$CORE_MACHINEKEY\", 'notify': { 'postman': \"services\" }}" >/dev/null 2>&1 + $JSON_USERCONF "this.core={'base-domain': \"$APP_HOST\", 'machinekey': \"$CORE_MACHINEKEY\"}" >/dev/null 2>&1 + $JSON $APP_DIR/apisystem.$ENVIRONMENT.json -e "this.core={'base-domain': \"$APP_HOST\", 'machinekey': \"$CORE_MACHINEKEY\"}" >/dev/null 2>&1 sed "s^\(machine_key\)\s*=.*^\1 = ${CORE_MACHINEKEY}^g" -i $APP_DIR/radicale.config } diff --git a/build/install/deb/debian/rules b/build/install/deb/debian/rules index 6e8b00fd9c4..b1ce98a66bf 100755 --- a/build/install/deb/debian/rules +++ b/build/install/deb/debian/rules @@ -46,6 +46,9 @@ override_dh_auto_build: find ${SRC_PATH}/config/ -type f -regex '.*\.\(test\|dev\).*' -delete + json -I -f ${SRC_PATH}/config/appsettings.json -e "this.core.notify.postman=\"services\"" + json -I -f ${SRC_PATH}/config/apisystem.json -e "this.core.notify.postman=\"services\"" + for i in ${PRODUCT} $$(ls ${CURRENT_PATH}/debian/*.install | grep -oP 'debian/\K.*' | grep -o '^[^.]*'); do \ cp ${CURRENT_PATH}/debian/source/lintian-overrides ${CURRENT_PATH}/debian/$$i.lintian-overrides; \ done diff --git a/build/install/rpm/SPECS/build.spec b/build/install/rpm/SPECS/build.spec index 80d164ec9cb..5e3e17f31a9 100644 --- a/build/install/rpm/SPECS/build.spec +++ b/build/install/rpm/SPECS/build.spec @@ -17,6 +17,9 @@ json -I -f %{_builddir}/%{sourcename}/config/appsettings.services.json -e "this. find %{_builddir}/%{sourcename}/config/ -type f -regex '.*\.\(test\|dev\).*' -delete +json -I -f %{_builddir}/%{sourcename}/config/appsettings.json -e "this.core.notify.postman=\"services\"" +json -I -f %{_builddir}/%{sourcename}/config/apisystem.json -e "this.core.notify.postman=\"services\"" + find %{_builddir}/%{sourcename}/publish/ \ %{_builddir}/%{sourcename}/ASC.Migration.Runner \ -depth -type f -regex '.*\(dll\|dylib\|so\)$' -exec chmod 755 {} \; From 589018903bfb4b49e750de14e3925ffb8a78f48a Mon Sep 17 00:00:00 2001 From: Evgeniy Antonyuk Date: Mon, 24 Jul 2023 17:36:56 +0500 Subject: [PATCH 03/30] fix Bug 63382 - Change default logging to warning --- build/install/deb/debian/rules | 6 +++--- build/install/rpm/SPECS/build.spec | 6 +++--- build/install/win/build-batch.bat | 6 ++++++ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/build/install/deb/debian/rules b/build/install/deb/debian/rules index b1ce98a66bf..844dcbeb758 100755 --- a/build/install/deb/debian/rules +++ b/build/install/deb/debian/rules @@ -42,12 +42,12 @@ override_dh_auto_build: if ! grep -q 'var/www/${PRODUCT}' ${SRC_PATH}/config/nginx/*.conf; then find ${SRC_PATH}/config/nginx/ -name "*.conf" -exec sed -i "s@\(var/www/\)@\1${PRODUCT}/@" {} +; fi json -I -f ${SRC_PATH}/config/appsettings.services.json -e "this.logPath=\"/var/log/onlyoffice/${PRODUCT}\"" -e "this.socket={ 'path': '../ASC.Socket.IO/' }" \ - -e "this.ssoauth={ 'path': '../ASC.SsoAuth/' }" -e "this.core={ 'products': { 'folder': '/var/www/${PRODUCT}/products', 'subfolder': 'server'} }" + -e "this.ssoauth={ 'path': '../ASC.SsoAuth/' }" -e "this.logLevel=\"warning\"" -e "this.core={ 'products': { 'folder': '/var/www/${PRODUCT}/products', 'subfolder': 'server'} }" find ${SRC_PATH}/config/ -type f -regex '.*\.\(test\|dev\).*' -delete - - json -I -f ${SRC_PATH}/config/appsettings.json -e "this.core.notify.postman=\"services\"" + json -I -f ${SRC_PATH}/config/appsettings.json -e "this.core.notify.postman=\"services\"" -e "this.Logging.LogLevel.Default=\"Warning\"" -e "this['debug-info'].enabled=\"false\"" json -I -f ${SRC_PATH}/config/apisystem.json -e "this.core.notify.postman=\"services\"" + sed 's_\(minlevel=\)".*"_\1"Warn"_g' -i ${SRC_PATH}/config/nlog.config for i in ${PRODUCT} $$(ls ${CURRENT_PATH}/debian/*.install | grep -oP 'debian/\K.*' | grep -o '^[^.]*'); do \ cp ${CURRENT_PATH}/debian/source/lintian-overrides ${CURRENT_PATH}/debian/$$i.lintian-overrides; \ diff --git a/build/install/rpm/SPECS/build.spec b/build/install/rpm/SPECS/build.spec index 5e3e17f31a9..7a8b6eaa454 100644 --- a/build/install/rpm/SPECS/build.spec +++ b/build/install/rpm/SPECS/build.spec @@ -13,12 +13,12 @@ rm -f %{_builddir}/%{sourcename}/config/nginx/onlyoffice-login.conf if ! grep -q 'var/www/%{product}' config/nginx/*.conf; then find config/nginx/ -name "*.conf" -exec sed -i "s@\(var/www/\)@\1%{product}/@" {} +; fi json -I -f %{_builddir}/%{sourcename}/config/appsettings.services.json -e "this.logPath=\"/var/log/onlyoffice/%{product}\"" -e "this.socket={ 'path': '../ASC.Socket.IO/' }" \ --e "this.ssoauth={ 'path': '../ASC.SsoAuth/' }" -e "this.core={ 'products': { 'folder': '%{buildpath}/products', 'subfolder': 'server'} }" +-e "this.ssoauth={ 'path': '../ASC.SsoAuth/' }" -e "this.logLevel=\"warning\"" -e "this.core={ 'products': { 'folder': '%{buildpath}/products', 'subfolder': 'server'} }" find %{_builddir}/%{sourcename}/config/ -type f -regex '.*\.\(test\|dev\).*' -delete - -json -I -f %{_builddir}/%{sourcename}/config/appsettings.json -e "this.core.notify.postman=\"services\"" +json -I -f %{_builddir}/%{sourcename}/config/appsettings.json -e "this.core.notify.postman=\"services\"" -e "this.Logging.LogLevel.Default=\"Warning\"" -e "this['debug-info'].enabled=\"false\"" json -I -f %{_builddir}/%{sourcename}/config/apisystem.json -e "this.core.notify.postman=\"services\"" +sed 's_\(minlevel=\)".*"_\1"Warn"_g' -i %{_builddir}/%{sourcename}/config/nlog.config find %{_builddir}/%{sourcename}/publish/ \ %{_builddir}/%{sourcename}/ASC.Migration.Runner \ diff --git a/build/install/win/build-batch.bat b/build/install/win/build-batch.bat index d4528f3b7f3..11927db9b3d 100644 --- a/build/install/win/build-batch.bat +++ b/build/install/win/build-batch.bat @@ -41,6 +41,12 @@ REM echo ######## Delete test and dev configs ######## del /f /q build\install\win\Files\config\*.test.json del /f /q build\install\win\Files\config\*.dev.json +::default logging to warning +%sed% "s_\(minlevel=\)".*"_\1\"Warn\"_g" -i build\install\win\Files\config\nlog.config +%sed% "s_\(\"Default\":\).*,_\1 \"Warning\",_g" -i build\install\win\Files\config\appsettings.json +%sed% "s_\(\"logLevel\":\).*_\1 \"warning\"_g" -i build\install\win\Files\config\appsettings.services.json +%sed% "/\"debug-info\": {/,/}/ s/\(\"enabled\": \)\"[^\"]*\"/\1\"false\"/' -i build\install\win\Files\config\appsettings.json + REM echo ######## Remove AWSTarget from nlog.config ######## %sed% -i "//d; //d" build\install\win\Files\config\nlog.config del /q build\install\win\Files\config\sed* From 35b36cc3dcd4965ebc1a5c58705b39e6faf4b65b Mon Sep 17 00:00:00 2001 From: Evgeniy Antonyuk Date: Mon, 24 Jul 2023 17:38:39 +0500 Subject: [PATCH 04/30] Revert "Temporarily fix missing mysql package files for debian buster (#1570)" This reverts commit 58f3d5e275a34ef0a714013888b9c7fc1bcdbe8a. --- build/install/OneClickInstall/install-Debian/install-preq.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/build/install/OneClickInstall/install-Debian/install-preq.sh b/build/install/OneClickInstall/install-Debian/install-preq.sh index 1975f0abc59..ef2d978491f 100644 --- a/build/install/OneClickInstall/install-Debian/install-preq.sh +++ b/build/install/OneClickInstall/install-Debian/install-preq.sh @@ -78,7 +78,6 @@ if ! dpkg -l | grep -q "mysql-server"; then #Temporary fix for missing mysql repository for debian bookworm [ "$DISTRIB_CODENAME" = "bookworm" ] && sed -i "s/$DIST/ubuntu/g; s/$DISTRIB_CODENAME/jammy/g" /etc/apt/sources.list.d/mysql.list - [ "$DISTRIB_CODENAME" = "buster" ] && sed -i "s/$DIST/ubuntu/g; s/$DISTRIB_CODENAME/bionic/g" /etc/apt/sources.list.d/mysql.list echo mysql-community-server mysql-community-server/root-pass password ${MYSQL_SERVER_PASS} | debconf-set-selections echo mysql-community-server mysql-community-server/re-root-pass password ${MYSQL_SERVER_PASS} | debconf-set-selections From 693fb7341273116e49d80a99039deea3de5f7854 Mon Sep 17 00:00:00 2001 From: Evgeniy Antonyuk Date: Fri, 21 Jul 2023 15:37:03 +0500 Subject: [PATCH 05/30] Prevent interactive information from being displayed to user --- build/install/OneClickInstall/install-Debian/bootstrap.sh | 4 ++++ build/install/OneClickInstall/install-Debian/install-preq.sh | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build/install/OneClickInstall/install-Debian/bootstrap.sh b/build/install/OneClickInstall/install-Debian/bootstrap.sh index a3be34ed77a..e3b3545f815 100644 --- a/build/install/OneClickInstall/install-Debian/bootstrap.sh +++ b/build/install/OneClickInstall/install-Debian/bootstrap.sh @@ -10,6 +10,10 @@ cat< Date: Mon, 24 Jul 2023 15:48:04 +0300 Subject: [PATCH 06/30] Web: Client: Files: Restored mobile main button for frame mode after bad merge --- packages/client/src/pages/Files.jsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/client/src/pages/Files.jsx b/packages/client/src/pages/Files.jsx index 1b4ac8ab9bb..7eb3a647f1f 100644 --- a/packages/client/src/pages/Files.jsx +++ b/packages/client/src/pages/Files.jsx @@ -235,7 +235,9 @@ class FilesContent extends React.Component { {isFrame ? ( - showMenu && + showMenu && ( + + ) ) : ( )} From 5e101d33f70cc97151b5b2f16b2b6e6bf0bf13f8 Mon Sep 17 00:00:00 2001 From: Ilya Oleshko Date: Mon, 24 Jul 2023 16:10:02 +0300 Subject: [PATCH 07/30] Common: Navigation: Added action buttons for frame mode --- packages/common/components/Navigation/Navigation.js | 2 ++ .../components/Navigation/sub-components/control-btn.js | 9 ++++++--- .../components/Navigation/sub-components/plus-btn.js | 5 +++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/packages/common/components/Navigation/Navigation.js b/packages/common/components/Navigation/Navigation.js index 65f463d0c8b..673d78b7aea 100644 --- a/packages/common/components/Navigation/Navigation.js +++ b/packages/common/components/Navigation/Navigation.js @@ -49,6 +49,7 @@ const Navigation = ({ isEmptyPage, isDesktop: isDesktopClient, isRoom, + isFrame, ...rest }) => { const [isOpen, setIsOpen] = React.useState(false); @@ -201,6 +202,7 @@ const Navigation = ({ titles={titles} withMenu={withMenu} onPlusClick={onPlusClick} + isFrame={isFrame} /> {isTrashFolder && !isEmptyPage && ( diff --git a/packages/common/components/Navigation/sub-components/control-btn.js b/packages/common/components/Navigation/sub-components/control-btn.js index c2548439c95..44c8509587a 100644 --- a/packages/common/components/Navigation/sub-components/control-btn.js +++ b/packages/common/components/Navigation/sub-components/control-btn.js @@ -22,12 +22,12 @@ const StyledContainer = styled.div` min-width: 15px; @media ${tablet} { - display: none; + display: ${(props) => (props.isFrame ? "flex" : "none")}; } ${isMobile && css` - display: none; + display: ${(props) => (props.isFrame ? "flex" : "none")}; `} } @@ -105,6 +105,7 @@ const ControlButtons = ({ titles, withMenu, onPlusClick, + isFrame, }) => { const toggleInfoPanelAction = () => { toggleInfoPanel && toggleInfoPanel(); @@ -112,7 +113,7 @@ const ControlButtons = ({ }; return ( - + {!isRootFolder || (isRecycleBinFolder && !isEmptyFilesList) ? ( <> {!isMobile && canCreate && ( @@ -121,6 +122,7 @@ const ControlButtons = ({ getData={getContextOptionsPlus} withMenu={withMenu} onPlusClick={onPlusClick} + isFrame={isFrame} /> )} @@ -153,6 +155,7 @@ const ControlButtons = ({ getData={getContextOptionsPlus} withMenu={withMenu} onPlusClick={onPlusClick} + isFrame={isFrame} /> )} {!isDesktop && ( diff --git a/packages/common/components/Navigation/sub-components/plus-btn.js b/packages/common/components/Navigation/sub-components/plus-btn.js index 0c7e61e8412..50ca59b1acb 100644 --- a/packages/common/components/Navigation/sub-components/plus-btn.js +++ b/packages/common/components/Navigation/sub-components/plus-btn.js @@ -11,7 +11,7 @@ const PlusButton = (props) => { const ref = useRef(null); const menuRef = useRef(null); - const { className, getData, withMenu, onPlusClick } = props; + const { className, getData, withMenu, onPlusClick, isFrame } = props; const toggle = (e, isOpen) => { isOpen ? menuRef.current.show(e) : menuRef.current.hide(e); @@ -44,7 +44,8 @@ const PlusButton = (props) => { ref={menuRef} onHide={onHide} scaled={false} - leftOffset={150} + directionX="right" + leftOffset={isFrame ? 190 : 150} /> ); From 800a5e3ccf5bb5f876d019d3a33a0d6ab63c1246 Mon Sep 17 00:00:00 2001 From: Ilya Oleshko Date: Mon, 24 Jul 2023 16:13:53 +0300 Subject: [PATCH 08/30] Web: SDK: Fixed property name --- public/scripts/api.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/scripts/api.js b/public/scripts/api.js index 8d97f4319e8..71ddb8e32a0 100644 --- a/public/scripts/api.js +++ b/public/scripts/api.js @@ -13,7 +13,7 @@ theme: "Base", editorType: "embedded", //TODO: ["desktop", "embedded"] editorGoBack: true, - selectorType: "exceptPrivacyTrashArchiveFolders", //TODO: ["roomOnly", "userFolderOnly", "exceptPrivacyTrashArchiveFolders", "exceptSortedByTagsFolders"] + selectorType: "exceptPrivacyTrashArchiveFolders", //TODO: ["roomsOnly", "userFolderOnly", "exceptPrivacyTrashArchiveFolders", "exceptSortedByTagsFolders"] showHeader: false, showTitle: true, showMenu: false, From 06bf62f3c364a9f5cf9f478484d731fb81c90aeb Mon Sep 17 00:00:00 2001 From: pavelbannov Date: Mon, 24 Jul 2023 18:10:07 +0300 Subject: [PATCH 09/30] Smtp: fixed delete smtp method --- web/ASC.Web.Api/Api/SmtpSettingsController.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/web/ASC.Web.Api/Api/SmtpSettingsController.cs b/web/ASC.Web.Api/Api/SmtpSettingsController.cs index e0bff3113cd..7a25f797049 100644 --- a/web/ASC.Web.Api/Api/SmtpSettingsController.cs +++ b/web/ASC.Web.Api/Api/SmtpSettingsController.cs @@ -131,6 +131,11 @@ public SmtpSettingsDto ResetSmtpSettings() var current = _coreConfiguration.DefaultSmtpSettings; + if (current.IsDefaultSettings && !_coreBaseSettings.Standalone) + { + current = SmtpSettings.Empty; + } + var settings = _mapper.Map(current); settings.CredentialsUserPassword = ""; From f135f37e060b2f6624d50cc674e3b30c3bfa8cd8 Mon Sep 17 00:00:00 2001 From: Andrey Savihin Date: Mon, 24 Jul 2023 21:29:56 +0300 Subject: [PATCH 10/30] fix Bug 63409 - Welcome letter markup --- .../WebstudioNotifyPatternResource.ru.resx | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.ru.resx b/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.ru.resx index 8cb61d3fe0e..eac3c1f4dd1 100644 --- a/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.ru.resx +++ b/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.ru.resx @@ -1353,24 +1353,24 @@ _Обратите внимание: плательщиком становитс Здравствуйте, $UserName! -  + Вот три простых вопроса, которые помогут нам сделать использование более комфортным для вас. -  -* У вас большая команда или много клиентов и партнеров, с которыми вы могли бы совместно работать в ONLYOFFICE DocSpace? -  -* Вы хотели бы создавать любое количество комнат для работы с большим объемом документов? -  + +* У вас большая команда или много клиентов и партнеров, с которыми вы могли бы совместно работать в ONLYOFFICE DocSpace? + +* Вы хотели бы создавать любое количество комнат для работы с большим объемом документов? + * Вы хотели бы использовать ONLYOFFICE DocSpace под собственным брендом? -  + Если вы ответили «да» хотя бы на один вопрос, выберите тарифный план BUSINESS, который позволит добавлять любое желаемое количество менеджеров в ваш ONLYOFFICE DocSpace, а также применять опции брендинга. -  -Для этого обратитесь к разделу "Платежи":"$PricingPage" вашего ONLYOFFICE DocSpace. Вы получите индивидуальную ссылку на клиентский портал Stripe, где вы можете легко управлять всеми платежами. -  + +Для этого обратитесь к разделу "Платежи":"$PricingPage" вашего ONLYOFFICE DocSpace. Вы получите индивидуальную ссылку на клиентский портал Stripe, где вы можете легко управлять всеми платежами. + _Обратите внимание: плательщиком становится тот, кто оплачивает подписку. Вносить изменения в подписку (регулировать количество менеджеров) может только плательщик. Пользователи не получают доступа к платежным реквизитам. Владелец учетной записи ONLYOFFICE DocSpace может переназначить плательщика в любое время позднее. _ -  + С уважением, команда ONLYOFFICE -"www.onlyoffice.com":http://onlyoffice.com/ru +"www.onlyoffice.com":"http://onlyoffice.com/ru" Здравствуйте! From ee56dc8ffbcea7268cf4c9766fafdb5f1b9bbd40 Mon Sep 17 00:00:00 2001 From: Alexey Safronov Date: Tue, 25 Jul 2023 13:21:17 +0400 Subject: [PATCH 11/30] Update yarn.lock --- yarn.lock | 1692 ++++++++++++++++++++++++----------------------------- 1 file changed, 761 insertions(+), 931 deletions(-) diff --git a/yarn.lock b/yarn.lock index 183dc2c9b8e..c920ba5f69d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -97,161 +97,161 @@ __metadata: linkType: hard "@aws-sdk/client-cloudwatch-logs@npm:^3.199.0": - version: 3.363.0 - resolution: "@aws-sdk/client-cloudwatch-logs@npm:3.363.0" + version: 3.370.0 + resolution: "@aws-sdk/client-cloudwatch-logs@npm:3.370.0" dependencies: "@aws-crypto/sha256-browser": 3.0.0 "@aws-crypto/sha256-js": 3.0.0 - "@aws-sdk/client-sts": 3.363.0 - "@aws-sdk/credential-provider-node": 3.363.0 - "@aws-sdk/middleware-host-header": 3.363.0 - "@aws-sdk/middleware-logger": 3.363.0 - "@aws-sdk/middleware-recursion-detection": 3.363.0 - "@aws-sdk/middleware-signing": 3.363.0 - "@aws-sdk/middleware-user-agent": 3.363.0 - "@aws-sdk/types": 3.357.0 - "@aws-sdk/util-endpoints": 3.357.0 - "@aws-sdk/util-user-agent-browser": 3.363.0 - "@aws-sdk/util-user-agent-node": 3.363.0 + "@aws-sdk/client-sts": 3.370.0 + "@aws-sdk/credential-provider-node": 3.370.0 + "@aws-sdk/middleware-host-header": 3.370.0 + "@aws-sdk/middleware-logger": 3.370.0 + "@aws-sdk/middleware-recursion-detection": 3.370.0 + "@aws-sdk/middleware-signing": 3.370.0 + "@aws-sdk/middleware-user-agent": 3.370.0 + "@aws-sdk/types": 3.370.0 + "@aws-sdk/util-endpoints": 3.370.0 + "@aws-sdk/util-user-agent-browser": 3.370.0 + "@aws-sdk/util-user-agent-node": 3.370.0 "@smithy/config-resolver": ^1.0.1 "@smithy/fetch-http-handler": ^1.0.1 "@smithy/hash-node": ^1.0.1 "@smithy/invalid-dependency": ^1.0.1 "@smithy/middleware-content-length": ^1.0.1 - "@smithy/middleware-endpoint": ^1.0.1 - "@smithy/middleware-retry": ^1.0.2 + "@smithy/middleware-endpoint": ^1.0.2 + "@smithy/middleware-retry": ^1.0.3 "@smithy/middleware-serde": ^1.0.1 "@smithy/middleware-stack": ^1.0.1 "@smithy/node-config-provider": ^1.0.1 "@smithy/node-http-handler": ^1.0.2 - "@smithy/protocol-http": ^1.0.1 + "@smithy/protocol-http": ^1.1.0 "@smithy/smithy-client": ^1.0.3 - "@smithy/types": ^1.0.0 + "@smithy/types": ^1.1.0 "@smithy/url-parser": ^1.0.1 "@smithy/util-base64": ^1.0.1 "@smithy/util-body-length-browser": ^1.0.1 "@smithy/util-body-length-node": ^1.0.1 "@smithy/util-defaults-mode-browser": ^1.0.1 "@smithy/util-defaults-mode-node": ^1.0.1 - "@smithy/util-retry": ^1.0.2 + "@smithy/util-retry": ^1.0.3 "@smithy/util-utf8": ^1.0.1 tslib: ^2.5.0 - checksum: cf731d40d922a0a37e3f760e1fa4eb6f2c3aaa112a467ec1c3007a9548168f82caf8838564bb21a3acbe107f7e9056d68c2376b5862fbf2862dc3c81876a9d5e + checksum: e3076066e61df8517d443a8770abcac1751970321db9fd68d3c4d82ef98cffb66381c419ecb9e4c363a310bc43913d318f65ffeb76b4c89bf949ef0d9b02827f languageName: node linkType: hard -"@aws-sdk/client-sso-oidc@npm:3.363.0": - version: 3.363.0 - resolution: "@aws-sdk/client-sso-oidc@npm:3.363.0" +"@aws-sdk/client-sso-oidc@npm:3.370.0": + version: 3.370.0 + resolution: "@aws-sdk/client-sso-oidc@npm:3.370.0" dependencies: "@aws-crypto/sha256-browser": 3.0.0 "@aws-crypto/sha256-js": 3.0.0 - "@aws-sdk/middleware-host-header": 3.363.0 - "@aws-sdk/middleware-logger": 3.363.0 - "@aws-sdk/middleware-recursion-detection": 3.363.0 - "@aws-sdk/middleware-user-agent": 3.363.0 - "@aws-sdk/types": 3.357.0 - "@aws-sdk/util-endpoints": 3.357.0 - "@aws-sdk/util-user-agent-browser": 3.363.0 - "@aws-sdk/util-user-agent-node": 3.363.0 + "@aws-sdk/middleware-host-header": 3.370.0 + "@aws-sdk/middleware-logger": 3.370.0 + "@aws-sdk/middleware-recursion-detection": 3.370.0 + "@aws-sdk/middleware-user-agent": 3.370.0 + "@aws-sdk/types": 3.370.0 + "@aws-sdk/util-endpoints": 3.370.0 + "@aws-sdk/util-user-agent-browser": 3.370.0 + "@aws-sdk/util-user-agent-node": 3.370.0 "@smithy/config-resolver": ^1.0.1 "@smithy/fetch-http-handler": ^1.0.1 "@smithy/hash-node": ^1.0.1 "@smithy/invalid-dependency": ^1.0.1 "@smithy/middleware-content-length": ^1.0.1 - "@smithy/middleware-endpoint": ^1.0.1 - "@smithy/middleware-retry": ^1.0.2 + "@smithy/middleware-endpoint": ^1.0.2 + "@smithy/middleware-retry": ^1.0.3 "@smithy/middleware-serde": ^1.0.1 "@smithy/middleware-stack": ^1.0.1 "@smithy/node-config-provider": ^1.0.1 "@smithy/node-http-handler": ^1.0.2 - "@smithy/protocol-http": ^1.0.1 + "@smithy/protocol-http": ^1.1.0 "@smithy/smithy-client": ^1.0.3 - "@smithy/types": ^1.0.0 + "@smithy/types": ^1.1.0 "@smithy/url-parser": ^1.0.1 "@smithy/util-base64": ^1.0.1 "@smithy/util-body-length-browser": ^1.0.1 "@smithy/util-body-length-node": ^1.0.1 "@smithy/util-defaults-mode-browser": ^1.0.1 "@smithy/util-defaults-mode-node": ^1.0.1 - "@smithy/util-retry": ^1.0.2 + "@smithy/util-retry": ^1.0.3 "@smithy/util-utf8": ^1.0.1 tslib: ^2.5.0 - checksum: 89c24c9bc083c6995370fdbd68f4933dd0c90bdbc62f5c7dd1cd3b07b13195c3ab9abf25e2657e725b2330ec99fcc69b9e1392565c3e34f8e6cd7164b115a335 + checksum: a94d58fdef83615fa63ecde638a3ece82c2eaf05d7309a4ab336e0c6bebf8501aad123efbbf0714db4710208897594e13bfe1e450a657aa4bd82fbea338c0946 languageName: node linkType: hard -"@aws-sdk/client-sso@npm:3.363.0": - version: 3.363.0 - resolution: "@aws-sdk/client-sso@npm:3.363.0" +"@aws-sdk/client-sso@npm:3.370.0": + version: 3.370.0 + resolution: "@aws-sdk/client-sso@npm:3.370.0" dependencies: "@aws-crypto/sha256-browser": 3.0.0 "@aws-crypto/sha256-js": 3.0.0 - "@aws-sdk/middleware-host-header": 3.363.0 - "@aws-sdk/middleware-logger": 3.363.0 - "@aws-sdk/middleware-recursion-detection": 3.363.0 - "@aws-sdk/middleware-user-agent": 3.363.0 - "@aws-sdk/types": 3.357.0 - "@aws-sdk/util-endpoints": 3.357.0 - "@aws-sdk/util-user-agent-browser": 3.363.0 - "@aws-sdk/util-user-agent-node": 3.363.0 + "@aws-sdk/middleware-host-header": 3.370.0 + "@aws-sdk/middleware-logger": 3.370.0 + "@aws-sdk/middleware-recursion-detection": 3.370.0 + "@aws-sdk/middleware-user-agent": 3.370.0 + "@aws-sdk/types": 3.370.0 + "@aws-sdk/util-endpoints": 3.370.0 + "@aws-sdk/util-user-agent-browser": 3.370.0 + "@aws-sdk/util-user-agent-node": 3.370.0 "@smithy/config-resolver": ^1.0.1 "@smithy/fetch-http-handler": ^1.0.1 "@smithy/hash-node": ^1.0.1 "@smithy/invalid-dependency": ^1.0.1 "@smithy/middleware-content-length": ^1.0.1 - "@smithy/middleware-endpoint": ^1.0.1 - "@smithy/middleware-retry": ^1.0.2 + "@smithy/middleware-endpoint": ^1.0.2 + "@smithy/middleware-retry": ^1.0.3 "@smithy/middleware-serde": ^1.0.1 "@smithy/middleware-stack": ^1.0.1 "@smithy/node-config-provider": ^1.0.1 "@smithy/node-http-handler": ^1.0.2 - "@smithy/protocol-http": ^1.0.1 + "@smithy/protocol-http": ^1.1.0 "@smithy/smithy-client": ^1.0.3 - "@smithy/types": ^1.0.0 + "@smithy/types": ^1.1.0 "@smithy/url-parser": ^1.0.1 "@smithy/util-base64": ^1.0.1 "@smithy/util-body-length-browser": ^1.0.1 "@smithy/util-body-length-node": ^1.0.1 "@smithy/util-defaults-mode-browser": ^1.0.1 "@smithy/util-defaults-mode-node": ^1.0.1 - "@smithy/util-retry": ^1.0.2 + "@smithy/util-retry": ^1.0.3 "@smithy/util-utf8": ^1.0.1 tslib: ^2.5.0 - checksum: 938f435f25125458920aad3c7e6d6964df49b42ad447de19b60fe212de9cc1c638d6e8cff224cf49a0a973ecb69e2eb8360415138ad985d614f35c9af13d3457 + checksum: e6797cac371b7da2b01885f0a4bcb81033af2246bb45ca6454d76b223ab23a824667479e9e7a77fe3d99164fb009a970ff6498d9d13ef57587ef1652f0f7f036 languageName: node linkType: hard -"@aws-sdk/client-sts@npm:3.363.0": - version: 3.363.0 - resolution: "@aws-sdk/client-sts@npm:3.363.0" +"@aws-sdk/client-sts@npm:3.370.0": + version: 3.370.0 + resolution: "@aws-sdk/client-sts@npm:3.370.0" dependencies: "@aws-crypto/sha256-browser": 3.0.0 "@aws-crypto/sha256-js": 3.0.0 - "@aws-sdk/credential-provider-node": 3.363.0 - "@aws-sdk/middleware-host-header": 3.363.0 - "@aws-sdk/middleware-logger": 3.363.0 - "@aws-sdk/middleware-recursion-detection": 3.363.0 - "@aws-sdk/middleware-sdk-sts": 3.363.0 - "@aws-sdk/middleware-signing": 3.363.0 - "@aws-sdk/middleware-user-agent": 3.363.0 - "@aws-sdk/types": 3.357.0 - "@aws-sdk/util-endpoints": 3.357.0 - "@aws-sdk/util-user-agent-browser": 3.363.0 - "@aws-sdk/util-user-agent-node": 3.363.0 + "@aws-sdk/credential-provider-node": 3.370.0 + "@aws-sdk/middleware-host-header": 3.370.0 + "@aws-sdk/middleware-logger": 3.370.0 + "@aws-sdk/middleware-recursion-detection": 3.370.0 + "@aws-sdk/middleware-sdk-sts": 3.370.0 + "@aws-sdk/middleware-signing": 3.370.0 + "@aws-sdk/middleware-user-agent": 3.370.0 + "@aws-sdk/types": 3.370.0 + "@aws-sdk/util-endpoints": 3.370.0 + "@aws-sdk/util-user-agent-browser": 3.370.0 + "@aws-sdk/util-user-agent-node": 3.370.0 "@smithy/config-resolver": ^1.0.1 "@smithy/fetch-http-handler": ^1.0.1 "@smithy/hash-node": ^1.0.1 "@smithy/invalid-dependency": ^1.0.1 "@smithy/middleware-content-length": ^1.0.1 - "@smithy/middleware-endpoint": ^1.0.1 - "@smithy/middleware-retry": ^1.0.1 + "@smithy/middleware-endpoint": ^1.0.2 + "@smithy/middleware-retry": ^1.0.3 "@smithy/middleware-serde": ^1.0.1 "@smithy/middleware-stack": ^1.0.1 "@smithy/node-config-provider": ^1.0.1 - "@smithy/node-http-handler": ^1.0.1 + "@smithy/node-http-handler": ^1.0.2 "@smithy/protocol-http": ^1.1.0 - "@smithy/smithy-client": ^1.0.2 + "@smithy/smithy-client": ^1.0.3 "@smithy/types": ^1.1.0 "@smithy/url-parser": ^1.0.1 "@smithy/util-base64": ^1.0.1 @@ -259,208 +259,209 @@ __metadata: "@smithy/util-body-length-node": ^1.0.1 "@smithy/util-defaults-mode-browser": ^1.0.1 "@smithy/util-defaults-mode-node": ^1.0.1 - "@smithy/util-retry": ^1.0.1 + "@smithy/util-retry": ^1.0.3 "@smithy/util-utf8": ^1.0.1 fast-xml-parser: 4.2.5 tslib: ^2.5.0 - checksum: 5af409a69d61a50b50fe0f73d69a85ef84ee23c4b9987f1c8f81b3b516fb0bdae99814ef011d96f8985e5895f563592f8ebb22d10a8d06bb937434387178487f + checksum: 55ce8a7a8a8a44cffdbfca10ac2e4d389a4a13e81a4558ef401c3174727296c47375cec5898023e082285aaf5804d62f5d887da53e343f24aec8d8b5bc4ea29b languageName: node linkType: hard -"@aws-sdk/credential-provider-env@npm:3.363.0": - version: 3.363.0 - resolution: "@aws-sdk/credential-provider-env@npm:3.363.0" +"@aws-sdk/credential-provider-env@npm:3.370.0": + version: 3.370.0 + resolution: "@aws-sdk/credential-provider-env@npm:3.370.0" dependencies: - "@aws-sdk/types": 3.357.0 + "@aws-sdk/types": 3.370.0 "@smithy/property-provider": ^1.0.1 "@smithy/types": ^1.1.0 tslib: ^2.5.0 - checksum: 760cd1090b9523f03058973fa4abde09ea71e012ffb1f71234ca059e4c4ab657d12fb688cb5e017f612278e95a3e9043b3a26b7aa86473aa2b915034ba71fa28 + checksum: 0295278ca333b8548c417d164569df737a5c587d7d39c35e9d0c9b55022a3d8caa3de04dd242135069cb3570cd9f52a2c1012fcaef4a13f49e91cec6aa0ed9b6 languageName: node linkType: hard -"@aws-sdk/credential-provider-ini@npm:3.363.0": - version: 3.363.0 - resolution: "@aws-sdk/credential-provider-ini@npm:3.363.0" +"@aws-sdk/credential-provider-ini@npm:3.370.0": + version: 3.370.0 + resolution: "@aws-sdk/credential-provider-ini@npm:3.370.0" dependencies: - "@aws-sdk/credential-provider-env": 3.363.0 - "@aws-sdk/credential-provider-process": 3.363.0 - "@aws-sdk/credential-provider-sso": 3.363.0 - "@aws-sdk/credential-provider-web-identity": 3.363.0 - "@aws-sdk/types": 3.357.0 + "@aws-sdk/credential-provider-env": 3.370.0 + "@aws-sdk/credential-provider-process": 3.370.0 + "@aws-sdk/credential-provider-sso": 3.370.0 + "@aws-sdk/credential-provider-web-identity": 3.370.0 + "@aws-sdk/types": 3.370.0 "@smithy/credential-provider-imds": ^1.0.1 "@smithy/property-provider": ^1.0.1 "@smithy/shared-ini-file-loader": ^1.0.1 "@smithy/types": ^1.1.0 tslib: ^2.5.0 - checksum: 6a23678a4e5f7ec78f2330005bd51efd0658cd24543ea32f7a54b090a3513f50d26f7ee52c4da3eb748c3be1e199adcfc4e5a2e6d2dfc85b64ab9b3aa5825db4 + checksum: 8d8d0d386eb521047ac515fe8bb99faad0b5613dfd1e1824ebc0b427f68d420a68c97ba5b1b5e64a16e3edda3633d76d2f632acdf2c8b37ff39148c8e50c7200 languageName: node linkType: hard -"@aws-sdk/credential-provider-node@npm:3.363.0": - version: 3.363.0 - resolution: "@aws-sdk/credential-provider-node@npm:3.363.0" +"@aws-sdk/credential-provider-node@npm:3.370.0": + version: 3.370.0 + resolution: "@aws-sdk/credential-provider-node@npm:3.370.0" dependencies: - "@aws-sdk/credential-provider-env": 3.363.0 - "@aws-sdk/credential-provider-ini": 3.363.0 - "@aws-sdk/credential-provider-process": 3.363.0 - "@aws-sdk/credential-provider-sso": 3.363.0 - "@aws-sdk/credential-provider-web-identity": 3.363.0 - "@aws-sdk/types": 3.357.0 + "@aws-sdk/credential-provider-env": 3.370.0 + "@aws-sdk/credential-provider-ini": 3.370.0 + "@aws-sdk/credential-provider-process": 3.370.0 + "@aws-sdk/credential-provider-sso": 3.370.0 + "@aws-sdk/credential-provider-web-identity": 3.370.0 + "@aws-sdk/types": 3.370.0 "@smithy/credential-provider-imds": ^1.0.1 "@smithy/property-provider": ^1.0.1 "@smithy/shared-ini-file-loader": ^1.0.1 "@smithy/types": ^1.1.0 tslib: ^2.5.0 - checksum: 9a50f8ec1713be3ebd14c233d4e97c149277004ac91b14110497d572942d8c7a48d5201277defd077bb6c2a0ca17db076bb4cf2b88fc343e186867b8cb177070 + checksum: 564422e77d791fcc307f2954ebf2e7a17273dff63812ed8528196f3f38163db726a71cc1c22d2e6de287727d3506764dab8c9c99de7fe3426d6cec0bf4d4f0ab languageName: node linkType: hard -"@aws-sdk/credential-provider-process@npm:3.363.0": - version: 3.363.0 - resolution: "@aws-sdk/credential-provider-process@npm:3.363.0" +"@aws-sdk/credential-provider-process@npm:3.370.0": + version: 3.370.0 + resolution: "@aws-sdk/credential-provider-process@npm:3.370.0" dependencies: - "@aws-sdk/types": 3.357.0 + "@aws-sdk/types": 3.370.0 "@smithy/property-provider": ^1.0.1 "@smithy/shared-ini-file-loader": ^1.0.1 "@smithy/types": ^1.1.0 tslib: ^2.5.0 - checksum: d8f12f30a442f68f4d465ba38ea2dbb6e5df07da389ba9dc3a6178a2b125e50b62526d92af4fe3d18d38a74fdd00b97082dd2ad796bde9247aa014fa3229ca56 + checksum: 286080cfdb0a433a619cafb29316cc4259022de5369a5a2eefd638a8b025626eb730a6d676bdff4ef0fb905c44fe4a1d4c856f62318553f62b425eea406229de languageName: node linkType: hard -"@aws-sdk/credential-provider-sso@npm:3.363.0": - version: 3.363.0 - resolution: "@aws-sdk/credential-provider-sso@npm:3.363.0" +"@aws-sdk/credential-provider-sso@npm:3.370.0": + version: 3.370.0 + resolution: "@aws-sdk/credential-provider-sso@npm:3.370.0" dependencies: - "@aws-sdk/client-sso": 3.363.0 - "@aws-sdk/token-providers": 3.363.0 - "@aws-sdk/types": 3.357.0 + "@aws-sdk/client-sso": 3.370.0 + "@aws-sdk/token-providers": 3.370.0 + "@aws-sdk/types": 3.370.0 "@smithy/property-provider": ^1.0.1 "@smithy/shared-ini-file-loader": ^1.0.1 "@smithy/types": ^1.1.0 tslib: ^2.5.0 - checksum: 0cf8b29865e80ecc7f4aa02de389e9f313df40035eade19dfe6c3de4c3dd5b8a604cd9089b5ce3d0338fac2c9fcfe97da16becb51a9068d01c189dfa1e24b478 + checksum: a5ef52fd213f567ba7aaa243bf4494a4df272522de4db952f0f9a0b1c148920fc49aff43321ec11b08ddd62e34c2686b0d50ae3a20c229e680d392b3c194b0f5 languageName: node linkType: hard -"@aws-sdk/credential-provider-web-identity@npm:3.363.0": - version: 3.363.0 - resolution: "@aws-sdk/credential-provider-web-identity@npm:3.363.0" +"@aws-sdk/credential-provider-web-identity@npm:3.370.0": + version: 3.370.0 + resolution: "@aws-sdk/credential-provider-web-identity@npm:3.370.0" dependencies: - "@aws-sdk/types": 3.357.0 + "@aws-sdk/types": 3.370.0 "@smithy/property-provider": ^1.0.1 "@smithy/types": ^1.1.0 tslib: ^2.5.0 - checksum: b0625bf4e59b64f6d2cfb718db78d43e2ad25e4df1c2d5c9b662d43b25e4cda3409176ccabee586cd22362e39bfeafe089592c895c9bcb7b1d5e86db55c06826 + checksum: 3e9ce1c7749e60302f966a64635a11dece3da47ece8da6e4eae0c784bdf481bee48a0b1085014b11b812ee608fe99fb20548203bfa8d2f43f709b39b1a484f9b languageName: node linkType: hard -"@aws-sdk/middleware-host-header@npm:3.363.0": - version: 3.363.0 - resolution: "@aws-sdk/middleware-host-header@npm:3.363.0" +"@aws-sdk/middleware-host-header@npm:3.370.0": + version: 3.370.0 + resolution: "@aws-sdk/middleware-host-header@npm:3.370.0" dependencies: - "@aws-sdk/types": 3.357.0 + "@aws-sdk/types": 3.370.0 "@smithy/protocol-http": ^1.1.0 "@smithy/types": ^1.1.0 tslib: ^2.5.0 - checksum: 80f747bacb0cedb7f56f38836869807c15a6bf0d791a26ab9e856e4bfce7f895d63847caa14ccc4bf461352db7312a3f3d771c48132870aa91eea22dcf4f7922 + checksum: 2a7d3f3a0ab75d3c09a9cecc3e545706df2ba561851cde0992a41d00bad2695e5d5f29ff388037a11fb52770b3b9b2a98166cab5c4d1a2fa438ecea32e14604b languageName: node linkType: hard -"@aws-sdk/middleware-logger@npm:3.363.0": - version: 3.363.0 - resolution: "@aws-sdk/middleware-logger@npm:3.363.0" +"@aws-sdk/middleware-logger@npm:3.370.0": + version: 3.370.0 + resolution: "@aws-sdk/middleware-logger@npm:3.370.0" dependencies: - "@aws-sdk/types": 3.357.0 + "@aws-sdk/types": 3.370.0 "@smithy/types": ^1.1.0 tslib: ^2.5.0 - checksum: 13c6dccb41b7c5538bbb58367b6c5f6b9971509afded35fad1dc9bfe56be306eb1e8ad7e46bc8c6457a515880642073c66a2a3ec1f3f08a538089a9d5d6b9ecf + checksum: f3c4062247d2a0064f82e412f027c2cd950d512d9e4a14d603a925ae97cd527e304439e854fb0b2de1f84b429ace317edaa09a8ee9319efec8df47aa3abbb65b languageName: node linkType: hard -"@aws-sdk/middleware-recursion-detection@npm:3.363.0": - version: 3.363.0 - resolution: "@aws-sdk/middleware-recursion-detection@npm:3.363.0" +"@aws-sdk/middleware-recursion-detection@npm:3.370.0": + version: 3.370.0 + resolution: "@aws-sdk/middleware-recursion-detection@npm:3.370.0" dependencies: - "@aws-sdk/types": 3.357.0 + "@aws-sdk/types": 3.370.0 "@smithy/protocol-http": ^1.1.0 "@smithy/types": ^1.1.0 tslib: ^2.5.0 - checksum: 7ef55ef6ca6fc3b4344502d40787e9c8bc21bfa8b86b5bb7087406af5d3a080038da42701a12777b4f636a5eeacfd73c6db020ee55527b24b5504c8d3ced54f7 + checksum: ee259519548171ef3381f9bd48568d8052a7980cfe1a8070d72b44af0522a55baa0e440db5c1460123dc48fb217251a31aea236beda7220af60ebbe2375c96a0 languageName: node linkType: hard -"@aws-sdk/middleware-sdk-sts@npm:3.363.0": - version: 3.363.0 - resolution: "@aws-sdk/middleware-sdk-sts@npm:3.363.0" +"@aws-sdk/middleware-sdk-sts@npm:3.370.0": + version: 3.370.0 + resolution: "@aws-sdk/middleware-sdk-sts@npm:3.370.0" dependencies: - "@aws-sdk/middleware-signing": 3.363.0 - "@aws-sdk/types": 3.357.0 + "@aws-sdk/middleware-signing": 3.370.0 + "@aws-sdk/types": 3.370.0 "@smithy/types": ^1.1.0 tslib: ^2.5.0 - checksum: b5f03018e86b8b389ef1dc14a5e3078e95cd40a90490b0284b1933e65e4a15c8c27fad96f50ba82a605489b36c2092fbdaf6aaf7011ed2b07c5f3701d085517a + checksum: 14877966d56518895d55b30af45ff695b835ced56e46986b3aea12b3f8df953741a18ad24fcd567eae7a4b0c4c501fe4c0a20c01d6604d0e67c2be6435b15037 languageName: node linkType: hard -"@aws-sdk/middleware-signing@npm:3.363.0": - version: 3.363.0 - resolution: "@aws-sdk/middleware-signing@npm:3.363.0" +"@aws-sdk/middleware-signing@npm:3.370.0": + version: 3.370.0 + resolution: "@aws-sdk/middleware-signing@npm:3.370.0" dependencies: - "@aws-sdk/types": 3.357.0 + "@aws-sdk/types": 3.370.0 "@smithy/property-provider": ^1.0.1 "@smithy/protocol-http": ^1.1.0 "@smithy/signature-v4": ^1.0.1 "@smithy/types": ^1.1.0 "@smithy/util-middleware": ^1.0.1 tslib: ^2.5.0 - checksum: 7f4efb241b1d9241ffde3ac26b65eeee04c943fd68b0e83e72ce443b4821fb228bff7584b063cfcff62a35bac5f537460c4ef443b7a62fb3f8d6b1493bd36792 + checksum: f8581ad377a8eea2345b2881adfe0c4fc35a9825ca0b55facbac5f89e088acd8e231d87ae632dd249df71f8b0113046b7cdd8a0b82c69195faf799813da14e91 languageName: node linkType: hard -"@aws-sdk/middleware-user-agent@npm:3.363.0": - version: 3.363.0 - resolution: "@aws-sdk/middleware-user-agent@npm:3.363.0" +"@aws-sdk/middleware-user-agent@npm:3.370.0": + version: 3.370.0 + resolution: "@aws-sdk/middleware-user-agent@npm:3.370.0" dependencies: - "@aws-sdk/types": 3.357.0 - "@aws-sdk/util-endpoints": 3.357.0 + "@aws-sdk/types": 3.370.0 + "@aws-sdk/util-endpoints": 3.370.0 "@smithy/protocol-http": ^1.1.0 "@smithy/types": ^1.1.0 tslib: ^2.5.0 - checksum: d66f0ec8030fbbbb200f30cc4564ee085333ffa4eded02502fadd561c4b3cb481e4bdc960369850696c89a54de592d1627ebb8f98b8f7aa84b03ff8b81f330b3 + checksum: c4366db10a7eece54c9f5429352329e7ea31c91a2c05b5b484304fb2e69f07d297e04c387c22ddc11759945e2adc97e6541302391ad8faa5a3aae8e6a1605589 languageName: node linkType: hard -"@aws-sdk/token-providers@npm:3.363.0": - version: 3.363.0 - resolution: "@aws-sdk/token-providers@npm:3.363.0" +"@aws-sdk/token-providers@npm:3.370.0": + version: 3.370.0 + resolution: "@aws-sdk/token-providers@npm:3.370.0" dependencies: - "@aws-sdk/client-sso-oidc": 3.363.0 - "@aws-sdk/types": 3.357.0 + "@aws-sdk/client-sso-oidc": 3.370.0 + "@aws-sdk/types": 3.370.0 "@smithy/property-provider": ^1.0.1 "@smithy/shared-ini-file-loader": ^1.0.1 "@smithy/types": ^1.1.0 tslib: ^2.5.0 - checksum: ba945164da36a5d95fbd481702290489897097435014b2c3d22986c9e307000a63a0841798c2cbd59726ffe7dfbf0cc73c3d05a2064b679b164aef9bef00ec77 + checksum: 7126c5bdc86d8a0cefbf92649927747928fd1af76ca943ec8e9c558d99c7550535b694149601c16b096ff429178e7bea51ac2ffc121a24637ddc8b03976759ed languageName: node linkType: hard -"@aws-sdk/types@npm:3.357.0, @aws-sdk/types@npm:^3.222.0": - version: 3.357.0 - resolution: "@aws-sdk/types@npm:3.357.0" +"@aws-sdk/types@npm:3.370.0, @aws-sdk/types@npm:^3.222.0": + version: 3.370.0 + resolution: "@aws-sdk/types@npm:3.370.0" dependencies: + "@smithy/types": ^1.1.0 tslib: ^2.5.0 - checksum: 41001b0ea7af2e09daca87f2fedb992bddd864f27f70c70acd62f95bc949ae0637f7100f2cff7a5618291d77c2146f157a863a2d7a4d2576ba2d6882fd4a75bd + checksum: 105a5768f20075035c2250de69f782ea4219c9ed8cd426c9ab57605616c8b1d534764d3c5b29e9715eb68a0e3f99b27ed463c410a3d728abf3c4ad59347e9f4e languageName: node linkType: hard -"@aws-sdk/util-endpoints@npm:3.357.0": - version: 3.357.0 - resolution: "@aws-sdk/util-endpoints@npm:3.357.0" +"@aws-sdk/util-endpoints@npm:3.370.0": + version: 3.370.0 + resolution: "@aws-sdk/util-endpoints@npm:3.370.0" dependencies: - "@aws-sdk/types": 3.357.0 + "@aws-sdk/types": 3.370.0 tslib: ^2.5.0 - checksum: dcbe4a4ee0fe4490c64465c1dbaaf67d1da38fbc2e8d95e44f50dc4cc94c378b5d1e561c77d5d1c30bb89fb39891e24f1d3778dd8b1fda9305bc3529e3174fe5 + checksum: d351ad2fdc92bec16d0d925dbcfc3f38baed12a7984d70bf02ee2dfe4c3fd1a85f53e515f9751f31d1345fe0bdebd62be7cd08e405a31354db92312f0cc6282c languageName: node linkType: hard @@ -473,23 +474,23 @@ __metadata: languageName: node linkType: hard -"@aws-sdk/util-user-agent-browser@npm:3.363.0": - version: 3.363.0 - resolution: "@aws-sdk/util-user-agent-browser@npm:3.363.0" +"@aws-sdk/util-user-agent-browser@npm:3.370.0": + version: 3.370.0 + resolution: "@aws-sdk/util-user-agent-browser@npm:3.370.0" dependencies: - "@aws-sdk/types": 3.357.0 + "@aws-sdk/types": 3.370.0 "@smithy/types": ^1.1.0 bowser: ^2.11.0 tslib: ^2.5.0 - checksum: efd4319c2c6cf2385a471b28f0e48d6c197551a769040c5fe4e8fbcec0eb2b5f8fd326b17fefc3935d5bded731f1df5923fb114dc4ed720550731cfd0d2e597f + checksum: 3a549b1337490aaeacc21c3bff0e7459f51e764c6c9a69aafeb7950f54e118d2eeb64b652afb97e2f0aa6777df1e65fced2b96bfcdd98aacc753acfce7847b59 languageName: node linkType: hard -"@aws-sdk/util-user-agent-node@npm:3.363.0": - version: 3.363.0 - resolution: "@aws-sdk/util-user-agent-node@npm:3.363.0" +"@aws-sdk/util-user-agent-node@npm:3.370.0": + version: 3.370.0 + resolution: "@aws-sdk/util-user-agent-node@npm:3.370.0" dependencies: - "@aws-sdk/types": 3.357.0 + "@aws-sdk/types": 3.370.0 "@smithy/node-config-provider": ^1.0.1 "@smithy/types": ^1.1.0 tslib: ^2.5.0 @@ -498,7 +499,7 @@ __metadata: peerDependenciesMeta: aws-crt: optional: true - checksum: bfa6bdcfdfa10ae5beb1edf5ef4296b2f3f65ba48e897a601a2853be8b9d5a6510791eef9d3506ec1df261e2a88db10059a330d01d9b4fda83dc8d3766c735aa + checksum: 83b1f2c7f25f44b6bd3aed8e7b9fe3a68e077f3b8b3832648a38eb5985b95d0e5ac469242e1d21aa37e29a6c8b4f9cb2a1d60ea1b6e4a76c32225e58f98da504 languageName: node linkType: hard @@ -512,8 +513,8 @@ __metadata: linkType: hard "@babel/cli@npm:^7.15.4": - version: 7.22.6 - resolution: "@babel/cli@npm:7.22.6" + version: 7.22.9 + resolution: "@babel/cli@npm:7.22.9" dependencies: "@jridgewell/trace-mapping": ^0.3.17 "@nicolo-ribaudo/chokidar-2": 2.1.8-no-fsevents.3 @@ -534,7 +535,7 @@ __metadata: bin: babel: ./bin/babel.js babel-external-helpers: ./bin/babel-external-helpers.js - checksum: c2a6b7d68226f1601446a0e452fcbec9df40c5aabb991f427ad1e2d0eb75f123f530c1319b55b040d32b3593e003fced99e073ed556435e301d97a10965ac947 + checksum: 6acc76e521f8d657d8a85ff27387149b415507095911356417c7d26c456685153c76924bd5469f2ff026e83b65091df22d2066f1f403aeed82c4762611d9a9da languageName: node linkType: hard @@ -547,10 +548,10 @@ __metadata: languageName: node linkType: hard -"@babel/compat-data@npm:^7.20.5, @babel/compat-data@npm:^7.22.5, @babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.9.0": - version: 7.22.6 - resolution: "@babel/compat-data@npm:7.22.6" - checksum: b88631143a2ebdb75e5bac47984e950983294f1739c2133f32569c6f2fcee85f83634bb6cf4378afb44fa8eb7877d11e48811d1e6a52afa161f82276ffdc3fb4 +"@babel/compat-data@npm:^7.20.5, @babel/compat-data@npm:^7.22.5, @babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.22.9, @babel/compat-data@npm:^7.9.0": + version: 7.22.9 + resolution: "@babel/compat-data@npm:7.22.9" + checksum: bed77d9044ce948b4327b30dd0de0779fa9f3a7ed1f2d31638714ed00229fa71fc4d1617ae0eb1fad419338d3658d0e9a5a083297451e09e73e078d0347ff808 languageName: node linkType: hard @@ -603,37 +604,37 @@ __metadata: linkType: hard "@babel/core@npm:^7.1.0, @babel/core@npm:^7.12.10, @babel/core@npm:^7.12.3, @babel/core@npm:^7.15.5, @babel/core@npm:^7.18.6, @babel/core@npm:^7.19.6, @babel/core@npm:^7.7.5": - version: 7.22.8 - resolution: "@babel/core@npm:7.22.8" + version: 7.22.9 + resolution: "@babel/core@npm:7.22.9" dependencies: "@ampproject/remapping": ^2.2.0 "@babel/code-frame": ^7.22.5 - "@babel/generator": ^7.22.7 - "@babel/helper-compilation-targets": ^7.22.6 - "@babel/helper-module-transforms": ^7.22.5 + "@babel/generator": ^7.22.9 + "@babel/helper-compilation-targets": ^7.22.9 + "@babel/helper-module-transforms": ^7.22.9 "@babel/helpers": ^7.22.6 "@babel/parser": ^7.22.7 "@babel/template": ^7.22.5 "@babel/traverse": ^7.22.8 "@babel/types": ^7.22.5 - "@nicolo-ribaudo/semver-v6": ^6.3.3 convert-source-map: ^1.7.0 debug: ^4.1.0 gensync: ^1.0.0-beta.2 json5: ^2.2.2 - checksum: 75ed701c14ad17070382ae1dd166f7534b31f2c71e00995a5f261ee2398ee96335b0736573b8ff24ab6e3e6f5814ee2a48fa11ab90fabcd3dfc70ea87c5f30a6 + semver: ^6.3.1 + checksum: 7bf069aeceb417902c4efdaefab1f7b94adb7dea694a9aed1bda2edf4135348a080820529b1a300c6f8605740a00ca00c19b2d5e74b5dd489d99d8c11d5e56d1 languageName: node linkType: hard -"@babel/generator@npm:^7.12.11, @babel/generator@npm:^7.12.5, @babel/generator@npm:^7.22.7, @babel/generator@npm:^7.4.0, @babel/generator@npm:^7.9.0": - version: 7.22.7 - resolution: "@babel/generator@npm:7.22.7" +"@babel/generator@npm:^7.12.11, @babel/generator@npm:^7.12.5, @babel/generator@npm:^7.22.7, @babel/generator@npm:^7.22.9, @babel/generator@npm:^7.4.0, @babel/generator@npm:^7.9.0": + version: 7.22.9 + resolution: "@babel/generator@npm:7.22.9" dependencies: "@babel/types": ^7.22.5 "@jridgewell/gen-mapping": ^0.3.2 "@jridgewell/trace-mapping": ^0.3.17 jsesc: ^2.5.1 - checksum: cee15558888bdf5564e19cfaf95101b2910fa425f30cc1a25ac9b8621bd62b63544eb1b36ad89c80b5e41915699219f78712cab128d1f7e3da6a21fbf4143927 + checksum: 7c9d2c58b8d5ac5e047421a6ab03ec2ff5d9a5ff2c2212130a0055e063ac349e0b19d435537d6886c999771aef394832e4f54cd9fc810100a7f23d982f6af06b languageName: node linkType: hard @@ -655,50 +656,50 @@ __metadata: languageName: node linkType: hard -"@babel/helper-compilation-targets@npm:^7.13.0, @babel/helper-compilation-targets@npm:^7.20.7, @babel/helper-compilation-targets@npm:^7.22.5, @babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.8.7": - version: 7.22.6 - resolution: "@babel/helper-compilation-targets@npm:7.22.6" +"@babel/helper-compilation-targets@npm:^7.13.0, @babel/helper-compilation-targets@npm:^7.20.7, @babel/helper-compilation-targets@npm:^7.22.5, @babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.22.9, @babel/helper-compilation-targets@npm:^7.8.7": + version: 7.22.9 + resolution: "@babel/helper-compilation-targets@npm:7.22.9" dependencies: - "@babel/compat-data": ^7.22.6 + "@babel/compat-data": ^7.22.9 "@babel/helper-validator-option": ^7.22.5 - "@nicolo-ribaudo/semver-v6": ^6.3.3 browserslist: ^4.21.9 lru-cache: ^5.1.1 + semver: ^6.3.1 peerDependencies: "@babel/core": ^7.0.0 - checksum: c7788c48099c4f0edf2adeb367a941a930d39ed7453140ceb10d7114c4091922adf56d3cdd832050fd4501f25e872886390629042ddd365d3bce2ecad69ed394 + checksum: ea0006c6a93759025f4a35a25228ae260538c9f15023e8aac2a6d45ca68aef4cf86cfc429b19af9a402cbdd54d5de74ad3fbcf6baa7e48184dc079f1a791e178 languageName: node linkType: hard -"@babel/helper-create-class-features-plugin@npm:^7.18.6, @babel/helper-create-class-features-plugin@npm:^7.21.0, @babel/helper-create-class-features-plugin@npm:^7.22.5, @babel/helper-create-class-features-plugin@npm:^7.22.6, @babel/helper-create-class-features-plugin@npm:^7.8.3": - version: 7.22.6 - resolution: "@babel/helper-create-class-features-plugin@npm:7.22.6" +"@babel/helper-create-class-features-plugin@npm:^7.18.6, @babel/helper-create-class-features-plugin@npm:^7.21.0, @babel/helper-create-class-features-plugin@npm:^7.22.5, @babel/helper-create-class-features-plugin@npm:^7.22.6, @babel/helper-create-class-features-plugin@npm:^7.22.9, @babel/helper-create-class-features-plugin@npm:^7.8.3": + version: 7.22.9 + resolution: "@babel/helper-create-class-features-plugin@npm:7.22.9" dependencies: "@babel/helper-annotate-as-pure": ^7.22.5 "@babel/helper-environment-visitor": ^7.22.5 "@babel/helper-function-name": ^7.22.5 "@babel/helper-member-expression-to-functions": ^7.22.5 "@babel/helper-optimise-call-expression": ^7.22.5 - "@babel/helper-replace-supers": ^7.22.5 + "@babel/helper-replace-supers": ^7.22.9 "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5 "@babel/helper-split-export-declaration": ^7.22.6 - "@nicolo-ribaudo/semver-v6": ^6.3.3 + semver: ^6.3.1 peerDependencies: "@babel/core": ^7.0.0 - checksum: 10412e8a509a607cde6137288d3f12b1f91acd374e29e6dd6a277b67217e9f4c932a0acd89eeda837c8432916df775a8af6321aeb8d8b131ccdbf7688208dda1 + checksum: 6c2436d1a5a3f1ff24628d78fa8c6d3120c40285aa3eda7815b1adbf8c5951e0dd73d368cf845825888fa3dc2f207dadce53309825598d7c67953e5ed9dd51d2 languageName: node linkType: hard "@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.22.5": - version: 7.22.6 - resolution: "@babel/helper-create-regexp-features-plugin@npm:7.22.6" + version: 7.22.9 + resolution: "@babel/helper-create-regexp-features-plugin@npm:7.22.9" dependencies: "@babel/helper-annotate-as-pure": ^7.22.5 - "@nicolo-ribaudo/semver-v6": ^6.3.3 regexpu-core: ^5.3.1 + semver: ^6.3.1 peerDependencies: "@babel/core": ^7.0.0 - checksum: a26df33a08bc603177cc4a59d067740bd7156c05d6b519bf28cdd2f07f653be2a7f37d8dd93b85e620f20ad90da1b8dbe4d7c6cf5262e67f713904e811b7ffd2 + checksum: 87cb48a7ee898ab205374274364c3adc70b87b08c7bd07f51019ae4562c0170d7148e654d591f825dee14b5fe11666a0e7966872dfdbfa0d1b94b861ecf0e4e1 languageName: node linkType: hard @@ -720,9 +721,9 @@ __metadata: languageName: node linkType: hard -"@babel/helper-define-polyfill-provider@npm:^0.4.1": - version: 0.4.1 - resolution: "@babel/helper-define-polyfill-provider@npm:0.4.1" +"@babel/helper-define-polyfill-provider@npm:^0.4.2": + version: 0.4.2 + resolution: "@babel/helper-define-polyfill-provider@npm:0.4.2" dependencies: "@babel/helper-compilation-targets": ^7.22.6 "@babel/helper-plugin-utils": ^7.22.5 @@ -730,8 +731,8 @@ __metadata: lodash.debounce: ^4.0.8 resolve: ^1.14.2 peerDependencies: - "@babel/core": ^7.4.0-0 - checksum: 712b440cdd343ac7c4617225f91b0a9db5a7b1c96356b720e011af64ad6c4da9c66889f8d2962a0a2ae2e4ccb6a9b4a210c4a3c8c8ff103846b3d93b61bc6634 + "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 + checksum: 1f6dec0c5d0876d278fe15b71238eccc5f74c4e2efa2c78aaafa8bc2cc96336b8e68d94cd1a78497356c96e8b91b8c1f4452179820624d1702aee2f9832e6569 languageName: node linkType: hard @@ -779,19 +780,18 @@ __metadata: languageName: node linkType: hard -"@babel/helper-module-transforms@npm:^7.12.1, @babel/helper-module-transforms@npm:^7.22.5, @babel/helper-module-transforms@npm:^7.9.0": - version: 7.22.5 - resolution: "@babel/helper-module-transforms@npm:7.22.5" +"@babel/helper-module-transforms@npm:^7.12.1, @babel/helper-module-transforms@npm:^7.22.5, @babel/helper-module-transforms@npm:^7.22.9, @babel/helper-module-transforms@npm:^7.9.0": + version: 7.22.9 + resolution: "@babel/helper-module-transforms@npm:7.22.9" dependencies: "@babel/helper-environment-visitor": ^7.22.5 "@babel/helper-module-imports": ^7.22.5 "@babel/helper-simple-access": ^7.22.5 - "@babel/helper-split-export-declaration": ^7.22.5 + "@babel/helper-split-export-declaration": ^7.22.6 "@babel/helper-validator-identifier": ^7.22.5 - "@babel/template": ^7.22.5 - "@babel/traverse": ^7.22.5 - "@babel/types": ^7.22.5 - checksum: 8985dc0d971fd17c467e8b84fe0f50f3dd8610e33b6c86e5b3ca8e8859f9448bcc5c84e08a2a14285ef388351c0484797081c8f05a03770bf44fc27bf4900e68 + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 2751f77660518cf4ff027514d6f4794f04598c6393be7b04b8e46c6e21606e11c19f3f57ab6129a9c21bacdf8b3ffe3af87bb401d972f34af2d0ffde02ac3001 languageName: node linkType: hard @@ -819,30 +819,28 @@ __metadata: linkType: hard "@babel/helper-remap-async-to-generator@npm:^7.18.9, @babel/helper-remap-async-to-generator@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/helper-remap-async-to-generator@npm:7.22.5" + version: 7.22.9 + resolution: "@babel/helper-remap-async-to-generator@npm:7.22.9" dependencies: "@babel/helper-annotate-as-pure": ^7.22.5 "@babel/helper-environment-visitor": ^7.22.5 - "@babel/helper-wrap-function": ^7.22.5 - "@babel/types": ^7.22.5 + "@babel/helper-wrap-function": ^7.22.9 peerDependencies: "@babel/core": ^7.0.0 - checksum: 1e51dcff1c22e97ea3d22034b77788048eb6d8c6860325bd7a1046b7a7135730cefd93b5c96fd9839d76031095d5ffb6f0cd6ee90a5d69a4c7de980d7f4623d9 + checksum: 05538079447829b13512157491cc77f9cf1ea7e1680e15cff0682c3ed9ee162de0c4862ece20a6d6b2df28177a1520bcfe45993fbeccf2747a81795a7c3f6290 languageName: node linkType: hard -"@babel/helper-replace-supers@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/helper-replace-supers@npm:7.22.5" +"@babel/helper-replace-supers@npm:^7.22.5, @babel/helper-replace-supers@npm:^7.22.9": + version: 7.22.9 + resolution: "@babel/helper-replace-supers@npm:7.22.9" dependencies: "@babel/helper-environment-visitor": ^7.22.5 "@babel/helper-member-expression-to-functions": ^7.22.5 "@babel/helper-optimise-call-expression": ^7.22.5 - "@babel/template": ^7.22.5 - "@babel/traverse": ^7.22.5 - "@babel/types": ^7.22.5 - checksum: af29deff6c6dc3fa2d1a517390716aa3f4d329855e8689f1d5c3cb07c1b898e614a5e175f1826bb58e9ff1480e6552885a71a9a0ba5161787aaafa2c79b216cc + peerDependencies: + "@babel/core": ^7.0.0 + checksum: d41471f56ff2616459d35a5df1900d5f0756ae78b1027040365325ef332d66e08e3be02a9489756d870887585ff222403a228546e93dd7019e19e59c0c0fe586 languageName: node linkType: hard @@ -864,7 +862,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-split-export-declaration@npm:^7.22.5, @babel/helper-split-export-declaration@npm:^7.22.6": +"@babel/helper-split-export-declaration@npm:^7.22.6": version: 7.22.6 resolution: "@babel/helper-split-export-declaration@npm:7.22.6" dependencies: @@ -894,15 +892,14 @@ __metadata: languageName: node linkType: hard -"@babel/helper-wrap-function@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/helper-wrap-function@npm:7.22.5" +"@babel/helper-wrap-function@npm:^7.22.9": + version: 7.22.9 + resolution: "@babel/helper-wrap-function@npm:7.22.9" dependencies: "@babel/helper-function-name": ^7.22.5 "@babel/template": ^7.22.5 - "@babel/traverse": ^7.22.5 "@babel/types": ^7.22.5 - checksum: a4ba2d7577ad3ce92fadaa341ffce3b0e4b389808099b07c80847f9be0852f4b42344612bc1b3d1b796ffb75be56d5957c5c56a1734f6aee5ccbb7cd9ab12691 + checksum: 037317dc06dac6593e388738ae1d3e43193bc1d31698f067c0ef3d4dc6f074dbed860ed42aa137b48a67aa7cb87336826c4bdc13189260481bcf67eb7256c789 languageName: node linkType: hard @@ -2109,18 +2106,18 @@ __metadata: linkType: hard "@babel/plugin-transform-runtime@npm:^7.12.1, @babel/plugin-transform-runtime@npm:^7.15.0, @babel/plugin-transform-runtime@npm:^7.18.6": - version: 7.22.7 - resolution: "@babel/plugin-transform-runtime@npm:7.22.7" + version: 7.22.9 + resolution: "@babel/plugin-transform-runtime@npm:7.22.9" dependencies: "@babel/helper-module-imports": ^7.22.5 "@babel/helper-plugin-utils": ^7.22.5 - "@nicolo-ribaudo/semver-v6": ^6.3.3 babel-plugin-polyfill-corejs2: ^0.4.4 babel-plugin-polyfill-corejs3: ^0.8.2 babel-plugin-polyfill-regenerator: ^0.5.1 + semver: ^6.3.1 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 1b41c44d5c44c98df3885b4f541c4edbef507bbdb1c889eed9878d9aabb29b6f589192ae712454c20ced22c79cfb2911403023daf03d20902434a258632d4773 + checksum: 2fe5e41f83015ca174feda841d77aa9012fc855c907f9b360a11927f41b100537c8c83487771769147668e797eec26d5294e972b997f4759133cc43a22a43eec languageName: node linkType: hard @@ -2181,16 +2178,16 @@ __metadata: linkType: hard "@babel/plugin-transform-typescript@npm:^7.22.5, @babel/plugin-transform-typescript@npm:^7.9.0": - version: 7.22.5 - resolution: "@babel/plugin-transform-typescript@npm:7.22.5" + version: 7.22.9 + resolution: "@babel/plugin-transform-typescript@npm:7.22.9" dependencies: "@babel/helper-annotate-as-pure": ^7.22.5 - "@babel/helper-create-class-features-plugin": ^7.22.5 + "@babel/helper-create-class-features-plugin": ^7.22.9 "@babel/helper-plugin-utils": ^7.22.5 "@babel/plugin-syntax-typescript": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: d12f1ca1ef1f2a54432eb044d2999705d1205ebe211c2a7f05b12e8eb2d2a461fd7657b5486b2f2f1efe7c0c0dc8e80725b767073d40fe4ae059a7af057b05e4 + checksum: 6d1317a54d093b302599a4bee8ba9865d0de8b7b6ac1a0746c4316231d632f75b7f086e6e78acb9ac95ba12ba3b9da462dc9ca69370abb4603c4cc987f62e67e languageName: node linkType: hard @@ -2312,11 +2309,11 @@ __metadata: linkType: hard "@babel/preset-env@npm:^7.12.1, @babel/preset-env@npm:^7.12.11, @babel/preset-env@npm:^7.14.4, @babel/preset-env@npm:^7.15.4, @babel/preset-env@npm:^7.15.6, @babel/preset-env@npm:^7.19.4": - version: 7.22.7 - resolution: "@babel/preset-env@npm:7.22.7" + version: 7.22.9 + resolution: "@babel/preset-env@npm:7.22.9" dependencies: - "@babel/compat-data": ^7.22.6 - "@babel/helper-compilation-targets": ^7.22.6 + "@babel/compat-data": ^7.22.9 + "@babel/helper-compilation-targets": ^7.22.9 "@babel/helper-plugin-utils": ^7.22.5 "@babel/helper-validator-option": ^7.22.5 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": ^7.22.5 @@ -2390,14 +2387,14 @@ __metadata: "@babel/plugin-transform-unicode-sets-regex": ^7.22.5 "@babel/preset-modules": ^0.1.5 "@babel/types": ^7.22.5 - "@nicolo-ribaudo/semver-v6": ^6.3.3 babel-plugin-polyfill-corejs2: ^0.4.4 babel-plugin-polyfill-corejs3: ^0.8.2 babel-plugin-polyfill-regenerator: ^0.5.1 core-js-compat: ^3.31.0 + semver: ^6.3.1 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: eabde70e450dd54f57997b0f92317f69f268e9a1f85b13f5ef5540d2a38cfae5620bd8e48ddffb547c55fbd2f17673276e6eb9411d6b5fb82e3422faf44cb6cf + checksum: 6caa2897bbda30c6932aed0a03827deb1337c57108050c9f97dc9a857e1533c7125b168b6d70b9d191965bf05f9f233f0ad20303080505dff7ce39740aaa759d languageName: node linkType: hard @@ -2415,8 +2412,8 @@ __metadata: linkType: hard "@babel/preset-modules@npm:^0.1.3, @babel/preset-modules@npm:^0.1.5": - version: 0.1.5 - resolution: "@babel/preset-modules@npm:0.1.5" + version: 0.1.6 + resolution: "@babel/preset-modules@npm:0.1.6" dependencies: "@babel/helper-plugin-utils": ^7.0.0 "@babel/plugin-proposal-unicode-property-regex": ^7.4.4 @@ -2424,8 +2421,8 @@ __metadata: "@babel/types": ^7.4.4 esutils: ^2.0.2 peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 8430e0e9e9d520b53e22e8c4c6a5a080a12b63af6eabe559c2310b187bd62ae113f3da82ba33e9d1d0f3230930ca702843aae9dd226dec51f7d7114dc1f51c10 + "@babel/core": ^7.0.0-0 || ^8.0.0-0 <8.0.0 + checksum: 9700992d2b9526e703ab49eb8c4cd0b26bec93594d57c6b808967619df1a387565e0e58829b65b5bd6d41049071ea0152c9195b39599515fddb3e52b09a55ff0 languageName: node linkType: hard @@ -2549,7 +2546,7 @@ __metadata: languageName: node linkType: hard -"@babel/traverse@npm:^7.1.0, @babel/traverse@npm:^7.1.6, @babel/traverse@npm:^7.12.11, @babel/traverse@npm:^7.12.9, @babel/traverse@npm:^7.13.0, @babel/traverse@npm:^7.22.5, @babel/traverse@npm:^7.22.6, @babel/traverse@npm:^7.22.8, @babel/traverse@npm:^7.4.3, @babel/traverse@npm:^7.4.5, @babel/traverse@npm:^7.7.0, @babel/traverse@npm:^7.9.0": +"@babel/traverse@npm:^7.1.0, @babel/traverse@npm:^7.1.6, @babel/traverse@npm:^7.12.11, @babel/traverse@npm:^7.12.9, @babel/traverse@npm:^7.13.0, @babel/traverse@npm:^7.22.6, @babel/traverse@npm:^7.22.8, @babel/traverse@npm:^7.4.3, @babel/traverse@npm:^7.4.5, @babel/traverse@npm:^7.7.0, @babel/traverse@npm:^7.9.0": version: 7.22.8 resolution: "@babel/traverse@npm:7.22.8" dependencies: @@ -3144,9 +3141,9 @@ __metadata: linkType: hard "@eslint-community/regexpp@npm:^4.4.0": - version: 4.5.1 - resolution: "@eslint-community/regexpp@npm:4.5.1" - checksum: 6d901166d64998d591fab4db1c2f872981ccd5f6fe066a1ad0a93d4e11855ecae6bfb76660869a469563e8882d4307228cebd41142adb409d182f2966771e57e + version: 4.6.1 + resolution: "@eslint-community/regexpp@npm:4.6.1" + checksum: 5741f457f5cc4ec89389d185c44c511fc85ef3630c6ce033a64c779e72f7aa3a7d5bcdc45d54612989f0dc6ea958438c02d363797b3e4f87952fc6878481da0e languageName: node linkType: hard @@ -3537,12 +3534,12 @@ __metadata: linkType: hard "@grpc/grpc-js@npm:^1.3.2": - version: 1.8.17 - resolution: "@grpc/grpc-js@npm:1.8.17" + version: 1.8.19 + resolution: "@grpc/grpc-js@npm:1.8.19" dependencies: "@grpc/proto-loader": ^0.7.0 "@types/node": ">=12.12.47" - checksum: 0ac8cd7342a33d7e507ec0ebb470721ae84eb964fd164e4b7b829cb35774c09df158124cbce859d9398c9a015f0e29d2308a3a17be35d54e030a7dc091e7e9a4 + checksum: a1dcda766cf9a2a1c40366a4c1bfcfc8bde29d962651add76e77d091e383e90abbc9a48fcf18bb61b55d8dc3adf0b1316cccdfc7d616011c62f1e08e92b57728 languageName: node linkType: hard @@ -3562,17 +3559,17 @@ __metadata: linkType: hard "@grpc/proto-loader@npm:^0.7.0": - version: 0.7.7 - resolution: "@grpc/proto-loader@npm:0.7.7" + version: 0.7.8 + resolution: "@grpc/proto-loader@npm:0.7.8" dependencies: "@types/long": ^4.0.1 lodash.camelcase: ^4.3.0 long: ^4.0.0 - protobufjs: ^7.0.0 + protobufjs: ^7.2.4 yargs: ^17.7.2 bin: proto-loader-gen-types: build/bin/proto-loader-gen-types.js - checksum: 6015d99d36d0451075a53e5c5842e8912235973a515677afca038269969ad84f22a4c9fbc9badf52f034736b3f1bf864739f7c4238ba8a7e6fd3bba75cfce0ee + checksum: 0c7d755b08b74c25d113e363ebb7b44d2bb778158304c2c9549e1b36a57a9b7afc05563684b3cb39faed47c585ba609b84546a076f86eab7d5fef2d5794a45a9 languageName: node linkType: hard @@ -3947,13 +3944,13 @@ __metadata: linkType: hard "@loadable/babel-plugin@npm:^5.13.2": - version: 5.15.3 - resolution: "@loadable/babel-plugin@npm:5.15.3" + version: 5.16.1 + resolution: "@loadable/babel-plugin@npm:5.16.1" dependencies: "@babel/plugin-syntax-dynamic-import": ^7.7.4 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: bea73fb9019e2b5d7418b52cfb63abd6838291ccc2ad64f65c7c17ff7eb1dae5dc4b471cf9a1df39a89cc8ab6fdfac47cae66f1d9827cb91478416708b96bbb9 + checksum: f7a1eed76ca6749d66f44d5d690c5812870cda7005fb02ac31135ad99d444d73919c3d31cbbcd94c7c9444641161406b4c42e44a9fee479f533ffafc62f8ad58 languageName: node linkType: hard @@ -3971,14 +3968,14 @@ __metadata: linkType: hard "@loadable/server@npm:^5.15.2": - version: 5.15.3 - resolution: "@loadable/server@npm:5.15.3" + version: 5.16.1 + resolution: "@loadable/server@npm:5.16.1" dependencies: lodash: ^4.17.15 peerDependencies: "@loadable/component": ^5.0.1 react: ^16.3.0 || ^17.0.0 || ^18.0.0 - checksum: 86b239296d6da5101867724418e182360069310b950a6bad5f269ebbbb96d96b60cf72b9c35f28298b2020d8c31b2fde907523de1baf367269dc980b7b6e1d8c + checksum: 47628785292f571c65dd8d5082be2c7169494e5a26498fbee87ab0bbe88df41227a8ff78926c186779067d93c4eb77aad82414aabfff17709330e102560150de languageName: node linkType: hard @@ -4053,15 +4050,6 @@ __metadata: languageName: node linkType: hard -"@nicolo-ribaudo/semver-v6@npm:^6.3.3": - version: 6.3.3 - resolution: "@nicolo-ribaudo/semver-v6@npm:6.3.3" - bin: - semver: bin/semver.js - checksum: 8290855b1591477d2298364541fda64fafd4acc110b387067a71c9b05f4105c0a4ac079857ae9cd107c42ee884e8724a406b5116f069575e02d7ab87a35a5272 - languageName: node - linkType: hard - "@nodelib/fs.scandir@npm:2.1.5": version: 2.1.5 resolution: "@nodelib/fs.scandir@npm:2.1.5" @@ -4334,419 +4322,419 @@ __metadata: languageName: node linkType: hard -"@smithy/abort-controller@npm:^1.0.2": - version: 1.0.2 - resolution: "@smithy/abort-controller@npm:1.0.2" +"@smithy/abort-controller@npm:^1.1.0": + version: 1.1.0 + resolution: "@smithy/abort-controller@npm:1.1.0" dependencies: - "@smithy/types": ^1.1.1 + "@smithy/types": ^1.2.0 tslib: ^2.5.0 - checksum: 5d0c5b04636c1e27c812b3ac0f780602ff28ed60dbd5b9d39e9caa6f2e982b340efd3fea4d7e7b282451d1469ef6f9d5086e79a0945a078db2db7672dd174f49 + checksum: 4299368f0b7dbeb8ffba00632b191ec39113fa9b9d29c3ff33c54d5a8663d42d769aa5d79ecd656fe8d09ccb23a7351095305524c27c5650ec7f96a312e5e522 languageName: node linkType: hard -"@smithy/config-resolver@npm:^1.0.1, @smithy/config-resolver@npm:^1.0.2": - version: 1.0.2 - resolution: "@smithy/config-resolver@npm:1.0.2" +"@smithy/config-resolver@npm:^1.0.1, @smithy/config-resolver@npm:^1.1.0": + version: 1.1.0 + resolution: "@smithy/config-resolver@npm:1.1.0" dependencies: - "@smithy/types": ^1.1.1 - "@smithy/util-config-provider": ^1.0.2 - "@smithy/util-middleware": ^1.0.2 + "@smithy/types": ^1.2.0 + "@smithy/util-config-provider": ^1.1.0 + "@smithy/util-middleware": ^1.1.0 tslib: ^2.5.0 - checksum: 23efcb59d682b7ab05ec920c92d9e7fcecc58b9ab204a4de504da18ef0687c051b27acf9bcfc91969a160ea137d6f2f2091b4f3e31c659327784f95240ec0d13 + checksum: 3127ab1e35875337c98daec4ae4acce35afe5ad5f21cc84b5d634cb5d3ddc71baddb4780b225294b9e6e929e213799bdc1a7681da545c0797c8d7ae5b1eafcd3 languageName: node linkType: hard -"@smithy/credential-provider-imds@npm:^1.0.1, @smithy/credential-provider-imds@npm:^1.0.2": - version: 1.0.2 - resolution: "@smithy/credential-provider-imds@npm:1.0.2" +"@smithy/credential-provider-imds@npm:^1.0.1, @smithy/credential-provider-imds@npm:^1.1.0": + version: 1.1.0 + resolution: "@smithy/credential-provider-imds@npm:1.1.0" dependencies: - "@smithy/node-config-provider": ^1.0.2 - "@smithy/property-provider": ^1.0.2 - "@smithy/types": ^1.1.1 - "@smithy/url-parser": ^1.0.2 + "@smithy/node-config-provider": ^1.1.0 + "@smithy/property-provider": ^1.2.0 + "@smithy/types": ^1.2.0 + "@smithy/url-parser": ^1.1.0 tslib: ^2.5.0 - checksum: 91b57891b68fd1e83b40d8bde72cbc38247982ba6eaaf32a80bdcccb1e30b42799ac7d8b50da55796ae873a95891b567298d5da41e1059150e240d075a82ee03 + checksum: 08e08ef6a22ce0f9d75864a1ebd960acf2e30fe30cd74bdf30a1ea3a7e57ed16d817d903e2698342284c4a8cee22058d599ca93d38953083d490aa3657c6d72f languageName: node linkType: hard -"@smithy/eventstream-codec@npm:^1.0.2": - version: 1.0.2 - resolution: "@smithy/eventstream-codec@npm:1.0.2" +"@smithy/eventstream-codec@npm:^1.1.0": + version: 1.1.0 + resolution: "@smithy/eventstream-codec@npm:1.1.0" dependencies: "@aws-crypto/crc32": 3.0.0 - "@smithy/types": ^1.1.1 - "@smithy/util-hex-encoding": ^1.0.2 + "@smithy/types": ^1.2.0 + "@smithy/util-hex-encoding": ^1.1.0 tslib: ^2.5.0 - checksum: 64e2f6e5b03595815a2b968938459db3df31498b2befa657b5acc55242c57da56825431465bac271344cecf68d1f31a54ed3477ebd7d775ad3791d7e48a2bc62 + checksum: 88e414d9a758b88f28ddb669f1dc26f8d3e3a36d398adace3919a699ff289dbf0e0c59bed69dc85741a2bcf9cbe66ce803986ede548328a7117a711534e51c6b languageName: node linkType: hard -"@smithy/fetch-http-handler@npm:^1.0.1, @smithy/fetch-http-handler@npm:^1.0.2": - version: 1.0.2 - resolution: "@smithy/fetch-http-handler@npm:1.0.2" +"@smithy/fetch-http-handler@npm:^1.0.1, @smithy/fetch-http-handler@npm:^1.1.0": + version: 1.1.0 + resolution: "@smithy/fetch-http-handler@npm:1.1.0" dependencies: - "@smithy/protocol-http": ^1.1.1 - "@smithy/querystring-builder": ^1.0.2 - "@smithy/types": ^1.1.1 - "@smithy/util-base64": ^1.0.2 + "@smithy/protocol-http": ^1.2.0 + "@smithy/querystring-builder": ^1.1.0 + "@smithy/types": ^1.2.0 + "@smithy/util-base64": ^1.1.0 tslib: ^2.5.0 - checksum: 62965f69ebcb7a7a67576d4ac909873080d0da33796f15ecf7b265e7f35e0d43e6d3cdf5edb53b9a51f97a88ee90777dd8a7a84ac8dd914cd3d4bcb1c6611506 + checksum: 07e084913902b2699089baf89fa964e79e373f1f77fdb9a803e6c1a58d9148da9348cdc77de70a6b684a907faeb8958433fd66548774f5d14e1216b99fbfe37d languageName: node linkType: hard "@smithy/hash-node@npm:^1.0.1": - version: 1.0.2 - resolution: "@smithy/hash-node@npm:1.0.2" + version: 1.1.0 + resolution: "@smithy/hash-node@npm:1.1.0" dependencies: - "@smithy/types": ^1.1.1 - "@smithy/util-buffer-from": ^1.0.2 - "@smithy/util-utf8": ^1.0.2 + "@smithy/types": ^1.2.0 + "@smithy/util-buffer-from": ^1.1.0 + "@smithy/util-utf8": ^1.1.0 tslib: ^2.5.0 - checksum: 018ef3271c60e7c8df07c4b5f77b52010a8a6be53e9da3f7e361cda48a6df6f5a52870a7721110338725e83b88d5ef120c2312334b6618f3dfdf80d4e0725cab + checksum: 5384cd517c94454b14357332a09b6ba76331d68808cd0816af7050d608634cff6f51375871a2caa97973441d27bf7b355aa950d1c9f4658be31b3893812327c3 languageName: node linkType: hard "@smithy/invalid-dependency@npm:^1.0.1": - version: 1.0.2 - resolution: "@smithy/invalid-dependency@npm:1.0.2" + version: 1.1.0 + resolution: "@smithy/invalid-dependency@npm:1.1.0" dependencies: - "@smithy/types": ^1.1.1 + "@smithy/types": ^1.2.0 tslib: ^2.5.0 - checksum: 51d4bfc25854789a312d87c9bfe1a919e8d7a96052d4010f411c0cb532673a8a3fff92f2d0cf18ccbd05f618f36bfc7fab61159878559ffdd7096de2bd749916 + checksum: e2b42bee8d07b2b4bcacdd47262d73da845a1dc33d3820a75b730874d596a99dea48bf57acfbad601d14f7ae19569a80efa7fa178e7e9a1c0865286bd90dc27d languageName: node linkType: hard -"@smithy/is-array-buffer@npm:^1.0.2": - version: 1.0.2 - resolution: "@smithy/is-array-buffer@npm:1.0.2" +"@smithy/is-array-buffer@npm:^1.1.0": + version: 1.1.0 + resolution: "@smithy/is-array-buffer@npm:1.1.0" dependencies: tslib: ^2.5.0 - checksum: 811b100b809bc1730ed33231ae22afbce5ccc8d2d5db5c8e86b52db718d738283337a43f777397d1308c24243d0be3e3d862684e9be1dbdfb547a8d8399f0911 + checksum: 39b2a177b5d98f1adb2e44c363be2f4f335b698e9803f5ffb4c6d32e5d51543f29daf90b9ee99d8833446561dfe1b8dc3464852970b90bb6c00655a425fc3ac2 languageName: node linkType: hard "@smithy/middleware-content-length@npm:^1.0.1": - version: 1.0.2 - resolution: "@smithy/middleware-content-length@npm:1.0.2" + version: 1.1.0 + resolution: "@smithy/middleware-content-length@npm:1.1.0" dependencies: - "@smithy/protocol-http": ^1.1.1 - "@smithy/types": ^1.1.1 + "@smithy/protocol-http": ^1.2.0 + "@smithy/types": ^1.2.0 tslib: ^2.5.0 - checksum: 4b00aa741179152cbdc2aa1229077d0a39196f7ce916a11d121cfa160af380651e031f6a8e59193061bbca0baf5fff5f6010b1a998a6c0b03f228fa862625a8a + checksum: bd4661b236e4ffaa92f353c3d919515f76db23f1223cdd84e9c975125c3a1d4b84848e5c9233804cd07a2d731dac25f76b072c0a2dc018cfacda5a6c8b879021 languageName: node linkType: hard -"@smithy/middleware-endpoint@npm:^1.0.1": - version: 1.0.3 - resolution: "@smithy/middleware-endpoint@npm:1.0.3" +"@smithy/middleware-endpoint@npm:^1.0.2": + version: 1.1.0 + resolution: "@smithy/middleware-endpoint@npm:1.1.0" dependencies: - "@smithy/middleware-serde": ^1.0.2 - "@smithy/types": ^1.1.1 - "@smithy/url-parser": ^1.0.2 - "@smithy/util-middleware": ^1.0.2 + "@smithy/middleware-serde": ^1.1.0 + "@smithy/types": ^1.2.0 + "@smithy/url-parser": ^1.1.0 + "@smithy/util-middleware": ^1.1.0 tslib: ^2.5.0 - checksum: 8081b515955632828cdf6955368e46b5288f996fd6697dacf1d44eced488033f8f9d7a10e036fcebabc7f4e72dfcd69ab8ac76b4c17082b9b8326431441ef1a7 + checksum: fc69aa79834d0203307002ffdf6df5c99fb0d55c8d3f9e0bd524a1be06288d3ff40bc58e36396e883f0c4330e0dc9137b34fa09a75493434457e5a898a4b368e languageName: node linkType: hard -"@smithy/middleware-retry@npm:^1.0.1, @smithy/middleware-retry@npm:^1.0.2": - version: 1.0.4 - resolution: "@smithy/middleware-retry@npm:1.0.4" +"@smithy/middleware-retry@npm:^1.0.3": + version: 1.1.0 + resolution: "@smithy/middleware-retry@npm:1.1.0" dependencies: - "@smithy/protocol-http": ^1.1.1 - "@smithy/service-error-classification": ^1.0.3 - "@smithy/types": ^1.1.1 - "@smithy/util-middleware": ^1.0.2 - "@smithy/util-retry": ^1.0.4 + "@smithy/protocol-http": ^1.2.0 + "@smithy/service-error-classification": ^1.1.0 + "@smithy/types": ^1.2.0 + "@smithy/util-middleware": ^1.1.0 + "@smithy/util-retry": ^1.1.0 tslib: ^2.5.0 uuid: ^8.3.2 - checksum: 3ca5c4abe3cbfba1201a7777c0f41ae9df0985a1f155bab647cd88d86c8101f4de0bc118164a14d4ac8bd41d120d0c0f1b327b3512c341aeb06f60b0a32dc89d + checksum: 8a74421116d94ae7d0f9282865a244648cf8df7b6ef1ba30a7535791f1b40982b8a78abfd77e8634048229d0deb01487ab08ac83065afaa1be15046e1c9f1503 languageName: node linkType: hard -"@smithy/middleware-serde@npm:^1.0.1, @smithy/middleware-serde@npm:^1.0.2": - version: 1.0.2 - resolution: "@smithy/middleware-serde@npm:1.0.2" +"@smithy/middleware-serde@npm:^1.0.1, @smithy/middleware-serde@npm:^1.1.0": + version: 1.1.0 + resolution: "@smithy/middleware-serde@npm:1.1.0" dependencies: - "@smithy/types": ^1.1.1 + "@smithy/types": ^1.2.0 tslib: ^2.5.0 - checksum: 563045c0ad6fd37548197a3844716e61bf969f4a7b3fbb6c6f0129d4745a0c373029acf069d142a59f1d22778e90f86869cd4ef3f9b297b04a23ef042c6c9c55 + checksum: d4bb4b9eb8b936bd03b21f76bdc042cab346aa8993f8c398003c80491befbde2bf7b035c0aeb17bf56e611700c459414410dc8b90566ce4cc3073fbb63133463 languageName: node linkType: hard -"@smithy/middleware-stack@npm:^1.0.1, @smithy/middleware-stack@npm:^1.0.2": - version: 1.0.2 - resolution: "@smithy/middleware-stack@npm:1.0.2" +"@smithy/middleware-stack@npm:^1.0.1, @smithy/middleware-stack@npm:^1.1.0": + version: 1.1.0 + resolution: "@smithy/middleware-stack@npm:1.1.0" dependencies: tslib: ^2.5.0 - checksum: 34794d1e6d8b5fd9be70d5d0137f09d8ec88942d054575e35dbf6407f2040c3d0d667d26ff01132c4c42933785127d12b6406a1802af65a779e44cbf38fc9fe2 + checksum: 68530010e41cefc1eefc1bf6e7703c90c9bbf67303ff751d85c46c6f11eaa992c0b47d2a935c9df67bb504ce6aafdc0f5a5bf3df51be0b4526716ec21c371b26 languageName: node linkType: hard -"@smithy/node-config-provider@npm:^1.0.1, @smithy/node-config-provider@npm:^1.0.2": - version: 1.0.2 - resolution: "@smithy/node-config-provider@npm:1.0.2" +"@smithy/node-config-provider@npm:^1.0.1, @smithy/node-config-provider@npm:^1.1.0": + version: 1.1.0 + resolution: "@smithy/node-config-provider@npm:1.1.0" dependencies: - "@smithy/property-provider": ^1.0.2 - "@smithy/shared-ini-file-loader": ^1.0.2 - "@smithy/types": ^1.1.1 + "@smithy/property-provider": ^1.2.0 + "@smithy/shared-ini-file-loader": ^1.1.0 + "@smithy/types": ^1.2.0 tslib: ^2.5.0 - checksum: 593bd5adf0177851a191849e68760f7ebde943db2613898ecda468b31c47442e5fd380fdd95fe95f912bd15fe48a28dbde3f352b49a8108fc34c630d7eb50843 + checksum: ab0289a450697e50511f46dd0e1e69a19bb2fa47be611ad284e40c8617c9911d37b7cd257421903d40efd6b75517db770cb5ce2dcb7faa40cd919f402f6e39b5 languageName: node linkType: hard -"@smithy/node-http-handler@npm:^1.0.1, @smithy/node-http-handler@npm:^1.0.2, @smithy/node-http-handler@npm:^1.0.3": - version: 1.0.3 - resolution: "@smithy/node-http-handler@npm:1.0.3" +"@smithy/node-http-handler@npm:^1.0.2, @smithy/node-http-handler@npm:^1.1.0": + version: 1.1.0 + resolution: "@smithy/node-http-handler@npm:1.1.0" dependencies: - "@smithy/abort-controller": ^1.0.2 - "@smithy/protocol-http": ^1.1.1 - "@smithy/querystring-builder": ^1.0.2 - "@smithy/types": ^1.1.1 + "@smithy/abort-controller": ^1.1.0 + "@smithy/protocol-http": ^1.2.0 + "@smithy/querystring-builder": ^1.1.0 + "@smithy/types": ^1.2.0 tslib: ^2.5.0 - checksum: 727e1391ccc409b3ed7d7a697bfcd29e4e9fbc81404665719c47c8143832ef8f65ea9f8f5d783ea1930fd56a0d45eaaa6a7a8db76da785ba73f0fd29276fbe11 + checksum: dd0e00e96a552891ffa50c696b2c71d650515e589ccbaabc9053a8f2e4ed18c122040feea27196267ebf55bffaa3f25e5801cefebdfe96c886d0555c141c98b4 languageName: node linkType: hard -"@smithy/property-provider@npm:^1.0.1, @smithy/property-provider@npm:^1.0.2": - version: 1.0.2 - resolution: "@smithy/property-provider@npm:1.0.2" +"@smithy/property-provider@npm:^1.0.1, @smithy/property-provider@npm:^1.2.0": + version: 1.2.0 + resolution: "@smithy/property-provider@npm:1.2.0" dependencies: - "@smithy/types": ^1.1.1 + "@smithy/types": ^1.2.0 tslib: ^2.5.0 - checksum: 55d09de3dab2e5858b45f981c67ec1cf4e8fc28a758b9830fd0c5e04ca6e9d69f31e92c80fa4fba5d8eed4a60b4f95528d41f9a6c63e2ff0aad726d3c3b83636 + checksum: b8060676e7be23abe4d5996cfc1ba80a65c1dd226d78a4594e61c03f0507924eb70cd957200b182ae5170e5219f6786198244f68dd5df3433710140ec62b56ba languageName: node linkType: hard -"@smithy/protocol-http@npm:^1.0.1, @smithy/protocol-http@npm:^1.1.0, @smithy/protocol-http@npm:^1.1.1": - version: 1.1.1 - resolution: "@smithy/protocol-http@npm:1.1.1" +"@smithy/protocol-http@npm:^1.1.0, @smithy/protocol-http@npm:^1.2.0": + version: 1.2.0 + resolution: "@smithy/protocol-http@npm:1.2.0" dependencies: - "@smithy/types": ^1.1.1 + "@smithy/types": ^1.2.0 tslib: ^2.5.0 - checksum: 6320e8b010d05a123efef19401b3e2fc0d03efa99082ad0d5fd41a3209a05332acb4b5ee21dcfd4764b6576019884602bd09ede0f7508540baf7ddb1f7eb49f5 + checksum: 39548762da6dbd301d36ef67709ef73ef6f9a4c9bdcc3fafa5d5625eec7dfa71db72898d3eb219a368a79ea5e368a08189519a7512d48e0cdc9db7089c8e9618 languageName: node linkType: hard -"@smithy/querystring-builder@npm:^1.0.2": - version: 1.0.2 - resolution: "@smithy/querystring-builder@npm:1.0.2" +"@smithy/querystring-builder@npm:^1.1.0": + version: 1.1.0 + resolution: "@smithy/querystring-builder@npm:1.1.0" dependencies: - "@smithy/types": ^1.1.1 - "@smithy/util-uri-escape": ^1.0.2 + "@smithy/types": ^1.2.0 + "@smithy/util-uri-escape": ^1.1.0 tslib: ^2.5.0 - checksum: c0e6807a5b6c8438295ff8ebc11d9e2a28fe1434405688055a9dd4f4d354e49e14a4e459419af23f74aab0a281d58b70d29ae6777a42504a89d6f089b110ee52 + checksum: 53aa5244a12056f31da12ed65ffb22877b69abd86246d534ba50ac9c0a9dbe134256e40dbc79dc1bc59e153a7d90f97496c7c9ed0d422dffebd03ebb8b389d20 languageName: node linkType: hard -"@smithy/querystring-parser@npm:^1.0.2": - version: 1.0.2 - resolution: "@smithy/querystring-parser@npm:1.0.2" +"@smithy/querystring-parser@npm:^1.1.0": + version: 1.1.0 + resolution: "@smithy/querystring-parser@npm:1.1.0" dependencies: - "@smithy/types": ^1.1.1 + "@smithy/types": ^1.2.0 tslib: ^2.5.0 - checksum: 348672b1bc4193de23055421756c47619de5a2dea496dcf85a7744e9a8d5b26a4573dd731f9be936f7b1ba564676ecdf6d166638f9961bff497a2c554c97f01c + checksum: 7c596994e49aca1a97e6847ea31740c53df0b39c974799b36313d228c6ee7b48897237cd5b6a3db2fb6b183782eb859ec49cb76c0174abf98384b02a81bc6364 languageName: node linkType: hard -"@smithy/service-error-classification@npm:^1.0.3": - version: 1.0.3 - resolution: "@smithy/service-error-classification@npm:1.0.3" - checksum: adf840de7865606946a68f55ae4f35e03d96422be4df886309300944243510baf1bd84ef0786bcd8184094e97fafdff66a52b8ba669267391a8d8856093edde0 +"@smithy/service-error-classification@npm:^1.1.0": + version: 1.1.0 + resolution: "@smithy/service-error-classification@npm:1.1.0" + checksum: 5b8e6f47580630d020f3272ac4905038fed91476991352ebe97e145098f48ab3ac9001512b2bc3b8fb98b7753daf30467f357e9069975f09b137abf0aef54677 languageName: node linkType: hard -"@smithy/shared-ini-file-loader@npm:^1.0.1, @smithy/shared-ini-file-loader@npm:^1.0.2": - version: 1.0.2 - resolution: "@smithy/shared-ini-file-loader@npm:1.0.2" +"@smithy/shared-ini-file-loader@npm:^1.0.1, @smithy/shared-ini-file-loader@npm:^1.1.0": + version: 1.1.0 + resolution: "@smithy/shared-ini-file-loader@npm:1.1.0" dependencies: - "@smithy/types": ^1.1.1 + "@smithy/types": ^1.2.0 tslib: ^2.5.0 - checksum: c9ba908a48c12a06bcbb872e2e0581805507efc9beffcdbad39baa09b22da63bbcbf538a95d099666869e080ad5556bfe2fab6d4e977a71163595f3f9c1d7edc + checksum: 42875d581789f455dd48c16ef9ca1faf0f9b81f02530542448ad316fb5bd7418c8cce24260e9183cc4cb2408c808679ed233c35746d91705ffa40fdaa5253435 languageName: node linkType: hard "@smithy/signature-v4@npm:^1.0.1": - version: 1.0.2 - resolution: "@smithy/signature-v4@npm:1.0.2" - dependencies: - "@smithy/eventstream-codec": ^1.0.2 - "@smithy/is-array-buffer": ^1.0.2 - "@smithy/types": ^1.1.1 - "@smithy/util-hex-encoding": ^1.0.2 - "@smithy/util-middleware": ^1.0.2 - "@smithy/util-uri-escape": ^1.0.2 - "@smithy/util-utf8": ^1.0.2 + version: 1.1.0 + resolution: "@smithy/signature-v4@npm:1.1.0" + dependencies: + "@smithy/eventstream-codec": ^1.1.0 + "@smithy/is-array-buffer": ^1.1.0 + "@smithy/types": ^1.2.0 + "@smithy/util-hex-encoding": ^1.1.0 + "@smithy/util-middleware": ^1.1.0 + "@smithy/util-uri-escape": ^1.1.0 + "@smithy/util-utf8": ^1.1.0 tslib: ^2.5.0 - checksum: 3e3072ef956adbb9fe633f2e7c28fc9aaeddb7551c25a1af94214fd5e93617c2b0ede440c1cb61ee6268c502ce0418cf124fb21cb654605292a956ec3061d54a + checksum: c9bcbf1eedb9d266643a091ba39410ce625e790d63e26785d11fec0b3e1e98b8e86fda1e4baaa1c79a52c17f4dfac15d6648a5c47243cffb04c9b0d465e8751a languageName: node linkType: hard -"@smithy/smithy-client@npm:^1.0.2, @smithy/smithy-client@npm:^1.0.3": - version: 1.0.4 - resolution: "@smithy/smithy-client@npm:1.0.4" +"@smithy/smithy-client@npm:^1.0.3": + version: 1.1.0 + resolution: "@smithy/smithy-client@npm:1.1.0" dependencies: - "@smithy/middleware-stack": ^1.0.2 - "@smithy/types": ^1.1.1 - "@smithy/util-stream": ^1.0.2 + "@smithy/middleware-stack": ^1.1.0 + "@smithy/types": ^1.2.0 + "@smithy/util-stream": ^1.1.0 tslib: ^2.5.0 - checksum: 468aa2f28b6addb82861a543a2c1639dcfd40e49d3344237bd56c2d061af5e2bc88972297a2b86de7bf31d7ee49589a4e5a577518ef747e2c7458ae20f7c3322 + checksum: 76ecf76a9a03ce87272b4b2cbfdedcd14195d02a707e1697f87dd797f8c0bb18e6346f8928445e3a1989e7c6da56c6f47a9de0eee78c1c8af7352dcf8a9baa6f languageName: node linkType: hard -"@smithy/types@npm:^1.0.0, @smithy/types@npm:^1.1.0, @smithy/types@npm:^1.1.1": - version: 1.1.1 - resolution: "@smithy/types@npm:1.1.1" +"@smithy/types@npm:^1.1.0, @smithy/types@npm:^1.2.0": + version: 1.2.0 + resolution: "@smithy/types@npm:1.2.0" dependencies: tslib: ^2.5.0 - checksum: bf4b632eb7d668d8b99e99facf514d506868121e24c0adfaaa52f7da4056644fda5cb4324355f1dba16fc43a4c9af9ef7853db2a4895c3fca11ac98cf6d12234 + checksum: 376a1402d356a8dddd804af66ff2d273e57e332a3e9537a98039b47572684aae044d5fcd879ac6eee5cc08640ea00fbef0725a6a16026db5fb8d189473d44fe6 languageName: node linkType: hard -"@smithy/url-parser@npm:^1.0.1, @smithy/url-parser@npm:^1.0.2": - version: 1.0.2 - resolution: "@smithy/url-parser@npm:1.0.2" +"@smithy/url-parser@npm:^1.0.1, @smithy/url-parser@npm:^1.1.0": + version: 1.1.0 + resolution: "@smithy/url-parser@npm:1.1.0" dependencies: - "@smithy/querystring-parser": ^1.0.2 - "@smithy/types": ^1.1.1 + "@smithy/querystring-parser": ^1.1.0 + "@smithy/types": ^1.2.0 tslib: ^2.5.0 - checksum: 1844b23a30afb689bc9ec21238d9e6cc428e152201f8f30f252f6211ee8b74760d6568e42125b75bc4d110b15476eac22c204c7e36f6970d04e8afa5bc83ec1d + checksum: d003785a5f0890402d04c1ac1914b856e22c85616e66a1e73c0632cd338fff0015c96fedcd04804f4b706426075d36d4b5ac7ea6b1cd037066b43a711f33a74b languageName: node linkType: hard -"@smithy/util-base64@npm:^1.0.1, @smithy/util-base64@npm:^1.0.2": - version: 1.0.2 - resolution: "@smithy/util-base64@npm:1.0.2" +"@smithy/util-base64@npm:^1.0.1, @smithy/util-base64@npm:^1.1.0": + version: 1.1.0 + resolution: "@smithy/util-base64@npm:1.1.0" dependencies: - "@smithy/util-buffer-from": ^1.0.2 + "@smithy/util-buffer-from": ^1.1.0 tslib: ^2.5.0 - checksum: 618d2952fbbc2cabcc6234c9aad612417a2a6f2fcac556a81b75f59d651e5daea7b2c1b44894b30611a425f32045a2dbe0623ebf57654e2068486d0d5a4b6ac7 + checksum: a767b64e9b4b5c1ef4c2e9a2666752c4420e593c2bcfbcb13f2152b9e29e5228d3e2a265b7cb3101c9f26e1e32ee779791e296e58418b4bfd1088d8cee48b06a languageName: node linkType: hard "@smithy/util-body-length-browser@npm:^1.0.1": - version: 1.0.2 - resolution: "@smithy/util-body-length-browser@npm:1.0.2" + version: 1.1.0 + resolution: "@smithy/util-body-length-browser@npm:1.1.0" dependencies: tslib: ^2.5.0 - checksum: 3b0eacc3761625aaf5c384da8487a38663325385826ca9ac0fee17b7dff879a2cb3564a03d146e0b66ba6c503e1a07f159a9cccd4d7711b7063516acbfadb496 + checksum: c66a3a8aef34aa47382aa0655f026532e80b9617b0e191b7aa76513b55558ebc9a6738cf97f0cd894b779db85b47992531fd00d88ca99f08d7f89dfd8bda4c99 languageName: node linkType: hard "@smithy/util-body-length-node@npm:^1.0.1": - version: 1.0.2 - resolution: "@smithy/util-body-length-node@npm:1.0.2" + version: 1.1.0 + resolution: "@smithy/util-body-length-node@npm:1.1.0" dependencies: tslib: ^2.5.0 - checksum: 472371dc0a44a72333111758b8e60428cdca088cfe8a87c98413c81c4083e8988ae9d27f20fa2b0a8aed7fc26c0fec8e13c271494772c619f65f1a9f4e665eb3 + checksum: 31dedb158342dacb94c0b5b8e1b11f725a012d268ad406705173b94b1ac427c847d2d382b1d901fe46b2b88da6cc2a6e8356c528d6a96b24c87e063eb59e9e38 languageName: node linkType: hard -"@smithy/util-buffer-from@npm:^1.0.2": - version: 1.0.2 - resolution: "@smithy/util-buffer-from@npm:1.0.2" +"@smithy/util-buffer-from@npm:^1.1.0": + version: 1.1.0 + resolution: "@smithy/util-buffer-from@npm:1.1.0" dependencies: - "@smithy/is-array-buffer": ^1.0.2 + "@smithy/is-array-buffer": ^1.1.0 tslib: ^2.5.0 - checksum: ca4308ebc54f372777fc53b2782c752ebfdfe3934b1c4da935c78bb2f4f921d2071056edc644704ba894d363f85cc52fc07095d93eb6cbba510ba19a767be265 + checksum: 73b145d6a11754cb95d9fc21264dd7623855cb768b42db4465232b878c148d8b6c968c8d77bd836f28d0ce4c855f30814848e8533764ee587c6c7c0176e7582b languageName: node linkType: hard -"@smithy/util-config-provider@npm:^1.0.2": - version: 1.0.2 - resolution: "@smithy/util-config-provider@npm:1.0.2" +"@smithy/util-config-provider@npm:^1.1.0": + version: 1.1.0 + resolution: "@smithy/util-config-provider@npm:1.1.0" dependencies: tslib: ^2.5.0 - checksum: 625c100b8af62cb08c167ebd23f77250e62b012e085ec8db8f06e3539fc516c340e14b480a09012192595121a58276dfc4370529237a58393185f3782ed0244a + checksum: 0bb27350f012e6b263e854f3e4bd7ac9604cd7bc1ba903874640748ae3f54ad16ca388d4177dcba2aefa57874194d28afadffcc43a72c4704bcb97ec91b24724 languageName: node linkType: hard "@smithy/util-defaults-mode-browser@npm:^1.0.1": - version: 1.0.2 - resolution: "@smithy/util-defaults-mode-browser@npm:1.0.2" + version: 1.1.0 + resolution: "@smithy/util-defaults-mode-browser@npm:1.1.0" dependencies: - "@smithy/property-provider": ^1.0.2 - "@smithy/types": ^1.1.1 + "@smithy/property-provider": ^1.2.0 + "@smithy/types": ^1.2.0 bowser: ^2.11.0 tslib: ^2.5.0 - checksum: ca03c9f596f9a26d392c289de7af7c7e7bdb12648b0339074bcbaddd762e58cb0cf127b8ed24e269bff004465702986b90d5151c502b418a615449171432024b + checksum: 390eaf5cfe1d9831d74ef406e09bcf0b8f31b64308d2df36ff108da4e9283ddb250160ced56b19b08bd05694767ba34f48b91eea188248ec5cb9965583c02405 languageName: node linkType: hard "@smithy/util-defaults-mode-node@npm:^1.0.1": - version: 1.0.2 - resolution: "@smithy/util-defaults-mode-node@npm:1.0.2" + version: 1.1.0 + resolution: "@smithy/util-defaults-mode-node@npm:1.1.0" dependencies: - "@smithy/config-resolver": ^1.0.2 - "@smithy/credential-provider-imds": ^1.0.2 - "@smithy/node-config-provider": ^1.0.2 - "@smithy/property-provider": ^1.0.2 - "@smithy/types": ^1.1.1 + "@smithy/config-resolver": ^1.1.0 + "@smithy/credential-provider-imds": ^1.1.0 + "@smithy/node-config-provider": ^1.1.0 + "@smithy/property-provider": ^1.2.0 + "@smithy/types": ^1.2.0 tslib: ^2.5.0 - checksum: 805977758a5cabe3b8a4ee69f29cf6861356096239a60269eac6b83a4d11eddba030b0a5bcdb64add3d1301f611b21ed7d773e354cac8ff08b9d85ba47960252 + checksum: a6a05135aa6a302b7143a78c47b89a37ea137d20bd44657c42fafe7dd5526229c1cdfcd61a3d4b6671b0ee7efcef8bdcb586f6630a52cae136d6ef147e124a11 languageName: node linkType: hard -"@smithy/util-hex-encoding@npm:^1.0.2": - version: 1.0.2 - resolution: "@smithy/util-hex-encoding@npm:1.0.2" +"@smithy/util-hex-encoding@npm:^1.1.0": + version: 1.1.0 + resolution: "@smithy/util-hex-encoding@npm:1.1.0" dependencies: tslib: ^2.5.0 - checksum: c70bfccb41ac702b514a2bc3d6f897a616efa5aba880a6c7a7501ea874bea3c2213868cb2c494c19f6a5190f3f9e4f7d73d9ab87addbd243435e287dc892dc30 + checksum: e2647adbcd01660930d585ab34caca36c6d260127d63375a424de9bd36270b22fadfe7ac111155b9318cadbd43ce51034607f3f1c421deb56beb88839e629bf5 languageName: node linkType: hard -"@smithy/util-middleware@npm:^1.0.1, @smithy/util-middleware@npm:^1.0.2": - version: 1.0.2 - resolution: "@smithy/util-middleware@npm:1.0.2" +"@smithy/util-middleware@npm:^1.0.1, @smithy/util-middleware@npm:^1.1.0": + version: 1.1.0 + resolution: "@smithy/util-middleware@npm:1.1.0" dependencies: tslib: ^2.5.0 - checksum: 899aca62efab92ac1b55e801b2bb1a3e5eb1b74f52387abe40f902ec2e5f3afd36e2942f392ff1a562e69dd0de901b9aa20c55e4af2ff0e37e20c14b20940852 + checksum: 4c30f83355a2c455ec2d6ee8a1907c673a16955a33e8f220a2bb774f55310db1b1f9eea8c2760238916e04191ccb85583e91930e5710ba79e0be4dd4986940e8 languageName: node linkType: hard -"@smithy/util-retry@npm:^1.0.1, @smithy/util-retry@npm:^1.0.2, @smithy/util-retry@npm:^1.0.4": - version: 1.0.4 - resolution: "@smithy/util-retry@npm:1.0.4" +"@smithy/util-retry@npm:^1.0.3, @smithy/util-retry@npm:^1.1.0": + version: 1.1.0 + resolution: "@smithy/util-retry@npm:1.1.0" dependencies: - "@smithy/service-error-classification": ^1.0.3 + "@smithy/service-error-classification": ^1.1.0 tslib: ^2.5.0 - checksum: b9a7e464d67b141a175f126b2a0fc5c91de387eb483b432db4769cee43bbbb546e4142711f293c3a04c82b6d56b676b7a2f7f7150e2c736a10d8e5df1ed63c04 + checksum: 69cf879e95b22fa4a1baf78cb1f42d63236d1554aa7ad39eee7ea8b5fd69ee69e91fc78891a17a4d83743bca9c1e0fcc2721e3f0c976dca4fb5bf3e0026845d0 languageName: node linkType: hard -"@smithy/util-stream@npm:^1.0.2": - version: 1.0.2 - resolution: "@smithy/util-stream@npm:1.0.2" - dependencies: - "@smithy/fetch-http-handler": ^1.0.2 - "@smithy/node-http-handler": ^1.0.3 - "@smithy/types": ^1.1.1 - "@smithy/util-base64": ^1.0.2 - "@smithy/util-buffer-from": ^1.0.2 - "@smithy/util-hex-encoding": ^1.0.2 - "@smithy/util-utf8": ^1.0.2 +"@smithy/util-stream@npm:^1.1.0": + version: 1.1.0 + resolution: "@smithy/util-stream@npm:1.1.0" + dependencies: + "@smithy/fetch-http-handler": ^1.1.0 + "@smithy/node-http-handler": ^1.1.0 + "@smithy/types": ^1.2.0 + "@smithy/util-base64": ^1.1.0 + "@smithy/util-buffer-from": ^1.1.0 + "@smithy/util-hex-encoding": ^1.1.0 + "@smithy/util-utf8": ^1.1.0 tslib: ^2.5.0 - checksum: ebea6886766da812434d4ca39ee201302096451441d577eb5efeb44ce3437f3828df435676a5e453f8eb535e19224bc3d21c2d3e6632a5eef68d932a37343476 + checksum: f72ce65f07f6f9283512b321db259ad130c6846d8819de6dd2dbf319e0a35cb30394536c83a024902833140617d4649ae2e82265fca3607e6083595c6c934aa2 languageName: node linkType: hard -"@smithy/util-uri-escape@npm:^1.0.2": - version: 1.0.2 - resolution: "@smithy/util-uri-escape@npm:1.0.2" +"@smithy/util-uri-escape@npm:^1.1.0": + version: 1.1.0 + resolution: "@smithy/util-uri-escape@npm:1.1.0" dependencies: tslib: ^2.5.0 - checksum: 6df9fb3aed8fc386c1b7ccb2b52268c2e67f3620a85fa42d35f964ae2c492b6395841a751a0ab4068825c7fd54a84933014571d6fbc12e9e1a711d0be3f2c747 + checksum: 17f02106e1d9875d4ab3b56e1fd7fffceec94a4632f265d3f6cc1d812d0ee208d9db3c3e0fd14025ea5993b503e84c0e3fda291ec4fb87719473e5e5116fb899 languageName: node linkType: hard -"@smithy/util-utf8@npm:^1.0.1, @smithy/util-utf8@npm:^1.0.2": - version: 1.0.2 - resolution: "@smithy/util-utf8@npm:1.0.2" +"@smithy/util-utf8@npm:^1.0.1, @smithy/util-utf8@npm:^1.1.0": + version: 1.1.0 + resolution: "@smithy/util-utf8@npm:1.1.0" dependencies: - "@smithy/util-buffer-from": ^1.0.2 + "@smithy/util-buffer-from": ^1.1.0 tslib: ^2.5.0 - checksum: 64add10ac1bbeb0c96a1ba8b05886ae86cee589fd4cccb25276849748fed7035c54e64d40107f22a57ca9b4f9324afe4baf0007c67536d520c1b8378e1e6ec55 + checksum: 24216c8ce41cbb9455a4b33564c9a1b5c49dab77d7a0aa6f1daa71ada90ca82198ed48f9dda0d4a2c583e36e5259a4fb3b7584b3cf2983a1bfec440a7b303527 languageName: node linkType: hard @@ -6490,13 +6478,6 @@ __metadata: languageName: node linkType: hard -"@tootallnate/once@npm:1": - version: 1.1.2 - resolution: "@tootallnate/once@npm:1.1.2" - checksum: e1fb1bbbc12089a0cb9433dc290f97bddd062deadb6178ce9bcb93bb7c1aecde5e60184bc7065aec42fe1663622a213493c48bbd4972d931aae48315f18e1be9 - languageName: node - linkType: hard - "@tootallnate/once@npm:2": version: 2.0.0 resolution: "@tootallnate/once@npm:2.0.0" @@ -6625,12 +6606,12 @@ __metadata: linkType: hard "@types/eslint@npm:*": - version: 8.40.2 - resolution: "@types/eslint@npm:8.40.2" + version: 8.44.0 + resolution: "@types/eslint@npm:8.44.0" dependencies: "@types/estree": "*" "@types/json-schema": "*" - checksum: a4780e45e677e3af21c44a900846996cb6d9ae8f71d51940942a047163ae93a05444392c005f491ed46aa169f3b25f8be125ab42c5d8bdb571154bf62a7c828a + checksum: 2655f409a4ecdd64bb9dd9eb6715e7a2ac30c0e7f902b414e10dbe9d6d497baa5a0f13105e1f7bd5ad7a913338e2ab4bed1faf192a7a0d27d1acd45ba79d3f69 languageName: node linkType: hard @@ -6709,11 +6690,11 @@ __metadata: linkType: hard "@types/hast@npm:^2.0.0": - version: 2.3.4 - resolution: "@types/hast@npm:2.3.4" + version: 2.3.5 + resolution: "@types/hast@npm:2.3.5" dependencies: - "@types/unist": "*" - checksum: fff47998f4c11e21a7454b58673f70478740ecdafd95aaf50b70a3daa7da9cdc57315545bf9c039613732c40b7b0e9e49d11d03fe9a4304721cdc3b29a88141e + "@types/unist": ^2 + checksum: e435e9fbf6afc616ade377d2246a632fb75f4064be4bfd619b67a1ba0d9935d75968a18fbdb66535dfb5e77ef81f4b9b56fd8f35c1cffa34b48ddb0287fec91e languageName: node linkType: hard @@ -6839,11 +6820,11 @@ __metadata: linkType: hard "@types/mdast@npm:^3.0.0": - version: 3.0.11 - resolution: "@types/mdast@npm:3.0.11" + version: 3.0.12 + resolution: "@types/mdast@npm:3.0.12" dependencies: - "@types/unist": "*" - checksum: 3b04cf465535553b47a1811c247668bd6cfeb54d99a2c9dbb82ccd0f5145d271d10c3169f929701d8cd55fd569f0d2e459a50845813ba3261f1fb0395a288cea + "@types/unist": ^2 + checksum: 83adb8679b9d139f69f63554d120af921e9f1289e9903a2c99e0554a327c8524a6c0beccdc0721e4fdbccc606e81964fecb0d390d53df0f74360938e22f1a469 languageName: node linkType: hard @@ -6902,23 +6883,23 @@ __metadata: linkType: hard "@types/node@npm:*, @types/node@npm:>=12.12.47, @types/node@npm:>=13.7.0": - version: 20.4.0 - resolution: "@types/node@npm:20.4.0" - checksum: 8ad632ee131611651fc5f4ac3a47427640e2492ab314fe1c4d0c3b97af71784ef48c53221d5f9922aab4724375dcb4f33137b3107ba2c356d9366216a31678aa + version: 20.4.4 + resolution: "@types/node@npm:20.4.4" + checksum: 43f3c4a8acc38ae753e15a0e79bae0447d255b3742fa87f8e065d7b9d20ecb0e03d6c5b46c00d5d26f4552160381a00255f49205595a8ee48c2423e00263c930 languageName: node linkType: hard "@types/node@npm:^14.0.10 || ^16.0.0, @types/node@npm:^14.14.20 || ^16.0.0": - version: 16.18.38 - resolution: "@types/node@npm:16.18.38" - checksum: a3baa141e49ce94486f083eea1240cf38479a73ba663e1bf3f52f85b466125821b6e3ea85ded38fde3901530aca4601291395a50eefcea533a4f3b45171bda28 + version: 16.18.39 + resolution: "@types/node@npm:16.18.39" + checksum: eac9b202b76013256cb517ca8d3e3f61df206edb1615ca8d8df4c80616e92879fe4d3f8570a11d60f4216a82724a3265d5888b24c6994c80b057a0423c9ff1d2 languageName: node linkType: hard "@types/node@npm:^18.6.1": - version: 18.16.19 - resolution: "@types/node@npm:18.16.19" - checksum: 63c31f09616508aa7135380a4c79470a897b75f9ff3a70eb069e534dfabdec3f32fb0f9df5939127f1086614d980ddea0fa5e8cc29a49103c4f74cd687618aaf + version: 18.17.0 + resolution: "@types/node@npm:18.17.0" + checksum: 3a43c5c5541342751b514485144818a515fac5427f663066068eaacbe8a108cbe1207aae75ec89d34c3b32414c334aad84e9083cf7fcf3ebfd970adc871314a4 languageName: node linkType: hard @@ -6995,11 +6976,11 @@ __metadata: linkType: hard "@types/react-dom@npm:*, @types/react-dom@npm:^18.0.6": - version: 18.2.6 - resolution: "@types/react-dom@npm:18.2.6" + version: 18.2.7 + resolution: "@types/react-dom@npm:18.2.7" dependencies: "@types/react": "*" - checksum: b56e42efab121a3a8013d2eb8c1688e6028a25ea6d33c4362d2846f0af3760b164b4d7c34846614024cfb8956cca70dd1743487f152e32ff89a00fe6fbd2be54 + checksum: e02ea908289a7ad26053308248d2b87f6aeafd73d0e2de2a3d435947bcea0422599016ffd1c3e38ff36c42f5e1c87c7417f05b0a157e48649e4a02f21727d54f languageName: node linkType: hard @@ -7022,13 +7003,13 @@ __metadata: linkType: hard "@types/react@npm:*, @types/react@npm:^18.0.15": - version: 18.2.14 - resolution: "@types/react@npm:18.2.14" + version: 18.2.16 + resolution: "@types/react@npm:18.2.16" dependencies: "@types/prop-types": "*" "@types/scheduler": "*" csstype: ^3.0.2 - checksum: a6a5e8cc78f486b9020d1ad009aa6c56943c68c7c6376e0f8399e9cbcd950b7b8f5d73f00200f5379f5e58d31d57d8aed24357f301d8e86108cd438ce6c8b3dd + checksum: 3d4fdc12509e0098e0dbb4bacdea53e8ccc6632e9df63d9f2711c77aa81ce3b2bb9c76d087f284034b25fd7245680167f4832bf6e4df960c5af2634b52adfd0c languageName: node linkType: hard @@ -7165,17 +7146,10 @@ __metadata: languageName: node linkType: hard -"@types/unist@npm:*": - version: 3.0.0 - resolution: "@types/unist@npm:3.0.0" - checksum: e9d21a8fb5e332be0acef29192d82632875b2ef3e700f1bc64fdfc1520189542de85c3d4f3bcfbc2f4afdb210f4c23f68061f3fbf10744e920d4f18430d19f49 - languageName: node - linkType: hard - -"@types/unist@npm:^2.0.0, @types/unist@npm:^2.0.2, @types/unist@npm:^2.0.3": - version: 2.0.6 - resolution: "@types/unist@npm:2.0.6" - checksum: 25cb860ff10dde48b54622d58b23e66214211a61c84c0f15f88d38b61aa1b53d4d46e42b557924a93178c501c166aa37e28d7f6d994aba13d24685326272d5db +"@types/unist@npm:^2, @types/unist@npm:^2.0.0, @types/unist@npm:^2.0.2, @types/unist@npm:^2.0.3": + version: 2.0.7 + resolution: "@types/unist@npm:2.0.7" + checksum: b97a219554e83431f19a93ff113306bf0512909292815e8f32964e47d041c505af1aaa2a381c23e137c4c0b962fad58d4ce9c5c3256642921a466be43c1fc715 languageName: node linkType: hard @@ -7254,29 +7228,29 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.61.0": - version: 5.61.0 - resolution: "@typescript-eslint/scope-manager@npm:5.61.0" +"@typescript-eslint/scope-manager@npm:5.62.0": + version: 5.62.0 + resolution: "@typescript-eslint/scope-manager@npm:5.62.0" dependencies: - "@typescript-eslint/types": 5.61.0 - "@typescript-eslint/visitor-keys": 5.61.0 - checksum: 6dfbb42c4b7d796ae3c395398bdfd2e5a4ae8aaf1448381278ecc39a1d1045af2cb452da5a00519d265bc1a5997523de22d5021acb4dbe1648502fe61512d3c6 + "@typescript-eslint/types": 5.62.0 + "@typescript-eslint/visitor-keys": 5.62.0 + checksum: 6062d6b797fe1ce4d275bb0d17204c827494af59b5eaf09d8a78cdd39dadddb31074dded4297aaf5d0f839016d601032857698b0e4516c86a41207de606e9573 languageName: node linkType: hard -"@typescript-eslint/types@npm:5.61.0": - version: 5.61.0 - resolution: "@typescript-eslint/types@npm:5.61.0" - checksum: d311ca2141f6bcb5f0f8f97ddbc218c9911e0735aaa30f0f2e64d518fb33568410754e1b04bf157175f8783504f8ec62a7ab53a66a18507f43edb1e21fe69e90 +"@typescript-eslint/types@npm:5.62.0": + version: 5.62.0 + resolution: "@typescript-eslint/types@npm:5.62.0" + checksum: 48c87117383d1864766486f24de34086155532b070f6264e09d0e6139449270f8a9559cfef3c56d16e3bcfb52d83d42105d61b36743626399c7c2b5e0ac3b670 languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.61.0": - version: 5.61.0 - resolution: "@typescript-eslint/typescript-estree@npm:5.61.0" +"@typescript-eslint/typescript-estree@npm:5.62.0": + version: 5.62.0 + resolution: "@typescript-eslint/typescript-estree@npm:5.62.0" dependencies: - "@typescript-eslint/types": 5.61.0 - "@typescript-eslint/visitor-keys": 5.61.0 + "@typescript-eslint/types": 5.62.0 + "@typescript-eslint/visitor-keys": 5.62.0 debug: ^4.3.4 globby: ^11.1.0 is-glob: ^4.0.3 @@ -7285,35 +7259,35 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: efe25a1b2774939c02cb9b388cf72efa672811f1c39a87ddd617937f63c2320551ce459ba69c6d022e33322594d40b9f2d2c6bc9937387718adc40dc5e57ea8e + checksum: 3624520abb5807ed8f57b1197e61c7b1ed770c56dfcaca66372d584ff50175225798bccb701f7ef129d62c5989070e1ee3a0aa2d84e56d9524dcf011a2bb1a52 languageName: node linkType: hard "@typescript-eslint/utils@npm:^5.10.0, @typescript-eslint/utils@npm:^5.45.0": - version: 5.61.0 - resolution: "@typescript-eslint/utils@npm:5.61.0" + version: 5.62.0 + resolution: "@typescript-eslint/utils@npm:5.62.0" dependencies: "@eslint-community/eslint-utils": ^4.2.0 "@types/json-schema": ^7.0.9 "@types/semver": ^7.3.12 - "@typescript-eslint/scope-manager": 5.61.0 - "@typescript-eslint/types": 5.61.0 - "@typescript-eslint/typescript-estree": 5.61.0 + "@typescript-eslint/scope-manager": 5.62.0 + "@typescript-eslint/types": 5.62.0 + "@typescript-eslint/typescript-estree": 5.62.0 eslint-scope: ^5.1.1 semver: ^7.3.7 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: 24efc1964e6c92db96fe0d9a390550e4f27e8f353e51a9b46bda03e6692ea5d40f398d539235a4ff0894e9e45dfcfb51df953ade2ae9d17a1421449625ce6f5a + checksum: ee9398c8c5db6d1da09463ca7bf36ed134361e20131ea354b2da16a5fdb6df9ba70c62a388d19f6eebb421af1786dbbd79ba95ddd6ab287324fc171c3e28d931 languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.61.0": - version: 5.61.0 - resolution: "@typescript-eslint/visitor-keys@npm:5.61.0" +"@typescript-eslint/visitor-keys@npm:5.62.0": + version: 5.62.0 + resolution: "@typescript-eslint/visitor-keys@npm:5.62.0" dependencies: - "@typescript-eslint/types": 5.61.0 + "@typescript-eslint/types": 5.62.0 eslint-visitor-keys: ^3.3.0 - checksum: a8d589f61ddfc380787218da4d347e8f9aef0f82f4a93f1daee46786bda889a90961c7ec1b470db5e3261438a728fdfd956f5bda6ee2de22c4be2d2152d6e270 + checksum: 976b05d103fe8335bef5c93ad3f76d781e3ce50329c0243ee0f00c0fcfb186c81df50e64bfdd34970148113f8ade90887f53e3c4938183afba830b4ba8e30a35 languageName: node linkType: hard @@ -7984,13 +7958,6 @@ __metadata: languageName: node linkType: hard -"acorn-walk@npm:^8.2.0": - version: 8.2.0 - resolution: "acorn-walk@npm:8.2.0" - checksum: 1715e76c01dd7b2d4ca472f9c58968516a4899378a63ad5b6c2d668bba8da21a71976c14ec5f5b75f887b6317c4ae0b897ab141c831d741dc76024d8745f1ad1 - languageName: node - linkType: hard - "acorn@npm:^5.5.3": version: 5.7.4 resolution: "acorn@npm:5.7.4" @@ -8018,7 +7985,7 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^8.4.1, acorn@npm:^8.5.0, acorn@npm:^8.7.0, acorn@npm:^8.7.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0": +"acorn@npm:^8.4.1, acorn@npm:^8.5.0, acorn@npm:^8.7.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0": version: 8.10.0 resolution: "acorn@npm:8.10.0" bin: @@ -8041,7 +8008,7 @@ __metadata: languageName: node linkType: hard -"agent-base@npm:6, agent-base@npm:^6.0.0, agent-base@npm:^6.0.2": +"agent-base@npm:6, agent-base@npm:^6.0.2": version: 6.0.2 resolution: "agent-base@npm:6.0.2" dependencies: @@ -8619,6 +8586,20 @@ __metadata: languageName: node linkType: hard +"arraybuffer.prototype.slice@npm:^1.0.1": + version: 1.0.1 + resolution: "arraybuffer.prototype.slice@npm:1.0.1" + dependencies: + array-buffer-byte-length: ^1.0.0 + call-bind: ^1.0.2 + define-properties: ^1.2.0 + get-intrinsic: ^1.2.1 + is-array-buffer: ^3.0.2 + is-shared-array-buffer: ^1.0.2 + checksum: e3e9b2a3e988ebfeddce4c7e8f69df730c9e48cb04b0d40ff0874ce3d86b3d1339dd520ffde5e39c02610bc172ecfbd4bc93324b1cabd9554c44a56b131ce0ce + languageName: node + linkType: hard + "arrify@npm:^2.0.1": version: 2.0.1 resolution: "arrify@npm:2.0.1" @@ -8671,15 +8652,6 @@ __metadata: languageName: node linkType: hard -"ast-types@npm:^0.13.2": - version: 0.13.4 - resolution: "ast-types@npm:0.13.4" - dependencies: - tslib: ^2.0.1 - checksum: 5a51f7b70588ecced3601845a0e203279ca2f5fdc184416a0a1640c93ec0a267241d6090a328e78eebb8de81f8754754e0a4f1558ba2a3d638f8ccbd0b1f0eff - languageName: node - linkType: hard - "ast-types@npm:^0.14.2": version: 0.14.2 resolution: "ast-types@npm:0.14.2" @@ -8803,8 +8775,8 @@ __metadata: linkType: hard "aws-crt@npm:^1.14.7": - version: 1.15.20 - resolution: "aws-crt@npm:1.15.20" + version: 1.15.22 + resolution: "aws-crt@npm:1.15.22" dependencies: "@aws-sdk/util-utf8-browser": ^3.109.0 "@httptoolkit/websocket-stream": ^6.0.0 @@ -8815,7 +8787,7 @@ __metadata: mqtt: ^4.3.7 process: ^0.11.10 tar: ^6.1.11 - checksum: bdb2314c9edce5370b8e93834719ae61b0e4e63e1405717ebb21cdf5804b981907f23831cc90061400921884e40a09885f7a19e3e5cc364be5fa1e1f935a7490 + checksum: cacf80dfbeac40cc276de86f524bb321a2f1c8a88d49ce0dd164b26d2176fdd2cae8885c7a5acb0f7a85f1ee58a5c264b48b79ba515d4b70b09511efb112dea8 languageName: node linkType: hard @@ -9033,15 +9005,15 @@ __metadata: linkType: hard "babel-plugin-polyfill-corejs2@npm:^0.4.4": - version: 0.4.4 - resolution: "babel-plugin-polyfill-corejs2@npm:0.4.4" + version: 0.4.5 + resolution: "babel-plugin-polyfill-corejs2@npm:0.4.5" dependencies: "@babel/compat-data": ^7.22.6 - "@babel/helper-define-polyfill-provider": ^0.4.1 - "@nicolo-ribaudo/semver-v6": ^6.3.3 + "@babel/helper-define-polyfill-provider": ^0.4.2 + semver: ^6.3.1 peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 0273f3d74ccbf78086a3b14bb11b1fb94933830f51c576a24229d75b3b91c8b357c3a381d4ab3146abf9b052fa4c33ec9368dd010ada9ee355e1d03ff64e1ff0 + "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 + checksum: 33a8e06aa54e2858d211c743d179f0487b03222f9ca1bfd7c4865bca243fca942a3358cb75f6bb894ed476cbddede834811fbd6903ff589f055821146f053e1a languageName: node linkType: hard @@ -9058,25 +9030,25 @@ __metadata: linkType: hard "babel-plugin-polyfill-corejs3@npm:^0.8.2": - version: 0.8.2 - resolution: "babel-plugin-polyfill-corejs3@npm:0.8.2" + version: 0.8.3 + resolution: "babel-plugin-polyfill-corejs3@npm:0.8.3" dependencies: - "@babel/helper-define-polyfill-provider": ^0.4.1 + "@babel/helper-define-polyfill-provider": ^0.4.2 core-js-compat: ^3.31.0 peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 0bc3e9e0114eba18f4fea8a9ff5a6016cae73b74cb091290c3f75fd7b9e34e712ee26f95b52d796f283970d7c6256fb01196e3608e8db03f620e3389d56d37c6 + "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 + checksum: dcbb30e551702a82cfd4d2c375da2c317658e55f95e9edcda93b9bbfdcc8fb6e5344efcb144e04d3406859e7682afce7974c60ededd9f12072a48a83dd22a0da languageName: node linkType: hard "babel-plugin-polyfill-regenerator@npm:^0.5.1": - version: 0.5.1 - resolution: "babel-plugin-polyfill-regenerator@npm:0.5.1" + version: 0.5.2 + resolution: "babel-plugin-polyfill-regenerator@npm:0.5.2" dependencies: - "@babel/helper-define-polyfill-provider": ^0.4.1 + "@babel/helper-define-polyfill-provider": ^0.4.2 peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 85a56d28b34586fbe482225fb6a9592fc793a459c5eea987a3427fb723c7aa2f76916348a9fc5e9ca48754ebf6086cfbb9226f4cd0cf9c6257f94553622562ed + "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 + checksum: d962200f604016a9a09bc9b4aaf60a3db7af876bb65bcefaeac04d44ac9d9ec4037cf24ce117760cc141d7046b6394c7eb0320ba9665cb4a2ee64df2be187c93 languageName: node linkType: hard @@ -9929,9 +9901,9 @@ __metadata: linkType: hard "caniuse-lite@npm:^1.0.30001109, caniuse-lite@npm:^1.0.30001503": - version: 1.0.30001513 - resolution: "caniuse-lite@npm:1.0.30001513" - checksum: 7d783f4f40584e7bdeda3f3abc23ffff21f14c37e1fadf1a6b3d2e299727fe9d5a61096101d9d4e4174f881d4ff4c62204fc41f3bc950f4da1b0edfdea025fa4 + version: 1.0.30001517 + resolution: "caniuse-lite@npm:1.0.30001517" + checksum: e4e87436ae1c4408cf4438aac22902b31eb03f3f5bad7f33bc518d12ffb35f3fd9395ccf7efc608ee046f90ce324ec6f7f26f8a8172b8c43c26a06ecee612a29 languageName: node linkType: hard @@ -11372,13 +11344,6 @@ __metadata: languageName: node linkType: hard -"data-uri-to-buffer@npm:3": - version: 3.0.1 - resolution: "data-uri-to-buffer@npm:3.0.1" - checksum: c59c3009686a78c071806b72f4810856ec28222f0f4e252aa495ec027ed9732298ceea99c50328cf59b151dd34cbc3ad6150bbb43e41fc56fa19f48c99e9fc30 - languageName: node - linkType: hard - "data-urls@npm:^1.0.0": version: 1.1.0 resolution: "data-urls@npm:1.1.0" @@ -11601,18 +11566,6 @@ __metadata: languageName: node linkType: hard -"degenerator@npm:^3.0.2": - version: 3.0.4 - resolution: "degenerator@npm:3.0.4" - dependencies: - ast-types: ^0.13.2 - escodegen: ^1.8.1 - esprima: ^4.0.0 - vm2: ^3.9.17 - checksum: 99c27c9456095e32c4f6e01091d2b5c249f246b574487c52bca571e1e586b02d4b74a0ea7f22f30cc953c914383d02e2038d7d476a22f2704a8c1e88b671007d - languageName: node - linkType: hard - "del@npm:^4.1.1": version: 4.1.1 resolution: "del@npm:4.1.1" @@ -12112,9 +12065,9 @@ __metadata: linkType: hard "electron-to-chromium@npm:^1.4.431": - version: 1.4.453 - resolution: "electron-to-chromium@npm:1.4.453" - checksum: dcd354388b2b60fb0158a6daf7a3a93796b9f6e0045bc507021bcbbf72790cb94c5bb549f699150e18d090321bca0583d729bc479d2d48a0c94a29b1a2f0165e + version: 1.4.470 + resolution: "electron-to-chromium@npm:1.4.470" + checksum: 0b1749f07b5e97b9d8f805cac6950574017cf2cf19a05cbc3dc46e7397be1d51485a5ece69478e7b12766f4643f45530b6bcebefa8916096a50f6a38dca381ca languageName: node linkType: hard @@ -12424,16 +12377,17 @@ __metadata: linkType: hard "es-abstract@npm:^1.17.2, es-abstract@npm:^1.19.0, es-abstract@npm:^1.20.4, es-abstract@npm:^1.21.2": - version: 1.21.2 - resolution: "es-abstract@npm:1.21.2" + version: 1.22.1 + resolution: "es-abstract@npm:1.22.1" dependencies: array-buffer-byte-length: ^1.0.0 + arraybuffer.prototype.slice: ^1.0.1 available-typed-arrays: ^1.0.5 call-bind: ^1.0.2 es-set-tostringtag: ^2.0.1 es-to-primitive: ^1.2.1 function.prototype.name: ^1.1.5 - get-intrinsic: ^1.2.0 + get-intrinsic: ^1.2.1 get-symbol-description: ^1.0.0 globalthis: ^1.0.3 gopd: ^1.0.1 @@ -12453,15 +12407,19 @@ __metadata: object-inspect: ^1.12.3 object-keys: ^1.1.1 object.assign: ^4.1.4 - regexp.prototype.flags: ^1.4.3 + regexp.prototype.flags: ^1.5.0 + safe-array-concat: ^1.0.0 safe-regex-test: ^1.0.0 string.prototype.trim: ^1.2.7 string.prototype.trimend: ^1.0.6 string.prototype.trimstart: ^1.0.6 + typed-array-buffer: ^1.0.0 + typed-array-byte-length: ^1.0.0 + typed-array-byte-offset: ^1.0.0 typed-array-length: ^1.0.4 unbox-primitive: ^1.0.2 - which-typed-array: ^1.1.9 - checksum: 037f55ee5e1cdf2e5edbab5524095a4f97144d95b94ea29e3611b77d852fd8c8a40e7ae7101fa6a759a9b9b1405f188c3c70928f2d3cd88d543a07fc0d5ad41a + which-typed-array: ^1.1.10 + checksum: 614e2c1c3717cb8d30b6128ef12ea110e06fd7d75ad77091ca1c5dbfb00da130e62e4bbbbbdda190eada098a22b27fe0f99ae5a1171dac2c8663b1e8be8a3a9b languageName: node linkType: hard @@ -12583,7 +12541,7 @@ __metadata: languageName: node linkType: hard -"escodegen@npm:^1.8.1, escodegen@npm:^1.9.1": +"escodegen@npm:^1.9.1": version: 1.14.3 resolution: "escodegen@npm:1.14.3" dependencies: @@ -12638,8 +12596,8 @@ __metadata: linkType: hard "eslint-plugin-react@npm:^7.17.0": - version: 7.32.2 - resolution: "eslint-plugin-react@npm:7.32.2" + version: 7.33.0 + resolution: "eslint-plugin-react@npm:7.33.0" dependencies: array-includes: ^3.1.6 array.prototype.flatmap: ^1.3.1 @@ -12654,17 +12612,17 @@ __metadata: object.values: ^1.1.6 prop-types: ^15.8.1 resolve: ^2.0.0-next.4 - semver: ^6.3.0 + semver: ^6.3.1 string.prototype.matchall: ^4.0.8 peerDependencies: eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 - checksum: 2232b3b8945aa50b7773919c15cd96892acf35d2f82503667a79e2f55def90f728ed4f0e496f0f157acbe1bd4397c5615b676ae7428fe84488a544ca53feb944 + checksum: f3ce2978322efd3c698b802dabfad070109dd1935c4e468545992b82b5fb8257ea3ad56732330bb46643182a09560129a259b436952b3e2aa426947d3abd2b1a languageName: node linkType: hard "eslint-plugin-storybook@npm:^0.6.7": - version: 0.6.12 - resolution: "eslint-plugin-storybook@npm:0.6.12" + version: 0.6.13 + resolution: "eslint-plugin-storybook@npm:0.6.13" dependencies: "@storybook/csf": ^0.0.1 "@typescript-eslint/utils": ^5.45.0 @@ -12672,7 +12630,7 @@ __metadata: ts-dedent: ^2.2.0 peerDependencies: eslint: ">=6" - checksum: 8e0e160c71216019c291a5a03b797b5359076067d16ea03b3dec63594093d45398f028d15c47eb89f2ddb6e8db18cc7e376b02d921dacc4fb31bbc8da46363c8 + checksum: 4d7bebd19bbebcdc36042e1e796dfd25fbde5f9d3a3d551a4d75fe1f41f537412f53fcf6b5e544386c5e0e2ce7af30efdabeb9169df27333e3e793a26fe2f008 languageName: node linkType: hard @@ -12697,12 +12655,12 @@ __metadata: linkType: hard "eslint-scope@npm:^7.2.0": - version: 7.2.0 - resolution: "eslint-scope@npm:7.2.0" + version: 7.2.1 + resolution: "eslint-scope@npm:7.2.1" dependencies: esrecurse: ^4.3.0 estraverse: ^5.2.0 - checksum: 64591a2d8b244ade9c690b59ef238a11d5c721a98bcee9e9f445454f442d03d3e04eda88e95a4daec558220a99fa384309d9faae3d459bd40e7a81b4063980ae + checksum: dccda5c8909216f6261969b72c77b95e385f9086bed4bc09d8a6276df8439d8f986810fd9ac3bd02c94c0572cefc7fdbeae392c69df2e60712ab8263986522c5 languageName: node linkType: hard @@ -12721,8 +12679,8 @@ __metadata: linkType: hard "eslint@npm:^8.11.0": - version: 8.44.0 - resolution: "eslint@npm:8.44.0" + version: 8.45.0 + resolution: "eslint@npm:8.45.0" dependencies: "@eslint-community/eslint-utils": ^4.2.0 "@eslint-community/regexpp": ^4.4.0 @@ -12749,7 +12707,6 @@ __metadata: globals: ^13.19.0 graphemer: ^1.4.0 ignore: ^5.2.0 - import-fresh: ^3.0.0 imurmurhash: ^0.1.4 is-glob: ^4.0.0 is-path-inside: ^3.0.3 @@ -12761,22 +12718,21 @@ __metadata: natural-compare: ^1.4.0 optionator: ^0.9.3 strip-ansi: ^6.0.1 - strip-json-comments: ^3.1.0 text-table: ^0.2.0 bin: eslint: bin/eslint.js - checksum: d06309ce4aafb9d27d558c8e5e5aa5cba3bbec3ce8ceccbc7d4b7a35f2b67fd40189159155553270e2e6febeb69bd8a3b60d6241c8f5ddc2ef1702ccbd328501 + checksum: 3e6dcce5cc43c5e301662db88ee26d1d188b22c177b9f104d7eefd1191236980bd953b3670fe2fac287114b26d7c5420ab48407d7ea1c3a446d6313c000009da languageName: node linkType: hard "espree@npm:^9.6.0": - version: 9.6.0 - resolution: "espree@npm:9.6.0" + version: 9.6.1 + resolution: "espree@npm:9.6.1" dependencies: acorn: ^8.9.0 acorn-jsx: ^5.3.2 eslint-visitor-keys: ^3.4.1 - checksum: 1287979510efb052a6a97c73067ea5d0a40701b29adde87bbe2d3eb1667e39ca55e8129e20e2517fed3da570150e7ef470585228459a8f3e3755f45007a1c662 + checksum: eb8c149c7a2a77b3f33a5af80c10875c3abd65450f60b8af6db1bfcfa8f101e21c1e56a561c6dc13b848e18148d43469e7cd208506238554fb5395a9ea5a1ab9 languageName: node linkType: hard @@ -13115,15 +13071,15 @@ __metadata: linkType: hard "fast-glob@npm:^3.2.11, fast-glob@npm:^3.2.4, fast-glob@npm:^3.2.7, fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.0": - version: 3.3.0 - resolution: "fast-glob@npm:3.3.0" + version: 3.3.1 + resolution: "fast-glob@npm:3.3.1" dependencies: "@nodelib/fs.stat": ^2.0.2 "@nodelib/fs.walk": ^1.2.3 glob-parent: ^5.1.2 merge2: ^1.3.0 micromatch: ^4.0.4 - checksum: 20df62be28eb5426fe8e40e0d05601a63b1daceb7c3d87534afcad91bdcf1e4b1743cf2d5247d6e225b120b46df0b9053a032b2691ba34ee121e033acd81f547 + checksum: b6f3add6403e02cf3a798bfbb1183d0f6da2afd368f27456010c0bc1f9640aea308243d4cb2c0ab142f618276e65ecb8be1661d7c62a7b4e5ba774b9ce5432e5 languageName: node linkType: hard @@ -13311,13 +13267,6 @@ __metadata: languageName: node linkType: hard -"file-uri-to-path@npm:2": - version: 2.0.0 - resolution: "file-uri-to-path@npm:2.0.0" - checksum: 4a71a99ddaa6ae7ae7bffe2948c34da59982ed465d930a0af9cb59fcc10fcd93366cc356ec3337c18373fde5df7ac52afda4558f155febd1799d135552207edb - languageName: node - linkType: hard - "fill-range@npm:^4.0.0": version: 4.0.0 resolution: "fill-range@npm:4.0.0" @@ -13716,17 +13665,6 @@ __metadata: languageName: node linkType: hard -"fs-extra@npm:^8.1.0": - version: 8.1.0 - resolution: "fs-extra@npm:8.1.0" - dependencies: - graceful-fs: ^4.2.0 - jsonfile: ^4.0.0 - universalify: ^0.1.0 - checksum: bf44f0e6cea59d5ce071bba4c43ca76d216f89e402dc6285c128abc0902e9b8525135aa808adad72c9d5d218e9f4bcc63962815529ff2f684ad532172a284880 - languageName: node - linkType: hard - "fs-extra@npm:^9.0.0, fs-extra@npm:^9.0.1": version: 9.1.0 resolution: "fs-extra@npm:9.1.0" @@ -13858,16 +13796,6 @@ __metadata: languageName: node linkType: hard -"ftp@npm:^0.3.10": - version: 0.3.10 - resolution: "ftp@npm:0.3.10" - dependencies: - readable-stream: 1.1.x - xregexp: 2.0.0 - checksum: ddd313c1d44eb7429f3a7d77a0155dc8fe86a4c64dca58f395632333ce4b4e74c61413c6e0ef66ea3f3d32d905952fbb6d028c7117d522f793eb1fa282e17357 - languageName: node - linkType: hard - "function-bind@npm:^1.1.1": version: 1.1.1 resolution: "function-bind@npm:1.1.1" @@ -13954,7 +13882,7 @@ __metadata: languageName: node linkType: hard -"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.0": +"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.0, get-intrinsic@npm:^1.2.1": version: 1.2.1 resolution: "get-intrinsic@npm:1.2.1" dependencies: @@ -14006,20 +13934,6 @@ __metadata: languageName: node linkType: hard -"get-uri@npm:3": - version: 3.0.2 - resolution: "get-uri@npm:3.0.2" - dependencies: - "@tootallnate/once": 1 - data-uri-to-buffer: 3 - debug: 4 - file-uri-to-path: 2 - fs-extra: ^8.1.0 - ftp: ^0.3.10 - checksum: 5325b2906b08ca37529ca421cf52bc50376e75c6a945e0a8064e3f76b4bb67b8ab1e316a2fc7a307c8c606ab36d030720f39a57c97b027ff1134335e12102946 - languageName: node - linkType: hard - "get-value@npm:^2.0.3, get-value@npm:^2.0.6": version: 2.0.6 resolution: "get-value@npm:2.0.6" @@ -14111,17 +14025,17 @@ __metadata: linkType: hard "glob@npm:^10.2.2": - version: 10.3.1 - resolution: "glob@npm:10.3.1" + version: 10.3.3 + resolution: "glob@npm:10.3.3" dependencies: foreground-child: ^3.1.0 jackspeak: ^2.0.3 minimatch: ^9.0.1 - minipass: ^5.0.0 || ^6.0.2 - path-scurry: ^1.10.0 + minipass: ^5.0.0 || ^6.0.2 || ^7.0.0 + path-scurry: ^1.10.1 bin: glob: dist/cjs/src/bin.js - checksum: 19c8c2805658b1002fecf0722cd609a33153d756a0d5260676bd0e9c5e6ef889ec9cce6d3dac0411aa90bce8de3d14f25b6f5589a3292582cccbfeddd0e98cc4 + checksum: 29190d3291f422da0cb40b77a72fc8d2c51a36524e99b8bf412548b7676a6627489528b57250429612b6eec2e6fe7826d328451d3e694a9d15e575389308ec53 languageName: node linkType: hard @@ -14936,17 +14850,6 @@ __metadata: languageName: node linkType: hard -"http-proxy-agent@npm:^4.0.0, http-proxy-agent@npm:^4.0.1": - version: 4.0.1 - resolution: "http-proxy-agent@npm:4.0.1" - dependencies: - "@tootallnate/once": 1 - agent-base: 6 - debug: 4 - checksum: c6a5da5a1929416b6bbdf77b1aca13888013fe7eb9d59fc292e25d18e041bb154a8dfada58e223fc7b76b9b2d155a87e92e608235201f77d34aa258707963a82 - languageName: node - linkType: hard - "http-proxy-agent@npm:^5.0.0": version: 5.0.0 resolution: "http-proxy-agent@npm:5.0.0" @@ -15005,7 +14908,7 @@ __metadata: languageName: node linkType: hard -"https-proxy-agent@npm:5, https-proxy-agent@npm:^5.0.0": +"https-proxy-agent@npm:^5.0.0": version: 5.0.1 resolution: "https-proxy-agent@npm:5.0.1" dependencies: @@ -15144,13 +15047,13 @@ __metadata: linkType: hard "immutable@npm:^4.0.0": - version: 4.3.0 - resolution: "immutable@npm:4.3.0" - checksum: bbd7ea99e2752e053323543d6ff1cc71a4b4614fa6121f321ca766db2bd2092f3f1e0a90784c5431350b7344a4f792fa002eac227062d59b9377b6c09063b58b + version: 4.3.1 + resolution: "immutable@npm:4.3.1" + checksum: a3a5ba29bd43f3f9a2e4d599763d7455d11a0ea57e50bf43f2836672fc80003e90d69f2a4f5b589f1f3d6986faf97f08ce1e253583740dd33c00adebab88b217 languageName: node linkType: hard -"import-fresh@npm:^3.0.0, import-fresh@npm:^3.1.0, import-fresh@npm:^3.2.1": +"import-fresh@npm:^3.1.0, import-fresh@npm:^3.2.1": version: 3.3.0 resolution: "import-fresh@npm:3.3.0" dependencies: @@ -15326,7 +15229,7 @@ __metadata: languageName: node linkType: hard -"ip@npm:^1.1.0, ip@npm:^1.1.5": +"ip@npm:^1.1.0": version: 1.1.8 resolution: "ip@npm:1.1.8" checksum: a2ade53eb339fb0cbe9e69a44caab10d6e3784662285eb5d2677117ee4facc33a64679051c35e0dfdb1a3983a51ce2f5d2cb36446d52e10d01881789b76e28fb @@ -15887,15 +15790,11 @@ __metadata: linkType: hard "is-typed-array@npm:^1.1.10, is-typed-array@npm:^1.1.9": - version: 1.1.10 - resolution: "is-typed-array@npm:1.1.10" + version: 1.1.12 + resolution: "is-typed-array@npm:1.1.12" dependencies: - available-typed-arrays: ^1.0.5 - call-bind: ^1.0.2 - for-each: ^0.3.3 - gopd: ^1.0.1 - has-tostringtag: ^1.0.0 - checksum: aac6ecb59d4c56a1cdeb69b1f129154ef462bbffe434cb8a8235ca89b42f258b7ae94073c41b3cb7bce37f6a1733ad4499f07882d5d5093a7ba84dfc4ebb8017 + which-typed-array: ^1.1.11 + checksum: 4c89c4a3be07186caddadf92197b17fda663a9d259ea0d44a85f171558270d36059d1c386d34a12cba22dfade5aba497ce22778e866adc9406098c8fc4771796 languageName: node linkType: hard @@ -16164,15 +16063,15 @@ __metadata: linkType: hard "jackspeak@npm:^2.0.3": - version: 2.2.1 - resolution: "jackspeak@npm:2.2.1" + version: 2.2.2 + resolution: "jackspeak@npm:2.2.2" dependencies: "@isaacs/cliui": ^8.0.2 "@pkgjs/parseargs": ^0.11.0 dependenciesMeta: "@pkgjs/parseargs": optional: true - checksum: e29291c0d0f280a063fa18fbd1e891ab8c2d7519fd34052c0ebde38538a15c603140d60c2c7f432375ff7ee4c5f1c10daa8b2ae19a97c3d4affe308c8360c1df + checksum: 7b1468dd910afc00642db87448f24b062346570b8b47531409aa9012bcb95fdf7ec2b1c48edbb8b57a938c08391f8cc01b5034fc335aa3a2e74dbcc0ee5c555a languageName: node linkType: hard @@ -18436,10 +18335,10 @@ __metadata: languageName: node linkType: hard -"minipass@npm:^5.0.0 || ^6.0.2": - version: 6.0.2 - resolution: "minipass@npm:6.0.2" - checksum: d140b91f4ab2e5ce5a9b6c468c0e82223504acc89114c1a120d4495188b81fedf8cade72a9f4793642b4e66672f990f1e0d902dd858485216a07cd3c8a62fac9 +"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0": + version: 7.0.2 + resolution: "minipass@npm:7.0.2" + checksum: 46776de732eb7cef2c7404a15fb28c41f5c54a22be50d47b03c605bf21f5c18d61a173c0a20b49a97e7a65f78d887245066410642551e45fffe04e9ac9e325bc languageName: node linkType: hard @@ -18501,7 +18400,7 @@ __metadata: languageName: node linkType: hard -"mkdirp@npm:^1.0.3, mkdirp@npm:^1.0.4, mkdirp@npm:~1.0.4": +"mkdirp@npm:^1.0.3, mkdirp@npm:^1.0.4": version: 1.0.4 resolution: "mkdirp@npm:1.0.4" bin: @@ -18510,6 +18409,15 @@ __metadata: languageName: node linkType: hard +"mkdirp@npm:^3.0.0": + version: 3.0.1 + resolution: "mkdirp@npm:3.0.1" + bin: + mkdirp: dist/cjs/src/bin.js + checksum: 972deb188e8fb55547f1e58d66bd6b4a3623bf0c7137802582602d73e6480c1c2268dcbafbfb1be466e00cc7e56ac514d7fd9334b7cf33e3e2ab547c16f83a8d + languageName: node + linkType: hard + "mobx-react-lite@npm:^3.4.0": version: 3.4.3 resolution: "mobx-react-lite@npm:3.4.3" @@ -18543,24 +18451,24 @@ __metadata: linkType: hard "mobx@npm:^6.3.3": - version: 6.9.0 - resolution: "mobx@npm:6.9.0" - checksum: ae03e95334887305c49d3e63e54f5e5e571b21f6a649fc0b7f6f1afd83470db63d8ab3e7c4b9e6ace2aaf6eded5255878c5f69d293efa9fd35af3d640b4a4756 + version: 6.10.0 + resolution: "mobx@npm:6.10.0" + checksum: 8279d5a978d845664fb1830ce1e7f3fcebd5809bd9be6f2cac9b190e07cf6f16b09581107cc2d1ff7097e979da758fefd9ac68db76c814b8e783e59d0b8e418c languageName: node linkType: hard "mocha-junit-reporter@npm:^2.0.2": - version: 2.2.0 - resolution: "mocha-junit-reporter@npm:2.2.0" + version: 2.2.1 + resolution: "mocha-junit-reporter@npm:2.2.1" dependencies: debug: ^4.3.4 md5: ^2.3.0 - mkdirp: ~1.0.4 + mkdirp: ^3.0.0 strip-ansi: ^6.0.1 xml: ^1.0.1 peerDependencies: mocha: ">=2.2.5" - checksum: 476dc12b676b8313ddac8ed27c5b43c86d6d54770efa0081a35a58f3a6717a504cc871058850da0611e7fc42e17201332390dc516096d51a189f12ff2141d420 + checksum: 752c30b1ef7c99eff6d82104f1b7a8179a21f3afefa3df38edb4e2478986a7c74d28b6c4525da5109cba8a4bf31cf697f4cff7584a3784fb9fc40be804fd7351 languageName: node linkType: hard @@ -18894,13 +18802,6 @@ __metadata: languageName: node linkType: hard -"netmask@npm:^2.0.2": - version: 2.0.2 - resolution: "netmask@npm:2.0.2" - checksum: c65cb8d3f7ea5669edddb3217e4c96910a60d0d9a4b52d9847ff6b28b2d0277cd8464eee0ef85133cdee32605c57940cacdd04a9a019079b091b6bba4cb0ec22 - languageName: node - linkType: hard - "nice-try@npm:^1.0.4": version: 1.0.5 resolution: "nice-try@npm:1.0.5" @@ -19694,34 +19595,6 @@ __metadata: languageName: node linkType: hard -"pac-proxy-agent@npm:^5.0.0": - version: 5.0.0 - resolution: "pac-proxy-agent@npm:5.0.0" - dependencies: - "@tootallnate/once": 1 - agent-base: 6 - debug: 4 - get-uri: 3 - http-proxy-agent: ^4.0.1 - https-proxy-agent: 5 - pac-resolver: ^5.0.0 - raw-body: ^2.2.0 - socks-proxy-agent: 5 - checksum: cfd26a0e2ebfea4ca6162465018ce093bf147d26cf6c8fb3e7155bc7c184370d80d4d09a1c097e3db7676d0e3f574ea1cb56a4aa7d1d2e5cca6238935fabf010 - languageName: node - linkType: hard - -"pac-resolver@npm:^5.0.0": - version: 5.0.1 - resolution: "pac-resolver@npm:5.0.1" - dependencies: - degenerator: ^3.0.2 - ip: ^1.1.5 - netmask: ^2.0.2 - checksum: e3bd8aada70d173cd4cec1ac810fb56161678b7a597060a740c4a31d9c5f8cd95687b2d0fd90b69c0cafe5ef787404074f38042ba08c8d378fed48973f58e493 - languageName: node - linkType: hard - "pako@npm:~1.0.5": version: 1.0.11 resolution: "pako@npm:1.0.11" @@ -19983,13 +19856,13 @@ __metadata: languageName: node linkType: hard -"path-scurry@npm:^1.10.0": - version: 1.10.0 - resolution: "path-scurry@npm:1.10.0" +"path-scurry@npm:^1.10.1": + version: 1.10.1 + resolution: "path-scurry@npm:1.10.1" dependencies: lru-cache: ^9.1.1 || ^10.0.0 - minipass: ^5.0.0 || ^6.0.2 - checksum: 3b66a4a6ab66e45755b577c966ecf0da92d3e068b3c992d8f69aa2cc908ef4eda9358253e9b4f86cad43d3ad810ec445be164105975f5cb3fdab68459c59dc6e + minipass: ^5.0.0 || ^6.0.2 || ^7.0.0 + checksum: e2557cff3a8fb8bc07afdd6ab163a92587884f9969b05bbbaf6fe7379348bfb09af9ed292af12ed32398b15fb443e81692047b786d1eeb6d898a51eb17ed7d90 languageName: node linkType: hard @@ -20164,23 +20037,23 @@ __metadata: languageName: node linkType: hard -"playwright-core@npm:1.35.1": - version: 1.35.1 - resolution: "playwright-core@npm:1.35.1" +"playwright-core@npm:1.36.1": + version: 1.36.1 + resolution: "playwright-core@npm:1.36.1" bin: playwright-core: cli.js - checksum: 179abc0051f00474e528935b507fa8cedc986b2803b020d7679878ba28cdd7036ad5a779792aad2ad281f8dc625eb1d2fb77663cb8de0d20c7ffbda7c18febdd + checksum: bbde807294053b50f0dbbc81f0dacc43fe525830ce1526e6ca74012582dd1645eae2391719cfb020051abea90704057cfabcbfe45ca530b37becc491e9459790 languageName: node linkType: hard "playwright@npm:^1.17.1, playwright@npm:^1.18.1": - version: 1.35.1 - resolution: "playwright@npm:1.35.1" + version: 1.36.1 + resolution: "playwright@npm:1.36.1" dependencies: - playwright-core: 1.35.1 + playwright-core: 1.36.1 bin: playwright: cli.js - checksum: 46e8ad6d4429acd8e6c8e680ed8107b13c62a22bb95172666411aedb8e9abd8f9c379e4905493a330e29c3dcf63b9a49a528f2f081d682d9f5da078c54760634 + checksum: 21940ccd174eb03a52b13e26dc7e0e90db05298caeab1dd71d21e996b65d959b82aa133f3c9fafb99b5e0bd37265338802d3fbcee1b567e0f75212ddbde5ebae languageName: node linkType: hard @@ -20393,13 +20266,13 @@ __metadata: linkType: hard "postcss@npm:^8.2.15, postcss@npm:^8.3.11, postcss@npm:^8.4.21": - version: 8.4.25 - resolution: "postcss@npm:8.4.25" + version: 8.4.27 + resolution: "postcss@npm:8.4.27" dependencies: nanoid: ^3.3.6 picocolors: ^1.0.0 source-map-js: ^1.0.2 - checksum: 9ed3ab8af43ad5210c28f56f916fd9b8c9f94fbeaebbf645dcf579bc28bdd8056c2a7ecc934668d399b81fedb6128f0c4b299f931e50454964bc911c25a3a0a2 + checksum: 1cdd0c298849df6cd65f7e646a3ba36870a37b65f55fd59d1a165539c263e9b4872a402bf4ed1ca1bc31f58b68b2835545e33ea1a23b161a1f8aa6d5ded81e78 languageName: node linkType: hard @@ -20664,7 +20537,7 @@ __metadata: languageName: node linkType: hard -"protobufjs@npm:^7.0.0": +"protobufjs@npm:^7.2.4": version: 7.2.4 resolution: "protobufjs@npm:7.2.4" dependencies: @@ -20694,29 +20567,6 @@ __metadata: languageName: node linkType: hard -"proxy-agent@npm:^5.0.0": - version: 5.0.0 - resolution: "proxy-agent@npm:5.0.0" - dependencies: - agent-base: ^6.0.0 - debug: 4 - http-proxy-agent: ^4.0.0 - https-proxy-agent: ^5.0.0 - lru-cache: ^5.1.1 - pac-proxy-agent: ^5.0.0 - proxy-from-env: ^1.0.0 - socks-proxy-agent: ^5.0.0 - checksum: 3b0bb73a4d3a07711d3cad72b2fa4320880f7a6ec1959cdcc186ac6ffb173db8137d7c4046c27fdfa6e2207b2eb75e802f3d5e14c766700586ec4d47299a5124 - languageName: node - linkType: hard - -"proxy-from-env@npm:^1.0.0": - version: 1.1.0 - resolution: "proxy-from-env@npm:1.1.0" - checksum: ed7fcc2ba0a33404958e34d95d18638249a68c430e30fcb6c478497d72739ba64ce9810a24f53a7d921d0c065e5b78e3822759800698167256b04659366ca4d4 - languageName: node - linkType: hard - "prr@npm:~1.0.1": version: 1.0.1 resolution: "prr@npm:1.0.1" @@ -20940,18 +20790,6 @@ __metadata: languageName: node linkType: hard -"raw-body@npm:^2.2.0": - version: 2.5.2 - resolution: "raw-body@npm:2.5.2" - dependencies: - bytes: 3.1.2 - http-errors: 2.0.0 - iconv-lite: 0.4.24 - unpipe: 1.0.0 - checksum: ba1583c8d8a48e8fbb7a873fdbb2df66ea4ff83775421bfe21ee120140949ab048200668c47d9ae3880012f6e217052690628cf679ddfbd82c9fc9358d574676 - languageName: node - linkType: hard - "raw-loader@npm:^4.0.2": version: 4.0.2 resolution: "raw-loader@npm:4.0.2" @@ -20994,8 +20832,8 @@ __metadata: linkType: hard "rc-tree@npm:^5.6.1": - version: 5.7.8 - resolution: "rc-tree@npm:5.7.8" + version: 5.7.9 + resolution: "rc-tree@npm:5.7.9" dependencies: "@babel/runtime": ^7.10.1 classnames: 2.x @@ -21005,7 +20843,7 @@ __metadata: peerDependencies: react: "*" react-dom: "*" - checksum: d2e80a32b096ff781e2cbb5b9b8b1f7e2adfff45e74d596985b7d31587fa08755d444388401a39513cb0dc4a97f5e936809749348d85ea555da0913ce0800c6f + checksum: ece66a1c56883da5a3412d524e2fb66e3ddb7c463a0d91e15062f023e590bf738431d70a8697d6799db758cf2f9752c875b89d7d60d5903ab41a5d4185a6600b languageName: node linkType: hard @@ -21023,8 +20861,8 @@ __metadata: linkType: hard "rc-virtual-list@npm:^3.5.1": - version: 3.5.2 - resolution: "rc-virtual-list@npm:3.5.2" + version: 3.5.3 + resolution: "rc-virtual-list@npm:3.5.3" dependencies: "@babel/runtime": ^7.20.0 classnames: ^2.2.6 @@ -21033,7 +20871,7 @@ __metadata: peerDependencies: react: "*" react-dom: "*" - checksum: d0ea5bc20bd54751220422442c6ff9c670fbe412b200a7739ac635212d3f0fd74863c85ed0532a9d65cf0e0e09a752c3ee65ed7233327529ac502aca118375a2 + checksum: 670ee4fbaa413706666f5ed6133a14e14ad2c3433acd1f95c24b8586a68b021b8bca4de81cf630973577adb28c58329da7bd005728cc3189facb8927c6be5632 languageName: node linkType: hard @@ -21248,8 +21086,8 @@ __metadata: linkType: hard "react-focus-lock@npm:^2.1.0": - version: 2.9.4 - resolution: "react-focus-lock@npm:2.9.4" + version: 2.9.5 + resolution: "react-focus-lock@npm:2.9.5" dependencies: "@babel/runtime": ^7.0.0 focus-lock: ^0.11.6 @@ -21263,7 +21101,7 @@ __metadata: peerDependenciesMeta: "@types/react": optional: true - checksum: f4c696bdbde5008560388622b994c00502d1faeeabff32b02964770c8c020208872f5f6b914b249a8bf3e97cc12e58bb0d227cd33460093654156b7b7f4c8d76 + checksum: 93473a6f0a249487e0f1609ccfe94312ce86265d7bca01f6825c061e15fcc13c78d6adb0555f8d9e7fa1cba3e23958f3ca4d4148c7bea828843c909feb5e10f1 languageName: node linkType: hard @@ -21822,18 +21660,6 @@ __metadata: languageName: node linkType: hard -"readable-stream@npm:1.1.x": - version: 1.1.14 - resolution: "readable-stream@npm:1.1.14" - dependencies: - core-util-is: ~1.0.0 - inherits: ~2.0.1 - isarray: 0.0.1 - string_decoder: ~0.10.x - checksum: 17dfeae3e909945a4a1abc5613ea92d03269ef54c49288599507fc98ff4615988a1c39a999dcf9aacba70233d9b7040bc11a5f2bfc947e262dedcc0a8b32b5a0 - languageName: node - linkType: hard - "readable-stream@npm:^3.0.0, readable-stream@npm:^3.0.2, readable-stream@npm:^3.0.6, readable-stream@npm:^3.1.1, readable-stream@npm:^3.4.0, readable-stream@npm:^3.6.0": version: 3.6.2 resolution: "readable-stream@npm:3.6.2" @@ -21989,7 +21815,7 @@ __metadata: languageName: node linkType: hard -"regexp.prototype.flags@npm:^1.2.0, regexp.prototype.flags@npm:^1.4.3": +"regexp.prototype.flags@npm:^1.2.0, regexp.prototype.flags@npm:^1.4.3, regexp.prototype.flags@npm:^1.5.0": version: 1.5.0 resolution: "regexp.prototype.flags@npm:1.5.0" dependencies: @@ -22707,15 +22533,15 @@ __metadata: linkType: hard "sass@npm:^1.39.2, sass@npm:^1.53.0": - version: 1.63.6 - resolution: "sass@npm:1.63.6" + version: 1.64.1 + resolution: "sass@npm:1.64.1" dependencies: chokidar: ">=3.0.0 <4.0.0" immutable: ^4.0.0 source-map-js: ">=0.6.2 <2.0.0" bin: sass: sass.js - checksum: 3372319904658eeafaf78a09a6fcb3368a68e6d76fe3c43c2d009f4f72e475ab22b82ef483ef5c00fcda3ab00066846c0bd88c36b42771b855f6ab80c7eda541 + checksum: e908f96f3d5fa5869e2f2aec97548c93d6ef390680af89870fcae8bdbaee2392ac650fbeae8d2ef8e4c99cb9f81e6b3624e1cb659af6d6e746332a22233b5ad8 languageName: node linkType: hard @@ -22840,31 +22666,31 @@ __metadata: linkType: hard "semver@npm:2 || 3 || 4 || 5, semver@npm:^5.0.3, semver@npm:^5.4.1, semver@npm:^5.5.0, semver@npm:^5.5.1, semver@npm:^5.6.0, semver@npm:^5.7.0, semver@npm:^5.7.1": - version: 5.7.1 - resolution: "semver@npm:5.7.1" + version: 5.7.2 + resolution: "semver@npm:5.7.2" bin: - semver: ./bin/semver - checksum: 57fd0acfd0bac382ee87cd52cd0aaa5af086a7dc8d60379dfe65fea491fb2489b6016400813930ecd61fd0952dae75c115287a1b16c234b1550887117744dfaf + semver: bin/semver + checksum: fb4ab5e0dd1c22ce0c937ea390b4a822147a9c53dbd2a9a0132f12fe382902beef4fbf12cf51bb955248d8d15874ce8cd89532569756384f994309825f10b686 languageName: node linkType: hard -"semver@npm:^6.0.0, semver@npm:^6.1.2, semver@npm:^6.2.0, semver@npm:^6.3.0": - version: 6.3.0 - resolution: "semver@npm:6.3.0" +"semver@npm:^6.0.0, semver@npm:^6.1.2, semver@npm:^6.2.0, semver@npm:^6.3.0, semver@npm:^6.3.1": + version: 6.3.1 + resolution: "semver@npm:6.3.1" bin: - semver: ./bin/semver.js - checksum: 1b26ecf6db9e8292dd90df4e781d91875c0dcc1b1909e70f5d12959a23c7eebb8f01ea581c00783bbee72ceeaad9505797c381756326073850dc36ed284b21b9 + semver: bin/semver.js + checksum: ae47d06de28836adb9d3e25f22a92943477371292d9b665fb023fae278d345d508ca1958232af086d85e0155aee22e313e100971898bbb8d5d89b8b1d4054ca2 languageName: node linkType: hard "semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8": - version: 7.5.3 - resolution: "semver@npm:7.5.3" + version: 7.5.4 + resolution: "semver@npm:7.5.4" dependencies: lru-cache: ^6.0.0 bin: semver: bin/semver.js - checksum: 9d58db16525e9f749ad0a696a1f27deabaa51f66e91d2fa2b0db3de3e9644e8677de3b7d7a03f4c15bc81521e0c3916d7369e0572dbde250d9bedf5194e2a8a7 + checksum: 12d8ad952fa353b0995bf180cdac205a4068b759a140e5d3c608317098b3575ac2f1e09182206bf2eb26120e1c0ed8fb92c48c592f6099680de56bb071423ca3 languageName: node linkType: hard @@ -23366,17 +23192,6 @@ __metadata: languageName: node linkType: hard -"socks-proxy-agent@npm:5, socks-proxy-agent@npm:^5.0.0": - version: 5.0.1 - resolution: "socks-proxy-agent@npm:5.0.1" - dependencies: - agent-base: ^6.0.2 - debug: 4 - socks: ^2.3.3 - checksum: 1b60c4977b2fef783f0fc4dc619cd2758aafdb43f3cf679f1e3627cb6c6e752811cee5513ebb4157ad26786033d2f85029440f197d321e8293b38cc5aab01e06 - languageName: node - linkType: hard - "socks-proxy-agent@npm:^7.0.0": version: 7.0.0 resolution: "socks-proxy-agent@npm:7.0.0" @@ -23388,7 +23203,7 @@ __metadata: languageName: node linkType: hard -"socks@npm:^2.3.3, socks@npm:^2.6.2": +"socks@npm:^2.6.2": version: 2.7.1 resolution: "socks@npm:2.7.1" dependencies: @@ -24027,7 +23842,7 @@ __metadata: languageName: node linkType: hard -"strip-json-comments@npm:3.1.1, strip-json-comments@npm:^3.1.0, strip-json-comments@npm:^3.1.1": +"strip-json-comments@npm:3.1.1, strip-json-comments@npm:^3.1.1": version: 3.1.1 resolution: "strip-json-comments@npm:3.1.1" checksum: 492f73e27268f9b1c122733f28ecb0e7e8d8a531a6662efbd08e22cccb3f9475e90a1b82cab06a392f6afae6d2de636f977e231296400d0ec5304ba70f166443 @@ -24447,8 +24262,8 @@ __metadata: linkType: hard "terser@npm:^5.10.0, terser@npm:^5.15.1, terser@npm:^5.16.8, terser@npm:^5.3.4, terser@npm:^5.8.0": - version: 5.18.2 - resolution: "terser@npm:5.18.2" + version: 5.19.2 + resolution: "terser@npm:5.19.2" dependencies: "@jridgewell/source-map": ^0.3.3 acorn: ^8.8.2 @@ -24456,7 +24271,7 @@ __metadata: source-map-support: ~0.5.20 bin: terser: bin/terser - checksum: 50988412533bfd5a07294df002d772ad5b1277a9d1164dd19c8876a2094ced7b78fcf36cb32122a9a5238ba2597d77178a2385dfc6c4d506622309493f613cf4 + checksum: e059177775b4d4f4cff219ad89293175aefbd1b081252270444dc83e42a2c5f07824eb2a85eae6e22ef6eb7ef04b21af36dd7d1dd7cfb93912310e57d416a205 languageName: node linkType: hard @@ -24717,9 +24532,9 @@ __metadata: linkType: hard "triple-beam@npm:^1.3.0": - version: 1.3.0 - resolution: "triple-beam@npm:1.3.0" - checksum: 7d7b77d8625fb252c126c24984a68de462b538a8fcd1de2abd0a26421629cf3527d48e23b3c2264f08f4a6c3bc40a478a722176f4d7b6a1acc154cb70c359f2b + version: 1.4.1 + resolution: "triple-beam@npm:1.4.1" + checksum: 2e881a3e8e076b6f2b85b9ec9dd4a900d3f5016e6d21183ed98e78f9abcc0149e7d54d79a3f432b23afde46b0885bdcdcbff789f39bc75de796316961ec07f61 languageName: node linkType: hard @@ -24769,9 +24584,9 @@ __metadata: linkType: hard "tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.3.1, tslib@npm:^2.5.0": - version: 2.6.0 - resolution: "tslib@npm:2.6.0" - checksum: c01066038f950016a18106ddeca4649b4d76caa76ec5a31e2a26e10586a59fceb4ee45e96719bf6c715648e7c14085a81fee5c62f7e9ebee68e77a5396e5538f + version: 2.6.1 + resolution: "tslib@npm:2.6.1" + checksum: b0d176d176487905b66ae4d5856647df50e37beea7571c53b8d10ba9222c074b81f1410fb91da13debaf2cbc970663609068bdebafa844ea9d69b146527c38fe languageName: node linkType: hard @@ -24865,6 +24680,42 @@ __metadata: languageName: node linkType: hard +"typed-array-buffer@npm:^1.0.0": + version: 1.0.0 + resolution: "typed-array-buffer@npm:1.0.0" + dependencies: + call-bind: ^1.0.2 + get-intrinsic: ^1.2.1 + is-typed-array: ^1.1.10 + checksum: 3e0281c79b2a40cd97fe715db803884301993f4e8c18e8d79d75fd18f796e8cd203310fec8c7fdb5e6c09bedf0af4f6ab8b75eb3d3a85da69328f28a80456bd3 + languageName: node + linkType: hard + +"typed-array-byte-length@npm:^1.0.0": + version: 1.0.0 + resolution: "typed-array-byte-length@npm:1.0.0" + dependencies: + call-bind: ^1.0.2 + for-each: ^0.3.3 + has-proto: ^1.0.1 + is-typed-array: ^1.1.10 + checksum: b03db16458322b263d87a702ff25388293f1356326c8a678d7515767ef563ef80e1e67ce648b821ec13178dd628eb2afdc19f97001ceae7a31acf674c849af94 + languageName: node + linkType: hard + +"typed-array-byte-offset@npm:^1.0.0": + version: 1.0.0 + resolution: "typed-array-byte-offset@npm:1.0.0" + dependencies: + available-typed-arrays: ^1.0.5 + call-bind: ^1.0.2 + for-each: ^0.3.3 + has-proto: ^1.0.1 + is-typed-array: ^1.1.10 + checksum: 04f6f02d0e9a948a95fbfe0d5a70b002191fae0b8fe0fe3130a9b2336f043daf7a3dda56a31333c35a067a97e13f539949ab261ca0f3692c41603a46a94e960b + languageName: node + linkType: hard + "typed-array-length@npm:^1.0.4": version: 1.0.4 resolution: "typed-array-length@npm:1.0.4" @@ -25659,18 +25510,6 @@ __metadata: languageName: node linkType: hard -"vm2@npm:^3.9.17": - version: 3.9.19 - resolution: "vm2@npm:3.9.19" - dependencies: - acorn: ^8.7.0 - acorn-walk: ^8.2.0 - bin: - vm2: bin/vm2 - checksum: fc6cf553134145cd7bb5246985bf242b056e3fb5ea71e2eef6710b2a5d6c6119cc6bc960435ff62480ee82efb43369be8f4db07b6690916ae7d3b2e714f395d8 - languageName: node - linkType: hard - "void-elements@npm:3.1.0": version: 3.1.0 resolution: "void-elements@npm:3.1.0" @@ -26068,8 +25907,8 @@ __metadata: linkType: hard "webpack@npm:>=4.43.0 <6.0.0, webpack@npm:^5.9.0": - version: 5.88.1 - resolution: "webpack@npm:5.88.1" + version: 5.88.2 + resolution: "webpack@npm:5.88.2" dependencies: "@types/eslint-scope": ^3.7.3 "@types/estree": ^1.0.0 @@ -26100,7 +25939,7 @@ __metadata: optional: true bin: webpack: bin/webpack.js - checksum: 726e7e05ab2e7c142609a673dd6aa1a711ed97f349418a2a393d650c5ddad172d191257f60e1e37f6b2a77261571c202aabd5ce9240791a686774f0801cf5ec2 + checksum: 79476a782da31a21f6dd38fbbd06b68da93baf6a62f0d08ca99222367f3b8668f5a1f2086b7bb78e23172e31fa6df6fa7ab09b25e827866c4fc4dc2b30443ce2 languageName: node linkType: hard @@ -26204,17 +26043,16 @@ __metadata: languageName: node linkType: hard -"which-typed-array@npm:^1.1.9": - version: 1.1.9 - resolution: "which-typed-array@npm:1.1.9" +"which-typed-array@npm:^1.1.10, which-typed-array@npm:^1.1.11": + version: 1.1.11 + resolution: "which-typed-array@npm:1.1.11" dependencies: available-typed-arrays: ^1.0.5 call-bind: ^1.0.2 for-each: ^0.3.3 gopd: ^1.0.1 has-tostringtag: ^1.0.0 - is-typed-array: ^1.1.10 - checksum: fe0178ca44c57699ca2c0e657b64eaa8d2db2372a4e2851184f568f98c478ae3dc3fdb5f7e46c384487046b0cf9e23241423242b277e03e8ba3dabc7c84c98ef + checksum: 711ffc8ef891ca6597b19539075ec3e08bb9b4c2ca1f78887e3c07a977ab91ac1421940505a197758fb5939aa9524976d0a5bbcac34d07ed6faa75cedbb17206 languageName: node linkType: hard @@ -26291,8 +26129,8 @@ __metadata: linkType: hard "winston-cloudwatch@npm:^6.1.1": - version: 6.1.1 - resolution: "winston-cloudwatch@npm:6.1.1" + version: 6.2.0 + resolution: "winston-cloudwatch@npm:6.2.0" dependencies: async: ^3.1.0 chalk: ^4.0.0 @@ -26301,11 +26139,10 @@ __metadata: lodash.find: ^4.6.0 lodash.isempty: ^4.4.0 lodash.iserror: ^3.1.1 - proxy-agent: ^5.0.0 peerDependencies: "@aws-sdk/client-cloudwatch-logs": ^3.0.0 winston: ^3.0.0 - checksum: 57adc419a8235d8b149d72b43542d31210f8203dc4bfb9ead471f18cc1a100e3c8927fc5f6cb86cfb7b369cf8042fda94703b55a83563efdd6556a8dfc1cc9c0 + checksum: de39f76ad06bc8fd1adeaee6c872648f700c18b9b348e12ec88e8aef99dba290c58218573ffaa4c041e050066694d7d650772b77a2ef8599c6e406ec5caab7e2 languageName: node linkType: hard @@ -26335,8 +26172,8 @@ __metadata: linkType: hard "winston@npm:*, winston@npm:^3.8.2": - version: 3.9.0 - resolution: "winston@npm:3.9.0" + version: 3.10.0 + resolution: "winston@npm:3.10.0" dependencies: "@colors/colors": 1.5.0 "@dabh/diagnostics": ^2.0.2 @@ -26349,14 +26186,14 @@ __metadata: stack-trace: 0.0.x triple-beam: ^1.3.0 winston-transport: ^4.5.0 - checksum: 410f82b7a502106e7d93e62cd21d7e9bcfd37884d0d95921b12526d2fe163e654ec9cd39e18f9884fad5cf6506a45d07bd2519c1dc9c88e82f0f12b2ce9fa510 + checksum: 47df0361220d12b46d1b3c98a1c380a3718321739d527a182ce7984fc20715e5b0b55db0bcd3fd076d1b1d3261903b890b053851cfd4bc028bda7951fa8ca2e0 languageName: node linkType: hard "word-wrap@npm:~1.2.3": - version: 1.2.3 - resolution: "word-wrap@npm:1.2.3" - checksum: 30b48f91fcf12106ed3186ae4fa86a6a1842416df425be7b60485de14bec665a54a68e4b5156647dec3a70f25e84d270ca8bc8cd23182ed095f5c7206a938c1f + version: 1.2.5 + resolution: "word-wrap@npm:1.2.5" + checksum: f93ba3586fc181f94afdaff3a6fef27920b4b6d9eaefed0f428f8e07adea2a7f54a5f2830ce59406c8416f033f86902b91eb824072354645eea687dff3691ccb languageName: node linkType: hard @@ -26578,13 +26415,6 @@ __metadata: languageName: node linkType: hard -"xregexp@npm:2.0.0": - version: 2.0.0 - resolution: "xregexp@npm:2.0.0" - checksum: de62d1f01c9f1a67c80cafe48a3dc081b324249a0e88e65dc9acae9cce6d8e63c9d91c0f97e2ad2d8c5351c856c139c04dc55ebd941e59b7d1d5c1169e164cff - languageName: node - linkType: hard - "xtend@npm:^4.0.0, xtend@npm:^4.0.1, xtend@npm:^4.0.2, xtend@npm:~4.0.1": version: 4.0.2 resolution: "xtend@npm:4.0.2" From ac32bd5c1c5789acd2f0250dfad333b5250997f5 Mon Sep 17 00:00:00 2001 From: Alexey Safronov Date: Tue, 25 Jul 2023 13:52:47 +0400 Subject: [PATCH 12/30] Web: Removed useless package --- packages/browserslist-config-asc/README.md | 15 --------------- .../browserslist-config-asc/browserlist.config.js | 7 ------- packages/browserslist-config-asc/package.json | 13 ------------- 3 files changed, 35 deletions(-) delete mode 100644 packages/browserslist-config-asc/README.md delete mode 100644 packages/browserslist-config-asc/browserlist.config.js delete mode 100644 packages/browserslist-config-asc/package.json diff --git a/packages/browserslist-config-asc/README.md b/packages/browserslist-config-asc/README.md deleted file mode 100644 index c4f61f24658..00000000000 --- a/packages/browserslist-config-asc/README.md +++ /dev/null @@ -1,15 +0,0 @@ -# @appserver/browserslist-config - -Shared browserslist config for AppServer - -## Usage - -### package.json - -```json -{ - "browserslist": [ - "extends @appserver/browserslist-config" - ] -} -``` diff --git a/packages/browserslist-config-asc/browserlist.config.js b/packages/browserslist-config-asc/browserlist.config.js deleted file mode 100644 index f31ec8c246e..00000000000 --- a/packages/browserslist-config-asc/browserlist.config.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = [ - '>0.25%', - 'not ie 11', - 'not op_mini all', - 'not dead', - 'Firefox ESR', -]; diff --git a/packages/browserslist-config-asc/package.json b/packages/browserslist-config-asc/package.json deleted file mode 100644 index 601b5046168..00000000000 --- a/packages/browserslist-config-asc/package.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "@docspace/browserslist-config-asc", - "version": "1.2.0", - "description": "Shared browserslist for DocSpace libraries and apps", - "main": "browserlist.config.js", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "keywords": [ - "docspace", - "browserslist" - ] -} From f3765018f1645ff2e2ad408ea7362aefa58b6e98 Mon Sep 17 00:00:00 2001 From: Alexey Safronov Date: Tue, 25 Jul 2023 14:02:50 +0400 Subject: [PATCH 13/30] Web: bump version --- package.json | 2 +- packages/client/package.json | 2 +- packages/common/package.json | 2 +- packages/components/package.json | 2 +- packages/editor/package.json | 2 +- packages/login/package.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 999637466b5..5737530f236 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "docspace", - "version": "1.1.0", + "version": "1.1.1", "private": true, "workspaces": { "packages": [ diff --git a/packages/client/package.json b/packages/client/package.json index da194860314..b417bc5db26 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@docspace/client", - "version": "1.1.0", + "version": "1.1.1", "private": true, "homepage": "", "scripts": { diff --git a/packages/common/package.json b/packages/common/package.json index bc81f57cd53..afda07e3b57 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@docspace/common", - "version": "1.1.0", + "version": "1.1.1", "private": true, "scripts": { "build": "echo 'skip it'", diff --git a/packages/components/package.json b/packages/components/package.json index 4101e30d169..50cdae53fe0 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@docspace/components", - "version": "1.1.0", + "version": "1.1.1", "private": true, "scripts": { "build": "echo 'skip it'", diff --git a/packages/editor/package.json b/packages/editor/package.json index 4b395666ab3..9dcc4794d42 100644 --- a/packages/editor/package.json +++ b/packages/editor/package.json @@ -1,6 +1,6 @@ { "name": "@docspace/editor", - "version": "1.1.0", + "version": "1.1.1", "private": true, "homepage": "/doceditor", "scripts": { diff --git a/packages/login/package.json b/packages/login/package.json index 9cec08f6263..0787eee071f 100644 --- a/packages/login/package.json +++ b/packages/login/package.json @@ -1,6 +1,6 @@ { "name": "@docspace/login", - "version": "1.1.0", + "version": "1.1.1", "private": true, "homepage": "/login", "scripts": { From 4fcb79e49884befcc801a702f466651622ff3cd4 Mon Sep 17 00:00:00 2001 From: Evgeniy Antonyuk Date: Tue, 25 Jul 2023 15:07:31 +0500 Subject: [PATCH 14/30] Disable debug-info by default for win package --- build/install/win/build-batch.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/install/win/build-batch.bat b/build/install/win/build-batch.bat index 11927db9b3d..499b5a34d48 100644 --- a/build/install/win/build-batch.bat +++ b/build/install/win/build-batch.bat @@ -45,7 +45,7 @@ del /f /q build\install\win\Files\config\*.dev.json %sed% "s_\(minlevel=\)".*"_\1\"Warn\"_g" -i build\install\win\Files\config\nlog.config %sed% "s_\(\"Default\":\).*,_\1 \"Warning\",_g" -i build\install\win\Files\config\appsettings.json %sed% "s_\(\"logLevel\":\).*_\1 \"warning\"_g" -i build\install\win\Files\config\appsettings.services.json -%sed% "/\"debug-info\": {/,/}/ s/\(\"enabled\": \)\"[^\"]*\"/\1\"false\"/' -i build\install\win\Files\config\appsettings.json +%sed% "/\"debug-info\": {/,/}/ s/\(\"enabled\": \)\".*\"/\1\"false\"/" -i build\install\win\Files\config\appsettings.json REM echo ######## Remove AWSTarget from nlog.config ######## %sed% -i "//d; //d" build\install\win\Files\config\nlog.config From ab6920145ad15ace62a82178638404e335f35dca Mon Sep 17 00:00:00 2001 From: Evgeniy Antonyuk Date: Tue, 25 Jul 2023 19:31:34 +0500 Subject: [PATCH 15/30] fix Bug 63456 - Change the redirecturl value in production configuration (#1584) --- build/install/deb/debian/rules | 2 ++ build/install/docker/.env | 1 + build/install/docker/docker-entrypoint.py | 14 +++++++++++++- build/install/rpm/SPECS/build.spec | 2 ++ build/install/win/build-batch.bat | 3 +++ 5 files changed, 21 insertions(+), 1 deletion(-) diff --git a/build/install/deb/debian/rules b/build/install/deb/debian/rules index 844dcbeb758..70dc6808211 100755 --- a/build/install/deb/debian/rules +++ b/build/install/deb/debian/rules @@ -49,6 +49,8 @@ override_dh_auto_build: json -I -f ${SRC_PATH}/config/apisystem.json -e "this.core.notify.postman=\"services\"" sed 's_\(minlevel=\)".*"_\1"Warn"_g' -i ${SRC_PATH}/config/nlog.config + sed 's/teamlab.info/onlyoffice.com/g' -i ${SRC_PATH}/config/autofac.consumers.json + for i in ${PRODUCT} $$(ls ${CURRENT_PATH}/debian/*.install | grep -oP 'debian/\K.*' | grep -o '^[^.]*'); do \ cp ${CURRENT_PATH}/debian/source/lintian-overrides ${CURRENT_PATH}/debian/$$i.lintian-overrides; \ done diff --git a/build/install/docker/.env b/build/install/docker/.env index 82512a5e915..995c593f8bf 100644 --- a/build/install/docker/.env +++ b/build/install/docker/.env @@ -36,6 +36,7 @@ ENV_EXTENSION=none APP_CORE_BASE_DOMAIN=localhost APP_URL_PORTAL="http://localhost:8092" + OAUTH_REDIRECT_URL="https://service.onlyoffice.com/oauth2.aspx" APP_KNOWN_PROXIES="" APP_KNOWN_NETWORKS="" diff --git a/build/install/docker/docker-entrypoint.py b/build/install/docker/docker-entrypoint.py index f448162ad1f..668da7cd78a 100755 --- a/build/install/docker/docker-entrypoint.py +++ b/build/install/docker/docker-entrypoint.py @@ -1,4 +1,4 @@ -import json, sys, os, netifaces +import json, sys, os, netifaces, re from jsonpath_ng import jsonpath, parse from os import environ from multipledispatch import dispatch @@ -28,6 +28,7 @@ APP_CORE_MACHINEKEY = os.environ["APP_CORE_MACHINEKEY"] if environ.get("APP_CORE_MACHINEKEY") else "your_core_machinekey" INSTALLATION_TYPE = os.environ["INSTALLATION_TYPE"].upper() if environ.get("INSTALLATION_TYPE") else "ENTERPRISE" APP_URL_PORTAL = os.environ["APP_URL_PORTAL"] if environ.get("APP_URL_PORTAL") else "http://" + ROUTER_HOST + ":8092" +OAUTH_REDIRECT_URL = os.environ["OAUTH_REDIRECT_URL"] if environ.get("OAUTH_REDIRECT_URL") else "https://service.onlyoffice.com/oauth2.aspx" APP_STORAGE_ROOT = os.environ["APP_STORAGE_ROOT"] if environ.get("APP_STORAGE_ROOT") else BASE_DIR + "/data/" APP_KNOWN_PROXIES = os.environ["APP_KNOWN_PROXIES"] APP_KNOWN_NETWORKS = os.environ["APP_KNOWN_NETWORKS"] @@ -178,6 +179,17 @@ def writeJsonFile(jsonFile, jsonData, indent=4): updateJsonData(jsonData,"$.core.machinekey", APP_CORE_MACHINEKEY) writeJsonFile(filePath, jsonData) +filePath = "/app/onlyoffice/config/autofac.consumers.json" +jsonData = openJsonFile(filePath) + +for component in jsonData['components']: + if 'parameters' in component and 'additional' in component['parameters']: + for key, value in component['parameters']['additional'].items(): + if re.search(r'.*RedirectUrl$', key) and value: + component['parameters']['additional'][key] = OAUTH_REDIRECT_URL + +writeJsonFile(filePath, jsonData) + filePath = "/app/onlyoffice/config/elastic.json" jsonData = openJsonFile(filePath) jsonData["elastic"]["Scheme"] = ELK_SHEME diff --git a/build/install/rpm/SPECS/build.spec b/build/install/rpm/SPECS/build.spec index 7a8b6eaa454..0e8b54bf441 100644 --- a/build/install/rpm/SPECS/build.spec +++ b/build/install/rpm/SPECS/build.spec @@ -20,6 +20,8 @@ json -I -f %{_builddir}/%{sourcename}/config/appsettings.json -e "this.core.noti json -I -f %{_builddir}/%{sourcename}/config/apisystem.json -e "this.core.notify.postman=\"services\"" sed 's_\(minlevel=\)".*"_\1"Warn"_g' -i %{_builddir}/%{sourcename}/config/nlog.config +sed 's/teamlab.info/onlyoffice.com/g' -i %{_builddir}/%{sourcename}/config/autofac.consumers.json + find %{_builddir}/%{sourcename}/publish/ \ %{_builddir}/%{sourcename}/ASC.Migration.Runner \ -depth -type f -regex '.*\(dll\|dylib\|so\)$' -exec chmod 755 {} \; diff --git a/build/install/win/build-batch.bat b/build/install/win/build-batch.bat index 499b5a34d48..2c7ea5ec0aa 100644 --- a/build/install/win/build-batch.bat +++ b/build/install/win/build-batch.bat @@ -47,6 +47,9 @@ del /f /q build\install\win\Files\config\*.dev.json %sed% "s_\(\"logLevel\":\).*_\1 \"warning\"_g" -i build\install\win\Files\config\appsettings.services.json %sed% "/\"debug-info\": {/,/}/ s/\(\"enabled\": \)\".*\"/\1\"false\"/" -i build\install\win\Files\config\appsettings.json +::redirectUrl value replacement +%sed% "s/teamlab.info/onlyoffice.com/g" -i build\install\win\Files\config/autofac.consumers.json + REM echo ######## Remove AWSTarget from nlog.config ######## %sed% -i "//d; //d" build\install\win\Files\config\nlog.config del /q build\install\win\Files\config\sed* From 1f5f196f3bc51c739e2b4274eedc888df710a525 Mon Sep 17 00:00:00 2001 From: Elbakyan Shirak Date: Tue, 25 Jul 2023 10:56:35 -0400 Subject: [PATCH 16/30] Add concurrency in actions (#1587) --- .github/workflows/build_packages.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build_packages.yml b/.github/workflows/build_packages.yml index e9e448ffd2f..3b7ba5d0521 100644 --- a/.github/workflows/build_packages.yml +++ b/.github/workflows/build_packages.yml @@ -11,6 +11,9 @@ on: - build/install/rpm** - build/install/common** workflow_dispatch: +concurrency: + group: ${{ github.ref }} + cancel-in-progress: true env: BRANCH_NAME: $(echo ${GITHUB_REF#refs/heads/}) From 1b154217961d38fe9a9e0b0331421616af19f640 Mon Sep 17 00:00:00 2001 From: Elbakyan Shirak Date: Tue, 25 Jul 2023 11:02:19 -0400 Subject: [PATCH 17/30] Fix no space left on device error (#1588) --- .github/workflows/build_packages.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.github/workflows/build_packages.yml b/.github/workflows/build_packages.yml index 3b7ba5d0521..22c25aae09e 100644 --- a/.github/workflows/build_packages.yml +++ b/.github/workflows/build_packages.yml @@ -30,6 +30,16 @@ jobs: contents: write steps: + - name: Free Disk Space + uses: jlumbroso/free-disk-space@main + with: + tool-cache: true + android: true + haskell: true + large-packages: true + docker-images: true + swap-storage: true + - name: Import GPG uses: crazy-max/ghaction-import-gpg@v5 id: gpg_step @@ -91,6 +101,16 @@ jobs: contents: write steps: + - name: Free Disk Space + uses: jlumbroso/free-disk-space@main + with: + tool-cache: true + android: true + haskell: true + large-packages: true + docker-images: true + swap-storage: true + - name: Import GPG uses: crazy-max/ghaction-import-gpg@v5 with: From 78c6719a03d96538e7756c2422b8f09bb5f2188a Mon Sep 17 00:00:00 2001 From: pavelbannov Date: Tue, 25 Jul 2023 18:12:08 +0300 Subject: [PATCH 18/30] bug 63390 --- .../Core/ApiModels/ResponseDto/MoveDto.cs | 33 +++++++ .../Core/Core/Dao/Interfaces/IFolderDao.cs | 14 +-- .../Core/Core/Dao/TeamlabDao/FolderDao.cs | 35 ++++---- .../ASC.Files/Core/Core/FileStorageService.cs | 86 ++++++++++++------- .../Core/Core/Thirdparty/Box/BoxFolderDao.cs | 20 ++--- .../Thirdparty/Dropbox/DropboxFolderDao.cs | 20 ++--- .../GoogleDrive/GoogleDriveFolderDao.cs | 22 ++--- .../Thirdparty/OneDrive/OneDriveFolderDao.cs | 20 ++--- .../ProviderDao/ProviderFolderDao.cs | 40 ++++----- .../SharePoint/SharePointFolderDao.cs | 24 +++--- .../Thirdparty/Sharpbox/SharpBoxFolderDao.cs | 24 +++--- .../Server/Api/OperationController.cs | 56 ++++++++---- 12 files changed, 238 insertions(+), 156 deletions(-) create mode 100644 products/ASC.Files/Core/ApiModels/ResponseDto/MoveDto.cs diff --git a/products/ASC.Files/Core/ApiModels/ResponseDto/MoveDto.cs b/products/ASC.Files/Core/ApiModels/ResponseDto/MoveDto.cs new file mode 100644 index 00000000000..d17a84b410f --- /dev/null +++ b/products/ASC.Files/Core/ApiModels/ResponseDto/MoveDto.cs @@ -0,0 +1,33 @@ +// (c) Copyright Ascensio System SIA 2010-2022 +// +// This program is a free software product. +// You can redistribute it and/or modify it under the terms +// of the GNU Affero General Public License (AGPL) version 3 as published by the Free Software +// Foundation. In accordance with Section 7(a) of the GNU AGPL its Section 15 shall be amended +// to the effect that Ascensio System SIA expressly excludes the warranty of non-infringement of +// any third-party rights. +// +// This program is distributed WITHOUT ANY WARRANTY, without even the implied warranty +// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For details, see +// the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html +// +// You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021. +// +// The interactive user interfaces in modified source and object code versions of the Program must +// display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3. +// +// Pursuant to Section 7(b) of the License you must retain the original Product logo when +// distributing the program. Pursuant to Section 7(e) we decline to grant you any rights under +// trademark law for use of our trademarks. +// +// All the Product's GUI elements, including illustrations and icon sets, as well as technical writing +// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 +// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + +namespace ASC.Files.Core.ApiModels.ResponseDto; + +public class MoveDto +{ + public FileEntryDto EntryFrom { get; set; } + public FileEntryDto EntryTo { get; set; } +} diff --git a/products/ASC.Files/Core/Core/Dao/Interfaces/IFolderDao.cs b/products/ASC.Files/Core/Core/Dao/Interfaces/IFolderDao.cs index 0f27b530de2..1d0ee0ac204 100644 --- a/products/ASC.Files/Core/Core/Dao/Interfaces/IFolderDao.cs +++ b/products/ASC.Files/Core/Core/Dao/Interfaces/IFolderDao.cs @@ -65,7 +65,7 @@ IAsyncEnumerable> GetRoomsAsync(IEnumerable parentsIds, IEnumerable IAsyncEnumerable> GetFakeRoomsAsync(IEnumerable parentsIds, FilterType filterType, IEnumerable tags, Guid subjectId, string searchText, bool withSubfolders, bool withoutTags, bool excludeSubject, ProviderFilter provider, SubjectFilter subjectFilter, IEnumerable subjectEntriesIds); - + IAsyncEnumerable> GetFakeRoomsAsync(IEnumerable parentsIds, IEnumerable roomsIds, FilterType filterType, IEnumerable tags, Guid subjectId, string searchText, bool withSubfolders, bool withoutTags, bool excludeSubject, ProviderFilter provider, SubjectFilter subjectFilter, IEnumerable subjectEntriesIds); @@ -88,7 +88,7 @@ IAsyncEnumerable> GetFakeRoomsAsync(IEnumerable parentsIds, IEnumer /// /// /// - IAsyncEnumerable> GetFoldersAsync(T parentId, OrderBy orderBy, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, + IAsyncEnumerable> GetFoldersAsync(T parentId, OrderBy orderBy, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool withSubfolders = false, bool exludeSubject = false, int offset = 0, int count = -1); /// @@ -154,10 +154,10 @@ IAsyncEnumerable> GetFoldersAsync(T parentId, OrderBy orderBy, FilterT /// /// Returns pair of file ID, file name, in which the same name. /// - Task> CanMoveOrCopyAsync(T[] folderIds, T to); - Task> CanMoveOrCopyAsync(T[] folderIds, TTo to); - Task> CanMoveOrCopyAsync(T[] folderIds, string to); - Task> CanMoveOrCopyAsync(T[] folderIds, int to); + Task> CanMoveOrCopyAsync(T[] folderIds, T to); + Task> CanMoveOrCopyAsync(T[] folderIds, TTo to); + Task> CanMoveOrCopyAsync(T[] folderIds, string to); + Task> CanMoveOrCopyAsync(T[] folderIds, int to); /// /// Rename folder @@ -216,7 +216,7 @@ IDataWriteOperator CreateDataWriteOperator( T folderId, CommonChunkedUploadSession chunkedUploadSession, CommonChunkedUploadSessionHolder sessionHolder); - + #region Only for TMFolderDao diff --git a/products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs b/products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs index 6a3340b165c..36e90cac2ef 100644 --- a/products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs +++ b/products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs @@ -239,7 +239,7 @@ public async Task GetFoldersCountAsync(int parentId, FilterType filterType, { return 0; } - + var filesDbContext = _dbContextFactory.CreateDbContext(); if (filterType == FilterType.None && subjectId == default && string.IsNullOrEmpty(searchText) && !withSubfolders && !excludeSubject) @@ -252,7 +252,7 @@ public async Task GetFoldersCountAsync(int parentId, FilterType filterType, return await q.CountAsync(); } - public async IAsyncEnumerable> GetFoldersAsync(int parentId, OrderBy orderBy, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool withSubfolders = false, + public async IAsyncEnumerable> GetFoldersAsync(int parentId, OrderBy orderBy, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool withSubfolders = false, bool excludeSubject = false, int offset = 0, int count = -1) { if (CheckInvalidFilter(filterType) || count == 0) @@ -783,29 +783,34 @@ public async Task> CopyFolderAsync(int folderId, string toFolderI return moved; } - public Task> CanMoveOrCopyAsync(int[] folderIds, TTo to) + public async Task> CanMoveOrCopyAsync(int[] folderIds, TTo to) { if (to is int tId) { - return CanMoveOrCopyAsync(folderIds, tId); + return await CanMoveOrCopyAsync(folderIds, tId); } if (to is string tsId) { - return CanMoveOrCopyAsync(folderIds, tsId); + return await CanMoveOrCopyAsync(folderIds, tsId); } throw new NotImplementedException(); } - public Task> CanMoveOrCopyAsync(int[] folderIds, string to) + public Task> CanMoveOrCopyAsync(int[] folderIds, string to) { - return Task.FromResult((IDictionary)new Dictionary()); + return Task.FromResult((IDictionary)new Dictionary()); } - public async Task> CanMoveOrCopyAsync(int[] folderIds, int to) + public async Task> CanMoveOrCopyAsync(int[] folderIds, int to) { - var result = new Dictionary(); + if (typeof(TTo) == typeof(string)) + { + return new Dictionary(); + } + + var result = new Dictionary(); using var filesDbContext = _dbContextFactory.CreateDbContext(); @@ -846,7 +851,7 @@ public async Task> CanMoveOrCopyAsync(int[] folderIds, foreach (var file in files) { - result[file.Id] = file.Title; + result[file.Id] = (TTo)Convert.ChangeType(conflict, typeof(TTo)); } var childs = await Query(filesDbContext.Folders) @@ -857,7 +862,7 @@ public async Task> CanMoveOrCopyAsync(int[] folderIds, foreach (var pair in await CanMoveOrCopyAsync(childs, conflict)) { - result.Add(pair.Key, pair.Value); + result.Add(pair.Key, (TTo)Convert.ChangeType(pair.Value, typeof(TTo))); } } } @@ -1493,7 +1498,7 @@ public IAsyncEnumerable> GetFakeRoomsAsync(IEnumerable parentsI if (rootFolderType != FolderType.VirtualRooms && rootFolderType != FolderType.Archive) { - return (-1,""); + return (-1, ""); } var rootFolderId = Convert.ToInt32(fileEntry.RootId); @@ -1510,14 +1515,14 @@ public IAsyncEnumerable> GetFakeRoomsAsync(IEnumerable parentsI { return (entryId, fileEntry.Title); } - + using var filesDbContext = _dbContextFactory.CreateDbContext(); var parentFolders = await filesDbContext.Tree .Join(filesDbContext.Folders, r => r.ParentId, s => s.Id, (t, f) => new { Tree = t, Folders = f }) .Where(r => r.Tree.FolderId == folderId) .OrderByDescending(r => r.Tree.Level) - .Select(r => new { r.Tree.ParentId, r.Folders.Title}) + .Select(r => new { r.Tree.ParentId, r.Folders.Title }) .ToListAsync(); if (parentFolders.Count > 1) @@ -1691,7 +1696,7 @@ public IDataWriteOperator CreateDataWriteOperator( { return _globalStore.GetStore().CreateDataWriteOperator(chunkedUploadSession, sessionHolder); } - + private IQueryable GetFoldersQueryWithFilters(int parentId, OrderBy orderBy, bool subjectGroup, Guid subjectId, string searchText, bool withSubfolders, bool excludeSubject, FilesDbContext filesDbContext) { diff --git a/products/ASC.Files/Core/Core/FileStorageService.cs b/products/ASC.Files/Core/Core/FileStorageService.cs index ac3c6b8a2c3..4b30d96c18d 100644 --- a/products/ASC.Files/Core/Core/FileStorageService.cs +++ b/products/ASC.Files/Core/Core/FileStorageService.cs @@ -1994,46 +1994,71 @@ public List BulkDownload(Dictionary fo return _fileOperationsManager.Download(_authContext.CurrentAccount.ID, _tenantManager.GetCurrentTenant(), folders, files, GetHttpHeaders()); } - public async Task<(List, List)> MoveOrCopyFilesCheckAsync(List filesId, List foldersId, T1 destFolderId) + public async Task<((List, List), (List, List))> MoveOrCopyFilesCheckAsync(List filesId, List foldersId, T1 destFolderId) { var (folderIntIds, folderStringIds) = FileOperationsManager.GetIds(foldersId); var (fileIntIds, fileStringIds) = FileOperationsManager.GetIds(filesId); var checkedFiles = new List(); + var conflictFiles = new List(); var checkedFolders = new List(); + var conflictFolders = new List(); + + var (filesInts, conflictFilesInts) = await MoveOrCopyFilesCheckFullAsync(fileIntIds, destFolderId); + var (fileString, conflictfileString) = await MoveOrCopyFilesCheckFullAsync(fileStringIds, destFolderId); - var (filesInts, folderInts) = await MoveOrCopyFilesCheckAsync(fileIntIds, folderIntIds, destFolderId); foreach (var i in filesInts) { checkedFiles.Add(i); } + foreach (var i in conflictFilesInts) + { + conflictFiles.Add(i); + } + + foreach (var i in fileString) + { + checkedFiles.Add(i); + } + + foreach (var i in conflictfileString) + { + conflictFiles.Add(i); + } + + var (folderInts, conflictFolderInts) = await MoveOrCopyFoldersCheckFullAsync(folderIntIds, destFolderId); + var (folderString, conflictFolderString) = await MoveOrCopyFoldersCheckFullAsync(folderStringIds, destFolderId); + + foreach (var i in folderInts) { checkedFolders.Add(i); } - var (filesStrings, folderStrings) = await MoveOrCopyFilesCheckAsync(fileStringIds, folderStringIds, destFolderId); - - foreach (var i in filesStrings) + foreach (var i in conflictFolderInts) { - checkedFiles.Add(i); + conflictFolders.Add(i); } - foreach (var i in folderStrings) + foreach (var i in folderString) { checkedFolders.Add(i); } - return (checkedFiles, checkedFolders); + foreach (var i in conflictFolderString) + { + conflictFolders.Add(i); + } + + return ((checkedFiles, conflictFiles), (checkedFolders, conflictFolders)); } - private async Task<(List, List)> MoveOrCopyFilesCheckAsync(IEnumerable filesId, IEnumerable foldersId, TTo destFolderId) + private async Task<(List, List)> MoveOrCopyFilesCheckFullAsync(IEnumerable filesId, TTo destFolderId) { var checkedFiles = new List(); - var checkedFolders = new List(); - var folderDao = _daoFactory.GetFolderDao(); + var destFiles = new List(); var fileDao = _daoFactory.GetFileDao(); var destFolderDao = _daoFactory.GetFolderDao(); var destFileDao = _daoFactory.GetFileDao(); @@ -2045,40 +2070,41 @@ public List BulkDownload(Dictionary fo foreach (var id in filesId) { var file = await fileDao.GetFileAsync(id); + var destFile = await destFileDao.GetFileAsync(toFolder.Id, file.Title); if (file != null && !file.Encrypted - && await destFileDao.IsExistAsync(file.Title, toFolder.Id)) + && destFile != null) { checkedFiles.Add(id); + destFiles.Add(destFile.Id); } } - var folders = folderDao.GetFoldersAsync(foldersId); - var foldersProject = folders.Where(folder => folder.FolderType == FolderType.BUNCH); - var toSubfolders = destFolderDao.GetFoldersAsync(toFolder.Id); + return (checkedFiles, destFiles); + } - await foreach (var folderProject in foldersProject) - { - var toSub = await toSubfolders.FirstOrDefaultAsync(to => Equals(to.Title, folderProject.Title)); - if (toSub == null) - { - continue; - } + private async Task<(List, List)> MoveOrCopyFoldersCheckFullAsync(IEnumerable foldersId, TTo destFolderId) + { + var checkedFolders = new List(); + var destFolders = new List(); + var folderDao = _daoFactory.GetFolderDao(); + var destFolderDao = _daoFactory.GetFolderDao(); - var filesPr = fileDao.GetFilesAsync(folderProject.Id).ToListAsync(); - var foldersTmp = folderDao.GetFoldersAsync(folderProject.Id); - var foldersPr = foldersTmp.Select(d => d.Id).ToListAsync(); + var toFolder = await destFolderDao.GetFolderAsync(destFolderId); + ErrorIf(toFolder == null, FilesCommonResource.ErrorMassage_FolderNotFound); + ErrorIf(!await _fileSecurity.CanCreateAsync(toFolder), FilesCommonResource.ErrorMassage_SecurityException_Create); - var (cFiles, cFolders) = await MoveOrCopyFilesCheckAsync(await filesPr, await foldersPr, toSub.Id); - checkedFiles.AddRange(cFiles); - checkedFolders.AddRange(cFolders); - } + var folders = folderDao.GetFoldersAsync(foldersId); + var foldersProject = folders.Where(folder => folder.FolderType == FolderType.BUNCH); + var toSubfolders = destFolderDao.GetFoldersAsync(toFolder.Id); try { foreach (var pair in await folderDao.CanMoveOrCopyAsync(foldersId.ToArray(), toFolder.Id)) { checkedFolders.Add(pair.Key); + destFolders.Add(pair.Value); + //TODO: checkFiles } } catch (Exception e) @@ -2086,7 +2112,7 @@ public List BulkDownload(Dictionary fo throw GenerateException(e); } - return (checkedFiles, checkedFolders); + return (checkedFolders, destFolders); } public List MoveOrCopyItems(List foldersId, List filesId, JsonElement destFolderId, FileConflictResolveType resolve, bool ic, bool deleteAfter = false) diff --git a/products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs b/products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs index fac61257992..d8bad43d373 100644 --- a/products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs +++ b/products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs @@ -99,10 +99,10 @@ public async IAsyncEnumerable> GetRoomsAsync(IEnumerable rooms = FilterByTags(rooms, withoutTags, tags, filesDbContext); await foreach (var room in rooms) - { + { yield return room; } - } + } public async IAsyncEnumerable> GetFoldersAsync(string parentId) { @@ -113,7 +113,7 @@ public async IAsyncEnumerable> GetFoldersAsync(string parentId) } } - public IAsyncEnumerable> GetFoldersAsync(string parentId, OrderBy orderBy, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, + public IAsyncEnumerable> GetFoldersAsync(string parentId, OrderBy orderBy, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool withSubfolders = false, bool excludeSubject = false, int offset = 0, int count = -1) { if (CheckInvalidFilter(filterType)) @@ -413,29 +413,29 @@ public async Task> CopyFolderAsync(string folderId, int toFolderId, return moved; } - public Task> CanMoveOrCopyAsync(string[] folderIds, TTo to) + public async Task> CanMoveOrCopyAsync(string[] folderIds, TTo to) { if (to is int tId) { - return CanMoveOrCopyAsync(folderIds, tId); + return await CanMoveOrCopyAsync(folderIds, tId); } if (to is string tsId) { - return CanMoveOrCopyAsync(folderIds, tsId); + return await CanMoveOrCopyAsync(folderIds, tsId); } throw new NotImplementedException(); } - public Task> CanMoveOrCopyAsync(string[] folderIds, string to) + public Task> CanMoveOrCopyAsync(string[] folderIds, string to) { - return Task.FromResult((IDictionary)new Dictionary()); + return Task.FromResult((IDictionary)new Dictionary()); } - public Task> CanMoveOrCopyAsync(string[] folderIds, int to) + public Task> CanMoveOrCopyAsync(string[] folderIds, int to) { - return Task.FromResult((IDictionary)new Dictionary()); + return Task.FromResult((IDictionary)new Dictionary()); } public async Task RenameFolderAsync(Folder folder, string newTitle) diff --git a/products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs b/products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs index 285fb43f6e5..d50b142281b 100644 --- a/products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs +++ b/products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs @@ -101,10 +101,10 @@ public async IAsyncEnumerable> GetRoomsAsync(IEnumerable rooms = FilterByTags(rooms, withoutTags, tags, filesDbContext); await foreach (var room in rooms) - { + { yield return room; } - } + } public async IAsyncEnumerable> GetFoldersAsync(string parentId) { @@ -115,7 +115,7 @@ public async IAsyncEnumerable> GetFoldersAsync(string parentId) } } - public IAsyncEnumerable> GetFoldersAsync(string parentId, OrderBy orderBy, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, + public IAsyncEnumerable> GetFoldersAsync(string parentId, OrderBy orderBy, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool withSubfolders = false, bool excludeSubject = false, int offset = 0, int count = -1) { if (CheckInvalidFilter(filterType)) @@ -407,29 +407,29 @@ public async Task> CopyFolderAsync(string folderId, string toFold return ToFolder(newDropboxFolder); } - public Task> CanMoveOrCopyAsync(string[] folderIds, TTo to) + public async Task> CanMoveOrCopyAsync(string[] folderIds, TTo to) { if (to is int tId) { - return CanMoveOrCopyAsync(folderIds, tId); + return await CanMoveOrCopyAsync(folderIds, tId); } if (to is string tsId) { - return CanMoveOrCopyAsync(folderIds, tsId); + return await CanMoveOrCopyAsync(folderIds, tsId); } throw new NotImplementedException(); } - public Task> CanMoveOrCopyAsync(string[] folderIds, string to) + public Task> CanMoveOrCopyAsync(string[] folderIds, string to) { - return Task.FromResult((IDictionary)new Dictionary()); + return Task.FromResult((IDictionary)new Dictionary()); } - public Task> CanMoveOrCopyAsync(string[] folderIds, int to) + public Task> CanMoveOrCopyAsync(string[] folderIds, int to) { - return Task.FromResult((IDictionary)new Dictionary()); + return Task.FromResult((IDictionary)new Dictionary()); } public async Task RenameFolderAsync(Folder folder, string newTitle) diff --git a/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs b/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs index 6c51a3b2294..88730456c02 100644 --- a/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs +++ b/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs @@ -98,10 +98,10 @@ public async IAsyncEnumerable> GetRoomsAsync(IEnumerable rooms = FilterByTags(rooms, withoutTags, tags, filesDbContext); await foreach (var room in rooms) - { + { yield return room; } - } + } public async IAsyncEnumerable> GetFoldersAsync(string parentId) { @@ -113,7 +113,7 @@ public async IAsyncEnumerable> GetFoldersAsync(string parentId) } } - public IAsyncEnumerable> GetFoldersAsync(string parentId, OrderBy orderBy, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, + public IAsyncEnumerable> GetFoldersAsync(string parentId, OrderBy orderBy, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool withSubfolders = false, bool excludeSubject = false, int offset = 0, int count = -1) { if (CheckInvalidFilter(filterType)) @@ -406,29 +406,29 @@ public async Task> CopyFolderAsync(string folderId, string toFold return ToFolder(newDriveFolder); } - public Task> CanMoveOrCopyAsync(string[] folderIds, TTo to) + public async Task> CanMoveOrCopyAsync(string[] folderIds, TTo to) { if (to is int tId) { - return CanMoveOrCopyAsync(folderIds, tId); + return await CanMoveOrCopyAsync(folderIds, tId); } if (to is string tsId) { - return CanMoveOrCopyAsync(folderIds, tsId); + return await CanMoveOrCopyAsync(folderIds, tsId); } throw new NotImplementedException(); } - public Task> CanMoveOrCopyAsync(string[] folderIds, string to) + public Task> CanMoveOrCopyAsync(string[] folderIds, string to) { - return Task.FromResult((IDictionary)new Dictionary()); + return Task.FromResult((IDictionary)new Dictionary()); } - public Task> CanMoveOrCopyAsync(string[] folderIds, int to) + public Task> CanMoveOrCopyAsync(string[] folderIds, int to) { - return Task.FromResult((IDictionary)new Dictionary()); + return Task.FromResult((IDictionary)new Dictionary()); } public async Task RenameFolderAsync(Folder folder, string newTitle) @@ -517,6 +517,6 @@ public IDataWriteOperator CreateDataWriteOperator( CommonChunkedUploadSession chunkedUploadSession, CommonChunkedUploadSessionHolder sessionHolder) { - return new ChunkZipWriteOperator(_tempStream ,chunkedUploadSession, sessionHolder); + return new ChunkZipWriteOperator(_tempStream, chunkedUploadSession, sessionHolder); } } diff --git a/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs b/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs index 38eafd3872a..8ef09e3b6ad 100644 --- a/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs +++ b/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs @@ -95,10 +95,10 @@ public async IAsyncEnumerable> GetRoomsAsync(IEnumerable rooms = FilterByTags(rooms, withoutTags, tags, filesDbContext); await foreach (var room in rooms) - { + { yield return room; } - } + } public async IAsyncEnumerable> GetFoldersAsync(string parentId) { @@ -110,7 +110,7 @@ public async IAsyncEnumerable> GetFoldersAsync(string parentId) } } - public IAsyncEnumerable> GetFoldersAsync(string parentId, OrderBy orderBy, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, + public IAsyncEnumerable> GetFoldersAsync(string parentId, OrderBy orderBy, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool withSubfolders = false, bool excludeSubject = false, int offset = 0, int count = -1) { if (CheckInvalidFilter(filterType)) @@ -409,29 +409,29 @@ public async Task> CopyFolderAsync(string folderId, string toFold return ToFolder(newOneDriveFolder); } - public Task> CanMoveOrCopyAsync(string[] folderIds, TTo to) + public async Task> CanMoveOrCopyAsync(string[] folderIds, TTo to) { if (to is int tId) { - return CanMoveOrCopyAsync(folderIds, tId); + return await CanMoveOrCopyAsync(folderIds, tId); } if (to is string tsId) { - return CanMoveOrCopyAsync(folderIds, tsId); + return await CanMoveOrCopyAsync(folderIds, tsId); } throw new NotImplementedException(); } - public Task> CanMoveOrCopyAsync(string[] folderIds, string to) + public Task> CanMoveOrCopyAsync(string[] folderIds, string to) { - return Task.FromResult((IDictionary)new Dictionary()); + return Task.FromResult((IDictionary)new Dictionary()); } - public Task> CanMoveOrCopyAsync(string[] folderIds, int to) + public Task> CanMoveOrCopyAsync(string[] folderIds, int to) { - return Task.FromResult((IDictionary)new Dictionary()); + return Task.FromResult((IDictionary)new Dictionary()); } public async Task RenameFolderAsync(Folder folder, string newTitle) diff --git a/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs b/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs index 8799eb29397..9acda97c82a 100644 --- a/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs +++ b/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs @@ -41,10 +41,10 @@ public ProviderFolderDao( TenantManager tenantManager, SecurityDao securityDao, TagDao tagDao, - CrossDao crossDao, - GlobalFolderHelper globalFolderHelper, - IProviderDao providerDao, - IDbContextFactory dbContextFactory, + CrossDao crossDao, + GlobalFolderHelper globalFolderHelper, + IProviderDao providerDao, + IDbContextFactory dbContextFactory, AuthContext authContext) : base(serviceProvider, tenantManager, securityDao, tagDao, crossDao) { @@ -127,7 +127,7 @@ public IAsyncEnumerable> GetRoomsAsync(IEnumerable parent return result.Distinct(); } - public override async IAsyncEnumerable> GetFakeRoomsAsync(IEnumerable parentsIds, FilterType filterType, IEnumerable tags, Guid subjectId, + public override async IAsyncEnumerable> GetFakeRoomsAsync(IEnumerable parentsIds, FilterType filterType, IEnumerable tags, Guid subjectId, string searchText, bool withSubfolders, bool withoutTags, bool excludeSubject, ProviderFilter provider, SubjectFilter subjectFilter, IEnumerable subjectEntriesIds) { var virtualRoomsFolderId = await _globalFolderHelper.GetFolderVirtualRooms(); @@ -181,7 +181,7 @@ public IAsyncEnumerable> GetFoldersAsync(string parentId) return folders.Where(r => r != null); } - public async IAsyncEnumerable> GetFoldersAsync(string parentId, OrderBy orderBy, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, + public async IAsyncEnumerable> GetFoldersAsync(string parentId, OrderBy orderBy, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool withSubfolders = false, bool excludeSubject = false, int offset = 0, int count = -1) { var selector = GetSelector(parentId); @@ -343,31 +343,31 @@ public async Task> CopyFolderAsync(string folderId, string toFold : await folderDao.CopyFolderAsync(selector.ConvertId(folderId), selector.ConvertId(toFolderId), null); } - public Task> CanMoveOrCopyAsync(string[] folderIds, TTo to) + public async Task> CanMoveOrCopyAsync(string[] folderIds, TTo to) { if (to is int tId) { - return CanMoveOrCopyAsync(folderIds, tId); + return await CanMoveOrCopyAsync(folderIds, tId); } if (to is string tsId) { - return CanMoveOrCopyAsync(folderIds, tsId); + return await CanMoveOrCopyAsync(folderIds, tsId); } throw new NotImplementedException(); } - public Task> CanMoveOrCopyAsync(string[] folderIds, int to) + public Task> CanMoveOrCopyAsync(string[] folderIds, int to) { - return Task.FromResult((IDictionary)new Dictionary()); + return Task.FromResult((IDictionary)new Dictionary()); } - public Task> CanMoveOrCopyAsync(string[] folderIds, string to) + public Task> CanMoveOrCopyAsync(string[] folderIds, string to) { if (folderIds.Length == 0) { - return Task.FromResult>(new Dictionary()); + return Task.FromResult>(new Dictionary()); } var selector = GetSelector(to); @@ -375,17 +375,17 @@ public Task> CanMoveOrCopyAsync(string[] folderIds, if (matchedIds.Length == 0) { - return Task.FromResult>(new Dictionary()); + return Task.FromResult>(new Dictionary()); } - return InternalCanMoveOrCopyAsync(to, matchedIds, selector); + return InternalCanMoveOrCopyAsync(to, matchedIds, selector); } - private Task> InternalCanMoveOrCopyAsync(string to, string[] matchedIds, IDaoSelector selector) + private Task> InternalCanMoveOrCopyAsync(string to, string[] matchedIds, IDaoSelector selector) { var folderDao = selector.GetFolderDao(matchedIds.FirstOrDefault()); - return folderDao.CanMoveOrCopyAsync(matchedIds, to); + return folderDao.CanMoveOrCopyAsync(matchedIds, to); } public Task RenameFolderAsync(Folder folder, string newTitle) @@ -501,7 +501,7 @@ private IAsyncEnumerable> FilterByProvider(IAsyncEnumerable providerKey == x.ProviderKey); } - + private async IAsyncEnumerable GetProvidersAsync(IEnumerable parentsIds, string virtualRoomsFolderId, string archiveFolderId) { IAsyncEnumerable providers; @@ -525,11 +525,11 @@ private async IAsyncEnumerable GetProvidersAsync(IEnumerable ToFakeRoom(IProviderInfo providerInfo, string roomsFolderId, string archiveFolderId) { var rootId = providerInfo.RootFolderType == FolderType.VirtualRooms ? roomsFolderId : archiveFolderId; - + var folder = _serviceProvider.GetRequiredService>(); folder.Id = providerInfo.FolderId; folder.ParentId = rootId; diff --git a/products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs b/products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs index bda780499fe..273f6e6fed3 100644 --- a/products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs +++ b/products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs @@ -101,10 +101,10 @@ public async IAsyncEnumerable> GetRoomsAsync(IEnumerable rooms = FilterByTags(rooms, withoutTags, tags, filesDbContext); await foreach (var room in rooms) - { + { yield return room; } - } + } public async IAsyncEnumerable> GetFoldersAsync(string parentId) { @@ -116,7 +116,7 @@ public async IAsyncEnumerable> GetFoldersAsync(string parentId) } } - public IAsyncEnumerable> GetFoldersAsync(string parentId, OrderBy orderBy, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, + public IAsyncEnumerable> GetFoldersAsync(string parentId, OrderBy orderBy, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool withSubfolders = false, bool excludeSubject = false, int offset = 0, int count = -1) { if (CheckInvalidFilter(filterType)) @@ -346,29 +346,29 @@ public async Task> CopyFolderAsync(string folderId, int toFolderId, return moved; } - public Task> CanMoveOrCopyAsync(string[] folderIds, TTo to) + public async Task> CanMoveOrCopyAsync(string[] folderIds, TTo to) { if (to is int tId) { - return CanMoveOrCopyAsync(folderIds, tId); + return await CanMoveOrCopyAsync(folderIds, tId); } if (to is string tsId) { - return CanMoveOrCopyAsync(folderIds, tsId); + return await CanMoveOrCopyAsync(folderIds, tsId); } throw new NotImplementedException(); } - public Task> CanMoveOrCopyAsync(string[] folderIds, string to) + public Task> CanMoveOrCopyAsync(string[] folderIds, string to) { - return Task.FromResult((IDictionary)new Dictionary()); + return Task.FromResult((IDictionary)new Dictionary()); } - public Task> CanMoveOrCopyAsync(string[] folderIds, int to) + public Task> CanMoveOrCopyAsync(string[] folderIds, int to) { - return Task.FromResult((IDictionary)new Dictionary()); + return Task.FromResult((IDictionary)new Dictionary()); } public async Task RenameFolderAsync(Folder folder, string newTitle) @@ -391,10 +391,10 @@ public async Task RenameFolderAsync(Folder folder, string newTit if (ProviderInfo.FolderId == oldId) { - await DaoSelector.UpdateProviderFolderId(ProviderInfo, newFolderId); + await DaoSelector.UpdateProviderFolderId(ProviderInfo, newFolderId); + } } } - } await UpdatePathInDBAsync(oldId, newFolderId); diff --git a/products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs b/products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs index 5b2d0df0da0..d8b2dc3e0a8 100644 --- a/products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs +++ b/products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs @@ -101,10 +101,10 @@ public async IAsyncEnumerable> GetRoomsAsync(IEnumerable rooms = FilterByTags(rooms, withoutTags, tags, filesDbContext); await foreach (var room in rooms) - { + { yield return room; } - } + } public IAsyncEnumerable> GetFoldersAsync(string parentId) { @@ -113,7 +113,7 @@ public IAsyncEnumerable> GetFoldersAsync(string parentId) return parentFolder.OfType().Select(ToFolder).ToAsyncEnumerable(); } - public IAsyncEnumerable> GetFoldersAsync(string parentId, OrderBy orderBy, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, + public IAsyncEnumerable> GetFoldersAsync(string parentId, OrderBy orderBy, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool withSubfolders = false, bool excludeSubject = false, int offset = 0, int count = -1) { if (CheckInvalidFilter(filterType)) @@ -393,29 +393,29 @@ public Task> CopyFolderAsync(string folderId, string toFolderId, return Task.FromResult(ToFolder(GetFolderById(toFolderId).OfType().FirstOrDefault(x => x.Name == folder.Name))); } - public Task> CanMoveOrCopyAsync(string[] folderIds, TTo to) + public async Task> CanMoveOrCopyAsync(string[] folderIds, TTo to) { if (to is int tId) { - return CanMoveOrCopyAsync(folderIds, tId); + return await CanMoveOrCopyAsync(folderIds, tId); } if (to is string tsId) { - return CanMoveOrCopyAsync(folderIds, tsId); + return await CanMoveOrCopyAsync(folderIds, tsId); } throw new NotImplementedException(); } - public Task> CanMoveOrCopyAsync(string[] folderIds, string to) + public Task> CanMoveOrCopyAsync(string[] folderIds, string to) { - return Task.FromResult((IDictionary)new Dictionary()); + return Task.FromResult((IDictionary)new Dictionary()); } - public Task> CanMoveOrCopyAsync(string[] folderIds, int to) + public Task> CanMoveOrCopyAsync(string[] folderIds, int to) { - return Task.FromResult((IDictionary)new Dictionary()); + return Task.FromResult((IDictionary)new Dictionary()); } public async Task RenameFolderAsync(Folder folder, string newTitle) @@ -450,11 +450,11 @@ public async Task RenameFolderAsync(Folder folder, string newTit if (ProviderInfo.FolderId == oldId) { - await DaoSelector.UpdateProviderFolderId(ProviderInfo, newId); + await DaoSelector.UpdateProviderFolderId(ProviderInfo, newId); + } } } } - } await UpdatePathInDBAsync(oldId, newId); diff --git a/products/ASC.Files/Server/Api/OperationController.cs b/products/ASC.Files/Server/Api/OperationController.cs index 1616c79217c..e2bb261ac79 100644 --- a/products/ASC.Files/Server/Api/OperationController.cs +++ b/products/ASC.Files/Server/Api/OperationController.cs @@ -199,42 +199,60 @@ public async IAsyncEnumerable MoveBatchItems(BatchRequestDto i /// Conflicts file ids [HttpGet("fileops/move")] public async IAsyncEnumerable MoveOrCopyBatchCheckAsync([ModelBinder(BinderType = typeof(BatchModelBinder))] BatchRequestDto inDto) + { + await foreach (var e in MoveOrCopyBatchCheckFullAsync(inDto)) + { + yield return e.EntryFrom; + } + } + + /// false + [HttpGet("fileops/move/full")] + public async IAsyncEnumerable MoveOrCopyBatchCheckFullAsync([ModelBinder(BinderType = typeof(BatchModelBinder))] BatchRequestDto inDto) { - List checkedFiles; - List checkedFolders; + var checkedFiles = new List(); + var conflictFiles = new List(); + var checkedFolders = new List(); + var conflictFolders = new List(); if (inDto.DestFolderId.ValueKind == JsonValueKind.Number) { - (checkedFiles, checkedFolders) = await _fileStorageServiceString.MoveOrCopyFilesCheckAsync(inDto.FileIds.ToList(), inDto.FolderIds.ToList(), inDto.DestFolderId.GetInt32()); + ((checkedFiles, conflictFiles), (checkedFolders, conflictFolders)) = await _fileStorageServiceString.MoveOrCopyFilesCheckAsync(inDto.FileIds.ToList(), inDto.FolderIds.ToList(), inDto.DestFolderId.GetInt32()); } else { - (checkedFiles, checkedFolders) = await _fileStorageServiceString.MoveOrCopyFilesCheckAsync(inDto.FileIds.ToList(), inDto.FolderIds.ToList(), inDto.DestFolderId.GetString()); + ((checkedFiles, conflictFiles), (checkedFolders, conflictFolders)) = await _fileStorageServiceString.MoveOrCopyFilesCheckAsync(inDto.FileIds.ToList(), inDto.FolderIds.ToList(), inDto.DestFolderId.GetString()); } var entries = await _fileStorageServiceString.GetItemsAsync(checkedFiles.OfType().Select(Convert.ToInt32), checkedFiles.OfType().Select(Convert.ToInt32), FilterType.FilesOnly, false, "", ""); + entries.AddRange(await _fileStorageServiceString.GetItemsAsync(checkedFiles.OfType(), checkedFiles.OfType(), FilterType.FilesOnly, false, "", "")); + - entries.AddRange(await _fileStorageServiceString.GetItemsAsync(checkedFiles.OfType(), checkedFiles.OfType(), FilterType.FilesOnly, false, "", "")); + var conflictEntries = await _fileStorageServiceString.GetItemsAsync(checkedFiles.OfType().Select(Convert.ToInt32), checkedFiles.OfType().Select(Convert.ToInt32), FilterType.FilesOnly, false, "", ""); + conflictEntries.AddRange(await _fileStorageServiceString.GetItemsAsync(checkedFiles.OfType(), checkedFiles.OfType(), FilterType.FilesOnly, false, "", "")); - foreach (var e in entries) - { - yield return await GetFileEntryWrapperAsync(e); - } - } + for (var i = 0; i < entries.Count; i++) + { + var entry = entries[i]; + var conflictEntry = conflictEntries[i]; + yield return new MoveDto() { EntryFrom = await GetFileEntryWrapperAsync(entry), EntryTo = await GetFileEntryWrapperAsync(conflictEntry) }; + } + } + /// /// Finishes all the active file operations /// /// Finish all /// File operations /// Operation result - [HttpPut("fileops/terminate")] - public async IAsyncEnumerable TerminateTasks() - { - var tasks = _fileStorageServiceString.TerminateTasks(); - - foreach (var e in tasks) - { - yield return await _fileOperationDtoHelper.GetAsync(e); - } + [HttpPut("fileops/terminate")] + public async IAsyncEnumerable TerminateTasks() + { + var tasks = _fileStorageServiceString.TerminateTasks(); + + foreach (var e in tasks) + { + yield return await _fileOperationDtoHelper.GetAsync(e); + } } } \ No newline at end of file From ccf13cf375e8bd15a59bb58114b72eb10a11a48d Mon Sep 17 00:00:00 2001 From: pavelbannov Date: Tue, 25 Jul 2023 19:25:51 +0300 Subject: [PATCH 19/30] fix Bug 63454 --- .../GoogleDrive/GoogleDriveStorage.cs | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs b/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs index 0ddf903eb87..cb92054a93e 100644 --- a/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs +++ b/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs @@ -603,18 +603,19 @@ private async Task InternalTransferAsync(ResumableUploadSession googleDriveSessi request.Content = new StreamContent(stream); if (googleDriveSession.BytesToTransfer > 0) { - request.Headers.Add("Content-Range", string.Format("bytes {0}-{1}/{2}", - googleDriveSession.BytesTransfered, - googleDriveSession.BytesTransfered + chunkLength - 1, - googleDriveSession.BytesToTransfer)); + request.Content.Headers.ContentRange = new ContentRangeHeaderValue( + googleDriveSession.BytesTransfered, + googleDriveSession.BytesTransfered + chunkLength - 1, + googleDriveSession.BytesToTransfer); } else { var bytesToTransfer = lastChunk ? (googleDriveSession.BytesTransfered + chunkLength).ToString() : "*"; - request.Headers.Add("Content-Range", string.Format("bytes {0}-{1}/{2}", - googleDriveSession.BytesTransfered, - googleDriveSession.BytesTransfered + chunkLength - 1, - bytesToTransfer)); + + request.Content.Headers.ContentRange = new ContentRangeHeaderValue( + googleDriveSession.BytesTransfered, + googleDriveSession.BytesTransfered + chunkLength - 1, + Convert.ToInt64(bytesToTransfer)); } var httpClient = _clientFactory.CreateClient(); HttpResponseMessage response; From 8990e5c07f613a2f167311e8c0a589d886e93cb3 Mon Sep 17 00:00:00 2001 From: Alexey Safronov Date: Wed, 26 Jul 2023 11:10:25 +0400 Subject: [PATCH 20/30] Update yarn.lock --- yarn.lock | 105 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 54 insertions(+), 51 deletions(-) diff --git a/yarn.lock b/yarn.lock index c920ba5f69d..81f3ac2bd91 100644 --- a/yarn.lock +++ b/yarn.lock @@ -97,12 +97,12 @@ __metadata: linkType: hard "@aws-sdk/client-cloudwatch-logs@npm:^3.199.0": - version: 3.370.0 - resolution: "@aws-sdk/client-cloudwatch-logs@npm:3.370.0" + version: 3.377.0 + resolution: "@aws-sdk/client-cloudwatch-logs@npm:3.377.0" dependencies: "@aws-crypto/sha256-browser": 3.0.0 "@aws-crypto/sha256-js": 3.0.0 - "@aws-sdk/client-sts": 3.370.0 + "@aws-sdk/client-sts": 3.377.0 "@aws-sdk/credential-provider-node": 3.370.0 "@aws-sdk/middleware-host-header": 3.370.0 "@aws-sdk/middleware-logger": 3.370.0 @@ -136,7 +136,7 @@ __metadata: "@smithy/util-retry": ^1.0.3 "@smithy/util-utf8": ^1.0.1 tslib: ^2.5.0 - checksum: e3076066e61df8517d443a8770abcac1751970321db9fd68d3c4d82ef98cffb66381c419ecb9e4c363a310bc43913d318f65ffeb76b4c89bf949ef0d9b02827f + checksum: 26be79077a48e26ce105839d6531605dc4cce82197502ab1beccba14d5aebaf021ce486132f22c21c580f7451303bf47b35bb2074489252878d5574bd6c9f67e languageName: node linkType: hard @@ -222,9 +222,9 @@ __metadata: languageName: node linkType: hard -"@aws-sdk/client-sts@npm:3.370.0": - version: 3.370.0 - resolution: "@aws-sdk/client-sts@npm:3.370.0" +"@aws-sdk/client-sts@npm:3.377.0": + version: 3.377.0 + resolution: "@aws-sdk/client-sts@npm:3.377.0" dependencies: "@aws-crypto/sha256-browser": 3.0.0 "@aws-crypto/sha256-js": 3.0.0 @@ -263,7 +263,7 @@ __metadata: "@smithy/util-utf8": ^1.0.1 fast-xml-parser: 4.2.5 tslib: ^2.5.0 - checksum: 55ce8a7a8a8a44cffdbfca10ac2e4d389a4a13e81a4558ef401c3174727296c47375cec5898023e082285aaf5804d62f5d887da53e343f24aec8d8b5bc4ea29b + checksum: 14bdc55b3ba6ad4b6761e1dc8b7904950643b1830987ca6712f2f16a23a95e42fdaf3dbdae0fbfc966e796dbaebede0046fd5234c3a5e5e88a39b77ae0db6cbb languageName: node linkType: hard @@ -2626,12 +2626,6 @@ __metadata: languageName: node linkType: hard -"@docspace/browserslist-config-asc@workspace:packages/browserslist-config-asc": - version: 0.0.0-use.local - resolution: "@docspace/browserslist-config-asc@workspace:packages/browserslist-config-asc" - languageName: unknown - linkType: soft - "@docspace/client@workspace:packages/client": version: 0.0.0-use.local resolution: "@docspace/client@workspace:packages/client" @@ -3141,9 +3135,9 @@ __metadata: linkType: hard "@eslint-community/regexpp@npm:^4.4.0": - version: 4.6.1 - resolution: "@eslint-community/regexpp@npm:4.6.1" - checksum: 5741f457f5cc4ec89389d185c44c511fc85ef3630c6ce033a64c779e72f7aa3a7d5bcdc45d54612989f0dc6ea958438c02d363797b3e4f87952fc6878481da0e + version: 4.6.2 + resolution: "@eslint-community/regexpp@npm:4.6.2" + checksum: a3c341377b46b54fa228f455771b901d1a2717f95d47dcdf40199df30abc000ba020f747f114f08560d119e979d882a94cf46cfc51744544d54b00319c0f2724 languageName: node linkType: hard @@ -3534,12 +3528,12 @@ __metadata: linkType: hard "@grpc/grpc-js@npm:^1.3.2": - version: 1.8.19 - resolution: "@grpc/grpc-js@npm:1.8.19" + version: 1.8.20 + resolution: "@grpc/grpc-js@npm:1.8.20" dependencies: "@grpc/proto-loader": ^0.7.0 "@types/node": ">=12.12.47" - checksum: a1dcda766cf9a2a1c40366a4c1bfcfc8bde29d962651add76e77d091e383e90abbc9a48fcf18bb61b55d8dc3adf0b1316cccdfc7d616011c62f1e08e92b57728 + checksum: 9a18b3b7342b13259567c7fe6161ba1b43d85ee911ed5003939dc392a0575724014978c40e6edb4eedb035126a8d3c66dcf6cb7678153565c2ae77c3bd4b3e97 languageName: node linkType: hard @@ -6606,12 +6600,12 @@ __metadata: linkType: hard "@types/eslint@npm:*": - version: 8.44.0 - resolution: "@types/eslint@npm:8.44.0" + version: 8.44.1 + resolution: "@types/eslint@npm:8.44.1" dependencies: "@types/estree": "*" "@types/json-schema": "*" - checksum: 2655f409a4ecdd64bb9dd9eb6715e7a2ac30c0e7f902b414e10dbe9d6d497baa5a0f13105e1f7bd5ad7a913338e2ab4bed1faf192a7a0d27d1acd45ba79d3f69 + checksum: 8b45be72d3c22a1ee0b1cc7e7fb0e34e32bbf959e6b7e0e46d160c17894aedf159c1db5c85750f10068884c741eebc37a1cc7ea659de23a8df0c9a3203e2ff9d languageName: node linkType: hard @@ -6806,9 +6800,9 @@ __metadata: linkType: hard "@types/lodash@npm:^4.14.167": - version: 4.14.195 - resolution: "@types/lodash@npm:4.14.195" - checksum: 39b75ca635b3fa943d17d3d3aabc750babe4c8212485a4df166fe0516e39288e14b0c60afc6e21913cc0e5a84734633c71e617e2bd14eaa1cf51b8d7799c432e + version: 4.14.196 + resolution: "@types/lodash@npm:4.14.196" + checksum: 201d17c3e62ae02a93c99ec78e024b2be9bd75564dd8fd8c26f6ac51a985ab280d28ce2688c3bcdfe785b0991cd9814edff19ee000234c7b45d9a697f09feb6a languageName: node linkType: hard @@ -6883,9 +6877,9 @@ __metadata: linkType: hard "@types/node@npm:*, @types/node@npm:>=12.12.47, @types/node@npm:>=13.7.0": - version: 20.4.4 - resolution: "@types/node@npm:20.4.4" - checksum: 43f3c4a8acc38ae753e15a0e79bae0447d255b3742fa87f8e065d7b9d20ecb0e03d6c5b46c00d5d26f4552160381a00255f49205595a8ee48c2423e00263c930 + version: 20.4.5 + resolution: "@types/node@npm:20.4.5" + checksum: 36a0304a8dc346a1b2d2edac4c4633eecf70875793d61a5274d0df052d7a7af7a8e34f29884eac4fbd094c4f0201477dcb39c0ecd3307ca141688806538d1138 languageName: node linkType: hard @@ -6897,9 +6891,9 @@ __metadata: linkType: hard "@types/node@npm:^18.6.1": - version: 18.17.0 - resolution: "@types/node@npm:18.17.0" - checksum: 3a43c5c5541342751b514485144818a515fac5427f663066068eaacbe8a108cbe1207aae75ec89d34c3b32414c334aad84e9083cf7fcf3ebfd970adc871314a4 + version: 18.17.1 + resolution: "@types/node@npm:18.17.1" + checksum: 56201bda9a2d05d68602df63b4e67b0545ac8c6d0280bd5fb31701350a978a577a027501fbf49db99bf177f2242ebd1244896bfd35e89042d5bd7dfebff28d4e languageName: node linkType: hard @@ -12065,9 +12059,9 @@ __metadata: linkType: hard "electron-to-chromium@npm:^1.4.431": - version: 1.4.470 - resolution: "electron-to-chromium@npm:1.4.470" - checksum: 0b1749f07b5e97b9d8f805cac6950574017cf2cf19a05cbc3dc46e7397be1d51485a5ece69478e7b12766f4643f45530b6bcebefa8916096a50f6a38dca381ca + version: 1.4.471 + resolution: "electron-to-chromium@npm:1.4.471" + checksum: c62ac1f2e9e0395b3095899c7d07a723611a6ca9bc754935101f9f659d7fc3f564f4e47cacb5639abdc172265db041923679942c72055fc8d6522e1b57f755df languageName: node linkType: hard @@ -16003,13 +15997,13 @@ __metadata: linkType: hard "istanbul-lib-report@npm:^3.0.0": - version: 3.0.0 - resolution: "istanbul-lib-report@npm:3.0.0" + version: 3.0.1 + resolution: "istanbul-lib-report@npm:3.0.1" dependencies: istanbul-lib-coverage: ^3.0.0 - make-dir: ^3.0.0 + make-dir: ^4.0.0 supports-color: ^7.1.0 - checksum: 3f29eb3f53c59b987386e07fe772d24c7f58c6897f34c9d7a296f4000de7ae3de9eb95c3de3df91dc65b134c84dee35c54eee572a56243e8907c48064e34ff1b + checksum: fd17a1b879e7faf9bb1dc8f80b2a16e9f5b7b8498fe6ed580a618c34df0bfe53d2abd35bf8a0a00e628fb7405462576427c7df20bbe4148d19c14b431c974b21 languageName: node linkType: hard @@ -16036,12 +16030,12 @@ __metadata: linkType: hard "istanbul-reports@npm:^3.1.4": - version: 3.1.5 - resolution: "istanbul-reports@npm:3.1.5" + version: 3.1.6 + resolution: "istanbul-reports@npm:3.1.6" dependencies: html-escaper: ^2.0.0 istanbul-lib-report: ^3.0.0 - checksum: 7867228f83ed39477b188ea07e7ccb9b4f5320b6f73d1db93a0981b7414fa4ef72d3f80c4692c442f90fc250d9406e71d8d7ab65bb615cb334e6292b73192b89 + checksum: 44c4c0582f287f02341e9720997f9e82c071627e1e862895745d5f52ec72c9b9f38e1d12370015d2a71dcead794f34c7732aaef3fab80a24bc617a21c3d911d6 languageName: node linkType: hard @@ -17489,6 +17483,15 @@ __metadata: languageName: node linkType: hard +"make-dir@npm:^4.0.0": + version: 4.0.0 + resolution: "make-dir@npm:4.0.0" + dependencies: + semver: ^7.5.3 + checksum: bf0731a2dd3aab4db6f3de1585cea0b746bb73eb5a02e3d8d72757e376e64e6ada190b1eddcde5b2f24a81b688a9897efd5018737d05e02e2a671dda9cff8a8a + languageName: node + linkType: hard + "make-fetch-happen@npm:^11.0.3": version: 11.1.1 resolution: "make-fetch-happen@npm:11.1.1" @@ -20037,23 +20040,23 @@ __metadata: languageName: node linkType: hard -"playwright-core@npm:1.36.1": - version: 1.36.1 - resolution: "playwright-core@npm:1.36.1" +"playwright-core@npm:1.36.2": + version: 1.36.2 + resolution: "playwright-core@npm:1.36.2" bin: playwright-core: cli.js - checksum: bbde807294053b50f0dbbc81f0dacc43fe525830ce1526e6ca74012582dd1645eae2391719cfb020051abea90704057cfabcbfe45ca530b37becc491e9459790 + checksum: 2193ce802ef93c28b9b5e11a0b1d7b60778c686015659978d1cbf0eb9cda2cdc85ec5575b887c1346e9d161cc2805bf27638d76a2f7f857dffeae968e6ceffcd languageName: node linkType: hard "playwright@npm:^1.17.1, playwright@npm:^1.18.1": - version: 1.36.1 - resolution: "playwright@npm:1.36.1" + version: 1.36.2 + resolution: "playwright@npm:1.36.2" dependencies: - playwright-core: 1.36.1 + playwright-core: 1.36.2 bin: playwright: cli.js - checksum: 21940ccd174eb03a52b13e26dc7e0e90db05298caeab1dd71d21e996b65d959b82aa133f3c9fafb99b5e0bd37265338802d3fbcee1b567e0f75212ddbde5ebae + checksum: 5876b65a0f1303e45f99c7d120706af0ab808efd5d89c514741584ff1060408b62148ae2790c2e6527642f2b8f49db682710b87d3df7b3ba510e8e847e6041ef languageName: node linkType: hard @@ -22683,7 +22686,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8": +"semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.3": version: 7.5.4 resolution: "semver@npm:7.5.4" dependencies: From 343c3f766c1661d16ca53a1f22c094f12af6f4a0 Mon Sep 17 00:00:00 2001 From: Andrey Savihin Date: Wed, 26 Jul 2023 11:53:24 +0300 Subject: [PATCH 21/30] fix Bug 63409 - Welcome letter markup --- .../PublicResources/WebstudioNotifyPatternResource.fi.resx | 4 ++-- .../PublicResources/WebstudioNotifyPatternResource.fr.resx | 2 +- .../PublicResources/WebstudioNotifyPatternResource.it.resx | 2 +- .../PublicResources/WebstudioNotifyPatternResource.ja-JP.resx | 2 +- .../PublicResources/WebstudioNotifyPatternResource.pl.resx | 4 ++-- .../PublicResources/WebstudioNotifyPatternResource.pt.resx | 2 +- .../PublicResources/WebstudioNotifyPatternResource.ro.resx | 4 ++-- .../PublicResources/WebstudioNotifyPatternResource.sk.resx | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.fi.resx b/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.fi.resx index 8633e10cf2c..707a966b818 100644 --- a/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.fi.resx +++ b/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.fi.resx @@ -545,7 +545,7 @@ ONLYOFFICE-tiimi "www.onlyoffice.com":"http://onlyoffice.com/" - Hei, $ UserName! + Hei, $UserName! Tässä on sinull kolme yksinkertaista kysymystä, jotka auttavat meitä parantamaan käyttäjäkokemusta. @@ -557,7 +557,7 @@ Tässä on sinull kolme yksinkertaista kysymystä, jotka auttavat meitä paranta Jos sinulla on vähintään yksi 'kyllä'-vastaus, valitse Yritystilaus, joka mahdollistaa rajattoman managerien määrän sekä käyttää brändäysvaihtoehtoja ONLYOFFICE DocSpacessasi. -Tehdäksesi niin, ole hyvä ja pyydä apua "Maksut osiosta":ONLYOFFICE DocSpacesi $PricingPage ". Sieltä löydät yksilöllisen linkin Stripe-asiakasportaaliin, jossa voit helposti hoitaa kaikkia maksutietoja. +Tehdäksesi niin, ole hyvä ja pyydä apua "Maksut osiosta":"$PricingPage" ONLYOFFICE DocSpacesi. Sieltä löydät yksilöllisen linkin Stripe-asiakasportaaliin, jossa voit helposti hoitaa kaikkia maksutietoja. _Huom: Henkilöstä, joka maksaa tilauksen, tulee maksaja. Vain maksaja pystyy tekemään muutoksia tilaukseen (muuttaa johtajien määrää). Käyttäjillä ei ole pääsyä maksutietoihin. ONLY OFFICE DocSpace-tilin omistaja voi vaihtaa maksajaa milloin tahansa._ diff --git a/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.fr.resx b/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.fr.resx index d59c9516e26..0e777eebbc8 100644 --- a/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.fr.resx +++ b/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.fr.resx @@ -1264,7 +1264,7 @@ Voici trois questions simples qui peuvent nous aider à rendre votre expérience   Si vous avez au moins une réponse positive, optez pour le plan tarifaire BUSINESS qui vous permet d'ajouter autant d'adùinistrateurs que vous le souhaitez à ONLYOFFICE DocSpace ainsi que d'appliquer des options de marque blache.   -Pour ce faire, veuillez consulter la section "Paiements" : "$PricingPage" de votre ONLYOFFICE DocSpaceE. Vous y trouverez un lien individuel vers le portail client Stripe où vous pourrez facilement gérer tous les détails du paiement. +Pour ce faire, veuillez consulter la section "Paiements":"$PricingPage" de votre ONLYOFFICE DocSpaceE. Vous y trouverez un lien individuel vers le portail client Stripe où vous pourrez facilement gérer tous les détails du paiement.   _Attention : la personne qui paie l'abonnement devient le payeur. Seul le payeur est en mesure d'apporter des modifications à l'abonnement (ajuster le nombre d'administrateurs). Les utilisateurs n'ont pas accès aux détails des paiements. Le propriétaire du compte ONLYOFFICE DocSpace peut réaffecter le payeur à tout moment par la suite. _   diff --git a/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.it.resx b/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.it.resx index ce3b0e07b07..5c3dd58ea3a 100644 --- a/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.it.resx +++ b/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.it.resx @@ -1187,7 +1187,7 @@ _Nota: la persona che paga l'abbonamento diventa il pagatore. Solo il pagatore Distinti saluti, Team di ONLYOFFICE -"www.onlyoffice.com":http://onlyoffice.com/it +"www.onlyoffice.com":"http://onlyoffice.com/it" Ciao! diff --git a/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.ja-JP.resx b/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.ja-JP.resx index 53c208d10c1..38779abe00d 100644 --- a/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.ja-JP.resx +++ b/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.ja-JP.resx @@ -463,7 +463,7 @@ ONLYOFFICE DocSpaceの "お支払いセクション":"$PricingPage" をご参照 _ご注意：サブスクリプションをお支払いされている方は、支払者になります。お支払い担当者のみがサブスクリプションの変更（マネージャー数の調整）を行うことができます。ユーザーはお支払いの詳細にアクセスすることはできません。ONLYOFFICE DocSpaceのアカウント所有者は、支払者をいつでも変更することができます。_ ONLYOFFICE チーム -"www.onlyoffice.com":http://onlyoffice.com/ja +"www.onlyoffice.com":"http://onlyoffice.com/ja" こんにちは！ diff --git a/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.pl.resx b/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.pl.resx index 7635c8f39bb..5df11bd6f48 100644 --- a/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.pl.resx +++ b/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.pl.resx @@ -826,13 +826,13 @@ Mamy dla Ciebie trzy proste pytania, które pomogą nam poprawić Twój komfort Jeśli Twoja odpowiedź choć na jedno z pytań brzmiała „tak”, wybierz plan cenowy BIZNES, który pozwala dodać do konta ONLYOFFICE DocSpace dowolną liczbę menedżerów oraz zastosować branding. -Aby to zrobić, skorzystaj przejdź do „sekcji płatności”:"$PricingPage” swojego konta ONLYOFFICE DocSpace. Znajdziesz tam indywidualny link do portalu klienta Stripe, gdzie z łatwością można zarządzać wszystkimi danymi płatniczymi. +Aby to zrobić, skorzystaj przejdź do "sekcji płatności":"$PricingPage” swojego konta ONLYOFFICE DocSpace. Znajdziesz tam indywidualny link do portalu klienta Stripe, gdzie z łatwością można zarządzać wszystkimi danymi płatniczymi. _Uwaga: Osoba, która opłaca subskrypcję staje się płatnikiem. Tylko płatnicy mogą dokonywać zmian w subskrypcji (dostosować liczbę menedżerów). Użytkownicy nie mają dostępu do danych płatniczych. Właściciel konta ONLYOFFICE DocSpace może zmienić płatnika kiedykolwiek zechce. _ Pozdrawiamy, Zespół ONLYOFFICE -"www.onlyoffice.com":”http://onlyoffice.com/’ +"www.onlyoffice.com":"http://onlyoffice.com/" Witaj! diff --git a/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.pt.resx b/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.pt.resx index cbdf135abc4..61c3e4db8c3 100644 --- a/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.pt.resx +++ b/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.pt.resx @@ -359,7 +359,7 @@ Se respondeu “sim” a pelo menos uma destas perguntas, opte pelo tarifário B Para o fazer, consulte a "Secção de pagamentos":"$PricingPage" do seu ONLYOFFICE DocSpace. Aí, encontrará uma ligação individual para o Portal do Cliente Stripe onde pode facilmente tratar de todos os detalhes de pagamento. -Por Favor Note: A pessoa que paga a subscrição torna-se o pagador. Apenas o pagador pode fazer alterações à subscrição (ajustar o número de gestores). Os utilizadores não têm acesso aos detalhes de pagamento. O proprietário da conta do ONLYOFFICE DocSpace pode reatribuir o pagador em qualquer altura mais tarde. _ +_Por Favor Note: A pessoa que paga a subscrição torna-se o pagador. Apenas o pagador pode fazer alterações à subscrição (ajustar o número de gestores). Os utilizadores não têm acesso aos detalhes de pagamento. O proprietário da conta do ONLYOFFICE DocSpace pode reatribuir o pagador em qualquer altura mais tarde. _ Com os melhores cumprimentos, A Equipa da ONLYOFFICE diff --git a/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.ro.resx b/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.ro.resx index e4d574393df..2815b5d3fb3 100644 --- a/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.ro.resx +++ b/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.ro.resx @@ -371,13 +371,13 @@ Iată trei întrebări simple, care ne pot ajuta să facem experiența dvs de ut   Dacă ați răspuns DA la oricare dintre întrebările de mai sus, optați pentru abonamentul BUSINESS, care vă permite să adăugați la spațiul dvs ONLYOFFICE DocSpace numărul de administratori dorit și să utilizați opțiuni de branding.   -Pentru a proceda astfel, consultaţi secţiunea Plăți:"$PricingPage" a spațiului dvs ONLYOFFICE DocSpace. Acolo veți găsi un link personal la portalul pentru clienți Stripe de unde puteți gestiona cu ușurință  toate detaliile de plată. +Pentru a proceda astfel, consultaţi secţiunea "Plăți":"$PricingPage" a spațiului dvs ONLYOFFICE DocSpace. Acolo veți găsi un link personal la portalul pentru clienți Stripe de unde puteți gestiona cu ușurință  toate detaliile de plată.   _Vă rugăm să rețineți: Persoana care plătește abonamentul devine plătitorul. Numai plătitorul poate modifica abonamentul (defini numărul de administratori). Utilizatorii nu pot accesa detalii de plată. Proprietarul contului ONLYOFFICE DocSpace poate reatribui rolul de plătitor oricând mai târziu. _   Cu deosebită considerație, Echipa ONLYOFFICE -"www.onlyoffice.com":http://onlyoffice.com +"www.onlyoffice.com":"http://onlyoffice.com" Bună! diff --git a/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.sk.resx b/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.sk.resx index 69c0697abb7..a465cd4924b 100644 --- a/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.sk.resx +++ b/web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.sk.resx @@ -882,9 +882,9 @@ Tu sú pre Vás tri jednoduché otázky, ktoré nám pomôžu ešte viac spríje Ak ste aspoň na jednu otázku odpovedali "áno", vyberte si tarifný plán BUSINESS, ktorý vám umožní pridať do vášho priestoru ONLYOFFICE DocSpace ľubovoľný počet manažérov, ako aj uplatniť možnosti tvorby firemných značiek. -Ak to chcete urobiť, pozrite sa do časti "Platby":" $PricingPage" vášho ONLYOFFICE DocSpace. Nájdete tam samostatný odkaz na zákaznícky portál Stripe, kde môžete jednoducho spracovať všetky údaje o platbe. +Ak to chcete urobiť, pozrite sa do časti "Platby":"$PricingPage" vášho ONLYOFFICE DocSpace. Nájdete tam samostatný odkaz na zákaznícky portál Stripe, kde môžete jednoducho spracovať všetky údaje o platbe. -Upozornenie: Platiteľom sa stáva osoba, ktorá zaplatí predplatné. Iba platiteľ môže vykonávať zmeny v predplatnom (upravovať počet manažérov). Používatelia nemajú prístup k údajom o platbách. Vlastník účtu ONLYOFFICE DocSpace môže platiteľa kedykoľvek neskôr opätovne priradiť. _ +_Upozornenie: Platiteľom sa stáva osoba, ktorá zaplatí predplatné. Iba platiteľ môže vykonávať zmeny v predplatnom (upravovať počet manažérov). Používatelia nemajú prístup k údajom o platbách. Vlastník účtu ONLYOFFICE DocSpace môže platiteľa kedykoľvek neskôr opätovne priradiť. _ Skutočne Váš, tím ONLYOFFICE From 69e7a63b44b1fa72b0871312735f84fc535e0f01 Mon Sep 17 00:00:00 2001 From: Nasrullo Nurullaev <61620246+nasrullonurullaev@users.noreply.github.com> Date: Wed, 26 Jul 2023 17:03:21 +0500 Subject: [PATCH 22/30] fix Bug 63398 - Made versions of prerequisites in Win consistent with the rest (#1580) * fix Bug 63398 - Made versions of prerequisites in Win packages consistent with others * Update psql ODBC driver * Edit psqlodbc driver name --- build/install/win/DocSpace.Enterprise.aip | 32 ++++++++++----------- build/install/win/DocSpace.aip | 32 ++++++++++----------- build/install/win/build-download-prereq.ps1 | 30 +++++++++---------- build/install/win/utils.vbs | 10 +++---- 4 files changed, 52 insertions(+), 52 deletions(-) diff --git a/build/install/win/DocSpace.Enterprise.aip b/build/install/win/DocSpace.Enterprise.aip index 979fe22dc69..cf48fbfc397 100644 --- a/build/install/win/DocSpace.Enterprise.aip +++ b/build/install/win/DocSpace.Enterprise.aip @@ -819,21 +819,21 @@ - + - - - + + + - - + + - - - + + + @@ -841,18 +841,18 @@ - - - + + + - - + + - + - + diff --git a/build/install/win/DocSpace.aip b/build/install/win/DocSpace.aip index 6f21642c0c6..bc988c706ba 100644 --- a/build/install/win/DocSpace.aip +++ b/build/install/win/DocSpace.aip @@ -1508,18 +1508,18 @@ - + - - - - + + + + - - - + + + - + @@ -1528,18 +1528,18 @@ - - + + - - - + + + - - + + diff --git a/build/install/win/build-download-prereq.ps1 b/build/install/win/build-download-prereq.ps1 index c9aef5e5005..0240765d480 100644 --- a/build/install/win/build-download-prereq.ps1 +++ b/build/install/win/build-download-prereq.ps1 @@ -49,7 +49,7 @@ switch ( $env:DOCUMENT_SERVER_VERSION_CE ) } $nginx_version = '1.21.1' -$psql_version = '12.9' +$psql_version = '14.0' $path_prereq = "${pwd}\build\install\win\" @@ -82,8 +82,8 @@ $prerequisites = @( @{ download_allways = $false; - name = "psqlodbc_x64.msi"; - link = "http://download.onlyoffice.com/install/windows/redist/psqlodbc_x64.msi" + name = "psqlodbc_15_x64.msi"; + link = "http://download.onlyoffice.com/install/windows/redist/psqlodbc_15_x64.msi" } @{ @@ -132,14 +132,14 @@ $enterprise_prerequisites = @( @{ download_allways = $false; - name = "mysql-connector-odbc-8.0.32-win32.msi"; - link = "https://cdn.mysql.com/Downloads/Connector-ODBC/8.0/mysql-connector-odbc-8.0.32-win32.msi"; + name = "mysql-connector-odbc-8.0.33-win32.msi"; + link = "https://cdn.mysql.com/Downloads/Connector-ODBC/8.0/mysql-connector-odbc-8.0.33-win32.msi"; } @{ download_allways = $false; - name = "mysql-installer-community-8.0.32.0.msi"; - link = "https://cdn.mysql.com/Downloads/MySQLInstaller/mysql-installer-community-8.0.32.0.msi"; + name = "mysql-installer-community-8.0.33.0.msi"; + link = "https://cdn.mysql.com/Downloads/MySQLInstaller/mysql-installer-community-8.0.33.0.msi"; } @{ @@ -150,20 +150,20 @@ $enterprise_prerequisites = @( @{ download_allways = $false; - name = "elasticsearch-7.16.3.msi"; - link = "https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.16.3.msi"; + name = "elasticsearch-7.10.0.msi"; + link = "https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.10.0.msi"; } @{ download_allways = $false; - name = "otp_win64_20.3.exe"; - link = "https://erlang.org/download/otp_win64_20.3.exe"; + name = "otp_win64_26.0.2.exe"; + link = "https://github.com/erlang/otp/releases/download/OTP-26.0.2/otp_win64_26.0.2.exe"; } @{ download_allways = $false; - name = "rabbitmq-server-3.7.4.exe"; - link = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.7.4/rabbitmq-server-3.7.4.exe"; + name = "rabbitmq-server-3.12.1.exe"; + link = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.12.1/rabbitmq-server-3.12.1.exe"; } @{ @@ -180,8 +180,8 @@ $enterprise_prerequisites = @( @{ download_allways = $false; - name = "psqlodbc_x64.msi"; - link = "http://download.onlyoffice.com/install/windows/redist/psqlodbc_x64.msi" + name = "psqlodbc_15_x64.msi"; + link = "http://download.onlyoffice.com/install/windows/redist/psqlodbc_15_x64.msi" } @{ diff --git a/build/install/win/utils.vbs b/build/install/win/utils.vbs index d22dada11f5..a1172daface 100644 --- a/build/install/win/utils.vbs +++ b/build/install/win/utils.vbs @@ -220,13 +220,13 @@ Function ElasticSearchSetup Set Shell = CreateObject("WScript.Shell") Set objFSO = CreateObject("Scripting.FileSystemObject") - APP_INDEX_DIR = Session.Property("APPDIR") & "Data\Index\v7.16.3\" + APP_INDEX_DIR = Session.Property("APPDIR") & "Data\Index\v7.10.0\" If Not fso.FolderExists(APP_INDEX_DIR) Then Session.Property("NEED_REINDEX_ELASTICSEARCH") = "TRUE" End If - Call Shell.Run("%COMSPEC% /c mkdir """ & Session.Property("APPDIR") & "Data\Index\v7.16.3\""",0,true) + Call Shell.Run("%COMSPEC% /c mkdir """ & Session.Property("APPDIR") & "Data\Index\v7.10.0\""",0,true) Call Shell.Run("%COMSPEC% /c mkdir """ & Session.Property("APPDIR") & "Logs\""",0,true) Set objFile = objFSO.OpenTextFile(Session.Property("CommonAppDataFolder") & "Elastic\Elasticsearch\config\elasticsearch.yml", ForReading) @@ -278,7 +278,7 @@ Function ElasticSearchSetup End if oRE.Pattern = "path.data:.*" - fileContent = oRE.Replace(fileContent, "path.data: " & Session.Property("APPDIR") & "Data\Index\v7.16.3\") + fileContent = oRE.Replace(fileContent, "path.data: " & Session.Property("APPDIR") & "Data\Index\v7.10.0\") oRE.Pattern = "path.logs:.*" fileContent = oRE.Replace(fileContent, "path.logs: " & Session.Property("APPDIR") & "Logs\") @@ -334,8 +334,8 @@ Function ElasticSearchInstallPlugin Set Shell = CreateObject("WScript.Shell") - ShellInstallCommand = """C:\Program Files\Elastic\Elasticsearch\7.16.3\bin\elasticsearch-plugin""" & " install -b -s ingest-attachment""" - ShellRemoveCommand = """C:\Program Files\Elastic\Elasticsearch\7.16.3\bin\elasticsearch-plugin""" & " remove -s ingest-attachment""" + ShellInstallCommand = """C:\Program Files\Elastic\Elasticsearch\7.10.0\bin\elasticsearch-plugin""" & " install -b -s ingest-attachment""" + ShellRemoveCommand = """C:\Program Files\Elastic\Elasticsearch\7.10.0\bin\elasticsearch-plugin""" & " remove -s ingest-attachment""" Call Shell.Run("cmd /C " & """" & ShellRemoveCommand & """",0,true) Call Shell.Run("cmd /C " & """" & ShellInstallCommand & """",0,true) From ebe3a50f9954cf61e7c09559e4730db4d010a1da Mon Sep 17 00:00:00 2001 From: Nasrullo Nurullaev <61620246+nasrullonurullaev@users.noreply.github.com> Date: Wed, 26 Jul 2023 17:46:23 +0500 Subject: [PATCH 23/30] Fix issue with installing MySQL prerequisites (#1589) --- build/install/win/DocSpace.Enterprise.aip | 7 ++++++- build/install/win/DocSpace.aip | 7 ++++++- build/install/win/build-download-prereq.ps1 | 12 ++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/build/install/win/DocSpace.Enterprise.aip b/build/install/win/DocSpace.Enterprise.aip index cf48fbfc397..c6068b208df 100644 --- a/build/install/win/DocSpace.Enterprise.aip +++ b/build/install/win/DocSpace.Enterprise.aip @@ -822,6 +822,8 @@ + + @@ -833,19 +835,22 @@ - + + + + diff --git a/build/install/win/DocSpace.aip b/build/install/win/DocSpace.aip index bc988c706ba..62751afa809 100644 --- a/build/install/win/DocSpace.aip +++ b/build/install/win/DocSpace.aip @@ -1503,6 +1503,8 @@ + + @@ -1519,9 +1521,12 @@ - + + + + diff --git a/build/install/win/build-download-prereq.ps1 b/build/install/win/build-download-prereq.ps1 index 0240765d480..b6e6f4aabd7 100644 --- a/build/install/win/build-download-prereq.ps1 +++ b/build/install/win/build-download-prereq.ps1 @@ -106,6 +106,12 @@ $nuget_packages = @( $path_enterprise_prereq = "${pwd}\build\install\win\redist\" $enterprise_prerequisites = @( + @{ + download_allways = $false; + name = ".net_framework_4.8.exe"; + link = "https://download.visualstudio.microsoft.com/download/pr/014120d7-d689-4305-befd-3cb711108212/0fd66638cde16859462a6243a4629a50/ndp48-x86-x64-allos-enu.exe" + } + @{ download_allways = $false; name = "aspnetcore-runtime-7.0.4-win-x64.exe"; @@ -124,6 +130,12 @@ $enterprise_prerequisites = @( link = "http://download.microsoft.com/download/C/C/2/CC2DF5F8-4454-44B4-802D-5EA68D086676/vcredist_x64.exe"; } + @{ + download_allways = $false; + name = "VC_redist.x86.exe"; + link = "https://download.visualstudio.microsoft.com/download/pr/d60aa805-26e9-47df-b4e3-cd6fcc392333/A06AAC66734A618AB33C1522920654DDFC44FC13CAFAA0F0AB85B199C3D51DC0/VC_redist.x86.exe"; + } + @{ download_allways = $false; name = "VC_redist.x64.exe"; From 281122602c8410e924fa2d0e2fe98a81d50f138f Mon Sep 17 00:00:00 2001 From: Evgeniy Antonyuk Date: Wed, 26 Jul 2023 18:55:29 +0500 Subject: [PATCH 24/30] Add an environment file for redis configuration in packages --- build/install/common/product-configuration | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build/install/common/product-configuration b/build/install/common/product-configuration index 8a921ff2911..74511c9fae5 100644 --- a/build/install/common/product-configuration +++ b/build/install/common/product-configuration @@ -606,8 +606,7 @@ setup_elasticsearch() { setup_redis() { echo -n "Configuring redis... " - sed "s_\(\"Host\":\).*_\1 \"${REDIS_HOST}\",_" -i $APP_DIR/redis.json - sed "s_\(\"Port\":\).*_\1 \"${REDIS_PORT}\"_" -i $APP_DIR/redis.json + $JSON $APP_DIR/redis.$ENVIRONMENT.json -e "this.Redis={'Hosts': [ { Host: \"${REDIS_HOST}\", Port: \"${REDIS_PORT}\" } ] }" >/dev/null 2>&1 if [ -e /etc/redis/redis.conf ]; then sed "s_\(^bind\).*_\1 ${REDIS_HOST}_" -i /etc/redis/redis.conf @@ -635,7 +634,7 @@ product_configuration(){ echo -n "Configuring ${PRODUCT}... " #Creating environment configuration files - enviromentFiles=("appsettings.$ENVIRONMENT.json" "apisystem.$ENVIRONMENT.json" "elastic.$ENVIRONMENT.json" "rabbitmq.$ENVIRONMENT.json") + enviromentFiles=("appsettings.$ENVIRONMENT.json" "apisystem.$ENVIRONMENT.json" "elastic.$ENVIRONMENT.json" "rabbitmq.$ENVIRONMENT.json" "redis.$ENVIRONMENT.json") for i in "${!enviromentFiles[@]}"; do if [ ! -e "$APP_DIR/${enviromentFiles[$i]}" ]; then From ac77a4cb04a565c9ba092b9c3b16e153d03f024c Mon Sep 17 00:00:00 2001 From: Nasrullo Nurullaev <61620246+nasrullonurullaev@users.noreply.github.com> Date: Thu, 27 Jul 2023 11:32:30 +0500 Subject: [PATCH 25/30] Fix issue with parsing data from nlog.config (#1592) --- build/install/win/build-batch.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/install/win/build-batch.bat b/build/install/win/build-batch.bat index 2c7ea5ec0aa..d94c1265a8c 100644 --- a/build/install/win/build-batch.bat +++ b/build/install/win/build-batch.bat @@ -42,7 +42,7 @@ del /f /q build\install\win\Files\config\*.test.json del /f /q build\install\win\Files\config\*.dev.json ::default logging to warning -%sed% "s_\(minlevel=\)".*"_\1\"Warn\"_g" -i build\install\win\Files\config\nlog.config +%sed% -i "s/minlevel=\"Debug\""/minlevel=\"Warn\""/g" build\install\win\Files\config\nlog.config %sed% "s_\(\"Default\":\).*,_\1 \"Warning\",_g" -i build\install\win\Files\config\appsettings.json %sed% "s_\(\"logLevel\":\).*_\1 \"warning\"_g" -i build\install\win\Files\config\appsettings.services.json %sed% "/\"debug-info\": {/,/}/ s/\(\"enabled\": \)\".*\"/\1\"false\"/" -i build\install\win\Files\config\appsettings.json From f281277f6bcb01907cbfb29b5d0c898f15ada9b4 Mon Sep 17 00:00:00 2001 From: Evgeniy Antonyuk Date: Thu, 27 Jul 2023 13:43:12 +0500 Subject: [PATCH 26/30] Add ability to set log level in docker (#1591) --- build/install/docker/.env | 2 ++ build/install/docker/docker-entrypoint.py | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/build/install/docker/.env b/build/install/docker/.env index 995c593f8bf..a6a2cbd5b7e 100644 --- a/build/install/docker/.env +++ b/build/install/docker/.env @@ -37,6 +37,8 @@ APP_CORE_BASE_DOMAIN=localhost APP_URL_PORTAL="http://localhost:8092" OAUTH_REDIRECT_URL="https://service.onlyoffice.com/oauth2.aspx" + LOG_LEVEL="Warning" + DEBUG_INFO="false" APP_KNOWN_PROXIES="" APP_KNOWN_NETWORKS="" diff --git a/build/install/docker/docker-entrypoint.py b/build/install/docker/docker-entrypoint.py index 668da7cd78a..bb1b6efbc41 100755 --- a/build/install/docker/docker-entrypoint.py +++ b/build/install/docker/docker-entrypoint.py @@ -32,6 +32,8 @@ APP_STORAGE_ROOT = os.environ["APP_STORAGE_ROOT"] if environ.get("APP_STORAGE_ROOT") else BASE_DIR + "/data/" APP_KNOWN_PROXIES = os.environ["APP_KNOWN_PROXIES"] APP_KNOWN_NETWORKS = os.environ["APP_KNOWN_NETWORKS"] +LOG_LEVEL = os.environ["LOG_LEVEL"] if environ.get("LOG_LEVEL") else "Warning" +DEBUG_INFO = os.environ["DEBUG_INFO"] if environ.get("DEBUG_INFO") else "false" DOCUMENT_SERVER_JWT_SECRET = os.environ["DOCUMENT_SERVER_JWT_SECRET"] if environ.get("DOCUMENT_SERVER_JWT_SECRET") else "your_jwt_secret" DOCUMENT_SERVER_JWT_HEADER = os.environ["DOCUMENT_SERVER_JWT_HEADER"] if environ.get("DOCUMENT_SERVER_JWT_HEADER") else "AuthorizationJwt" @@ -151,6 +153,8 @@ def writeJsonFile(jsonFile, jsonData, indent=4): updateJsonData(jsonData,"$.files.docservice.url.internal", DOCUMENT_SERVER_URL_INTERNAL) updateJsonData(jsonData,"$.files.docservice.secret.value", DOCUMENT_SERVER_JWT_SECRET) updateJsonData(jsonData,"$.files.docservice.secret.header", DOCUMENT_SERVER_JWT_HEADER) +updateJsonData(jsonData,"$.Logging.LogLevel.Default", LOG_LEVEL) +updateJsonData(jsonData,"$.debug-info.enabled", DEBUG_INFO) if INSTALLATION_TYPE == "ENTERPRISE": updateJsonData(jsonData, "$.license.file.path", "/app/onlyoffice/data/license.lic") @@ -179,6 +183,11 @@ def writeJsonFile(jsonFile, jsonData, indent=4): updateJsonData(jsonData,"$.core.machinekey", APP_CORE_MACHINEKEY) writeJsonFile(filePath, jsonData) +filePath = "/app/onlyoffice/config/appsettings.services.json" +jsonData = openJsonFile(filePath) +updateJsonData(jsonData,"$.logLevel", LOG_LEVEL) +writeJsonFile(filePath, jsonData) + filePath = "/app/onlyoffice/config/autofac.consumers.json" jsonData = openJsonFile(filePath) From c04b1c33242cfb35f7b1d2a68d82e98fc90ec118 Mon Sep 17 00:00:00 2001 From: Evgeniy Antonyuk Date: Thu, 27 Jul 2023 14:20:50 +0500 Subject: [PATCH 27/30] Add swap file creation when installing packages --- .../install/OneClickInstall/install-Debian.sh | 9 +++++ .../install-Debian/install-app.sh | 4 ++ .../OneClickInstall/install-Debian/tools.sh | 18 +++++++++ .../install/OneClickInstall/install-Docker.sh | 39 +++++++++++++++++++ .../install/OneClickInstall/install-RedHat.sh | 8 ++++ .../install-RedHat/install-app.sh | 6 ++- .../OneClickInstall/install-RedHat/tools.sh | 18 +++++++++ build/install/common/product-configuration | 2 +- 8 files changed, 102 insertions(+), 2 deletions(-) diff --git a/build/install/OneClickInstall/install-Debian.sh b/build/install/OneClickInstall/install-Debian.sh index 2b405c9695c..e45c2c8a601 100644 --- a/build/install/OneClickInstall/install-Debian.sh +++ b/build/install/OneClickInstall/install-Debian.sh @@ -7,6 +7,7 @@ DS_COMMON_NAME="onlyoffice"; product="docspace" GIT_BRANCH="master" INSTALLATION_TYPE="ENTERPRISE" +MAKESWAP="true" RES_APP_INSTALLED="is already installed"; RES_APP_CHECK_PORTS="uses ports" RES_CHECK_PORTS="please, make sure that the ports are free."; @@ -72,6 +73,13 @@ while [ "$1" != "" ]; do shift fi ;; + + -ms | --makeswap ) + if [ "$2" != "" ]; then + MAKESWAP=$2 + shift + fi + ;; -? | -h | --help ) echo " Usage $0 [PARAMETER] [[PARAMETER], ...]" @@ -83,6 +91,7 @@ while [ "$1" != "" ]; do echo " -js, --jwtsecret defines the secret key to validate the JWT in the request" echo " -ls, --local_scripts use 'true' to run local scripts (true|false)" echo " -skiphc, --skiphardwarecheck use to skip hardware check (true|false)" + echo " -ms, --makeswap make swap file (true|false)" echo " -?, -h, --help this help" echo exit 0 diff --git a/build/install/OneClickInstall/install-Debian/install-app.sh b/build/install/OneClickInstall/install-Debian/install-app.sh index 5d1c44f77d9..9e88d16ad9a 100644 --- a/build/install/OneClickInstall/install-Debian/install-app.sh +++ b/build/install/OneClickInstall/install-Debian/install-app.sh @@ -85,6 +85,10 @@ elif [ "$UPDATE" = "true" ] && [ "$PRODUCT_INSTALLED" = "true" ]; then fi fi +if [ "$MAKESWAP" == "true" ]; then + make_swap +fi + echo "" echo "$RES_INSTALL_SUCCESS" echo "$RES_QUESTIONS" diff --git a/build/install/OneClickInstall/install-Debian/tools.sh b/build/install/OneClickInstall/install-Debian/tools.sh index f8a939253d7..4e124df6a0b 100644 --- a/build/install/OneClickInstall/install-Debian/tools.sh +++ b/build/install/OneClickInstall/install-Debian/tools.sh @@ -2,6 +2,24 @@ set -e +make_swap () { + DISK_REQUIREMENTS=6144; #6Gb free space + MEMORY_REQUIREMENTS=11000; #RAM ~12Gb + SWAPFILE="/${PRODUCT}_swapfile"; + + AVAILABLE_DISK_SPACE=$(df -m / | tail -1 | awk '{ print $4 }'); + TOTAL_MEMORY=$(free -m | grep -oP '\d+' | head -n 1); + EXIST=$(swapon -s | awk '{ print $1 }' | { grep -x ${SWAPFILE} || true; }); + + if [[ -z $EXIST ]] && [ ${TOTAL_MEMORY} -lt ${MEMORY_REQUIREMENTS} ] && [ ${AVAILABLE_DISK_SPACE} -gt ${DISK_REQUIREMENTS} ]; then + fallocate -l 6G ${SWAPFILE} + chmod 600 ${SWAPFILE} + mkswap ${SWAPFILE} + swapon ${SWAPFILE} + echo "$SWAPFILE none swap sw 0 0" >> /etc/fstab + fi +} + command_exists () { type "$1" &> /dev/null; } diff --git a/build/install/OneClickInstall/install-Docker.sh b/build/install/OneClickInstall/install-Docker.sh index 61204c8f475..52ad2e80f26 100644 --- a/build/install/OneClickInstall/install-Docker.sh +++ b/build/install/OneClickInstall/install-Docker.sh @@ -43,6 +43,9 @@ CONTAINER_NAME="${PACKAGE_SYSNAME}-api" NETWORK_NAME=${PACKAGE_SYSNAME} +SWAPFILE="/${PRODUCT}_swapfile"; +MAKESWAP="true"; + DISK_REQUIREMENTS=40960; MEMORY_REQUIREMENTS=5500; CORE_REQUIREMENTS=2; @@ -310,6 +313,13 @@ while [ "$1" != "" ]; do fi ;; + -ms | --makeswap ) + if [ "$2" != "" ]; then + MAKESWAP=$2 + shift + fi + ;; + -? | -h | --help ) echo " Usage: bash $HELP_TARGET [PARAMETER] [[PARAMETER], ...]" echo @@ -341,6 +351,7 @@ while [ "$1" != "" ]; do echo " -mysqlp, --mysqlpassword $PRODUCT database password" echo " -mysqlh, --mysqlhost mysql server host" echo " -dbm, --databasemigration database migration (true|false)" + echo " -ms, --makeswap make swap file (true|false)" echo " -?, -h, --help this help" echo echo " Install all the components without document server:" @@ -1048,6 +1059,30 @@ install_product () { docker-compose -f $BASE_DIR/healthchecks.yml up -d } +make_swap () { + DISK_REQUIREMENTS=6144; #6Gb free space + MEMORY_REQUIREMENTS=11000; #RAM ~12Gb + + AVAILABLE_DISK_SPACE=$(df -m / | tail -1 | awk '{ print $4 }'); + TOTAL_MEMORY=$(free -m | grep -oP '\d+' | head -n 1); + EXIST=$(swapon -s | awk '{ print $1 }' | { grep -x ${SWAPFILE} || true; }); + + if [[ -z $EXIST ]] && [ ${TOTAL_MEMORY} -lt ${MEMORY_REQUIREMENTS} ] && [ ${AVAILABLE_DISK_SPACE} -gt ${DISK_REQUIREMENTS} ]; then + + if [ "${DIST}" == "Ubuntu" ] || [ "${DIST}" == "Debian" ]; then + fallocate -l 6G ${SWAPFILE} + else + dd if=/dev/zero of=${SWAPFILE} count=6144 bs=1MiB + fi + + chmod 600 ${SWAPFILE} + mkswap ${SWAPFILE} + swapon ${SWAPFILE} + echo "$SWAPFILE none swap sw 0 0" >> /etc/fstab + fi +} + + start_installation () { root_checking @@ -1065,6 +1100,10 @@ start_installation () { check_hardware fi + if [ "$MAKESWAP" == "true" ]; then + make_swap + fi + if command_exists docker ; then check_docker_version service docker start diff --git a/build/install/OneClickInstall/install-RedHat.sh b/build/install/OneClickInstall/install-RedHat.sh index a7929b13bcc..a8272617b6c 100644 --- a/build/install/OneClickInstall/install-RedHat.sh +++ b/build/install/OneClickInstall/install-RedHat.sh @@ -81,6 +81,13 @@ while [ "$1" != "" ]; do shift fi ;; + + -ms | --makeswap ) + if [ "$2" != "" ]; then + MAKESWAP=$2 + shift + fi + ;; -? | -h | --help ) echo " Usage $0 [PARAMETER] [[PARAMETER], ...]" @@ -92,6 +99,7 @@ while [ "$1" != "" ]; do echo " -js, --jwtsecret defines the secret key to validate the JWT in the request" echo " -ls, --local_scripts use 'true' to run local scripts (true|false)" echo " -skiphc, --skiphardwarecheck use to skip hardware check (true|false)" + echo " -ms, --makeswap make swap file (true|false)" echo " -?, -h, --help this help" echo exit 0 diff --git a/build/install/OneClickInstall/install-RedHat/install-app.sh b/build/install/OneClickInstall/install-RedHat/install-app.sh index 89dc51bef05..d8249137240 100644 --- a/build/install/OneClickInstall/install-RedHat/install-app.sh +++ b/build/install/OneClickInstall/install-RedHat/install-app.sh @@ -156,7 +156,7 @@ if [ "$PRODUCT_INSTALLED" = "false" ]; then -mysqlu ${MYSQL_SERVER_USER} \ -mysqlp ${MYSQL_ROOT_PASS} elif [[ $PRODUCT_CHECK_UPDATE -eq $UPDATE_AVAILABLE_CODE || $RECONFIGURE_PRODUCT = "true" ]]; then - ENVIRONMENT=$(grep -oP 'ENVIRONMENT=\K.*' /lib/systemd/system/${product}-api.service) + ENVIRONMENT=$(grep -oP 'ENVIRONMENT=\K.*' /usr/lib/systemd/system/${product}-api.service) CONNECTION_STRING=$(json -f /etc/${package_sysname}/${product}/appsettings.$ENVIRONMENT.json ConnectionStrings.default.connectionString) ${package_manager} -y update ${product} ${product}-configuration \ @@ -167,6 +167,10 @@ elif [[ $PRODUCT_CHECK_UPDATE -eq $UPDATE_AVAILABLE_CODE || $RECONFIGURE_PRODUCT -mysqlp $(grep -oP 'Password=\K[^;]*' <<< "$CONNECTION_STRING") fi +if [ "$MAKESWAP" == "true" ]; then + make_swap +fi + echo "" echo "$RES_INSTALL_SUCCESS" echo "$RES_QUESTIONS" diff --git a/build/install/OneClickInstall/install-RedHat/tools.sh b/build/install/OneClickInstall/install-RedHat/tools.sh index e5de7821efd..3ffbd5c6d25 100644 --- a/build/install/OneClickInstall/install-RedHat/tools.sh +++ b/build/install/OneClickInstall/install-RedHat/tools.sh @@ -2,6 +2,24 @@ set -e +function make_swap () { + local DISK_REQUIREMENTS=6144; #6Gb free space + local MEMORY_REQUIREMENTS=11000; #RAM ~12Gb + SWAPFILE="/${PRODUCT}_swapfile"; + + local AVAILABLE_DISK_SPACE=$(df -m / | tail -1 | awk '{ print $4 }'); + local TOTAL_MEMORY=$(free -m | grep -oP '\d+' | head -n 1); + local EXIST=$(swapon -s | awk '{ print $1 }' | { grep -x ${SWAPFILE} || true; }); + + if [[ -z $EXIST ]] && [ ${TOTAL_MEMORY} -lt ${MEMORY_REQUIREMENTS} ] && [ ${AVAILABLE_DISK_SPACE} -gt ${DISK_REQUIREMENTS} ]; then + dd if=/dev/zero of=${SWAPFILE} count=6144 bs=1MiB + chmod 600 ${SWAPFILE} + mkswap ${SWAPFILE} + swapon ${SWAPFILE} + echo "$SWAPFILE none swap sw 0 0" >> /etc/fstab + fi +} + check_hardware () { DISK_REQUIREMENTS=40960; MEMORY_REQUIREMENTS=5500; diff --git a/build/install/common/product-configuration b/build/install/common/product-configuration index 74511c9fae5..2d78a1a0f4b 100644 --- a/build/install/common/product-configuration +++ b/build/install/common/product-configuration @@ -239,7 +239,7 @@ install_json() { restart_services() { chown -R ${PACKAGE_SYSNAME}:${PACKAGE_SYSNAME} $APP_DIR $PRODUCT_DIR $LOG_DIR /var/www/$PACKAGE_SYSNAME/Data - sed "s_\(ENVIRONMENT=\).*_\1${ENVIRONMENT}_i" -i /lib/systemd/system/${PRODUCT}*.service >/dev/null 2>&1 + sed "s_\(ENVIRONMENT=\).*_\1${ENVIRONMENT}_i" -i /usr/lib/systemd/system/${PRODUCT}*.service >/dev/null 2>&1 systemctl daemon-reload echo -n "Updating database... " From 60da3a7f34b7bd0ac337b2e9740567d68265630f Mon Sep 17 00:00:00 2001 From: Evgeniy Antonyuk Date: Thu, 27 Jul 2023 14:30:43 +0500 Subject: [PATCH 28/30] Add enabling makeswap by default for OCI Redhat --- build/install/OneClickInstall/install-RedHat.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build/install/OneClickInstall/install-RedHat.sh b/build/install/OneClickInstall/install-RedHat.sh index a8272617b6c..a1eb518c726 100644 --- a/build/install/OneClickInstall/install-RedHat.sh +++ b/build/install/OneClickInstall/install-RedHat.sh @@ -7,6 +7,7 @@ package_sysname="onlyoffice"; product="docspace" GIT_BRANCH="master" INSTALLATION_TYPE="ENTERPRISE" +MAKESWAP="true" RES_APP_INSTALLED="is already installed"; RES_APP_CHECK_PORTS="uses ports" RES_CHECK_PORTS="please, make sure that the ports are free."; From f2c4ddfe9f6703d8105454df2e70128fc47d761c Mon Sep 17 00:00:00 2001 From: Evgeniy Antonyuk Date: Thu, 27 Jul 2023 14:47:30 +0500 Subject: [PATCH 29/30] Prevent interactive information from being displayed to user --- build/install/OneClickInstall/install-Docker.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build/install/OneClickInstall/install-Docker.sh b/build/install/OneClickInstall/install-Docker.sh index 52ad2e80f26..c1d04635b23 100644 --- a/build/install/OneClickInstall/install-Docker.sh +++ b/build/install/OneClickInstall/install-Docker.sh @@ -491,6 +491,10 @@ check_os_info () { echo "Not supported OS"; exit 1; fi + + if [ -f /etc/needrestart/needrestart.conf ]; then + sed -e "s_#\$nrconf{restart}_\$nrconf{restart}_" -e "s_\(\$nrconf{restart} =\).*_\1 'a';_" -i /etc/needrestart/needrestart.conf + fi } check_kernel () { From ef99b47510f09d5f004fefb6f839086ce7054b00 Mon Sep 17 00:00:00 2001 From: Evgeniy Antonyuk Date: Thu, 27 Jul 2023 15:12:25 +0500 Subject: [PATCH 30/30] Add a log level replacement for nlog.config --- build/install/docker/docker-entrypoint.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build/install/docker/docker-entrypoint.py b/build/install/docker/docker-entrypoint.py index bb1b6efbc41..7dd84bdab83 100755 --- a/build/install/docker/docker-entrypoint.py +++ b/build/install/docker/docker-entrypoint.py @@ -240,5 +240,12 @@ def writeJsonFile(jsonFile, jsonData, indent=4): jsonData["Redis"].update(REDIS_PASSWORD) if REDIS_PASSWORD is not None else None writeJsonFile(filePath, jsonData) +filePath = "/app/onlyoffice/config/nlog.config" +with open(filePath, 'r') as f: + configData = f.read() +configData = re.sub(r'(minlevel=")(\w+)(")', '\\1' + LOG_LEVEL + '\\3', configData) +with open(filePath, 'w') as f: + f.write(configData) + run = RunServices(SERVICE_PORT, PATH_TO_CONF) run.RunService(RUN_FILE, ENV_EXTENSION, LOG_FILE) \ No newline at end of file